passenger 3.0.21 → 3.9.1.beta

data/ext/apache2/Bucket.h

@@ -27,7 +27,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <apr_buckets.h>
-#include "Session.h"
+#include <FileDescriptor.h>
 
 namespace Passenger {
 
@@ -51,10 +51,14 @@ struct PassengerBucketState {
 	 */
 	int errorCode;
 	
-	PassengerBucketState() {
-		bytesRead = 0;
-		completed = false;
-		errorCode = 0;
+	/** Connection to the helper agent. */
+	FileDescriptor connection;
+	
+	PassengerBucketState(const FileDescriptor &conn) {
+		bytesRead  = 0;
+		completed  = false;
+		errorCode  = 0;
+		connection = conn;
 	}
 };
 
@@ -71,15 +75,14 @@ typedef shared_ptr<PassengerBucketState> PassengerBucketStatePtr;
  *   to read less data than can actually be read.
  *
  * PassengerBucket is like apr_bucket_pipe, but:
- * - It also holds a reference to a Session. When a read error has occured
- *   or when end-of-stream has been reached, the Session will be
- *   dereferenced, so that the underlying file descriptor is closed.
+ * - It also holds a reference to the helper agent connection. When a read
+ *   error has occured or when end-of-stream has been reached this connection
+ *   will be closed.
  * - It ignores the APR_NONBLOCK_READ flag because that's known to cause
  *   strange I/O problems.
  * - It can store its current state in a PassengerBucketState data structure.
  */
-apr_bucket *passenger_bucket_create(SessionPtr session,
-                                    PassengerBucketStatePtr state,
+apr_bucket *passenger_bucket_create(const PassengerBucketStatePtr &state,
                                     apr_bucket_alloc_t *list,
                                     bool bufferResponse);
 

data/ext/apache2/Configuration.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - http://www.modrails.com/
- *  Copyright (c) 2010 Phusion
+ *  Copyright (c) 2010, 2011, 2012 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -37,7 +37,7 @@
 #include "Configuration.hpp"
 #include "Utils.h"
 #include "Constants.h"
-#include <LoggingAgent/FilterSupport.h>
+#include <agents/LoggingAgent/FilterSupport.h>
 
 /* The APR headers must come after the Passenger headers. See Hooks.cpp
  * to learn why.
@@ -189,19 +189,18 @@ passenger_config_create_dir(apr_pool_t *p, char *dirspec) {
 	config->autoDetectRails = DirConfig::UNSET;
 	config->autoDetectRack = DirConfig::UNSET;
 	config->autoDetectWSGI = DirConfig::UNSET;
+	config->ruby = NULL;
 	config->environment = NULL;
 	config->appRoot = NULL;
 	config->user = NULL;
 	config->group = NULL;
 	config->spawnMethod = DirConfig::SM_UNSET;
-	config->frameworkSpawnerTimeout = -1;
-	config->appSpawnerTimeout = -1;
+	config->maxPreloaderIdleTime = -1;
 	config->maxRequests = 0;
 	config->maxRequestsSpecified = false;
 	config->minInstances = 1;
 	config->minInstancesSpecified = false;
 	config->highPerformance = DirConfig::UNSET;
-	config->useGlobalQueue = DirConfig::UNSET;
 	config->resolveSymlinksInDocRoot = DirConfig::UNSET;
 	config->allowEncodedSlashes = DirConfig::UNSET;
 	config->statThrottleRate = 0;
@@ -235,18 +234,17 @@ passenger_config_merge_dir(apr_pool_t *p, void *basev, void *addv) {
 	MERGE_THREEWAY_CONFIG(autoDetectRails);
 	MERGE_THREEWAY_CONFIG(autoDetectRack);
 	MERGE_THREEWAY_CONFIG(autoDetectWSGI);
+	MERGE_STR_CONFIG(ruby);
 	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->frameworkSpawnerTimeout = (add->frameworkSpawnerTimeout == -1) ? base->frameworkSpawnerTimeout : add->frameworkSpawnerTimeout;
-	config->appSpawnerTimeout = (add->appSpawnerTimeout == -1) ? base->appSpawnerTimeout : add->appSpawnerTimeout;
+	config->maxPreloaderIdleTime = (add->maxPreloaderIdleTime == -1) ? base->maxPreloaderIdleTime : add->maxPreloaderIdleTime;
 	MERGE_INT_CONFIG(maxRequests);
 	MERGE_INT_CONFIG(minInstances);
 	MERGE_THREEWAY_CONFIG(highPerformance);
-	MERGE_THREEWAY_CONFIG(useGlobalQueue);
 	MERGE_INT_CONFIG(statThrottleRate);
 	MERGE_STR_CONFIG(restartDir);
 	MERGE_STR_CONFIG(uploadBufferDir);
@@ -272,7 +270,6 @@ passenger_config_merge_dir(apr_pool_t *p, void *basev, void *addv) {
  *************************************************/
 
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_root, root)
-DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_ruby, ruby)
 DEFINE_SERVER_INT_CONFIG_SETTER(cmd_passenger_log_level, logLevel, unsigned int, 0)
 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)
@@ -299,10 +296,10 @@ cmd_passenger_pre_start(cmd_parms *cmd, void *pcfg, const char *arg) {
 }
 
 DEFINE_DIR_INT_CONFIG_SETTER(cmd_passenger_min_instances, minInstances, unsigned long, 0)
-DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_passenger_use_global_queue, useGlobalQueue)
 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)
 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)
@@ -330,14 +327,12 @@ cmd_passenger_enterprise_only(cmd_parms *cmd, void *pcfg, const char *arg) {
 static const char *
 cmd_passenger_spawn_method(cmd_parms *cmd, void *pcfg, const char *arg) {
 	DirConfig *config = (DirConfig *) pcfg;
-	if (strcmp(arg, "smart") == 0) {
+	if (strcmp(arg, "smart") == 0 || strcmp(arg, "smart-lv2") == 0) {
 		config->spawnMethod = DirConfig::SM_SMART;
-	} else if (strcmp(arg, "smart-lv2") == 0) {
-		config->spawnMethod = DirConfig::SM_SMART_LV2;
-	} else if (strcmp(arg, "conservative") == 0) {
-		config->spawnMethod = DirConfig::SM_CONSERVATIVE;
+	} else if (strcmp(arg, "conservative") == 0 || strcmp(arg, "direct") == 0) {
+		config->spawnMethod = DirConfig::SM_DIRECT;
 	} else {
-		return "PassengerSpawnMethod may only be 'smart', 'smart-lv2' or 'conservative'.";
+		return "PassengerSpawnMethod may only be 'smart', 'direct'.";
 	}
 	return NULL;
 }
@@ -382,36 +377,21 @@ cmd_rails_base_uri(cmd_parms *cmd, void *pcfg, const char *arg) {
 
 DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_rails_auto_detect, autoDetectRails)
 
-static const char *
-cmd_rails_framework_spawner_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 RailsFrameworkSpawnerIdleTime.";
-	} else if (result < 0) {
-		return "Value for RailsFrameworkSpawnerIdleTime must be at least 0.";
-	} else {
-		config->frameworkSpawnerTimeout = result;
-		return NULL;
-	}
-}
+
 
 static const char *
-cmd_rails_app_spawner_idle_time(cmd_parms *cmd, void *pcfg, const char *arg) {
+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 RailsAppSpawnerIdleTime.";
+		return "Invalid number specified for PassengerMaxPreloaderIdleTime.";
 	} else if (result < 0) {
-		return "Value for RailsAppSpawnerIdleTime must be at least 0.";
+		return "Value for PassengerMaxPreloaderIdleTime must be at least 0.";
 	} else {
-		config->appSpawnerTimeout = result;
+		config->maxPreloaderIdleTime = result;
 		return NULL;
 	}
 }
@@ -454,7 +434,7 @@ static const char *
 cmd_rails_spawn_server(cmd_parms *cmd, void *pcfg, const char *arg) {
 	fprintf(stderr, "WARNING: The 'RailsSpawnServer' option is obsolete. "
 		"Please specify 'PassengerRoot' instead. The correct value was "
-		"given to you by 'passenger-install-apache2-module'.");
+		"given to you by 'passenger-install-apache2-module'.\n");
 	fflush(stderr);
 	return NULL;
 }
@@ -463,7 +443,24 @@ static const char *
 cmd_rails_allow_mod_rewrite(cmd_parms *cmd, void *pcfg, int arg) {
 	fprintf(stderr, "WARNING: The 'RailsAllowModRewrite' option is obsolete: "
 		"Phusion Passenger now fully supports mod_rewrite. "
-		"Please remove this option from your configuration file.");
+		"Please remove this option from your configuration file.\n");
+	fflush(stderr);
+	return NULL;
+}
+
+static const char *
+cmd_rails_framework_spawner_idle_time(cmd_parms *cmd, void *pcfg, const char *arg) {
+	fprintf(stderr, "WARNING: The 'RailsFrameworkSpawnerIdleTime' option is obsolete. "
+		"Please use 'PassengerPreloaderMaxIdleTime' instead.\n");
+	fflush(stderr);
+	return NULL;
+}
+
+static const char *
+cmd_passenger_use_global_queue(cmd_parms *cmd, void *pcfg, int arg) {
+	fprintf(stderr, "WARNING: The 'PassengerUseGlobalQueue' option is obsolete: "
+		"global queueing is now always turned on. "
+		"Please remove this option from your configuration file.\n");
 	fflush(stderr);
 	return NULL;
 }
@@ -482,7 +479,7 @@ const command_rec passenger_commands[] = {
 	AP_INIT_TAKE1("PassengerRuby",
 		(Take1Func) cmd_passenger_ruby,
 		NULL,
-		RSRC_CONF,
+		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
 		"The Ruby interpreter to use."),
 	AP_INIT_TAKE1("PassengerLogLevel",
 		(Take1Func) cmd_passenger_log_level,
@@ -514,11 +511,6 @@ const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"The maximum number of seconds that an application may be idle before it gets terminated."),
-	AP_INIT_FLAG("PassengerUseGlobalQueue",
-		(FlagFunc) cmd_passenger_use_global_queue,
-		NULL,
-		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
-		"Enable or disable Passenger's global queuing mode mode."),
 	AP_INIT_FLAG("PassengerUserSwitching",
 		(FlagFunc) cmd_passenger_user_switching,
 		NULL,
@@ -624,6 +616,11 @@ const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"The spawn method to use."),
+	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,
@@ -711,6 +708,16 @@ const command_rec passenger_commands[] = {
 		NULL,
 		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
 		"Whether to turn on debugger support"),
+	AP_INIT_TAKE1("PassengerConcurrencyModel",
+		(Take1Func) cmd_passenger_enterprise_only,
+		NULL,
+		OR_ALL,
+		"The concurrency model that should be used for applications."),
+	AP_INIT_TAKE1("PassengerThreadCount",
+		(Take1Func) cmd_passenger_enterprise_only,
+		NULL,
+		OR_ALL,
+		"The number of threads that Phusion Passenger should spawn per application."),
 
 	// Rails-specific settings.
 	AP_INIT_TAKE1("RailsBaseURI",
@@ -728,16 +735,6 @@ const command_rec passenger_commands[] = {
 		NULL,
 		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
 		"The environment under which a Rails app must run."),
-	AP_INIT_TAKE1("RailsFrameworkSpawnerIdleTime",
-		(Take1Func) cmd_rails_framework_spawner_idle_time,
-		NULL,
-		RSRC_CONF,
-		"The maximum number of seconds that a framework spawner may be idle before it is shutdown."),
-	AP_INIT_TAKE1("RailsAppSpawnerIdleTime",
-		(Take1Func) cmd_rails_app_spawner_idle_time,
-		NULL,
-		RSRC_CONF,
-		"The maximum number of seconds that an application spawner may be idle before it is shutdown."),
 	
 	// Rack-specific settings.
 	AP_INIT_TAKE1("RackBaseURI",
@@ -767,7 +764,7 @@ const command_rec passenger_commands[] = {
 	AP_INIT_TAKE1("RailsRuby",
 		(Take1Func) cmd_passenger_ruby,
 		NULL,
-		RSRC_CONF,
+		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
 		"Deprecated option."),
 	AP_INIT_TAKE1("RailsMaxPoolSize",
 		(Take1Func) cmd_passenger_max_pool_size,
@@ -799,7 +796,12 @@ const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"Deprecated option."),
-	
+	AP_INIT_TAKE1("RailsAppSpawnerIdleTime",
+		(Take1Func) cmd_passenger_max_preloader_idle_time,
+		NULL,
+		RSRC_CONF,
+		"Deprecated option."),
+
 	// Obsolete options.
 	AP_INIT_TAKE1("RailsSpawnServer",
 		(Take1Func) cmd_rails_spawn_server,
@@ -810,8 +812,18 @@ const command_rec passenger_commands[] = {
 		(FlagFunc) cmd_rails_allow_mod_rewrite,
 		NULL,
 		RSRC_CONF,
-		"Whether custom mod_rewrite rules should be allowed."),
-	
+		"Obsolete option."),
+	AP_INIT_TAKE1("RailsFrameworkSpawnerIdleTime",
+		(Take1Func) cmd_rails_framework_spawner_idle_time,
+		NULL,
+		RSRC_CONF,
+		"Obsolete option."),
+	AP_INIT_FLAG("PassengerUseGlobalQueue",
+		(FlagFunc) cmd_passenger_use_global_queue,
+		NULL,
+		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+		"Obsolete option."),
+
 	{ NULL }
 };
 

data/ext/apache2/Configuration.hpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - http://www.modrails.com/
- *  Copyright (c) 2010 Phusion
+ *  Copyright (c) 2010, 2011, 2012 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -61,7 +61,7 @@ using namespace std;
  */
 struct DirConfig {
 	enum Threeway { ENABLED, DISABLED, UNSET };
-	enum SpawnMethod { SM_UNSET, SM_SMART, SM_SMART_LV2, SM_CONSERVATIVE };
+	enum SpawnMethod { SM_UNSET, SM_SMART, SM_DIRECT };
 	
 	Threeway enabled;
 	
@@ -76,6 +76,9 @@ struct DirConfig {
 	
 	/** Whether to autodetect WSGI applications. */
 	Threeway autoDetectWSGI;
+
+	/** The Ruby interpreter to use. */
+	const char *ruby;
 	
 	/** The environment (RAILS_ENV/RACK_ENV/WSGI_ENV) under which
 	 * applications should operate. */
@@ -103,18 +106,12 @@ struct DirConfig {
 	const char *group;
 	
 	/**
-	 * The idle timeout, in seconds, of Rails framework spawners.
-	 * May also be 0 (which indicates that the framework spawner should
-	 * never idle timeout) or -1 (which means that the value is not specified).
-	 */
-	long frameworkSpawnerTimeout;
-	
-	/**
-	 * The idle timeout, in seconds, of Rails application spawners.
+	 * 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).
+	 * never idle timeout) or -1 (which means that the value is not specified,
+	 * and the default value should be used).
 	 */
-	long appSpawnerTimeout;
+	long maxPreloaderIdleTime;
 	
 	/**
 	 * The maximum number of requests that the spawned application may process
@@ -146,9 +143,6 @@ struct DirConfig {
 	/** Whether high performance mode should be turned on. */
 	Threeway highPerformance;
 	
-	/** Whether global queuing should be used. */
-	Threeway useGlobalQueue;
-	
 	/**
 	 * Whether encoded slashes in URLs should be supported. This however conflicts
 	 * with mod_rewrite support because of a bug/limitation in Apache, so it's one
@@ -204,19 +198,7 @@ struct DirConfig {
 		return enabled != DISABLED;
 	}
 	
-	string getAppRoot(const char *documentRoot) const {
-		if (appRoot == NULL) {
-			if (resolveSymlinksInDocRoot == DirConfig::ENABLED) {
-				return extractDirName(resolveSymlink(documentRoot));
-			} else {
-				return extractDirName(documentRoot);
-			}
-		} else {
-			return appRoot;
-		}
-	}
-	
-	string getAppRoot(const string &documentRoot) const {
+	string getAppRoot(const StaticString &documentRoot) const {
 		if (appRoot == NULL) {
 			if (resolveSymlinksInDocRoot == DirConfig::ENABLED) {
 				return extractDirName(resolveSymlink(documentRoot));
@@ -228,7 +210,7 @@ struct DirConfig {
 		}
 	}
 	
-	const char *getUser() const {
+	StaticString getUser() const {
 		if (user != NULL) {
 			return user;
 		} else {
@@ -236,7 +218,7 @@ struct DirConfig {
 		}
 	}
 	
-	const char *getGroup() const {
+	StaticString getGroup() const {
 		if (group != NULL) {
 			return group;
 		} else {
@@ -244,7 +226,7 @@ struct DirConfig {
 		}
 	}
 	
-	const char *getEnvironment() const {
+	StaticString getEnvironment() const {
 		if (environment != NULL) {
 			return environment;
 		} else {
@@ -252,7 +234,7 @@ struct DirConfig {
 		}
 	}
 	
-	string getAppGroupName(const string &appRoot) const {
+	StaticString getAppGroupName(const StaticString &appRoot) const {
 		if (appGroupName.empty()) {
 			return appRoot;
 		} else {
@@ -260,16 +242,14 @@ struct DirConfig {
 		}
 	}
 	
-	const char *getSpawnMethodString() const {
+	StaticString getSpawnMethodString() const {
 		switch (spawnMethod) {
 		case SM_SMART:
 			return "smart";
-		case SM_SMART_LV2:
-			return "smart-lv2";
-		case SM_CONSERVATIVE:
-			return "conservative";
+		case SM_DIRECT:
+			return "direct";
 		default:
-			return "smart-lv2";
+			return "smart";
 		}
 	}
 	
@@ -293,10 +273,6 @@ struct DirConfig {
 		return highPerformance == ENABLED;
 	}
 	
-	bool usingGlobalQueue() const {
-		return useGlobalQueue != DISABLED;
-	}
-	
 	bool allowsEncodedSlashes() const {
 		return allowEncodedSlashes == ENABLED;
 	}
@@ -309,7 +285,7 @@ struct DirConfig {
 		}
 	}
 	
-	const char *getRestartDir() const {
+	StaticString getRestartDir() const {
 		if (restartDir != NULL) {
 			return restartDir;
 		} else {
@@ -365,9 +341,6 @@ struct DirConfig {
  * the default value if the value is not specified.
  */
 struct ServerConfig {
-	/** The filename of the Ruby interpreter to use. */
-	const char *ruby;
-	
 	/** The Passenger root folder. */
 	const char *root;
 	
@@ -415,7 +388,6 @@ struct ServerConfig {
 	set<string> prestartURLs;
 	
 	ServerConfig() {
-		ruby               = "ruby";
 		root               = NULL;
 		logLevel           = DEFAULT_LOG_LEVEL;
 		debugLogFile       = NULL;