passenger 5.1.12 → 5.2.0

data/src/cxx_supportlib/vendor-modified/modp_b64.cpp

@@ -90,9 +90,20 @@ size_t modp_b64_encode(char* dest, const char* str, size_t len)
 	*p = '\0';
 	return (size_t)(p - (modp_uint8_t*)dest);
 }
+
 #if defined(__x86_64__) || defined(__x86__)
 /* INTEL & AMD */
 
+#if defined(__has_feature)
+	#if __has_feature(address_sanitizer)
+		#define MODP_NO_SANITIZE(args) __attribute__((no_sanitize(args)))
+	#endif
+#endif
+#ifndef MODP_NO_SANITIZE
+	#define MODP_NO_SANITIZE(args)
+#endif
+
+MODP_NO_SANITIZE("undefined")
 size_t modp_b64_decode(char* dest, const char* src, size_t len)
 {
 	size_t i;

data/src/helper-scripts/rack-preloader.rb

@@ -38,7 +38,7 @@ module PhusionPassenger
 
     def self.format_exception(e)
       result = "#{e} (#{e.class})"
-      if !e.backtrace.empty?
+      if !(e.backtrace.nil? || e.backtrace.empty?)
         if e.respond_to?(:html?) && e.html?
           require 'erb' if !defined?(ERB)
           result << "\n<pre>  " << ERB::Util.h(e.backtrace.join("\n  ")) << "</pre>"

data/src/nginx_module/{ConfigurationCommands.c → ConfigGeneral/AutoGeneratedDefinitions.c}

@@ -25,56 +25,201 @@
  */
 
 /*
- * ConfigurationCommands.c is automatically generated from ConfigurationCommands.c.cxxcodebuilder,
+ * ConfigGeneral/AutoGeneratedDefinitions.c is automatically generated from
+ * ConfigGeneral/AutoGeneratedDefinitions.c.cxxcodebuilder,
  * using definitions from src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.
- * Edits to ConfigurationCommands.c will be lost.
+ * Edits to ConfigGeneral/AutoGeneratedDefinitions.c will be lost.
  *
- * To update ConfigurationCommands.c:
+ * To update ConfigGeneral/AutoGeneratedDefinitions.c:
  *   rake nginx
  *
- * To force regeneration of ConfigurationCommands.c:
- *   rm -f src/nginx_module/ConfigurationCommands.c
- *   rake src/nginx_module/ConfigurationCommands.c
+ * To force regeneration of ConfigGeneral/AutoGeneratedDefinitions.c:
+ *   rm -f src/nginx_module/ConfigGeneral/AutoGeneratedDefinitions.c
+ *   rake src/nginx_module/ConfigGeneral/AutoGeneratedDefinitions.c
  */
 
+{
+    ngx_string("passenger_root"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_root,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.root_dir),
+    NULL
+},
+{
+    ngx_string("passenger_ctl"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE2,
+    passenger_conf_set_ctl,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.ctl),
+    NULL
+},
+{
+    ngx_string("passenger_abort_on_startup_error"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_FLAG,
+    passenger_conf_set_abort_on_startup_error,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.abort_on_startup_error),
+    NULL
+},
+{
+    ngx_string("passenger_log_level"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_log_level,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.log_level),
+    NULL
+},
+{
+    ngx_string("passenger_log_file"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_log_file,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.log_file),
+    NULL
+},
+{
+    ngx_string("passenger_file_descriptor_log_file"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_file_descriptor_log_file,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.file_descriptor_log_file),
+    NULL
+},
+{
+    ngx_string("passenger_data_buffer_dir"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_data_buffer_dir,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.data_buffer_dir),
+    NULL
+},
 {
     ngx_string("passenger_socket_backlog"),
     NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
+    passenger_conf_set_socket_backlog,
     NGX_HTTP_MAIN_CONF_OFFSET,
-    offsetof(passenger_main_conf_t, socket_backlog),
+    offsetof(passenger_main_conf_t, autogenerated.socket_backlog),
     NULL
 },
 {
     ngx_string("passenger_core_file_descriptor_ulimit"),
     NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
+    passenger_conf_set_core_file_descriptor_ulimit,
     NGX_HTTP_MAIN_CONF_OFFSET,
-    offsetof(passenger_main_conf_t, core_file_descriptor_ulimit),
+    offsetof(passenger_main_conf_t, autogenerated.core_file_descriptor_ulimit),
     NULL
 },
 {
-    ngx_string("disable_security_update_check"),
+    ngx_string("passenger_disable_security_update_check"),
     NGX_HTTP_MAIN_CONF | NGX_CONF_FLAG,
-    ngx_conf_set_flag_slot,
+    passenger_conf_set_disable_security_update_check,
     NGX_HTTP_MAIN_CONF_OFFSET,
-    offsetof(passenger_main_conf_t, disable_security_update_check),
+    offsetof(passenger_main_conf_t, autogenerated.disable_security_update_check),
     NULL
 },
 {
-    ngx_string("security_update_check_proxy"),
+    ngx_string("passenger_security_update_check_proxy"),
     NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    passenger_conf_set_security_update_check_proxy,
     NGX_HTTP_MAIN_CONF_OFFSET,
-    offsetof(passenger_main_conf_t, security_update_check_proxy),
+    offsetof(passenger_main_conf_t, autogenerated.security_update_check_proxy),
+    NULL
+},
+{
+    ngx_string("passenger_pre_start"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_pre_start,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.prestart_uris),
+    NULL
+},
+{
+    ngx_string("passenger_instance_registry_dir"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_instance_registry_dir,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.instance_registry_dir),
+    NULL
+},
+{
+    ngx_string("passenger_turbocaching"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_FLAG,
+    passenger_conf_set_turbocaching,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.turbocaching),
+    NULL
+},
+{
+    ngx_string("passenger_user_switching"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_FLAG,
+    passenger_conf_set_user_switching,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.user_switching),
+    NULL
+},
+{
+    ngx_string("passenger_default_user"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_default_user,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.default_user),
+    NULL
+},
+{
+    ngx_string("passenger_default_group"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_default_group,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.default_group),
+    NULL
+},
+{
+    ngx_string("passenger_max_pool_size"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_max_pool_size,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.max_pool_size),
+    NULL
+},
+{
+    ngx_string("passenger_pool_idle_time"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_pool_idle_time,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.pool_idle_time),
+    NULL
+},
+{
+    ngx_string("passenger_response_buffer_high_watermark"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_response_buffer_high_watermark,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.response_buffer_high_watermark),
+    NULL
+},
+{
+    ngx_string("passenger_stat_throttle_rate"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_stat_throttle_rate,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.stat_throttle_rate),
+    NULL
+},
+{
+    ngx_string("passenger_show_version_in_header"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_FLAG,
+    passenger_conf_set_show_version_in_header,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.show_version_in_header),
     NULL
 },
 {
     ngx_string("passenger_app_file_descriptor_ulimit"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
+    passenger_conf_set_app_file_descriptor_ulimit,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, app_file_descriptor_ulimit),
+    offsetof(passenger_loc_conf_t, autogenerated.app_file_descriptor_ulimit),
     NULL
 },
 {
@@ -82,175 +227,159 @@
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
     passenger_enabled,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, enabled),
+    offsetof(passenger_loc_conf_t, autogenerated.enabled),
     NULL
 },
 {
     ngx_string("passenger_ruby"),
-    NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_ruby,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, ruby),
+    offsetof(passenger_loc_conf_t, autogenerated.ruby),
     NULL
 },
 {
     ngx_string("passenger_python"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    passenger_conf_set_python,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, python),
+    offsetof(passenger_loc_conf_t, autogenerated.python),
     NULL
 },
 {
     ngx_string("passenger_nodejs"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    passenger_conf_set_nodejs,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, nodejs),
+    offsetof(passenger_loc_conf_t, autogenerated.nodejs),
     NULL
 },
 {
     ngx_string("passenger_meteor_app_settings"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    passenger_conf_set_meteor_app_settings,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, meteor_app_settings),
+    offsetof(passenger_loc_conf_t, autogenerated.meteor_app_settings),
     NULL
 },
 {
     ngx_string("passenger_app_env"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    passenger_conf_set_app_env,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, environment),
+    offsetof(passenger_loc_conf_t, autogenerated.environment),
     NULL
 },
 {
     ngx_string("passenger_friendly_error_pages"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
-    ngx_conf_set_flag_slot,
+    passenger_conf_set_friendly_error_pages,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, friendly_error_pages),
+    offsetof(passenger_loc_conf_t, autogenerated.friendly_error_pages),
     NULL
 },
 {
     ngx_string("passenger_min_instances"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
+    passenger_conf_set_min_instances,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, min_instances),
+    offsetof(passenger_loc_conf_t, autogenerated.min_instances),
     NULL
 },
 {
     ngx_string("passenger_max_instances_per_app"),
     NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
+    passenger_conf_set_max_instances_per_app,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, max_instances_per_app),
+    offsetof(passenger_loc_conf_t, autogenerated.max_instances_per_app),
     NULL
 },
 {
     ngx_string("passenger_max_requests"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
+    passenger_conf_set_max_requests,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, max_requests),
+    offsetof(passenger_loc_conf_t, autogenerated.max_requests),
     NULL
 },
 {
     ngx_string("passenger_start_timeout"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
+    passenger_conf_set_start_timeout,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, start_timeout),
+    offsetof(passenger_loc_conf_t, autogenerated.start_timeout),
     NULL
 },
 {
     ngx_string("passenger_base_uri"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_array_slot,
+    passenger_conf_set_base_uri,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, base_uris),
+    offsetof(passenger_loc_conf_t, autogenerated.base_uris),
     NULL
 },
 {
     ngx_string("passenger_document_root"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    passenger_conf_set_document_root,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, document_root),
+    offsetof(passenger_loc_conf_t, autogenerated.document_root),
     NULL
 },
 {
     ngx_string("passenger_user"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    passenger_conf_set_user,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, user),
+    offsetof(passenger_loc_conf_t, autogenerated.user),
     NULL
 },
 {
     ngx_string("passenger_group"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    passenger_conf_set_group,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, group),
+    offsetof(passenger_loc_conf_t, autogenerated.group),
     NULL
 },
 {
     ngx_string("passenger_app_group_name"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    passenger_conf_set_app_group_name,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, app_group_name),
+    offsetof(passenger_loc_conf_t, autogenerated.app_group_name),
     NULL
 },
 {
     ngx_string("passenger_app_root"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    passenger_conf_set_app_root,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, app_root),
+    offsetof(passenger_loc_conf_t, autogenerated.app_root),
     NULL
 },
 {
     ngx_string("passenger_app_rights"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, app_rights),
-    NULL
-},
-{
-    ngx_string("union_station_support"),
-    NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
-    ngx_conf_set_flag_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, union_station_support),
-    NULL
-},
-{
-    ngx_string("union_station_filter"),
-    NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    union_station_filter,
+    passenger_conf_set_app_rights,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, union_station_filters),
+    offsetof(passenger_loc_conf_t, autogenerated.app_rights),
     NULL
 },
 {
     ngx_string("passenger_debugger"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
-    ngx_conf_set_flag_slot,
+    passenger_conf_set_debugger,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, debugger),
+    offsetof(passenger_loc_conf_t, autogenerated.debugger),
     NULL
 },
 {
     ngx_string("passenger_max_preloader_idle_time"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
+    passenger_conf_set_max_preloader_idle_time,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, max_preloader_idle_time),
+    offsetof(passenger_loc_conf_t, autogenerated.max_preloader_idle_time),
     NULL
 },
 {
@@ -264,23 +393,23 @@
 {
     ngx_string("passenger_env_var"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE2,
-    ngx_conf_set_keyval_slot,
+    passenger_conf_set_env_var,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, env_vars),
+    offsetof(passenger_loc_conf_t, autogenerated.env_vars),
     NULL
 },
 {
     ngx_string("passenger_set_header"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE2,
-    ngx_conf_set_keyval_slot,
+    passenger_conf_set_set_header,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, headers_source),
+    offsetof(passenger_loc_conf_t, autogenerated.headers_source),
     NULL
 },
 {
     ngx_string("passenger_pass_header"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_array_slot,
+    passenger_conf_set_pass_header,
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(passenger_loc_conf_t, upstream_config.pass_headers),
     NULL
@@ -288,31 +417,39 @@
 {
     ngx_string("passenger_headers_hash_max_size"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
+    passenger_conf_set_headers_hash_max_size,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, headers_hash_max_size),
+    offsetof(passenger_loc_conf_t, autogenerated.headers_hash_max_size),
     NULL
 },
 {
     ngx_string("passenger_headers_hash_bucket_size"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
+    passenger_conf_set_headers_hash_bucket_size,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, headers_hash_bucket_size),
+    offsetof(passenger_loc_conf_t, autogenerated.headers_hash_bucket_size),
     NULL
 },
 {
     ngx_string("passenger_ignore_client_abort"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
-    ngx_conf_set_flag_slot,
+    passenger_conf_set_ignore_client_abort,
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(passenger_loc_conf_t, upstream_config.ignore_client_abort),
     NULL
 },
+{
+    ngx_string("passenger_read_timeout"),
+    NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_read_timeout,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(passenger_loc_conf_t, upstream_config.read_timeout),
+    NULL
+},
 {
     ngx_string("passenger_buffer_response"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
-    ngx_conf_set_flag_slot,
+    passenger_conf_set_buffer_response,
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(passenger_loc_conf_t, upstream_config.buffering),
     NULL
@@ -344,7 +481,7 @@
 {
     ngx_string("passenger_intercept_errors"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
-    ngx_conf_set_flag_slot,
+    passenger_conf_set_intercept_errors,
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(passenger_loc_conf_t, upstream_config.intercept_errors),
     NULL
@@ -352,105 +489,97 @@
 {
     ngx_string("passenger_spawn_method"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    passenger_conf_set_spawn_method,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, spawn_method),
+    offsetof(passenger_loc_conf_t, autogenerated.spawn_method),
     NULL
 },
 {
     ngx_string("passenger_load_shell_envvars"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
-    ngx_conf_set_flag_slot,
+    passenger_conf_set_load_shell_envvars,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, load_shell_envvars),
-    NULL
-},
-{
-    ngx_string("union_station_key"),
-    NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, union_station_key),
+    offsetof(passenger_loc_conf_t, autogenerated.load_shell_envvars),
     NULL
 },
 {
     ngx_string("passenger_max_request_queue_size"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
+    passenger_conf_set_max_request_queue_size,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, max_request_queue_size),
+    offsetof(passenger_loc_conf_t, autogenerated.max_request_queue_size),
     NULL
 },
 {
     ngx_string("passenger_request_queue_overflow_status_code"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
+    passenger_conf_set_request_queue_overflow_status_code,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, request_queue_overflow_status_code),
+    offsetof(passenger_loc_conf_t, autogenerated.request_queue_overflow_status_code),
     NULL
 },
 {
     ngx_string("passenger_restart_dir"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    passenger_conf_set_restart_dir,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, restart_dir),
+    offsetof(passenger_loc_conf_t, autogenerated.restart_dir),
     NULL
 },
 {
     ngx_string("passenger_app_type"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    passenger_conf_set_app_type,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, app_type),
+    offsetof(passenger_loc_conf_t, autogenerated.app_type),
     NULL
 },
 {
     ngx_string("passenger_startup_file"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    passenger_conf_set_startup_file,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, startup_file),
+    offsetof(passenger_loc_conf_t, autogenerated.startup_file),
     NULL
 },
 {
     ngx_string("passenger_sticky_sessions"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
-    ngx_conf_set_flag_slot,
+    passenger_conf_set_sticky_sessions,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, sticky_sessions),
+    offsetof(passenger_loc_conf_t, autogenerated.sticky_sessions),
     NULL
 },
 {
     ngx_string("passenger_sticky_sessions_cookie_name"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    passenger_conf_set_sticky_sessions_cookie_name,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, sticky_sessions_cookie_name),
+    offsetof(passenger_loc_conf_t, autogenerated.sticky_sessions_cookie_name),
     NULL
 },
 {
     ngx_string("passenger_vary_turbocache_by_cookie"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    passenger_conf_set_vary_turbocache_by_cookie,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, vary_turbocache_by_cookie),
+    offsetof(passenger_loc_conf_t, autogenerated.vary_turbocache_by_cookie),
     NULL
 },
 {
     ngx_string("passenger_abort_websockets_on_process_shutdown"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
-    ngx_conf_set_flag_slot,
+    passenger_conf_set_abort_websockets_on_process_shutdown,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, abort_websockets_on_process_shutdown),
+    offsetof(passenger_loc_conf_t, autogenerated.abort_websockets_on_process_shutdown),
     NULL
 },
 {
     ngx_string("passenger_force_max_concurrent_requests_per_process"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
+    passenger_conf_set_force_max_concurrent_requests_per_process,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, force_max_concurrent_requests_per_process),
+    offsetof(passenger_loc_conf_t, autogenerated.force_max_concurrent_requests_per_process),
     NULL
 },
 {
@@ -469,14 +598,6 @@
     0,
     NULL
 },
-{
-    ngx_string("passenger_max_request_time"),
-    NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    passenger_enterprise_only,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL
-},
 {
     ngx_string("passenger_memory_limit"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
@@ -517,36 +638,60 @@
     0,
     NULL
 },
+{
+    ngx_string("passenger_max_request_time"),
+    NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+    passenger_enterprise_only,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL
+},
+{
+    ngx_string("passenger_max_request_queue_time"),
+    NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+    passenger_enterprise_only,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL
+},
+{
+    ngx_string("passenger_debug_log_file"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_log_file,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.log_file),
+    NULL
+},
 {
     ngx_string("rails_spawn_method"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    passenger_conf_set_spawn_method,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, spawn_method),
+    offsetof(passenger_loc_conf_t, autogenerated.spawn_method),
     NULL
 },
 {
     ngx_string("rails_env"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    passenger_conf_set_app_env,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, environment),
+    offsetof(passenger_loc_conf_t, autogenerated.environment),
     NULL
 },
 {
     ngx_string("rack_env"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    passenger_conf_set_app_env,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, environment),
+    offsetof(passenger_loc_conf_t, autogenerated.environment),
     NULL
 },
 {
     ngx_string("rails_app_spawner_idle_time"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
+    passenger_conf_set_max_preloader_idle_time,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(passenger_loc_conf_t, max_preloader_idle_time),
+    offsetof(passenger_loc_conf_t, autogenerated.max_preloader_idle_time),
     NULL
 },
 {
@@ -565,3 +710,75 @@
     0,
     NULL
 },
+{
+    ngx_string("passenger_analytics_log_user"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_obsolete_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL
+},
+{
+    ngx_string("passenger_analytics_log_group"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_obsolete_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL
+},
+{
+    ngx_string("union_station_gateway_address"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_obsolete_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL
+},
+{
+    ngx_string("union_station_gateway_port"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_obsolete_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL
+},
+{
+    ngx_string("union_station_gateway_cert"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_obsolete_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL
+},
+{
+    ngx_string("union_station_proxy_address"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_obsolete_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL
+},
+{
+    ngx_string("union_station_key"),
+    NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+    passenger_obsolete_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL
+},
+{
+    ngx_string("union_station_support"),
+    NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
+    passenger_obsolete_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL
+},
+{
+    ngx_string("union_station_filter"),
+    NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+    passenger_obsolete_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL
+},