passenger 4.0.14 → 4.0.16

data/doc/users_guide_snippets/passenger_spawn_method.txt

@@ -32,6 +32,6 @@ the startup time of a single server in Mongrel Cluster. Direct spawning will als
 render <<reducing_memory_usage,Ruby Enterprise Edition's memory reduction technology>> useless.
 
 ************************************************
-As of Passenger 3.2, 'conservative' spawning was renamed to 'direct' and 'smart-lv2' was renamed
+As of Phusion Passenger 4.0, 'conservative' spawning was renamed to 'direct' and 'smart-lv2' was renamed
 to 'smart'. The old 'smart' spawning has been removed in favor of the new version.
 ************************************************

data/doc/users_guide_snippets/rvm_helper_tool.txt

@@ -21,12 +21,6 @@ passenger-config was invoked through the following Ruby interpreter:
   To use in Nginx : passenger_ruby /usr/local/rvm/wrappers/ruby-1.8.7-p358/ruby
   To use with Standalone: /usr/local/rvm/wrappers/ruby-1.8.7-p358/ruby /opt/passenger/bin/passenger start
 
-The following Ruby interpreter was found first in $PATH:
-  Command: /usr/local/rvm/wrappers/ruby-1.8.7-p358/ruby
-  Version: ruby 1.8.7 (2012-02-08 patchlevel 358) [universal-darwin12.0]
-  To use in Apache: PassengerRuby /usr/local/rvm/wrappers/ruby-1.8.7-p358/ruby
-  To use in Nginx : passenger_ruby /usr/local/rvm/wrappers/ruby-1.8.7-p358/ruby
-  To use with Standalone: /usr/local/rvm/wrappers/ruby-1.8.7-p358/ruby /opt/passenger/bin/passenger start
 
 ## Notes for RVM users
 Do you want to know which command to use for a different Ruby interpreter? 'rvm use' that Ruby interpreter, then re-run 'passenger-config --ruby-command'.
@@ -44,12 +38,6 @@ passenger-config was invoked through the following Ruby interpreter:
   To use in Nginx : passenger_ruby /usr/local/rvm/wrappers/ruby-1.9.3-p392/ruby
   To use with Standalone: /usr/local/rvm/wrappers/ruby-1.9.3-p392/ruby /opt/passenger/bin/passenger start
 
-The following Ruby interpreter was found first in $PATH:
-  Command: /usr/local/rvm/wrappers/ruby-1.9.3-p392/ruby
-  Version: ruby 1.9.3p392 (2013-02-22 revision 39386) [x86_64-darwin12.2.1]
-  To use in Apache: PassengerRuby /usr/local/rvm/wrappers/ruby-1.9.3-p392/ruby
-  To use in Nginx : passenger_ruby /usr/local/rvm/wrappers/ruby-1.9.3-p392/ruby
-  To use with Standalone: /usr/local/rvm/wrappers/ruby-1.9.3-p392/ruby /opt/passenger/bin/passenger start
 
 ## Notes for RVM users
 Do you want to know which command to use for a different Ruby interpreter? 'rvm use' that Ruby interpreter, then re-run 'passenger-config --ruby-command'.

data/doc/users_guide_snippets/tips.txt

@@ -314,7 +314,7 @@ append a timestamp to the URI to better facilitate HTTP caching. For more inform
 please refer to
 link:http://api.rubyonrails.org/classes/ActionView/Helpers/AssetTagHelper.html[the Rails API docs].
 
-=== Out-of-Band Garbage Work and Out-of-Band Garbage Collection
+=== Out-of-Band Work and Out-of-Band Garbage Collection
 
 **Available since Phusion Passenger 4.0.0.**
 
@@ -328,11 +328,24 @@ Because Out-of-Band Work is implemented at the Phusion Passenger inter-process r
 
 - It works well even with tasks that can pause all threads. The MRI Ruby garbage collector is a stop-the-world mark-and-sweep garbage collector.
 - Phusion Passenger can spawn more processes as necessary, in order to prevent situations in which all application processes are busy performing out-of-band work. Phusion Passenger guarantees that there's at least one process that's ready to process requests.
+- Phusion Passenger guarantees that no more than 1 process is performing out-of-band work at the same time.
 
 Applications can use Out-of-Band Work as follows:
 
-1. Request out-of-band work by outputting the `X-Passenger-Request-OOB-Work` header during a request. It does not matter what the value is. At this time, it is not possible to request out-of-band work from outside requests.
-2. You can actually perform out-of-band work when you receive a `:oob_work` Phusion Passenger event.
+1. Ensure that
+ifdef::apache[]
+<<PassengerMaxPoolSize,PassengerMaxPoolSize>>
+and
+<<PassengerMaxInstances,PassengerMaxInstances>>
+endif::[]
+ifdef::nginx[]
+<<PassengerMaxPoolSize,passenger_max_pool_size>>
+and
+<<PassengerMaxInstances,passenger_max_instances>>
+endif::[]
+are both larger than 1. Out-of-band work only works if there are at least 2 application processes.
+2. Request out-of-band work by outputting the `X-Passenger-Request-OOB-Work` header during a request. It does not matter what the value is. At this time, it is not possible to request out-of-band work from outside requests.
+3. You can actually perform out-of-band work when you receive a `:oob_work` Phusion Passenger event.
 
 Note that even though you can request out-of-band work, there's no guarantee that Phusion Passenger will send an `oob_work` event in a timely manner, if at all. It is also possible that Phusion Passenger sends an `oob_work` event without you ever having requested one. This latter could for example happen if the OOB work is administrator-initiated. Do not make any assumptions in your code.
 
@@ -538,6 +551,59 @@ Immediately after creating the `run` file, daemontools/runit automatically runs
 
 To shut down a daemontools/runit-managed daemon, you need to use `svc -d /etc/service/flying-passenger` (daemontools) or `sv stop /etc/service/flying-passenger` (runit) instead of sending a signal to the process.
 
+[[using_flying_passenger_with_mri_18_or_jruby]]
+==== Using Flying Passenger with MRI 1.8 or JRuby
+
+Using Flying Passenger in combination with MRI Ruby 1.8 or with JRuby requires special attention. This is because the Flying Passenger daemon is written in Ruby, and requires proper `Process.spawn` support, which neither MRI 1.8 nor JRuby support.
+
+It is however possible to use Flying Passenger with MRI Ruby 1.8 and JRuby. You can't run the Flying Passenger daemon in MRI 1.8 or JRuby, but you can still run the web applications - hosted under Flying Passenger - in MRI 1.8 or JRuby.
+
+First, edit your Nginx configuration file and specify a Ruby interpreter for your web applications. For example:
+
+--------------------
+# Connect to the Flying Passenger daemon on the following socket
+passenger_fly_with /var/run/flying-passenger.sock;
+...
+
+server {
+    listen 80;
+    server_name www.foo.com;
+    root /webapps/foo/public;
+    passenger_enabled on;
+    # Use JRuby for this web application
+    passenger_ruby /opt/jruby/bin/jruby;
+}
+--------------------
+
+Then you need to install a Ruby 1.9-compatible Ruby interpeter with POSIX spawn support, alongside JRuby/MRI 1.8. Ruby interpreters which can be used for running the Flying Passenger daemon include:
+
+ * MRI Ruby >= 1.9.
+ * Rubinius.
+
+The following example demonstrates how you can install MRI Ruby 1.9 in parallel with your MRI Ruby 1.8 or JRuby installation.
+
+Example for Debian/Ubuntu users:
+
+[source,sh]
+--------------------------------
+# Install Ruby 1.9
+sudo apt-get install ruby1.9.3
+# Run the Flying Passenger daemon in Ruby 1.9
+ruby1.9 -S flying-passenger --socket-file=/var/run/flying-passenger.sock
+--------------------------------
+
+Example for RVM users:
+
+[source,sh]
+--------------------------------
+# Install Ruby 1.9
+rvm install 1.9.3
+# Run the Flying Passenger daemon in Ruby 1.9
+$ rvm-exec 1.9.3 ruby -S flying-passenger --socket-file=/var/run/flying-passenger.sock
+--------------------------------
+
+The Flying Passenger daemon will now be run on Ruby 1.9, while the web application 'www.foo.com' will be run on JRuby.
+
 [[flying_passenger_caveats]]
 ==== Caveats and limitations
 
@@ -545,6 +611,7 @@ Beware of the following caveats and limitations when using Flying Passenger:
 
 - The Nginx executable **must** be compiled with the same version of Phusion Passenger as the Flying Passenger daemon. Failing to meet this requirement may result in cryptic errors, or may result in certain features not working, until you've fixed the situation. When upgrading Phusion Passenger, you must restart both Nginx and the Flying Passenger daemon.
 - The <<PassengerRoot,passenger_root>> directive has no effect. When using Flying Passenger, you are not supposed to set `passenger_root`.
+- The Flying Passenger daemon is written in Ruby. It requires a Ruby interpreter with proper `Process#spawn` support. At the time of writing, all Ruby interpreters in existance satisfy this requirement, except for MRI Ruby 1.8 and JRuby. See <<using_flying_passenger_with_mri_18_or_jruby,Using Flying Passenger with MRI 1.8 or JRuby>> for more information.
 - When you add a new application to the web server configuration, Flying Passenger will automatically pick up the application's settings and spawn this new application upon the first request to it. However it is not capable of automatically starting the new app before a request has been sent to it (i.e. <<PassengerPreStart,passenger_pre_start>>-like behavior is not available in this case). As a workaround, you can send an HTTP request to your application after starting the daemon, which forces it to spawn application processes.
 - When you remove an application from the web server configuration, Flying Passenger will not detect the removal and will not shut down the associated application processes. Killing the application processes will also not help, because Flying Passenger will restart them per the (now-removed, but still in the Flying Passenger daemon's memory) <<PassengerMinInstances,passenger_min_instances>> settings. At the moment, there are two ways to get rid of those processes:
   * Before removing the application from the web server configuration, explicitly set its `passenger_min_instances` to 0. Next, send a request to it, which will cause the Flying Passenger daemon to take over the new `passenger_min_instances 0` option. You can then proceed with removing the application from the web server configuration, and restarting the web server. Finally, kill the PIDs associated to those application processes and remove the application configuration.

data/doc/users_guide_snippets/under_the_hood/page_caching_support.txt

@@ -1,3 +1,5 @@
+=== Page caching support
+
 For each HTTP request, Phusion Passenger will automatically look for a corresponding
 page cache file, and serve that if it exists. It does this by appending ".html" to
 the filename that the URI normally maps to, and checking whether that file exists.

data/doc/users_guide_snippets/under_the_hood/relationship_with_ruby.txt

@@ -0,0 +1,114 @@
+[[relationship_with_ruby]]
+=== Phusion Passenger and its relationship with Ruby
+
+==== How Ruby is used
+
+Phusion Passenger's core is written in C++ for performance and memory efficiency. It supports web applications written in any language. Phusion Passenger requires Ruby, its usage of Ruby is minimal in order to maximize performance and to minimize memory usage.
+
+ * Phusion Passenger's installer, build system and administration tools are written in Ruby.
+ * Certain internally used tools, such as the crash handler (which generates a backtrace in case Phusion Passenger crash) and the prespawn script (used to implement
+ifdef::apache[]
+<<PassengerPreStart,PassengerPreStart>>)
+endif::[]
+ifdef::nginx[]
+<<PassengerPreStart,passenger_pre_start>>)
+endif::[]
+are written in Ruby as well.
+ * Ruby web application support is implemented in Ruby.
+ * If you use <<flying_passenger,Flying Passenger>>, then the Flying Passenger daemon is written in Ruby. The daemon is a small (less than 500 lines of code) and offloads most tasks to the C++ core.
+ * If you use link:Users%20guide%20Standalone.html[Phusion Passenger Standalone], then the frontend (the `passenger` command) is written in Ruby. The frontend is small (less than 1500 lines of code) and offloads most tasks to the C++ core.
+
+Other than the aforementioned aspects, Phusion Passenger does not use Ruby during normal operation. For example, if you run Python WSGI web applications on Phusion Passenger, then there will be (almost) no Ruby code running on the system.
+
+==== When the system has multiple Ruby interpreters
+
+Phusion Passenger may be installed with any Ruby interpreter. Once installed, you can run Phusion Passenger's Ruby parts under any Ruby interpreter you want, even if that Ruby interpreter was not the one you originally installed Phusion Passenger with.
+
+The reason for this is that Phusion Passenger does not dynamically link to Ruby: Phusion Passenger uses Ruby entirely out-of-process. Thus you can switch to any Ruby interpreter you want during runtime, without recompiling Phusion Passenger, and without worrying about what Ruby you used to install Phusion Passenger.
+
+Phusion Passenger is also capable of running Ruby web applications under any Ruby interpreter you want. So it is not important which Ruby you use to install Phusion Passenger: it will work regardless. Please refer to the documentation for the
+ifdef::apache[]
+<<PassengerRuby,PassengerRuby>>
+endif::[]
+ifdef::nginx[]
+<<PassengerRuby,passenger_ruby>>
+endif::[]
+directive to learn how run different web applications under different Ruby interpreters.
+
+.Caveat: RVM and RVM gemsets
+
+There is however one caveat if you happen to be using RVM or RVM gemsets. When you `gem install` Phusion Passenger using RVM, then RVM will install Phusion Passenger into the *currently active RVM Ruby and gemset*. This means that Phusion Passenger commands - such as `passenger`, `passenger-install-xxx-module` and `passenger-status` - are available in that same RVM Ruby and gemset only. When you switch Ruby interpreter, or when you switch gemset, the Phusion Passenger commands will no longer be available, and you will get a `command not found` error. Here's an example which demonstrates the problem.
+
+."Command not found" problem demonstration
+[source,sh]
+------------------------
+## Install Phusion Passenger (open source edition) using Ruby 1.9.3
+## and the 'business' gemset
+$ rvm use 1.9.3
+Using /home/phusion/.rvm/gems/ruby-1.9.3-p429
+$ rvm gemset create business
+$ rvm gemset use business
+Using ruby-1.9.3-p429 with gemset business
+$ curl -O https://s3.amazonaws.com/phusion-passenger/releases/gem_bootstrap.sh
+$ eval "`sh gem_bootstrap.sh`"
+$ gem install passenger
+
+## Verify that passenger works
+$ passenger --version
+Phusion Passenger version 4.0.14
+
+## Switch to a different RVM gemset. You will get a `command not found`
+$ rvm gemset use default
+Using ruby-1.9.3-p429 with gemset default
+$ passenger --version
+bash: passenger: command not found
+
+## Switch to a different Ruby interpreter. You will also get
+## a `command not found`
+$ rvm use 2.0.0
+Using /home/phusion/.rvm/gems/ruby-2.0.0-p195
+$ passenger --version
+bash: passenger: command not found
+
+## Switch back to the Ruby and gemset that you installed Phusion
+## Passenger with, and verify that it works again
+$ rvm use 1.9.3
+Using /home/phusion/.rvm/gems/ruby-2.0.0-p195
+$ rvm gemset use business
+Using ruby-1.9.3-p429 with gemset business
+$ passenger --version
+Phusion Passenger version 4.0.14
+------------------------
+
+.Solutions
+There are several ways to solve this problem:
+
+ 1. Permanently add Phusion Passenger's command directory to your PATH, so that your shell can always find them even when you switch RVM Ruby or gemset. If you don't know what PATH means, please read <<about_environment_variable,About environment variables>> first.
++
+The drawback is that you have to redo this every time you upgrade Phusion Passenger, because the Phusion Passenger directory filename is dependent on the version number.
++
+First, identify the location of the Phusion Passenger command directory, like this:
++
+------------------------------------------------------------------
+$ echo `passenger-config --root`/bin
+/home/phusion/.rvm/gems/ruby-1.9.3-p429/gems/passenger-4.0.15/bin
+------------------------------------------------------------------
++
+Next, add the directory that you've found to your current shell's PATH:
++
+------------------------------------------------------------------
+$ export PATH=/home/phusion/.rvm/gems/ruby-1.9.3-p429/gems/passenger-4.0.15/bin:$PATH
+------------------------------------------------------------------
++
+Finally, make the change permanent by appending the above command to your bash startup file:
++
+------------------------------------------------------------------
+$ echo 'export PATH=/home/phusion/.rvm/gems/ruby-1.9.3-p429/gems/passenger-4.0.15/bin:$PATH' >> ~/.bashrc
+------------------------------------------------------------------
+ 2. Switch back to the RVM Ruby and gemset that you installed Phusion Passenger with, before running any Phusion Passenger command.
+ 3. Prepend any Phusion Passenger command with `rvm-exec RUBY_NAME@GEMSET_NAME ruby -S`. If the relevant Phusion Passenger command also needs root privileges, then prepend `rvmsudo` before that. For example:
++
+------------------------------------------------------------------
+rvm-exec 1.9.3@business ruby -S passenger --version
+rvmsudo rvm-exec 1.9.3@business ruby -S passenger-install-apache2-module
+------------------------------------------------------------------

data/ext/apache2/Configuration.cpp

@@ -24,6 +24,7 @@
  */
 #include <algorithm>
 #include <cstdlib>
+#include <climits>
 
 /* ap_config.h checks whether the compiler has support for C99's designated
  * initializers, and defines AP_HAVE_DESIGNATED_INITIALIZER if it does. However,
@@ -185,20 +186,14 @@ create_dir_config_struct(apr_pool_t *pool) {
 void *
 passenger_config_create_dir(apr_pool_t *p, char *dirspec) {
 	DirConfig *config = create_dir_config_struct(p);
-	config->enabled = DirConfig::UNSET;
-	config->ruby = NULL;
+	
+	#include "CreateDirConfig.cpp"
+
 	config->python = NULL;
 	config->environment = NULL;
 	config->appRoot = NULL;
-	config->user = NULL;
-	config->group = NULL;
 	config->spawnMethod = DirConfig::SM_UNSET;
 	config->maxPreloaderIdleTime = -1;
-	config->maxRequests = 0;
-	config->maxRequestsSpecified = false;
-	config->minInstances = 1;
-	config->minInstancesSpecified = false;
-	config->highPerformance = DirConfig::UNSET;
 	config->resolveSymlinksInDocRoot = DirConfig::UNSET;
 	config->allowEncodedSlashes = DirConfig::UNSET;
 	config->statThrottleRate = 0;
@@ -218,25 +213,19 @@ passenger_config_merge_dir(apr_pool_t *p, void *basev, void *addv) {
 	DirConfig *base = (DirConfig *) basev;
 	DirConfig *add = (DirConfig *) addv;
 	
-	config->enabled = (add->enabled == DirConfig::UNSET) ? base->enabled : add->enabled;
+	#include "MergeDirConfig.cpp"
 	
 	config->baseURIs = base->baseURIs;
 	for (set<string>::const_iterator it(add->baseURIs.begin()); it != add->baseURIs.end(); it++) {
 		config->baseURIs.insert(*it);
 	}
 	
-	MERGE_STR_CONFIG(ruby);
 	MERGE_STR_CONFIG(python);
 	MERGE_STR_CONFIG(environment);
 	MERGE_STR_CONFIG(appRoot);
 	MERGE_STRING_CONFIG(appGroupName);
-	MERGE_STR_CONFIG(user);
-	MERGE_STR_CONFIG(group);
 	config->spawnMethod = (add->spawnMethod == DirConfig::SM_UNSET) ? base->spawnMethod : add->spawnMethod;
 	config->maxPreloaderIdleTime = (add->maxPreloaderIdleTime == -1) ? base->maxPreloaderIdleTime : add->maxPreloaderIdleTime;
-	MERGE_INT_CONFIG(maxRequests);
-	MERGE_INT_CONFIG(minInstances);
-	MERGE_THREEWAY_CONFIG(highPerformance);
 	MERGE_INT_CONFIG(statThrottleRate);
 	MERGE_STR_CONFIG(restartDir);
 	MERGE_STR_CONFIG(uploadBufferDir);
@@ -291,18 +280,13 @@ cmd_passenger_pre_start(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return NULL;
 }
 
-DEFINE_DIR_INT_CONFIG_SETTER(cmd_passenger_min_instances, minInstances, unsigned long, 0)
-DEFINE_DIR_INT_CONFIG_SETTER(cmd_passenger_max_requests, maxRequests, unsigned long, 0)
-DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_passenger_high_performance, highPerformance)
-DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_passenger_enabled, enabled)
-DEFINE_DIR_STR_CONFIG_SETTER(cmd_passenger_ruby, ruby)
+#include "ConfigurationSetters.cpp"
+
 DEFINE_DIR_STR_CONFIG_SETTER(cmd_passenger_python, python)
 DEFINE_DIR_STR_CONFIG_SETTER(cmd_environment, environment)
 DEFINE_DIR_INT_CONFIG_SETTER(cmd_passenger_stat_throttle_rate, statThrottleRate, unsigned long, 0)
 DEFINE_DIR_STR_CONFIG_SETTER(cmd_passenger_app_root, appRoot)
 DEFINE_DIR_STR_CONFIG_SETTER(cmd_passenger_app_group_name, appGroupName)
-DEFINE_DIR_STR_CONFIG_SETTER(cmd_passenger_user, user)
-DEFINE_DIR_STR_CONFIG_SETTER(cmd_passenger_group, group)
 DEFINE_DIR_STR_CONFIG_SETTER(cmd_passenger_restart_dir, restartDir)
 DEFINE_DIR_STR_CONFIG_SETTER(cmd_passenger_upload_buffer_dir, uploadBufferDir)
 DEFINE_DIR_STR_CONFIG_SETTER(cmd_union_station_key, unionStationKey)
@@ -451,11 +435,6 @@ const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"The default Ruby interpreter to use."),
-	AP_INIT_TAKE1("PassengerRuby",
-		(Take1Func) cmd_passenger_ruby,
-		NULL,
-		OR_OPTIONS | ACCESS_CONF,
-		"The Ruby interpreter to use."),
 	AP_INIT_TAKE1("PassengerLogLevel",
 		(Take1Func) cmd_passenger_log_level,
 		NULL,
@@ -471,11 +450,6 @@ const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"The maximum number of simultaneously alive application instances."),
-	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,
@@ -491,16 +465,6 @@ const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"Whether to enable user switching support."),
-	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_TAKE1("PassengerDefaultUser",
 		(Take1Func) cmd_passenger_default_user,
 		NULL,
@@ -516,21 +480,54 @@ const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"The temp directory that Passenger should use."),
-	AP_INIT_TAKE1("PassengerMaxRequests",
-		(Take1Func) cmd_passenger_max_requests,
+	AP_INIT_TAKE1("PassengerMaxPreloaderIdleTime",
+		(Take1Func) cmd_passenger_max_preloader_idle_time,
 		NULL,
-		OR_LIMIT | ACCESS_CONF | RSRC_CONF,
-		"The maximum number of requests that an application instance may process."),
-	AP_INIT_FLAG("PassengerHighPerformance",
-		(FlagFunc) cmd_passenger_high_performance,
+		RSRC_CONF,
+		"The maximum number of seconds that a preloader process may be idle before it is shutdown."),
+	AP_INIT_TAKE1("UnionStationGatewayAddress",
+		(Take1Func) cmd_union_station_gateway_address,
 		NULL,
-		OR_ALL,
-		"Enable or disable Passenger's high performance mode."),
-	AP_INIT_FLAG("PassengerEnabled",
-		(FlagFunc) cmd_passenger_enabled,
+		RSRC_CONF,
+		"The Union Station Gateway host name."),
+	AP_INIT_TAKE1("UnionStationGatewayPort",
+		(Take1Func) cmd_union_station_gateway_port,
 		NULL,
-		OR_ALL,
-		"Enable or disable Phusion Passenger."),
+		RSRC_CONF,
+		"The Union Station Gateway port number."),
+	AP_INIT_TAKE1("UnionStationGatewayCert",
+		(Take1Func) cmd_union_station_gateway_cert,
+		NULL,
+		RSRC_CONF,
+		"The Union Station Gateway certificate."),
+	AP_INIT_TAKE1("UnionStationProxyAddress",
+		(Take1Func) cmd_union_station_proxy_address,
+		NULL,
+		RSRC_CONF,
+		"The address of the proxy that should be used for sending data to Union Station."),
+	AP_INIT_TAKE1("PassengerAnalyticsLogUser",
+		(Take1Func) cmd_passenger_analytics_log_user,
+		NULL,
+		RSRC_CONF,
+		"The owner of analytics files."),
+	AP_INIT_TAKE1("PassengerAnalyticsLogGroup",
+		(Take1Func) cmd_passenger_analytics_log_group,
+		NULL,
+		RSRC_CONF,
+		"The group of analytics files."),
+	AP_INIT_TAKE1("PassengerPreStart",
+		(Take1Func) cmd_passenger_pre_start,
+		NULL,
+		RSRC_CONF,
+		"Prestart the given web applications during startup."),
+	AP_INIT_TAKE1("PassengerSpawnMethod",
+		(Take1Func) cmd_passenger_spawn_method,
+		NULL,
+		RSRC_CONF,
+		"The spawn method to use."),
+	
+	#include "ConfigurationCommands.cpp"
+	
 	AP_INIT_TAKE1("PassengerAppGroupName",
 		(Take1Func) cmd_passenger_app_group_name,
 		NULL,
@@ -586,62 +583,17 @@ const command_rec passenger_commands[] = {
 		NULL,
 		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
 		"Whether to display friendly error pages when something goes wrong"),
-	AP_INIT_TAKE1("PassengerSpawnMethod",
-		(Take1Func) cmd_passenger_spawn_method,
-		NULL,
-		RSRC_CONF,
-		"The spawn method to use."),
 	AP_INIT_TAKE1("PassengerBaseURI",
 		(Take1Func) cmd_passenger_base_uri,
 		NULL,
 		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
 		"Declare the given base URI as belonging to an application."),
-	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_TAKE1("UnionStationGatewayAddress",
-		(Take1Func) cmd_union_station_gateway_address,
-		NULL,
-		RSRC_CONF,
-		"The Union Station Gateway host name."),
-	AP_INIT_TAKE1("UnionStationGatewayPort",
-		(Take1Func) cmd_union_station_gateway_port,
-		NULL,
-		RSRC_CONF,
-		"The Union Station Gateway port number."),
-	AP_INIT_TAKE1("UnionStationGatewayCert",
-		(Take1Func) cmd_union_station_gateway_cert,
-		NULL,
-		RSRC_CONF,
-		"The Union Station Gateway certificate."),
-	AP_INIT_TAKE1("UnionStationProxyAddress",
-		(Take1Func) cmd_union_station_proxy_address,
-		NULL,
-		RSRC_CONF,
-		"The address of the proxy that should be used for sending data to Union Station."),
-	AP_INIT_TAKE1("PassengerAnalyticsLogUser",
-		(Take1Func) cmd_passenger_analytics_log_user,
-		NULL,
-		RSRC_CONF,
-		"The owner of analytics files."),
-	AP_INIT_TAKE1("PassengerAnalyticsLogGroup",
-		(Take1Func) cmd_passenger_analytics_log_group,
-		NULL,
-		RSRC_CONF,
-		"The group of analytics files."),
-	AP_INIT_TAKE1("PassengerPreStart",
-		(Take1Func) cmd_passenger_pre_start,
-		NULL,
-		RSRC_CONF,
-		"Prestart the given web applications during startup."),
 	AP_INIT_FLAG("UnionStationSupport",
 		(Take1Func) cmd_union_station_support,
 		NULL,
 		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
 		"Whether to enable logging through Union Station."),
-	
+
 	/*****************************/
 	AP_INIT_TAKE1("PassengerMemoryLimit",
 		(Take1Func) cmd_passenger_enterprise_only,