passenger 4.0.48 → 4.0.49

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

@@ -156,9 +156,9 @@ Client::onAppInputData(const EventedBufferedInputPtr &source, const StaticString
 void
 Client::onAppInputChunk(const char *data, size_t size, void *userData) {
 	Client *client = (Client *) userData;
-	assert(client != NULL);
-	assert(client->requestHandler != NULL);
-	client->requestHandler->onAppInputChunk(client->shared_from_this(), StaticString(data, size));
+	if (client != NULL && client->connected()) {
+		client->requestHandler->onAppInputChunk(client->shared_from_this(), StaticString(data, size));
+	}
 }
 
 void
@@ -278,7 +278,7 @@ main() {
 	FileDescriptor requestSocket(createTcpServer("127.0.0.1", 3000));
 	setNonBlocking(requestSocket);
 	handler = new RequestHandler(libev, requestSocket, pool, options);
-	
+
 	ev_signal_init(&sigquitwatcher, sigquit_cb, SIGQUIT);
 	ev_signal_start(loop, &sigquitwatcher);
 

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

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2013 Phusion
+ *  Copyright (c) 2011-2014 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -25,7 +25,7 @@
 
 /*
    STAGES
-   
+
      Accept connect password
               |
              \|/
@@ -113,6 +113,7 @@
 #include <boost/weak_ptr.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/regex.hpp>
+#include <boost/cstdint.hpp>
 #include <ev++.h>
 
 #if defined(__GLIBCXX__) || defined(__APPLE__)
@@ -186,21 +187,21 @@ private:
 	static void onClientBodyBufferEnd(const FileBackedPipePtr &source);
 	static void onClientBodyBufferError(const FileBackedPipePtr &source, int errorCode);
 	static void onClientBodyBufferCommit(const FileBackedPipePtr &source);
-	
+
 	static void onClientOutputPipeData(const FileBackedPipePtr &source,
 		const char *data, size_t size,
 		const FileBackedPipe::ConsumeCallback &callback);
 	static void onClientOutputPipeEnd(const FileBackedPipePtr &source);
 	static void onClientOutputPipeError(const FileBackedPipePtr &source, int errorCode);
 	static void onClientOutputPipeCommit(const FileBackedPipePtr &source);
-	
+
 	void onClientOutputWritable(ev::io &io, int revents);
 
 	static size_t onAppInputData(const EventedBufferedInputPtr &source, const StaticString &data);
 	static void onAppInputChunk(const char *data, size_t size, void *userData);
 	static void onAppInputChunkEnd(void *userData);
 	static void onAppInputError(const EventedBufferedInputPtr &source, const char *message, int errnoCode);
-	
+
 	void onAppOutputWritable(ev::io &io, int revents);
 
 	void onTimeout(ev::timer &timer, int revents);
@@ -313,7 +314,7 @@ public:
 	 * socket (e.g. WebSocket data).
 	 *
 	 * Possible values:
-	 * 
+	 *
 	 * -1: infinite. Should keep forwarding client body until end of stream.
 	 *  0: no client body. Should stop after sending headers to application.
 	 * >0: Should forward exactly this many bytes of the client body.
@@ -366,7 +367,7 @@ public:
 		clientInput->onData   = onClientInputData;
 		clientInput->onError  = onClientInputError;
 		clientInput->userData = this;
-		
+
 		clientBodyBuffer = boost::make_shared<FileBackedPipe>("/tmp");
 		clientBodyBuffer->userData  = this;
 		clientBodyBuffer->onData    = onClientBodyBufferData;
@@ -383,12 +384,12 @@ public:
 
 		clientOutputWatcher.set<Client, &Client::onClientOutputWritable>(this);
 
-		
+
 		appInput = boost::make_shared< EventedBufferedInput<> >();
 		appInput->onData   = onAppInputData;
 		appInput->onError  = onAppInputError;
 		appInput->userData = this;
-		
+
 		appOutputWatcher.set<Client, &Client::onAppOutputWritable>(this);
 
 
@@ -398,7 +399,7 @@ public:
 		responseDechunker.onData = onAppInputChunk;
 		responseDechunker.onEnd = onAppInputChunkEnd;
 		responseDechunker.userData = this;
-		
+
 
 		bufferedConnectPassword.data = NULL;
 		bufferedConnectPassword.alreadyRead = 0;
@@ -453,7 +454,7 @@ public:
 		appInput->reset(NULL, FileDescriptor());
 		appOutputBuffer.resize(0);
 		appOutputWatcher.stop();
-		
+
 		timeoutTimer.stop();
 		scgiParser.reset();
 		session.reset();
@@ -873,7 +874,7 @@ private:
 	 * possibly modifies it, and forwards it to
 	 * clientOutputPipe.
 	 *****************************************************/
-	
+
 	struct Header {
 		StaticString key;
 		StaticString value;
@@ -884,7 +885,7 @@ private:
 			: key(_key),
 			  value(_value)
 			{ }
-		
+
 		bool empty() const {
 			return key.empty();
 		}
@@ -915,11 +916,11 @@ private:
 		const char *start = data;
 		const char *end   = data + size;
 		const char *terminator;
-		
+
 		while (start < end && *start == ' ') {
 			start++;
 		}
-		
+
 		terminator = (const char *) memchr(start, '\r', end - start);
 		if (terminator == NULL) {
 			return StaticString();
@@ -1054,7 +1055,7 @@ private:
 		headerData.reserve(origHeaderData.size() + 150);
 		// Strip trailing CRLF.
 		headerData.append(origHeaderData.data(), origHeaderData.size() - 2);
-		
+
 		if (startsWith(headerData, "HTTP/1.")) {
 			Header status = lookupHeader(headerData, "Status", "status");
 			if (status.empty()) {
@@ -1144,7 +1145,7 @@ private:
 			headerData.append("\r\n");
 
 			// Invalidate all cookies with a different route.
-			// 
+			//
 			// TODO: This is not entirely correct. Clients MAY send multiple Cookie
 			// headers, although this is in practice extremely rare.
 			// http://stackoverflow.com/questions/16305814/are-multiple-cookie-headers-allowed-in-an-http-request
@@ -1937,7 +1938,7 @@ private:
 			}
 			options.baseURI = scriptName;
 		}
-		
+
 		options.ruby = this->options.defaultRubyCommand;
 		options.logLevel = getLogLevel();
 		options.loggingAgentAddress = this->options.loggingAgentAddress;
@@ -1969,7 +1970,7 @@ private:
 		fillPoolOption(client, options.raiseInternalError, "PASSENGER_RAISE_INTERNAL_ERROR");
 		setStickySessionId(client);
 		/******************/
-		
+
 		for (it = client->scgiParser.begin(); it != end; it++) {
 			if (!startsWith(it->first, "PASSENGER_")
 			 && !startsWith(it->first, "HTTP_")
@@ -2001,7 +2002,7 @@ private:
 				client->options.analytics = true;
 				client->options.unionStationKey = key;
 			}
-			
+
 			client->beginScopeLog(&client->scopeLogs.requestProcessing, "request processing");
 
 			StaticString staticRequestMethod = parser.getHeader("REQUEST_METHOD");
@@ -2301,7 +2302,7 @@ private:
 
 	void writeSpawnExceptionErrorResponse(const ClientPtr &client, const boost::shared_ptr<SpawnException> &e) {
 		RH_ERROR(client, "Cannot checkout session because a spawning error occurred. " <<
-			"The identifier of the error is " << e->get("ERROR_ID") << ". Please see earlier logs for " <<
+			"The identifier of the error is " << e->get("error_id") << ". Please see earlier logs for " <<
 			"details about the error.");
 		writeErrorResponse(client, e->getErrorPage(), e.get());
 	}
@@ -2323,7 +2324,7 @@ private:
 
 		RH_WARN(client, "Cannot checkout session (exception type " <<
 			typeName << "): " << e->what());
-		
+
 		string response = "An internal error occurred while trying to spawn the application.\n";
 		response.append("Exception type: ");
 		response.append(typeName);
@@ -2362,7 +2363,7 @@ private:
 			}
 			return;
 		}
-		
+
 		if (client->useUnionStation()) {
 			client->endScopeLog(&client->scopeLogs.getFromPool);
 			client->logMessage("Application PID: " +
@@ -2370,7 +2371,7 @@ private:
 				" (GUPID: " + client->session->getGupid() + ")");
 			client->beginScopeLog(&client->scopeLogs.requestProxying, "request proxying");
 		}
-		
+
 		RH_DEBUG(client, "Session initiated: fd=" << client->session->fd());
 		setNonBlocking(client->session->fd());
 		client->appInput->reset(libev.get(), client->session->fd());
@@ -2398,10 +2399,10 @@ private:
 			disconnectWithError(client,
 				"Application sent EOF before we were able to send headers to it");
 		} else if (client->session->getProtocol() == "session") {
-			char sizeField[sizeof(uint32_t)];
+			char sizeField[sizeof(boost::uint32_t)];
 			SmallVector<StaticString, 10> data;
 
-			data.push_back(StaticString(sizeField, sizeof(uint32_t)));
+			data.push_back(StaticString(sizeField, sizeof(boost::uint32_t)));
 			data.push_back(client->scgiParser.getHeaderData());
 
 			data.push_back(makeStaticStringWithNull("PASSENGER_CONNECT_PASSWORD"));
@@ -2412,9 +2413,9 @@ private:
 				data.push_back(makeStaticStringWithNull(client->options.transaction->getTxnId()));
 			}
 
-			uint32_t dataSize = 0;
+			boost::uint32_t dataSize = 0;
 			for (unsigned int i = 1; i < data.size(); i++) {
-				dataSize += (uint32_t) data[i].size();
+				dataSize += (boost::uint32_t) data[i].size();
 			}
 			Uint32Message::generate(sizeField, dataSize);
 

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

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010 Phusion
+ *  Copyright (c) 2010-2014 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -55,12 +55,12 @@ using namespace std;
  *    char buf[1024 * 16];
  *    ssize_t size;
  *    unsigned in bytesAccepted;
- *    
+ *
  *    do {
  *        size = read(fd, buf, sizeof(buf));
  *        bytesAccepted = parser.feed(buf, size);
  *    } while (parser.acceptingInput());
- *    
+ *
  *    // Check whether a parse error occured.
  *    if (parser.getState() == ScgiRequestParser::ERROR) {
  *        bailOut();
@@ -68,7 +68,7 @@ using namespace std;
  *        // All good! Do something with the SCGI header that the parser parsed.
  *        processHeader(parser.getHeaderData());
  *        print(parser.getHeader("DOCUMENT_ROOT"));
- *        
+ *
  *        // If the last buffer passed to the parser also contains body data,
  *        // then the body data starts at 'buf + bytesAccepted'.
  *        if (bytesAccepted < size) {
@@ -115,53 +115,53 @@ public:
 		DONE,
 		ERROR
 	};
-	
+
 	enum ErrorReason {
 		NONE,
-		
+
 		/** The header has a length of 0 bytes. */
 		EMPTY_HEADER,
-		
+
 		/** The length string is too large. */
 		LENGTH_STRING_TOO_LARGE,
-		
+
 		/** The header is larger than the maxSize value provided to the constructor. */
 		LIMIT_REACHED,
-		
+
 		/** The length string contains an invalid character. */
 		INVALID_LENGTH_STRING,
-		
-		/** A header terminator character (",") was expected, but some else
+
+		/** A header terminator character (",") was expected, but something else
 		 * was encountered instead. */
 		HEADER_TERMINATOR_EXPECTED,
-		
+
 		/** The header data itself contains errors. */
 		INVALID_HEADER_DATA
 	};
-	
+
 private:
 	State state;
 	ErrorReason errorReason;
 	unsigned int lengthStringBufferSize;
 	size_t headerSize;
 	size_t maxSize;
-	
+
 	StaticString headerData;
 	string headerBuffer;
 	HeaderMap headers;
 	char lengthStringBuffer[sizeof("4294967296")];
-	
+
 	static inline bool isDigit(char byte) {
 		return byte >= '0' && byte <= '9';
 	}
-	
+
 	/**
 	 * Parse the given header data into key-value pairs, returns whether parsing succeeded.
 	 */
 	bool parseHeaderData(const StaticString &data, HeaderMap &output) {
 		const char *current = data.data();
 		const char *end     = data.data() + data.size();
-		
+
 		while (current < end) {
 			const char *keyEnd = (const char *) memchr(current, '\0', end - current);
 			if (OXT_UNLIKELY(
@@ -170,24 +170,24 @@ private:
 			) {
 				return false;
 			}
-			
+
 			StaticString key(current, keyEnd - current);
 			current = keyEnd + 1;
 			if (OXT_UNLIKELY(current >= end)) {
 				return false;
 			}
-			
+
 			const char *valueEnd = (const char *) memchr(current, '\0', end - current);
 			if (OXT_UNLIKELY(valueEnd == NULL)) {
 				return false;
 			}
-			
+
 			output[key] = StaticString(current, valueEnd - current);
 			current = valueEnd + 1;
 		}
 		return true;
 	}
-	
+
 public:
 	/**
 	 * Create a new ScgiRequestParser, ready to parse a request.
@@ -199,7 +199,7 @@ public:
 		this->maxSize = maxSize;
 		reset();
 	}
-	
+
 	void reset() {
 		state = READING_LENGTH_STRING;
 		errorReason = NONE;
@@ -227,41 +227,47 @@ public:
 	 */
 	size_t feed(const char *data, size_t size) {
 		size_t consumed = 0;
-		
+
 		while (acceptingInput() && consumed < size) {
 			switch (state) {
 			case READING_LENGTH_STRING:
 				while (consumed < size
-				    && lengthStringBufferSize < sizeof(lengthStringBuffer) - 1
-				    && isDigit(data[consumed])) {
+				    && lengthStringBufferSize < sizeof(lengthStringBuffer)
+				    && isDigit(data[consumed]))
+				{
 					lengthStringBuffer[lengthStringBufferSize] = data[consumed];
 					lengthStringBufferSize++;
 					consumed++;
 				}
 				if (consumed < size) {
-					if (data[consumed] == ':') {
-						consumed++;
-						lengthStringBuffer[lengthStringBufferSize] = '\0';
-						headerSize = atol(lengthStringBuffer);
-						if (maxSize > 0 && headerSize > maxSize) {
-							state = ERROR;
-							errorReason = LIMIT_REACHED;
-						} else if (headerSize == 0) {
+					if (lengthStringBufferSize == sizeof(lengthStringBuffer)) {
+						state = ERROR;
+						errorReason = LENGTH_STRING_TOO_LARGE;
+					} else if (data[consumed] == ':') {
+						if (lengthStringBufferSize == 0) {
 							state = ERROR;
-							errorReason = EMPTY_HEADER;
+							errorReason = INVALID_LENGTH_STRING;
 						} else {
-							state = READING_HEADER_DATA;
+							consumed++;
+							lengthStringBuffer[lengthStringBufferSize] = '\0';
+							headerSize = atol(lengthStringBuffer);
+							if (maxSize > 0 && headerSize > maxSize) {
+								state = ERROR;
+								errorReason = LIMIT_REACHED;
+							} else if (headerSize == 0) {
+								state = ERROR;
+								errorReason = EMPTY_HEADER;
+							} else {
+								state = READING_HEADER_DATA;
+							}
 						}
-					} else if (lengthStringBufferSize >= sizeof(lengthStringBuffer) - 1) {
-						state = ERROR;
-						errorReason = LENGTH_STRING_TOO_LARGE;
 					} else {
 						state = ERROR;
 						errorReason = INVALID_LENGTH_STRING;
 					}
 				}
 				break;
-				
+
 			case READING_HEADER_DATA: {
 				const char *localData = data + consumed;
 				size_t localSize = std::min(
@@ -283,7 +289,7 @@ public:
 				consumed += localSize;
 				break;
 			}
-			
+
 			case EXPECTING_COMMA:
 				if (data[consumed] == ',') {
 					if (parseHeaderData(headerData, headers)) {
@@ -298,12 +304,12 @@ public:
 					errorReason = HEADER_TERMINATOR_EXPECTED;
 				}
 				break;
-			
+
 			default:
 				abort(); // Never reached.
 			}
 		}
-		
+
 		if (state == EXPECTING_COMMA && headerBuffer.empty()) {
 			/* We got all the header data in a single round, except
 			 * for the closing comma. The static header data isn't
@@ -313,10 +319,10 @@ public:
 			headerBuffer.assign(headerData.c_str(), headerData.size());
 			headerData = headerBuffer;
 		}
-		
+
 		return consumed;
 	}
-	
+
 	/**
 	 * Get the raw header data that has been processed so far.
 	 * Please read the zero-copy notes in the class description for
@@ -330,7 +336,7 @@ public:
 	const_iterator getHeaderIterator(const StaticString &name) const {
 		return headers.find(name);
 	}
-	
+
 	/**
 	 * Get the value of the header with the given name.
 	 * Lookup is case-sensitive.
@@ -350,7 +356,7 @@ public:
 			return it->second;
 		}
 	}
-	
+
 	/**
 	 * Checks whether there is a header with the given name.
 	 * Lookup is case-sensitive.
@@ -364,7 +370,7 @@ public:
 	HeaderMap &getMap() {
 		return headers;
 	}
-	
+
 	unsigned int size() const {
 		return headers.size();
 	}
@@ -376,14 +382,14 @@ public:
 	const_iterator end() const {
 		return headers.end();
 	}
-	
+
 	/**
 	 * Get the parser's current state.
 	 */
 	State getState() const {
 		return state;
 	}
-	
+
 	/**
 	 * Returns the reason why the parser entered the error state.
 	 *
@@ -392,7 +398,7 @@ public:
 	ErrorReason getErrorReason() const {
 		return errorReason;
 	}
-	
+
 	/**
 	 * Checks whether this parser is still capable of accepting input (that
 	 * is, that this parser is not in a final/error state).