passenger 5.0.28 → 5.0.29

data/build/support/vendor/cxxcodebuilder/lib/cxxcodebuilder/initializer_builder.rb

@@ -0,0 +1,166 @@
+# encoding: utf-8
+
+#  Copyright (c) 2016 Phusion Holding B.V.
+#
+#  "Union Station" and "Passenger" are 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.
+
+module CxxCodeBuilder
+  # Builds array and struct initialization code.
+  class InitializerBuilder
+    def initialize(builder, start_character, end_character)
+      @builder = builder
+      @start_character = start_character
+      @end_character = end_character
+      @elements = []
+    end
+
+    # Adds an array/struct initializer element to the internal buffer.
+    # The code is added verbatim, so you can supply expressions. If you
+    # want to add a string element, use `#string_element` instead.
+    #
+    # Example:
+    #
+    #   array_initializer do
+    #     element '1 + 2'
+    #   end
+    #
+    # Output:
+    #
+    #   [
+    #       1 + 2
+    #   ]
+    def element(code)
+      @elements << code
+    end
+
+    # Adds an array/struct initializer string element to the internal buffer.
+    #
+    # Example:
+    #
+    #   array_initializer do
+    #     string_element 'hello world'
+    #   end
+    #
+    # Output:
+    #
+    #   [
+    #       "hello world"
+    #   ]
+    def string_element(str)
+      element(str.inspect)
+    end
+
+    # Adds an array initializer (in the form of `[x, y, z]`) to the internal
+    # buffer. This works exactly the same as `Builder#array_initializer`, and
+    # allows you to nest an array initializer inside a parent array/struct
+    # initializer.
+    #
+    # Example:
+    #
+    #   struct_initializer do
+    #     array_initializer_element do
+    #       element 1
+    #       element 2
+    #     end
+    #     array_initializer_element do
+    #       element 3
+    #       element 4
+    #     end
+    #   end
+    #
+    # Output:
+    #
+    #   {
+    #       [
+    #           1,
+    #           2
+    #       ],
+    #       [
+    #           3,
+    #           4
+    #       ]
+    #   }
+    def array_initializer_element(&block)
+      subbuilder = InitializerBuilder.new(@builder, '[', ']')
+      subbuilder.instance_eval(&block)
+      @elements << subbuilder
+    end
+
+    # Adds a struct initializer (in the form of `{x, y, z}`) to the internal
+    # buffer. This works exactly the same as `Builder#struct_initializer`, and
+    # allows you to nest a struct initializer inside a parent array/struct
+    # initializer.
+    #
+    # Example:
+    #
+    #   array_initializer do
+    #     struct_initializer_element do
+    #       string_element 'Joe'
+    #       element 1
+    #     end
+    #     struct_initializer_element do
+    #       string_element 'Jane'
+    #       element 2
+    #     end
+    #   end
+    #
+    # Output:
+    #
+    #   [
+    #       {
+    #           "Joe",
+    #           1
+    #       },
+    #       {
+    #           "Jane",
+    #           2
+    #       }
+    #   ]
+    def struct_initializer_element(&block)
+      subbuilder = InitializerBuilder.new(@builder, '{', '}')
+      subbuilder.instance_eval(&block)
+      @elements << subbuilder
+    end
+
+    alias array_element array_initializer_element
+    alias struct_element struct_initializer_element
+
+    # @private
+    def write_code_without_newline
+      @builder.add_code(@start_character)
+      @builder.indent do
+        @elements.each_with_index do |elem, i|
+          if elem.respond_to?(:write_code_without_newline)
+            elem.write_code_without_newline
+          else
+            @builder.add_code_without_newline(elem)
+          end
+
+          if i != @elements.size - 1
+            @builder.add_raw_code(',')
+          end
+          @builder.newline
+        end
+      end
+      @builder.add_code_without_newline(@end_character)
+    end
+  end
+end

data/build/test_basics.rb

@@ -57,7 +57,8 @@ task 'test:install_deps' do
   end
 
   if !PlatformInfo.locate_ruby_tool('bundle') || bundler_too_old?
-    sh "#{gem_install} bundler"
+    # workaround for issue "bluecloth not found" when using 1.12.1
+    sh "#{gem_install} bundler --version 1.11.2"
   end
 
   if install_base_deps && install_doctools

data/resources/templates/standalone/server.erb

@@ -6,6 +6,8 @@ server_name <%= app[:server_names].join(' ') %>;
     <% else %>
         listen <%= nginx_listen_address(app) %> ssl;
     <% end %>
+    ssl_certificate <%= app[:ssl_certificate] %>;
+    ssl_certificate_key <%= app[:ssl_certificate_key] %>;
 <% else %>
     listen <%= nginx_listen_address(app) %>;
 <% end %>
@@ -17,10 +19,7 @@ server_name <%= app[:server_names].join(' ') %>;
 
 passenger_app_root '<%= app[:root] %>';
 passenger_enabled on;
-<% if app[:ssl] %>
-    ssl_certificate <%= app[:ssl_certificate] %>;
-    ssl_certificate_key <%= app[:ssl_certificate_key] %>;
-<% end %>
+
 <% if app[:union_station_key] %>
     union_station_support on;
     union_station_key <%= app[:union_station_key] %>;
@@ -36,6 +35,9 @@ passenger_enabled on;
 <% end %>
 
 <%= nginx_option(app, :environment, :passenger_app_env) %>
+<%= nginx_option(app, :ruby) %>
+<%= nginx_option(app, :python) %>
+<%= nginx_option(app, :nodejs) %>
 <%= nginx_option(app, :spawn_method) %>
 <%= nginx_option(app, :app_type) %>
 <%= nginx_option(app, :startup_file) %>

data/src/agent/Core/Controller/ForwardResponse.cpp

@@ -332,15 +332,15 @@ Controller::onAppResponseBegin(Client *client, Request *req) {
 	resp->date = resp->headers.lookup(HTTP_DATE);
 	resp->setCookie = resp->headers.lookup(ServerKit::HTTP_SET_COOKIE);
 	if (resp->setCookie != NULL) {
-		// Remove Set-Cookie from resp->headers without deallocating it.
+		// Move the Set-Cookie header from resp->headers to resp->setCookie;
+		// remove Set-Cookie from resp->headers without deallocating it.
 		LString *copy;
 
 		copy = (LString *) psg_palloc(req->pool, sizeof(LString));
-		*copy = *resp->setCookie;
+		psg_lstr_init(copy);
+		psg_lstr_move_and_append(resp->setCookie, req->pool, copy);
 
-		resp->setCookie->start = NULL;
-		resp->setCookie->end = NULL;
-		resp->setCookie->size = 0;
+		P_ASSERT_EQ(resp->setCookie->size, 0);
 		psg_lstr_append(resp->setCookie, req->pool, "x", 1);
 		resp->headers.erase(ServerKit::HTTP_SET_COOKIE);
 

data/src/agent/Watchdog/WatchdogMain.cpp

@@ -1023,16 +1023,6 @@ initializeWorkingObjects(const WorkingObjectsPtr &wo, InstanceDirToucherPtr &ins
 	if (options.get("integration_mode") == "standalone") {
 		instanceOptions.properties["standalone_engine"] = options.get("standalone_engine");
 	}
-	if (options.has("web_server_config_files")) {
-		vector<string> configFiles = options.getStrSet("web_server_config_files");
-		Json::Value array(Json::arrayValue);
-
-		foreach (string configFile, configFiles) {
-			array.append(configFile);
-		}
-
-		instanceOptions.properties["web_server_config_files"] = array;
-	}
 	wo->instanceDir = boost::make_shared<InstanceDirectory>(instanceOptions,
 		options.get("instance_registry_dir"));
 	options.set("instance_dir", wo->instanceDir->getPath());

data/src/apache2_module/ConfigurationCommands.cpp

@@ -1,266 +1,199 @@
 /*
- *  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.
  */
 
 /*
- * ConfigurationCommands.cpp is automatically generated from ConfigurationCommands.cpp.erb,
+ * ConfigurationCommands.cpp is automatically generated from ConfigurationCommands.cpp.cxxcodebuilder,
  * using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.
  * Edits to ConfigurationCommands.cpp will be lost.
  *
  * To update ConfigurationCommands.cpp:
  *   rake apache2
  *
- * To force regeneration of ConfigurationCommands.c:
+ * To force regeneration of ConfigurationCommands.cpp:
  *   rm -f src/apache2_module/ConfigurationCommands.cpp
  *   rake src/apache2_module/ConfigurationCommands.cpp
  */
 
-
-
-
-	
-	AP_INIT_TAKE1("PassengerRuby",
-		(Take1Func) cmd_passenger_ruby,
-		NULL,
-		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
-		"The Ruby interpreter to use."),
-
-	
-	AP_INIT_TAKE1("PassengerPython",
-		(Take1Func) cmd_passenger_python,
-		NULL,
-		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
-		"The Python interpreter to use."),
-
-	
-	AP_INIT_TAKE1("PassengerNodejs",
-		(Take1Func) cmd_passenger_nodejs,
-		NULL,
-		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
-		"The Node.js command to use."),
-
-	
-	AP_INIT_TAKE1("PassengerMeteorAppSettings",
-		(Take1Func) cmd_passenger_meteor_app_settings,
-		NULL,
-		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
-		"Settings file for (non-bundled) Meteor apps."),
-
-	
-	AP_INIT_TAKE1("PassengerAppEnv",
-		(Take1Func) cmd_passenger_app_env,
-		NULL,
-		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
-		"The environment under which applications are run."),
-
-	
-	AP_INIT_TAKE1("PassengerMinInstances",
-		(Take1Func) cmd_passenger_min_instances,
-		NULL,
-		OR_LIMIT | ACCESS_CONF | RSRC_CONF,
-		"The minimum number of application instances to keep when cleaning idle instances."),
-
-	
-	AP_INIT_TAKE1("PassengerMaxInstancesPerApp",
-		(Take1Func) cmd_passenger_max_instances_per_app,
-		NULL,
-		RSRC_CONF,
-		"The maximum number of simultaneously alive application instances a single application may occupy."),
-
-	
-	AP_INIT_TAKE1("PassengerUser",
-		(Take1Func) cmd_passenger_user,
-		NULL,
-		ACCESS_CONF | RSRC_CONF,
-		"The user that Ruby applications must run as."),
-
-	
-	AP_INIT_TAKE1("PassengerGroup",
-		(Take1Func) cmd_passenger_group,
-		NULL,
-		ACCESS_CONF | RSRC_CONF,
-		"The group that Ruby applications must run as."),
-
-	
-	AP_INIT_FLAG("PassengerErrorOverride",
-		(FlagFunc) cmd_passenger_error_override,
-		NULL,
-		OR_ALL,
-		"Allow Apache to handle error response."),
-
-	
-	AP_INIT_TAKE1("PassengerMaxRequests",
-		(Take1Func) cmd_passenger_max_requests,
-		NULL,
-		OR_LIMIT | ACCESS_CONF | RSRC_CONF,
-		"The maximum number of requests that an application instance may process."),
-
-	
-	AP_INIT_TAKE1("PassengerStartTimeout",
-		(Take1Func) cmd_passenger_start_timeout,
-		NULL,
-		OR_LIMIT | ACCESS_CONF | RSRC_CONF,
-		"A timeout for application startup."),
-
-	
-	AP_INIT_FLAG("PassengerHighPerformance",
-		(FlagFunc) cmd_passenger_high_performance,
-		NULL,
-		OR_ALL,
-		"Enable or disable Passenger's high performance mode."),
-
-	
-	AP_INIT_FLAG("PassengerEnabled",
-		(FlagFunc) cmd_passenger_enabled,
-		NULL,
-		OR_ALL,
-		"Enable or disable Phusion Passenger."),
-
-	
-	AP_INIT_TAKE1("PassengerMaxRequestQueueSize",
-		(Take1Func) cmd_passenger_max_request_queue_size,
-		NULL,
-		OR_ALL,
-		"The maximum number of queued requests."),
-
-	
-	AP_INIT_TAKE1("PassengerMaxPreloaderIdleTime",
-		(Take1Func) cmd_passenger_max_preloader_idle_time,
-		NULL,
-		RSRC_CONF,
-		"The maximum number of seconds that a preloader process may be idle before it is shutdown."),
-
-	
-	AP_INIT_FLAG("PassengerLoadShellEnvvars",
-		(FlagFunc) cmd_passenger_load_shell_envvars,
-		NULL,
-		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
-		"Whether to load environment variables from the shell before running the application."),
-
-	
-	AP_INIT_FLAG("PassengerBufferUpload",
-		(FlagFunc) cmd_passenger_buffer_upload,
-		NULL,
-		OR_ALL,
-		"Whether to buffer file uploads."),
-
-	
-	AP_INIT_TAKE1("PassengerAppType",
-		(Take1Func) cmd_passenger_app_type,
-		NULL,
-		OR_ALL,
-		"Force specific application type."),
-
-	
-	AP_INIT_TAKE1("PassengerStartupFile",
-		(Take1Func) cmd_passenger_startup_file,
-		NULL,
-		OR_ALL,
-		"Force specific startup file."),
-
-	
-	AP_INIT_FLAG("PassengerStickySessions",
-		(FlagFunc) cmd_passenger_sticky_sessions,
-		NULL,
-		OR_ALL,
-		"Whether to enable sticky sessions."),
-
-	
-	AP_INIT_FLAG("PassengerStickySessionsCookieName",
-		(FlagFunc) cmd_passenger_sticky_sessions_cookie_name,
-		NULL,
-		OR_ALL,
-		"The cookie name to use for sticky sessions."),
-
-	
-	AP_INIT_TAKE1("PassengerSpawnMethod",
-		(Take1Func) cmd_passenger_spawn_method,
-		NULL,
-		RSRC_CONF,
-		"The spawn method to use."),
-
-	
-	AP_INIT_FLAG("PassengerShowVersionInHeader",
-		(FlagFunc) cmd_passenger_show_version_in_header,
-		NULL,
-		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
-		"Whether to show the Phusion Passenger version number in the X-Powered-By header."),
-
-	
-	AP_INIT_FLAG("PassengerFriendlyErrorPages",
-		(FlagFunc) cmd_passenger_friendly_error_pages,
-		NULL,
-		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
-		"Whether to display friendly error pages when something goes wrong."),
-
-	
-	AP_INIT_TAKE1("PassengerRestartDir",
-		(Take1Func) cmd_passenger_restart_dir,
-		NULL,
-		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
-		"The directory in which Passenger should look for restart.txt."),
-
-	
-	AP_INIT_TAKE1("PassengerAppGroupName",
-		(Take1Func) cmd_passenger_app_group_name,
-		NULL,
-		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
-		"Application process group name."),
-
-	
-	AP_INIT_TAKE1("PassengerForceMaxConcurrentRequestsPerProcess",
-		(Take1Func) cmd_passenger_force_max_concurrent_requests_per_process,
-		NULL,
-		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
-		"Force Passenger to believe that an application process can handle the given number of concurrent requests per process"),
-
-	
-	AP_INIT_TAKE1("PassengerLveMinUid",
-		(Take1Func) cmd_passenger_lve_min_uid,
-		NULL,
-		RSRC_CONF,
-		"Minimum user id starting from which entering LVE and CageFS is allowed."),
-
-	
-	AP_INIT_TAKE1("RailsEnv",
-		(Take1Func) cmd_passenger_app_env,
-		NULL,
-		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
-		"The environment under which applications are run."),
-
-	
-	AP_INIT_TAKE1("RackEnv",
-		(Take1Func) cmd_passenger_app_env,
-		NULL,
-		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
-		"The environment under which applications are run."),
-
-	
-	AP_INIT_TAKE1("RailsSpawnMethod",
-		(Take1Func) cmd_passenger_spawn_method,
-		NULL,
-		RSRC_CONF,
-		"The spawn method to use."),
-
+AP_INIT_TAKE1("PassengerRuby",
+	(Take1Func) cmd_passenger_ruby,
+	NULL,
+	OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+	"The Ruby interpreter to use."),
+AP_INIT_TAKE1("PassengerPython",
+	(Take1Func) cmd_passenger_python,
+	NULL,
+	OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+	"The Python interpreter to use."),
+AP_INIT_TAKE1("PassengerNodejs",
+	(Take1Func) cmd_passenger_nodejs,
+	NULL,
+	OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+	"The Node.js command to use."),
+AP_INIT_TAKE1("PassengerMeteorAppSettings",
+	(Take1Func) cmd_passenger_meteor_app_settings,
+	NULL,
+	OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+	"Settings file for (non-bundled) Meteor apps."),
+AP_INIT_TAKE1("PassengerAppEnv",
+	(Take1Func) cmd_passenger_app_env,
+	NULL,
+	OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+	"The environment under which applications are run."),
+AP_INIT_TAKE1("PassengerMinInstances",
+	(Take1Func) cmd_passenger_min_instances,
+	NULL,
+	OR_LIMIT | ACCESS_CONF | RSRC_CONF,
+	"The minimum number of application instances to keep when cleaning idle instances."),
+AP_INIT_TAKE1("PassengerMaxInstancesPerApp",
+	(Take1Func) cmd_passenger_max_instances_per_app,
+	NULL,
+	RSRC_CONF,
+	"The maximum number of simultaneously alive application instances a single application may occupy."),
+AP_INIT_TAKE1("PassengerUser",
+	(Take1Func) cmd_passenger_user,
+	NULL,
+	ACCESS_CONF | RSRC_CONF,
+	"The user that Ruby applications must run as."),
+AP_INIT_TAKE1("PassengerGroup",
+	(Take1Func) cmd_passenger_group,
+	NULL,
+	ACCESS_CONF | RSRC_CONF,
+	"The group that Ruby applications must run as."),
+AP_INIT_FLAG("PassengerErrorOverride",
+	(FlagFunc) cmd_passenger_error_override,
+	NULL,
+	OR_ALL,
+	"Allow Apache to handle error response."),
+AP_INIT_TAKE1("PassengerMaxRequests",
+	(Take1Func) cmd_passenger_max_requests,
+	NULL,
+	OR_LIMIT | ACCESS_CONF | RSRC_CONF,
+	"The maximum number of requests that an application instance may process."),
+AP_INIT_TAKE1("PassengerStartTimeout",
+	(Take1Func) cmd_passenger_start_timeout,
+	NULL,
+	OR_LIMIT | ACCESS_CONF | RSRC_CONF,
+	"A timeout for application startup."),
+AP_INIT_FLAG("PassengerHighPerformance",
+	(FlagFunc) cmd_passenger_high_performance,
+	NULL,
+	OR_ALL,
+	"Enable or disable Passenger's high performance mode."),
+AP_INIT_FLAG("PassengerEnabled",
+	(FlagFunc) cmd_passenger_enabled,
+	NULL,
+	OR_ALL,
+	"Enable or disable Phusion Passenger."),
+AP_INIT_TAKE1("PassengerMaxRequestQueueSize",
+	(Take1Func) cmd_passenger_max_request_queue_size,
+	NULL,
+	OR_ALL,
+	"The maximum number of queued requests."),
+AP_INIT_TAKE1("PassengerMaxPreloaderIdleTime",
+	(Take1Func) cmd_passenger_max_preloader_idle_time,
+	NULL,
+	RSRC_CONF,
+	"The maximum number of seconds that a preloader process may be idle before it is shutdown."),
+AP_INIT_FLAG("PassengerLoadShellEnvvars",
+	(FlagFunc) cmd_passenger_load_shell_envvars,
+	NULL,
+	OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+	"Whether to load environment variables from the shell before running the application."),
+AP_INIT_FLAG("PassengerBufferUpload",
+	(FlagFunc) cmd_passenger_buffer_upload,
+	NULL,
+	OR_ALL,
+	"Whether to buffer file uploads."),
+AP_INIT_TAKE1("PassengerAppType",
+	(Take1Func) cmd_passenger_app_type,
+	NULL,
+	OR_ALL,
+	"Force specific application type."),
+AP_INIT_TAKE1("PassengerStartupFile",
+	(Take1Func) cmd_passenger_startup_file,
+	NULL,
+	OR_ALL,
+	"Force specific startup file."),
+AP_INIT_FLAG("PassengerStickySessions",
+	(FlagFunc) cmd_passenger_sticky_sessions,
+	NULL,
+	OR_ALL,
+	"Whether to enable sticky sessions."),
+AP_INIT_FLAG("PassengerStickySessionsCookieName",
+	(FlagFunc) cmd_passenger_sticky_sessions_cookie_name,
+	NULL,
+	OR_ALL,
+	"The cookie name to use for sticky sessions."),
+AP_INIT_TAKE1("PassengerSpawnMethod",
+	(Take1Func) cmd_passenger_spawn_method,
+	NULL,
+	RSRC_CONF,
+	"The spawn method to use."),
+AP_INIT_FLAG("PassengerShowVersionInHeader",
+	(FlagFunc) cmd_passenger_show_version_in_header,
+	NULL,
+	OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+	"Whether to show the Phusion Passenger version number in the X-Powered-By header."),
+AP_INIT_FLAG("PassengerFriendlyErrorPages",
+	(FlagFunc) cmd_passenger_friendly_error_pages,
+	NULL,
+	OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+	"Whether to display friendly error pages when something goes wrong."),
+AP_INIT_TAKE1("PassengerRestartDir",
+	(Take1Func) cmd_passenger_restart_dir,
+	NULL,
+	OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+	"The directory in which Passenger should look for restart.txt."),
+AP_INIT_TAKE1("PassengerAppGroupName",
+	(Take1Func) cmd_passenger_app_group_name,
+	NULL,
+	OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+	"Application process group name."),
+AP_INIT_TAKE1("PassengerForceMaxConcurrentRequestsPerProcess",
+	(Take1Func) cmd_passenger_force_max_concurrent_requests_per_process,
+	NULL,
+	OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+	"Force Passenger to believe that an application process can handle the given number of concurrent requests per process"),
+AP_INIT_TAKE1("PassengerLveMinUid",
+	(Take1Func) cmd_passenger_lve_min_uid,
+	NULL,
+	RSRC_CONF,
+	"Minimum user id starting from which entering LVE and CageFS is allowed."),
+AP_INIT_TAKE1("RailsEnv",
+	(Take1Func) cmd_passenger_app_env,
+	NULL,
+	OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+	"The environment under which applications are run."),
+AP_INIT_TAKE1("RackEnv",
+	(Take1Func) cmd_passenger_app_env,
+	NULL,
+	OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+	"The environment under which applications are run."),
+AP_INIT_TAKE1("RailsSpawnMethod",
+	(Take1Func) cmd_passenger_spawn_method,
+	NULL,
+	RSRC_CONF,
+	"The spawn method to use."),