passenger 5.1.12 → 5.2.0

data/src/nginx_module/{CreateLocationConfig.c.cxxcodebuilder → LocationConfig/AutoGeneratedCreateFunction.c.cxxcodebuilder}

@@ -34,51 +34,64 @@ def main
   separator
 
   comment %q{
-    CreateLocationConfig.c is automatically generated from CreateLocationConfig.c.cxxcodebuilder,
+    LocationConfig/AutoGenereatedCreateFunction.c is automatically generated from
+    LocationConfig/AutoGenereatedCreateFunction.c.cxxcodebuilder,
     using definitions from src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.
-    Edits to CreateLocationConfig.c will be lost.
+    Edits to LocationConfig/AutoGenereatedCreateFunction.c will be lost.
 
-    To update CreateLocationConfig.c:
+    To update LocationConfig/AutoGenereatedCreateFunction.c:
       rake nginx
 
-    To force regeneration of CreateLocationConfig.c:
-      rm -f src/nginx_module/CreateLocationConfig.c
-      rake src/nginx_module/CreateLocationConfig.c
+    To force regeneration of LocationConfig/AutoGenereatedCreateFunction.c:
+      rm -f src/nginx_module/LocationConfig/AutoGenereatedCreateFunction.c
+      rake src/nginx_module/LocationConfig/AutoGenereatedCreateFunction.c
   }
 
   separator
 
-  function('void generated_set_conf_part(passenger_loc_conf_t  *conf)') do
-    filter_eligible_options(LOCATION_CONFIGURATION_OPTIONS).each do |option|
+  function('static void passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *conf)') do
+    filter_options_eligible_for_value_definitions(NGINX_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;
+          conf->#{value_struct_field_for(option)}.data = NULL;
+          conf->#{value_struct_field_for(option)}.len  = 0;
         }
       elsif option[:type] == :integer || option[:type] == :flag
         add_code %Q{
-          conf->#{struct_field_for(option)} = NGX_CONF_UNSET;
+          conf->#{value_struct_field_for(option)} = NGX_CONF_UNSET;
         }
       elsif option[:type] == :uinteger
         add_code %Q{
-          conf->#{struct_field_for(option)} = NGX_CONF_UNSET_UINT;
+          conf->#{value_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;
+          conf->#{value_struct_field_for(option)} = NGX_CONF_UNSET_PTR;
         }
       elsif option[:type] == :string_keyval
         add_code %Q{
-          conf->#{struct_field_for(option)} = NULL;
+          conf->#{value_struct_field_for(option)} = NULL;
         }
       else
         raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}"
       end
     end
+
+    separator
+
+    filter_options_eligible_for_source_location_definitions(NGINX_CONFIGURATION_OPTIONS).each do |option|
+      field = source_location_struct_field_for(option)
+      add_code %Q{
+        conf->#{field}_source_file.data = NULL;
+        conf->#{field}_source_file.len = 0;
+        conf->#{field}_source_line = 0;
+        conf->#{field}_explicitly_set = 0;
+      }
+    end
   end
 end
 
-def filter_eligible_options(options)
+def filter_options_eligible_for_value_definitions(options)
   options.reject do |option|
     option[:alias_for] ||
       option.fetch(:field, true).nil? ||
@@ -88,12 +101,25 @@ def filter_eligible_options(options)
   end
 end
 
-def struct_field_for(option)
+def filter_options_eligible_for_source_location_definitions(options)
+  options.reject do |option|
+    option[:alias_for] ||
+      option.fetch(:field, true).nil? ||
+      option[:struct] == 'NGX_HTTP_MAIN_CONF_OFFSET'
+  end
+end
+
+def value_struct_field_for(option)
   if option.has_key?(:field)
-    option[:field]
+    option[:field].to_s
   else
     option[:name].sub(/^passenger_/, '')
   end
 end
 
+def source_location_struct_field_for(option)
+  result = value_struct_field_for(option)
+  result.gsub('.', '_')
+end
+
 main

data/src/nginx_module/{CacheLocationConfig.c → LocationConfig/AutoGeneratedHeaderSerialization.c}

@@ -25,22 +25,23 @@
  */
 
 /*
- * CacheLocationConfig.c is automatically generated from CacheLocationConfig.c.cxxcodebuilder,
+ * LocationConfig/AutoGeneratedHeaderSerialization.c is automatically generated from
+ * LocationConfig/AutoGeneratedHeaderSerialization.c.cxxcodebuilder,
  * using definitions from src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.
- * Edits to CacheLocationConfig.c will be lost.
+ * Edits to LocationConfig/AutoGeneratedHeaderSerialization.c will be lost.
  *
- * To update CacheLocationConfig.c:
+ * To update LocationConfig/AutoGeneratedHeaderSerialization.c:
  *   rake nginx
  *
- * To force regeneration of CacheLocationConfig.c:
- *   rm -f src/nginx_module/CacheLocationConfig.c
- *   rake src/nginx_module/CacheLocationConfig.c
+ * To force regeneration of LocationConfig/AutoGeneratedHeaderSerialization.c:
+ *   rm -f src/nginx_module/LocationConfig/AutoGeneratedHeaderSerialization.c
+ *   rake src/nginx_module/LocationConfig/AutoGeneratedHeaderSerialization.c
  */
 /*
  * 0: NGX_ERROR, 1: OK
  */
-int
-generated_cache_location_part(ngx_conf_t *cf, passenger_loc_conf_t *conf) {
+static int
+passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_loc_conf_t *conf) {
     size_t len = 0;
     u_char int_buf[32], *end, *buf, *pos;
 
@@ -48,229 +49,216 @@ generated_cache_location_part(ngx_conf_t *cf, passenger_loc_conf_t *conf) {
      * Calculate lengths
      */
 
-    if (conf->app_file_descriptor_ulimit != NGX_CONF_UNSET_UINT) {
+    if (conf->autogenerated.app_file_descriptor_ulimit != NGX_CONF_UNSET_UINT) {
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
             "%ui",
-            conf->app_file_descriptor_ulimit);
+            conf->autogenerated.app_file_descriptor_ulimit);
         len += sizeof("!~PASSENGER_APP_FILE_DESCRIPTOR_ULIMIT: ") - 1;
         len += end - int_buf;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->ruby.data != NULL) {
+    if (conf->autogenerated.ruby.data != NULL) {
         len += sizeof("!~PASSENGER_RUBY: ") - 1;
-        len += conf->ruby.len;
+        len += conf->autogenerated.ruby.len;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->python.data != NULL) {
+    if (conf->autogenerated.python.data != NULL) {
         len += sizeof("!~PASSENGER_PYTHON: ") - 1;
-        len += conf->python.len;
+        len += conf->autogenerated.python.len;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->nodejs.data != NULL) {
+    if (conf->autogenerated.nodejs.data != NULL) {
         len += sizeof("!~PASSENGER_NODEJS: ") - 1;
-        len += conf->nodejs.len;
+        len += conf->autogenerated.nodejs.len;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->meteor_app_settings.data != NULL) {
+    if (conf->autogenerated.meteor_app_settings.data != NULL) {
         len += sizeof("!~PASSENGER_METEOR_APP_SETTINGS: ") - 1;
-        len += conf->meteor_app_settings.len;
+        len += conf->autogenerated.meteor_app_settings.len;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->environment.data != NULL) {
+    if (conf->autogenerated.environment.data != NULL) {
         len += sizeof("!~PASSENGER_APP_ENV: ") - 1;
-        len += conf->environment.len;
+        len += conf->autogenerated.environment.len;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->friendly_error_pages != NGX_CONF_UNSET) {
+    if (conf->autogenerated.friendly_error_pages != NGX_CONF_UNSET) {
         len += sizeof("!~PASSENGER_FRIENDLY_ERROR_PAGES: ") - 1;
-        len += conf->friendly_error_pages
+        len += conf->autogenerated.friendly_error_pages
             ? sizeof("t\r\n") - 1
             : sizeof("f\r\n") - 1;
     }
 
-    if (conf->min_instances != NGX_CONF_UNSET) {
+    if (conf->autogenerated.min_instances != NGX_CONF_UNSET_UINT) {
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
-            "%d",
-            conf->min_instances);
+            "%ui",
+            conf->autogenerated.min_instances);
         len += sizeof("!~PASSENGER_MIN_PROCESSES: ") - 1;
         len += end - int_buf;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->max_instances_per_app != NGX_CONF_UNSET) {
+    if (conf->autogenerated.max_instances_per_app != NGX_CONF_UNSET_UINT) {
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
-            "%d",
-            conf->max_instances_per_app);
+            "%ui",
+            conf->autogenerated.max_instances_per_app);
         len += sizeof("!~PASSENGER_MAX_PROCESSES: ") - 1;
         len += end - int_buf;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->max_requests != NGX_CONF_UNSET) {
+    if (conf->autogenerated.max_requests != NGX_CONF_UNSET_UINT) {
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
-            "%d",
-            conf->max_requests);
+            "%ui",
+            conf->autogenerated.max_requests);
         len += sizeof("!~PASSENGER_MAX_REQUESTS: ") - 1;
         len += end - int_buf;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->start_timeout != NGX_CONF_UNSET) {
+    if (conf->autogenerated.start_timeout != NGX_CONF_UNSET) {
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
             "%d",
-            conf->start_timeout);
+            conf->autogenerated.start_timeout);
         len += sizeof("!~PASSENGER_START_TIMEOUT: ") - 1;
         len += end - int_buf;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->user.data != NULL) {
+    if (conf->autogenerated.user.data != NULL) {
         len += sizeof("!~PASSENGER_USER: ") - 1;
-        len += conf->user.len;
+        len += conf->autogenerated.user.len;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->group.data != NULL) {
+    if (conf->autogenerated.group.data != NULL) {
         len += sizeof("!~PASSENGER_GROUP: ") - 1;
-        len += conf->group.len;
+        len += conf->autogenerated.group.len;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->app_group_name.data != NULL) {
+    if (conf->autogenerated.app_group_name.data != NULL) {
         len += sizeof("!~PASSENGER_APP_GROUP_NAME: ") - 1;
-        len += conf->app_group_name.len;
+        len += conf->autogenerated.app_group_name.len;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->app_root.data != NULL) {
+    if (conf->autogenerated.app_root.data != NULL) {
         len += sizeof("!~PASSENGER_APP_ROOT: ") - 1;
-        len += conf->app_root.len;
+        len += conf->autogenerated.app_root.len;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->app_rights.data != NULL) {
+    if (conf->autogenerated.app_rights.data != NULL) {
         len += sizeof("!~PASSENGER_APP_RIGHTS: ") - 1;
-        len += conf->app_rights.len;
+        len += conf->autogenerated.app_rights.len;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->union_station_support != NGX_CONF_UNSET) {
-        len += sizeof("!~UNION_STATION_SUPPORT: ") - 1;
-        len += conf->union_station_support
-            ? sizeof("t\r\n") - 1
-            : sizeof("f\r\n") - 1;
-    }
-
-    if (conf->debugger != NGX_CONF_UNSET) {
+    if (conf->autogenerated.debugger != NGX_CONF_UNSET) {
         len += sizeof("!~PASSENGER_DEBUGGER: ") - 1;
-        len += conf->debugger
+        len += conf->autogenerated.debugger
             ? sizeof("t\r\n") - 1
             : sizeof("f\r\n") - 1;
     }
 
-    if (conf->max_preloader_idle_time != NGX_CONF_UNSET) {
+    if (conf->autogenerated.max_preloader_idle_time != NGX_CONF_UNSET) {
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
             "%d",
-            conf->max_preloader_idle_time);
+            conf->autogenerated.max_preloader_idle_time);
         len += sizeof("!~PASSENGER_MAX_PRELOADER_IDLE_TIME: ") - 1;
         len += end - int_buf;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->spawn_method.data != NULL) {
+    if (conf->autogenerated.spawn_method.data != NULL) {
         len += sizeof("!~PASSENGER_SPAWN_METHOD: ") - 1;
-        len += conf->spawn_method.len;
+        len += conf->autogenerated.spawn_method.len;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->load_shell_envvars != NGX_CONF_UNSET) {
+    if (conf->autogenerated.load_shell_envvars != NGX_CONF_UNSET) {
         len += sizeof("!~PASSENGER_LOAD_SHELL_ENVVARS: ") - 1;
-        len += conf->load_shell_envvars
+        len += conf->autogenerated.load_shell_envvars
             ? sizeof("t\r\n") - 1
             : sizeof("f\r\n") - 1;
     }
 
-    if (conf->union_station_key.data != NULL) {
-        len += sizeof("!~UNION_STATION_KEY: ") - 1;
-        len += conf->union_station_key.len;
-        len += sizeof("\r\n") - 1;
-    }
-
-    if (conf->max_request_queue_size != NGX_CONF_UNSET) {
+    if (conf->autogenerated.max_request_queue_size != NGX_CONF_UNSET_UINT) {
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
-            "%d",
-            conf->max_request_queue_size);
+            "%ui",
+            conf->autogenerated.max_request_queue_size);
         len += sizeof("!~PASSENGER_MAX_REQUEST_QUEUE_SIZE: ") - 1;
         len += end - int_buf;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->request_queue_overflow_status_code != NGX_CONF_UNSET) {
+    if (conf->autogenerated.request_queue_overflow_status_code != NGX_CONF_UNSET) {
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
             "%d",
-            conf->request_queue_overflow_status_code);
+            conf->autogenerated.request_queue_overflow_status_code);
         len += sizeof("!~PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE: ") - 1;
         len += end - int_buf;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->restart_dir.data != NULL) {
+    if (conf->autogenerated.restart_dir.data != NULL) {
         len += sizeof("!~PASSENGER_RESTART_DIR: ") - 1;
-        len += conf->restart_dir.len;
+        len += conf->autogenerated.restart_dir.len;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->startup_file.data != NULL) {
+    if (conf->autogenerated.startup_file.data != NULL) {
         len += sizeof("!~PASSENGER_STARTUP_FILE: ") - 1;
-        len += conf->startup_file.len;
+        len += conf->autogenerated.startup_file.len;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->sticky_sessions != NGX_CONF_UNSET) {
+    if (conf->autogenerated.sticky_sessions != NGX_CONF_UNSET) {
         len += sizeof("!~PASSENGER_STICKY_SESSIONS: ") - 1;
-        len += conf->sticky_sessions
+        len += conf->autogenerated.sticky_sessions
             ? sizeof("t\r\n") - 1
             : sizeof("f\r\n") - 1;
     }
 
-    if (conf->sticky_sessions_cookie_name.data != NULL) {
+    if (conf->autogenerated.sticky_sessions_cookie_name.data != NULL) {
         len += sizeof("!~PASSENGER_STICKY_SESSIONS_COOKIE_NAME: ") - 1;
-        len += conf->sticky_sessions_cookie_name.len;
+        len += conf->autogenerated.sticky_sessions_cookie_name.len;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->vary_turbocache_by_cookie.data != NULL) {
+    if (conf->autogenerated.vary_turbocache_by_cookie.data != NULL) {
         len += sizeof("!~PASSENGER_VARY_TURBOCACHE_BY_COOKIE: ") - 1;
-        len += conf->vary_turbocache_by_cookie.len;
+        len += conf->autogenerated.vary_turbocache_by_cookie.len;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->abort_websockets_on_process_shutdown != NGX_CONF_UNSET) {
+    if (conf->autogenerated.abort_websockets_on_process_shutdown != NGX_CONF_UNSET) {
         len += sizeof("!~PASSENGER_ABORT_WEBSOCKETS_ON_PROCESS_SHUTDOWN: ") - 1;
-        len += conf->abort_websockets_on_process_shutdown
+        len += conf->autogenerated.abort_websockets_on_process_shutdown
             ? sizeof("t\r\n") - 1
             : sizeof("f\r\n") - 1;
     }
 
-    if (conf->force_max_concurrent_requests_per_process != NGX_CONF_UNSET) {
+    if (conf->autogenerated.force_max_concurrent_requests_per_process != NGX_CONF_UNSET) {
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
             "%d",
-            conf->force_max_concurrent_requests_per_process);
+            conf->autogenerated.force_max_concurrent_requests_per_process);
         len += sizeof("!~PASSENGER_FORCE_MAX_CONCURRENT_REQUESTS_PER_PROCESS: ") - 1;
         len += end - int_buf;
         len += sizeof("\r\n") - 1;
@@ -283,312 +271,292 @@ generated_cache_location_part(ngx_conf_t *cf, passenger_loc_conf_t *conf) {
         return 0;
     }
 
-    if (conf->app_file_descriptor_ulimit != NGX_CONF_UNSET_UINT) {
+    if (conf->autogenerated.app_file_descriptor_ulimit != NGX_CONF_UNSET_UINT) {
         pos = ngx_copy(pos,
             "!~PASSENGER_APP_FILE_DESCRIPTOR_ULIMIT: ",
             sizeof("!~PASSENGER_APP_FILE_DESCRIPTOR_ULIMIT: ") - 1);
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
             "%ui",
-            conf->app_file_descriptor_ulimit);
+            conf->autogenerated.app_file_descriptor_ulimit);
         pos = ngx_copy(pos, int_buf, end - int_buf);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->ruby.data != NULL) {
+    if (conf->autogenerated.ruby.data != NULL) {
         pos = ngx_copy(pos,
             "!~PASSENGER_RUBY: ",
             sizeof("!~PASSENGER_RUBY: ") - 1);
         pos = ngx_copy(pos,
-            conf->ruby.data,
-            conf->ruby.len);
+            conf->autogenerated.ruby.data,
+            conf->autogenerated.ruby.len);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->python.data != NULL) {
+    if (conf->autogenerated.python.data != NULL) {
         pos = ngx_copy(pos,
             "!~PASSENGER_PYTHON: ",
             sizeof("!~PASSENGER_PYTHON: ") - 1);
         pos = ngx_copy(pos,
-            conf->python.data,
-            conf->python.len);
+            conf->autogenerated.python.data,
+            conf->autogenerated.python.len);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->nodejs.data != NULL) {
+    if (conf->autogenerated.nodejs.data != NULL) {
         pos = ngx_copy(pos,
             "!~PASSENGER_NODEJS: ",
             sizeof("!~PASSENGER_NODEJS: ") - 1);
         pos = ngx_copy(pos,
-            conf->nodejs.data,
-            conf->nodejs.len);
+            conf->autogenerated.nodejs.data,
+            conf->autogenerated.nodejs.len);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->meteor_app_settings.data != NULL) {
+    if (conf->autogenerated.meteor_app_settings.data != NULL) {
         pos = ngx_copy(pos,
             "!~PASSENGER_METEOR_APP_SETTINGS: ",
             sizeof("!~PASSENGER_METEOR_APP_SETTINGS: ") - 1);
         pos = ngx_copy(pos,
-            conf->meteor_app_settings.data,
-            conf->meteor_app_settings.len);
+            conf->autogenerated.meteor_app_settings.data,
+            conf->autogenerated.meteor_app_settings.len);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->environment.data != NULL) {
+    if (conf->autogenerated.environment.data != NULL) {
         pos = ngx_copy(pos,
             "!~PASSENGER_APP_ENV: ",
             sizeof("!~PASSENGER_APP_ENV: ") - 1);
         pos = ngx_copy(pos,
-            conf->environment.data,
-            conf->environment.len);
+            conf->autogenerated.environment.data,
+            conf->autogenerated.environment.len);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->friendly_error_pages != NGX_CONF_UNSET) {
+    if (conf->autogenerated.friendly_error_pages != NGX_CONF_UNSET) {
         pos = ngx_copy(pos,
             "!~PASSENGER_FRIENDLY_ERROR_PAGES: ",
             sizeof("!~PASSENGER_FRIENDLY_ERROR_PAGES: ") - 1);
-        if (conf->friendly_error_pages) {
+        if (conf->autogenerated.friendly_error_pages) {
             pos = ngx_copy(pos, "t\r\n", sizeof("t\r\n") - 1);
         } else {
             pos = ngx_copy(pos, "f\r\n", sizeof("f\r\n") - 1);
         }
     }
 
-    if (conf->min_instances != NGX_CONF_UNSET) {
+    if (conf->autogenerated.min_instances != NGX_CONF_UNSET_UINT) {
         pos = ngx_copy(pos,
             "!~PASSENGER_MIN_PROCESSES: ",
             sizeof("!~PASSENGER_MIN_PROCESSES: ") - 1);
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
-            "%d",
-            conf->min_instances);
+            "%ui",
+            conf->autogenerated.min_instances);
         pos = ngx_copy(pos, int_buf, end - int_buf);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->max_instances_per_app != NGX_CONF_UNSET) {
+    if (conf->autogenerated.max_instances_per_app != NGX_CONF_UNSET_UINT) {
         pos = ngx_copy(pos,
             "!~PASSENGER_MAX_PROCESSES: ",
             sizeof("!~PASSENGER_MAX_PROCESSES: ") - 1);
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
-            "%d",
-            conf->max_instances_per_app);
+            "%ui",
+            conf->autogenerated.max_instances_per_app);
         pos = ngx_copy(pos, int_buf, end - int_buf);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->max_requests != NGX_CONF_UNSET) {
+    if (conf->autogenerated.max_requests != NGX_CONF_UNSET_UINT) {
         pos = ngx_copy(pos,
             "!~PASSENGER_MAX_REQUESTS: ",
             sizeof("!~PASSENGER_MAX_REQUESTS: ") - 1);
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
-            "%d",
-            conf->max_requests);
+            "%ui",
+            conf->autogenerated.max_requests);
         pos = ngx_copy(pos, int_buf, end - int_buf);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->start_timeout != NGX_CONF_UNSET) {
+    if (conf->autogenerated.start_timeout != NGX_CONF_UNSET) {
         pos = ngx_copy(pos,
             "!~PASSENGER_START_TIMEOUT: ",
             sizeof("!~PASSENGER_START_TIMEOUT: ") - 1);
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
             "%d",
-            conf->start_timeout);
+            conf->autogenerated.start_timeout);
         pos = ngx_copy(pos, int_buf, end - int_buf);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->user.data != NULL) {
+    if (conf->autogenerated.user.data != NULL) {
         pos = ngx_copy(pos,
             "!~PASSENGER_USER: ",
             sizeof("!~PASSENGER_USER: ") - 1);
         pos = ngx_copy(pos,
-            conf->user.data,
-            conf->user.len);
+            conf->autogenerated.user.data,
+            conf->autogenerated.user.len);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->group.data != NULL) {
+    if (conf->autogenerated.group.data != NULL) {
         pos = ngx_copy(pos,
             "!~PASSENGER_GROUP: ",
             sizeof("!~PASSENGER_GROUP: ") - 1);
         pos = ngx_copy(pos,
-            conf->group.data,
-            conf->group.len);
+            conf->autogenerated.group.data,
+            conf->autogenerated.group.len);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->app_group_name.data != NULL) {
+    if (conf->autogenerated.app_group_name.data != NULL) {
         pos = ngx_copy(pos,
             "!~PASSENGER_APP_GROUP_NAME: ",
             sizeof("!~PASSENGER_APP_GROUP_NAME: ") - 1);
         pos = ngx_copy(pos,
-            conf->app_group_name.data,
-            conf->app_group_name.len);
+            conf->autogenerated.app_group_name.data,
+            conf->autogenerated.app_group_name.len);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->app_root.data != NULL) {
+    if (conf->autogenerated.app_root.data != NULL) {
         pos = ngx_copy(pos,
             "!~PASSENGER_APP_ROOT: ",
             sizeof("!~PASSENGER_APP_ROOT: ") - 1);
         pos = ngx_copy(pos,
-            conf->app_root.data,
-            conf->app_root.len);
+            conf->autogenerated.app_root.data,
+            conf->autogenerated.app_root.len);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->app_rights.data != NULL) {
+    if (conf->autogenerated.app_rights.data != NULL) {
         pos = ngx_copy(pos,
             "!~PASSENGER_APP_RIGHTS: ",
             sizeof("!~PASSENGER_APP_RIGHTS: ") - 1);
         pos = ngx_copy(pos,
-            conf->app_rights.data,
-            conf->app_rights.len);
+            conf->autogenerated.app_rights.data,
+            conf->autogenerated.app_rights.len);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->union_station_support != NGX_CONF_UNSET) {
-        pos = ngx_copy(pos,
-            "!~UNION_STATION_SUPPORT: ",
-            sizeof("!~UNION_STATION_SUPPORT: ") - 1);
-        if (conf->union_station_support) {
-            pos = ngx_copy(pos, "t\r\n", sizeof("t\r\n") - 1);
-        } else {
-            pos = ngx_copy(pos, "f\r\n", sizeof("f\r\n") - 1);
-        }
-    }
-
-    if (conf->debugger != NGX_CONF_UNSET) {
+    if (conf->autogenerated.debugger != NGX_CONF_UNSET) {
         pos = ngx_copy(pos,
             "!~PASSENGER_DEBUGGER: ",
             sizeof("!~PASSENGER_DEBUGGER: ") - 1);
-        if (conf->debugger) {
+        if (conf->autogenerated.debugger) {
             pos = ngx_copy(pos, "t\r\n", sizeof("t\r\n") - 1);
         } else {
             pos = ngx_copy(pos, "f\r\n", sizeof("f\r\n") - 1);
         }
     }
 
-    if (conf->max_preloader_idle_time != NGX_CONF_UNSET) {
+    if (conf->autogenerated.max_preloader_idle_time != NGX_CONF_UNSET) {
         pos = ngx_copy(pos,
             "!~PASSENGER_MAX_PRELOADER_IDLE_TIME: ",
             sizeof("!~PASSENGER_MAX_PRELOADER_IDLE_TIME: ") - 1);
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
             "%d",
-            conf->max_preloader_idle_time);
+            conf->autogenerated.max_preloader_idle_time);
         pos = ngx_copy(pos, int_buf, end - int_buf);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->spawn_method.data != NULL) {
+    if (conf->autogenerated.spawn_method.data != NULL) {
         pos = ngx_copy(pos,
             "!~PASSENGER_SPAWN_METHOD: ",
             sizeof("!~PASSENGER_SPAWN_METHOD: ") - 1);
         pos = ngx_copy(pos,
-            conf->spawn_method.data,
-            conf->spawn_method.len);
+            conf->autogenerated.spawn_method.data,
+            conf->autogenerated.spawn_method.len);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->load_shell_envvars != NGX_CONF_UNSET) {
+    if (conf->autogenerated.load_shell_envvars != NGX_CONF_UNSET) {
         pos = ngx_copy(pos,
             "!~PASSENGER_LOAD_SHELL_ENVVARS: ",
             sizeof("!~PASSENGER_LOAD_SHELL_ENVVARS: ") - 1);
-        if (conf->load_shell_envvars) {
+        if (conf->autogenerated.load_shell_envvars) {
             pos = ngx_copy(pos, "t\r\n", sizeof("t\r\n") - 1);
         } else {
             pos = ngx_copy(pos, "f\r\n", sizeof("f\r\n") - 1);
         }
     }
 
-    if (conf->union_station_key.data != NULL) {
-        pos = ngx_copy(pos,
-            "!~UNION_STATION_KEY: ",
-            sizeof("!~UNION_STATION_KEY: ") - 1);
-        pos = ngx_copy(pos,
-            conf->union_station_key.data,
-            conf->union_station_key.len);
-        pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
-    }
-    if (conf->max_request_queue_size != NGX_CONF_UNSET) {
+    if (conf->autogenerated.max_request_queue_size != NGX_CONF_UNSET_UINT) {
         pos = ngx_copy(pos,
             "!~PASSENGER_MAX_REQUEST_QUEUE_SIZE: ",
             sizeof("!~PASSENGER_MAX_REQUEST_QUEUE_SIZE: ") - 1);
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
-            "%d",
-            conf->max_request_queue_size);
+            "%ui",
+            conf->autogenerated.max_request_queue_size);
         pos = ngx_copy(pos, int_buf, end - int_buf);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->request_queue_overflow_status_code != NGX_CONF_UNSET) {
+    if (conf->autogenerated.request_queue_overflow_status_code != NGX_CONF_UNSET) {
         pos = ngx_copy(pos,
             "!~PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE: ",
             sizeof("!~PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE: ") - 1);
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
             "%d",
-            conf->request_queue_overflow_status_code);
+            conf->autogenerated.request_queue_overflow_status_code);
         pos = ngx_copy(pos, int_buf, end - int_buf);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->restart_dir.data != NULL) {
+    if (conf->autogenerated.restart_dir.data != NULL) {
         pos = ngx_copy(pos,
             "!~PASSENGER_RESTART_DIR: ",
             sizeof("!~PASSENGER_RESTART_DIR: ") - 1);
         pos = ngx_copy(pos,
-            conf->restart_dir.data,
-            conf->restart_dir.len);
+            conf->autogenerated.restart_dir.data,
+            conf->autogenerated.restart_dir.len);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->startup_file.data != NULL) {
+    if (conf->autogenerated.startup_file.data != NULL) {
         pos = ngx_copy(pos,
             "!~PASSENGER_STARTUP_FILE: ",
             sizeof("!~PASSENGER_STARTUP_FILE: ") - 1);
         pos = ngx_copy(pos,
-            conf->startup_file.data,
-            conf->startup_file.len);
+            conf->autogenerated.startup_file.data,
+            conf->autogenerated.startup_file.len);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->sticky_sessions != NGX_CONF_UNSET) {
+    if (conf->autogenerated.sticky_sessions != NGX_CONF_UNSET) {
         pos = ngx_copy(pos,
             "!~PASSENGER_STICKY_SESSIONS: ",
             sizeof("!~PASSENGER_STICKY_SESSIONS: ") - 1);
-        if (conf->sticky_sessions) {
+        if (conf->autogenerated.sticky_sessions) {
             pos = ngx_copy(pos, "t\r\n", sizeof("t\r\n") - 1);
         } else {
             pos = ngx_copy(pos, "f\r\n", sizeof("f\r\n") - 1);
         }
     }
 
-    if (conf->sticky_sessions_cookie_name.data != NULL) {
+    if (conf->autogenerated.sticky_sessions_cookie_name.data != NULL) {
         pos = ngx_copy(pos,
             "!~PASSENGER_STICKY_SESSIONS_COOKIE_NAME: ",
             sizeof("!~PASSENGER_STICKY_SESSIONS_COOKIE_NAME: ") - 1);
         pos = ngx_copy(pos,
-            conf->sticky_sessions_cookie_name.data,
-            conf->sticky_sessions_cookie_name.len);
+            conf->autogenerated.sticky_sessions_cookie_name.data,
+            conf->autogenerated.sticky_sessions_cookie_name.len);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->vary_turbocache_by_cookie.data != NULL) {
+    if (conf->autogenerated.vary_turbocache_by_cookie.data != NULL) {
         pos = ngx_copy(pos,
             "!~PASSENGER_VARY_TURBOCACHE_BY_COOKIE: ",
             sizeof("!~PASSENGER_VARY_TURBOCACHE_BY_COOKIE: ") - 1);
         pos = ngx_copy(pos,
-            conf->vary_turbocache_by_cookie.data,
-            conf->vary_turbocache_by_cookie.len);
+            conf->autogenerated.vary_turbocache_by_cookie.data,
+            conf->autogenerated.vary_turbocache_by_cookie.len);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->abort_websockets_on_process_shutdown != NGX_CONF_UNSET) {
+    if (conf->autogenerated.abort_websockets_on_process_shutdown != NGX_CONF_UNSET) {
         pos = ngx_copy(pos,
             "!~PASSENGER_ABORT_WEBSOCKETS_ON_PROCESS_SHUTDOWN: ",
             sizeof("!~PASSENGER_ABORT_WEBSOCKETS_ON_PROCESS_SHUTDOWN: ") - 1);
-        if (conf->abort_websockets_on_process_shutdown) {
+        if (conf->autogenerated.abort_websockets_on_process_shutdown) {
             pos = ngx_copy(pos, "t\r\n", sizeof("t\r\n") - 1);
         } else {
             pos = ngx_copy(pos, "f\r\n", sizeof("f\r\n") - 1);
         }
     }
 
-    if (conf->force_max_concurrent_requests_per_process != NGX_CONF_UNSET) {
+    if (conf->autogenerated.force_max_concurrent_requests_per_process != NGX_CONF_UNSET) {
         pos = ngx_copy(pos,
             "!~PASSENGER_FORCE_MAX_CONCURRENT_REQUESTS_PER_PROCESS: ",
             sizeof("!~PASSENGER_FORCE_MAX_CONCURRENT_REQUESTS_PER_PROCESS: ") - 1);
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
             "%d",
-            conf->force_max_concurrent_requests_per_process);
+            conf->autogenerated.force_max_concurrent_requests_per_process);
         pos = ngx_copy(pos, int_buf, end - int_buf);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }