passenger 5.0.21 → 5.0.22

data/src/apache2_module/ConfigurationCommands.cpp

@@ -230,6 +230,13 @@
 		"Application process group name."),
 
 	
+	AP_INIT_TAKE1("PassengerForceMaxConcurrentRequestsPerProcess",
+		(Take1Func) cmd_passenger_force_max_concurrent_requests_per_process,
+		NULL,
+		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+		"Force Passenger to believe that an application process can handle the given number of concurrent requests per process"),
+
+	
 	AP_INIT_TAKE1("RailsEnv",
 		(Take1Func) cmd_passenger_app_env,
 		NULL,

data/src/apache2_module/ConfigurationFields.hpp

@@ -59,6 +59,8 @@ struct GeneratedDirConfigPart {
 	Threeway stickySessions;
 	/** The cookie name to use for sticky sessions. */
 	Threeway stickySessionsCookieName;
+	/** Force Passenger to believe that an application process can handle the given number of concurrent requests per process */
+	int forceMaxConcurrentRequestsPerProcess;
 	/** The maximum number of simultaneously alive application instances a single application may occupy. */
 	int maxInstancesPerApp;
 	/** The maximum number of seconds that a preloader process may be idle before it is shutdown. */

data/src/apache2_module/ConfigurationSetters.cpp

@@ -420,4 +420,28 @@
 			return NULL;
 		}
 	
+	
+		static const char *
+		cmd_passenger_force_max_concurrent_requests_per_process(cmd_parms *cmd, void *pcfg, const char *arg) {
+			DirConfig *config = (DirConfig *) pcfg;
+			char *end;
+			long result;
+
+			result = strtol(arg, &end, 10);
+			if (*end != '\0') {
+				string message = "Invalid number specified for ";
+				message.append(cmd->directive->directive);
+				message.append(".");
+
+				char *messageStr = (char *) apr_palloc(cmd->temp_pool,
+					message.size() + 1);
+				memcpy(messageStr, message.c_str(), message.size() + 1);
+				return messageStr;
+			
+			} else {
+				config->forceMaxConcurrentRequestsPerProcess = (int) result;
+				return NULL;
+			}
+		}
+	
 

data/src/apache2_module/CreateDirConfig.cpp

@@ -66,4 +66,5 @@
 				config->friendlyErrorPages = DirConfig::UNSET;
 				config->restartDir = NULL;
 				config->appGroupName = NULL;
+				config->forceMaxConcurrentRequestsPerProcess = UNSET_INT_VALUE;
 	

data/src/apache2_module/Hooks.cpp

@@ -60,6 +60,7 @@
 #include <Utils/StrIntUtils.h>
 #include <Utils/Timer.h>
 #include <Utils/HttpConstants.h>
+#include <Utils/ReleaseableScopedPointer.h>
 #include <Logging.h>
 #include <WatchdogLauncher.h>
 #include <Constants.h>
@@ -408,8 +409,8 @@ private:
 				return false;
 			}
 		} catch (const DocumentRootDeterminationError &e) {
-			auto_ptr<RequestNote> note(new RequestNote(mapper, config));
-			note->errorReport = new ReportDocumentRootDeterminationError(e);
+			ReleaseableScopedPointer<RequestNote> note(new RequestNote(mapper, config));
+			note.get()->errorReport = new ReportDocumentRootDeterminationError(e);
 			apr_pool_userdata_set(note.release(), "Phusion Passenger",
 				RequestNote::cleanup, r->pool);
 			return true;
@@ -428,8 +429,8 @@ private:
 			 * Phusion Passenger for the rest of the request.
 			 */
 			if (e.code() == EACCES || e.code() == EPERM) {
-				auto_ptr<RequestNote> note(new RequestNote(mapper, config));
-				note->errorReport = new ReportFileSystemError(e);
+				ReleaseableScopedPointer<RequestNote> note(new RequestNote(mapper, config));
+				note.get()->errorReport = new ReportFileSystemError(e);
 				apr_pool_userdata_set(note.release(), "Phusion Passenger",
 					RequestNote::cleanup, r->pool);
 				return true;
@@ -1513,7 +1514,7 @@ public:
 		RequestNote *note = getRequestNote(r);
 		if (note != 0 && hasModAutoIndex()) {
 			note->handlerBeforeModAutoIndex = r->handler;
-			r->handler = "";
+			r->handler = "passenger-skip-autoindex";
 		}
 		return DECLINED;
 	}

data/src/apache2_module/MergeDirConfig.cpp

@@ -229,3 +229,10 @@
 			add->appGroupName;
 	
 
+	
+		config->forceMaxConcurrentRequestsPerProcess =
+			(add->forceMaxConcurrentRequestsPerProcess == UNSET_INT_VALUE) ?
+			base->forceMaxConcurrentRequestsPerProcess :
+			add->forceMaxConcurrentRequestsPerProcess;
+	
+

data/src/apache2_module/SetHeaders.cpp

@@ -150,3 +150,8 @@
 			sizeof("!~PASSENGER_APP_GROUP_NAME") - 1), config->appGroupName);
 	
 
+	
+		addHeader(r, result, StaticString("!~PASSENGER_FORCE_MAX_CONCURRENT_REQUESTS_PER_PROCESS",
+			sizeof("!~PASSENGER_FORCE_MAX_CONCURRENT_REQUESTS_PER_PROCESS") - 1), config->forceMaxConcurrentRequestsPerProcess);
+	
+

data/src/cxx_supportlib/Constants.h

@@ -69,6 +69,8 @@
 
 	#define DEFAULT_MAX_PRELOADER_IDLE_TIME 300
 
+	#define DEFAULT_MAX_REQUEST_QUEUE_SIZE 100
+
 	#define DEFAULT_MBUF_CHUNK_SIZE 512
 
 	#define DEFAULT_NODEJS "node"
@@ -109,15 +111,15 @@
 
 	#define MESSAGE_SERVER_MAX_USERNAME_SIZE 100
 
-	#define PASSENGER_API_VERSION "0.2"
+	#define PASSENGER_API_VERSION "0.3"
 
 	#define PASSENGER_API_VERSION_MAJOR 0
 
-	#define PASSENGER_API_VERSION_MINOR 2
+	#define PASSENGER_API_VERSION_MINOR 3
 
 	#define PASSENGER_DEFAULT_USER "nobody"
 
-	#define PASSENGER_VERSION "5.0.21"
+	#define PASSENGER_VERSION "5.0.22"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/src/cxx_supportlib/SafeLibev.h

@@ -31,6 +31,7 @@
 #include <list>
 #include <memory>
 #include <boost/thread.hpp>
+#include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
@@ -81,7 +82,7 @@ private:
 	}
 
 	static void timeoutHandler(int revents, void *arg) {
-		auto_ptr<Callback> callback((Callback *) arg);
+		boost::scoped_ptr<Callback> callback((Callback *) arg);
 		(*callback)();
 	}
 

data/src/cxx_supportlib/UnionStationFilterSupport.h

@@ -47,6 +47,7 @@
 #include <StaticString.h>
 #include <Exceptions.h>
 #include <Utils/StrIntUtils.h>
+#include <Utils/ReleaseableScopedPointer.h>
 
 namespace Passenger {
 namespace FilterSupport {
@@ -783,7 +784,7 @@ private:
 
 	SimpleContext *parse() const {
 		if (parsedData == NULL) {
-			auto_ptr<SimpleContext> ctx(new SimpleContext());
+			ReleaseableScopedPointer<SimpleContext> ctx(new SimpleContext());
 			reallyParse(logData, *ctx.get());
 			parsedData = ctx.release();
 		}

data/src/cxx_supportlib/Utils/ReleaseableScopedPointer.h

@@ -0,0 +1,70 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2015 Phusion Holding B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Phusion Holding B.V.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+#ifndef _PASSENGER_RELEASEABLE_SCOPED_POINTER_H_
+#define _PASSENGER_RELEASEABLE_SCOPED_POINTER_H_
+
+#include <boost/noncopyable.hpp>
+#include <cstddef>
+
+namespace Passenger {
+
+
+using namespace std;
+
+/**
+ * This is like std::auto_ptr, but does not raise deprecation warnings on newer
+ * compilers. We cannot replace std::auto_ptr with boost::scoped_ptr or
+ * boost::shared_ptr because have a few use cases for std::auto_ptr.release().
+ */
+template<typename T>
+class ReleaseableScopedPointer: public boost::noncopyable {
+private:
+	T *p;
+
+public:
+	ReleaseableScopedPointer(T *_p)
+		: p(_p)
+		{ }
+
+	~ReleaseableScopedPointer() {
+		delete p;
+	}
+
+	T *get() const {
+		return p;
+	}
+
+	T *release() {
+		T *tmp = p;
+		p = NULL;
+		return tmp;
+	}
+};
+
+
+} // namespace Passenger
+
+#endif /* _PASSENGER_RELEASEABLE_SCOPED_POINTER_H_ */

data/src/cxx_supportlib/vendor-modified/boost/libs/regex/src/regex_raw_buffer.cpp

@@ -3,8 +3,8 @@
  * Copyright (c) 2004
  * John Maddock
  *
- * Use, modification and distribution are subject to the 
- * Boost Software License, Version 1.0. (See accompanying file 
+ * Use, modification and distribution are subject to the
+ * Boost Software License, Version 1.0. (See accompanying file
  * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
@@ -36,15 +36,15 @@ namespace boost{ namespace re_detail{
 
 void BOOST_REGEX_CALL raw_storage::resize(size_type n)
 {
-   register size_type newsize = start ? last - start : 1024;
+   size_type newsize = start ? last - start : 1024;
    while(newsize < n)
       newsize *= 2;
-   register size_type datasize = end - start;
+   size_type datasize = end - start;
    // extend newsize to WORD/DWORD boundary:
    newsize = (newsize + padding_mask) & ~(padding_mask);
 
    // allocate and copy data:
-   register pointer ptr = static_cast<pointer>(::operator new(newsize));
+   pointer ptr = static_cast<pointer>(::operator new(newsize));
    BOOST_REGEX_NOEH_ASSERT(ptr)
    if(start)
       std::memcpy(ptr, start, datasize);
@@ -63,7 +63,7 @@ void* BOOST_REGEX_CALL raw_storage::insert(size_type pos, size_type n)
    BOOST_ASSERT(pos <= size_type(end - start));
    if(size_type(last - end) < n)
       resize(n + (end - start));
-   register void* result = start + pos;
+   void* result = start + pos;
    std::memmove(start + pos + n, start + pos, (end - start) - pos);
    end += n;
    return result;

data/src/helper-scripts/node-loader.js

@@ -32,6 +32,10 @@ var net = require('net');
 var http = require('http');
 
 var LineReader = require('phusion_passenger/line_reader').LineReader;
+var ustLog = require('phusion_passenger/ustrouter_connector');
+
+var instrumentModulePaths = [ 'phusion_passenger/log_express', 'phusion_passenger/log_mongodb'];
+var instrumentedModules = [];
 
 module.isApplicationLoader = true; // https://groups.google.com/forum/#!topic/compoundjs/4txxkNtROQg
 GLOBAL.PhusionPassenger = exports.PhusionPassenger = new EventEmitter();
@@ -76,13 +80,62 @@ function readOptions() {
 	readNextOption();
 }
 
+function passengerToWinstonLogLevel(passengerLogLevel) {
+	switch (passengerLogLevel) {
+		case "1":
+			return "error";
+		case "2":
+			return "warn";
+		case "3": // notice
+		case "4": // info
+			return "info";
+		case "5": // debug
+			return "verbose";
+		case "6": // debug2
+			return "debug";
+		case "7": // debug3
+			return "silly";
+		case "0": // crit
+		default:
+			break;
+	}
+	
+	return "none";
+}
+
 function setupEnvironment(options) {
 	PhusionPassenger.options = options;
 	PhusionPassenger.configure = configure;
 	PhusionPassenger._appInstalled = false;
+	
+	var logLevel = passengerToWinstonLogLevel(PhusionPassenger.options.log_level);
+	var winston = require("vendor-copy/winston");
+	var logger = new (winston.Logger)({
+  		transports: [ 
+  			new (winston.transports.Console)({ level: logLevel, debugStdout: true })
+  		]
+	});
+	
 	process.title = 'Passenger NodeApp: ' + options.app_root;
 	http.Server.prototype.originalListen = http.Server.prototype.listen;
 	http.Server.prototype.listen = installServer;
+	
+	ustLog.init(logger, PhusionPassenger.options.ust_router_address, PhusionPassenger.options.ust_router_username, 
+		PhusionPassenger.options.ust_router_password, PhusionPassenger.options.union_station_key, PhusionPassenger.options.app_group_name);
+
+	if (ustLog.isEnabled()) {
+		// must be first so other modules can use the cls context
+		require('vendor-copy/continuation-local-storage').createNamespace('passenger-request-ctx');
+		
+		global.phusion_passenger_ustReporter = require('phusion_passenger/ustreporter');
+		global.phusion_passenger_ustReporter.init(logger, options.app_root, ustLog);
+		
+		instrumentModulePaths.forEach(function(modulePath) {
+			var module = require(modulePath);
+			instrumentedModules.push(module);
+			module.initPreLoad(logger, options.app_root, ustLog);
+		});
+	}
 
 	stdinReader.close();
 	stdinReader = undefined;
@@ -90,6 +143,12 @@ function setupEnvironment(options) {
 	process.stdin.resume();
 
 	loadApplication();
+	
+	if (ustLog.isEnabled()) {
+		instrumentedModules.forEach(function(module) {
+			module.initPostLoad();
+		});
+	}
 }
 
 /**

data/src/nginx_module/CacheLocationConfig.c

@@ -303,6 +303,27 @@ int generated_cache_location_part(ngx_conf_t *cf, passenger_loc_conf_t *conf) {
 		}
 	
 
+	
+		if (conf->abort_websockets_on_process_shutdown != NGX_CONF_UNSET) {
+			len += sizeof("!~PASSENGER_ABORT_WEBSOCKETS_ON_PROCESS_SHUTDOWN: ") - 1;
+			len += conf->abort_websockets_on_process_shutdown
+				? sizeof("t\r\n") - 1
+				: sizeof("f\r\n") - 1;
+		}
+	
+
+	
+		if (conf->force_max_concurrent_requests_per_process != NGX_CONF_UNSET) {
+			end = ngx_snprintf(int_buf,
+				sizeof(int_buf) - 1,
+				"%d",
+				conf->force_max_concurrent_requests_per_process);
+			len += sizeof("!~PASSENGER_FORCE_MAX_CONCURRENT_REQUESTS_PER_PROCESS: ") - 1;
+			len += end - int_buf;
+			len += sizeof("\r\n") - 1;
+		}
+	
+
 
 /* Create string */
 buf = pos = ngx_pnalloc(cf->pool, len);
@@ -666,6 +687,33 @@ if (buf == NULL) {
 		}
 	
 
+	
+		if (conf->abort_websockets_on_process_shutdown != NGX_CONF_UNSET) {
+			pos = ngx_copy(pos,
+				"!~PASSENGER_ABORT_WEBSOCKETS_ON_PROCESS_SHUTDOWN: ",
+				sizeof("!~PASSENGER_ABORT_WEBSOCKETS_ON_PROCESS_SHUTDOWN: ") - 1);
+			if (conf->abort_websockets_on_process_shutdown) {
+				pos = ngx_copy(pos, "t\r\n", sizeof("t\r\n") - 1);
+			} else {
+				pos = ngx_copy(pos, "f\r\n", sizeof("f\r\n") - 1);
+			}
+		}
+	
+
+	
+		if (conf->force_max_concurrent_requests_per_process != NGX_CONF_UNSET) {
+			pos = ngx_copy(pos,
+				"!~PASSENGER_FORCE_MAX_CONCURRENT_REQUESTS_PER_PROCESS: ",
+				sizeof("!~PASSENGER_FORCE_MAX_CONCURRENT_REQUESTS_PER_PROCESS: ") - 1);
+			end = ngx_snprintf(int_buf,
+				sizeof(int_buf) - 1,
+				"%d",
+				conf->force_max_concurrent_requests_per_process);
+			pos = ngx_copy(pos, int_buf, end - int_buf);
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
+		}
+	
+
 
 	conf->options_cache.data = buf;
 	conf->options_cache.len = pos - buf;

data/src/nginx_module/ConfigurationCommands.c

@@ -490,6 +490,26 @@
 	NULL
 },
 
+{
+	
+	ngx_string("passenger_abort_websockets_on_process_shutdown"),
+	NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
+	ngx_conf_set_flag_slot,
+	NGX_HTTP_LOC_CONF_OFFSET,
+	offsetof(passenger_loc_conf_t, abort_websockets_on_process_shutdown),
+	NULL
+},
+
+{
+	
+	ngx_string("passenger_force_max_concurrent_requests_per_process"),
+	NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+	ngx_conf_set_num_slot,
+	NGX_HTTP_LOC_CONF_OFFSET,
+	offsetof(passenger_loc_conf_t, force_max_concurrent_requests_per_process),
+	NULL
+},
+
 {
 	
 	ngx_string("passenger_fly_with"),