passenger 5.0.28 → 5.0.29

data/src/nginx_module/CreateLocationConfig.c.cxxcodebuilder

@@ -0,0 +1,98 @@
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2010-2016 Phusion Holding B.V.
+#
+#  "Passenger", "Phusion Passenger" and "Union Station" are registered
+#  trademarks of Phusion Holding B.V.
+#
+#  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.
+
+# This file uses the cxxcodebuilder API. Learn more at:
+# https://github.com/phusion/passenger/cxxcodebuilder
+
+require 'phusion_passenger/nginx/config_options'
+
+def main
+  set_indent_string '    '
+  comment copyright_header_for(__FILE__)
+
+  separator
+
+  comment %q{
+    CreateLocationConfig.c is automatically generated from CreateLocationConfig.c.cxxcodebuilder,
+    using definitions from src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.
+    Edits to CreateLocationConfig.c will be lost.
+
+    To update CreateLocationConfig.c:
+      rake nginx
+
+    To force regeneration of CreateLocationConfig.c:
+      rm -f src/nginx_module/CreateLocationConfig.c
+      rake src/nginx_module/CreateLocationConfig.c
+  }
+
+  separator
+
+  function('void generated_set_conf_part(passenger_loc_conf_t  *conf)') do
+    filter_eligible_options(LOCATION_CONFIGURATION_OPTIONS).each do |option|
+      if option[:type] == :string
+        add_code %Q{
+          conf->#{struct_field_for(option)}.data = NULL;
+          conf->#{struct_field_for(option)}.len  = 0;
+        }
+      elsif option[:type] == :integer || option[:type] == :flag
+        add_code %Q{
+          conf->#{struct_field_for(option)} = NGX_CONF_UNSET;
+        }
+      elsif option[:type] == :uinteger
+        add_code %Q{
+          conf->#{struct_field_for(option)} = NGX_CONF_UNSET_UINT;
+        }
+      elsif option[:type] == :string_array
+        add_code %Q{
+          conf->#{struct_field_for(option)} = NGX_CONF_UNSET_PTR;
+        }
+      elsif option[:type] == :string_keyval
+        add_code %Q{
+          conf->#{struct_field_for(option)} = NULL;
+        }
+      else
+        raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}"
+      end
+    end
+  end
+end
+
+def filter_eligible_options(options)
+  options.reject do |option|
+    option[:alias_for] ||
+      option.fetch(:field, true).nil? ||
+      option[:field].to_s =~ /\./ ||
+      option[:auto_generate_nginx_create_code] == false
+  end
+end
+
+def struct_field_for(option)
+  if option.has_key?(:field)
+    option[:field]
+  else
+    option[:name].sub(/^passenger_/, '')
+  end
+end
+
+main

data/src/nginx_module/LocationConfig.h

@@ -0,0 +1,97 @@
+/*
+ * Phusion Passenger - https://www.phusionpassenger.com/
+ * Copyright (c) 2010-2016 Phusion Holding B.V.
+ *
+ * "Passenger", "Phusion Passenger" and "Union Station" are registered
+ * trademarks of Phusion Holding B.V.
+ *
+ * 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.
+ */
+
+/*
+ * LocationConfig.h is automatically generated from LocationConfig.h.cxxcodebuilder,
+ * using definitions from src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.
+ * Edits to LocationConfig.h will be lost.
+ *
+ * To update LocationConfig.h:
+ *   rake nginx
+ *
+ * To force regeneration of LocationConfig.h:
+ *   rm -f src/nginx_module/LocationConfig.h
+ *   rake src/nginx_module/LocationConfig.h
+ */
+
+typedef struct {
+    ngx_http_upstream_conf_t upstream_config;
+    ngx_array_t *flushes;
+    ngx_array_t *headers_set_len;
+    ngx_array_t *headers_set;
+    ngx_hash_t   headers_set_hash;
+
+    /** Raw HTTP header data for this location are cached here. */
+    ngx_str_t    options_cache;
+    ngx_str_t    env_vars_cache;
+
+    ngx_int_t abort_websockets_on_process_shutdown;
+    ngx_uint_t app_file_descriptor_ulimit;
+    ngx_array_t *base_uris;
+    ngx_uint_t core_file_descriptor_ulimit;
+    ngx_int_t debugger;
+    ngx_int_t enabled;
+    ngx_array_t *env_vars;
+    ngx_int_t force_max_concurrent_requests_per_process;
+    ngx_int_t friendly_error_pages;
+    ngx_uint_t headers_hash_bucket_size;
+    ngx_uint_t headers_hash_max_size;
+    ngx_array_t *headers_source;
+    ngx_int_t load_shell_envvars;
+    ngx_int_t max_instances_per_app;
+    ngx_int_t max_preloader_idle_time;
+    ngx_int_t max_request_queue_size;
+    ngx_int_t max_requests;
+    ngx_int_t min_instances;
+    ngx_int_t request_queue_overflow_status_code;
+    ngx_int_t socket_backlog;
+    ngx_int_t start_timeout;
+    ngx_int_t sticky_sessions;
+    ngx_array_t *union_station_filters;
+    ngx_int_t union_station_support;
+    ngx_str_t app_group_name;
+    ngx_str_t app_rights;
+    ngx_str_t app_root;
+    ngx_str_t app_type;
+    ngx_str_t document_root;
+    ngx_str_t environment;
+    ngx_str_t group;
+    ngx_str_t meteor_app_settings;
+    ngx_str_t nodejs;
+    ngx_str_t python;
+    ngx_str_t restart_dir;
+    ngx_str_t ruby;
+    ngx_str_t spawn_method;
+    ngx_str_t startup_file;
+    ngx_str_t sticky_sessions_cookie_name;
+    ngx_str_t union_station_key;
+    ngx_str_t user;
+    ngx_str_t vary_turbocache_by_cookie;
+
+    #if (NGX_HTTP_CACHE)
+        ngx_http_complex_value_t cache_key;
+    #endif
+} passenger_loc_conf_t;

data/src/nginx_module/LocationConfig.h.cxxcodebuilder

@@ -0,0 +1,131 @@
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2010-2016 Phusion Holding B.V.
+#
+#  "Passenger", "Phusion Passenger" and "Union Station" are registered
+#  trademarks of Phusion Holding B.V.
+#
+#  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.
+
+# This file uses the cxxcodebuilder API. Learn more at:
+# https://github.com/phusion/passenger/cxxcodebuilder
+
+require 'phusion_passenger/nginx/config_options'
+
+def main
+  set_indent_string '    '
+  comment copyright_header_for(__FILE__)
+
+  separator
+
+  comment %q{
+    LocationConfig.h is automatically generated from LocationConfig.h.cxxcodebuilder,
+    using definitions from src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.
+    Edits to LocationConfig.h will be lost.
+
+    To update LocationConfig.h:
+      rake nginx
+
+    To force regeneration of LocationConfig.h:
+      rm -f src/nginx_module/LocationConfig.h
+      rake src/nginx_module/LocationConfig.h
+  }
+
+  separator
+
+  typedef_struct 'passenger_loc_conf_t' do
+    add_code %q{
+      ngx_http_upstream_conf_t upstream_config;
+      ngx_array_t *flushes;
+      ngx_array_t *headers_set_len;
+      ngx_array_t *headers_set;
+      ngx_hash_t   headers_set_hash;
+
+      /** Raw HTTP header data for this location are cached here. */
+      ngx_str_t    options_cache;
+      ngx_str_t    env_vars_cache;
+    }
+
+    separator
+
+    definitions.each do |definition|
+      field(definition[0])
+    end
+
+    separator
+
+    add_code %q{
+      #if (NGX_HTTP_CACHE)
+        ngx_http_complex_value_t cache_key;
+      #endif
+    }
+  end
+end
+
+def filter_eligible_options(options)
+  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)
+    option[:field].to_s
+  else
+    option[:name].sub(/^passenger_/, '')
+  end
+end
+
+# Returns [definition_source, estimated_size_on_x86_64, field_name]
+def definition_for(option)
+    field = struct_field_for(option)
+    case option[:type]
+    when :string
+        return ["ngx_str_t #{field}", 8 + 4, field]
+    when :integer, :flag
+        return ["ngx_int_t #{field}", 8, field]
+    when :uinteger
+        return ["ngx_uint_t #{field}", 8, field]
+    when :string_array, :string_keyval
+        return ["ngx_array_t *#{field}", 8, field];
+    else
+        raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}"
+    end
+end
+
+def definitions
+  @definitions ||= begin
+    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|
+        if d1[1] == d2[1]
+            # After sorting on size, sort alphabetically.
+            d1[2] <=> d2[2]
+        else
+            d1[1] <=> d2[1]
+        end
+    end
+  end
+end
+
+main

data/src/nginx_module/MergeLocationConfig.c

@@ -1,31 +1,31 @@
 /*
- *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 Phusion Holding B.V.
+ * Phusion Passenger - https://www.phusionpassenger.com/
+ * Copyright (c) 2010-2016 Phusion Holding B.V.
  *
- *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of Phusion Holding B.V.
+ * "Passenger", "Phusion Passenger" and "Union Station" are registered
+ * trademarks of Phusion Holding B.V.
  *
- *  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:
+ * 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 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.
+ * 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.
  */
 
 /*
- * MergeLocationConfig.c is automatically generated from MergeLocationConfig.c.erb,
+ * MergeLocationConfig.c is automatically generated from MergeLocationConfig.c.cxxcodebuilder,
  * using definitions from src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.
  * Edits to MergeLocationConfig.c will be lost.
  *
@@ -37,262 +37,141 @@
  *   rake src/nginx_module/MergeLocationConfig.c
  */
 
-/* 0: NGX_CONF_ERROR, 1: OK */
-int generated_merge_part(passenger_loc_conf_t *conf, passenger_loc_conf_t *prev, ngx_conf_t *cf) {
-
-
-
-	
-		ngx_conf_merge_value(conf->socket_backlog,
-			prev->socket_backlog,
-			NGX_CONF_UNSET);
-	
-
-	
-		ngx_conf_merge_uint_value(conf->core_file_descriptor_ulimit,
-			prev->core_file_descriptor_ulimit,
-			NGX_CONF_UNSET_UINT);
-	
-
-	
-		ngx_conf_merge_uint_value(conf->app_file_descriptor_ulimit,
-			prev->app_file_descriptor_ulimit,
-			NGX_CONF_UNSET_UINT);
-	
-
-	
-		ngx_conf_merge_value(conf->enabled,
-			prev->enabled,
-			NGX_CONF_UNSET);
-	
-
-	
-		ngx_conf_merge_str_value(conf->ruby,
-			prev->ruby,
-			NULL);
-	
-
-	
-		ngx_conf_merge_str_value(conf->python,
-			prev->python,
-			NULL);
-	
-
-	
-		ngx_conf_merge_str_value(conf->nodejs,
-			prev->nodejs,
-			NULL);
-	
-
-	
-		ngx_conf_merge_str_value(conf->meteor_app_settings,
-			prev->meteor_app_settings,
-			NULL);
-	
-
-	
-		ngx_conf_merge_str_value(conf->environment,
-			prev->environment,
-			NULL);
-	
-
-	
-		ngx_conf_merge_value(conf->friendly_error_pages,
-			prev->friendly_error_pages,
-			NGX_CONF_UNSET);
-	
-
-	
-		ngx_conf_merge_value(conf->min_instances,
-			prev->min_instances,
-			NGX_CONF_UNSET);
-	
-
-	
-		ngx_conf_merge_value(conf->max_instances_per_app,
-			prev->max_instances_per_app,
-			NGX_CONF_UNSET);
-	
-
-	
-		ngx_conf_merge_value(conf->max_requests,
-			prev->max_requests,
-			NGX_CONF_UNSET);
-	
-
-	
-		ngx_conf_merge_value(conf->start_timeout,
-			prev->start_timeout,
-			NGX_CONF_UNSET);
-	
-
-	
-		if (merge_string_array(cf, &prev->base_uris, &conf->base_uris) != NGX_OK) {
-			ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-				"cannot merge \"passenger_base_uri\" configurations");
-			return 0;
-		}
-	
-
-	
-		ngx_conf_merge_str_value(conf->document_root,
-			prev->document_root,
-			NULL);
-	
-
-	
-		ngx_conf_merge_str_value(conf->user,
-			prev->user,
-			NULL);
-	
-
-	
-		ngx_conf_merge_str_value(conf->group,
-			prev->group,
-			NULL);
-	
-
-	
-		ngx_conf_merge_str_value(conf->app_group_name,
-			prev->app_group_name,
-			NULL);
-	
-
-	
-		ngx_conf_merge_str_value(conf->app_root,
-			prev->app_root,
-			NULL);
-	
-
-	
-		ngx_conf_merge_str_value(conf->app_rights,
-			prev->app_rights,
-			NULL);
-	
-
-	
-		ngx_conf_merge_value(conf->union_station_support,
-			prev->union_station_support,
-			NGX_CONF_UNSET);
-	
-
-	
-		if (merge_string_array(cf, &prev->union_station_filters, &conf->union_station_filters) != NGX_OK) {
-			ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-				"cannot merge \"union_station_filter\" configurations");
-			return 0;
-		}
-	
-
-	
-		ngx_conf_merge_value(conf->debugger,
-			prev->debugger,
-			NGX_CONF_UNSET);
-	
-
-	
-		ngx_conf_merge_value(conf->max_preloader_idle_time,
-			prev->max_preloader_idle_time,
-			NGX_CONF_UNSET);
-	
-
-	
-		if (merge_string_keyval_table(cf, &prev->env_vars, &conf->env_vars) != NGX_OK) {
-			ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-				"cannot merge \"passenger_env_var\" configurations");
-			return 0;
-		}
-	
-
-	
-		ngx_conf_merge_uint_value(conf->headers_hash_max_size,
-			prev->headers_hash_max_size,
-			512);
-	
-
-	
-		ngx_conf_merge_uint_value(conf->headers_hash_bucket_size,
-			prev->headers_hash_bucket_size,
-			64);
-	
-
-	
-		ngx_conf_merge_str_value(conf->spawn_method,
-			prev->spawn_method,
-			NULL);
-	
-
-	
-		ngx_conf_merge_value(conf->load_shell_envvars,
-			prev->load_shell_envvars,
-			NGX_CONF_UNSET);
-	
-
-	
-		ngx_conf_merge_str_value(conf->union_station_key,
-			prev->union_station_key,
-			NULL);
-	
-
-	
-		ngx_conf_merge_value(conf->max_request_queue_size,
-			prev->max_request_queue_size,
-			NGX_CONF_UNSET);
-	
-
-	
-		ngx_conf_merge_value(conf->request_queue_overflow_status_code,
-			prev->request_queue_overflow_status_code,
-			NGX_CONF_UNSET);
-	
-
-	
-		ngx_conf_merge_str_value(conf->restart_dir,
-			prev->restart_dir,
-			NULL);
-	
-
-	
-		ngx_conf_merge_str_value(conf->app_type,
-			prev->app_type,
-			NULL);
-	
-
-	
-		ngx_conf_merge_str_value(conf->startup_file,
-			prev->startup_file,
-			NULL);
-	
-
-	
-		ngx_conf_merge_value(conf->sticky_sessions,
-			prev->sticky_sessions,
-			NGX_CONF_UNSET);
-	
-
-	
-		ngx_conf_merge_str_value(conf->sticky_sessions_cookie_name,
-			prev->sticky_sessions_cookie_name,
-			NULL);
-	
-
-	
-		ngx_conf_merge_str_value(conf->vary_turbocache_by_cookie,
-			prev->vary_turbocache_by_cookie,
-			NULL);
-	
-
-	
-		ngx_conf_merge_value(conf->abort_websockets_on_process_shutdown,
-			prev->abort_websockets_on_process_shutdown,
-			NGX_CONF_UNSET);
-	
-
-	
-		ngx_conf_merge_value(conf->force_max_concurrent_requests_per_process,
-			prev->force_max_concurrent_requests_per_process,
-			NGX_CONF_UNSET);
-	
-
-	return 1;
+/*
+ * 0: NGX_CONF_ERROR, 1: OK
+ */
+int
+generated_merge_part(passenger_loc_conf_t *conf, passenger_loc_conf_t *prev, ngx_conf_t *cf) {
+    ngx_conf_merge_value(conf->socket_backlog,
+        prev->socket_backlog,
+        NGX_CONF_UNSET);
+    ngx_conf_merge_uint_value(conf->core_file_descriptor_ulimit,
+        prev->core_file_descriptor_ulimit,
+        NGX_CONF_UNSET_UINT);
+    ngx_conf_merge_uint_value(conf->app_file_descriptor_ulimit,
+        prev->app_file_descriptor_ulimit,
+        NGX_CONF_UNSET_UINT);
+    ngx_conf_merge_value(conf->enabled,
+        prev->enabled,
+        NGX_CONF_UNSET);
+    ngx_conf_merge_str_value(conf->ruby,
+        prev->ruby,
+        NULL);
+    ngx_conf_merge_str_value(conf->python,
+        prev->python,
+        NULL);
+    ngx_conf_merge_str_value(conf->nodejs,
+        prev->nodejs,
+        NULL);
+    ngx_conf_merge_str_value(conf->meteor_app_settings,
+        prev->meteor_app_settings,
+        NULL);
+    ngx_conf_merge_str_value(conf->environment,
+        prev->environment,
+        NULL);
+    ngx_conf_merge_value(conf->friendly_error_pages,
+        prev->friendly_error_pages,
+        NGX_CONF_UNSET);
+    ngx_conf_merge_value(conf->min_instances,
+        prev->min_instances,
+        NGX_CONF_UNSET);
+    ngx_conf_merge_value(conf->max_instances_per_app,
+        prev->max_instances_per_app,
+        NGX_CONF_UNSET);
+    ngx_conf_merge_value(conf->max_requests,
+        prev->max_requests,
+        NGX_CONF_UNSET);
+    ngx_conf_merge_value(conf->start_timeout,
+        prev->start_timeout,
+        NGX_CONF_UNSET);
+    if (merge_string_array(cf, &prev->base_uris, &conf->base_uris) != NGX_OK) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+            "cannot merge \"passenger_base_uri\" configurations");
+        return 0;
+    }
+    ngx_conf_merge_str_value(conf->document_root,
+        prev->document_root,
+        NULL);
+    ngx_conf_merge_str_value(conf->user,
+        prev->user,
+        NULL);
+    ngx_conf_merge_str_value(conf->group,
+        prev->group,
+        NULL);
+    ngx_conf_merge_str_value(conf->app_group_name,
+        prev->app_group_name,
+        NULL);
+    ngx_conf_merge_str_value(conf->app_root,
+        prev->app_root,
+        NULL);
+    ngx_conf_merge_str_value(conf->app_rights,
+        prev->app_rights,
+        NULL);
+    ngx_conf_merge_value(conf->union_station_support,
+        prev->union_station_support,
+        NGX_CONF_UNSET);
+    if (merge_string_array(cf, &prev->union_station_filters, &conf->union_station_filters) != NGX_OK) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+            "cannot merge \"union_station_filter\" configurations");
+        return 0;
+    }
+    ngx_conf_merge_value(conf->debugger,
+        prev->debugger,
+        NGX_CONF_UNSET);
+    ngx_conf_merge_value(conf->max_preloader_idle_time,
+        prev->max_preloader_idle_time,
+        NGX_CONF_UNSET);
+    if (merge_string_keyval_table(cf, &prev->env_vars, &conf->env_vars) != NGX_OK) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+            "cannot merge \"passenger_env_var\" configurations");
+        return 0;
+    }
+    ngx_conf_merge_uint_value(conf->headers_hash_max_size,
+        prev->headers_hash_max_size,
+        512);
+    ngx_conf_merge_uint_value(conf->headers_hash_bucket_size,
+        prev->headers_hash_bucket_size,
+        64);
+    ngx_conf_merge_str_value(conf->spawn_method,
+        prev->spawn_method,
+        NULL);
+    ngx_conf_merge_value(conf->load_shell_envvars,
+        prev->load_shell_envvars,
+        NGX_CONF_UNSET);
+    ngx_conf_merge_str_value(conf->union_station_key,
+        prev->union_station_key,
+        NULL);
+    ngx_conf_merge_value(conf->max_request_queue_size,
+        prev->max_request_queue_size,
+        NGX_CONF_UNSET);
+    ngx_conf_merge_value(conf->request_queue_overflow_status_code,
+        prev->request_queue_overflow_status_code,
+        NGX_CONF_UNSET);
+    ngx_conf_merge_str_value(conf->restart_dir,
+        prev->restart_dir,
+        NULL);
+    ngx_conf_merge_str_value(conf->app_type,
+        prev->app_type,
+        NULL);
+    ngx_conf_merge_str_value(conf->startup_file,
+        prev->startup_file,
+        NULL);
+    ngx_conf_merge_value(conf->sticky_sessions,
+        prev->sticky_sessions,
+        NGX_CONF_UNSET);
+    ngx_conf_merge_str_value(conf->sticky_sessions_cookie_name,
+        prev->sticky_sessions_cookie_name,
+        NULL);
+    ngx_conf_merge_str_value(conf->vary_turbocache_by_cookie,
+        prev->vary_turbocache_by_cookie,
+        NULL);
+    ngx_conf_merge_value(conf->abort_websockets_on_process_shutdown,
+        prev->abort_websockets_on_process_shutdown,
+        NGX_CONF_UNSET);
+    ngx_conf_merge_value(conf->force_max_concurrent_requests_per_process,
+        prev->force_max_concurrent_requests_per_process,
+        NGX_CONF_UNSET);
+
+    return 1;
 }
+