passenger 5.0.0.beta1 → 5.0.0.beta2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2MwNTYyYWNkZDMzZGIxNDM5NWNhMGJlOTA5Y2RjNjE0Y2RjZjdhNw==
+    Yzc0NjVmNTJlYTZmYWExZjBmZTEyZDFjODliMDg2YTBiZWI5ZmQ2MA==
   data.tar.gz: !binary |-
-    MzNlOTI1MWZkNDIzMTg0NWVmZjg4YWNlMWJiODU0MmRiMjMzMjFiMA==
+    YzJmMGQxZmU1NmY5ODcxNTBiZWZlZThmMjhiYTE1NjVmNThiYjkxNw==
 SHA512:
   metadata.gz: !binary |-
-    OTQ4YjNmNzNmZTYzYWIzYTc4MTA0MTE4ODZhNDM2NzVkNGZhMTk1OTQ5NzQy
-    ZDU4Mjc4ZTlhOTI4ODc2ZWUyZjQ3MTk0NDA4NjU1MjBkMjc3OTBhYTNmYzdl
-    MzY1ZDczZDQ4ZTRjNmUzNDUwMTBkODFlMjBjNmQ1ZTEwZjIyMGQ=
+    ZmY1NmQwMzNkZmFhYWQ1MWVjMDFkYWQwYzRlNDdhNzI1MjI3MjUwODUyOGI5
+    ZjFkMmRkOTY0NzE2YTUyYmI4YzEwNjJiOTIwZWNmNzMwMTc2YzM0NWEzMzY4
+    NGVhMjQ4MjA4MWRmMjkzMmMwOGE2MjdmNzVmY2M1ZWU2NmIxMTE=
   data.tar.gz: !binary |-
-    YjQ5M2NlNDEzNTIzMTNiNjllZTQzZTczYzU1NjBhOTI0MDk3M2QzMWNlYjdl
-    OTE5MGZkY2ZmZmMzNjAwN2UwYjM5NmJhYmRmZGQyNzQ1ODNkYzNkYWNjZTUy
-    NzBlMGE5MDM2ZjZkOGM2ZGM1NWYzNTI5ZjRmNDM0ODdmYzMzMDQ=
+    MTA0ZGVkNjg2NWM1YzRkZTBmMjAwMDM0MmYyNjJjNTNiMmNiZWEzNTIyNTQw
+    ZDM0NzljODkwNWVlMjU5NDIxOWRkODMwNmJkNDc4MTE1ZmZmNjAxZTE3NmFj
+    YzE3ODgyOTM4N2EzYjg5NDJlNGRhMWQ3NjFmZTg2YWJjZmNlYTY=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJUdIftAAoJECrHRaUKISqMuuYH/1upwgXMC5FAFeeO1+4LRGYr
-ISrBfAo406NssNSJXCZWXOS1Yquuv2r+8ZtEhmikXhueoCdKgEfkJs83jfxTBywG
-qRTCQhduyZlcmc0P2T7ZQBj2lHIqoeMajT8oiERm/xpLKn8snpujdrMDxxZTWqh5
-lFtj0srdw2/+1cKzpLi+3b21bnLUhZdWOylr52oNIEhtlYFJFl/xVK1Jim4KYtj8
-sGrN+dTCqqNIPJhMKyT7QAI4OMQ3sTV+N9w0Px2BKbpUk3VvPU5QtYeGVX5DMljW
-naCtmstWTa304LkvtkYT4XGAX/OkKoozl1swes05ePhiBYWIfhByuyHSd+HRPX8=
-=VpUk
+iQEcBAABAgAGBQJUlA2PAAoJECrHRaUKISqMfFcH/RERmONzrpkI9JVi+JxjUFRf
+u9QT0kBu8VDYhaZEHQHvhVsTKKu+6+9qa0td1B9CFf2M+pdEakCIqIWCxb0dQVme
+/F4z+pprnCEUwc348iynv0evSQ7dUhQphNGL0cCXDGDuMrGxbQxP7DRiyc2h99un
+CVWuQGwZvnMGnJ4gmQjTKLalnMVHxEkEwukuhPFbuMEt6lzo4JXzTc3/STRSkt1J
+ZnXeFOR8ifkynyvNv7wgbIv1r4iAWSn0L2c1P2ou1MnghQhjBDs2XJDnZ1KjDuML
+f1AoWn/VyWi4HkyqAvVhFxCCr0WoyWmQ2uhD5vikwPHVrxoKbQGP2OJwk+FbltI=
+=CGbg
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJUdIftAAoJECrHRaUKISqMFw8H/R0bjqRGi/R6YMr7ZIKs6kSM
-kWBA+k0OR7AAeKNlvWGJW1YlFRgn8dGQCqQOFKbOtXZUbxYOpuNJCnJPN9UQe60A
-XrN7GRa7JLBL9DAfz1/PR5KicQvZ/XZ//zegPXFsFdRE0QSbqGKZRdNIwL9TtjwV
-OVFJ0UWeUCWme281T27q8yuGPGNRh7C5ypB9nYy3kmVuCPrfddA0n+R2WD+6CVMe
-sLm/axbTbhXdJ8Fn/riuDPWNXvgayXCB+9Ds6bdblsRGwkrGqf392upyIv0stXp5
-rRytKymkXMAlg57MRwvGBIikxyV0B0AHjhtuqQ69TYXnt4rhNTn9xbI6JK5uQ2E=
-=R+7h
+iQEcBAABAgAGBQJUlA2PAAoJECrHRaUKISqMKGAH/At3Qmxna8prw6C4gGN2quRk
+B29MiVrX/mt82dUhM4+ENRSN4Anxzj+ZiIzjts/ko4LO5z7imX6/Yg9yVu+JX2+K
+DPmmmvvAfFhwslVf3bbL5f9bmaS1AV9Vh0a0TJtN2kv+wKmOJ0olbA8mYmC3TQh+
+Ypg23/0FgGNESTM19RL5cr4govT8xd2/qYAn+WauXqmxaXLfRZFLXpDOrVQJztIu
+AZA7FfhEaFRUv+2YB2iiO474AUIdCNpksWIs/q3bKJHy+buMsytFCWD5UcBt5Cfu
+rli1TCrwxgnHTes5rrXWvAeQyJzmwQmhA6A8co6F6xOArfZmxZRfegD8Z82fY/M=
+=MeVu
 -----END PGP SIGNATURE-----

data/CHANGELOG

@@ -1,3 +1,16 @@
+Release 5.0.0 beta 2
+--------------------
+
+ * Fixed handling of multiple Set-Cookie headers. Closes GH-1296.
+ * `passenger-config system-metrics` now works properly if the agent is installed in ~/.passenger. Closes GH-1304.
+ * Documentation enhancements by Igor Vuk. Closes GH-1318.
+ * Fixed some crasher bugs.
+ * [Standalone] User switching is now correctly disabled.
+ * [Standalone] Fixed the `--thread-count` parameter.
+ * [Apache] IPs set by mod_remoteip are now respected. Closes GH-1284.
+ * [Apache] Fixed support for gzipped chunked responses. Closes GH-1309.
+
+
 Release 5.0.0 beta 1
 --------------------
 
@@ -31,6 +44,26 @@ Minor changes:
  * [Standalone] `passenger-standalone.json`/`Passengerfile.json` no longer overrides command line options. Instead, command line options now have the highest priority.
 
 
+Release 4.0.56
+--------------
+
+ * Fixed a file descriptor leak that manifests when an error page is shown. Contributed by Paul Bonaud, closes GH-1325.
+ * Improved Node.js request load balancing. Closes GH-1322. Thanks to Charles Vallières for the analysis.
+
+
+Release 4.0.55
+--------------
+
+ * Supports Ruby 2.2. Closes GH-1314.
+ * Fixed Linux OS name detection.
+
+
+Release 4.0.54
+--------------
+
+ * Contains a licensing-related hot fix for Enterprise customers.
+
+
 Release 4.0.53
 --------------
 

data/CONTRIBUTORS

@@ -30,6 +30,7 @@ Gokulnath Manakkattil
 Gregory Potamianos
 Hongli Lai (Phusion)
 Ian Ehlert
+Igor Vuk
 isaac
 Isaac Reuben
 J Smith
@@ -57,6 +58,7 @@ Nathaniel Bibler
 Neil Wilson
 Ninh Bui (Phusion)
 Pat Downey
+Paul B
 Paul Kmiec
 Pepijn Looije
 Perry Smith

data/build/agents.rb

@@ -62,6 +62,9 @@ AGENT_OBJECTS = {
 		'ext/common/ServerKit/HttpHeaderParser.h',
 		'ext/common/ServerKit/AcceptLoadBalancer.h',
 		'ext/common/ServerKit/FileBufferedChannel.h',
+		'ext/common/ApplicationPool2/Pool.h',
+		'ext/common/ApplicationPool2/Group.h',
+		'ext/common/ApplicationPool2/Spawner.h',
 		'ext/common/Constants.h',
 		'ext/common/StaticString.h',
 		'ext/common/Account.h',

data/build/packaging.rb

@@ -142,7 +142,7 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 	end
 
 	if is_open_source?
-		if boolean_option('HOMEBREW_UPDATE', true)
+		if boolean_option('HOMEBREW_UPDATE', true) && !is_beta
 			puts "Updating Homebrew formula..."
 			Rake::Task['package:update_homebrew'].invoke
 		else

data/doc/Packaging.txt.md

@@ -233,7 +233,7 @@ a list of all possible assets and asset directories.
 
    The directory that contains the source code for the Phusion Passenger Ruby
    extension. Phusion Passenger uses these sources to build a Ruby extension,
-   when it detects that the user is using a new Ruby interpeter for which
+   when it detects that the user is using a new Ruby interpreter for which
    no Ruby extension has been compiled.
 
    Value when originally packaged: `<SOURCE_ROOT>/ext/ruby`.

data/doc/users_guide_snippets/tips.txt

@@ -799,7 +799,7 @@ server {
 --------------------
 endif::nginx[]
 
-Then you need to install a Ruby 1.9-compatible Ruby interpeter with POSIX spawn support, alongside JRuby/MRI 1.8. Ruby interpreters which can be used for running the Flying Passenger daemon include:
+Then you need to install a Ruby 1.9-compatible Ruby interpreter with POSIX spawn support, alongside JRuby/MRI 1.8. Ruby interpreters which can be used for running the Flying Passenger daemon include:
 
  * MRI Ruby >= 1.9.
  * Rubinius.

data/ext/apache2/Hooks.cpp

@@ -706,16 +706,6 @@ private:
 		return 0;
 	}
 
-	/**
-	 * Checks case-insensitively whether the given header is "Transfer-Encoding".
-	 */
-	bool headerIsTransferEncoding(const char *headerName, size_t len) const {
-		return len == sizeof("transfer-encoding") - 1 &&
-			apr_tolower(headerName[0]) == (u_char) 't' &&
-			apr_tolower(headerName[sizeof("transfer-encoding") - 2]) == (u_char) 'g' &&
-			apr_strnatcasecmp(headerName + 1, "ransfer-encoding") == 0;
-	}
-
 	/**
 	 * Convert an HTTP header name to a CGI environment name.
 	 */
@@ -892,7 +882,7 @@ private:
 
 		#if HTTP_VERSION(AP_SERVER_MAJORVERSION_NUMBER, AP_SERVER_MINORVERSION_NUMBER) >= 2004
 			addHeader(result, P_STATIC_STRING("!~REMOTE_ADDR"),
-				r->connection->client_ip);
+				r->useragent_ip);
 			addHeader(r, result, P_STATIC_STRING("!~REMOTE_PORT"),
 				r->connection->client_addr->port);
 		#else
@@ -979,10 +969,11 @@ private:
 
 		// Add flags.
 		// C = Strip 100 Continue header
+		// D = Dechunk
 		// B = Buffer request body
 		// S = SSL
 
-		result.append("!~FLAGS: C", sizeof("!~FLAGS: C") - 1);
+		result.append("!~FLAGS: CD", sizeof("!~FLAGS: CD") - 1);
 		if (config->bufferUpload != DirConfig::DISABLED) {
 			result.append("B", 1);
 		}

data/ext/common/ApplicationPool2/Implementation.cpp

@@ -184,7 +184,6 @@ void processAndLogNewSpawnException(SpawnException &e, const Options &options,
 
 	try {
 		int fd = -1;
-		FdGuard guard(fd, true);
 		string errorPage;
 
 		UPDATE_TRACE_POINT();
@@ -199,6 +198,7 @@ void processAndLogNewSpawnException(SpawnException &e, const Options &options,
 				getSystemTempDir());
 			fd = mkstemp(filename);
 		#endif
+		FdGuard guard(fd, true);
 		if (fd == -1) {
 			int e = errno;
 			throw SystemException("Cannot generate a temporary filename",

data/ext/common/ApplicationPool2/Options.h

@@ -283,6 +283,8 @@ public:
 	 */
 	bool loadShellEnvvars;
 
+	bool userSwitching;
+
 	/** Whether Union Station logging should be enabled. Enabling this option will
 	 * result in:
 	 *
@@ -455,6 +457,7 @@ public:
 		  rights(DEFAULT_BACKEND_ACCOUNT_RIGHTS),
 		  debugger(false),
 		  loadShellEnvvars(true),
+		  userSwitching(true),
 		  analytics(false),
 		  raiseInternalError(false),
 

data/ext/common/ApplicationPool2/Process.h

@@ -534,19 +534,17 @@ public:
 	int busyness() const {
 		/* Different processes within a Group may have different
 		 * 'concurrency' values. We want:
-		 * - Group.pqueue to sort the processes from least used to most used.
-		 * - to give processes with concurrency == 0 more priority over processes
-		 *   with concurrency > 0.
-		 * Therefore, we describe our busyness as a percentage of 'concurrency', with
-		 * the percentage value in [0..INT_MAX] instead of [0..1].
+		 * - the process with the smallest busyness to be be picked for routing.
+		 * - to give processes with concurrency == 0 more priority (in general)
+		 *   over processes with concurrency > 0.
+		 * Therefore, in case of processes with concurrency > 0, we describe our
+		 * busyness as a percentage of 'concurrency', with the percentage value
+		 * in [0..INT_MAX] instead of [0..1]. That way, the busyness value
+		 * of processes with concurrency > 0 is usually higher than that of processes
+		 * with concurrency == 0.
 		 */
 		if (concurrency == 0) {
-			// Allows Group.pqueue to give idle sockets more priority.
-			if (sessions == 0) {
-				return 0;
-			} else {
-				return 1;
-			}
+			return sessions;
 		} else {
 			return (int) (((long long) sessions * INT_MAX) / (double) concurrency);
 		}

data/ext/common/ApplicationPool2/Spawner.h

@@ -924,7 +924,9 @@ protected:
 
 		UPDATE_TRACE_POINT();
 		userInfo = (struct passwd *) NULL;
-		if (!options.user.empty()) {
+		if (!options.userSwitching) {
+			// Keep userInfo at NULL so that it's set to defaultUser's UID.
+		} else if (!options.user.empty()) {
 			ret = getpwnam_r(options.user.c_str(), &pwd, pwdBuf.get(),
 				pwdBufSize, &userInfo);
 			if (ret != 0) {
@@ -953,7 +955,9 @@ protected:
 		}
 
 		UPDATE_TRACE_POINT();
-		if (!options.group.empty()) {
+		if (!options.userSwitching) {
+			// Keep groupId at -1 so that it's set to defaultGroup's GID.
+		} else if (!options.group.empty()) {
 			struct group *groupInfo = (struct group *) NULL;
 
 			if (options.group == "!STARTUP_FILE!") {

data/ext/common/Constants.h

@@ -110,7 +110,7 @@
 
 	#define NGINX_DOC_URL "https://www.phusionpassenger.com/documentation/Users%20guide%20Nginx.html"
 
-	#define PASSENGER_VERSION "5.0.0.beta1"
+	#define PASSENGER_VERSION "5.0.0.beta2"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/ext/common/ServerKit/HeaderTable.h

@@ -39,6 +39,9 @@ namespace ServerKit {
 using namespace std;
 
 
+extern const HashedStaticString HTTP_COOKIE;
+extern const HashedStaticString HTTP_SET_COOKIE;
+
 struct Header {
 	LString key;
 	LString val;
@@ -104,6 +107,18 @@ private:
 		return v;
 	}
 
+	OXT_FORCE_INLINE
+	static bool isCookieHeader(const Header *header) {
+		return header->hash == HTTP_COOKIE.hash()
+			&& psg_lstr_cmp(&header->key, HTTP_COOKIE);
+	}
+
+	OXT_FORCE_INLINE
+	static bool isSetCookieHeader(const Header *header) {
+		return header->hash == HTTP_SET_COOKIE.hash()
+			&& psg_lstr_cmp(&header->key, HTTP_SET_COOKIE);
+	}
+
 	void repopulate(unsigned int desiredSize) {
 		assert((desiredSize & (desiredSize - 1)) == 0);   // Must be a power of 2
 		assert(m_population * 4  <= desiredSize * 3);
@@ -248,8 +263,13 @@ public:
 					return;
 				} else if (psg_lstr_cmp(&cell->header->key, &header->key)) {
 					// Cell matches, so merge value into header.
-					// TODO: we need to merge Set-Cookie headers differently
-					psg_lstr_append(&cell->header->val, pool, ",", 1);
+					if (isCookieHeader(header)) {
+						psg_lstr_append(&cell->header->val, pool, ";", 1);
+					} else if (isSetCookieHeader(header)) {
+						psg_lstr_append(&cell->header->val, pool, "\n", 1);
+					} else {
+						psg_lstr_append(&cell->header->val, pool, ",", 1);
+					}
 					LString::Part *part = header->val.start;
 					header->val.start = NULL;
 					while (part != NULL) {
@@ -301,8 +321,12 @@ public:
 			if (PHT_CIRCULAR_OFFSET(ideal, cell) < PHT_CIRCULAR_OFFSET(ideal, neighbor)) {
 				// Erase current cell and move neighbor into this position,
 				// then make the now-empty neighbor the new cell to remove.
-				psg_lstr_deinit(&cell->header->key);
-				psg_lstr_deinit(&cell->header->val);
+				if (cell->header != NULL) {
+					// A previous iteration in this loop
+					// could have made cell->header NULL.
+					psg_lstr_deinit(&cell->header->key);
+					psg_lstr_deinit(&cell->header->val);
+				}
 				*cell = *neighbor;
 				cell = neighbor;
 				neighbor->header = NULL;

data/ext/common/ServerKit/Implementation.cpp

@@ -28,7 +28,9 @@ namespace Passenger {
 namespace ServerKit {
 
 
-extern const HashedStaticString TRANSFER_ENCODING;
+// Define 'extern' so that the compiler doesn't output warnings.
+extern const HashedStaticString HTTP_COOKIE;
+extern const HashedStaticString HTTP_SET_COOKIE;
 extern const char DEFAULT_INTERNAL_SERVER_ERROR_RESPONSE[];
 extern const unsigned int DEFAULT_INTERNAL_SERVER_ERROR_RESPONSE_SIZE;
 
@@ -41,6 +43,8 @@ const char DEFAULT_INTERNAL_SERVER_ERROR_RESPONSE[] =
 	"Internal server error\n";
 const unsigned int DEFAULT_INTERNAL_SERVER_ERROR_RESPONSE_SIZE =
 	sizeof(DEFAULT_INTERNAL_SERVER_ERROR_RESPONSE) - 1;
+const HashedStaticString HTTP_COOKIE("cookie");
+const HashedStaticString HTTP_SET_COOKIE("set-cookie");
 
 
 } // namespace ServerKit

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

@@ -939,12 +939,29 @@ preinitialize(VariantMap &options) {
 	}
 }
 
+static string
+inferDefaultGroup(const string &defaultUser) {
+	struct passwd *userEntry = getpwnam(defaultUser.c_str());
+	if (userEntry == NULL) {
+		throw ConfigurationException(
+			string("The user that PassengerDefaultUser refers to, '") +
+			defaultUser + "', does not exist.");
+	}
+	return getGroupName(userEntry->pw_gid);
+}
+
 static void
 setAgentsOptionsDefaults() {
 	VariantMap &options = *agentsOptions;
 	set<string> defaultAddress;
 	defaultAddress.insert(DEFAULT_HTTP_SERVER_LISTEN_ADDRESS);
 
+	options.setDefaultBool("user_switching", true);
+	options.setDefault("default_user", DEFAULT_WEB_APP_USER);
+	if (!options.has("default_group")) {
+		options.set("default_group",
+			inferDefaultGroup(options.get("default_user")));
+	}
 	options.setDefaultStrSet("server_addresses", defaultAddress);
 	options.setDefaultBool("multi_app", false);
 	options.setDefault("environment", DEFAULT_APP_ENV);

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

@@ -78,6 +78,12 @@ serverUsage() {
 	printf("                            the given admin account. LEVEL indicates the\n");
 	printf("                            privilege level (see below). PASSWORDFILE must\n");
 	printf("                            point to a file containing the password\n");
+	printf("      --no-user-switching   Disables user switching support\n");
+	printf("      --default-user NAME   Default user to start apps as, when user\n");
+	printf("                            switching is enabled. Default: " DEFAULT_WEB_APP_USER "\n");
+	printf("      --default-group NAME  Default group to start apps as, when user\n");
+	printf("                            switching is disabled. Default: the default\n");
+	printf("                            user's primary group\n");
 	printf("\n");
 	printf("Application serving options (optional):\n");
 	printf("  -e, --environment NAME    Default framework environment name to use.\n");
@@ -208,6 +214,15 @@ parseServerOption(int argc, const char *argv[], int &i, VariantMap &options) {
 		authorizations.push_back(argv[i + 1]);
 		options.setStrSet("server_authorizations", authorizations);
 		i += 2;
+	} else if (p.isFlag(argv[i], '\0', "--no-user-switching")) {
+		options.setBool("user_switching", false);
+		i++;
+	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--default-user")) {
+		options.set("default_user", argv[i + 1]);
+		i += 2;
+	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--default-group")) {
+		options.set("default_group", argv[i + 1]);
+		i += 2;
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--max-pool-size")) {
 		options.setInt("max_pool_size", atoi(argv[i + 1]));
 		i += 2;

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

@@ -161,6 +161,12 @@ using namespace oxt;
 using namespace ApplicationPool2;
 
 
+namespace ServerKit {
+	extern const HashedStaticString HTTP_COOKIE;
+	extern const HashedStaticString HTTP_SET_COOKIE;
+}
+
+
 class RequestHandler: public ServerKit::HttpServer<RequestHandler, Client> {
 public:
 	enum BenchmarkMode {

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

@@ -120,6 +120,7 @@ public:
 	boost::uint64_t bodyAlreadyRead;
 
 	LString *date;
+	LString *setCookie;
 	LString *cacheControl;
 	LString *expiresHeader;
 	LString *lastModifiedHeader;

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

@@ -300,6 +300,22 @@ onAppResponseBegin(Client *client, Request *req) {
 	// Localize hash table operations for better CPU caching.
 	oobw = resp->secureHeaders.lookup(PASSENGER_REQUEST_OOB_WORK) != NULL;
 	resp->date = resp->headers.lookup(HTTP_DATE);
+	resp->setCookie = resp->headers.lookup(ServerKit::HTTP_SET_COOKIE);
+	if (resp->setCookie != NULL) {
+		// Remove Set-Cookie from resp->headers without deallocating it.
+		LString *copy;
+
+		copy = (LString *) psg_palloc(req->pool, sizeof(LString));
+		*copy = *resp->setCookie;
+
+		resp->setCookie->start = NULL;
+		resp->setCookie->end = NULL;
+		resp->setCookie->size = 0;
+		psg_lstr_append(resp->setCookie, req->pool, "x", 1);
+		resp->headers.erase(ServerKit::HTTP_SET_COOKIE);
+
+		resp->setCookie = copy;
+	}
 	resp->headers.erase(HTTP_CONNECTION);
 	resp->headers.erase(HTTP_STATUS);
 	if (resp->bodyType == AppResponse::RBT_CONTENT_LENGTH) {
@@ -574,6 +590,26 @@ constructHeaderBuffersForResponse(Request *req, struct iovec *buffers,
 		PUSH_STATIC_BUFFER("\r\n");
 	}
 
+	if (resp->setCookie != NULL) {
+		PUSH_STATIC_BUFFER("Set-Cookie: ");
+		part = resp->setCookie->start;
+		while (part != NULL) {
+			if (part->size == 1 && part->data[0] == '\n') {
+				// HeaderTable joins multiple Set-Cookie headers together using \n.
+				PUSH_STATIC_BUFFER("\r\nSet-Cookie: ");
+			} else {
+				if (buffers != NULL) {
+					buffers[i].iov_base = (void *) part->data;
+					buffers[i].iov_len  = part->size;
+				}
+				INC_BUFFER_ITER(i);
+				dataSize += part->size;
+			}
+			part = part->next;
+		}
+		PUSH_STATIC_BUFFER("\r\n");
+	}
+
 	nCacheableBuffers = i;
 
 	if (resp->bodyType == AppResponse::RBT_CONTENT_LENGTH) {

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

@@ -137,6 +137,7 @@ void reinitializeAppResponse(Client *client, Request *req) {
 	resp->aux.bodyInfo.contentLength = 0; // Sets the entire union to 0.
 	resp->bodyAlreadyRead = 0;
 	resp->date = NULL;
+	resp->setCookie = NULL;
 	resp->cacheControl = NULL;
 	resp->expiresHeader = NULL;
 	resp->lastModifiedHeader = NULL;

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

@@ -206,11 +206,12 @@ fillPoolOptionsFromAgentsOptions(Options &options) {
 	options.loggingAgentAddress = loggingAgentAddress;
 	options.loggingAgentUsername = P_STATIC_STRING("logging");
 	options.loggingAgentPassword = loggingAgentPassword;
-	if (!this->defaultUser.empty()) {
-		options.defaultUser = defaultUser;
+	options.userSwitching = agentsOptions->getBool("user_switching");
+	if (agentsOptions->has("default_user")) {
+		options.defaultUser = agentsOptions->get("default_user");
 	}
-	if (!this->defaultGroup.empty()) {
-		options.defaultGroup = defaultGroup;
+	if (agentsOptions->has("default_group")) {
+		options.defaultGroup = agentsOptions->get("default_group");
 	}
 	options.minProcesses = agentsOptions->getInt("min_instances");
 	options.spawnMethod = agentsOptions->get("spawn_method");

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

@@ -478,6 +478,7 @@ httpHeaderToScgiUpperCase(unsigned char *data, unsigned int size) {
 struct HttpHeaderConstructionCache {
 	StaticString methodStr;
 	const LString *remoteAddr;
+	const LString *setCookie;
 	bool cached;
 };
 
@@ -568,6 +569,7 @@ constructHeaderBuffersForHttpProtocol(Request *req, struct iovec *buffers,
 	if (!cache.cached) {
 		cache.methodStr  = http_method_str(req->method);
 		cache.remoteAddr = req->secureHeaders.lookup(REMOTE_ADDR);
+		cache.setCookie = req->headers.lookup(ServerKit::HTTP_SET_COOKIE);
 		cache.cached     = true;
 	}
 
@@ -593,9 +595,33 @@ constructHeaderBuffersForHttpProtocol(Request *req, struct iovec *buffers,
 		PUSH_STATIC_BUFFER(" HTTP/1.1\r\nConnection: close\r\n");
 	}
 
+	if (cache.setCookie != NULL) {
+		LString::Part *part;
+
+		PUSH_STATIC_BUFFER("Set-Cookie: ");
+		part = cache.setCookie->start;
+		while (part != NULL) {
+			if (part->size == 1 && part->data[0] == '\n') {
+				// HeaderTable joins multiple Set-Cookie headers together using \n.
+				PUSH_STATIC_BUFFER("\r\nSet-Cookie: ");
+			} else {
+				if (buffers != NULL) {
+					buffers[i].iov_base = (void *) part->data;
+					buffers[i].iov_len  = part->size;
+				}
+				INC_BUFFER_ITER(i);
+				dataSize += part->size;
+			}
+			part = part->next;
+		}
+		PUSH_STATIC_BUFFER("\r\n");
+	}
+
 	while (*it != NULL) {
-		if (it->header->hash == HTTP_CONNECTION.hash()
-		 && psg_lstr_cmp(&it->header->key, P_STATIC_STRING("connection")))
+		if ((it->header->hash == HTTP_CONNECTION.hash()
+		  || it->header->hash == ServerKit::HTTP_SET_COOKIE.hash())
+		 && (psg_lstr_cmp(&it->header->key, P_STATIC_STRING("connection"))
+		  || psg_lstr_cmp(&it->header->key, ServerKit::HTTP_SET_COOKIE)))
 		{
 			it.next();
 			continue;

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

@@ -460,7 +460,7 @@ public:
 
 	// @pre prepareRequest() returned true
 	bool requestAllowsFetching(Request *req) const {
-		return req->method == HTTP_GET
+		return (req->method == HTTP_GET || req->method == HTTP_HEAD)
 			&& req->cacheControl == NULL
 			&& !req->hasPragmaHeader;
 	}

data/ext/ruby/extconf.rb

@@ -37,8 +37,10 @@ end
 have_header('alloca.h')
 have_header('ruby/version.h')
 have_header('ruby/io.h')
+have_header('ruby/thread.h')
 have_var('ruby_version')
 have_func('rb_thread_io_blocking_region')
+have_func('rb_thread_call_without_gvl')
 
 with_cflags($CFLAGS) do
 	create_makefile('passenger_native_support')

data/ext/ruby/passenger_native_support.c

@@ -36,6 +36,9 @@
 #ifdef HAVE_RUBY_VERSION_H
 	#include "ruby/version.h"
 #endif
+#ifdef HAVE_RUBY_THREAD_H
+	#include "ruby/thread.h"
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
@@ -199,11 +202,19 @@ update_group_written_info(IOVectorGroup *group, ssize_t bytes_written) {
 		int iovcnt;
 	} WritevWrapperData;
 
-	static VALUE
-	writev_wrapper(void *ptr) {
-		WritevWrapperData *data = (WritevWrapperData *) ptr;
-		return (VALUE) writev(data->filedes, data->iov, data->iovcnt);
-	}
+	#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+		static void *
+		writev_wrapper(void *ptr) {
+			WritevWrapperData *data = (WritevWrapperData *) ptr;
+			return (void *) writev(data->filedes, data->iov, data->iovcnt);
+		}
+	#else
+		static VALUE
+		writev_wrapper(void *ptr) {
+			WritevWrapperData *data = (WritevWrapperData *) ptr;
+			return (VALUE) writev(data->filedes, data->iov, data->iovcnt);
+		}
+	#endif
 #endif
 
 static VALUE
@@ -320,7 +331,10 @@ f_generic_writev(VALUE fd, VALUE *array_of_components, unsigned int count) {
 				writev_wrapper_data.filedes = fd_num;
 				writev_wrapper_data.iov     = groups[i].io_vectors;
 				writev_wrapper_data.iovcnt  = groups[i].count;
-				#ifdef HAVE_RB_THREAD_IO_BLOCKING_REGION
+				#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+					ret = (int) rb_thread_call_without_gvl(writev_wrapper,
+						&writev_wrapper_data, RUBY_UBF_IO, NULL);
+				#elif defined(HAVE_RB_THREAD_IO_BLOCKING_REGION)
 					ret = (int) rb_thread_io_blocking_region(writev_wrapper,
 						&writev_wrapper_data, fd_num);
 				#else
@@ -726,13 +740,23 @@ fs_watcher_wait_fd(VALUE _fd) {
 }
 
 #ifndef TRAP_BEG
-	static VALUE
-	fs_watcher_read_byte_from_fd_wrapper(void *_arg) {
-		FSWatcherReadByteData *data = (FSWatcherReadByteData *) _arg;
-		data->ret = read(data->fd, &data->byte, 1);
-		data->error = errno;
-		return Qnil;
-	}
+	#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+		static void *
+		fs_watcher_read_byte_from_fd_wrapper(void *_arg) {
+			FSWatcherReadByteData *data = (FSWatcherReadByteData *) _arg;
+			data->ret = read(data->fd, &data->byte, 1);
+			data->error = errno;
+			return NULL;
+		}
+	#else
+		static VALUE
+		fs_watcher_read_byte_from_fd_wrapper(void *_arg) {
+			FSWatcherReadByteData *data = (FSWatcherReadByteData *) _arg;
+			data->ret = read(data->fd, &data->byte, 1);
+			data->error = errno;
+			return Qnil;
+		}
+	#endif
 #endif
 
 static VALUE
@@ -743,6 +767,9 @@ fs_watcher_read_byte_from_fd(VALUE _arg) {
 		data->ret = read(data->fd, &data->byte, 1);
 		TRAP_END;
 		data->error = errno;
+	#elif defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+		rb_thread_call_without_gvl2(fs_watcher_read_byte_from_fd_wrapper,
+			data, RUBY_UBF_IO, NULL);
 	#elif defined(HAVE_RB_THREAD_IO_BLOCKING_REGION)
 		rb_thread_io_blocking_region(fs_watcher_read_byte_from_fd_wrapper,
 			data, data->fd);

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.0.beta1'
+	VERSION_STRING = '5.0.0.beta2'
 
 	PREFERRED_NGINX_VERSION = '1.6.2'
 	NGINX_SHA256_CHECKSUM = 'b5608c2959d3e7ad09b20fc8f9e5bd4bc87b3bc8ba5936a513c04ed8f1391a18'

data/lib/phusion_passenger/config/admin_command_command.rb

@@ -81,11 +81,11 @@ private
 			opts.on("-i", "--stdin", "Read HTTP request body data from stdin") do
 				options[:data_source] = :stdin
 			end
-			opts.on("-f", "--data-file", String, "Read HTTP request body data from the given#{nl}" +
+			opts.on("-f", "--data-file PATH", String, "Read HTTP request body data from the given#{nl}" +
 				"file") do |value|
 				options[:data_source] = value
 			end
-			opts.on("-a", "--agent", String, "The name of the socket to send the command#{nl}" +
+			opts.on("-a", "--agent NAME", String, "The name of the socket to send the command#{nl}" +
 				"to. This specifies which agent the request#{nl}" +
 				"is sent to. Choices: watchdog,#{nl}" +
 				"server_admin, logging_admin.#{nl}" +

data/lib/phusion_passenger/config/main.rb

@@ -101,7 +101,7 @@ module Config
 		puts "#{PROGRAM_NAME} installation management:"
 		puts "  validate-install       Validate this #{PROGRAM_NAME} installation"
 		puts "  build-native-support   Ensure that the native_support library for the current"
-		puts "                         Ruby interpeter is built"
+		puts "                         Ruby interpreter is built"
 		puts "  install-agent          Install the #{PROGRAM_NAME} agent binary"
 		puts "  install-standalone-runtime"
 		puts "                         Install the #{PROGRAM_NAME} Standalone"

data/lib/phusion_passenger/config/system_metrics_command.rb

@@ -29,8 +29,13 @@ module Config
 
 class SystemMetricsCommand < Command
 	def run
-		exec("#{PhusionPassenger.support_binaries_dir}/#{AGENT_EXE}",
-			"system-metrics", *@argv)
+		agent_exe = PhusionPassenger.find_support_binary(AGENT_EXE)
+		if agent_exe
+			exec(agent_exe, "system-metrics", *@argv)
+		else
+			abort "This command requires the #{PROGRAM_NAME} agent to be installed. " +
+				"Please install it by running `passenger-config install-agent`."
+		end
 	end
 end
 

data/lib/phusion_passenger/platform_info/operating_system.rb

@@ -34,14 +34,14 @@ module PlatformInfo
 	def self.os_name
 		if rb_config['target_os'] =~ /darwin/ && (sw_vers = find_command('sw_vers'))
 			return "macosx"
-		elsif rb_config['target_os'] == "linux-"
+		elsif rb_config['target_os'] =~ /^linux-/
 			return "linux"
 		else
 			return rb_config['target_os']
 		end
 	end
 	memoize :os_name
-	
+
 	# The current platform's shared library extension ('so' on most Unices).
 	def self.library_extension
 		if os_name == "macosx"
@@ -50,7 +50,7 @@ module PlatformInfo
 			return "so"
 		end
 	end
-	
+
 	# Returns the `uname` command, or nil if `uname` cannot be found.
 	# In addition to looking for `uname` in `PATH`, this method also looks
 	# for `uname` in /bin and /usr/bin, just in case the user didn't
@@ -129,7 +129,7 @@ module PlatformInfo
 			elsif arch == "amd64"
 				arch = "x86_64"
 			end
-			
+
 			if arch == "x86"
 				# Most x86 operating systems nowadays are probably running on
 				# a CPU that supports both x86 and x86_64, but we're not gonna
@@ -146,7 +146,7 @@ module PlatformInfo
 		end
 	end
 	memoize :cpu_architectures, true
-	
+
 	# Returns whether the OS's main CPU architecture supports the
 	# x86/x86_64 sfence instruction.
 	def self.supports_sfence_instruction?
@@ -161,7 +161,7 @@ module PlatformInfo
 			}))
 	end
 	memoize :supports_sfence_instruction?, true
-	
+
 	# Returns whether the OS's main CPU architecture supports the
 	# x86/x86_64 lfence instruction.
 	def self.supports_lfence_instruction?

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

@@ -21,6 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+require 'etc'
 PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'standalone/control_utils'
 PhusionPassenger.require_passenger_lib 'utils/shellwords'
@@ -66,6 +67,7 @@ private
 		command = "#{@agent_exe} watchdog";
 		command << " --passenger-root #{Shellwords.escape PhusionPassenger.install_spec}"
 		command << " --daemonize"
+		command << " --no-user-switching"
 		command << " --no-delete-pid-file"
 		command << " --cleanup-pidfile #{Shellwords.escape @working_dir}/temp_dir_toucher.pid"
 		add_param(command, :user, "--user")
@@ -77,6 +79,14 @@ private
 		@options[:ctls].each do |ctl|
 			command << " --ctl #{Shellwords.escape ctl}"
 		end
+		if @options[:user]
+			command << " --default-user #{Shellwords.ecape @options[:user]}"
+		else
+			user  = Etc.getpwuid(Process.uid).name
+			group = Etc.getgrgid(Process.gid).name
+			command << " --default-user #{Shellwords.escape user}"
+			command << " --default-group #{Shellwords.escape group}"
+		end
 
 		command << " --BS"
 		command << " --listen #{listen_address}"
@@ -100,7 +110,7 @@ private
 		add_param(command, :max_pool_size, "--max-pool-size")
 		add_param(command, :min_instances, "--min-instances")
 		add_enterprise_param(command, :concurrency_model, "--concurrency-model")
-		add_enterprise_param(command, :thread_count, "--thread-count")
+		add_enterprise_param(command, :thread_count, "--app-thread-count")
 		add_enterprise_flag_param(command, :rolling_restarts, "--rolling-restarts")
 		add_enterprise_flag_param(command, :resist_deployment_errors, "--resist-deployment-errors")
 		add_flag_param(command, :sticky_sessions, "--sticky-sessions")

data/node_lib/phusion_passenger/line_reader.js

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2012-2013 Phusion
+ *  Copyright (c) 2012-2014 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -44,6 +44,8 @@ function LineReader(stream) {
 	this.paused = false;
 
 	function handleLineBuffer() {
+		var line, callback;
+
 		if (self.lineBufferIsFull()) {
 			stream.pause();
 			self.paused = true;

data/test/cxx/ServerKit/HeaderTableTest.cpp

@@ -163,9 +163,15 @@ namespace tut {
 		table.insert(createHeader("X-Forwarded-For", "bar.com"), pool);
 		table.insert(createHeader("Cache-Control", "must-invalidate"), pool);
 		table.insert(createHeader("Cache-Control", "private"), pool);
+		table.insert(createHeader("cookie", "a"), pool);
+		table.insert(createHeader("cookie", "b"), pool);
+		table.insert(createHeader("set-cookie", "c=123"), pool);
+		table.insert(createHeader("set-cookie", "d=456"), pool);
 
-		ensure_equals(table.size(), 2u);
+		ensure_equals(table.size(), 4u);
 		ensure("(1)", psg_lstr_cmp(table.lookup("X-Forwarded-For"), "foo.com,bar.com"));
 		ensure("(2)", psg_lstr_cmp(table.lookup("Cache-Control"), "must-invalidate,private"));
+		ensure("(3)", psg_lstr_cmp(table.lookup("cookie"), "a;b"));
+		ensure("(4)", psg_lstr_cmp(table.lookup("set-cookie"), "c=123\nd=456"));
 	}
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta1
+  version: 5.0.0.beta2
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJUdIftAAoJECrHRaUKISqMv7MIAJsk0dOWHUL73jKLsffZM5G+
-gzWSbdWzJnOThR+E7PDxEfzjdeDvUm4w/BJKtJFQpzI+pvZpIaXyu55hzuM//Jf1
-ewICbRB+S28idU2d/jd1uYcKBUJv7iA4HNx4XvjaTRy0mu2Z9xpyiNv83pcd7VRp
-XDyfJFM5iYXs4Guiafxvo+2PUz7bJG35ex2fBsxQ5Uy04wzOgdzmCW1OkZHmHGLV
-ebx84EvphhLlxfNZ7C9Ga6W/hqiTvA+VF2/Zcc6miz9BWyf7EZZbq7/t7bm3u5A9
-Qw2pmjyNnWaKn3JW0McfO0b43GiCa4pvp/T+LvNHr8s4b4xBQCm6rLKPLuB3VG8=
-=ZWLy
+iQEcBAABAgAGBQJUlA2PAAoJECrHRaUKISqMr/wH/32meSRiPtVaiDcVmbacmRXn
+iZ7KrTWZ1PqA03DpZBSDc/aZmpIQCR/kbt/Ozq5bEar102V8XuJ9iM9l4LNeiRBx
+iOXAj2/F8hRAR4eUPjNeMmrDFnoGF250aBTSjzr846DQZGUxB3PwDIPxeKMS96ek
+eD70rQ5BYzb1yfsxgcRMnSEQtjGv5je+t13c7gjwfERhpkBPquEA5rboQYRnyCsD
+5ujz+VM3Tf04QMGQy66V9KiRa99BwuzkUaX62qpHdPB6K97f+2729nR0duY3pH6+
+MY2XYKut8R0XIR+J9Ho6M0lHWASytT4huFDRmF7th2uxPCI2NdOg0fmdG3gyTyo=
+=2PDq
 -----END PGP SIGNATURE-----