passenger 4.0.30 → 4.0.31

data/ext/common/agents/HelperAgent/Main.cpp

@@ -122,17 +122,8 @@ private:
 			return false;
 		}
 
-		VariantMap map;
-		vector<string>::const_iterator it = args.begin(), end = args.end();
-		it++;
-		while (it != end) {
-			const string &key = *it;
-			it++;
-			const string &value = *it;
-			map.set(key, value);
-			it++;
-		}
-		writeScalarMessage(commonContext.fd, pool->inspect(Pool::InspectOptions(map)));
+		VariantMap options = argsToOptions(args);
+		writeScalarMessage(commonContext.fd, pool->inspect(Pool::InspectOptions(options)));
 		return true;
 	}
 	
@@ -155,6 +146,22 @@ private:
 		writeScalarMessage(commonContext.fd, oxt::thread::all_backtraces());
 	}
 
+	void processRestartAppGroup(CommonClientContext &commonContext, SpecificContext *specificContext,
+		const vector<string> &args)
+	{
+		TRACE_POINT();
+		commonContext.requireRights(Account::RESTART);
+		VariantMap options = argsToOptions(args, 2);
+		RestartMethod method = RM_DEFAULT;
+		if (options.get("method", false) == "blocking") {
+			method = RM_BLOCKING;
+		} else if (options.get("method", false) == "rolling") {
+			method = RM_ROLLING;
+		}
+		bool result = pool->restartGroupByName(args[1], method);
+		writeArrayMessage(commonContext.fd, result ? "true" : "false", NULL);
+	}
+
 	void processRequests(CommonClientContext &commonContext, SpecificContext *specificContext,
 		const vector<string> &args)
 	{
@@ -191,6 +198,8 @@ public:
 				processToXml(commonContext, specificContext, args);
 			} else if (isCommand(args, "backtraces", 0)) {
 				processBacktraces(commonContext, specificContext, args);
+			} else if (isCommand(args, "restart_app_group", 1, 99)) {
+				processRestartAppGroup(commonContext, specificContext, args);
 			} else if (isCommand(args, "requests", 0)) {
 				processRequests(commonContext, specificContext, args);
 			} else {
@@ -424,7 +433,8 @@ public:
 		accountsDatabase = boost::make_shared<AccountsDatabase>();
 		accountsDatabase->add("_passenger-status", options.adminToolStatusPassword, false,
 			Account::INSPECT_BASIC_INFO | Account::INSPECT_SENSITIVE_INFO |
-			Account::INSPECT_BACKTRACES | Account::INSPECT_REQUESTS);
+			Account::INSPECT_BACKTRACES | Account::INSPECT_REQUESTS |
+			Account::RESTART);
 		accountsDatabase->add("_web_server", options.exitPassword, false, Account::EXIT);
 		messageServer = boost::make_shared<MessageServer>(
 			parseUnixSocketAddress(options.adminSocketAddress), accountsDatabase);
@@ -579,6 +589,7 @@ public:
 			 */
 			P_DEBUG("Received command to exit gracefully. "
 				"Waiting until 5 seconds after all clients have disconnected...");
+			requestHandler->resetInactivityTime();
 			while (requestHandler->inactivityTime() < 5000) {
 				syscalls::usleep(250000);
 			}

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

@@ -639,6 +639,10 @@ private:
 	// GDB helper function, implemented in .cpp file to prevent inlining.
 	Client *getClientPointer(const ClientPtr &client);
 
+	void doResetInactivityTime() {
+		inactivityTimer.reset();
+	}
+
 	void getInactivityTime(unsigned long long *result) const {
 		*result = inactivityTimer.elapsed();
 	}
@@ -1297,7 +1301,8 @@ private:
 		if (accept4Available) {
 			FileDescriptor fd(callAccept4(requestSocket,
 				(struct sockaddr *) &u, &addrlen, O_NONBLOCK));
-			if (fd == -1 && errno == ENOSYS) {
+			// FreeBSD returns EINVAL if accept4() is called with invalid flags.
+			if (fd == -1 && (errno == ENOSYS || errno == EINVAL)) {
 				accept4Available = false;
 				return acceptNonBlockingSocket(sock);
 			} else {
@@ -2467,6 +2472,10 @@ public:
 		}
 	}
 
+	void resetInactivityTime() {
+		libev->run(boost::bind(&RequestHandler::doResetInactivityTime, this));
+	}
+
 	unsigned long long inactivityTime() const {
 		unsigned long long result;
 		libev->run(boost::bind(&RequestHandler::getInactivityTime, this, &result));

data/ext/common/agents/LoggingAgent/FilterSupport.h

@@ -920,6 +920,7 @@ private:
 		union {
 			struct {
 				char stringStorage[sizeof(string)];
+				string *stringPointer;
 				struct {
 					regex_t regexp;
 					int options;
@@ -945,7 +946,8 @@ private:
 			} else {
 				source = STRING_LITERAL;
 			}
-			new (u.stringOrRegexpValue.stringStorage) string(value.data(), value.size());
+			u.stringOrRegexpValue.stringPointer = new (u.stringOrRegexpValue.stringStorage)
+				string(value.data(), value.size());
 			if (regexp) {
 				int options = REG_EXTENDED;
 				u.stringOrRegexpValue.regexp.options = 0;
@@ -955,7 +957,7 @@ private:
 						Tokenizer::REGEXP_OPTION_CASE_INSENSITIVE;
 				}
 				regcomp(&u.stringOrRegexpValue.regexp.regexp,
-					value.toString().c_str(),
+					u.stringOrRegexpValue.stringPointer->c_str(),
 					options);
 			}
 		}
@@ -1066,7 +1068,7 @@ private:
 	
 	private:
 		const string &storedString() const {
-			return *((string *) u.stringOrRegexpValue.stringStorage);
+			return *u.stringOrRegexpValue.stringPointer;
 		}
 		
 		regex_t &storedRegexp() const {
@@ -1087,7 +1089,8 @@ private:
 			source = other.source;
 			switch (source) {
 			case REGEXP_LITERAL:
-				new (u.stringOrRegexpValue.stringStorage) string(other.storedString());
+				u.stringOrRegexpValue.stringPointer = new (u.stringOrRegexpValue.stringStorage)
+					string(other.storedString());
 				options = REG_EXTENDED;
 				if (other.u.stringOrRegexpValue.regexp.options & Tokenizer::REGEXP_OPTION_CASE_INSENSITIVE) {
 					options |= REG_ICASE;
@@ -1098,7 +1101,8 @@ private:
 				u.stringOrRegexpValue.regexp.options = other.u.stringOrRegexpValue.regexp.options;
 				break;
 			case STRING_LITERAL:
-				new (u.stringOrRegexpValue.stringStorage) string(other.storedString());
+				u.stringOrRegexpValue.stringPointer = new (u.stringOrRegexpValue.stringStorage)
+					string(other.storedString());
 				break;
 			case INTEGER_LITERAL:
 				u.intValue = other.u.intValue;

data/ext/common/agents/TempDirToucher.c

@@ -113,7 +113,7 @@ initialize(int argc, char *argv[]) {
 	parseArguments(argc, argv);
 
 	if (logFile != NULL) {
-		fd = open(logFile, O_WRONLY | O_APPEND | O_CREAT);
+		fd = open(logFile, O_WRONLY | O_APPEND | O_CREAT, 0644);
 		if (fd == -1) {
 			e = errno;
 			fprintf(stderr, ERROR_PREFIX
@@ -148,7 +148,10 @@ initialize(int argc, char *argv[]) {
 
 static void
 exitHandler(int signo) {
-	write(terminationPipe[1], "x", 1);
+	int ret = write(terminationPipe[1], "x", 1);
+	// We can't do anything about failures, so ignore
+	// compiler warnings about not using the result.
+	(void) ret;
 }
 
 static void
@@ -180,7 +183,13 @@ maybeDaemonize() {
 		pid = fork();
 		if (pid == 0) {
 			setsid();
-			chdir("/");
+			if (chdir("/") == -1) {
+				e = errno;
+				fprintf(stderr, ERROR_PREFIX
+					": cannot change working directory to /: %s (errno %d)\n",
+					strerror(e), e);
+				_exit(1);
+			}
 			redirectStdinToNull();
 		} else if (pid == -1) {
 			e = errno;

data/ext/common/agents/Watchdog/Main.cpp

@@ -172,7 +172,10 @@ setOomScore(const StaticString &score) {
 	
 	f = openOomAdjFile("w", type);
 	if (f != NULL) {
-		fwrite(score.data(), 1, score.size(), f);
+		size_t ret = fwrite(score.data(), 1, score.size(), f);
+		// We can't do anything about failures, so ignore compiler
+		// warnings about not doing anything with the result.
+		(void) ret;
 		fclose(f);
 	}
 }
@@ -467,7 +470,10 @@ initializeBareEssentials(int argc, char *argv[]) {
 	agentsOptions = initializeAgent(argc, argv, "PassengerWatchdog");
 
 	if (agentsOptions.get("test_binary", false) == "1") {
-		write(oldStdout, "PASS\n", 5);
+		int ret;
+		do {
+			ret = write(oldStdout, "PASS\n", 5);
+		} while (ret == -1 && errno == EAGAIN);
 		exit(0);
 	}
 	close(oldStdout);

data/ext/nginx/ConfigurationCommands.c

@@ -149,6 +149,16 @@
 	NULL
 },
 
+{
+	
+	ngx_string("passenger_document_root"),
+	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, document_root),
+	NULL
+},
+
 {
 	
 	ngx_string("passenger_user"),

data/ext/nginx/ConfigurationFields.h

@@ -79,6 +79,8 @@
 
 	ngx_str_t app_type;
 
+	ngx_str_t document_root;
+
 	ngx_str_t environment;
 
 	ngx_str_t group;

data/ext/nginx/ContentHandler.c

@@ -87,6 +87,16 @@ file_exists(const u_char *filename, unsigned int throttle_rate) {
     return get_file_type(filename, throttle_rate) == FT_FILE;
 }
 
+static int
+mapped_filename_equals(const u_char *filename, size_t filename_len, ngx_str_t *str)
+{
+    return (str->len == filename_len &&
+            memcmp(str->data, filename, filename_len) == 0) ||
+           (str->len == filename_len - 1 &&
+            filename[filename_len - 1] == '/' &&
+            memcmp(str->data, filename, filename_len - 1) == 0);
+}
+
 /**
  * Maps the URI for the given request to a page cache file, if possible.
  *
@@ -115,16 +125,12 @@ map_uri_to_page_cache_file(ngx_http_request_t *r, ngx_str_t *public_dir,
     
     /* From this point on we know that filename is not an empty string. */
     
-    /* Check whether filename is equal to public_dir. filename may also be equal to
-     * public_dir + "/" so check for that as well.
+    
+    /* Check whether `filename` is equal to public_dir.
+     * `filename` may also be equal to public_dir + "/" so check for that as well.
      */
-    if ((public_dir->len == filename_len && memcmp(public_dir->data, filename,
-                                                   filename_len) == 0) ||
-        (public_dir->len == filename_len - 1 &&
-         filename[filename_len - 1] == '/' &&
-         memcmp(public_dir->data, filename, filename_len - 1) == 0)
-       ) {
-        /* If the URI maps to the 'public' directory (i.e. the request is the
+    if (mapped_filename_equals(filename, filename_len, public_dir)) {
+        /* If the URI maps to the 'public' or the alias directory (i.e. the request is the
          * base URI) then index.html is the page cache file.
          */
         
@@ -1216,7 +1222,7 @@ passenger_content_handler(ngx_http_request_t *r)
     u_char                *path_last, *end;
     u_char                 root_path_str[NGX_MAX_PATH + 1];
     ngx_str_t              root_path;
-    size_t                 root, len;
+    size_t                 root_len, len;
     u_char                 page_cache_file_str[NGX_MAX_PATH + 1];
     ngx_str_t              page_cache_file;
     passenger_context_t   *context;
@@ -1243,7 +1249,7 @@ passenger_content_handler(ngx_http_request_t *r)
     /* Let the next content handler take care of this request if this URL
      * maps to an existing file.
      */
-    path_last = ngx_http_map_uri_to_path(r, &path, &root, 0);
+    path_last = ngx_http_map_uri_to_path(r, &path, &root_len, 0);
     if (path_last != NULL && file_exists(path.data, 0)) {
         return NGX_DECLINED;
     }
@@ -1251,10 +1257,10 @@ passenger_content_handler(ngx_http_request_t *r)
     /* Create a string containing the root path. This path already
      * contains a trailing slash.
      */
-    end = ngx_copy(root_path_str, path.data, root);
+    end = ngx_copy(root_path_str, path.data, root_len);
     *end = '\0';
     root_path.data = root_path_str;
-    root_path.len  = root;
+    root_path.len  = root_len;
     
     
     context = ngx_pcalloc(r->pool, sizeof(passenger_context_t));
@@ -1266,13 +1272,20 @@ passenger_content_handler(ngx_http_request_t *r)
     
     /* Find the base URI for this web application, if any. */
     if (find_base_uri(r, slcf, &base_uri)) {
-        /* Store the found base URI into context->public_dir. We infer that the 'public'
-         * directory of the web application is document root + base URI.
+        /* Store the found base URI into context->public_dir. We infer that
+         * the 'public' directory of the web app equals document root + base URI.
          */
-        len = root_path.len + base_uri.len + 1;
-        context->public_dir.data = ngx_palloc(r->pool, sizeof(u_char) * len);
-        end = ngx_copy(context->public_dir.data, root_path.data, root_path.len);
-        end = ngx_copy(end, base_uri.data, base_uri.len);
+        if (slcf->document_root.data != NULL) {
+            len = slcf->document_root.len + 1;
+            context->public_dir.data = ngx_palloc(r->pool, sizeof(u_char) * len);
+            end = ngx_copy(context->public_dir.data, slcf->document_root.data,
+                           slcf->document_root.len);
+        } else {
+            len = root_path.len + base_uri.len + 1;
+            context->public_dir.data = ngx_palloc(r->pool, sizeof(u_char) * len);
+            end = ngx_copy(context->public_dir.data, root_path.data, root_path.len);
+            end = ngx_copy(end, base_uri.data, base_uri.len);
+        }
         *end = '\0';
         context->public_dir.len = len - 1;
         context->base_uri = base_uri;

data/ext/nginx/CreateLocationConfig.c

@@ -88,6 +88,11 @@
 	
 
 	
+		conf->document_root.data = NULL;
+		conf->document_root.len  = 0;
+	
+
+	
 		conf->user.data = NULL;
 		conf->user.len  = 0;
 	

data/ext/nginx/MergeLocationConfig.c

@@ -100,6 +100,12 @@
 	
 
 	
+		ngx_conf_merge_str_value(conf->document_root,
+			prev->document_root,
+			NULL);
+	
+
+	
 		ngx_conf_merge_str_value(conf->user,
 			prev->user,
 			NULL);

data/ext/nginx/config

@@ -1,13 +1,19 @@
-PATH="$ngx_addon_dir/../../bin:$PATH"
-export PATH
-
+# passenger-config is run with the 'ruby' command in $PATH, even when natively packaged,
+# so we check whether 'ruby' is correctly in $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
+## Magic comment: begin bootstrap ##
+# Ensure that this script finds the passenger-config that belongs to this Phusion Passenger installation.
+PATH="$ngx_addon_dir/../../bin:$PATH"
+export PATH
+
+PASSENGER_CONFIG=${PASSENGER_CONFIG:-passenger-config}
+
+if test "x$PASSENGER_LIBS" = "x" && ! $PASSENGER_CONFIG --compiled; then
     echo "*** The Phusion Passenger support files are not yet compiled. Compiling them for you... ***"
     echo "*** Running 'rake nginx CACHING=false' in $ngx_addon_dir... ***"
     old_dir=`pwd`
@@ -26,12 +32,13 @@ if test "x$PASSENGER_LIBS" = "x" && ! passenger-config --compiled; then
     cd "$old_dir"
     echo "*** Phusion Passenger support files have been successfully compiled. ***"
 fi
+## Magic comment: end bootstrap ##
 
 if test "x$PASSENGER_INCLUDEDIR" = "x"; then
-    PASSENGER_INCLUDEDIR=`passenger-config --includedir`
+    PASSENGER_INCLUDEDIR=`$PASSENGER_CONFIG --includedir`
 fi
 if test "x$PASSENGER_LIBS" = "x"; then
-    PASSENGER_LIBS=`passenger-config --nginx-libs`
+    PASSENGER_LIBS=`$PASSENGER_CONFIG --nginx-libs`
 fi
 
 ngx_addon_name=ngx_http_passenger_module

data/ext/ruby/passenger_native_support.c

@@ -27,9 +27,11 @@
 	/* Ruby 1.9 */
 	#include "ruby/intern.h"
 	#include "ruby/io.h"
+	#include "ruby/version.h"
 #else
 	#include "rubysig.h"
 	#include "rubyio.h"
+	#include "version.h"
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -861,8 +863,65 @@ void
 Init_passenger_native_support() {
 	struct sockaddr_un addr;
 	
-	/* */
-	mPassenger = rb_define_module("PhusionPassenger"); // Do not remove the above comment. We want the Passenger module's rdoc to be empty.
+	/* Only defined on Ruby >= 1.9 */
+	#ifdef RUBY_API_VERSION_CODE
+		if (ruby_api_version[0] != RUBY_API_VERSION_MAJOR
+		 || ruby_api_version[1] != RUBY_API_VERSION_MINOR
+		 || ruby_api_version[2] != RUBY_API_VERSION_TEENY)
+		{
+			fprintf(stderr, " --> passenger_native_support was compiled for Ruby API version %d.%d.%d, "
+				"but you're currently running a Ruby interpreter with API version %d.%d.%d.\n",
+				RUBY_API_VERSION_MAJOR,
+				RUBY_API_VERSION_MINOR,
+				RUBY_API_VERSION_TEENY,
+				ruby_api_version[0],
+				ruby_api_version[1],
+				ruby_api_version[2]);
+			fprintf(stderr, "     Refusing to load existing passenger_native_support.\n");
+			return;
+		}
+		/* Because native extensions may be linked to libruby, loading
+		 * a Ruby 1.9 native extension may not fail on Ruby 1.8 (even though
+		 * the extension will crash later on). We detect such a case here and
+		 * abort early.
+		 */
+		if (strlen(ruby_version) >= sizeof("1.8.7") - 1
+		 && ruby_version[0] == '1'
+		 && ruby_version[1] == '.'
+		 && ruby_version[2] == '8')
+		{
+			fprintf(stderr, " --> passenger_native_support was compiled for Ruby %d.%d, "
+				"but you're currently running Ruby %s\n",
+				RUBY_API_VERSION_MAJOR,
+				RUBY_API_VERSION_MINOR,
+				ruby_version);
+			fprintf(stderr, "     Refusing to load existing passenger_native_support.\n");
+			return;
+		}
+	#else
+		if (strlen(ruby_version) < sizeof("1.8.7") - 1
+		 || ruby_version[0] != '1'
+		 || ruby_version[1] != '.'
+		 || ruby_version[2] != '8')
+		{
+			/* We may not have included Ruby 1.8's version.h because of compiler
+			 * header file search paths, so we can't rely on RUBY_VERSION being
+			 * defined.
+			 */
+			#ifdef RUBY_VERSION
+				#define ESTIMATED_RUBY_VERSION RUBY_VERSION
+			#else
+				#define ESTIMATED_RUBY_VERSION "1.8"
+			#endif
+			fprintf(stderr, " --> passenger_native_support was compiled for Ruby %s, "
+				"but you're currently running Ruby %s\n",
+				ESTIMATED_RUBY_VERSION, ruby_version);
+			fprintf(stderr, "     Refusing to load existing passenger_native_support.\n");
+			return;
+		}
+	#endif
+
+	mPassenger = rb_define_module("PhusionPassenger");
 	
 	/*
 	 * Utility functions for accessing system functionality.