passenger 4.0.19 → 4.0.20

data/ext/boost/type_traits/detail/wrap.hpp

@@ -0,0 +1,18 @@
+//  (C) Copyright David Abrahams 2002. 
+//  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).
+//
+//  See http://www.boost.org/libs/type_traits for most recent version including documentation.
+
+#ifndef BOOST_TT_DETAIL_WRAP_HPP_INCLUDED
+#define BOOST_TT_DETAIL_WRAP_HPP_INCLUDED
+
+namespace boost {
+namespace type_traits {
+
+template <class T> struct wrap {};
+
+}} // namespace boost::type_traits
+
+#endif // BOOST_TT_DETAIL_WRAP_HPP_INCLUDED

data/ext/common/Constants.h

@@ -72,7 +72,7 @@
 
 	#define MESSAGE_SERVER_MAX_USERNAME_SIZE 100
 
-	#define PASSENGER_VERSION "4.0.19"
+	#define PASSENGER_VERSION "4.0.20"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/ext/common/Utils/StrIntUtils.cpp

@@ -512,7 +512,7 @@ cEscapeString(const StaticString &input) {
 string
 escapeHTML(const StaticString &input) {
 	string result;
-	result.reserve((int) round(input.size() * 1.25));
+	result.reserve((int) ceil(input.size() * 1.25));
 	
 	const char *current = (const char *) input.c_str();
 	const char *end     = current + input.size();

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

@@ -506,7 +506,24 @@ public:
 		requestHandler.reset();
 
 		if (!options.requestSocketLink.empty()) {
-			syscalls::unlink(options.requestSocketLink.c_str());
+			char path[PATH_MAX + 1];
+			ssize_t ret;
+			bool shouldUnlink;
+
+			ret = readlink(options.requestSocketLink.c_str(), path, PATH_MAX);
+			if (ret != -1) {
+				path[ret] = '\0';
+				// Only unlink if a new Flying Passenger instance hasn't overwritten the
+				// symlink.
+				// https://code.google.com/p/phusion-passenger/issues/detail?id=939
+				shouldUnlink = getRequestSocketFilename() == path;
+			} else {
+				shouldUnlink = true;
+			}
+
+			if (shouldUnlink) {
+				syscalls::unlink(options.requestSocketLink.c_str());
+			}
 		}
 		
 		P_TRACE(2, "All threads have been shut down.");

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

@@ -1747,6 +1747,9 @@ private:
 			
 			client->beginScopeLog(&client->scopeLogs.requestProcessing, "request processing");
 
+			StaticString staticRequestMethod = parser.getHeader("REQUEST_METHOD");
+			client->logMessage("Request method: " + staticRequestMethod);
+
 			StaticString staticRequestURI = parser.getHeader("REQUEST_URI");
 			if (!staticRequestURI.empty()) {
 				client->logMessage("URI: " + staticRequestURI);

data/ext/common/agents/SpawnPreparer.cpp

@@ -1,3 +1,28 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2012-2013 Phusion
+ *
+ *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ *
+ *  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.
+ */
+
 /*
  * Sets given environment variables, dumps the entire environment to
  * a given file (for diagnostics purposes), then execs the given command.

data/ext/common/agents/TempDirToucher.c

@@ -0,0 +1,357 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2013 Phusion
+ *
+ *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ *
+ *  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.
+ */
+
+/* This tool touches everything in a directory every 30 minutes to prevent
+ * /tmp cleaners from removing it.
+ */
+
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <signal.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <errno.h>
+#include <string.h>
+
+#define ERROR_PREFIX "*** TempDirToucher error"
+
+static char *dir;
+/**
+ * When Passenger Standalone is started with --daemonize, then it will
+ * pass --cleanup to this tool so that this tool is responsible
+ * for cleaning up the Standalone temp dir.
+ */
+static int shouldCleanup = 0;
+static int shouldDaemonize = 0;
+static const char *pidFile = NULL;
+static const char *logFile = NULL;
+static int terminationPipe[2];
+
+
+static void
+parseArguments(int argc, char *argv[]) {
+	dir = argv[1];
+	int i;
+
+	for (i = 2; i < argc; i++) {
+		if (strcmp(argv[i], "--cleanup") == 0) {
+			shouldCleanup = 1;
+		} else if (strcmp(argv[i], "--daemonize") == 0) {
+			shouldDaemonize = 1;
+		} else if (strcmp(argv[i], "--pid-file") == 0) {
+			pidFile = argv[i + 1];
+			i++;
+		} else if (strcmp(argv[i], "--log-file") == 0) {
+			logFile = argv[i + 1];
+			i++;
+		} else {
+			fprintf(stderr, ERROR_PREFIX ": unrecognized argument %s\n",
+				argv[i]);
+			exit(1);
+		}
+	}
+}
+
+static void
+setNonBlocking(int fd) {
+	int flags, ret, e;
+	
+	do {
+		flags = fcntl(fd, F_GETFL);
+	} while (flags == -1 && errno == EINTR);
+	if (flags == -1) {
+		e = errno;
+		fprintf(stderr, ERROR_PREFIX
+			": cannot set pipe to non-blocking mode: "
+			"cannot get file descriptor flags. Error: %s (errno %d)\n",
+			strerror(e), e);
+		exit(1);
+	}
+	do {
+		ret = fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+	} while (ret == -1 && errno == EINTR);
+	if (ret == -1) {
+		e = errno;
+		fprintf(stderr, ERROR_PREFIX
+			": cannot set pipe to non-blocking mode: "
+			"cannot set file descriptor flags. Error: %s (errno %d)\n",
+			strerror(e), e);
+		exit(1);
+	}
+}
+
+static void
+initialize(int argc, char *argv[]) {
+	int e, fd;
+
+	parseArguments(argc, argv);
+
+	if (logFile != NULL) {
+		fd = open(logFile, O_WRONLY | O_APPEND | O_CREAT);
+		if (fd == -1) {
+			e = errno;
+			fprintf(stderr, ERROR_PREFIX
+				": cannot open log file %s for writing: %s (errno %d)\n",
+				logFile, strerror(e), e);
+			exit(1);
+		}
+
+		if (dup2(fd, 1) == -1) {
+			e = errno;
+			fprintf(stderr, ERROR_PREFIX ": cannot dup2(%d, 1): %s (errno %d)\n",
+				fd, strerror(e), e);
+		}
+		if (dup2(fd, 2) == -1) {
+			e = errno;
+			fprintf(stderr, ERROR_PREFIX ": cannot dup2(%d, 2): %s (errno %d)\n",
+				fd, strerror(e), e);
+		}
+
+		close(fd);
+	}
+
+	if (pipe(terminationPipe) == -1) {
+		e = errno;
+		fprintf(stderr, ERROR_PREFIX ": cannot create a pipe: %s (errno %d)\n",
+			strerror(e), e);
+		exit(1);
+	}
+	
+	setNonBlocking(terminationPipe[1]);
+}
+
+static void
+exitHandler(int signo) {
+	write(terminationPipe[1], "x", 1);
+}
+
+static void
+installSignalHandlers() {
+	struct sigaction action;
+
+	action.sa_handler = exitHandler;
+	action.sa_flags = SA_RESTART;
+	sigemptyset(&action.sa_mask);
+	sigaction(SIGINT, &action, NULL);
+	sigaction(SIGTERM, &action, NULL);
+}
+
+static void
+redirectStdinToNull() {
+	int fd = open("/dev/null", O_RDONLY);
+	if (fd != -1) {
+		dup2(fd, 1);
+		close(fd);
+	}
+}
+
+static void
+maybeDaemonize() {
+	pid_t pid;
+	int e;
+
+	if (shouldDaemonize) {
+		pid = fork();
+		if (pid == 0) {
+			setsid();
+			chdir("/");
+			redirectStdinToNull();
+		} else if (pid == -1) {
+			e = errno;
+			fprintf(stderr, ERROR_PREFIX ": cannot fork: %s (errno %d)\n",
+				strerror(e), e);
+			exit(1);
+		} else {
+			_exit(0);
+		}
+	}
+}
+
+static void
+maybeWritePidfile() {
+	FILE *f;
+
+	if (pidFile != NULL) {
+		f = fopen(pidFile, "w");
+		if (f != NULL) {
+			fprintf(f, "%d\n", (int) getpid());
+			fclose(f);
+		} else {
+			fprintf(stderr, ERROR_PREFIX ": cannot open PID file %s for writing\n",
+				pidFile);
+			exit(1);
+		}
+	}
+}
+
+static int
+dirExists(const char *dir) {
+	struct stat buf;
+	return stat(dir, &buf) == 0 && S_ISDIR(buf.st_mode);
+}
+
+static void
+touchDir(const char *dir) {
+	pid_t pid;
+	int e, status;
+
+	pid = fork();
+	if (pid == 0) {
+		close(terminationPipe[0]);
+		close(terminationPipe[1]);
+		if (chdir(dir) == -1) {
+			e = errno;
+			fprintf(stderr, ERROR_PREFIX
+				": cannot change working directory to %s: %s (errno %d)\n",
+				dir, strerror(e), e);
+			_exit(1);
+		}
+		execlp("/bin/sh", "/bin/sh", "-c",
+			"find \"$1\" | xargs touch", "/bin/sh", ".",
+			(const char * const) 0);
+		e = errno;
+		fprintf(stderr, ERROR_PREFIX ": cannot execute /bin/sh: %s (errno %d)\n",
+			strerror(e), e);
+		_exit(1);
+	} else if (pid == -1) {
+		e = errno;
+		fprintf(stderr, ERROR_PREFIX ": cannot fork: %s (errno %d)\n",
+			strerror(e), e);
+		exit(1);
+	} else {
+		if (waitpid(pid, &status, 0) == -1) {
+			if (errno != ESRCH && errno != EPERM) {
+				fprintf(stderr, ERROR_PREFIX
+					": unable to wait for shell command 'find %s | xargs touch'\n",
+					dir);
+				exit(1);
+			}
+		} else if (WEXITSTATUS(status) != 0) {
+			fprintf(stderr, ERROR_PREFIX
+				": shell command 'find %s | xargs touch' failed with exit status %d\n",
+				dir, WEXITSTATUS(status));
+			exit(1);
+		}
+	}
+}
+
+static int
+doSleep(int sec) {
+	fd_set readfds;
+	struct timeval timeout;
+	int ret, e;
+
+	FD_ZERO(&readfds);
+	FD_SET(terminationPipe[0], &readfds);
+	timeout.tv_sec = sec;
+	timeout.tv_usec = 0;
+	do {
+		ret = select(terminationPipe[0] + 1, &readfds, NULL, NULL, &timeout);
+	} while (ret == -1 && errno == EINTR);
+	if (ret == -1) {
+		e = errno;
+		fprintf(stderr, ERROR_PREFIX ": cannot select(): %s (errno %d)\n",
+			strerror(e), e);
+		exit(1);
+		return -1; /* Never reached */
+	} else {
+		return ret == 0;
+	}
+}
+
+static void
+maybeDeletePidFile() {
+	if (pidFile != NULL) {
+		unlink(pidFile);
+	}
+}
+
+static void
+performCleanup(const char *dir) {
+	pid_t pid;
+	int e, status;
+
+	pid = fork();
+	if (pid == 0) {
+		close(terminationPipe[0]);
+		close(terminationPipe[1]);
+		execlp("/bin/sh", "/bin/sh", "-c",
+			"rm -rf \"$1\"", "/bin/sh", dir,
+			(const char * const) 0);
+		e = errno;
+		fprintf(stderr, ERROR_PREFIX ": cannot execute /bin/sh: %s (errno %d)\n",
+			strerror(e), e);
+		_exit(1);
+	} else if (pid == -1) {
+		e = errno;
+		fprintf(stderr, ERROR_PREFIX ": cannot fork: %s (errno %d)\n",
+			strerror(e), e);
+		exit(1);
+	} else {
+		if (waitpid(pid, &status, 0) == -1) {
+			if (errno != ESRCH && errno != EPERM) {
+				fprintf(stderr, ERROR_PREFIX
+					": unable to wait for shell command 'rm -rf %s'\n",
+					dir);
+				exit(1);
+			}
+		} else if (WEXITSTATUS(status) != 0) {
+			fprintf(stderr, ERROR_PREFIX
+				": shell command 'rm -rf %s' failed with exit status %d\n",
+				dir, WEXITSTATUS(status));
+			exit(1);
+		}
+	}
+}
+
+int
+main(int argc, char *argv[]) {
+	initialize(argc, argv);
+	installSignalHandlers();
+	maybeDaemonize();
+	maybeWritePidfile();
+
+	while (1) {
+		if (dirExists(dir)) {
+			touchDir(dir);
+			if (!doSleep(1800)) {
+				break;
+			}
+		} else {
+			break;
+		}
+	}
+
+	maybeDeletePidFile();
+	if (shouldCleanup) {
+		performCleanup(dir);
+	}
+
+	return 0;
+}