passenger 4.0.46 → 4.0.48

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTMzMjIwYzg3NGQxMTFmZDllM2ExZGU0MmUyM2E2MGFjODU0MDQyNQ==
+    Y2Q0N2U0NTcyNWY5ZWYwMDA3NzRmMGZjNzUwNGUzNTNhZGNiYzFmOA==
   data.tar.gz: !binary |-
-    MTM5NmRmMWQyYzY0ZmZjNTNkMTYzYmFhZDcwZTVhNDdhZDI5YjM3MA==
+    N2NlN2NmMTRjYWU4NDAyN2Q2YWUxODJiNzJmOTA5M2Y5NWQ4YjUxMg==
 SHA512:
   metadata.gz: !binary |-
-    YmQ4Nzg3NTVjYzhhNDcyMzJkOWU0YTgwMmRiYzYwMGM4YzJlZDJiYjBlMDcw
-    MzU3MGY2NTc4NWRlNTU4OGU1ODM3OTliNWQ4MWJhYWIyNzUxOGM3YWViMTM2
-    NTQwYjE4NmIxYjczMTc4Y2I2YjliMjEwNGRmNTM0ZjkxY2EzMDc=
+    OTE2NzU1ODdmMDUyZWY0ZWUxNmMzYTZhMGY1ZTM2YTk1YzY3NjQyMGQzNzJh
+    ZTY0OWU4MzBlZGY1Y2RhZGM3NzViMTM3MzQzOWQxYjYzNDQ0ZTMyNWExYWYy
+    MzZhMGEwNzVlNjRjZjI2YzQ1ZTMyNGUyOTk4Mjc5MWNmMzI1YzQ=
   data.tar.gz: !binary |-
-    MGNiMGE0ODZkYjlhZjdhYmI1YmJkYjJlN2M0YmY1MjkxZjg3OWQ5ZmEyNmE2
-    NjhiY2RjZjRkZmRlZDdiMDg1MzI5YjI4M2JiNWQ2MDM3NDVkYTBjMmJlZTY3
-    YzRhNmQyZDIwZjBkNzhmYTkyMTUxY2QyZjY5MWVhYmI3ODE0YjE=
+    ZjYyY2JmMWQ5NmViMTk3ZGVlNGY1NTMxMmZjMmU4OGQxMzk5ODc4NmYyMGE1
+    YTM5NDUxMjg2MmZkZWE4NjJjYzFiYmUxYWQzZWVlODNjNGQ2NDViOTM2OTMz
+    YWMzZjYxMzkzZTRkOGNlYTExYzgzNjQ1ZGZlZWUxZTkwYTU2NTE=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJTxCOxAAoJECrHRaUKISqMIQsH/3NGVBMEB/WcSyQeLVw8skQZ
-ZgD6xWOeNH7im6h44UwT7zebDNuVVE2vhPhxcuv5h5D3zKeSutLV9deGbvx2KRHF
-5DhHC1M7YmirNDfxL1cD/mjHaK5XconhorcYghTwa9Co40c99pWB3DTMvt53zP4E
-udoJY26zO26PxpoZ3KQtkzp4PdTKs9VB3cq9YXuGtwjO10qUT/CJf2iXObYheSit
-zLC7b7L5qSDOg+Ty8PUQf3/vwyGp6X6+AlOcwJR8fHyWJ8TPn/xugAElUcHIsYDB
-jFb5rwDGYVmN6lpqVqVJ9+n4Ju2Sj9oBO4DCrPgTBvFXO0jfd8zK4JoCMb4H/2g=
-=EZq+
+iQEcBAABAgAGBQJT0PH3AAoJECrHRaUKISqMFzYIAIzqK4Mt2VJ3+b5i9T+VXYdB
+3Rwh00XDqiOtDUoyDQCLFcB5WlyvcVSphhmk6QqPe5SQN17Ryuw8t0caWls/c+ZI
+FjoTE9MNCG4MvRdwchquMiwmqqtq3RcWVLCBx/RHVOXwxGDEibTDqcVsW3nAgtvI
+wP82mpi9pxmknv2Qer9d8SdNOhXTBKxhU8PJgEQAVeGskiB9Qs3IehGxulP/ZjJc
+DUPhOVQpixapzU+ZmrQDY1UXn6yMV+z/sX/4icHgftm3O3t1cKg4cz0H3HPAkKK7
+EOxsoyySfTXfcAI15NvLh26HdmVBD17wCBSgtUrS1BhexzfJHucdiKa7WUrikZg=
+=KkS3
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJTxCOxAAoJECrHRaUKISqMCdsIAKR9HnGsLlsxmpu0zMWExqVb
-dHyyHP/ckMjqEsJs1jeS0iYniI59IxCLfcMCG0lYf0tLR1OSRbnTUSuDG7JQeKfN
-sA1OZ7i8UNPbFEhmzN/xAqmxioCNY0C85vPpUk4Vff11oLRmXN/YOKHKL0ukZIJs
-eaN9U+I+KtKCLkst5afwuzNlRMxDMxKnArdoWVD16iFbltMxHH+2l2wYF/APt4JS
-NAzBGbweQ8xi/7p1+ReVDG617Imh5aUt0tNEwlSbTS4P+fHObL4FaVPcVzzDGi17
-DxNCiqErNYCjEsy+6F4CjWPgO9fZ+IcwYqAk9NaW3z3ZrlQSK9F+hB+fiCalCRA=
-=BldL
+iQEcBAABAgAGBQJT0PH2AAoJECrHRaUKISqMUYwH/0C1g6jcd/g4ux//vTqjoRFX
+ShBZS3BXAeI0o2c4dq06mE8LM5FiIQmWa6mzRLooFgfUBzunC5TACyEQ65LaCi3r
+2QP07avW0JdSoCMypCld5EbTXacqfYRYtyVjnQRb9vbssFbHPVSnilL4m7N6Yit7
+2i/oDzaAaf8ka1fdfERXASwhyLuffn3IuVQz5L/zCd8HkcPyJpqmcd/oQ7jrdJng
+EfoRsivoernTPBrhJqJB566DtkVPLEzd2TrBoO1UspENBpZzfAZChYdgJQscOavT
+RPfX6B61kvahbpYfGU6A/bI8i7rOjKdGWIavaZex6ij32c+QQ+U2s3TdQBmtyIc=
+=A4Gz
 -----END PGP SIGNATURE-----

data/CHANGELOG

@@ -1,3 +1,24 @@
+Release 4.0.48
+--------------
+
+ * Fixed a race condition while determining what user an application should
+   be executed as. This bug could lead to applications being run as the wrong
+   user. Closes GH-1241.
+ * [Standalone] Improved autodetection of Rails asset pipeline files. This
+   prevents Standalone from incorrectly setting caching headers on non-asset
+   pipeline files. Closes GH-1225.
+ * Fixed compilation problems on CentOS 5. Thanks to J. Smith. Closes GH-1247.
+ * Fixed compilation problems on OpenBSD.
+ * Fixed compatibility with Ruby 1.8.5.
+
+
+Release 4.0.47
+--------------
+
+ * [Enterprise] Fixed a bug in Flying Passenger's `--max-preloader-idle-time`
+   option.
+
+
 Release 4.0.46
 --------------
 

data/bin/passenger-install-nginx-module

@@ -34,7 +34,7 @@ require 'phusion_passenger'
 
 PhusionPassenger.locate_directories
 
-require 'digest'
+require 'digest/sha2'
 require 'optparse'
 require 'fileutils'
 PhusionPassenger.require_passenger_lib 'platform_info/ruby'
@@ -268,7 +268,7 @@ private
 		if download(url, tarball, DOWNLOAD_OPTION)
 			Dir.chdir(@working_dir) do
 				puts "<banner>Verifying PCRE checksum...</banner>"
-				if Digest::SHA256.file(tarball) != PCRE_SHA256_CHECKSUM
+				if sha256_file(tarball) != PCRE_SHA256_CHECKSUM
 					new_screen
 					render_template "nginx/pcre_checksum_could_not_be_verified"
 					wait
@@ -306,7 +306,7 @@ private
 		if download(url, tarball, DOWNLOAD_OPTION)
 			Dir.chdir(@working_dir) do
 				puts "<banner>Verifying Nginx checksum...</banner>"
-				if Digest::SHA256.file(tarball) != NGINX_SHA256_CHECKSUM
+				if sha256_file(tarball) != NGINX_SHA256_CHECKSUM
 					return nil
 				end
 
@@ -566,6 +566,20 @@ private
 		end
 		return @pcre_is_installed
 	end
+
+	def sha256_file(path)
+		# We do this instead of using #file, for Ruby 1.8.5 support.
+		digest = Digest::SHA256.new
+		File.open(path, "rb") do |f|
+			buf = ''
+			buf.force_encoding('binary') if buf.respond_to?(:force_encoding)
+			while !f.eof?
+				f.read(1024 * 16, buf)
+				digest.update(buf)
+			end
+		end
+		return digest.hexdigest
+	end
 end
 
 ORIG_ARGV = ARGV.dup

data/dev/{list_tests.rb → list_tests}

@@ -1,5 +1,9 @@
 #!/usr/bin/env ruby
+#
+# Usage: ./dev/list_tests.rb <FILENAME>
+#
 # Lists the test names in the given .cpp test file.
+
 require_relative '../lib/phusion_passenger/utils/ansi_colors'
 
 include PhusionPassenger::Utils::AnsiColors

data/dev/rpmtool

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+require 'rake'
+
+class RpmTool
+	include Rake::DSL
+
+	def initialize(argv)
+		@argv = argv.dup
+	end
+
+	def start
+		parse_options
+	end
+
+private
+	def parse_options
+		sh "rake package:tarball"
+	end
+end
+
+RpmTool.new(ARGV).start

data/dev/run_travis.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+# This script is run by Travis, to execute tests in the CI environment.
+
 set -e
 
 export VERBOSE=1

data/dev/runner

@@ -1,4 +1,10 @@
 #!/usr/bin/env ruby
+#
+# Usage: ./dev/runner <CODE>
+#
+# Evaluates Ruby code in an environment that has the Phusion Passenger
+# libraries loaded.
+
 require File.expand_path(File.dirname(__FILE__) + "/../lib/phusion_passenger")
 PhusionPassenger.locate_directories
 

data/ext/common/ApplicationPool2/Implementation.cpp

@@ -25,8 +25,10 @@
 #include <typeinfo>
 #include <algorithm>
 #include <utility>
+#include <cstdio>
 #include <sstream>
 #include <limits.h>
+#include <unistd.h>
 #include <boost/make_shared.hpp>
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 #include <oxt/backtrace.hpp>
@@ -38,6 +40,7 @@
 #include <Exceptions.h>
 #include <MessageReadersWriters.h>
 #include <Utils.h>
+#include <Utils/IOUtils.h>
 #include <Utils/ScopeGuard.h>
 #include <Utils/MessageIO.h>
 #include <Utils/JsonUtils.h>
@@ -184,7 +187,7 @@ void processAndLogNewSpawnException(SpawnException &e, const Options &options,
 		UPDATE_TRACE_POINT();
 		errorPage = renderer.renderWithDetails(appMessage, options, &e);
 
-		#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
+		#if (defined(__linux__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 11))) || defined(__APPLE__) || defined(__FreeBSD__)
 			snprintf(filename, PATH_MAX, "%s/passenger-error-XXXXXX.html",
 				getSystemTempDir());
 			fd = mkstemps(filename, sizeof(".html") - 1);

data/ext/common/ApplicationPool2/Spawner.h

@@ -836,8 +836,21 @@ protected:
 	void prepareUserSwitching(SpawnPreparationInfo &info, const Options &options) const {
 		TRACE_POINT();
 		if (geteuid() != 0) {
-			struct passwd *userInfo = getpwuid(geteuid());
-			if (userInfo == NULL) {
+			struct passwd pwd, *userInfo;
+			long bufSize;
+			shared_array<char> strings;
+
+			bufSize = sysconf(_SC_GETPW_R_SIZE_MAX);
+			if (bufSize == -1) {
+				// Let's hope this is enough.
+				bufSize = 1024 * 64;
+			}
+			strings.reset(new char[bufSize]);
+
+			userInfo = (struct passwd *) NULL;
+			if (getpwuid_r(geteuid(), &pwd, strings.get(), bufSize, &userInfo) != 0
+			 || userInfo == (struct passwd *) NULL)
+			{
 				throw RuntimeException("Cannot get user database entry for user " +
 					getProcessUsername() + "; it looks like your system's " +
 					"user database is broken, please fix it.");
@@ -857,17 +870,48 @@ protected:
 		UPDATE_TRACE_POINT();
 		string defaultGroup;
 		string startupFile = absolutizePath(options.getStartupFile(), info.appRoot);
-		struct passwd *userInfo = NULL;
+		struct passwd pwd, *userInfo;
+		struct group  grp;
 		gid_t  groupId = (gid_t) -1;
+		long pwdBufSize, grpBufSize;
+		shared_array<char> pwdBuf, grpBuf;
+		int ret;
 		
+		pwdBufSize = sysconf(_SC_GETPW_R_SIZE_MAX);
+		if (pwdBufSize == -1) {
+			// Let's hope this is enough.
+			pwdBufSize = 1024 * 64;
+		}
+		pwdBuf.reset(new char[pwdBufSize]);
+
+		grpBufSize = sysconf(_SC_GETGR_R_SIZE_MAX);
+		if (grpBufSize == -1) {
+			// Let's hope this is enough.
+			grpBufSize = 1024 * 64;
+		}
+		grpBuf.reset(new char[grpBufSize]);
+
 		if (options.defaultGroup.empty()) {
-			struct passwd *info = getpwnam(options.defaultUser.c_str());
-			if (info == NULL) {
+			struct passwd *info;
+			struct group *group;
+
+			info = (struct passwd *) NULL;
+			ret = getpwnam_r(options.defaultUser.c_str(), &pwd, pwdBuf.get(),
+				pwdBufSize, &info);
+			if (ret != 0) {
+				info = (struct passwd *) NULL;
+			}
+			if (info == (struct passwd *) NULL) {
 				throw RuntimeException("Cannot get user database entry for username '" +
 					options.defaultUser + "'");
 			}
-			struct group *group = getgrgid(info->pw_gid);
-			if (group == NULL) {
+
+			group = (struct group *) NULL;
+			ret = getgrgid_r(info->pw_gid, &grp, grpBuf.get(), grpBufSize, &group);
+			if (ret != 0) {
+				group = (struct group *) NULL;
+			}
+			if (group == (struct group *) NULL) {
 				throw RuntimeException(string("Cannot get group database entry for ") +
 					"the default group belonging to username '" +
 					options.defaultUser + "'");
@@ -878,8 +922,13 @@ protected:
 		}
 		
 		UPDATE_TRACE_POINT();
+		userInfo = (struct passwd *) NULL;
 		if (!options.user.empty()) {
-			userInfo = getpwnam(options.user.c_str());
+			ret = getpwnam_r(options.user.c_str(), &pwd, pwdBuf.get(),
+				pwdBufSize, &userInfo);
+			if (ret != 0) {
+				userInfo = (struct passwd *) NULL;
+			}
 		} else {
 			struct stat buf;
 			if (syscalls::lstat(startupFile.c_str(), &buf) == -1) {
@@ -887,35 +936,57 @@ protected:
 				throw SystemException("Cannot lstat(\"" + startupFile +
 					"\")", e);
 			}
-			userInfo = getpwuid(buf.st_uid);
+			ret = getpwuid_r(buf.st_uid, &pwd, pwdBuf.get(),
+				pwdBufSize, &userInfo);
+			if (ret != 0) {
+				userInfo = (struct passwd *) NULL;
+			}
 		}
-		if (userInfo == NULL || userInfo->pw_uid == 0) {
-			userInfo = getpwnam(options.defaultUser.c_str());
+		if (userInfo == (struct passwd *) NULL || userInfo->pw_uid == 0) {
+			userInfo = (struct passwd *) NULL;
+			ret = getpwnam_r(options.defaultUser.c_str(), &pwd,
+				pwdBuf.get(), pwdBufSize, &userInfo);
+			if (ret != 0) {
+				userInfo = (struct passwd *) NULL;
+			}
 		}
 		
 		UPDATE_TRACE_POINT();
 		if (!options.group.empty()) {
+			struct group *groupInfo = (struct group *) NULL;
+
 			if (options.group == "!STARTUP_FILE!") {
 				struct stat buf;
+
 				if (syscalls::lstat(startupFile.c_str(), &buf) == -1) {
 					int e = errno;
 					throw SystemException("Cannot lstat(\"" +
 						startupFile + "\")", e);
 				}
-				if (getgrgid(buf.st_gid) != NULL) {
+
+				ret = getgrgid_r(buf.st_gid, &grp, grpBuf.get(), grpBufSize,
+					&groupInfo);
+				if (ret != 0) {
+					groupInfo = (struct group *) NULL;
+				}
+				if (groupInfo != NULL) {
 					groupId = buf.st_gid;
 				} else {
 					groupId = (gid_t) -1;
 				}
 			} else {
-				struct group *groupInfo = getgrnam(options.group.c_str());
+				ret = getgrnam_r(options.group.c_str(), &grp, grpBuf.get(),
+					grpBufSize, &groupInfo);
+				if (ret != 0) {
+					groupInfo = (struct group *) NULL;
+				}
 				if (groupInfo != NULL) {
 					groupId = groupInfo->gr_gid;
 				} else {
 					groupId = (gid_t) -1;
 				}
 			}
-		} else if (userInfo != NULL) {
+		} else if (userInfo != (struct passwd *) NULL) {
 			groupId = userInfo->pw_gid;
 		}
 		if (groupId == 0 || groupId == (gid_t) -1) {
@@ -923,7 +994,7 @@ protected:
 		}
 
 		UPDATE_TRACE_POINT();
-		if (userInfo == NULL) {
+		if (userInfo == (struct passwd *) NULL) {
 			throw RuntimeException("Cannot determine a user to lower privilege to");
 		}
 		if (groupId == (gid_t) -1) {
@@ -949,7 +1020,7 @@ protected:
 			#define HAVE_GETGROUPLIST
 		#endif
 		#ifdef HAVE_GETGROUPLIST
-			int ret = getgrouplist(userInfo->pw_name, groupId,
+			ret = getgrouplist(userInfo->pw_name, groupId,
 				groups, &info.ngroups);
 			if (ret == -1) {
 				int e = errno;

data/ext/common/Constants.h

@@ -90,7 +90,7 @@
 
 	#define NGINX_DOC_URL "https://www.phusionpassenger.com/documentation/Users%20guide%20Nginx.html"
 
-	#define PASSENGER_VERSION "4.0.46"
+	#define PASSENGER_VERSION "4.0.48"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/ext/common/Utils.cpp

@@ -25,6 +25,7 @@
 
 #include <oxt/system_calls.hpp>
 #include <boost/thread.hpp>
+#include <boost/shared_array.hpp>
 
 #include <cassert>
 #include <cstdlib>
@@ -38,6 +39,8 @@
 #include <fcntl.h>
 #include <poll.h>
 #include <dirent.h>
+#include <pwd.h>
+#include <grp.h>
 #include <limits.h>
 #include <unistd.h>
 #include <string.h>
@@ -381,21 +384,25 @@ escapeForXml(const StaticString &input) {
 string
 getProcessUsername() {
 	struct passwd pwd, *result;
-	char strings[1024];
-	int ret;
-	
+	long bufSize;
+	shared_array<char> strings;
+
+	bufSize = sysconf(_SC_GETPW_R_SIZE_MAX);
+	if (bufSize == -1) {
+		// Let's hope this is enough.
+		bufSize = 1024 * 64;
+	}
+	strings.reset(new char[bufSize]);
+
 	result = (struct passwd *) NULL;
-	do {
-		ret = getpwuid_r(getuid(), &pwd, strings, sizeof(strings), &result);
-	} while (ret == -1 && errno == EINTR);
-	if (ret == -1) {
+	if (getpwuid_r(getuid(), &pwd, strings.get(), bufSize, &result) != 0) {
 		result = (struct passwd *) NULL;
 	}
-	
+
 	if (result == (struct passwd *) NULL || result->pw_name == NULL || result->pw_name[0] == '\0') {
-		snprintf(strings, sizeof(strings), "UID %lld", (long long) getuid());
-		strings[sizeof(strings) - 1] = '\0';
-		return strings;
+		snprintf(strings.get(), bufSize, "UID %lld", (long long) getuid());
+		strings.get()[bufSize - 1] = '\0';
+		return strings.get();
 	} else {
 		return result->pw_name;
 	}
@@ -403,10 +410,23 @@ getProcessUsername() {
 
 string
 getGroupName(gid_t gid) {
-	struct group *groupEntry;
+	struct group grp, *groupEntry;
+	long bufSize;
+	shared_array<char> strings;
+
+	bufSize = sysconf(_SC_GETGR_R_SIZE_MAX);
+	if (bufSize == -1) {
+		// Let's hope this is enough.
+		bufSize = 1024 * 64;
+	}
+	strings.reset(new char[bufSize]);
+
+	groupEntry = (struct group *) NULL;
+	if (getgrgid_r(gid, &grp, strings.get(), bufSize, &groupEntry) != 0) {
+		groupEntry = (struct group *) NULL;
+	}
 
-	groupEntry = getgrgid(gid);
-	if (groupEntry == NULL) {
+	if (groupEntry == (struct group *) NULL) {
 		return toString(gid);
 	} else {
 		return groupEntry->gr_name;
@@ -415,10 +435,23 @@ getGroupName(gid_t gid) {
 
 gid_t
 lookupGid(const string &groupName) {
-	struct group *groupEntry;
+	struct group grp, *groupEntry;
+	long bufSize;
+	shared_array<char> strings;
+
+	bufSize = sysconf(_SC_GETGR_R_SIZE_MAX);
+	if (bufSize == -1) {
+		// Let's hope this is enough.
+		bufSize = 1024 * 64;
+	}
+	strings.reset(new char[bufSize]);
+
+	groupEntry = (struct group *) NULL;
+	if (getgrnam_r(groupName.c_str(), &grp, strings.get(), bufSize, &groupEntry) != 0) {
+		groupEntry = (struct group *) NULL;
+	}
 
-	groupEntry = getgrnam(groupName.c_str());
-	if (groupEntry == NULL) {
+	if (groupEntry == (struct group *) NULL) {
 		if (looksLikePositiveNumber(groupName)) {
 			return atoi(groupName);
 		} else {

data/ext/common/Utils/SystemMetricsCollector.h

@@ -829,7 +829,7 @@ private:
 		}
 
 		short fracToShort(double x) const {
-			return x * SHRT_MAX;
+			return (short) (x * SHRT_MAX);
 		}
 
 		void updateCpuMetrics(SystemMetrics::CpuUsage &cpuUsage, long long user, long long nice,

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

@@ -41,7 +41,7 @@ struct Options {
 	SystemMetrics::XmlOptions xmlOptions;
 	SystemMetrics::DescriptionOptions descOptions;
 	int interval;
-	bool stdin;
+	bool useStdin;
 	bool exitOnUnexpectedError;
 	bool help;
 
@@ -49,7 +49,7 @@ struct Options {
 		xml = false;
 		descOptions.colors = isatty(1);
 		interval = -1;
-		stdin = false;
+		useStdin = false;
 		exitOnUnexpectedError = true;
 		help = false;
 	}
@@ -117,7 +117,7 @@ parseOptions(int argc, char *argv[]) {
 				exit(1);
 			}
 		} else if (isFlag(argv[i], '\0', "--stdin")) {
-			options.stdin = true;
+			options.useStdin = true;
 			i++;
 		} else if (isFlag(argv[i], '\0', "--no-exit-on-unexpected-error")) {
 			options.exitOnUnexpectedError = false;
@@ -131,7 +131,7 @@ parseOptions(int argc, char *argv[]) {
 			exit(1);
 		}
 	}
-	if (options.interval != -1 && options.stdin) {
+	if (options.interval != -1 && options.useStdin) {
 		fprintf(stderr, "ERROR: --watch and --stdin are mutually exclusive.\n");
 		exit(1);
 	}
@@ -181,7 +181,7 @@ main(int argc, char *argv[]) {
 		usleep(50000);
 	}
 
-	if (options.stdin) {
+	if (options.useStdin) {
 		while (waitForNextLine()) {
 			perform(options, collector, metrics);
 		}

data/lib/phusion_passenger.rb

@@ -30,7 +30,7 @@ module PhusionPassenger
 	
 	PACKAGE_NAME = 'passenger'
 	# Run 'rake ext/common/Constants.h' after changing this number.
-	VERSION_STRING = '4.0.46'
+	VERSION_STRING = '4.0.48'
 	
 	PREFERRED_NGINX_VERSION = '1.6.0'
 	NGINX_SHA256_CHECKSUM = '943ad757a1c3e8b3df2d5c4ddacc508861922e36fa10ea6f8e3a348fc9abfc1a'

data/lib/phusion_passenger/config/validate_install_command.rb

@@ -122,12 +122,12 @@ private
 			paths.concat(output.split(':'))
 		end
 
-		paths.delete(gem_bindir)
-		paths.delete(homebrew_bindir)
-		paths.delete(PhusionPassenger.bin_dir)
 		# These may not be in PATH if the user did not run this command through sudo.
 		paths << "/usr/bin"
 		paths << "/usr/sbin"
+		paths.delete(gem_bindir)
+		paths.delete(homebrew_bindir)
+		paths.delete(PhusionPassenger.bin_dir)
 		paths.uniq!
 
 		other_installs = []

data/lib/phusion_passenger/loader_shared_helpers.rb

@@ -25,7 +25,7 @@
 PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'public_api'
 PhusionPassenger.require_passenger_lib 'debug_logging'
-require 'shellwords'
+PhusionPassenger.require_passenger_lib 'utils/shellwords'
 
 module PhusionPassenger
 

data/lib/phusion_passenger/native_support.rb

@@ -138,11 +138,11 @@ private
 		STDERR.puts " --> Downloading precompiled #{library_name} for the current Ruby interpreter..."
 		STDERR.puts "     (set PASSENGER_DOWNLOAD_NATIVE_SUPPORT_BINARY=0 to disable)"
 		
-		require 'shellwords'
 		require 'logger'
 		PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 		PhusionPassenger.require_passenger_lib 'utils/tmpio'
 		PhusionPassenger.require_passenger_lib 'utils/download'
+		PhusionPassenger.require_passenger_lib 'utils/shellwords'
 
 		PhusionPassenger::Utils.mktmpdir("passenger-native-support-") do |dir|
 			Dir.chdir(dir) do
@@ -215,7 +215,7 @@ private
 		STDERR.puts "     (set PASSENGER_COMPILE_NATIVE_SUPPORT_BINARY=0 to disable)"
 
 		require 'fileutils'
-		require 'shellwords'
+		PhusionPassenger.require_passenger_lib 'utils/shellwords'
 		PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 		
 		target_dir = compile(installation_target_dirs)

data/lib/phusion_passenger/utils/download.rb

@@ -23,8 +23,8 @@
 #  THE SOFTWARE.
 
 PhusionPassenger.require_passenger_lib 'platform_info'
+PhusionPassenger.require_passenger_lib 'utils/shellwords'
 require 'fileutils'
-require 'shellwords'
 
 module PhusionPassenger
 module Utils

data/lib/phusion_passenger/utils/shellwords.rb

@@ -0,0 +1,29 @@
+# Polyfill for the shellwords library on Ruby 1.8.5.
+
+require 'shellwords'
+
+if !Shellwords.respond_to?(:escape)
+	Shellwords.class_eval do
+		def self.escape(str)
+			# An empty argument will be skipped, so return empty quotes.
+			return "''" if str.empty?
+			str = str.dup
+			# Treat multibyte characters as is.  It is caller's responsibility
+			# to encode the string in the right encoding for the shell
+			# environment.
+			str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/, "\\\\\\1")
+			# A LF cannot be escaped with a backslash because a backslash + LF
+			# combo is regarded as line continuation and simply ignored.
+			str.gsub!(/\n/, "'\n'")
+			return str
+		end
+	end
+end
+
+if !Shellwords.respond_to?(:join)
+	Shellwords.class_eval do
+		def self.join(array)
+			array.map { |arg| escape(arg) }.join(' ')
+		end
+	end
+end

data/resources/templates/standalone/config.erb

@@ -151,7 +151,7 @@ http {
         <% end %>
 
         # Rails asset pipeline support.
-        location ~ ^/assets/ {
+        location ~ "^/assets/.+-[0-9a-f]{32}\..+" {
             error_page 490 = @static_asset;
             error_page 491 = @dynamic_request;
             recursive_error_pages on;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.46
+  version: 4.0.48
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -123,13 +123,12 @@ files:
 - debian.template/patches/series
 - debian.template/rules.template
 - debian.template/source/format
-- dev/copy_boost_headers.rb
-- dev/find_owner_pipe_leaks.rb
+- dev/copy_boost_headers
 - dev/install_scripts_bootstrap_code.rb
-- dev/list_tests.rb
+- dev/list_tests
 - dev/rack.test/config.ru
 - dev/rack.test/public/asset.txt
-- dev/render_error_pages.rb
+- dev/rpmtool
 - dev/run_travis.sh
 - dev/runner
 - dev/test_rpm_packaging.sh
@@ -2456,6 +2455,7 @@ files:
 - lib/phusion_passenger/utils/json.rb
 - lib/phusion_passenger/utils/lock.rb
 - lib/phusion_passenger/utils/native_support_utils.rb
+- lib/phusion_passenger/utils/shellwords.rb
 - lib/phusion_passenger/utils/tee_input.rb
 - lib/phusion_passenger/utils/terminal_choice_menu.rb
 - lib/phusion_passenger/utils/tmpdir.rb

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJTxCOxAAoJECrHRaUKISqMXVwIAI0rKA8XrET+UEEZxdg0KApM
-9To5MBumjeAEjNifX89upFHpSw+pXbOGz0xggl8h1y0axsDL8fQuXS7nWKWy4o6u
-FbOBo3BBH9Ji0e6G/LlPe2NbYGxHLGUEmFER1/qXwO4PffdR3+gRnjEJEucs4aPJ
-1qbrne5R3svh2vRFnzJMRHdP8cBYXz1DS/DK4xY0aQ10RK6Ah7C2zrhTBudezqUp
-dXnnDa8Pcc/i0j1v2bZISOYp7nwhs+akf+c9/z3dZBpoIDPN2USt5IMyb5B4/ueT
-SFgRk/kStS95XwIlAb6a+PzDGjEfL/qVxVjQDb2GjgihP7vQEzWMzeTumbZa16g=
-=k1B4
+iQEcBAABAgAGBQJT0PH2AAoJECrHRaUKISqM3rUH/AsN9NOP4ynTb+acSScLq/I/
+nF1Qv9XA8CW23M6Mx9boMgGcVC0B6NOP5I6T8WMHDBL3J6XLCOox0FeQ0kwAS1pZ
+y4uHVwNPvl3JTS8h2c50y7JeixN/WQodXvgb9WvtV6vJQKKaqQ65wAFKo2yk4Nn8
+hRipGYgrpuZsRG8/qKvk5iBa6qkWLrHWhWbekY/hS/zMAh+UlwV5UwUlL+Q8cf5L
+dOpPxu9qj1Fw2gdIRON4VJ/nW+MiH0skGCdtaLdVs+/aFW2DcF/5G28lcV7X1ANb
+vXL5NWRRM/ZveskFCFdbm5Irhp/dnf5PqPvoyljqsJh2O34e3PizXXtTN9a9kEw=
+=UGA6
 -----END PGP SIGNATURE-----

data/dev/find_owner_pipe_leaks.rb

@@ -1,128 +0,0 @@
-#!/usr/bin/env ruby
-#  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 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.
-##############################################################################
-# A script for finding owner pipe leaks in Apache. An owner pipe is considered
-# to be leaked if it is owned by two or more Apache processes.
-#
-# This script only works on Linux. Only run it when Apache is idle.
-
-$LOAD_PATH << "#{File.dirname(__FILE__)}/../lib"
-require 'set'
-require 'passenger/platform_info'
-
-include PlatformInfo
-
-def list_pids
-	Dir.chdir("/proc") do
-		return Dir["*"].select do |x|
-			x =~ /^\d+$/
-		end
-	end
-end
-
-def list_pipes(pid)
-	pipes = []
-	Dir["/proc/#{pid}/fd/*"].each do |file|
-		if File.symlink?(file) && File.readlink(file) =~ /^pipe:\[(.*)\]$/
-			pipes << $1
-		end
-	end
-	return pipes
-end
-
-def is_rails_app(pid)
-	return File.read("/proc/#{pid}/cmdline") =~ /^Rails: /
-end
-
-def is_apache(pid)
-	begin
-		return File.readlink("/proc/#{pid}/exe") == HTTPD
-	rescue
-		return false
-	end
-end
-
-# Returns a pair of these items:
-# - The owner pipe map. Maps a Rails application's PID to to its owner pipe's ID.
-# - The reverse map. Maps an owner pipe ID to the Rail application's PID.
-def create_owner_pipe_map
-	map = {}
-	reverse_map = {}
-	list_pids.select{ |x| is_rails_app(x) }.each do |pid|
-		owner_pipe = list_pipes(pid).first
-		map[pid] = owner_pipe
-		reverse_map[owner_pipe] = pid
-	end
-	return [map, reverse_map]
-end
-
-def show_owner_pipe_listing(map, reverse_map)
-	puts "------------ Owner pipe listing ------------"
-	count = 0
-	list_pids.select{ |x| is_apache(x) }.sort.each do |pid|
-		list_pipes(pid).select do |pipe|
-			reverse_map.has_key?(pipe)
-		end.each do |pipe|
-			puts "Apache PID #{pid} holds the owner pipe (#{pipe}) " <<
-				"for Rails PID #{reverse_map[pipe]}"
-			count += 1
-		end
-	end
-	if count == 0
-		puts "(none)"
-	end
-	puts ""
-end
-
-def show_owner_pipe_leaks(map, reverse_map)
-	apache_owner_pipe_map = {}
-	list_pids.select{ |x| is_apache(x) }.sort.each do |pid|
-		list_pipes(pid).select do |pipe|
-			reverse_map.has_key?(pipe)
-		end.each do |pipe|
-			apache_owner_pipe_map[pipe] ||= []
-			apache_owner_pipe_map[pipe] << pid
-		end
-	end
-	
-	puts "------------ Leaks ------------"
-	count = 0
-	apache_owner_pipe_map.each_pair do |pipe, pids|
-		if pids.size >= 2
-			puts "Rails PID #{reverse_map[pipe]} owned by Apache processes: #{pids.join(", ")}"
-			count += 1
-		end
-	end
-	if count == 0
-		puts "(none)"
-	end
-end
-
-def start
-	map, reverse_map = create_owner_pipe_map
-	show_owner_pipe_listing(map, reverse_map)
-	show_owner_pipe_leaks(map, reverse_map)
-end
-
-start

data/dev/render_error_pages.rb

@@ -1,116 +0,0 @@
-#!/usr/bin/env ruby
-#  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 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.
-
-$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib")
-$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../ext")
-require 'phusion_passenger/html_template'
-require 'phusion_passenger/spawn_manager'
-require 'phusion_passenger/platform_info'
-include PhusionPassenger
-
-if !defined?(Mysql::Error)
-	module Mysql
-		class Error < StandardError
-		end
-	end
-end
-
-def create_dummy_exception
-	begin
-		raise StandardError, "A dummy exception."
-	rescue => e
-		return e
-	end
-end
-
-def create_database_exception
-	begin
-		raise Mysql::Error, "Cannot connect to database localhost:12345: connection refused (1234)"
-	rescue => e
-		return e
-	end
-end
-
-def create_dummy_backtrace
-	dummy_backtrace = nil
-	begin
-		raise StandardError, "A dummy exception."
-	rescue => e
-		dummy_backtrace = e.backtrace
-	end
-	dummy_backtrace.unshift("/webapps/foo/app/models/Foo.rb:102:in `something`")
-	dummy_backtrace.unshift("/webapps/foo/config/environment.rb:10")
-	return dummy_backtrace
-end
-
-def render_error_page(exception, output, template)
-	exception.set_backtrace(create_dummy_backtrace)
-	File.open(output, 'w') do |f|
-		template = HTMLTemplate.new(template,
-			:error => exception, :app_root => "/foo/bar")
-		f.write(template.result)
-		puts "Written '#{output}'"
-	end
-end
-
-def start
-	bt = create_dummy_backtrace
-	
-	e = FrameworkInitError.new("Some error message",
-		create_dummy_exception,
-		:vendor => '/webapps/foo')
-	render_error_page(e, 'framework_init_error_with_vendor.html',
-		'framework_init_error')
-	
-	e = FrameworkInitError.new("Some error message",
-		create_dummy_exception,
-		:version => '1.2.3')
-	render_error_page(e, 'framework_init_error.html',
-		'framework_init_error')
-	
-	e = VersionNotFound.new("Some error message", '>= 1.0.2')
-	render_error_page(e, 'version_not_found.html',
-		'version_not_found')
-	
-	e = AppInitError.new("Some error message", create_dummy_exception)
-	render_error_page(e, 'app_init_error.html',
-		'app_init_error')
-	
-	e = AppInitError.new("Some error message", create_database_exception)
-	render_error_page(e, 'database_error.html',
-		'database_error')
-	
-	e = ArgumentError.new("Some error message")
-	render_error_page(e, 'invalid_app_root.html',
-		'invalid_app_root')
-	
-	e = StandardError.new("Some error message")
-	render_error_page(e, 'general_error.html',
-		'general_error')
-	
-	e = AppInitError.new("Some error message", create_dummy_exception)
-	render_error_page(e, 'app_exited.html', 'app_exited_during_initialization')
-end
-
-start