passenger 5.0.2 → 5.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2JiN2YxMTU2OTZmZTQzMzIwMTk1MWM4ZGZkYzZlZmJmMjdiZTM3NA==
+    YjRiYzNlNmYwZDQ5OGQ5MjJhMmE2MjM2MDE5M2M1YTBmMWVjNzAyOQ==
   data.tar.gz: !binary |-
-    YWQ0YzJmMDg0MzMwYzBkOGQwZjExYWIzMjA1ZGM4MTAxMDE5NDNkZQ==
+    OTBjODU4Yjg5OTUzOGJlMzIxOGE5YjVmODY5ZTFhOGUzMGM3MmI0OQ==
 SHA512:
   metadata.gz: !binary |-
-    ZGZhMjdiMTZhYTk1MDRiMTYxNTlhMjhiZjNmZDI3OTBmYWZkZmEzM2ZkMDY5
-    ZTU4MDRmZWU1NjdiOTYxZjk2OGM0YmE3ZmZkNzU2YjRmZGIwMzI1M2UxYmU2
-    YTBmYWEyNzdlZWYzMzQ0YzczYmRiNjcwYTVjMDQzMTVjNjBiMmM=
+    YTEyMmZkOWViYjU4YjNkNzA3M2VkNjA1MTgzMTdmMzUxYjc2MjlhYTA1MGM1
+    N2YzYWE3NjllZjcwNjQ5MjcxYTEyMWRkZDdhYzZmMWFiODJjMzU3ZGE0NTJk
+    OWY0OGU0MDU4ZTc5NWY5NTg5MmJlZDBiODJkYTQ4Y2M1MDVhMzU=
   data.tar.gz: !binary |-
-    MzliMDhiMjI5MzM2NTZjNmUwYmQ4MWVhNmZiY2EwYTczNGY0NzI1YzAwMzQ4
-    MmQwZTQwZTI0Y2U2NjBiY2ZmZGQzZTI1YmVjN2MzMjNkNTUwOTk0NDJiZTI3
-    ZThhZTk0MzFjODY2NjQ1NWFlMzBiOTkwZWM0NTNmYmI4MjljYzY=
+    YTY0NWM0M2FmOWU1ZDVmZjJkNjhmZDE4MThkNjM1YjNhNTNiNzcxZDU2MzRm
+    OGFiOTZiODBmMjJjMjMwOGJkZjliOTA3Mzg5OGE3N2E3ODNmNmZmNGEzMjI5
+    MDMyZDYwYWJiYzI4MDI4YmMwMzRjYmQwYzA4NTlmODE2YzVjZmY=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJU+skQAAoJECrHRaUKISqMCYEIALFilhp8+SVXIUbPuDbRWt+0
-V8JijFYyXw1Jiy5VFW5V20Zu70okzRXd9V+u3UvgdRkftqrIPsp4b+vW18pAeg4i
-Gse7Wjr53xMvNthIZKqC0BY6zi9FurzkgP4r0hkd2cLmcjB53NNui7nPuYt9mMwH
-+WplJeAazcISRhQRJnlBLMDrVWesgJMj+xP/8SaKGsIYfVju8m78TI+hl0X+XT0T
-qt9zZDLRd7EpJUS5BovYAFiU7ljLXeFt9bmvN23kZ1MB49GpaPe9hA9L8pRhZmOT
-7oyLImaMKFprjwL+vPS8JYM0b+NVYkT1ALki08yEoKIpwtnujkNFr6KpHAyGSFc=
-=o0Sc
+iQEcBAABAgAGBQJVAMF1AAoJECrHRaUKISqMDSsH/0xm2Y70Fr8iahHgf2MSe/bv
+jKAkjl+MqArHlEcAskMRSwYoOJRRTbAYF8R7WxAJERnpCEa1a9l1bVO3DMCprDD7
+by1xGn2FW2WWcsQcWjPNSeTgdII7qPtxk3AJ9KTP8PEoxMjzZKpBzCxHiwOTJ64t
+7AAGqEJ5Cr8zFq17NA9Lm9h8wvk7uop5ejmGJmgaOAcxtzowSXhGmN37C1yGGVWI
+wUl5d2etK8vRry7T+bxL8eTn8e4fmcJXjk/Jq7Bq35YSR6lhUwPT/5GBe7ENrR4s
+0E7sOLTuROhGsKpJ0SFvkSiywS/rldjxut1wzjDWmmB6tnEb4gdtZ4JuWHuDPPQ=
+=bM1v
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJU+skQAAoJECrHRaUKISqM3w8IALm2kOp7hWd1Qy4mvAl7czSb
-b+V/QGy14Mlt+v24GIuVjl88CaX4qA3eHGzsBNb807+L3pc/PYPi7qd0pf0hEN6x
-kL730RkjnSFvpuLE37kuemtStVUKHnO8jxMbGWMUZEdEOLThw4LkeDKJPAjm2M2V
-dWuHzzdFsA3tb79dy6dL8SSkpqwpfHhpeCdHbgZXhMq+PhllCieeICuwBvZeSOvE
-mOwAqt5Toq1KNoKPE/gOPiywGsNQgLYn6HXYTuHrCz/p8YMjJOiTEMODTJD4io4V
-cF6byuXfikIouVBgkZQYbwuItMlpJr9e4oZidjBZ7trFmqOT1FnnFiMUehsaHzw=
-=h4HJ
+iQEcBAABAgAGBQJVAMF1AAoJECrHRaUKISqMYNMIAK47UJTr5fLogoJ8+cF++oT4
+jIyexyKyXXlySoUHBFBwSikqAWrpVnZPCDu4ULUHSTDPHy/jkcfcC6LYzmtq0AiN
+NagWHqhtklUNgBoWUfv4rEg05hoZOUbFNysp2zbcQvqFEjhmNUONXnWzOgd1UMIC
+wNxZVHxnVpmmnDqc0zfE4CTTcSSc98BLMX3xaWP3bzKHFuM0UvXczTdcgdnhOxrf
++wJ7Fp8i2YA7yADEYp8aMX1jUIB/UuhTQ5qjG+4whpMfGQvDqJpmh2Z9lolQPxv/
+skt34/MboC5CuRq1jpJ40kU3P5XqY5XKe5sWdlC0z3lhiTXNcUA5hvOB1ZOIukc=
+=oRka
 -----END PGP SIGNATURE-----

data/CHANGELOG

@@ -1,8 +1,23 @@
+Release 5.0.3
+-------------
+
+ * [Standalone] When using the builtin engine, `passenger start` may crash during startup due to an initialization race condition. This has been fixed.
+ * [Enterprise] Fixes a bug in passenger-irb. Running passenger-irb without a PID parameter worked, but running it with a PID parameter didn't.
+ * Fixes an integer overflow that resulted in a file descriptor leak and stalled client connections. Closes GH-1412.
+ * Truncates Passenger source code paths in logs (to 3 chars) to reduce redundant info. Closes GH-1383.
+ * Fixes invalid JSON output for non-finite double values (e.g. from the HTTP JSON API). Closes GH-1408.
+ * All hooks now set the `PASSENGER_HOOK_NAME` environment variable. This variable is set to the name of the hook that is being called.
+ * The Ruby handler no longer tries to call #force_encoding on response body strings, which fixes an incompatibility with apps/libraries that return frozen body strings. Closes GH-1414.
+ * If the Ruby handler crashes while processing a Rack response body, it will now no longer stall the connection.
+ * Fixes env.SERVER_PORT containing 80 instead of 443 when using https on default port. Closes GH-1421.
+ * We now handle errors in the `poll()` system call better. This might fix some crashes during shutdown which manifest on FreeBSD.
+
+
 Release 5.0.2
 -------------
 
  * Fixes a connection freeze that could occur when processing large responses. This would manifest itself under the error message "This website is under heavy load" or "Request queue is full, returning an error". Closes GH-1404.
- * Debian and Ubuntu packages have been reintroduces.
+ * Debian and Ubuntu packages have been reintroduced.
  * When `passenger-config restart-app` is run interactively, if Passenger is not serving any applications, then the command now prints an error message instead of showing a menu with only a "Cancel" option.
  * Fixes a compilation problem on FreeBSD 10 (contributed by: clemensg). Closes GH-1401.
  * [Standalone] Fixes a crash that would occur if you use the `--ctl` parameter.

data/build/cxx_tests.rb

@@ -249,6 +249,9 @@ TEST_CXX_OBJECTS = {
   'test/cxx/UtilsTest.o' => %w(
     test/cxx/UtilsTest.cpp
     ext/common/Utils.h),
+  'test/cxx/Utils/StrIntUtilsTest.o' => %w(
+    test/cxx/Utils/StrIntUtilsTest.cpp
+    ext/common/Utils/StrIntUtils.cpp),
   'test/cxx/IOUtilsTest.o' => %w(
     test/cxx/IOUtilsTest.cpp
     ext/common/Utils/IOUtils.h),

data/build/packaging.rb

@@ -318,10 +318,10 @@ task 'package:sign' do
 end
 
 task 'package:update_homebrew' do
-  require 'digest/sha1'
+  require 'digest/sha2'
   version = VERSION_STRING
-  sha1 = File.open("#{PKG_DIR}/passenger-#{version}.tar.gz", "rb") do |f|
-    Digest::SHA1.hexdigest(f.read)
+  sha256 = File.open("#{PKG_DIR}/passenger-#{version}.tar.gz", "rb") do |f|
+    Digest::SHA256.hexdigest(f.read)
   end
   sh "rm -rf #{homebrew_dir}"
   sh "git clone git@github.com:phusion/homebrew.git #{homebrew_dir}"
@@ -331,8 +331,8 @@ task 'package:update_homebrew' do
   formula = File.read("/tmp/homebrew/Library/Formula/passenger.rb")
   formula.gsub!(/passenger-.+?\.tar\.gz/, "passenger-#{version}.tar.gz") ||
     abort("Unable to substitute Homebrew formula tarball filename")
-  formula.gsub!(/^  sha1 .*/, "  sha1 '#{sha1}'") ||
-    abort("Unable to substitute Homebrew formula SHA-1")
+  formula.gsub!(/^  sha256 .*/, "  sha256 '#{sha256}'") ||
+    abort("Unable to substitute Homebrew formula SHA-256")
   necessary_dirs = ORIG_TARBALL_FILES.call.map{ |filename| filename.split("/").first }.uniq
   necessary_dirs -= Packaging::HOMEBREW_EXCLUDE
   necessary_dirs += ["buildout"]

data/doc/Users guide Nginx.txt

@@ -1242,9 +1242,6 @@ This option may occur in the following places:
 
 In each place, it may be specified at most once. The default value is '300' (5 minutes).
 
-:option: `--max-preloader-idle-time`
-include::users_guide_snippets/alternative_for_flying_passenger.txt[]
-
 ==== passenger_start_timeout <seconds> ====
 :version: 4.0.15
 include::users_guide_snippets/since_version.txt[]

data/doc/users_guide_snippets/tips.txt

@@ -453,10 +453,11 @@ A lot of information is passed to hook scripts in the form of environment variab
 
 Here are some of the environment variables which are passed to all hooks, unless documented otherwise:
 
+ * `PASSENGER_HOOK_NAME`
  * `PASSENGER_VERSION`
  * `PASSENGER_PASSENGER_ROOT`
- * `PASSENGER_SERVER_INSTANCE_DIR`
- * `PASSENGER_GENERATION_PATH`
+ * `PASSENGER_INSTANCE_DIR`
+ * `PASSENGER_INSTANCE_REGISTRY_DIR`
 
 ==== Blocking and concurrency
 

data/ext/common/Constants.h

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

data/ext/common/Hooks.h

@@ -106,6 +106,7 @@ namespace {
 		for (it = options.environment.begin(); it != end; it++) {
 			envvars.push_back(*it);
 		}
+		envvars.push_back(make_pair("PASSENGER_HOOK_NAME", options.name));
 	}
 
 	inline void

data/ext/common/Logging.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2014 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -42,6 +42,8 @@ AssertionFailureInfo lastAssertionFailure;
 static bool printAppOutputAsDebuggingMessages = false;
 static char *logFile = NULL;
 
+#define TRUNCATE_LOGPATHS_TO_MAXCHARS 3 // set to 0 to disable truncation
+
 void
 setLogLevel(int value) {
 	_logLevel = value;
@@ -87,16 +89,6 @@ _prepareLogEntry(std::stringstream &sstream, const char *file, unsigned int line
 	char datetime_buf[60];
 	struct timeval tv;
 
-	if (startsWith(file, "ext/")) {
-		file += sizeof("ext/") - 1;
-		if (startsWith(file, "common/")) {
-			file += sizeof("common/") - 1;
-			if (startsWith(file, "ApplicationPool2/")) {
-				file += sizeof("Application") - 1;
-			}
-		}
-	}
-
 	the_time = time(NULL);
 	localtime_r(&the_time, &the_tm);
 	strftime(datetime_buf, sizeof(datetime_buf) - 1, "%F %H:%M:%S", &the_tm);
@@ -106,7 +98,22 @@ _prepareLogEntry(std::stringstream &sstream, const char *file, unsigned int line
 			(unsigned long) (tv.tv_usec / 100) <<
 		" " << std::dec << getpid() << "/" <<
 			std::hex << pthread_self() << std::dec <<
-		" " << file << ":" << line <<
+		" ";
+
+	if (startsWith(file, "ext/")) { // special reduncancy filter because most code resides in these paths
+		file += sizeof("ext/") - 1;
+		if (startsWith(file, "common/")) {
+			file += sizeof("common/") - 1;
+		}
+	}
+
+	if (TRUNCATE_LOGPATHS_TO_MAXCHARS > 0) {
+		truncateBeforeTokens(file, "/\\", TRUNCATE_LOGPATHS_TO_MAXCHARS, sstream);
+	} else {
+		sstream << file;
+	}
+
+	sstream << ":" << line <<
 		" ]: ";
 }
 

data/ext/common/ServerKit/AcceptLoadBalancer.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014 Phusion
+ *  Copyright (c) 2014-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -26,9 +26,12 @@
 #define _PASSENGER_SERVER_KIT_ACCEPT_LOAD_BALANCER_H_
 
 #include <boost/bind.hpp>
+#include <boost/cstdint.hpp>
+#include <boost/config.hpp>
 #include <oxt/thread.hpp>
 #include <oxt/macros.hpp>
 #include <vector>
+#include <limits>
 #include <cassert>
 #include <cerrno>
 
@@ -41,6 +44,7 @@
 
 #include <Constants.h>
 #include <Logging.h>
+#include <Utils.h>
 #include <Utils/IOUtils.h>
 
 namespace Passenger {
@@ -50,6 +54,32 @@ using namespace std;
 using namespace boost;
 
 
+/**
+ * Listens for client connections and load balances them to multiple
+ * Server objects in a round-robin manner.
+ *
+ * Normally, the Server class listens for client connections directly.
+ * But this is inefficient in multithreaded situations where you are
+ * running one Server and event loop per CPU core, that all happen to
+ * listen on the same server socket. This is because every time a client
+ * connects, all threads wake up, but only one thread will succeed in
+ * accept()ing the client.
+ *
+ * Furthermore, it can also be very easy for threads to become
+ * unbalanced. If a burst of clients connect to the server socket,
+ * then it is very likely that a single Server accepts all of
+ * those clients. This can result in situations where, for example,
+ * thread 1 has 40 clients and thread 2 has only 3.
+ *
+ * The AcceptLoadBalancer solves this problem by being the sole entity
+ * that listens on the server socket. All client sockets that it
+ * accepts are distributed to all registered Server objects, in a
+ * round-robin manner.
+ *
+ * Inside the "PassengerAgent server", we activate AcceptLoadBalancer
+ * only if `server_threads > 1`, which is often the case because
+ * `server_threads` defaults to the number of CPU cores.
+ */
 template<typename Server>
 class AcceptLoadBalancer {
 private:
@@ -59,15 +89,24 @@ private:
 	struct pollfd pollers[1 + SERVER_KIT_MAX_SERVER_ENDPOINTS];
 	int newClients[ACCEPT_BURST_COUNT];
 
-	unsigned int nEndpoints: 2;
-	bool accept4Available: 1;
-	bool quit: 1;
-	unsigned int newClientCount: 4;
+	unsigned int nEndpoints;
+	boost::uint8_t newClientCount;
+	boost::uint8_t nextServer;
+	bool accept4Available;
+	bool quit;
 
-	unsigned int nextServer;
 	int exitPipe[2];
 	oxt::thread *thread;
 
+	#if __cplusplus >= 199711L && !defined(BOOST_NO_STATIC_ASSERT)
+		static_assert(std::numeric_limits<typeof(nEndpoints)>::max()
+			>= SERVER_KIT_MAX_SERVER_ENDPOINTS,
+			"nEndpoints's type is too small to accomodate for SERVER_KIT_MAX_SERVER_ENDPOINTS");
+		static_assert(std::numeric_limits<typeof(newClientCount)>::max()
+			>= ACCEPT_BURST_COUNT,
+			"newClientCount's type is too small to accomodate for ACCEPT_BURST_COUNT");
+	#endif
+
 	void pollAllEndpoints() {
 		pollers[0].fd = exitPipe[0];
 		pollers[0].events = POLLIN;
@@ -75,18 +114,28 @@ private:
 			pollers[i + 1].fd = endpoints[i];
 			pollers[i + 1].events = POLLIN;
 		}
-		if (poll(pollers, nEndpoints + 1, -1) == -1) {
+
+		int ret;
+		do {
+			ret = poll(pollers, nEndpoints + 1, -1) == -1;
+		} while (ret == -1 && pollErrnoShouldRetry(errno));
+		if (ret == -1) {
 			int e = errno;
 			throw SystemException("poll() failed", e);
 		}
 	}
 
+	bool pollErrnoShouldRetry(int e) const {
+		return e == EAGAIN
+			|| e == EWOULDBLOCK
+			|| e == EINTR;
+	}
+
 	bool acceptNewClients(int endpoint) {
-		unsigned int i;
 		bool error = false;
 		int fd, errcode = 0;
 
-		for (i = 0; i < ACCEPT_BURST_COUNT; i++) {
+		while (newClientCount < ACCEPT_BURST_COUNT) {
 			fd = acceptNonBlockingSocket(endpoint);
 			if (fd == -1) {
 				error = true;
@@ -94,11 +143,11 @@ private:
 				break;
 			}
 
-			newClients[i] = fd;
+			P_TRACE(2, "Accepted client file descriptor: " << fd);
+			newClients[newClientCount] = fd;
+			newClientCount++;
 		}
 
-		newClientCount = i;
-
 		if (error && errcode != EAGAIN && errcode != EWOULDBLOCK) {
 			P_ERROR("Cannot accept client: " << getErrorDesc(errcode) <<
 				" (errno=" << errcode << "). " <<
@@ -121,6 +170,8 @@ private:
 
 		for (i = 0; i < newClientCount; i++) {
 			ServerKit::Context *ctx = servers[nextServer]->getContext();
+			P_TRACE(2, "Feeding client to server thread " << nextServer <<
+				": file descriptor " << newClients[i]);
 			ctx->libev->runLater(boost::bind(feedNewClient, servers[nextServer],
 				newClients[i]));
 			nextServer = (nextServer + 1) % servers.size();
@@ -182,13 +233,19 @@ private:
 				quit = true;
 				break;
 			}
-			for (unsigned i = 0; i < nEndpoints; i++) {
+
+			unsigned int i = 0;
+			newClientCount = 0;
+
+			while (newClientCount < ACCEPT_BURST_COUNT && i < nEndpoints) {
 				if (pollers[i + 1].revents & POLLIN) {
 					if (!acceptNewClients(endpoints[i])) {
 						break;
 					}
 				}
+				i++;
 			}
+
 			distributeNewClients();
 		}
 	}
@@ -198,10 +255,10 @@ public:
 
 	AcceptLoadBalancer()
 		: nEndpoints(0),
-		  accept4Available(true),
-		  quit(false),
 		  newClientCount(0),
 		  nextServer(0),
+		  accept4Available(true),
+		  quit(false),
 		  thread(NULL)
 	{
 		if (pipe(exitPipe) == -1) {
@@ -248,7 +305,8 @@ public:
 	}
 
 	void start() {
-		thread = new oxt::thread(boost::bind(&AcceptLoadBalancer<Server>::mainLoop, this),
+		boost::function<void ()> func = boost::bind(&AcceptLoadBalancer<Server>::mainLoop, this);
+		thread = new oxt::thread(boost::bind(runAndPrintExceptions, func, true),
 			"Load balancer");
 	}
 

data/ext/common/ServerKit/Server.h

@@ -632,6 +632,7 @@ protected:
 
 	virtual void reinitializeClient(Client *client, int fd) {
 		client->setConnState(Client::ACTIVE);
+		SKC_TRACE(client, 2, "Client associated with file descriptor: " << fd);
 		client->input.reinitialize(fd);
 		client->output.reinitialize(fd);
 	}
@@ -870,9 +871,10 @@ public:
 		disconnectedClientCount++;
 
 		deinitializeClient(c);
+		SKC_TRACE(c, 2, "Closing client file descriptor: " << fdnum);
 		try {
 			safelyClose(fdnum);
-		} catch (SystemException &e) {
+		} catch (const SystemException &e) {
 			SKC_WARN(c, "An error occurred while closing the client file descriptor: " <<
 				e.what() << " (errno=" << e.code() << ")");
 		}

data/ext/common/Utils/StrIntUtils.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2014 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -110,6 +110,38 @@ splitIncludeSep(const StaticString &str, char sep, vector<StaticString> &output)
 	_splitIncludeSep(str, sep, output);
 }
 
+void
+truncateBeforeTokens(const char* str, const char *tokens, int maxBetweenTokens, std::stringstream& sstream) {
+	std::string source(str);
+
+	if (source.empty()) {
+		return;
+	}
+
+	string::size_type copyStart, findStart, pos;
+	copyStart = 0; // for copying including the last found token
+	findStart = 0;
+	while ((pos = source.find_first_of(tokens, findStart)) != string::npos) {
+		// Determine & limit how many chars between two tokens (or start and first token)
+		int copyLen = pos - findStart;
+		if (copyLen > maxBetweenTokens) {
+			copyLen = maxBetweenTokens;
+		}
+		// Include token from the previous find (first iteration has no previous)
+		if (findStart > 0) {
+			copyLen++;
+		}
+		sstream << source.substr(copyStart, copyLen);
+		copyStart = pos;
+		findStart = pos + 1;
+	}
+
+	// Copy anything remaining (e.g. when no tokens at all)
+	if (copyStart < source.size()) {
+		sstream << source.substr(copyStart);
+	}
+}
+
 string
 replaceString(const string &str, const string &toFind, const string &replaceWith) {
 	string::size_type pos = str.find(toFind);

data/ext/common/Utils/StrIntUtils.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2014 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -128,6 +128,14 @@ void splitIncludeSep(const StaticString & restrict_ref str,
 	char sep,
 	vector<StaticString> & restrict_ref output);
 
+/**
+ * Each section in str ending with any of the tokens is truncated to a length of maxBetweenTokens.
+ * The result is streamed to sstream, including tokens.
+ *
+ * Example: ("hello/world\\path/Splitter.cpp", "\\/", 3, sstream) results in sstream << "hel/wor\\pat/Splitter.cpp"
+ */
+void truncateBeforeTokens(const char* str, const char *tokens, int maxBetweenTokens, std::stringstream& sstream);
+
 /**
  * Look for 'toFind' inside 'str', replace it with 'replaceWith' and return the result.
  * Only the first occurence of 'toFind' is replaced.

data/ext/common/Utils/jsoncpp.cpp

@@ -204,6 +204,7 @@ uintToString( LargestUInt value,
 #include <iostream>
 #include <stdexcept>
 #include <string.h>
+#include <boost/math/special_functions/fpclassify.hpp>
 
 #if _MSC_VER >= 1400 // VC++ 8.0
 #pragma warning( disable : 4996 )   // disable warning about strdup being deprecated.
@@ -3459,6 +3460,10 @@ std::string valueToString( UInt value )
 
 std::string valueToString( double value )
 {
+   if (!boost::math::isfinite(value)) {
+	   return "null";
+   }
+
    char buffer[32];
 #if defined(_MSC_VER) && defined(__STDC_SECURE_LIB__) // Use secure version with visual studio 2005 to avoid warning. 
    sprintf_s(buffer, sizeof(buffer), "%#.16g", value); 

data/ext/common/agents/HelperAgent/RequestHandler/ForwardResponse.cpp

@@ -715,9 +715,17 @@ constructHeaderBuffersForResponse(Request *req, struct iovec *buffers,
 	}
 
 	if (showVersionInHeader) {
-		PUSH_STATIC_BUFFER("X-Powered-By: " PROGRAM_NAME " " PASSENGER_VERSION "\r\n\r\n");
+		#ifdef PASSENGER_IS_ENTERPRISE
+			PUSH_STATIC_BUFFER("X-Powered-By: " PROGRAM_NAME " Enterprise " PASSENGER_VERSION "\r\n\r\n");
+		#else
+			PUSH_STATIC_BUFFER("X-Powered-By: " PROGRAM_NAME " " PASSENGER_VERSION "\r\n\r\n");
+		#endif
 	} else {
-		PUSH_STATIC_BUFFER("X-Powered-By: " PROGRAM_NAME "\r\n\r\n");
+		#ifdef PASSENGER_IS_ENTERPRISE
+			PUSH_STATIC_BUFFER("X-Powered-By: " PROGRAM_NAME " Enterprise\r\n\r\n");
+		#else
+			PUSH_STATIC_BUFFER("X-Powered-By: " PROGRAM_NAME "\r\n\r\n");
+		#endif
 	}
 
 	nbuffers = i;

data/ext/common/agents/HelperAgent/RequestHandler/SendRequest.cpp

@@ -212,7 +212,11 @@ determineHeaderSizeForSessionProtocol(Request *req,
 				host->start->data + host->size - sep - 1);
 		} else {
 			state.serverName = StaticString(host->start->data, host->size);
-			state.serverPort = P_STATIC_STRING("80");
+			if (req->https) {
+				state.serverPort = P_STATIC_STRING("443");
+			} else {
+				state.serverPort = P_STATIC_STRING("80");
+			}
 		}
 	} else {
 		state.serverName = defaultServerName;

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

@@ -162,12 +162,12 @@ private:
 
 		if (server->canKeepAlive(req)) {
 			if (httpVersion < 1010) {
-				// HTTP < 1.1 defaults to "Connection: close"
+				// HTTP < 1.1 defaults to "Connection: close", but we want keep-alive
 				PUSH_STATIC_STRING("Connection: keep-alive\r\n");
 			}
 		} else {
 			if (httpVersion >= 1010) {
-				// HTTP 1.1 defaults to "Connection: keep-alive"
+				// HTTP 1.1 defaults to "Connection: keep-alive", but we don't want it
 				PUSH_STATIC_STRING("Connection: close\r\n");
 			}
 		}

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

@@ -1215,6 +1215,8 @@ reportAgentsInformation(const WorkingObjectsPtr &wo, const vector<AgentWatcherPt
 		str = doc.toStyledString();
 
 		writeExact(wo->reportFile, str.data(), str.size());
+		close(wo->reportFile);
+		wo->reportFile = -1;
 	}
 }
 

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 = '5.0.2'
+  VERSION_STRING = '5.0.3'
 
   PREFERRED_NGINX_VERSION = '1.6.2'
   NGINX_SHA256_CHECKSUM = 'b5608c2959d3e7ad09b20fc8f9e5bd4bc87b3bc8ba5936a513c04ed8f1391a18'

data/lib/phusion_passenger/config/about_command.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion
+#  Copyright (c) 2010-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -175,7 +175,12 @@ module PhusionPassenger
           PhusionPassenger.require_passenger_lib 'platform_info/binary_compatibility'
           puts PhusionPassenger::PlatformInfo.cxx_binary_compatibility_id
         when "--version"
-          puts PhusionPassenger::VERSION_STRING
+          if defined?(PhusionPassenger::PASSENGER_IS_ENTERPRISE)
+            name = "#{PhusionPassenger::PROGRAM_NAME} Enterprise"
+          else
+            name = PhusionPassenger::PROGRAM_NAME
+          end
+          puts "#{name} #{PhusionPassenger::VERSION_STRING}"
         when "--help"
           self.class.help
         else

data/lib/phusion_passenger/rack/thread_handler_extension.rb

@@ -84,6 +84,7 @@ module PhusionPassenger
           begin
             status, headers, body = @app.call(env)
           rescue => e
+            disable_keep_alive
             if should_reraise_app_error?(e, socket_wrapper)
               raise e
             elsif !should_swallow_app_error?(e, socket_wrapper)
@@ -101,6 +102,9 @@ module PhusionPassenger
 
           begin
             process_body(env, connection, socket_wrapper, status.to_i, headers, body)
+          rescue Exception => e
+            disable_keep_alive
+            raise
           ensure
             body.close if body && body.respond_to?(:close)
           end
@@ -175,7 +179,6 @@ module PhusionPassenger
             begin
               if chunk
                 body.each do |part|
-                  part = force_binary(part)
                   size = bytesize(part)
                   if size != 0
                     connection.writev(chunk_data(part, size))
@@ -188,6 +191,7 @@ module PhusionPassenger
                 end
               end
             rescue => e
+              disable_keep_alive
               if should_reraise_app_error?(e, socket_wrapper)
                 raise e
               elsif !should_swallow_app_error?(e, socket_wrapper)
@@ -232,6 +236,10 @@ module PhusionPassenger
         end
       end
 
+      def disable_keep_alive
+        @keepalive_performed = false
+      end
+
       def should_output_body?(status, env)
         return (status < 100 ||
           (status >= 200 && status != 204 && status != 205 && status != 304)) &&
@@ -256,18 +264,6 @@ module PhusionPassenger
           str.size
         end
       end
-
-      if "".respond_to?(:force_encoding)
-        BINARY = "binary".freeze
-
-        def force_binary(str)
-          str.force_encoding(BINARY)
-        end
-      else
-        def force_binary(str)
-          str
-        end
-      end
     end
 
   end # module Rack

data/lib/phusion_passenger/standalone/start_command/builtin_engine.rb

@@ -68,10 +68,9 @@ module PhusionPassenger
         end
 
         def build_daemon_controller_options
-          if @options[:socket_file]
-            ping_spec = [:unix, @options[:socket_file]]
-          else
-            ping_spec = [:tcp, @options[:address], @options[:port]]
+          ping_spec = lambda do
+            File.exist?(report_file_path) &&
+              File.stat(report_file_path).size > 0
           end
 
           command = ""

data/test/cxx/Utils/StrIntUtilsTest.cpp

@@ -0,0 +1,39 @@
+#include "TestSupport.h"
+#include <Utils/StrIntUtils.h>
+
+using namespace Passenger;
+using namespace std;
+
+namespace tut {
+	struct StrIntUtilsTest {
+	};
+
+	void testTruncate(const char* str, const char *tokens, int maxBetweenTokens, const char* expected) {
+		std::stringstream sstream;
+		truncateBeforeTokens(str, tokens, maxBetweenTokens, sstream);
+		ensure("got [" +  sstream.str() + "], expected [" + expected + "]", sstream.str() == expected);
+	}
+	
+	DEFINE_TEST_GROUP(StrIntUtilsTest);
+
+	TEST_METHOD(1) {
+		set_test_name("no change should occur");
+		testTruncate("", "", 0, "");
+		testTruncate("testwithout/tokens", "", 2, "testwithout/tokens");
+		testTruncate("", "/", 2, "");
+		testTruncate("/", "", 2, "/");
+		testTruncate("/", "/", 2, "/");
+		testTruncate("hello", "/", 2, "hello");
+		testTruncate("/hello", "/", 3, "/hello");
+	} TEST_METHOD(2) {
+		set_test_name("truncation must not touch begin/end token");
+		testTruncate("hello/", "/", 3, "hel/");
+		testTruncate("/hello/", "/", 3, "/hel/");
+	} TEST_METHOD(3) {
+		set_test_name("exact truncation and multiple split tokens");
+		testTruncate("hello/world/Main.cpp", "/", 2, "he/wo/Main.cpp");
+		testTruncate("hello/world\\Main.cpp", "/\\", 1, "h/w\\Main.cpp");
+		testTruncate("hello/world\\Main.cpp", "/", 1, "h/world\\Main.cpp");
+		testTruncate("/he/llo/worl/", "/", 3, "/he/llo/wor/");
+	}
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -3009,6 +3009,7 @@ files:
 - test/cxx/TestSupport.cpp
 - test/cxx/TestSupport.h
 - test/cxx/UnionStationTest.cpp
+- test/cxx/Utils/StrIntUtilsTest.cpp
 - test/cxx/UtilsTest.cpp
 - test/cxx/VariantMapTest.cpp
 - test/gdbinit.example

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJU+skQAAoJECrHRaUKISqM1iIH/A3Ew5qcBlnzwsgcAOA739Qf
-aI39zhOeeXUUnqbfyTEJgQzOxbrk6Qz496V7x5tcVRTfRdxFnF+9PNVZwrdYc6/6
-viWyR43O6z1r6IG0qbOPDjRByMAqJEz3r0rzHHxUYbNSnxErYzuAvuOz17FfVhri
-S78GmvltgdHBdP2nGCr+fFc9MNEgi/2UKYL31/1bJrRJ+j9enkAWwF0mudr9RYxX
-pxOV/kOslurXLDfMPCeMZDLNXwY1uLg5FTDmG6ao80wNvV1Z+pQ5vBfsl4t73sxN
-TVuscgETgrLuSrIFqant4zIaFPXCXwY+HRyCHDn+S4MqD8l1ydUL0hCfho5780M=
-=86O6
+iQEcBAABAgAGBQJVAMF1AAoJECrHRaUKISqMImsIAJTQzyvYQ8pEqJsRuCK2E4aI
+cJCVHsWzz4M1rYG9ICtenTynE8Xahdf1n74sGjmd4cXY67V1b6EUXutOUH1JIa4n
+R/rDSvqvK/Fuj3B8r1Or87HwFqLdMEjCUd08GCGXtERAeswgaoQqXfM05x2V8cdp
+7UJdo2w0uPjEauDl0AD8lWNEWInTLw61uXkNkjfG04kMDmcgi8ZxK9epBmBjeX88
+byVAoKxOj0vXUCN9LDsJ4p1cQ+URqQPJUS88jBKNSi2S+S7V29CzauSHa/7yLnFK
+JOA55NXHpFfV9XCmeQHvq52bIBp1qfW5Umif0Gjv9v11P0bl3k9neJ1psLKRCZ8=
+=Ycnq
 -----END PGP SIGNATURE-----