passenger 5.0.23 → 5.0.24

data/src/agent/Core/UnionStation/StopwatchLog.h

@@ -49,17 +49,7 @@ using namespace boost;
 class StopwatchLog: public noncopyable {
 private:
 	Transaction * const transaction;
-	union {
-		const char *name;
-		struct {
-			const char *endMessage;
-			const char *abortMessage;
-		} granular;
-	} data;
-	enum {
-		NAME,
-		GRANULAR
-	} type: 1;
+	const char *id;
 	bool ok;
 
 	static string timevalToString(struct timeval &tv) {
@@ -78,20 +68,19 @@ public:
 		: transaction(NULL)
 		{ }
 
-	StopwatchLog(const TransactionPtr &_transaction, const char *name)
+	StopwatchLog(const TransactionPtr &_transaction, const char *id, const char *nameAndData)
 		: transaction(_transaction.get())
 	{
-		type = NAME;
-		data.name = name;
+		this->id = id;
 		ok = false;
 
-		char message[150];
+		char message[250];
 		char *pos = message;
 		const char *end = message + sizeof(message);
 		struct rusage usage;
 
 		pos = appendData(pos, end, "BEGIN: ");
-		pos = appendData(pos, end, name);
+		pos = appendData(pos, end, id);
 		pos = appendData(pos, end, " (");
 		pos = appendData(pos, end, usecToString(uv_hrtime() / 1000));
 		pos = appendData(pos, end, ",");
@@ -104,23 +93,16 @@ public:
 		pos = appendData(pos, end, timevalToString(usage.ru_stime));
 		pos = appendData(pos, end, ") ");
 
-		if (transaction != NULL) {
-			transaction->message(StaticString(message, pos - message));
+		if (nameAndData != NULL) {
+			try {
+				pos = appendData(pos, end, modp::b64_encode(nameAndData));
+			} catch (const std::runtime_error &) {
+				// non-fatal: ignore
+			}
 		}
-	}
 
-	StopwatchLog(const TransactionPtr &_transaction,
-		const char *beginMessage,
-		const char *endMessage,
-		const char *abortMessage = NULL)
-		: transaction(_transaction.get())
-	{
-		if (_transaction != NULL) {
-			type = GRANULAR;
-			data.granular.endMessage = endMessage;
-			data.granular.abortMessage = abortMessage;
-			ok = abortMessage == NULL;
-			_transaction->message(beginMessage);
+		if (transaction != NULL) {
+			transaction->message(StaticString(message, pos - message));
 		}
 	}
 
@@ -128,38 +110,30 @@ public:
 		if (transaction == NULL) {
 			return;
 		}
-		if (type == NAME) {
-			char message[150];
-			char *pos = message;
-			const char *end = message + sizeof(message);
-			struct rusage usage;
-
-			if (ok) {
-				pos = appendData(pos, end, "END: ");
-			} else {
-				pos = appendData(pos, end, "FAIL: ");
-			}
-			pos = appendData(pos, end, data.name);
-			pos = appendData(pos, end, " (");
-			pos = appendData(pos, end, usecToString(uv_hrtime() / 1000));
-			pos = appendData(pos, end, ",");
-			if (getrusage(RUSAGE_SELF, &usage) == -1) {
-				int e = errno;
-				throw SystemException("getrusage() failed", e);
-			}
-			pos = appendData(pos, end, timevalToString(usage.ru_utime));
-			pos = appendData(pos, end, ",");
-			pos = appendData(pos, end, timevalToString(usage.ru_stime));
-			pos = appendData(pos, end, ")");
+		char message[150];
+		char *pos = message;
+		const char *end = message + sizeof(message);
+		struct rusage usage;
 
-			transaction->message(StaticString(message, pos - message));
+		if (ok) {
+			pos = appendData(pos, end, "END: ");
 		} else {
-			if (ok) {
-				transaction->message(data.granular.endMessage);
-			} else {
-				transaction->message(data.granular.abortMessage);
-			}
+			pos = appendData(pos, end, "FAIL: ");
+		}
+		pos = appendData(pos, end, id);
+		pos = appendData(pos, end, " (");
+		pos = appendData(pos, end, usecToString(uv_hrtime() / 1000));
+		pos = appendData(pos, end, ",");
+		if (getrusage(RUSAGE_SELF, &usage) == -1) {
+			int e = errno;
+			throw SystemException("getrusage() failed", e);
 		}
+		pos = appendData(pos, end, timevalToString(usage.ru_utime));
+		pos = appendData(pos, end, ",");
+		pos = appendData(pos, end, timevalToString(usage.ru_stime));
+		pos = appendData(pos, end, ")");
+
+		transaction->message(StaticString(message, pos - message));
 	}
 
 	void success() {

data/src/agent/UstRouter/ApiServer.h

@@ -171,26 +171,39 @@ private:
 		}
 	}
 
-	static void inspectControllerState(Controller *controller, Json::Value *json) {
-		*json = controller->inspectStateAsJson();
+	void gatherControllerState(Client *client, Request *req, Controller *controller) {
+		Json::Value state = controller->inspectStateAsJson();
+		getContext()->libev->runLater(boost::bind(&ApiServer::controllerStateGathered,
+			this, client, req, state));
+	}
+
+	void controllerStateGathered(Client *client, Request *req, Json::Value state) {
+		if (req->ended()) {
+			unrefRequest(req, __FILE__, __LINE__);
+			return;
+		}
+
+		HeaderTable headers;
+		headers.insert(req->pool, "Content-Type", "application/json");
+
+		writeSimpleResponse(client, 200, &headers,
+			psg_pstrdup(req->pool, state.toStyledString()));
+		if (!req->ended()) {
+			Request *req2 = req;
+			endRequest(&client, &req2);
+		}
+
+		unrefRequest(req, __FILE__, __LINE__);
 	}
 
 	void processServerStatus(Client *client, Request *req) {
 		if (req->method != HTTP_GET) {
 			apiServerRespondWith405(this, client, req);
 		} else if (authorizeStateInspectionOperation(this, client, req)) {
-			HeaderTable headers;
-			headers.insert(req->pool, "Content-Type", "text/json");
-
-			Json::Value json;
-			controller->getContext()->libev->runSync(boost::bind(
-				inspectControllerState, controller, &json));
-
-			writeSimpleResponse(client, 200, &headers,
-				psg_pstrdup(req->pool, json.toStyledString()));
-			if (!req->ended()) {
-				endRequest(&client, &req);
-			}
+			refRequest(req, __FILE__, __LINE__);
+			controller->getContext()->libev->runLater(boost::bind(
+				&ApiServer::gatherControllerState, this,
+				client, req, controller));
 		} else {
 			apiServerRespondWith401(this, client, req);
 		}

data/src/apache2_module/Configuration.cpp

@@ -237,6 +237,7 @@ DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_root, root)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_default_ruby, defaultRuby)
 DEFINE_SERVER_INT_CONFIG_SETTER(cmd_passenger_log_level, logLevel, unsigned int, 0)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_log_file, logFile)
+DEFINE_SERVER_INT_CONFIG_SETTER(cmd_passenger_socket_backlog, socketBacklog, unsigned int, 0)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_file_descriptor_log_file, fileDescriptorLogFile)
 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)
@@ -403,6 +404,11 @@ const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"Passenger log file."),
+	AP_INIT_TAKE1("PassengerSocketBacklog",
+		(Take1Func) cmd_passenger_socket_backlog,
+		NULL,
+		RSRC_CONF,
+		"Override size of the socket backlog."),
 	AP_INIT_TAKE1("PassengerFileDescriptorLogFile",
 		(Take1Func) cmd_passenger_file_descriptor_log_file,
 		NULL,

data/src/apache2_module/Configuration.hpp

@@ -168,6 +168,9 @@ struct ServerConfig {
 	const char *logFile;
 	const char *fileDescriptorLogFile;
 
+	/** Socket backlog for Passenger Core server socket */
+	unsigned int socketBacklog;
+
 	/** The maximum number of simultaneously alive application
 	 * instances. */
 	unsigned int maxPoolSize;
@@ -210,6 +213,7 @@ struct ServerConfig {
 		logLevel           = DEFAULT_LOG_LEVEL;
 		logFile            = NULL;
 		fileDescriptorLogFile = NULL;
+		socketBacklog      = DEFAULT_SOCKET_BACKLOG;
 		maxPoolSize        = DEFAULT_MAX_POOL_SIZE;
 		poolIdleTime       = DEFAULT_POOL_IDLE_TIME;
 		responseBufferHighWatermark = DEFAULT_RESPONSE_BUFFER_HIGH_WATERMARK;

data/src/apache2_module/Hooks.cpp

@@ -1296,6 +1296,7 @@ public:
 			.setBool("load_shell_envvars", true)
 			.set    ("file_descriptor_log_file", (serverConfig.fileDescriptorLogFile == NULL)
 				? "" : serverConfig.fileDescriptorLogFile)
+			.setInt	("socket_backlog", serverConfig.socketBacklog)
 			.set    ("data_buffer_dir", serverConfig.dataBufferDir)
 			.set    ("instance_registry_dir", serverConfig.instanceRegistryDir)
 			.setBool("user_switching", serverConfig.userSwitching)

data/src/cxx_supportlib/Constants.h

@@ -83,6 +83,8 @@
 
 	#define DEFAULT_RUBY "ruby"
 
+	#define DEFAULT_SOCKET_BACKLOG 1024
+
 	#define DEFAULT_SPAWN_METHOD "smart"
 
 	#define DEFAULT_START_TIMEOUT 90000
@@ -119,7 +121,7 @@
 
 	#define PASSENGER_DEFAULT_USER "nobody"
 
-	#define PASSENGER_VERSION "5.0.23"
+	#define PASSENGER_VERSION "5.0.24"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/src/cxx_supportlib/ServerKit/FdSinkChannel.h

@@ -54,7 +54,7 @@ private:
 
 			do {
 				ret = ::write(watcher.fd, buffer.start, buffer.size());
-			} while (ret == -1 && errno == EAGAIN);
+			} while (ret == -1 && errno == EINTR);
 			if (ret == (ssize_t) buffer.size()) {
 				return Result(ret, false);
 			} else if (ret >= 0) {

data/src/cxx_supportlib/Utils.cpp

@@ -1313,7 +1313,7 @@ getHighestFileDescriptor(bool asyncSignalSafe) {
 
 			do {
 				ret = read(p[0], u.data + bytesRead, sizeof(int) - bytesRead);
-			} while (ret == -1 && ret == EINTR);
+			} while (ret == -1 && errno == EINTR);
 			if (ret == -1) {
 				if (errno != EAGAIN) {
 					goto done;

data/src/nginx_module/CacheLocationConfig.c

@@ -47,6 +47,18 @@ int generated_cache_location_part(ngx_conf_t *cf, passenger_loc_conf_t *conf) {
 /* Calculate lengths */
 
 	
+		if (conf->socket_backlog != NGX_CONF_UNSET) {
+			end = ngx_snprintf(int_buf,
+				sizeof(int_buf) - 1,
+				"%d",
+				conf->socket_backlog);
+			len += sizeof("!~PASSENGER_SOCKET_BACKLOG: ") - 1;
+			len += end - int_buf;
+			len += sizeof("\r\n") - 1;
+		}
+	
+
+	
 		if (conf->ruby.data != NULL) {
 			len += sizeof("!~PASSENGER_RUBY: ") - 1;
 			len += conf->ruby.len;
@@ -333,6 +345,20 @@ if (buf == NULL) {
 
 
 	
+		if (conf->socket_backlog != NGX_CONF_UNSET) {
+			pos = ngx_copy(pos,
+				"!~PASSENGER_SOCKET_BACKLOG: ",
+				sizeof("!~PASSENGER_SOCKET_BACKLOG: ") - 1);
+			end = ngx_snprintf(int_buf,
+				sizeof(int_buf) - 1,
+				"%d",
+				conf->socket_backlog);
+			pos = ngx_copy(pos, int_buf, end - int_buf);
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
+		}
+	
+
+	
 		if (conf->ruby.data != NULL) {
 			pos = ngx_copy(pos,
 				"!~PASSENGER_RUBY: ",

data/src/nginx_module/Configuration.c

@@ -86,6 +86,7 @@ passenger_create_main_conf(ngx_conf_t *cf)
     conf->log_level = (ngx_int_t) NGX_CONF_UNSET;
     conf->log_file.data = NULL;
     conf->log_file.len = 0;
+    conf->socket_backlog = NGX_CONF_UNSET_UINT;
     conf->file_descriptor_log_file.data = NULL;
     conf->file_descriptor_log_file.len = 0;
     conf->data_buffer_dir.data = NULL;
@@ -152,6 +153,10 @@ passenger_init_main_conf(ngx_conf_t *cf, void *conf_pointer)
         conf->file_descriptor_log_file.data = (u_char *) "";
     }
 
+    if (conf->socket_backlog == NGX_CONF_UNSET_UINT) {
+        conf->socket_backlog = DEFAULT_SOCKET_BACKLOG;
+    }
+
     if (conf->data_buffer_dir.len == 0) {
         conf->data_buffer_dir.data = (u_char *) "";
     }

data/src/nginx_module/Configuration.h

@@ -40,6 +40,7 @@ typedef struct {
     ngx_int_t    log_level;
     ngx_str_t    log_file;
     ngx_str_t    file_descriptor_log_file;
+    ngx_uint_t   socket_backlog;
     ngx_str_t    data_buffer_dir;
     ngx_str_t    instance_registry_dir;
     ngx_flag_t   abort_on_startup_error;

data/src/nginx_module/ConfigurationCommands.c

@@ -40,6 +40,16 @@
 
 
 
+{
+	
+	ngx_string("passenger_socket_backlog"),
+	NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+	ngx_conf_set_num_slot,
+	NGX_HTTP_MAIN_CONF_OFFSET,
+	offsetof(passenger_main_conf_t, socket_backlog),
+	NULL
+},
+
 {
 	
 	ngx_string("passenger_enabled"),

data/src/nginx_module/ConfigurationFields.h

@@ -85,6 +85,8 @@
 
 	ngx_int_t request_queue_overflow_status_code;
 
+	ngx_int_t socket_backlog;
+
 	ngx_int_t start_timeout;
 
 	ngx_int_t sticky_sessions;

data/src/nginx_module/CreateLocationConfig.c

@@ -42,6 +42,10 @@ void generated_set_conf_part(passenger_loc_conf_t  *conf) {
 
 
 	
+		conf->socket_backlog = NGX_CONF_UNSET;
+	
+
+	
 		conf->enabled = NGX_CONF_UNSET;
 	
 

data/src/nginx_module/MergeLocationConfig.c

@@ -43,6 +43,12 @@ int generated_merge_part(passenger_loc_conf_t *conf, passenger_loc_conf_t *prev,
 
 
 	
+		ngx_conf_merge_value(conf->socket_backlog,
+			prev->socket_backlog,
+			NGX_CONF_UNSET);
+	
+
+	
 		ngx_conf_merge_value(conf->enabled,
 			prev->enabled,
 			NGX_CONF_UNSET);

data/src/nginx_module/ngx_http_passenger_module.c

@@ -284,6 +284,7 @@ start_watchdog(ngx_cycle_t *cycle) {
     psg_variant_map_set_bool   (params, "load_shell_envvars", 1);
     psg_variant_map_set_int    (params, "log_level", passenger_main_conf.log_level);
     psg_variant_map_set_ngx_str(params, "file_descriptor_log_file", &passenger_main_conf.file_descriptor_log_file);
+    psg_variant_map_set_int    (params, "socket_backlog", passenger_main_conf.socket_backlog);
     psg_variant_map_set_ngx_str(params, "data_buffer_dir", &passenger_main_conf.data_buffer_dir);
     psg_variant_map_set_ngx_str(params, "instance_registry_dir", &passenger_main_conf.instance_registry_dir);
     psg_variant_map_set_bool   (params, "user_switching", passenger_main_conf.user_switching);

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,10 +31,10 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h' after changing this number.
-  VERSION_STRING = '5.0.23'
+  VERSION_STRING = '5.0.24'
 
-  PREFERRED_NGINX_VERSION = '1.8.0'
-  NGINX_SHA256_CHECKSUM = '23cca1239990c818d8f6da118320c4979aadf5386deda691b1b7c2c96b9df3d5'
+  PREFERRED_NGINX_VERSION = '1.8.1'
+  NGINX_SHA256_CHECKSUM = '8f4b3c630966c044ec72715754334d1fdf741caa1d5795fb4646c27d09f797b7'
 
   PREFERRED_PCRE_VERSION  = '8.34'
   PCRE_SHA256_CHECKSUM = '1dd78994c81e44ac41cf30b2a21d4b4cc6d76ccde7fc6e77713ed51d7bddca47'

data/src/ruby_supportlib/phusion_passenger/admin_tools/memory_stats.rb

@@ -118,7 +118,7 @@ module PhusionPassenger
       end
 
       def platform_provides_private_dirty_rss_information?
-        return os_name == "linux"
+        return os_name_simple == "linux"
       end
 
       # Returns whether root privileges are required in order to measure private dirty RSS.
@@ -138,8 +138,8 @@ module PhusionPassenger
       # if the system's RAM usage cannot be determined.
       def system_ram_usage
         @total_system_ram ||= begin
-          case os_name
-          when /linux/
+          case os_name_simple
+          when "linux"
             free_text = `free -k`
 
             free_text =~ %r{Mem:(.+)$}
@@ -151,7 +151,7 @@ module PhusionPassenger
             used = line.split(/ +/).first.to_i
 
             [total, used]
-          when /macosx/
+          when "macosx"
             vm_stat = `vm_stat`
             vm_stat =~ /page size of (\d+) bytes/
             page_size = $1
@@ -202,8 +202,8 @@ module PhusionPassenger
       end
 
     private
-      def os_name
-        return PlatformInfo.os_name
+      def os_name_simple
+        return PlatformInfo.os_name_simple
       end
 
       # Returns a list of Process objects that match the given search criteria.
@@ -219,14 +219,14 @@ module PhusionPassenger
       def list_processes(options)
         if options[:exe]
           name = options[:exe].sub(/.*\/(.*)/, '\1')
-          if os_name =~ /linux/
+          if os_name_simple == "linux"
             ps = "ps -C '#{name}'"
           else
             ps = "ps -A"
             options[:match] = Regexp.new(Regexp.escape(name))
           end
         elsif options[:name]
-          if os_name =~ /linux/
+          if os_name_simple == "linux"
             ps = "ps -C '#{options[:name]}'"
           else
             ps = "ps -A"
@@ -239,11 +239,11 @@ module PhusionPassenger
         end
 
         processes = []
-        case os_name
-        when /solaris/
+        case os_name_simple
+        when "solaris"
           ps_output = `#{ps} -o pid,ppid,nlwp,vsz,rss,pcpu,comm`
           threads_known = true
-        when /macosx/
+        when "macosx"
           ps_output = `#{ps} -w -o pid,ppid,vsz,rss,%cpu,command`
           threads_known = false
         else