passenger 4.0.14 → 4.0.16

data/ext/nginx/ConfigurationCommands.c.erb

@@ -0,0 +1,136 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2010-2013 Phusion
+ *
+ *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+
+/*
+ * ConfigurationCommands.c is automatically generated from ConfigurationCommands.c.erb,
+ * using definitions from lib/phusion_passenger/nginx/config_options.rb.
+ * Edits to ConfigurationCommands.c will be lost.
+ *
+ * To update ConfigurationCommands.c:
+ *   rake nginx
+ *
+ * To force regeneration of ConfigurationCommands.c:
+ *   rm -f ext/nginx/ConfigurationCommands.c
+ *   rake ext/nginx/ConfigurationCommands.c
+ */
+
+<%
+require 'phusion_passenger/nginx/config_options'
+
+def resolve_possible_alias(option)
+	if option[:alias_for]
+		the_alias = LOCATION_CONFIGURATION_OPTIONS.find do |o|
+			o[:name] == option[:alias_for]
+		end.dup
+		the_alias[:aliased_for] = option[:name]
+		return the_alias
+	else
+		return option
+	end
+end
+
+def name_for(option)
+	return (option[:aliased_for] || option[:name]).inspect
+end
+
+def context_for(option)
+	context = option.fetch(:context, [:main, :srv, :loc, :lif])
+	return context.map{ |c| "NGX_HTTP_#{c.upcase}_CONF" }.join(" | ")
+end
+
+def take_type_for(option)
+	return option[:take] if option[:take]
+
+	case option[:type]
+	when :string, :integer, :string_array
+		return "NGX_CONF_TAKE1"
+	when :flag
+		return "NGX_CONF_FLAG"
+	when :string_keyval
+		return "NGX_CONF_TAKE2"
+	else
+		raise "Unknown type #{option[:type].inspect} for option #{option[:name]}"
+	end
+end
+
+def setter_function_for(option)
+	return option[:function] if option[:function]
+
+	case option[:type]
+	when :string
+		return "ngx_conf_set_str_slot"
+	when :integer
+		return "ngx_conf_set_num_slot"
+	when :flag
+		return "ngx_conf_set_flag_slot"
+	when :string_array
+		return "ngx_conf_set_str_array_slot"
+	when :string_keyval
+		return "set_null_terminated_keyval_slot"
+	else
+		raise "Unknown type #{option[:type].inspect} for option #{option[:name]}"
+	end
+end
+
+def struct_for(option)
+	option[:struct] || "NGX_HTTP_LOC_CONF_OFFSET"
+end
+
+def struct_type_for(option)
+	case struct_for(option)
+	when "NGX_HTTP_LOC_CONF_OFFSET"
+		return "passenger_loc_conf_t"
+	when "NGX_HTTP_MAIN_CONF_OFFSET"
+		return "passenger_main_conf_t"
+	else
+		raise "Unknown struct #{struct_for(option).inspect}"
+	end
+end
+
+def struct_field_for(option)
+	if option.has_key?(:field)
+		if field = option[:field]
+			return "offsetof(#{struct_type_for(option)}, #{field})"
+		else
+			return "0"
+		end
+	else
+		field = option[:name].sub(/^passenger_/, '')
+		return "offsetof(#{struct_type_for(option)}, #{field})"
+	end
+end
+%>
+
+<% for option in LOCATION_CONFIGURATION_OPTIONS %>
+{
+	<% option = resolve_possible_alias(option) %>
+	ngx_string(<%= name_for(option) %>),
+	<%= context_for(option) %> | <%= take_type_for(option) %>,
+	<%= setter_function_for(option) %>,
+	<%= struct_for(option) %>,
+	<%= struct_field_for(option) %>,
+	NULL
+},
+<% end %>

data/ext/nginx/ConfigurationFields.h

@@ -0,0 +1,89 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2010-2013 Phusion
+ *
+ *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+
+/*
+ * ConfigurationFields.h is automatically generated from ConfigurationFields.h.erb,
+ * using definitions from lib/phusion_passenger/nginx/config_options.rb.
+ * Edits to ConfigurationFields.h will be lost.
+ *
+ * To update ConfigurationFields.h:
+ *   rake nginx
+ *
+ * To force regeneration of ConfigurationFields.h:
+ *   rm -f ext/nginx/ConfigurationFields.h
+ *   rake ext/nginx/ConfigurationFields.h
+ */
+
+
+
+
+	ngx_int_t enabled;
+
+	ngx_int_t max_request_queue_size;
+
+	ngx_array_t *vars_source;
+
+	ngx_int_t max_preloader_idle_time;
+
+	ngx_int_t friendly_error_pages;
+
+	ngx_int_t min_instances;
+
+	ngx_int_t max_requests;
+
+	ngx_int_t start_timeout;
+
+	ngx_array_t *base_uris;
+
+	ngx_int_t show_version_in_header;
+
+	ngx_int_t debugger;
+
+	ngx_array_t *union_station_filters;
+
+	ngx_int_t union_station_support;
+
+	ngx_int_t request_queue_overflow_status_code;
+
+	ngx_str_t app_rights;
+
+	ngx_str_t app_group_name;
+
+	ngx_str_t group;
+
+	ngx_str_t user;
+
+	ngx_str_t environment;
+
+	ngx_str_t python;
+
+	ngx_str_t spawn_method;
+
+	ngx_str_t union_station_key;
+
+	ngx_str_t ruby;
+
+	ngx_str_t app_root;
+

data/ext/nginx/ConfigurationFields.h.erb

@@ -0,0 +1,85 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2010-2013 Phusion
+ *
+ *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+
+/*
+ * ConfigurationFields.h is automatically generated from ConfigurationFields.h.erb,
+ * using definitions from lib/phusion_passenger/nginx/config_options.rb.
+ * Edits to ConfigurationFields.h will be lost.
+ *
+ * To update ConfigurationFields.h:
+ *   rake nginx
+ *
+ * To force regeneration of ConfigurationFields.h:
+ *   rm -f ext/nginx/ConfigurationFields.h
+ *   rake ext/nginx/ConfigurationFields.h
+ */
+
+<%
+require 'phusion_passenger/nginx/config_options'
+
+def filter_eligible_options(options)
+	return options.reject do |option|
+		option[:alias_for] ||
+			option.fetch(:field, true).nil? ||
+			option[:field].to_s =~ /\./
+	end
+end
+
+def struct_field_for(option)
+	if option.has_key?(:field)
+		return option[:field]
+	else
+		return option[:name].sub(/^passenger_/, '')
+	end
+end
+
+# Returns [definition_source, estimated_size_on_x86_64]
+def definition_for(option)
+	field = struct_field_for(option)
+	case option[:type]
+	when :string
+		return ["ngx_str_t #{field}", 8 + 4]
+	when :integer, :flag
+		return ["ngx_int_t #{field}", 8]
+	when :string_array, :string_keyval
+		return ["ngx_array_t *#{field}", 8];
+	else
+		raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}"
+	end
+end
+
+eligible_options = filter_eligible_options(LOCATION_CONFIGURATION_OPTIONS)
+definitions = eligible_options.map { |o| definition_for(o) }
+# Sort the definitions by size in order to make the struct smaller.
+# It's possible to make it even smaller with a smarter algorithm but for now
+# I don't bother.
+definitions.sort! do |d1, d2|
+	d1[1] <=> d2[1]
+end
+%>
+
+<% for definition in definitions %>
+	<%= definition[0] %>;
+<% end %>

data/ext/nginx/ContentHandler.c

@@ -275,63 +275,6 @@ fix_peer_address(ngx_http_request_t *r) {
 }
 
 
-/* Convenience macros for building the SCGI header in create_request(). */
-
-#define ANALYZE_BOOLEAN_CONFIG_LENGTH(name, container, config_field)    \
-    do {                                                                \
-        if (container->config_field) {                                  \
-            len += sizeof(name) + sizeof("true");                       \
-        } else {                                                        \
-            len += sizeof(name) + sizeof("false");                      \
-        }                                                               \
-    } while (0)
-
-#define SERIALIZE_BOOLEAN_CONFIG_DATA(name, container, config_field)    \
-    do {                                                                \
-        b->last = ngx_copy(b->last, name, sizeof(name));                \
-        if (container->config_field) {                                  \
-            b->last = ngx_copy(b->last, "true", sizeof("true"));        \
-        } else {                                                        \
-            b->last = ngx_copy(b->last, "false", sizeof("false"));      \
-        }                                                               \
-    } while (0)
-
-#define PREPARE_INT_CONFIG_DATA(name, container, config_field)      \
-    do {                                                            \
-        end = ngx_snprintf(config_field ## _string,                 \
-                           sizeof(config_field ## _string) - 1,     \
-                           "%d",                                    \
-                           container->config_field);                \
-        *end = '\0';                                                \
-        len += sizeof(name) + (end - config_field ## _string) + 1;  \
-    } while (0)
-
-#define SERIALIZE_INT_CONFIG_DATA(name, container, config_field)        \
-    do {                                                                \
-        b->last = ngx_copy(b->last, name, sizeof(name));                \
-        b->last = ngx_copy(b->last, config_field ## _string,            \
-                           ngx_strlen(config_field ## _string) + 1);    \
-    } while (0)
-
-#define ANALYZE_STR_CONFIG_LENGTH(name, container, config_field)        \
-    do {                                                                \
-        if (container->config_field.data != NULL) {                     \
-            len += sizeof(name) + (container->config_field.len) + 1;    \
-        }                                                               \
-    } while (0)
-
-#define SERIALIZE_STR_CONFIG_DATA(name, container, config_field)        \
-    do {                                                                \
-        if (container->config_field.data != NULL) {                     \
-            b->last = ngx_copy(b->last, name, sizeof(name));            \
-            b->last = ngx_copy(b->last, container->config_field.data,   \
-                               container->config_field.len);            \
-            *b->last = '\0';                                            \
-            b->last++;                                                  \
-        }                                                               \
-    } while (0)
-
-
 #if (NGX_HTTP_CACHE)
 
 static ngx_int_t
@@ -370,10 +313,6 @@ create_request(ngx_http_request_t *r)
     int                            server_name_len;
     ngx_str_t                      escaped_uri;
     ngx_str_t                     *union_station_filters = NULL;
-    u_char                         min_instances_string[12];
-    u_char                         max_requests_string[12];
-    u_char                         max_preloader_idle_time_string[12];
-    u_char                        *end;
     void                          *tmp;
     ngx_uint_t                     i, n;
     ngx_buf_t                     *b;
@@ -471,55 +410,10 @@ create_request(ngx_http_request_t *r)
     #endif
     
     /* Lengths of Passenger application pool options. */
-    ANALYZE_BOOLEAN_CONFIG_LENGTH("PASSENGER_FRIENDLY_ERROR_PAGES",
-                                  slcf, friendly_error_pages);
-    ANALYZE_BOOLEAN_CONFIG_LENGTH("UNION_STATION_SUPPORT",
-                                  slcf, union_station_support);
-    ANALYZE_BOOLEAN_CONFIG_LENGTH("PASSENGER_DEBUGGER",
-                                  slcf, debugger);
-    ANALYZE_BOOLEAN_CONFIG_LENGTH("PASSENGER_SHOW_VERSION_IN_HEADER",
-                                  slcf, show_version_in_header);
-    if (slcf->ruby.data != NULL) {
-        ANALYZE_STR_CONFIG_LENGTH("PASSENGER_RUBY", slcf, ruby);
-    } else {
-        len += sizeof("PASSENGER_RUBY") + passenger_main_conf.default_ruby.len + 1;
-    }
-    ANALYZE_STR_CONFIG_LENGTH("PASSENGER_PYTHON", slcf, python);
-    len += sizeof("PASSENGER_ENV") + slcf->environment.len + 1;
-    len += sizeof("PASSENGER_SPAWN_METHOD") + slcf->spawn_method.len + 1;
+    len += slcf->options_cache.len;
+
     len += sizeof("PASSENGER_APP_TYPE") + app_type_string_len;
-    ANALYZE_STR_CONFIG_LENGTH("PASSENGER_APP_GROUP_NAME", slcf, app_group_name);
-    ANALYZE_STR_CONFIG_LENGTH("PASSENGER_APP_ROOT", slcf, app_root);
-    ANALYZE_STR_CONFIG_LENGTH("PASSENGER_APP_RIGHTS", slcf, app_rights);
-    ANALYZE_STR_CONFIG_LENGTH("PASSENGER_USER", slcf, user);
-    ANALYZE_STR_CONFIG_LENGTH("PASSENGER_GROUP", slcf, group);
-    ANALYZE_STR_CONFIG_LENGTH("UNION_STATION_KEY", slcf, union_station_key);
-    
-    end = ngx_snprintf(min_instances_string,
-                       sizeof(min_instances_string) - 1,
-                       "%d",
-                       (slcf->min_instances == (ngx_int_t) -1) ? 1 : slcf->min_instances);
-    *end = '\0';
-    len += sizeof("PASSENGER_MIN_INSTANCES") +
-           ngx_strlen(min_instances_string) + 1;
 
-    end = ngx_snprintf(max_requests_string,
-                       sizeof(max_requests_string) - 1,
-                       "%d",
-                       (slcf->max_requests == (ngx_int_t) -1) ? 0 : slcf->max_requests);
-    *end = '\0';
-    len += sizeof("PASSENGER_MAX_REQUESTS") +
-           ngx_strlen(max_requests_string) + 1;
-    
-    end = ngx_snprintf(max_preloader_idle_time_string,
-                       sizeof(max_preloader_idle_time_string) - 1,
-                       "%d",
-                       (slcf->max_preloader_idle_time == (ngx_int_t) -1) ?
-                           -1 : slcf->max_preloader_idle_time);
-    *end = '\0';
-    len += sizeof("PASSENGER_MAX_PRELOADER_IDLE_TIME") +
-           ngx_strlen(max_preloader_idle_time_string) + 1;
-    
     if (slcf->union_station_filters != NGX_CONF_UNSET_PTR && slcf->union_station_filters->nelts > 0) {
         len += sizeof("UNION_STATION_FILTERS");
         
@@ -690,69 +584,12 @@ create_request(ngx_http_request_t *r)
     
 
     /* Build Passenger application pool option headers. */
-    SERIALIZE_BOOLEAN_CONFIG_DATA("PASSENGER_FRIENDLY_ERROR_PAGES",
-                                  slcf, friendly_error_pages);
-    SERIALIZE_BOOLEAN_CONFIG_DATA("UNION_STATION_SUPPORT",
-                                  slcf, union_station_support);
-    SERIALIZE_BOOLEAN_CONFIG_DATA("PASSENGER_DEBUGGER",
-                                  slcf, debugger);
-    SERIALIZE_BOOLEAN_CONFIG_DATA("PASSENGER_SHOW_VERSION_IN_HEADER",
-                                  slcf, show_version_in_header);
-    
-    if (slcf->ruby.data != NULL) {
-        SERIALIZE_STR_CONFIG_DATA("PASSENGER_RUBY",
-                                  slcf, ruby);
-    } else {
-        b->last = ngx_copy(b->last, "PASSENGER_RUBY",
-                           sizeof("PASSENGER_RUBY"));
-        b->last = ngx_copy(b->last, passenger_main_conf.default_ruby.data,
-                           passenger_main_conf.default_ruby.len + 1);
-    }
-    SERIALIZE_STR_CONFIG_DATA("PASSENGER_PYTHON",
-                              slcf, python);
-
-    b->last = ngx_copy(b->last, "PASSENGER_ENV",
-                       sizeof("PASSENGER_ENV"));
-    b->last = ngx_copy(b->last, slcf->environment.data,
-                       slcf->environment.len + 1);
-
-    b->last = ngx_copy(b->last, "PASSENGER_SPAWN_METHOD",
-                       sizeof("PASSENGER_SPAWN_METHOD"));
-    b->last = ngx_copy(b->last, slcf->spawn_method.data,
-                       slcf->spawn_method.len + 1);
-
-    SERIALIZE_STR_CONFIG_DATA("PASSENGER_APP_GROUP_NAME",
-                              slcf, app_group_name);
-    SERIALIZE_STR_CONFIG_DATA("PASSENGER_APP_ROOT",
-                              slcf, app_root);
-    SERIALIZE_STR_CONFIG_DATA("PASSENGER_APP_RIGHTS",
-                              slcf, app_rights);
-    SERIALIZE_STR_CONFIG_DATA("PASSENGER_USER",
-                              slcf, user);
-    SERIALIZE_STR_CONFIG_DATA("PASSENGER_GROUP",
-                              slcf, group);
-    SERIALIZE_STR_CONFIG_DATA("UNION_STATION_KEY",
-                              slcf, union_station_key);
+    b->last = ngx_copy(b->last, slcf->options_cache.data, slcf->options_cache.len);
 
     b->last = ngx_copy(b->last, "PASSENGER_APP_TYPE",
                        sizeof("PASSENGER_APP_TYPE"));
     b->last = ngx_copy(b->last, app_type_string, app_type_string_len);
 
-    b->last = ngx_copy(b->last, "PASSENGER_MIN_INSTANCES",
-                       sizeof("PASSENGER_MIN_INSTANCES"));
-    b->last = ngx_copy(b->last, min_instances_string,
-                       ngx_strlen(min_instances_string) + 1);
-
-    b->last = ngx_copy(b->last, "PASSENGER_MAX_REQUESTS",
-                       sizeof("PASSENGER_MAX_REQUESTS"));
-    b->last = ngx_copy(b->last, max_requests_string,
-                       ngx_strlen(max_requests_string) + 1);
-
-    b->last = ngx_copy(b->last, "PASSENGER_MAX_PRELOADER_IDLE_TIME",
-                       sizeof("PASSENGER_MAX_PRELOADER_IDLE_TIME"));
-    b->last = ngx_copy(b->last, max_preloader_idle_time_string,
-                       ngx_strlen(max_preloader_idle_time_string) + 1);
-
     if (slcf->union_station_filters != NGX_CONF_UNSET_PTR && slcf->union_station_filters->nelts > 0) {
         b->last = ngx_copy(b->last, "UNION_STATION_FILTERS",
                            sizeof("UNION_STATION_FILTERS"));