passenger 4.0.60 → 5.0.0.beta1

data/doc/Users guide Standalone.txt

@@ -75,7 +75,7 @@ See `--help` for all available options.
 :version: 4.0.24
 include::users_guide_snippets/since_version.txt[]
 
-It is possible to store some options in a configuration file `passenger-standalone.json` in the application directory. Configuration in this file overrides command line options. The configuration file format is JSON.
+It is possible to store some options in a configuration file `Passengerfile.json` in the application directory. Configuration in this file overrides command line options. The configuration file format is JSON.
 
 In case Passenger Standalone is in <<mass_deployment,mass deployment mode>>, such a configuration file allows customizing options on a per-application basis.
 
@@ -141,7 +141,7 @@ Every time you start Standalone, you must pass the `--nginx-config-template` par
 passenger start --nginx-config-template nginx.conf.erb
 ------------------------------------------
 
-Alternatively, if you don't want to pass this parameter every time, you can also set the `nginx_config_template` option in <<config_file,passenger-standalone.json>>.
+Alternatively, if you don't want to pass this parameter every time, you can also set the `nginx_config_template` option in <<config_file,Passengerfile.json>>.
 
 NOTE: The original configuration template file may change from time to time, e.g. because new features are introduced into Phusion Passenger. If your configuration template file does not contain the required changes, then these new features may not work properly. In the worst case, Standalone might even malfunction. Therefore, every time you upgrade Phusion Passenger, you should check whether the original configuration template file has changed, and merge back any changes into your own file.
 
@@ -403,7 +403,7 @@ Serving these applications on 0.0.0.0 port 3000:
 
 If you for example remove `/webapps/rubyapp.com`, Passenger Standalone will reconfigure itself without that web application. Or if you add a new web applications `/webapps/newapp.org`, Passenger Standalone will reconfigure itself with that web application.
 
-Any options that you pass to the `passenger` command will affect all deployed web applications. It is also possible to change options on a per-application basis through the use of <<config_file,a `passenger-standalone.json` file inside each application's directory>>.
+Any options that you pass to the `passenger` command will affect all deployed web applications. It is also possible to change options on a per-application basis through the use of <<config_file,a `Passengerfile.json` file inside each application's directory>>.
 
 
 [[troubleshooting]]

data/doc/templates/markdown.html.erb

@@ -6,13 +6,43 @@
     <title><%= title %></title>
     <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
     <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
+      <script src="https://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
     <![endif]-->
+    <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,700,400italic,600italic,700italic" rel="stylesheet" type="text/css">
     <style type="text/css">
       <%= css %>
       
+      body {
+        font-family: "Source Sans Pro", sans-serif;
+        color: #444;
+      }
+
+      h1, h2, h3, h4, h5, h6, strong {
+        font-weight: 600;
+      }
+
       h1, h2, h3, h4, h5, h6 {
-        margin-bottom: 9px;
+        color: #333;
+      }
+
+      @media (min-width: 768px) {
+        body {
+          font-size: 18px;
+        }
+
+        pre {
+          font-size: 14px;
+        }
+
+        h1 { font-size: 40px; }
+        h2 { font-size: 34px; }
+        h3 { font-size: 28px; }
+        h4 { font-size: 22px; }
+        h5 { font-size: 20px; }
+
+        p {
+          line-height: 1.55;
+        }
       }
 
       ul ul,
@@ -27,12 +57,12 @@
       }
 
       #container {
-        max-width: 750px;
+        max-width: 800px;
         margin-left: auto;
         margin-right: auto;
       }
 
-      @media(max-width: 767px) {
+      @media(max-width: 830px) {
         #container {
           max-width: auto;
           margin-left: 1em;
@@ -54,8 +84,9 @@
       }
 
       #title {
+        color: black;
         text-align: center;
-        font-size: 400%;
+        font-size: 300%;
         line-height: 1em;
         padding-bottom: 30px;
         margin-bottom: 30px;
@@ -103,7 +134,7 @@
       <div id="bottom-vertical-container-margin"></div>
     </div>
 
-    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
     <script>
       (function() {
         var toc = $('#toc');

data/doc/users_guide_snippets/environment_variables.txt

@@ -225,7 +225,7 @@ PATH=/usr/bin:/usr/local/bin
 You can pass environment variables to Phusion Passenger-served apps through various methods:
 
  * When running Apache, use the `PassEnv` and `SetEnv` directives of link:http://httpd.apache.org/docs/2.4/mod/mod_env.html[mod_env]. This is supported starting from Phusion Passenger 4.0.
- * When running Nginx, use the <<passenger_set_cgi_param,passenger_set_cgi_param>> directive.
+ * When running Nginx, use the <<passenger_env_var,passenger_env_var>> directive.
  * Through your `bashrc`. Starting from version 4.0, Phusion Passenger 4.0 spawns applications through bash and inherit all bash environment variables. Phusion Passenger Standalone tends to be started from the shell and thus inherits all environment variables set by the shell.
  * Through Apache and Nginx, as described earlier in this chapter. Any environment variables that you set on Apache and Nginx itself are inherited by Phusion Passenger, and thus by Phusion Passenger-served apps as well.
  * Through the application itself. Most programming languages provide APIs for setting environment variables. For example in Ruby you can write:

data/doc/users_guide_snippets/support_information.txt

@@ -38,7 +38,7 @@ Supported languages and frameworks:
 | Ruby (MRI)          | 1.8.5
 | JRuby               | 1.7.0
 | Rubinius            | 2.2.0
-| Ruby on Rails       | 1.2
+| Ruby on Rails       | 2.3
 | Python              | 2.6
 | Node.js             | 0.10
 | Meteor              | 0.6

data/doc/users_guide_snippets/tips.txt

@@ -344,7 +344,7 @@ and
 <<PassengerMinInstances,passenger_min_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.
+2. Request out-of-band work by outputting the `!~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.
@@ -355,7 +355,7 @@ Here's an example which implements out-of-band garbage collection using the Out-
 -------------------------------------------------
 # Somewhere in a controller method:
 # Tell Phusion Passenger we want to perform OOB work.
-response.headers["X-Passenger-Request-OOB-Work"] = "true"
+response.headers["!~Request-OOB-Work"] = "true"
 
 # Somewhere during application initialization:
 if defined?(PhusionPassenger)

data/ext/apache2/Configuration.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2013 Phusion
+ *  Copyright (c) 2010-2014 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -190,15 +190,8 @@ passenger_config_create_dir(apr_pool_t *p, char *dirspec) {
 	#include "CreateDirConfig.cpp"
 
 	config->appRoot = NULL;
-	config->spawnMethod = DirConfig::SM_UNSET;
-	config->maxPreloaderIdleTime = -1;
 	config->resolveSymlinksInDocRoot = DirConfig::UNSET;
 	config->allowEncodedSlashes = DirConfig::UNSET;
-	config->statThrottleRate = 0;
-	config->statThrottleRateSpecified = false;
-	config->restartDir = NULL;
-	config->uploadBufferDir = NULL;
-	config->friendlyErrorPages = DirConfig::UNSET;
 	config->unionStationSupport = DirConfig::UNSET;
 	config->bufferResponse = DirConfig::UNSET;
 	/*************************************/
@@ -219,12 +212,6 @@ passenger_config_merge_dir(apr_pool_t *p, void *basev, void *addv) {
 	}
 
 	MERGE_STR_CONFIG(appRoot);
-	MERGE_STRING_CONFIG(appGroupName);
-	config->spawnMethod = (add->spawnMethod == DirConfig::SM_UNSET) ? base->spawnMethod : add->spawnMethod;
-	config->maxPreloaderIdleTime = (add->maxPreloaderIdleTime == -1) ? base->maxPreloaderIdleTime : add->maxPreloaderIdleTime;
-	MERGE_INT_CONFIG(statThrottleRate);
-	MERGE_STR_CONFIG(restartDir);
-	MERGE_STR_CONFIG(uploadBufferDir);
 	MERGE_STRING_CONFIG(unionStationKey);
 	config->unionStationFilters = base->unionStationFilters;
 	for (vector<string>::const_iterator it = add->unionStationFilters.begin(); it != add->unionStationFilters.end(); it++) {
@@ -234,7 +221,6 @@ passenger_config_merge_dir(apr_pool_t *p, void *basev, void *addv) {
 	}
 	MERGE_THREEWAY_CONFIG(resolveSymlinksInDocRoot);
 	MERGE_THREEWAY_CONFIG(allowEncodedSlashes);
-	MERGE_THREEWAY_CONFIG(friendlyErrorPages);
 	MERGE_THREEWAY_CONFIG(unionStationSupport);
 	MERGE_THREEWAY_CONFIG(bufferResponse);
 	/*************************************/
@@ -252,16 +238,19 @@ DEFINE_SERVER_INT_CONFIG_SETTER(cmd_passenger_log_level, logLevel, unsigned int,
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_debug_log_file, debugLogFile)
 DEFINE_SERVER_INT_CONFIG_SETTER(cmd_passenger_max_pool_size, maxPoolSize, unsigned int, 1)
 DEFINE_SERVER_INT_CONFIG_SETTER(cmd_passenger_pool_idle_time, poolIdleTime, unsigned int, 0)
+DEFINE_SERVER_INT_CONFIG_SETTER(cmd_passenger_stat_throttle_rate, statThrottleRate, unsigned int, 0)
 DEFINE_SERVER_BOOLEAN_CONFIG_SETTER(cmd_passenger_user_switching, userSwitching)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_default_user, defaultUser)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_default_group, defaultGroup)
-DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_temp_dir, tempDir)
+DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_data_buffer_dir, dataBufferDir)
+DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_instance_registry_dir, instanceRegistryDir)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_union_station_gateway_address, unionStationGatewayAddress)
 DEFINE_SERVER_INT_CONFIG_SETTER(cmd_union_station_gateway_port, unionStationGatewayPort, int, 1)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_union_station_gateway_cert, unionStationGatewayCert)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_union_station_proxy_address, unionStationProxyAddress)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_analytics_log_user, analyticsLogUser)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_analytics_log_group, analyticsLogGroup)
+DEFINE_SERVER_BOOLEAN_CONFIG_SETTER(cmd_passenger_turbocaching, turbocaching)
 
 static const char *
 cmd_passenger_ctl(cmd_parms *cmd, void *dummy, const char *name, const char *value) {
@@ -277,15 +266,10 @@ cmd_passenger_pre_start(cmd_parms *cmd, void *pcfg, const char *arg) {
 
 #include "ConfigurationSetters.cpp"
 
-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_restart_dir, restartDir)
-DEFINE_DIR_STR_CONFIG_SETTER(cmd_passenger_upload_buffer_dir, uploadBufferDir)
 DEFINE_DIR_STR_CONFIG_SETTER(cmd_union_station_key, unionStationKey)
 DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_passenger_resolve_symlinks_in_document_root, resolveSymlinksInDocRoot)
 DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_passenger_allow_encoded_slashes, allowEncodedSlashes)
-DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_passenger_friendly_error_pages, friendlyErrorPages)
 DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_union_station_support, unionStationSupport)
 DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_passenger_buffer_response, bufferResponse)
 
@@ -302,9 +286,9 @@ static const char *
 cmd_passenger_spawn_method(cmd_parms *cmd, void *pcfg, const char *arg) {
 	DirConfig *config = (DirConfig *) pcfg;
 	if (strcmp(arg, "smart") == 0 || strcmp(arg, "smart-lv2") == 0) {
-		config->spawnMethod = DirConfig::SM_SMART;
+		config->spawnMethod = "smart";
 	} else if (strcmp(arg, "conservative") == 0 || strcmp(arg, "direct") == 0) {
-		config->spawnMethod = DirConfig::SM_DIRECT;
+		config->spawnMethod = "direct";
 	} else {
 		return "PassengerSpawnMethod may only be 'smart', 'direct'.";
 	}
@@ -345,28 +329,6 @@ cmd_union_station_filter(cmd_parms *cmd, void *pcfg, const char *arg) {
 }
 
 
-/*************************************************
- * Rack-specific settings
- *************************************************/
-
-static const char *
-cmd_passenger_max_preloader_idle_time(cmd_parms *cmd, void *pcfg, const char *arg) {
-	DirConfig *config = (DirConfig *) pcfg;
-	char *end;
-	long int result;
-
-	result = strtol(arg, &end, 10);
-	if (*end != '\0') {
-		return "Invalid number specified for PassengerMaxPreloaderIdleTime.";
-	} else if (result < 0) {
-		return "Value for PassengerMaxPreloaderIdleTime must be at least 0.";
-	} else {
-		config->maxPreloaderIdleTime = result;
-		return NULL;
-	}
-}
-
-
 /*************************************************
  * Obsolete settings
  *************************************************/
@@ -463,16 +425,26 @@ const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"The group that Ruby applications must run as when user switching fails or is disabled."),
-	AP_INIT_TAKE1("PassengerTempDir",
-		(Take1Func) cmd_passenger_temp_dir,
+	AP_INIT_TAKE1("PassengerDataBufferDir",
+		(Take1Func) cmd_passenger_data_buffer_dir,
+		NULL,
+		RSRC_CONF,
+		"The directory that data buffers should be stored into."),
+	AP_INIT_TAKE1("PassengerInstanceRegistryDir",
+		(Take1Func) cmd_passenger_instance_registry_dir,
 		NULL,
 		RSRC_CONF,
-		"The temp directory that Passenger should use."),
+		"The directory to register the instance to."),
 	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("PassengerStatThrottleRate",
+		(Take1Func) cmd_passenger_stat_throttle_rate,
+		NULL,
+		RSRC_CONF,
+		"Limit the number of stat calls to once per given seconds."),
 	AP_INIT_TAKE1("UnionStationGatewayAddress",
 		(Take1Func) cmd_union_station_gateway_address,
 		NULL,
@@ -508,39 +480,19 @@ const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"Prestart the given web applications during startup."),
-	AP_INIT_TAKE1("PassengerSpawnMethod",
-		(Take1Func) cmd_passenger_spawn_method,
+	AP_INIT_FLAG("PassengerTurbocaching",
+		(FlagFunc) cmd_passenger_turbocaching,
 		NULL,
 		RSRC_CONF,
-		"The spawn method to use."),
+		"Whether to enable turbocaching."),
 
 	#include "ConfigurationCommands.cpp"
 
-	AP_INIT_TAKE1("PassengerAppGroupName",
-		(Take1Func) cmd_passenger_app_group_name,
-		NULL,
-		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
-		"The temp directory that Passenger should use."),
-	AP_INIT_TAKE1("PassengerStatThrottleRate",
-		(Take1Func) cmd_passenger_stat_throttle_rate,
-		NULL,
-		OR_LIMIT | ACCESS_CONF | RSRC_CONF,
-		"Limit the number of stat calls to once per given seconds."),
-	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("PassengerAppRoot",
 		(Take1Func) cmd_passenger_app_root,
 		NULL,
 		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
 		"The application's root directory."),
-	AP_INIT_TAKE1("PassengerUploadBufferDir",
-		(Take1Func) cmd_passenger_upload_buffer_dir,
-		NULL,
-		OR_OPTIONS,
-		"The directory in which upload buffer files should be placed."),
 	AP_INIT_TAKE1("UnionStationKey",
 		(Take1Func) cmd_union_station_key,
 		NULL,
@@ -566,11 +518,6 @@ const command_rec passenger_commands[] = {
 		NULL,
 		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
 		"Whether to support encoded slashes in the URL"),
-	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("PassengerBaseURI",
 		(Take1Func) cmd_passenger_base_uri,
 		NULL,
@@ -655,11 +602,6 @@ const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"Deprecated option."),
-	AP_INIT_TAKE1("RailsSpawnMethod",
-		(Take1Func) cmd_passenger_spawn_method,
-		NULL,
-		RSRC_CONF,
-		"Deprecated option."),
 	AP_INIT_TAKE1("RailsAppSpawnerIdleTime",
 		(Take1Func) cmd_passenger_max_preloader_idle_time,
 		NULL,

data/ext/apache2/Configuration.hpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2013 Phusion
+ *  Copyright (c) 2010-2014 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -26,7 +26,6 @@
 #define _PASSENGER_CONFIGURATION_HPP_
 
 #include <Logging.h>
-#include <ServerInstanceDir.h>
 #include <Constants.h>
 #include <Utils.h>
 #include <Utils/VariantMap.h>
@@ -64,7 +63,6 @@ using namespace std;
  */
 struct DirConfig {
 	enum Threeway { ENABLED, DISABLED, UNSET };
-	enum SpawnMethod { SM_UNSET, SM_SMART, SM_DIRECT };
 
 	#include "ConfigurationFields.hpp"
 
@@ -77,19 +75,6 @@ struct DirConfig {
 	 */
 	const char *appRoot;
 
-	string appGroupName;
-
-	/** The spawn method to use. */
-	SpawnMethod spawnMethod;
-
-	/**
-	 * The idle timeout, in seconds, of preloader processes.
-	 * May also be 0 (which indicates that the application spawner should
-	 * never idle timeout) or -1 (which means that the value is not specified,
-	 * and the default value should be used).
-	 */
-	long maxPreloaderIdleTime;
-
 	/** Whether symlinks in the document root path should be resolved.
 	 * The implication of this is documented in the users guide, section
 	 * "How Phusion Passenger detects whether a virtual host is a web application".
@@ -103,36 +88,12 @@ struct DirConfig {
 	 */
 	Threeway allowEncodedSlashes;
 
-	/**
-	 * Throttle the number of stat() calls on files like
-	 * restart.txt to the once per given number of seconds.
-	 */
-	unsigned long statThrottleRate;
-
-	/** Indicates whether the statThrottleRate option was
-	 * explicitly specified in the directory configuration. */
-	bool statThrottleRateSpecified;
-
-	/** The directory in which Passenger should look for
-	 * restart.txt. NULL means that the default directory
-	 * should be used.
-	 */
-	const char *restartDir;
-
-	/**
-	 * The directory in which Passenger should place upload buffer
-	 * files. NULL means that the default directory should be used.
-	 */
-	const char *uploadBufferDir;
-
 	string unionStationKey;
 
 	vector<string> unionStationFilters;
 
-	/**
-	 * Whether Phusion Passenger should show friendly error pages.
-	 */
-	Threeway friendlyErrorPages;
+	char *envvarsCache;
+	unsigned int envvarsCacheSize;
 
 	/**
 	 * Whether analytics logging should be enabled.
@@ -147,27 +108,17 @@ struct DirConfig {
 	/*************************************/
 	/*************************************/
 
-	bool isEnabled() const {
-		return enabled != DISABLED;
+	DirConfig() {
+		envvarsCache = NULL;
+		envvarsCacheSize = 0;
 	}
 
-	StaticString getAppGroupName(const StaticString &appRoot) const {
-		if (appGroupName.empty()) {
-			return appRoot;
-		} else {
-			return appGroupName;
-		}
+	~DirConfig() {
+		free(envvarsCache);
 	}
 
-	StaticString getSpawnMethodString() const {
-		switch (spawnMethod) {
-		case SM_SMART:
-			return "smart";
-		case SM_DIRECT:
-			return "direct";
-		default:
-			return "smart";
-		}
+	bool isEnabled() const {
+		return enabled != DISABLED;
 	}
 
 	bool highPerformanceMode() const {
@@ -178,36 +129,6 @@ struct DirConfig {
 		return allowEncodedSlashes == ENABLED;
 	}
 
-	unsigned long getStatThrottleRate() const {
-		if (statThrottleRateSpecified) {
-			return statThrottleRate;
-		} else {
-			return 0;
-		}
-	}
-
-	StaticString getRestartDir() const {
-		if (restartDir != NULL) {
-			return restartDir;
-		} else {
-			return "";
-		}
-	}
-
-	string getUploadBufferDir(const ServerInstanceDir::Generation *generation) const {
-		if (uploadBufferDir != NULL) {
-			return uploadBufferDir;
-		} else if (generation != NULL) {
-			return generation->getPath() + "/buffered_uploads";
-		} else {
-			return getSystemTempDir();
-		}
-	}
-
-	bool showFriendlyErrorPages() const {
-		return friendlyErrorPages != DISABLED;
-	}
-
 	bool useUnionStation() const {
 		return unionStationSupport == ENABLED;
 	}
@@ -266,6 +187,8 @@ struct ServerConfig {
 	 * idle before it gets terminated. */
 	unsigned int poolIdleTime;
 
+	unsigned int statThrottleRate;
+
 	/** Whether user switching support is enabled. */
 	bool userSwitching;
 
@@ -274,8 +197,8 @@ struct ServerConfig {
 	/** See PoolOptions for more info. */
 	string defaultGroup;
 
-	/** The temp directory that Passenger should use. */
-	string tempDir;
+	string dataBufferDir;
+	string instanceRegistryDir;
 
 	string unionStationGatewayAddress;
 	int unionStationGatewayPort;
@@ -286,6 +209,8 @@ struct ServerConfig {
 	string analyticsLogUser;
 	string analyticsLogGroup;
 
+	bool turbocaching;
+
 	set<string> prestartURLs;
 
 	ServerConfig() {
@@ -295,15 +220,16 @@ struct ServerConfig {
 		debugLogFile       = NULL;
 		maxPoolSize        = DEFAULT_MAX_POOL_SIZE;
 		poolIdleTime       = DEFAULT_POOL_IDLE_TIME;
+		statThrottleRate   = DEFAULT_STAT_THROTTLE_RATE;
 		userSwitching      = true;
 		defaultUser        = DEFAULT_WEB_APP_USER;
-		tempDir            = getSystemTempDir();
 		unionStationGatewayAddress = DEFAULT_UNION_STATION_GATEWAY_ADDRESS;
 		unionStationGatewayPort    = DEFAULT_UNION_STATION_GATEWAY_PORT;
 		unionStationGatewayCert    = string();
 		unionStationProxyAddress   = string();
 		analyticsLogUser   = DEFAULT_ANALYTICS_LOG_USER;
 		analyticsLogGroup  = DEFAULT_ANALYTICS_LOG_GROUP;
+		turbocaching       = true;
 	}
 
 	/** Called after the configuration files have been loaded, inside