passenger 5.0.8 → 5.0.9

data/ext/common/ServerKit/HeaderTable.h

@@ -43,7 +43,10 @@ extern const HashedStaticString HTTP_COOKIE;
 extern const HashedStaticString HTTP_SET_COOKIE;
 
 struct Header {
+	/** Downcased version of the key, for case-insensitive lookup. */
 	LString key;
+	/** Original, unmodified key. */
+	LString origKey;
 	LString val;
 	boost::uint32_t hash;
 };
@@ -225,6 +228,16 @@ public:
 		return const_cast<Cell *>(static_cast<const HeaderTable *>(this)->lookupCell(key));
 	}
 
+	OXT_FORCE_INLINE
+	Header *lookupHeader(const HashedStaticString &key) {
+		Cell *cell = lookupCell(key);
+		if (cell != NULL) {
+			return cell->header;
+		} else {
+			return NULL;
+		}
+	}
+
 	const LString *lookup(const HashedStaticString &key) const {
 		const Cell * const cell = lookupCell(key);
 		if (cell != NULL) {
@@ -285,6 +298,7 @@ public:
 						part = next;
 					}
 					psg_lstr_deinit(&header->key);
+					psg_lstr_deinit(&header->origKey);
 					*headerPtr = NULL;
 					return;
 				} else {
@@ -294,15 +308,24 @@ public:
 		}
 	}
 
-	Header *insert(psg_pool_t *pool, const HashedStaticString &name,
+	Header *insert(psg_pool_t *pool, const StaticString &name,
 		const StaticString &value)
 	{
 		Header *header = (Header *) psg_palloc(pool, sizeof(Header));
+
+		char *downcasedName = (char *) psg_pnalloc(pool, name.size());
+		convertLowerCase((const unsigned char *) name.data(),
+			(unsigned char *) downcasedName, name.size());
 		psg_lstr_init(&header->key);
-		psg_lstr_append(&header->key, pool, name.data(), name.size());
+		psg_lstr_append(&header->key, pool, downcasedName, name.size());
+
+		psg_lstr_init(&header->origKey);
+		psg_lstr_append(&header->origKey, pool, name.data(), name.size());
+
 		psg_lstr_init(&header->val);
 		psg_lstr_append(&header->val, pool, value.data(), value.size());
-		header->hash = name.hash();
+
+		header->hash = HashedStaticString(downcasedName, name.size()).hash();
 		insert(&header, pool);
 		return header;
 	}
@@ -320,6 +343,7 @@ public:
 					// A previous iteration in this loop
 					// could have made cell->header NULL.
 					psg_lstr_deinit(&cell->header->key);
+					psg_lstr_deinit(&cell->header->origKey);
 					psg_lstr_deinit(&cell->header->val);
 					cell->header = NULL;
 				}
@@ -335,6 +359,7 @@ public:
 					// A previous iteration in this loop
 					// could have made cell->header NULL.
 					psg_lstr_deinit(&cell->header->key);
+					psg_lstr_deinit(&cell->header->origKey);
 					psg_lstr_deinit(&cell->header->val);
 				}
 				*cell = *neighbor;

data/ext/common/ServerKit/HttpHeaderParser.h

@@ -45,6 +45,7 @@ namespace ServerKit {
 
 
 extern const HashedStaticString HTTP_CONTENT_LENGTH;
+extern const HashedStaticString HTTP_TRANSFER_ENCODING;
 extern const HashedStaticString HTTP_X_SENDFILE;
 extern const HashedStaticString HTTP_X_ACCEL_REDIRECT;
 
@@ -172,7 +173,7 @@ private:
 		 || self->state->state == HttpHeaderParserState::PARSING_HEADER_VALUE
 		 || self->state->state == HttpHeaderParserState::PARSING_FIRST_HEADER_VALUE)
 		{
-			// New header key encountered.
+			// New header field encountered.
 
 			if (self->state->state == HttpHeaderParserState::PARSING_FIRST_HEADER_VALUE
 			 || self->state->state == HttpHeaderParserState::PARSING_HEADER_VALUE)
@@ -184,8 +185,10 @@ private:
 				self->insertCurrentHeader();
 			}
 
+			// Initialize new header field.
 			self->state->currentHeader = (Header *) psg_palloc(self->pool, sizeof(Header));
 			psg_lstr_init(&self->state->currentHeader->key);
+			psg_lstr_init(&self->state->currentHeader->origKey);
 			psg_lstr_init(&self->state->currentHeader->val);
 			self->state->hasher.reset();
 			if (self->state->state == HttpHeaderParserState::PARSING_URL) {
@@ -195,12 +198,20 @@ private:
 			}
 		}
 
-		psg_lstr_append(&self->state->currentHeader->key, self->pool,
+		psg_lstr_append(&self->state->currentHeader->origKey, self->pool,
 			*self->currentBuffer, data, len);
-		if (psg_lstr_first_byte(&self->state->currentHeader->key) != '!') {
-			convertLowerCase((unsigned char *) const_cast<char *>(data), len);
+		if (psg_lstr_first_byte(&self->state->currentHeader->origKey) == '!') {
+			psg_lstr_append(&self->state->currentHeader->key, self->pool,
+				*self->currentBuffer, data, len);
+			self->state->hasher.update(data, len);
+		} else {
+			char *downcasedData = (char *) psg_pnalloc(self->pool, len);
+			convertLowerCase((const unsigned char *) data,
+				(unsigned char *) downcasedData, len);
+			psg_lstr_append(&self->state->currentHeader->key, self->pool,
+				downcasedData, len);
+			self->state->hasher.update(downcasedData, len);
 		}
-		self->state->hasher.update(data, len);
 
 		return 0;
 	}
@@ -359,6 +370,27 @@ private:
 			message->httpState = Message::UPGRADED;
 			message->bodyType  = Message::RBT_UPGRADE;
 			message->wantKeepAlive = false;
+		} else if (message->headers.lookup(HTTP_X_SENDFILE) != NULL
+		 || message->headers.lookup(HTTP_X_ACCEL_REDIRECT) != NULL)
+		{
+			// If X-Sendfile or X-Accel-Redirect is set, pretend like the body
+			// is empty and disallow keep-alive. See:
+			// https://github.com/phusion/passenger/issues/1376
+			// https://github.com/phusion/passenger/issues/1498
+			//
+			// We don't set a fake "Content-Length: 0" header here
+			// because it's undefined what Content-Length means if
+			// X-Sendfile or X-Accel-Redirect are set.
+			//
+			// Because the response header no longer has any header
+			// that signals its size, keep-alive should also be disabled
+			// for the *request*. We already do that in RequestHandler's
+			// ForwardResponse.cpp.
+			message->httpState = Message::COMPLETE;
+			message->bodyType = Message::RBT_NO_BODY;
+			message->headers.erase(HTTP_CONTENT_LENGTH);
+			message->headers.erase(HTTP_TRANSFER_ENCODING);
+			message->wantKeepAlive = false;
 		} else if (requestMethod == HTTP_HEAD
 		 || status / 100 == 1  // status 1xx
 		 || status == 204
@@ -370,14 +402,6 @@ private:
 				message->httpState = Message::ONEHUNDRED_CONTINUE;
 			}
 			message->bodyType = Message::RBT_NO_BODY;
-		} else if (message->headers.lookup(HTTP_X_SENDFILE) != NULL
-		 || message->headers.lookup(HTTP_X_ACCEL_REDIRECT) != NULL)
-		{
-			// Ignore Content-Length when X-Sendfile or X-Accel-Redirect is set.
-			// See https://github.com/phusion/passenger/issues/1376
-			message->httpState = Message::COMPLETE;
-			message->bodyType = Message::RBT_NO_BODY;
-			message->headers.erase(HTTP_CONTENT_LENGTH);
 		} else if (state->parser.flags & F_CHUNKED) {
 			if (contentLength == std::numeric_limits<boost::uint64_t>::max()) {
 				message->httpState = Message::PARSING_CHUNKED_BODY;

data/ext/common/ServerKit/HttpServer.h

@@ -980,10 +980,20 @@ protected:
 		return false;
 	}
 
+	virtual PassengerLogLevel getClientOutputErrorDisconnectionLogLevel(
+		Client *client, int errcode) const
+	{
+		if (errcode == EPIPE || errcode == ECONNRESET) {
+			return LVL_INFO;
+		} else {
+			return LVL_WARN;
+		}
+	}
+
 	virtual void reinitializeClient(Client *client, int fd) {
 		ParentClass::reinitializeClient(client, fd);
 		client->requestsBegun = 0;
-		client->currentRequest = NULL;
+		assert(client->currentRequest == NULL);
 	}
 
 	virtual void reinitializeRequest(Client *client, Request *req) {
@@ -1025,6 +1035,7 @@ protected:
 		HeaderTable::Iterator it(req->headers);
 		while (*it != NULL) {
 			psg_lstr_deinit(&it->header->key);
+			psg_lstr_deinit(&it->header->origKey);
 			psg_lstr_deinit(&it->header->val);
 			it.next();
 		}
@@ -1032,6 +1043,7 @@ protected:
 		it = HeaderTable::Iterator(req->secureHeaders);
 		while (*it != NULL) {
 			psg_lstr_deinit(&it->header->key);
+			psg_lstr_deinit(&it->header->origKey);
 			psg_lstr_deinit(&it->header->val);
 			it.next();
 		}
@@ -1073,6 +1085,10 @@ public:
 
 		while (!STAILQ_EMPTY(&freeRequests)) {
 			Request *request = STAILQ_FIRST(&freeRequests);
+			if (request->pool != NULL) {
+				psg_destroy_pool(request->pool);
+				request->pool = NULL;
+			}
 			P_ASSERT_EQ(request->httpState, Request::IN_FREELIST);
 			freeRequestCount--;
 			STAILQ_REMOVE_HEAD(&freeRequests, nextRequest.freeRequest);

data/ext/common/ServerKit/Implementation.cpp

@@ -32,6 +32,7 @@ namespace ServerKit {
 extern const HashedStaticString HTTP_COOKIE;
 extern const HashedStaticString HTTP_SET_COOKIE;
 extern const HashedStaticString HTTP_CONTENT_LENGTH;
+extern const HashedStaticString HTTP_TRANSFER_ENCODING;
 extern const HashedStaticString HTTP_X_SENDFILE;
 extern const HashedStaticString HTTP_X_ACCEL_REDIRECT;
 extern const char DEFAULT_INTERNAL_SERVER_ERROR_RESPONSE[];
@@ -49,6 +50,7 @@ const unsigned int DEFAULT_INTERNAL_SERVER_ERROR_RESPONSE_SIZE =
 const HashedStaticString HTTP_COOKIE("cookie");
 const HashedStaticString HTTP_SET_COOKIE("set-cookie");
 const HashedStaticString HTTP_CONTENT_LENGTH("content-length");
+const HashedStaticString HTTP_TRANSFER_ENCODING("transfer-encoding");
 const HashedStaticString HTTP_X_SENDFILE("x-sendfile");
 const HashedStaticString HTTP_X_ACCEL_REDIRECT("x-accel-redirect");
 

data/ext/common/ServerKit/Server.h

@@ -79,6 +79,7 @@ using namespace oxt;
 
 #define SKS_NOTICE_FROM_STATIC(server, expr) P_NOTICE("[" << server->getServerName() << "] " << expr)
 
+#define SKC_LOG(client, level, expr) SKC_LOG_FROM_STATIC(this, client, level, expr)
 #define SKC_ERROR(client, expr) SKC_ERROR_FROM_STATIC(this, client, expr)
 #define SKC_WARN(client, expr) SKC_WARN_FROM_STATIC(this, client, expr)
 #define SKC_NOTICE(client, expr) SKC_NOTICE_FROM_STATIC(this, client, expr)
@@ -90,40 +91,25 @@ using namespace oxt;
 #define SKC_TRACE_WITH_POS(client, level, file, line, expr) \
 	SKC_TRACE_FROM_STATIC_WITH_POS(this, client, level, file, line, expr)
 
-#define SKC_ERROR_FROM_STATIC(server, client, expr) \
+#define SKC_LOG_FROM_STATIC(server, client, level, expr) \
 	do { \
-		if (Passenger::getLogLevel() >= LVL_ERROR) { \
+		if (Passenger::getLogLevel() >= level) { \
 			char _clientName[16]; \
 			int _clientNameSize = server->getClientName((client), _clientName, sizeof(_clientName)); \
-			P_ERROR("[Client " << StaticString(_clientName, _clientNameSize) << "] " << expr); \
+			P_LOG(level, __FILE__, __LINE__, \
+				"[Client " << StaticString(_clientName, _clientNameSize) << "] " << expr); \
 		} \
 	} while (0)
+#define SKC_ERROR_FROM_STATIC(server, client, expr) \
+	SKC_LOG_FROM_STATIC(server, client, LVL_ERROR, expr)
 #define SKC_WARN_FROM_STATIC(server, client, expr) \
-	do { \
-		if (Passenger::getLogLevel() >= LVL_WARN) { \
-			char _clientName[16]; \
-			int _clientNameSize = server->getClientName((client), _clientName, sizeof(_clientName)); \
-			P_WARN("[Client " << StaticString(_clientName, _clientNameSize) << "] " << expr); \
-		} \
-	} while (0)
+	SKC_LOG_FROM_STATIC(server, client, LVL_WARN, expr)
 #define SKC_NOTICE_FROM_STATIC(server, client, expr) \
-	do { \
-		if (Passenger::getLogLevel() >= LVL_WARN) { \
-			char _clientName[16]; \
-			int _clientNameSize = server->getClientName((client), _clientName, sizeof(_clientName)); \
-			P_NOTICE("[Client " << StaticString(_clientName, _clientNameSize) << "] " << expr); \
-		} \
-	} while (0)
+	SKC_LOG_FROM_STATIC(server, client, LVL_NOTICE, expr)
 #define SKC_INFO_FROM_STATIC(server, client, expr) \
-	do { \
-		if (Passenger::getLogLevel() >= LVL_WARN) { \
-			char _clientName[16]; \
-			int _clientNameSize = server->getClientName((client), _clientName, sizeof(_clientName)); \
-			P_INFO("[Client " << StaticString(_clientName, _clientNameSize) << "] " << expr); \
-		} \
-	} while (0)
+	SKC_LOG_FROM_STATIC(server, client, LVL_INFO, expr)
 #define SKC_DEBUG_FROM_STATIC(server, client, expr) \
-	SKC_DEBUG_FROM_STATIC_WITH_POS(server, client, __FILE__, __LINE__, expr)
+	SKC_LOG_FROM_STATIC(server, client, LVL_DEBUG, expr)
 #define SKC_DEBUG_FROM_STATIC_WITH_POS(server, client, file, line, expr) \
 	do { \
 		if (OXT_UNLIKELY(Passenger::getLogLevel() >= LVL_DEBUG)) { \
@@ -452,6 +438,8 @@ private:
 
 	void finishShutdown() {
 		TRACE_POINT();
+		compact(LVL_INFO);
+
 		SKS_NOTICE("Shutdown finished");
 		serverState = FINISHED_SHUTDOWN;
 		if (shutdownFinishCallback != NULL) {
@@ -629,7 +617,14 @@ protected:
 		int ret = snprintf(message, sizeof(message),
 			"client socket write error: %s (errno=%d)",
 			getErrorDesc(errcode), errcode);
-		disconnectWithError(&client, StaticString(message, ret));
+		disconnectWithError(&client, StaticString(message, ret),
+			getClientOutputErrorDisconnectionLogLevel(client, errcode));
+	}
+
+	virtual PassengerLogLevel getClientOutputErrorDisconnectionLogLevel(
+		Client *client, int errcode) const
+	{
+		return LVL_WARN;
 	}
 
 	virtual void reinitializeClient(Client *client, int fd) {
@@ -927,8 +922,10 @@ public:
 		disconnect(client);
 	}
 
-	void disconnectWithError(Client **client, const StaticString &message) {
-		SKC_WARN(*client, "Disconnecting client with error: " << message);
+	void disconnectWithError(Client **client, const StaticString &message,
+		PassengerLogLevel logLevel = LVL_WARN)
+	{
+		SKC_LOG(*client, logLevel, "Disconnecting client with error: " << message);
 		disconnect(client);
 	}
 

data/ext/common/Utils/IOUtils.cpp

@@ -360,6 +360,17 @@ createTcpServer(const char *address, unsigned short port, unsigned int backlogSi
 	}
 	// Ignore SO_REUSEADDR error, it's not fatal.
 
+	#ifdef SO_REUSEPORT
+		optval = 1;
+		if (syscalls::setsockopt(fd, SOL_SOCKET, SO_REUSEPORT,
+			&optval, sizeof(optval)) == -1)
+		{
+			int e = errno;
+			fprintf(stderr, "so_reuseport failed: %s\n", strerror(e));
+		}
+		// Ignore SO_REUSEPORT error, it's not fatal.
+	#endif
+
 	if (backlogSize == 0) {
 		backlogSize = 1024;
 	}

data/ext/common/Utils/ProcessMetricsCollector.h

@@ -99,11 +99,15 @@ struct ProcessMetrics {
 
 	ProcessMetrics() {
 		pid = (pid_t) -1;
+		ppid = (pid_t) -1;
+		cpu = -1;
 		rss = -1;
 		pss = -1;
 		privateDirty = -1;
 		swap = -1;
 		vmsize = -1;
+		processGroupId = (pid_t) -1;
+		uid = (uid_t) -1;
 	}
 
 	bool isValid() const {

data/ext/common/Utils/StrIntUtils.cpp

@@ -458,7 +458,10 @@ atol(const string &s) {
 #if !defined(__x86_64__) && !defined(__x86__)
 	// x86 and x86_64 optimized version is implemented in StrIntUtilsNoStrictAliasing.cpp.
 	void
-	convertLowerCase(unsigned char *data, size_t len) {
+	convertLowerCase(const unsigned char * restrict data,
+		unsigned char * restrict output,
+		size_t len)
+	{
 		static const boost::uint8_t gsToLowerMap[256] = {
 			'\0', 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, '\t',
 			'\n', 0x0b, 0x0c, '\r', 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13,
@@ -492,16 +495,17 @@ atol(const string &s) {
 		const size_t imax = len / 4;
 		size_t i;
 
-		for (i = 0; i < imax; i++, data += 4) {
-			data[0] = (unsigned char) gsToLowerMap[data[0]];
-			data[1] = (unsigned char) gsToLowerMap[data[1]];
-			data[2] = (unsigned char) gsToLowerMap[data[2]];
-			data[3] = (unsigned char) gsToLowerMap[data[3]];
+		for (i = 0; i < imax; i++, data += 4, output += 4) {
+			output[0] = (unsigned char) gsToLowerMap[data[0]];
+			output[1] = (unsigned char) gsToLowerMap[data[1]];
+			output[2] = (unsigned char) gsToLowerMap[data[2]];
+			output[3] = (unsigned char) gsToLowerMap[data[3]];
 		}
 
 		while (data < end) {
-			*data = (unsigned char) gsToLowerMap[*data];
+			*output = (unsigned char) gsToLowerMap[*data];
 			data++;
+			output++;
 		}
 	}
 #endif

data/ext/common/Utils/StrIntUtils.h

@@ -388,7 +388,7 @@ roundUp(IntegerType number, IntegerType multiple) {
 /**
  * Converts the given character array to lowercase.
  */
-void convertLowerCase(unsigned char *data, size_t len);
+void convertLowerCase(const unsigned char * restrict data, unsigned char * restrict output, size_t len);
 
 /**
  * Compare two strings using a constant time algorithm to avoid timing attacks.

data/ext/common/Utils/StrIntUtilsNoStrictAliasing.cpp

@@ -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.
  *
@@ -25,6 +25,7 @@
 
 #include <boost/cstdint.hpp>
 #include <cstddef>
+#include <Utils/StrIntUtils.h>
 
 namespace Passenger {
 
@@ -36,7 +37,10 @@ using namespace std;
 
 #if defined(__x86_64__) || defined(__x86__)
 void
-convertLowerCase(unsigned char *data, size_t len) {
+convertLowerCase(const unsigned char * restrict data,
+	unsigned char * restrict output,
+	size_t len)
+{
 	/*
 	 * Parts of this function is taken from stringencoders and modified to add
 	 * 64-bit support. https://code.google.com/p/stringencoders/
@@ -111,7 +115,8 @@ convertLowerCase(unsigned char *data, size_t len) {
 		const size_t leftover = len % 8;
 		const size_t imax = len / 8;
 		const boost::uint64_t *s = (const boost::uint64_t *) data;
-		boost::uint64_t *d = (boost::uint64_t *) data;
+		boost::uint64_t *d = (boost::uint64_t *) output;
+
 		for (i = 0; i != imax; ++i) {
 			eax = s[i];
 			/*
@@ -125,15 +130,15 @@ convertLowerCase(unsigned char *data, size_t len) {
 		}
 
 		i = imax * 8;
-		data = (unsigned char *) d;
+		output = (unsigned char *) d;
 		switch (leftover) {
-		case 7: *data++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 6: *data++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 5: *data++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 4: *data++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 3: *data++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 2: *data++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 1: *data++ = (unsigned char) gsToLowerMap[ustr[i]];
+		case 7: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
+		case 6: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
+		case 5: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
+		case 4: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
+		case 3: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
+		case 2: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
+		case 1: *output++ = (unsigned char) gsToLowerMap[ustr[i]];
 		case 0: break;
 		}
 	#elif defined(__x86__)
@@ -143,7 +148,7 @@ convertLowerCase(unsigned char *data, size_t len) {
 		const size_t leftover = len % 4;
 		const size_t imax = len / 4;
 		const boost::uint32_t *s = (const boost::uint32_t *) data;
-		boost::uint32_t *d = (boost::uint32_t *) data;
+		boost::uint32_t *d = (boost::uint32_t *) output;
 		for (i = 0; i != imax; ++i) {
 			eax = s[i];
 			/*
@@ -157,11 +162,11 @@ convertLowerCase(unsigned char *data, size_t len) {
 		}
 
 		i = imax * 4;
-		data = (unsigned char *) d;
+		output = (unsigned char *) d;
 		switch (leftover) {
-		case 3: *data++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 2: *data++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 1: *data++ = (unsigned char) gsToLowerMap[ustr[i]];
+		case 3: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
+		case 2: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
+		case 1: *output++ = (unsigned char) gsToLowerMap[ustr[i]];
 		case 0: break;
 		}
 	#else