passenger 4.0.23 → 4.0.24

data/ext/apache2/Hooks.cpp

@@ -680,83 +680,25 @@ private:
 				}
 				apr_table_setn(r->headers_out, "Status", r->status_line);
 				
-				//bool xsendfile = hasModXsendfile() &&
-				//	apr_table_get(r->err_headers_out, "X-Sendfile");
-				
 				UPDATE_TRACE_POINT();
-				ap_pass_brigade(r->output_filters, bb);
-				
-				/*
-				if (r->connection->aborted) {
-					P_WARN("Either the visitor clicked on the 'Stop' button in the "
-						"web browser, or the visitor's connection has stalled "
-						"and couldn't receive the data that Apache is sending "
-						"to it. As a result, you will probably see a 'Broken Pipe' "
-						"error in this log file. Please ignore it, "
-						"this is normal. You might also want to increase Apache's "
-						"TimeOut configuration option if you experience this "
-						"problem often.");
-				} else if (!bucketState->completed && !xsendfile) {
-					// mod_xsendfile drops the entire output bucket so
-					// suppress this message when mod_xsendfile is active.
-					P_WARN("Apache stopped forwarding the backend's response, "
-						"even though the HTTP client did not close the "
-						"connection. Is this an Apache bug?");
+				if (config->errorOverride == DirConfig::ENABLED
+				 && ap_is_HTTP_ERROR(r->status))
+				{
+					/* Send ErrorDocument.
+					 * Clear r->status for override error, otherwise ErrorDocument
+					 * thinks that this is a recursive error, and doesn't find the
+					 * custom error page.
+					 */
+					int originalStatus = r->status;
+					r->status = HTTP_OK;
+					return originalStatus;
+				} if (ap_pass_brigade(r->output_filters, bb) == APR_SUCCESS) {
+					apr_brigade_cleanup(bb);
 				}
-				*/
-				
 				return OK;
-			} else if (backendData[0] == '\0') {
-				/* if ((long long) timer.elapsed() >= r->server->timeout / 1000) {
-					// Looks like an I/O timeout.
-					P_ERROR("No data received from " <<
-						"the backend application (process " <<
-						backendPid << ") within " <<
-						(r->server->timeout / 1000) << " msec. Either " <<
-						"the backend application is frozen, or " <<
-						"your TimeOut value of " <<
-						(r->server->timeout / 1000000) <<
-						" seconds is too low. Please check " <<
-						"whether your application is frozen, or " <<
-						"increase the value of the TimeOut " <<
-						"configuration directive.");
-				} else {
-					P_ERROR("The backend application (process " <<
-						backendPid << ") did not send a valid " <<
-						"HTTP response; instead, it sent nothing " <<
-						"at all. It is possible that it has crashed; " <<
-						"please check whether there are crashing " <<
-						"bugs in this application.");
-				} */
-				apr_table_setn(r->err_headers_out, "Status", "500 Internal Server Error");
-				return HTTP_INTERNAL_SERVER_ERROR;
 			} else {
-				/* if ((long long) timer.elapsed() >= r->server->timeout / 1000) {
-					// Looks like an I/O timeout.
-					P_ERROR("The backend application (process " <<
-						backendPid << ") hasn't sent a valid " <<
-						"HTTP response within " <<
-						(r->server->timeout / 1000) << " msec. Either " <<
-						"the backend application froze while " <<
-						"sending a response, or " <<
-						"your TimeOut value of " <<
-						(r->server->timeout / 1000000) <<
-						" seconds is too low. Please check " <<
-						"whether the application is frozen, or " <<
-						"increase the value of the TimeOut " <<
-						"configuration directive. The application " <<
-						"has sent this data so far: [" <<
-						backendData << "]");
-				} else {
-					P_ERROR("The backend application (process " <<
-						backendPid << ") didn't send a valid " <<
-						"HTTP response. It might have crashed " <<
-						"during the middle of sending an HTTP " <<
-						"response, so please check whether there " <<
-						"are crashing problems in your application. " <<
-						"This is the data that it sent: [" <<
-						backendData << "]");
-				} */
+				// HelperAgent sent an empty response, or an invalid response.
+				apr_brigade_cleanup(bb);
 				apr_table_setn(r->err_headers_out, "Status", "500 Internal Server Error");
 				return HTTP_INTERNAL_SERVER_ERROR;
 			}
@@ -1005,7 +947,6 @@ private:
 		addHeader(output, "PASSENGER_APP_ROOT", mapper.getAppRoot());
 		addHeader(output, "PASSENGER_APP_GROUP_NAME", config->getAppGroupName(mapper.getAppRoot()));
 		#include "SetHeaders.cpp"
-		addHeader(output, "PASSENGER_PYTHON", config->python);
 		addHeader(output, "PASSENGER_ENV", config->getEnvironment());
 		addHeader(output, "PASSENGER_SPAWN_METHOD", config->getSpawnMethodString());
 		addHeader(r, output, "PASSENGER_MAX_REQUEST_QUEUE_SIZE", config->maxRequestQueueSize);

data/ext/apache2/MergeDirConfig.cpp

@@ -47,6 +47,20 @@
 	
 
 	
+		config->python =
+			(add->python == NULL) ?
+			base->python :
+			add->python;
+	
+
+	
+		config->nodejs =
+			(add->nodejs == NULL) ?
+			base->nodejs :
+			add->nodejs;
+	
+
+	
 		config->minInstances =
 			(add->minInstances == UNSET_INT_VALUE) ?
 			base->minInstances :
@@ -68,6 +82,13 @@
 	
 
 	
+		config->errorOverride =
+			(add->errorOverride == DirConfig::UNSET) ?
+			base->errorOverride :
+			add->errorOverride;
+	
+
+	
 		config->maxRequests =
 			(add->maxRequests == UNSET_INT_VALUE) ?
 			base->maxRequests :

data/ext/apache2/SetHeaders.cpp

@@ -44,6 +44,14 @@
 	
 
 	
+		addHeader(output, "PASSENGER_PYTHON", config->python);
+	
+
+	
+		addHeader(output, "PASSENGER_NODEJS", config->nodejs);
+	
+
+	
 		addHeader(r, output, "PASSENGER_MIN_INSTANCES", config->minInstances);
 	
 

data/ext/common/ApplicationPool2/Group.h

@@ -186,7 +186,7 @@ private:
 	void spawnThreadRealMain(const SpawnerPtr &spawner, const Options &options,
 		unsigned int restartsInitiated);
 	void finalizeRestart(GroupPtr self, Options options, SpawnerFactoryPtr spawnerFactory,
-		vector<Callback> postLockActions);
+		unsigned int restartsInitiated, vector<Callback> postLockActions);
 	void startCheckingDetachedProcesses(bool immediately);
 	void detachedProcessesCheckerMain(GroupPtr self);
 	void wakeUpGarbageCollector();

data/ext/common/ApplicationPool2/Implementation.cpp

@@ -907,17 +907,19 @@ Group::restart(const Options &options) {
 	vector<Callback> actions;
 
 	assert(isAlive());
-	assert(!m_restarting);
 	P_DEBUG("Restarting group " << name);
-	// Tell the restarter thread to exit as soon as possible.
+
+	// If there is currently a restarter thread or a spawner thread active,
+	// the following tells them to abort their current work as soon as possible.
 	restartsInitiated++;
+
 	m_spawning = false;
 	m_restarting = true;
 	detachAll(actions);
 	getPool()->interruptableThreads.create_thread(
 		boost::bind(&Group::finalizeRestart, this, shared_from_this(),
 			options.copyAndPersist().clearPerRequestFields(),
-			getPool()->spawnerFactory, actions),
+			getPool()->spawnerFactory, restartsInitiated, actions),
 		"Group restarter: " + name,
 		POOL_HELPER_THREAD_STACK_SIZE
 	);
@@ -926,7 +928,7 @@ Group::restart(const Options &options) {
 // The 'self' parameter is for keeping the current Group object alive while this thread is running.
 void
 Group::finalizeRestart(GroupPtr self, Options options, SpawnerFactoryPtr spawnerFactory,
-	vector<Callback> postLockActions)
+	unsigned int restartsInitiated, vector<Callback> postLockActions)
 {
 	TRACE_POINT();
 
@@ -957,6 +959,15 @@ Group::finalizeRestart(GroupPtr self, Options options, SpawnerFactoryPtr spawner
 		P_DEBUG("Group " << name << " is shutting down, so aborting restart");
 		return;
 	}
+	if (restartsInitiated != this->restartsInitiated) {
+		// Before this restart could be finalized, another restart command was given.
+		// The spawner we just created might be out of date now so we abort.
+		P_DEBUG("Restart of group " << name << " aborted because a new restart was initiated concurrently");
+		if (debug != NULL && debug->restarting) {
+			debug->debugger->send("Restarting aborted");
+		}
+		return;
+	}
 
 	// Run some sanity checks.
 	pool->fullVerifyInvariants();
@@ -1006,8 +1017,14 @@ void
 Group::detachedProcessesCheckerMain(GroupPtr self) {
 	TRACE_POINT();
 	PoolPtr pool = getPool();
-	boost::unique_lock<boost::mutex> lock(pool->syncher);
 
+	Pool::DebugSupportPtr debug = pool->debugSupport;
+	if (debug != NULL && debug->detachedProcessesChecker) {
+		debug->debugger->send("About to start detached processes checker");
+		debug->messages->recv("Proceed with starting detached processes checker");
+	}
+
+	boost::unique_lock<boost::mutex> lock(pool->syncher);
 	while (true) {
 		assert(detachedProcessesCheckerActive);
 

data/ext/common/ApplicationPool2/Options.h

@@ -101,6 +101,7 @@ private:
 		
 		result.push_back(&ruby);
 		result.push_back(&python);
+		result.push_back(&nodejs);
 		result.push_back(&loggingAgentAddress);
 		result.push_back(&loggingAgentUsername);
 		result.push_back(&loggingAgentPassword);
@@ -245,6 +246,12 @@ public:
 	 * is a Python app.
 	 */
 	StaticString python;
+
+	/**
+	 * Path to the Node.js command to use, in case the application to spawn
+	 * is a Node.js app.
+	 */
+	StaticString nodejs;
 	
 	/**
 	 * Any rights that the spawned application process may have. The SpawnManager
@@ -386,6 +393,7 @@ public:
 		defaultUser             = "nobody";
 		ruby                    = DEFAULT_RUBY;
 		python                  = DEFAULT_PYTHON;
+		nodejs                  = DEFAULT_NODEJS;
 		rights                  = DEFAULT_BACKEND_ACCOUNT_RIGHTS;
 		debugger                = false;
 		loadShellEnvvars        = true;
@@ -532,6 +540,7 @@ public:
 			appendKeyValue (vec, "postexec_chroot",    postexecChroot);
 			appendKeyValue (vec, "ruby",               ruby);
 			appendKeyValue (vec, "python",             python);
+			appendKeyValue (vec, "nodejs",             nodejs);
 			appendKeyValue (vec, "logging_agent_address",  loggingAgentAddress);
 			appendKeyValue (vec, "logging_agent_username", loggingAgentUsername);
 			appendKeyValue (vec, "logging_agent_password", loggingAgentPassword);
@@ -585,7 +594,7 @@ public:
 		} else if (appType == "wsgi") {
 			return python + "\t" + resourceLocator.getHelperScriptsDir() + "/wsgi-loader.py";
 		} else if (appType == "node") {
-			return "node\t" + resourceLocator.getHelperScriptsDir() + "/node-loader.js";
+			return nodejs + "\t" + resourceLocator.getHelperScriptsDir() + "/node-loader.js";
 		} else if (appType == "meteor") {
 			return ruby + "\t" + resourceLocator.getHelperScriptsDir() + "/meteor-loader.rb";
 		} else {

data/ext/common/ApplicationPool2/Pool.h

@@ -92,7 +92,9 @@ public:
 	typedef UnionStation::LoggerPtr LoggerPtr;
 
 	struct DebugSupport {
+		/** Mailbox for the unit tests to receive messages on. */
 		MessageBoxPtr debugger;
+		/** Mailbox for the ApplicationPool code to receive messages on. */
 		MessageBoxPtr messages;
 
 		// Choose aspects to debug.
@@ -101,6 +103,7 @@ public:
 		bool superGroup;
 		bool oobw;
 		bool testOverflowRequestQueue;
+		bool detachedProcessesChecker;
 
 		// The following fields may only be accessed by Pool.
 		boost::mutex syncher;
@@ -113,6 +116,7 @@ public:
 			spawning   = true;
 			superGroup = false;
 			oobw       = false;
+			detachedProcessesChecker = false;
 			testOverflowRequestQueue = false;
 			spawnLoopIteration = 0;
 		}

data/ext/common/Constants.h

@@ -52,6 +52,8 @@
 
 	#define DEFAULT_MAX_POOL_SIZE 6
 
+	#define DEFAULT_NODEJS "node"
+
 	#define DEFAULT_POOL_IDLE_TIME 300
 
 	#define DEFAULT_PYTHON "python"
@@ -78,7 +80,7 @@
 
 	#define NGINX_DOC_URL "http://www.modrails.com/documentation/Users%20guide%20Nginx.html"
 
-	#define PASSENGER_VERSION "4.0.23"
+	#define PASSENGER_VERSION "4.0.24"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 
@@ -98,7 +100,7 @@
 
 	#define STANDALONE_DOC_URL "http://www.modrails.com/documentation/Users%20guide%20Standalone.html"
 
-	#define STANDALONE_NGINX_CONFIGURE_OPTIONS "--with-cc-opt='-Wno-error' --without-http_fastcgi_module --without-http_scgi_module --without-http_uwsgi_module --with-http_gzip_static_module --with-http_stub_status_module"
+	#define STANDALONE_NGINX_CONFIGURE_OPTIONS "--with-cc-opt='-Wno-error' --without-http_fastcgi_module --without-http_scgi_module --without-http_uwsgi_module --with-http_gzip_static_module --with-http_stub_status_module --with-http_ssl_module"
 
 	#define SUPPORT_URL "http://www.phusionpassenger.com/support"
 

data/ext/common/agents/HelperAgent/RequestHandler.h

@@ -1718,6 +1718,7 @@ private:
 		fillPoolOption(client, options.environment, "PASSENGER_ENV");
 		fillPoolOption(client, options.ruby, "PASSENGER_RUBY");
 		fillPoolOption(client, options.python, "PASSENGER_PYTHON");
+		fillPoolOption(client, options.nodejs, "PASSENGER_NODEJS");
 		fillPoolOption(client, options.user, "PASSENGER_USER");
 		fillPoolOption(client, options.group, "PASSENGER_GROUP");
 		fillPoolOption(client, options.minProcesses, "PASSENGER_MIN_INSTANCES");

data/ext/nginx/CacheLocationConfig.c

@@ -58,6 +58,13 @@ u_char int_buf[32], *end, *buf, *pos;
 	
 
 	
+		if (conf->nodejs.data != NULL) {
+			len += 17;
+			len += conf->nodejs.len + 1;
+		}
+	
+
+	
 		if (conf->environment.data != NULL) {
 			len += 14;
 			len += conf->environment.len + 1;
@@ -246,6 +253,19 @@ buf = pos = ngx_pnalloc(cf->pool, len);
 	
 
 	
+		if (conf->nodejs.data != NULL) {
+			pos = ngx_copy(pos,
+				"PASSENGER_NODEJS",
+				17);
+			pos = ngx_copy(pos,
+				conf->nodejs.data,
+				conf->nodejs.len);
+			*pos = '\0';
+			pos++;
+		}
+	
+
+	
 		if (conf->environment.data != NULL) {
 			pos = ngx_copy(pos,
 				"PASSENGER_ENV",

data/ext/nginx/ConfigurationCommands.c

@@ -69,6 +69,16 @@
 	NULL
 },
 
+{
+	
+	ngx_string("passenger_nodejs"),
+	NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+	ngx_conf_set_str_slot,
+	NGX_HTTP_LOC_CONF_OFFSET,
+	offsetof(passenger_loc_conf_t, nodejs),
+	NULL
+},
+
 {
 	
 	ngx_string("passenger_app_env"),

data/ext/nginx/ConfigurationFields.h

@@ -79,6 +79,8 @@
 
 	ngx_str_t group;
 
+	ngx_str_t nodejs;
+
 	ngx_str_t python;
 
 	ngx_str_t ruby;

data/ext/nginx/CreateLocationConfig.c

@@ -54,6 +54,11 @@
 	
 
 	
+		conf->nodejs.data = NULL;
+		conf->nodejs.len  = 0;
+	
+
+	
 		conf->environment.data = NULL;
 		conf->environment.len  = 0;
 	

data/ext/nginx/MergeLocationConfig.c

@@ -58,6 +58,12 @@
 	
 
 	
+		ngx_conf_merge_str_value(conf->nodejs,
+			prev->nodejs,
+			NULL);
+	
+
+	
 		ngx_conf_merge_str_value(conf->environment,
 			prev->environment,
 			NULL);

data/ext/nginx/config

@@ -3,6 +3,8 @@ export PATH
 
 if ! ruby -v >/dev/null 2>/dev/null; then
     echo '*** ERROR: Cannot find the "ruby" command in $PATH. Please fix your $PATH. You can learn more about $PATH at: http://www.modrails.com/documentation/Users%20guide%20Nginx.html#_the_path_environment_variable'
+    echo '*** Do you think that you set $PATH correctly, and you happen to be using sudo or rvmsudo? Read this: http://www.modrails.com/documentation/Users%20guide%20Nginx.html#env_vars_and_sudo'
+    exit 1
 fi
 
 if test "x$PASSENGER_LIBS" = "x" && ! passenger-config --compiled; then
@@ -25,6 +27,13 @@ if test "x$PASSENGER_LIBS" = "x" && ! passenger-config --compiled; then
     echo "*** Phusion Passenger support files have been successfully compiled. ***"
 fi
 
+if test "x$PASSENGER_INCLUDEDIR" = "x"; then
+    PASSENGER_INCLUDEDIR=`passenger-config --includedir`
+fi
+if test "x$PASSENGER_LIBS" = "x"; then
+    PASSENGER_LIBS=`passenger-config --nginx-libs`
+fi
+
 ngx_addon_name=ngx_http_passenger_module
 HTTP_MODULES="$HTTP_MODULES ngx_http_passenger_module"
 NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
@@ -41,20 +50,11 @@ NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
     ${ngx_addon_dir}/ContentHandler.h \
     ${ngx_addon_dir}/StaticContentHandler.h \
     ${ngx_addon_dir}/ngx_http_passenger_module.h \
-    `passenger-config --includedir`/common/Constants.h \
-    `passenger-config --includedir`/common/AgentsStarter.h \
-    `passenger-config --includedir`/common/ApplicationPool2/AppTypes.h"
-if test "x$PASSENGER_INCLUDEDIR" = "x"; then
-    CORE_INCS="$CORE_INCS `passenger-config --includedir`"
-else
-    CORE_INCS="$CORE_INCS $PASSENGER_INCLUDEDIR"
-fi
-if test "x$PASSENGER_LIBS" = "x"; then
-    CORE_LIBS="$CORE_LIBS `passenger-config --nginx-libs`"
-else
-    CORE_LIBS="$CORE_LIBS $PASSENGER_LIBS"
-fi
-CORE_LIBS="$CORE_LIBS -lstdc++ -lpthread"
+    ${PASSENGER_INCLUDEDIR}/common/Constants.h \
+    ${PASSENGER_INCLUDEDIR}/common/AgentsStarter.h \
+    ${PASSENGER_INCLUDEDIR}/common/ApplicationPool2/AppTypes.h"
+CORE_INCS="$CORE_INCS $PASSENGER_INCLUDEDIR"
+CORE_LIBS="$CORE_LIBS $PASSENGER_LIBS -lstdc++ -lpthread"
 
 ngx_feature="Math library"
 ngx_feature_name=