passenger 5.0.8 → 5.0.9

data/ext/common/agents/Base.cpp

@@ -1638,4 +1638,10 @@ initializeAgentOptions(const char *processName, VariantMap &options,
 	}
 }
 
+void
+shutdownAgent(VariantMap *agentOptions) {
+	delete agentOptions;
+	oxt::shutdown();
+}
+
 } // namespace Passenger

data/ext/common/agents/Base.h

@@ -48,6 +48,8 @@ void initializeAgentOptions(const char *processName, VariantMap &options,
 void installAgentAbortHandler();
 void installDiagnosticsDumper(DiagnosticsDumper func, void *userData);
 
+void shutdownAgent(VariantMap *agentOptions);
+
 }
 
 #endif /* _PASSENGER_AGENT_BASE_H_ */

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

@@ -197,7 +197,7 @@ private:
 			P_WARN(threadNumber);
 			if (threadNumber < 1 || (unsigned int) threadNumber > requestHandlers.size()) {
 				HeaderTable headers;
-				headers.insert(req->pool, "content-type", "application/json");
+				headers.insert(req->pool, "Content-Type", "application/json");
 				writeSimpleResponse(client, 400, &headers,
 					"{ \"status\": \"error\", \"reason\": \"Invalid thread number\" }");
 				if (!req->ended()) {
@@ -210,7 +210,7 @@ private:
 				disconnectClient, requestHandlers[threadNumber - 1], results.str(1)));
 
 			HeaderTable headers;
-			headers.insert(req->pool, "content-type", "application/json");
+			headers.insert(req->pool, "Content-Type", "application/json");
 			writeSimpleResponse(client, 200, &headers,
 				"{ \"status\": \"ok\" }");
 			if (!req->ended()) {
@@ -228,7 +228,7 @@ private:
 	void processServerStatus(Client *client, Request *req) {
 		if (authorize(client, req, READONLY)) {
 			HeaderTable headers;
-			headers.insert(req->pool, "content-type", "application/json");
+			headers.insert(req->pool, "Content-Type", "application/json");
 
 			Json::Value doc;
 			doc["threads"] = (Json::UInt) requestHandlers.size();
@@ -256,7 +256,7 @@ private:
 			try {
 				VariantMap params = parseQueryString(req->getQueryString());
 				HeaderTable headers;
-				headers.insert(req->pool, "content-type", "text/xml");
+				headers.insert(req->pool, "Content-Type", "text/xml");
 				writeSimpleResponse(client, 200, &headers,
 					psg_pstrdup(req->pool, appPool->toXml(
 						params.getBool("secrets", false, false))));
@@ -277,7 +277,7 @@ private:
 				ApplicationPool2::Pool::InspectOptions options(
 					parseQueryString(req->getQueryString()));
 				HeaderTable headers;
-				headers.insert(req->pool, "content-type", "text/plain");
+				headers.insert(req->pool, "Content-Type", "text/plain");
 				writeSimpleResponse(client, 200, &headers,
 					psg_pstrdup(req->pool, appPool->inspect(options)));
 			} catch (const SyntaxError &e) {
@@ -308,8 +308,8 @@ private:
 		HeaderTable headers;
 		RestartMethod method = ApplicationPool2::RM_DEFAULT;
 
-		headers.insert(req->pool, "content-type", "application/json");
-		headers.insert(req->pool, "cache-control", "no-cache, no-store, must-revalidate");
+		headers.insert(req->pool, "Content-Type", "application/json");
+		headers.insert(req->pool, "Cache-Control", "no-cache, no-store, must-revalidate");
 
 		if (!req->jsonBody.isMember("name")) {
 			endAsBadRequest(&client, &req, "Name required");
@@ -358,8 +358,8 @@ private:
 		HeaderTable headers;
 		const char *response;
 
-		headers.insert(req->pool, "content-type", "application/json");
-		headers.insert(req->pool, "cache-control", "no-cache, no-store, must-revalidate");
+		headers.insert(req->pool, "Content-Type", "application/json");
+		headers.insert(req->pool, "Cache-Control", "no-cache, no-store, must-revalidate");
 
 		if (req->jsonBody.isMember("pid")) {
 			pid_t pid = (pid_t) req->jsonBody["pid"].asUInt();
@@ -380,7 +380,7 @@ private:
 	void processBacktraces(Client *client, Request *req) {
 		if (authorize(client, req, READONLY)) {
 			HeaderTable headers;
-			headers.insert(req->pool, "content-type", "text/plain");
+			headers.insert(req->pool, "Content-Type", "text/plain");
 			writeSimpleResponse(client, 200, &headers,
 				psg_pstrdup(req->pool, oxt::thread::all_backtraces()));
 			if (!req->ended()) {
@@ -394,8 +394,8 @@ private:
 	void processPing(Client *client, Request *req) {
 		if (authorize(client, req, READONLY)) {
 			HeaderTable headers;
-			headers.insert(req->pool, "cache-control", "no-cache, no-store, must-revalidate");
-			headers.insert(req->pool, "content-type", "application/json");
+			headers.insert(req->pool, "Cache-Control", "no-cache, no-store, must-revalidate");
+			headers.insert(req->pool, "Content-Type", "application/json");
 			writeSimpleResponse(client, 200, &headers, "{ \"status\": \"ok\" }");
 			if (!req->ended()) {
 				endRequest(&client, &req);
@@ -410,7 +410,7 @@ private:
 			respondWith405(client, req);
 		} else if (authorize(client, req, FULL)) {
 			HeaderTable headers;
-			headers.insert(req->pool, "content-type", "application/json");
+			headers.insert(req->pool, "Content-Type", "application/json");
 			exitEvent->notify();
 			writeSimpleResponse(client, 200, &headers, "{ \"status\": \"ok\" }");
 			if (!req->ended()) {
@@ -436,7 +436,7 @@ private:
 			respondWith405(client, req);
 		} else if (authorize(client, req, FULL)) {
 			HeaderTable headers;
-			headers.insert(req->pool, "content-type", "application/json");
+			headers.insert(req->pool, "Content-Type", "application/json");
 			for (unsigned int i = 0; i < requestHandlers.size(); i++) {
 				requestHandlers[i]->getContext()->libev->runLater(boost::bind(
 					garbageCollect, requestHandlers[i]));
@@ -464,7 +464,7 @@ private:
 			string logFile = getLogFile();
 			string fileDescriptorLogFile = getFileDescriptorLogFile();
 
-			headers.insert(req->pool, "content-type", "application/json");
+			headers.insert(req->pool, "Content-Type", "application/json");
 			Json::Value doc;
 			requestHandlers[0]->getContext()->libev->runSync(boost::bind(
 				getRequestHandlerConfig, requestHandlers[0], &doc));
@@ -501,8 +501,8 @@ private:
 		HeaderTable headers;
 		Json::Value &json = req->jsonBody;
 
-		headers.insert(req->pool, "content-type", "application/json");
-		headers.insert(req->pool, "cache-control", "no-cache, no-store, must-revalidate");
+		headers.insert(req->pool, "Content-Type", "application/json");
+		headers.insert(req->pool, "Cache-Control", "no-cache, no-store, must-revalidate");
 
 		if (json.isMember("log_level")) {
 			setLogLevel(json["log_level"].asInt());
@@ -556,7 +556,7 @@ private:
 		} else if (authorize(client, req, FULL)) {
 			int e;
 			HeaderTable headers;
-			headers.insert(req->pool, "content-type", "application/json");
+			headers.insert(req->pool, "Content-Type", "application/json");
 
 			string logFile = getLogFile();
 			if (logFile.empty()) {
@@ -620,8 +620,8 @@ private:
 
 	void respondWith401(Client *client, Request *req) {
 		HeaderTable headers;
-		headers.insert(req->pool, "cache-control", "no-cache, no-store, must-revalidate");
-		headers.insert(req->pool, "www-authenticate", "Basic realm=\"admin\"");
+		headers.insert(req->pool, "Cache-Control", "no-cache, no-store, must-revalidate");
+		headers.insert(req->pool, "WWW-Authenticate", "Basic realm=\"admin\"");
 		writeSimpleResponse(client, 401, &headers, "Unauthorized");
 		if (!req->ended()) {
 			endRequest(&client, &req);
@@ -630,7 +630,7 @@ private:
 
 	void respondWith404(Client *client, Request *req) {
 		HeaderTable headers;
-		headers.insert(req->pool, "cache-control", "no-cache, no-store, must-revalidate");
+		headers.insert(req->pool, "Cache-Control", "no-cache, no-store, must-revalidate");
 		writeSimpleResponse(client, 404, &headers, "Not found");
 		if (!req->ended()) {
 			endRequest(&client, &req);
@@ -639,7 +639,7 @@ private:
 
 	void respondWith405(Client *client, Request *req) {
 		HeaderTable headers;
-		headers.insert(req->pool, "cache-control", "no-cache, no-store, must-revalidate");
+		headers.insert(req->pool, "Cache-Control", "no-cache, no-store, must-revalidate");
 		writeSimpleResponse(client, 405, &headers, "Method not allowed");
 		if (!req->ended()) {
 			endRequest(&client, &req);
@@ -648,7 +648,7 @@ private:
 
 	void respondWith413(Client *client, Request *req) {
 		HeaderTable headers;
-		headers.insert(req->pool, "cache-control", "no-cache, no-store, must-revalidate");
+		headers.insert(req->pool, "Cache-Control", "no-cache, no-store, must-revalidate");
 		writeSimpleResponse(client, 413, &headers, "Request body too large");
 		if (!req->ended()) {
 			endRequest(&client, &req);
@@ -657,8 +657,8 @@ private:
 
 	void respondWith422(Client *client, Request *req, const StaticString &body) {
 		HeaderTable headers;
-		headers.insert(req->pool, "cache-control", "no-cache, no-store, must-revalidate");
-		headers.insert(req->pool, "content-type", "text/plain; charset=utf-8");
+		headers.insert(req->pool, "Cache-Control", "no-cache, no-store, must-revalidate");
+		headers.insert(req->pool, "Content-Type", "text/plain; charset=utf-8");
 		writeSimpleResponse(client, 422, &headers, body);
 		if (!req->ended()) {
 			endRequest(&client, &req);

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

@@ -159,6 +159,21 @@ namespace ServerAgent {
 				adminServerFds[i] = -1;
 			}
 		}
+
+		~WorkingObjects() {
+			delete prestarterThread;
+
+			vector<ThreadWorkingObjects>::iterator it, end = threadWorkingObjects.end();
+			for (it = threadWorkingObjects.begin(); it != end; it++) {
+				delete it->requestHandler;
+				delete it->serverKitContext;
+				delete it->bgloop;
+			}
+
+			delete adminWorkingObjects.adminServer;
+			delete adminWorkingObjects.serverKitContext;
+			delete adminWorkingObjects.bgloop;
+		}
 	};
 } // namespace ServerAgent
 } // namespace Passenger
@@ -580,11 +595,12 @@ initializeNonPrivilegedWorkingObjects() {
 		if (i == 0) {
 			two.bgloop = firstLoop = new BackgroundEventLoop(true, true);
 		} else {
-			two.bgloop = new BackgroundEventLoop(true, false);
+			two.bgloop = new BackgroundEventLoop(true, true);
 		}
 
 		UPDATE_TRACE_POINT();
-		two.serverKitContext = new ServerKit::Context(two.bgloop->safe);
+		two.serverKitContext = new ServerKit::Context(two.bgloop->safe,
+			two.bgloop->libuv_loop);
 		two.serverKitContext->secureModePassword = wo->password;
 		two.serverKitContext->defaultFileBufferedChannelConfig.bufferDir =
 			options.get("data_buffer_dir");
@@ -607,26 +623,25 @@ initializeNonPrivilegedWorkingObjects() {
 
 	UPDATE_TRACE_POINT();
 	ev_signal_init(&wo->sigquitWatcher, printInfo, SIGQUIT);
-	ev_signal_start(firstLoop->loop, &wo->sigquitWatcher);
+	ev_signal_start(firstLoop->libev_loop, &wo->sigquitWatcher);
 	ev_signal_init(&wo->sigintWatcher, onTerminationSignal, SIGINT);
-	ev_signal_start(firstLoop->loop, &wo->sigintWatcher);
+	ev_signal_start(firstLoop->libev_loop, &wo->sigintWatcher);
 	ev_signal_init(&wo->sigtermWatcher, onTerminationSignal, SIGTERM);
-	ev_signal_start(firstLoop->loop, &wo->sigtermWatcher);
+	ev_signal_start(firstLoop->libev_loop, &wo->sigtermWatcher);
 
 	UPDATE_TRACE_POINT();
 	if (!adminAddresses.empty()) {
 		UPDATE_TRACE_POINT();
 		AdminWorkingObjects *awo = &wo->adminWorkingObjects;
 
-		awo->bgloop = new BackgroundEventLoop(true, false);
-		awo->serverKitContext = new ServerKit::Context(awo->bgloop->safe);
+		awo->bgloop = new BackgroundEventLoop(true, true);
+		awo->serverKitContext = new ServerKit::Context(awo->bgloop->safe,
+			awo->bgloop->libuv_loop);
 		awo->serverKitContext->secureModePassword = wo->password;
-		// Configure a large threshold so that it uses libeio as little as possible.
-		// libeio runs on the RequestHandler's first thread, and if there's a
-		// problem there we don't want it to affect the admin server.
-		awo->serverKitContext->defaultFileBufferedChannelConfig.threshold = 1024 * 1024;
 		awo->serverKitContext->defaultFileBufferedChannelConfig.bufferDir =
 			options.get("data_buffer_dir");
+		awo->serverKitContext->defaultFileBufferedChannelConfig.threshold =
+			options.getUint("file_buffer_threshold");
 
 		UPDATE_TRACE_POINT();
 		awo->adminServer = new ServerAgent::AdminServer(awo->serverKitContext);
@@ -912,10 +927,12 @@ cleanup() {
 	for (unsigned i = 0; i < wo->threadWorkingObjects.size(); i++) {
 		ThreadWorkingObjects *two = &wo->threadWorkingObjects[i];
 		delete two->requestHandler;
+		two->requestHandler = NULL;
 	}
 	if (wo->prestarterThread != NULL) {
 		wo->prestarterThread->interrupt_and_join();
 		delete wo->prestarterThread;
+		wo->prestarterThread = NULL;
 	}
 	for (unsigned int i = 0; i < SERVER_KIT_MAX_SERVER_ENDPOINTS; i++) {
 		if (wo->serverFds[i] != -1) {
@@ -926,6 +943,8 @@ cleanup() {
 		}
 	}
 	deletePidFile();
+	delete workingObjects;
+	workingObjects = NULL;
 	P_NOTICE(AGENT_EXE " server shutdown finished");
 }
 
@@ -960,6 +979,8 @@ runServer() {
 		UPDATE_TRACE_POINT();
 		cleanup();
 	} catch (const tracable_exception &e) {
+		// We intentionally don't call cleanup() in
+		// order to avoid various destructor assertions.
 		P_CRITICAL("ERROR: " << e.what() << "\n" << e.backtrace());
 		deletePidFile();
 		return 1;
@@ -1170,10 +1191,14 @@ sanityCheckOptions() {
 
 int
 serverMain(int argc, char *argv[]) {
+	int ret;
+
 	agentsOptions = new VariantMap();
 	*agentsOptions = initializeAgent(argc, &argv, AGENT_EXE " server", parseOptions,
 		preinitialize, 2);
 	setAgentsOptionsDefaults();
 	sanityCheckOptions();
-	return runServer();
+	ret = runServer();
+	shutdownAgent(agentsOptions);
+	return ret;
 }

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

@@ -150,8 +150,6 @@ private:
 	HashedStaticString HTTP_CONNECTION;
 	HashedStaticString HTTP_STATUS;
 	HashedStaticString HTTP_TRANSFER_ENCODING;
-	HashedStaticString HTTP_X_SENDFILE;
-	HashedStaticString HTTP_X_ACCEL_REDIRECT;
 
 	unsigned int threadNumber;
 	StaticString serverLogName;
@@ -217,8 +215,6 @@ public:
 		  HTTP_CONNECTION("connection"),
 		  HTTP_STATUS("status"),
 		  HTTP_TRANSFER_ENCODING("transfer-encoding"),
-		  HTTP_X_SENDFILE("x-sendfile"),
-		  HTTP_X_ACCEL_REDIRECT("x-accel-redirect"),
 
 		  threadNumber(_threadNumber),
 		  turboCaching(getTurboCachingInitialState(_agentsOptions))
@@ -336,7 +332,7 @@ public:
 						StaticString hostStr;
 
 						size = getClientName(client, clientName, sizeof(clientName));
-						if (req->host != NULL) {
+						if (req->host != NULL && req->host->size > 0) {
 							host = psg_lstr_make_contiguous(req->host, req->pool);
 							hostStr = StaticString(host->start->data, host->size);
 						}
@@ -439,22 +435,24 @@ public:
 
 		if (req->appResponseInitialized) {
 			doc["app_response_http_state"] = resp->getHttpStateString();
-			doc["app_response_http_major"] = resp->httpMajor;
-			doc["app_response_http_minor"] = resp->httpMinor;
-			doc["app_response_want_keep_alive"] = resp->wantKeepAlive;
-			doc["app_response_body_type"] = resp->getBodyTypeString();
-			doc["app_response_body_fully_read"] = resp->bodyFullyRead();
-			doc["app_response_body_already_read"] = byteSizeToJson(
-				resp->bodyAlreadyRead);
-			if (resp->httpState != AppResponse::ERROR) {
-				if (resp->bodyType == AppResponse::RBT_CONTENT_LENGTH) {
-					doc["app_response_content_length"] = byteSizeToJson(
-						resp->aux.bodyInfo.contentLength);
-				} else if (resp->bodyType == AppResponse::RBT_CHUNKED) {
-					doc["app_response_end_chunk_reached"] = resp->aux.bodyInfo.endChunkReached;
+			if (resp->begun()) {
+				doc["app_response_http_major"] = resp->httpMajor;
+				doc["app_response_http_minor"] = resp->httpMinor;
+				doc["app_response_want_keep_alive"] = resp->wantKeepAlive;
+				doc["app_response_body_type"] = resp->getBodyTypeString();
+				doc["app_response_body_fully_read"] = resp->bodyFullyRead();
+				doc["app_response_body_already_read"] = byteSizeToJson(
+					resp->bodyAlreadyRead);
+				if (resp->httpState != AppResponse::ERROR) {
+					if (resp->bodyType == AppResponse::RBT_CONTENT_LENGTH) {
+						doc["app_response_content_length"] = byteSizeToJson(
+							resp->aux.bodyInfo.contentLength);
+					} else if (resp->bodyType == AppResponse::RBT_CHUNKED) {
+						doc["app_response_end_chunk_reached"] = resp->aux.bodyInfo.endChunkReached;
+					}
+				} else {
+					doc["app_response_parse_error"] = ServerKit::getErrorDesc(resp->aux.parseError);
 				}
-			} else {
-				doc["app_response_parse_error"] = ServerKit::getErrorDesc(resp->aux.parseError);
 			}
 		}
 

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

@@ -215,6 +215,10 @@ public:
 		return bodyType == RBT_UPGRADE;
 	}
 
+	bool begun() const {
+		return (int) httpState >= COMPLETE;
+	}
+
 	bool canKeepAlive() const {
 		return wantKeepAlive && bodyFullyRead();
 	}

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

@@ -335,11 +335,15 @@ onAppResponseBegin(Client *client, Request *req) {
 			req->wantKeepAlive = false;
 		}
 	}
-	if (resp->headers.lookup(HTTP_X_SENDFILE) != NULL
-	 || resp->headers.lookup(HTTP_X_ACCEL_REDIRECT) != NULL)
+	if (resp->headers.lookup(ServerKit::HTTP_X_SENDFILE) != NULL
+	 || resp->headers.lookup(ServerKit::HTTP_X_ACCEL_REDIRECT) != NULL)
 	{
-		// https://github.com/phusion/passenger/issues/1498
-		resp->wantKeepAlive = false;
+		// If X-Sendfile or X-Accel-Redirect is set, then HttpHeaderParser
+		// treats the app response as having no body, and removes the
+		// Content-Length and Transfer-Encoding headers. Because of this,
+		// the response that we output also doesn't Content-Length
+		// or Transfer-Encoding. So we should disable keep-alive.
+		req->wantKeepAlive = false;
 	}
 
 	prepareAppResponseCaching(client, req);
@@ -553,10 +557,10 @@ constructHeaderBuffersForResponse(Request *req, struct iovec *buffers,
 	}
 
 	while (*it != NULL) {
-		dataSize += it->header->key.size + sizeof(": ") - 1;
+		dataSize += it->header->origKey.size + sizeof(": ") - 1;
 		dataSize += it->header->val.size + sizeof("\r\n") - 1;
 
-		part = it->header->key.start;
+		part = it->header->origKey.start;
 		while (part != NULL) {
 			if (buffers != NULL) {
 				buffers[i].iov_base = (void *) part->data;

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

@@ -173,6 +173,7 @@ void deinitializeAppResponse(Client *client, Request *req) {
 	ServerKit::HeaderTable::Iterator it(resp->headers);
 	while (*it != NULL) {
 		psg_lstr_deinit(&it->header->key);
+		psg_lstr_deinit(&it->header->origKey);
 		psg_lstr_deinit(&it->header->val);
 		it.next();
 	}
@@ -180,6 +181,7 @@ void deinitializeAppResponse(Client *client, Request *req) {
 	it = ServerKit::HeaderTable::Iterator(resp->secureHeaders);
 	while (*it != NULL) {
 		psg_lstr_deinit(&it->header->key);
+		psg_lstr_deinit(&it->header->origKey);
 		psg_lstr_deinit(&it->header->val);
 		it.next();
 	}

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

@@ -426,7 +426,7 @@ setStickySessionId(Client *client, Request *req) {
 		// headers, although this is in practice extremely rare.
 		// http://stackoverflow.com/questions/16305814/are-multiple-cookie-headers-allowed-in-an-http-request
 		const LString *cookieHeader = req->headers.lookup(HTTP_COOKIE);
-		if (cookieHeader != NULL) {
+		if (cookieHeader != NULL && cookieHeader->size > 0) {
 			const LString *cookieName = getStickySessionCookieName(req);
 			vector< pair<StaticString, StaticString> > cookies;
 			pair<StaticString, StaticString> cookie;