passenger 4.0.48 → 4.0.49

data/ext/apache2/Bucket.cpp

@@ -34,7 +34,7 @@ static apr_status_t bucket_read(apr_bucket *a, const char **str, apr_size_t *len
 static const apr_bucket_type_t apr_bucket_type_passenger_pipe = {
 	"PASSENGER_PIPE",
 	5,
-	apr_bucket_type_t::APR_BUCKET_DATA, 
+	apr_bucket_type_t::APR_BUCKET_DATA,
 	bucket_destroy,
 	bucket_read,
 	apr_bucket_setaside_notimpl,
@@ -61,11 +61,11 @@ bucket_read(apr_bucket *bucket, const char **str, apr_size_t *len, apr_read_type
 	char *buf;
 	ssize_t ret;
 	BucketData *data;
-	
+
 	data = (BucketData *) bucket->data;
 	*str = NULL;
 	*len = 0;
-	
+
 	if (!data->bufferResponse && block == APR_NONBLOCK_READ) {
 		/*
 		 * The bucket brigade that Hooks::handleRequest() passes using
@@ -85,25 +85,25 @@ bucket_read(apr_bucket *bucket, const char **str, apr_size_t *len, apr_read_type
 		 */
 		return APR_EAGAIN;
 	}
-	
+
 	buf = (char *) apr_bucket_alloc(APR_BUCKET_BUFF_SIZE, bucket->list);
 	if (buf == NULL) {
 		return APR_ENOMEM;
 	}
-	
+
 	do {
 		ret = read(data->state->connection, buf, APR_BUCKET_BUFF_SIZE);
 	} while (ret == -1 && errno == EINTR);
-	
+
 	if (ret > 0) {
 		apr_bucket_heap *h;
-		
+
 		data->state->bytesRead += ret;
-		
+
 		*str = buf;
 		*len = ret;
 		bucket->data = NULL;
-		
+
 		/* Change the current bucket (which is a Passenger Bucket) into a heap bucket
 		 * that contains the data that we just read. This newly created heap bucket
 		 * will be the first in the bucket list.
@@ -111,32 +111,32 @@ bucket_read(apr_bucket *bucket, const char **str, apr_size_t *len, apr_read_type
 		bucket = apr_bucket_heap_make(bucket, buf, *len, apr_bucket_free);
 		h = (apr_bucket_heap *) bucket->data;
 		h->alloc_len = APR_BUCKET_BUFF_SIZE; /* note the real buffer size */
-		
+
 		/* And after this newly created bucket we insert a new Passenger Bucket
 		 * which can read the next chunk from the stream.
 		 */
 		APR_BUCKET_INSERT_AFTER(bucket, passenger_bucket_create(
 			data->state, bucket->list, data->bufferResponse));
-		
+
 		/* The newly created Passenger Bucket has a reference to the session
 		 * object, so we can delete data here.
 		 */
 		delete data;
-		
+
 		return APR_SUCCESS;
-		
+
 	} else if (ret == 0) {
 		data->state->completed = true;
 		delete data;
 		bucket->data = NULL;
-		
+
 		apr_bucket_free(buf);
-		
+
 		bucket = apr_bucket_immortal_make(bucket, "", 0);
 		*str = (const char *) bucket->data;
 		*len = 0;
 		return APR_SUCCESS;
-		
+
 	} else /* ret == -1 */ {
 		int e = errno;
 		data->state->completed = true;
@@ -153,7 +153,7 @@ passenger_bucket_make(apr_bucket *bucket, const PassengerBucketStatePtr &state,
 	BucketData *data = new BucketData();
 	data->state    = state;
 	data->bufferResponse = bufferResponse;
-	
+
 	bucket->type   = &apr_bucket_type_passenger_pipe;
 	bucket->length = (apr_size_t)(-1);
 	bucket->start  = -1;
@@ -164,7 +164,7 @@ passenger_bucket_make(apr_bucket *bucket, const PassengerBucketStatePtr &state,
 apr_bucket *
 passenger_bucket_create(const PassengerBucketStatePtr &state, apr_bucket_alloc_t *list, bool bufferResponse) {
 	apr_bucket *bucket;
-	
+
 	bucket = (apr_bucket *) apr_bucket_alloc(sizeof(*bucket), list);
 	APR_BUCKET_INIT(bucket);
 	bucket->free = apr_bucket_free;

data/ext/apache2/Bucket.h

@@ -36,24 +36,24 @@ using namespace boost;
 struct PassengerBucketState {
 	/** The number of bytes that this PassengerBucket has read so far. */
 	unsigned long bytesRead;
-	
+
 	/** Whether this PassengerBucket is completed, i.e. no more data
 	 * can be read from the underlying file descriptor. When true,
 	 * this can either mean that EOF has been reached, or that an I/O
 	 * error occured. Use errorCode to check whether an error occurred.
 	 */
 	bool completed;
-	
+
 	/** When completed is true, errorCode contains the errno value of
 	 * the last read() call.
 	 *
 	 * A value of 0 means that no error occured.
 	 */
 	int errorCode;
-	
+
 	/** Connection to the helper agent. */
 	FileDescriptor connection;
-	
+
 	PassengerBucketState(const FileDescriptor &conn) {
 		bytesRead  = 0;
 		completed  = false;

data/ext/apache2/Configuration.cpp

@@ -186,7 +186,7 @@ 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);
-	
+
 	#include "CreateDirConfig.cpp"
 
 	config->appRoot = NULL;
@@ -210,14 +210,14 @@ passenger_config_merge_dir(apr_pool_t *p, void *basev, void *addv) {
 	DirConfig *config = create_dir_config_struct(p);
 	DirConfig *base = (DirConfig *) basev;
 	DirConfig *add = (DirConfig *) addv;
-	
+
 	#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(appRoot);
 	MERGE_STRING_CONFIG(appGroupName);
 	config->spawnMethod = (add->spawnMethod == DirConfig::SM_UNSET) ? base->spawnMethod : add->spawnMethod;
@@ -354,7 +354,7 @@ cmd_passenger_max_preloader_idle_time(cmd_parms *cmd, void *pcfg, const char *ar
 	DirConfig *config = (DirConfig *) pcfg;
 	char *end;
 	long int result;
-	
+
 	result = strtol(arg, &end, 10);
 	if (*end != '\0') {
 		return "Invalid number specified for PassengerMaxPreloaderIdleTime.";
@@ -513,9 +513,9 @@ const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"The spawn method to use."),
-	
+
 	#include "ConfigurationCommands.cpp"
-	
+
 	AP_INIT_TAKE1("PassengerAppGroupName",
 		(Take1Func) cmd_passenger_app_group_name,
 		NULL,

data/ext/apache2/Configuration.hpp

@@ -55,7 +55,7 @@ using namespace std;
 
 #define UNSET_INT_VALUE INT_MIN
 
-	
+
 /**
  * Per-directory configuration information.
  *
@@ -65,23 +65,23 @@ using namespace std;
 struct DirConfig {
 	enum Threeway { ENABLED, DISABLED, UNSET };
 	enum SpawnMethod { SM_UNSET, SM_SMART, SM_DIRECT };
-	
+
 	#include "ConfigurationFields.hpp"
 
 	std::set<std::string> baseURIs;
-	
+
 	/** The path to the application's root (for example: RAILS_ROOT
 	 * for Rails applications, directory containing 'config.ru'
 	 * for Rack applications). If this value is NULL, the default
 	 * autodetected path will be used.
 	 */
 	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
@@ -95,62 +95,62 @@ struct DirConfig {
 	 * "How Phusion Passenger detects whether a virtual host is a web application".
 	 */
 	Threeway resolveSymlinksInDocRoot;
-	
+
 	/**
 	 * 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
 	 * or the other.
 	 */
 	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;
-	
+
 	/**
 	 * Whether analytics logging should be enabled.
 	 */
 	Threeway unionStationSupport;
-	
+
 	/**
 	 * Whether response buffering support is enabled.
 	 */
 	Threeway bufferResponse;
-	
+
 	/*************************************/
 	/*************************************/
-	
+
 	bool isEnabled() const {
 		return enabled != DISABLED;
 	}
-	
+
 	StaticString getAppGroupName(const StaticString &appRoot) const {
 		if (appGroupName.empty()) {
 			return appRoot;
@@ -158,7 +158,7 @@ struct DirConfig {
 			return appGroupName;
 		}
 	}
-	
+
 	StaticString getSpawnMethodString() const {
 		switch (spawnMethod) {
 		case SM_SMART:
@@ -173,11 +173,11 @@ struct DirConfig {
 	bool highPerformanceMode() const {
 		return highPerformance == ENABLED;
 	}
-	
+
 	bool allowsEncodedSlashes() const {
 		return allowEncodedSlashes == ENABLED;
 	}
-	
+
 	unsigned long getStatThrottleRate() const {
 		if (statThrottleRateSpecified) {
 			return statThrottleRate;
@@ -185,7 +185,7 @@ struct DirConfig {
 			return 0;
 		}
 	}
-	
+
 	StaticString getRestartDir() const {
 		if (restartDir != NULL) {
 			return restartDir;
@@ -193,7 +193,7 @@ struct DirConfig {
 			return "";
 		}
 	}
-	
+
 	string getUploadBufferDir(const ServerInstanceDir::Generation *generation) const {
 		if (uploadBufferDir != NULL) {
 			return uploadBufferDir;
@@ -203,11 +203,11 @@ struct DirConfig {
 			return getSystemTempDir();
 		}
 	}
-	
+
 	bool showFriendlyErrorPages() const {
 		return friendlyErrorPages != DISABLED;
 	}
-	
+
 	bool useUnionStation() const {
 		return unionStationSupport == ENABLED;
 	}
@@ -215,14 +215,14 @@ struct DirConfig {
 	bool getBufferResponse() const {
 		return bufferResponse == ENABLED;
 	}
-	
+
 	string getUnionStationFilterString() const {
 		if (unionStationFilters.empty()) {
 			return string();
 		} else {
 			string result;
 			vector<string>::const_iterator it;
-			
+
 			for (it = unionStationFilters.begin(); it != unionStationFilters.end(); it++) {
 				if (it != unionStationFilters.begin()) {
 					result.append(1, '\1');
@@ -232,7 +232,7 @@ struct DirConfig {
 			return result;
 		}
 	}
-	
+
 	/*************************************/
 };
 
@@ -251,43 +251,43 @@ struct ServerConfig {
 
 	/** The default Ruby interpreter to use. */
 	const char *defaultRuby;
-	
+
 	/** The log verbosity. */
 	int logLevel;
-	
+
 	/** A file to print debug messages to, or NULL to just use STDERR. */
 	const char *debugLogFile;
-	
+
 	/** The maximum number of simultaneously alive application
 	 * instances. */
 	unsigned int maxPoolSize;
-	
+
 	/** The maximum number of seconds that an application may be
 	 * idle before it gets terminated. */
 	unsigned int poolIdleTime;
-	
+
 	/** Whether user switching support is enabled. */
 	bool userSwitching;
-	
+
 	/** See PoolOptions for more info. */
 	string defaultUser;
 	/** See PoolOptions for more info. */
 	string defaultGroup;
-	
+
 	/** The temp directory that Passenger should use. */
 	string tempDir;
-	
+
 	string unionStationGatewayAddress;
 	int unionStationGatewayPort;
 	string unionStationGatewayCert;
 	string unionStationProxyAddress;
-	
+
 	/** Directory in which analytics logs should be saved. */
 	string analyticsLogUser;
 	string analyticsLogGroup;
-	
+
 	set<string> prestartURLs;
-	
+
 	ServerConfig() {
 		root               = NULL;
 		defaultRuby        = DEFAULT_RUBY;
@@ -305,7 +305,7 @@ struct ServerConfig {
 		analyticsLogUser   = DEFAULT_ANALYTICS_LOG_USER;
 		analyticsLogGroup  = DEFAULT_ANALYTICS_LOG_GROUP;
 	}
-	
+
 	/** Called after the configuration files have been loaded, inside
 	 * the control process.
 	 */
@@ -317,7 +317,7 @@ struct ServerConfig {
 					string("The user that PassengerDefaultUser refers to, '") +
 					defaultUser + "', does not exist.");
 			}
-			
+
 			struct group *groupEntry = getgrgid(userEntry->pw_gid);
 			if (groupEntry == NULL) {
 				throw ConfigurationException(
@@ -326,7 +326,7 @@ struct ServerConfig {
 					"In other words, your system's user account database "
 					"is broken. Please fix it."));
 			}
-			
+
 			defaultGroup = groupEntry->gr_name;
 		}
 	}