passenger 5.0.9 → 5.0.10

data/ext/common/ApplicationPool2/Session.h

@@ -31,10 +31,12 @@
 #include <oxt/macros.hpp>
 #include <oxt/system_calls.hpp>
 #include <oxt/backtrace.hpp>
-#include <ApplicationPool2/Common.h>
+#include <ApplicationPool2/Context.h>
+#include <ApplicationPool2/BasicProcessInfo.h>
+#include <ApplicationPool2/BasicGroupInfo.h>
 #include <ApplicationPool2/Socket.h>
-#include <FileDescriptor.h>
 #include <Utils/ScopeGuard.h>
+#include <Utils/Lock.h>
 
 namespace Passenger {
 namespace ApplicationPool2 {
@@ -47,11 +49,16 @@ using namespace oxt;
  * within Phusion Passenger is usually a single request + response but the API
  * allows arbitrary I/O. See Process's class overview for normal usage of Session.
  *
- * This class can be used outside the ApplicationPool lock, but is not thread-safe,
- * and so should only be access through 1 thread.
+ * A Session object is created from a Process object.
  *
- * You MUST destroy all Session objects before destroying the Pool, because Session
- * objects are stored inside a memory pool inside Pool.
+ * This class can be used outside the ApplicationPool lock, because the methods in this
+ * class only return immutable data and only modify data inside the Session object.
+ * However, it is not thread-safe, and so should only be accessed through 1 thread.
+ *
+ * You MUST destroy all Session objects before destroying the Context that
+ * it was allocated from. Outside unit tests, Context lives in Pool, so
+ * so in that case you must not destroy Pool before destroying all Session
+ * objects.
  */
 class Session {
 public:
@@ -59,13 +66,20 @@ public:
 
 private:
 	/**
-	 * Backpointers to the Pool, Process and Socket that this Session was made
-	 * from. `pool` is always non-NULL, but `process` and `socket` are only
-	 * non-NULL as long as the Session hasn't been closed. This is because Group
-	 * waits until all sessions are closed before destroying a Process.
+	 * Pointer to the Context that this Session was allocated from. Always
+	 * non-NULL. Allows the Session to free itself from the memory pool
+	 * inside the Context.
+	 */
+	Context * const context;
+	/**
+	 * Backpointers to Socket that this Session was made from, as well as the immutable info
+	 * of the Group and Process that this Session belongs to.
+	 *
+	 * These are non-NULL if and only if the Session hasn't been closed.
+	 * This works because Group waits until all sessions are closed
+	 * before destroying a Process.
 	 */
-	Pool * const pool;
-	Process *process;
+	const BasicProcessInfo *processInfo;
 	Socket *socket;
 
 	Connection connection;
@@ -92,13 +106,19 @@ private:
 		closed = true;
 	}
 
+	void destroySelf() const {
+		this->~Session();
+		LockGuard l(context->getMmSyncher());
+		context->getSessionObjectPool().free(const_cast<Session *>(this));
+	}
+
 public:
 	Callback onInitiateFailure;
 	Callback onClose;
 
-	Session(Pool *_pool, Process *_process, Socket *_socket)
-		: pool(_pool),
-		  process(_process),
+	Session(Context *_context, const BasicProcessInfo *_processInfo, Socket *_socket)
+		: context(_context),
+		  processInfo(_processInfo),
 		  socket(_socket),
 		  refcount(1),
 		  closed(false),
@@ -117,22 +137,36 @@ public:
 		}
 	}
 
-	StaticString getGroupSecret() const;
-	pid_t getPid() const;
-	StaticString getGupid() const;
-	unsigned int getStickySessionId() const;
-	Group *getGroup() const;
-	void requestOOBW();
-	int kill(int signo);
-	void destroySelf() const;
 
-	bool isClosed() const {
-		return closed;
+	Group *getGroup() const {
+		assert(!closed);
+		return processInfo->groupInfo->group;
 	}
 
 	Process *getProcess() const {
 		assert(!closed);
-		return process;
+		return processInfo->process;
+	}
+
+
+	const ApiKey &getApiKey() const {
+		assert(!closed);
+		return processInfo->groupInfo->apiKey;
+	}
+
+	pid_t getPid() const {
+		assert(!closed);
+		return processInfo->pid;
+	}
+
+	StaticString getGupid() const {
+		assert(!closed);
+		return StaticString(processInfo->gupid, processInfo->gupidSize);
+	}
+
+	unsigned int getStickySessionId() const {
+		assert(!closed);
+		return processInfo->stickySessionId;
 	}
 
 	Socket *getSocket() const {
@@ -144,6 +178,7 @@ public:
 		return getSocket()->protocol;
 	}
 
+
 	void initiate(bool blocking = true) {
 		assert(!closed);
 		ScopeGuard g(boost::bind(&Session::callOnInitiateFailure, this));
@@ -179,10 +214,17 @@ public:
 		if (OXT_LIKELY(!closed)) {
 			callOnClose();
 		}
-		process = NULL;
-		socket  = NULL;
+		processInfo = NULL;
+		socket = NULL;
 	}
 
+	bool isClosed() const {
+		return closed;
+	}
+
+	void requestOOBW();
+
+
 	void ref() const {
 		refcount.fetch_add(1, boost::memory_order_relaxed);
 	}

data/ext/common/ApplicationPool2/Socket.h

@@ -35,6 +35,7 @@
 #include <Logging.h>
 #include <StaticString.h>
 #include <ApplicationPool2/Common.h>
+#include <MemoryKit/palloc.h>
 #include <Utils/SmallVector.h>
 #include <Utils/IOUtils.h>
 

data/ext/common/Constants.h

@@ -64,7 +64,7 @@
 
 	#define DEFAULT_HTTP_SERVER_LISTEN_ADDRESS "tcp://127.0.0.1:3000"
 
-	#define DEFAULT_LOGGING_AGENT_ADMIN_LISTEN_ADDRESS "tcp://127.0.0.1:9345"
+	#define DEFAULT_LOGGING_AGENT_API_LISTEN_ADDRESS "tcp://127.0.0.1:9345"
 
 	#define DEFAULT_LOGGING_AGENT_LISTEN_ADDRESS "tcp://127.0.0.1:9344"
 
@@ -114,9 +114,15 @@
 
 	#define NGINX_DOC_URL "https://www.phusionpassenger.com/documentation/Users%20guide%20Nginx.html"
 
+	#define PASSENGER_API_VERSION "0.2"
+
+	#define PASSENGER_API_VERSION_MAJOR 0
+
+	#define PASSENGER_API_VERSION_MINOR 2
+
 	#define PASSENGER_DEFAULT_USER "nobody"
 
-	#define PASSENGER_VERSION "5.0.9"
+	#define PASSENGER_VERSION "5.0.10"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 
@@ -136,7 +142,9 @@
 
 	#define SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION 2
 
-	#define SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION 0
+	#define SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION 1
+
+	#define SERVER_INSTANCE_DIR_STRUCTURE_MIN_SUPPORTED_MINOR_VERSION 0
 
 	#define SERVER_KIT_MAX_SERVER_ENDPOINTS 4
 

data/ext/common/Exceptions.h

@@ -369,7 +369,7 @@ public:
  * Indicates that a Pool::get() or Pool::asyncGet() request was denied.
  * The request never reached a process. This could be because, before the
  * request could reach a process, the administrator detached the containing
- * SuperGroup. Or maybe the request sat in the queue for too long.
+ * group. Or maybe the request sat in the queue for too long.
  */
 class GetAbortedException: public oxt::tracable_exception {
 private:

data/ext/common/Logging.cpp

@@ -66,11 +66,8 @@ bool
 setLogFile(const string &path, int *errcode) {
 	int fd = open(path.c_str(), O_WRONLY | O_CREAT | O_APPEND, 0644);
 	if (fd != -1) {
-		boost::lock_guard<boost::mutex> l(logFileMutex);
-		dup2(fd, STDOUT_FILENO);
-		dup2(fd, STDERR_FILENO);
+		setLogFileWithFd(path, fd);
 		close(fd);
-		logFile = path;
 		return true;
 	} else {
 		if (errcode != NULL) {
@@ -80,6 +77,14 @@ setLogFile(const string &path, int *errcode) {
 	}
 }
 
+void
+setLogFileWithFd(const string &path, int fd) {
+	boost::lock_guard<boost::mutex> l(logFileMutex);
+	dup2(fd, STDOUT_FILENO);
+	dup2(fd, STDERR_FILENO);
+	logFile = path;
+}
+
 bool
 hasFileDescriptorLogFile() {
 	return fileDescriptorLog != -1;

data/ext/common/Logging.h

@@ -96,6 +96,12 @@ string getLogFile();
  */
 bool setLogFile(const string &path, int *errcode = NULL);
 
+/**
+ * Sets the general log file, assuming that it's already opened
+ * at the given fd. This method is thread-safe.
+ */
+void setLogFileWithFd(const string &path, int fd);
+
 /**
  * Returns whether we're using a separate log file for logging file
  * descriptor opening and closing.

data/ext/common/ServerKit/HttpServer.h

@@ -657,221 +657,6 @@ private:
 	}
 
 protected:
-	/***** Protected API *****/
-
-	/** Increase request reference count. */
-	void refRequest(Request *req, const char *file, unsigned int line) {
-		int oldRefcount = req->refcount.fetch_add(1, boost::memory_order_relaxed);
-		SKC_TRACE_WITH_POS(static_cast<Client *>(req->client), 3, file, line,
-			"Request refcount increased; it is now " << (oldRefcount + 1));
-	}
-
-	/** Decrease request reference count. Adds request to the
-	 * freelist if reference count drops to 0.
-	 */
-	void unrefRequest(Request *req, const char *file, unsigned int line) {
-		int oldRefcount = req->refcount.fetch_sub(1, boost::memory_order_release);
-		assert(oldRefcount >= 1);
-
-		SKC_TRACE_WITH_POS(static_cast<Client *>(req->client), 3, file, line,
-			"Request refcount decreased; it is now " << (oldRefcount - 1));
-		if (oldRefcount == 1) {
-			boost::atomic_thread_fence(boost::memory_order_acquire);
-
-			if (this->getContext()->libev->onEventLoopThread()) {
-				requestReachedZeroRefcount(req);
-			} else {
-				// Let the event loop handle the request reaching the 0 refcount.
-				passRequestToEventLoopThread(req);
-			}
-		}
-	}
-
-	object_pool<HttpHeaderParserState> &getHeaderParserStatePool() {
-		return headerParserStatePool;
-	}
-
-	bool canKeepAlive(Request *req) const {
-		return req->wantKeepAlive
-			&& req->bodyFullyRead()
-			&& HttpServer::serverState < HttpServer::SHUTTING_DOWN;
-	}
-
-	void writeResponse(Client *client, const MemoryKit::mbuf &buffer) {
-		client->currentRequest->responseBegun = true;
-		client->output.feedWithoutRefGuard(buffer);
-	}
-
-	void writeResponse(Client *client, const char *data, unsigned int size) {
-		writeResponse(client, MemoryKit::mbuf(data, size));
-	}
-
-	void writeResponse(Client *client, const StaticString &data) {
-		writeResponse(client, data.data(), data.size());
-	}
-
-	void
-	writeSimpleResponse(Client *client, int code, const HeaderTable *headers,
-		const StaticString &body)
-	{
-		unsigned int headerBufSize = 300;
-
-		if (headers != NULL) {
-			HeaderTable::ConstIterator it(*headers);
-			while (*it != NULL) {
-				headerBufSize += it->header->key.size + sizeof(": ") - 1;
-				headerBufSize += it->header->val.size + sizeof("\r\n") - 1;
-				it.next();
-			}
-		}
-
-		Request *req = client->currentRequest;
-		char *header = (char *) psg_pnalloc(req->pool, headerBufSize);
-		char statusBuffer[50];
-		char *pos = header;
-		const char *end = header + headerBufSize;
-		const char *status;
-		const LString *value;
-
-		status = getStatusCodeAndReasonPhrase(code);
-		if (status == NULL) {
-			snprintf(statusBuffer, sizeof(statusBuffer), "%d Unknown Reason-Phrase", code);
-			status = statusBuffer;
-		}
-
-		pos += snprintf(pos, end - pos,
-			"HTTP/%d.%d %s\r\n"
-			"Status: %s\r\n",
-			(int) req->httpMajor, (int) req->httpMinor, status, status);
-
-		value = (headers != NULL) ? headers->lookup(P_STATIC_STRING("content-type")) : NULL;
-		if (value == NULL) {
-			pos = appendData(pos, end, P_STATIC_STRING("Content-Type: text/html; charset=UTF-8\r\n"));
-		} else {
-			pos = appendData(pos, end, P_STATIC_STRING("Content-Type: "));
-			pos = appendLStringData(pos, end, value);
-			pos = appendData(pos, end, P_STATIC_STRING("\r\n"));
-		}
-
-		value = (headers != NULL) ? headers->lookup(P_STATIC_STRING("date")) : NULL;
-		pos = appendData(pos, end, P_STATIC_STRING("Date: "));
-		if (value == NULL) {
-			time_t the_time = time(NULL);
-			struct tm the_tm;
-			gmtime_r(&the_time, &the_tm);
-			pos += strftime(pos, end - pos, "%a, %d %b %Y %H:%M:%S %z", &the_tm);
-		} else {
-			pos = appendLStringData(pos, end, value);
-		}
-		pos = appendData(pos, end, P_STATIC_STRING("\r\n"));
-
-		value = (headers != NULL) ? headers->lookup(P_STATIC_STRING("connection")) : NULL;
-		if (value == NULL) {
-			if (canKeepAlive(req)) {
-				pos = appendData(pos, end, P_STATIC_STRING("Connection: keep-alive\r\n"));
-			} else {
-				pos = appendData(pos, end, P_STATIC_STRING("Connection: close\r\n"));
-			}
-		} else {
-			pos = appendData(pos, end, P_STATIC_STRING("Connection: "));
-			pos = appendLStringData(pos, end, value);
-			pos = appendData(pos, end, P_STATIC_STRING("\r\n"));
-			if (!psg_lstr_cmp(value, P_STATIC_STRING("Keep-Alive"))
-			 && !psg_lstr_cmp(value, P_STATIC_STRING("keep-alive")))
-			{
-				req->wantKeepAlive = false;
-			}
-		}
-
-		value = (headers != NULL) ? headers->lookup(P_STATIC_STRING("content-length")) : NULL;
-		pos = appendData(pos, end, P_STATIC_STRING("Content-Length: "));
-		if (value == NULL) {
-			pos += snprintf(pos, end - pos, "%u", (unsigned int) body.size());
-		} else {
-			pos = appendLStringData(pos, end, value);
-		}
-		pos = appendData(pos, end, P_STATIC_STRING("\r\n"));
-
-		if (headers != NULL) {
-			HeaderTable::ConstIterator it(*headers);
-			while (*it != NULL) {
-				if (!psg_lstr_cmp(&it->header->key, P_STATIC_STRING("content-type"))
-				 && !psg_lstr_cmp(&it->header->key, P_STATIC_STRING("date"))
-				 && !psg_lstr_cmp(&it->header->key, P_STATIC_STRING("connection"))
-				 && !psg_lstr_cmp(&it->header->key, P_STATIC_STRING("content-length")))
-				{
-					pos = appendLStringData(pos, end, &it->header->key);
-					pos = appendData(pos, end, P_STATIC_STRING(": "));
-					pos = appendLStringData(pos, end, &it->header->val);
-					pos = appendData(pos, end, P_STATIC_STRING("\r\n"));
-				}
-				it.next();
-			}
-		}
-
-		pos = appendData(pos, end, P_STATIC_STRING("\r\n"));
-
-		writeResponse(client, header, pos - header);
-		if (!req->ended() && req->method != HTTP_HEAD) {
-			writeResponse(client, body.data(), body.size());
-		}
-	}
-
-	bool endRequest(Client **client, Request **request) {
-		Client *c = *client;
-		Request *req = *request;
-		psg_pool_t *pool;
-
-		*client = NULL;
-		*request = NULL;
-
-		if (req->ended()) {
-			return false;
-		}
-
-		SKC_TRACE(c, 2, "Ending request");
-		assert(c->currentRequest == req);
-
-		if (OXT_UNLIKELY(!req->responseBegun)) {
-			writeDefault500Response(c, req);
-			if (req->ended()) {
-				return false;
-			}
-		}
-
-		// The memory buffers that we're writing out during the
-		// FLUSHING_OUTPUT state might live in the palloc pool,
-		// so we want to deinitialize the request while preserving
-		// the pool. We'll destroy the pool when the output is
-		// flushed.
-		pool = req->pool;
-		req->pool = NULL;
-		deinitializeRequestAndAddToFreelist(c, req);
-		req->pool = pool;
-
-		if (!c->output.ended()) {
-			c->output.feedWithoutRefGuard(MemoryKit::mbuf());
-		}
-		if (c->output.endAcked()) {
-			doneWithCurrentRequest(&c);
-		} else {
-			// Call doneWithCurrentRequest() when data flushed
-			SKC_TRACE(c, 2, "Waiting until output is flushed");
-			req->httpState = Request::FLUSHING_OUTPUT;
-			// If the request body is not fully read at this time,
-			// then ensure that onClientDataReceived() discards any
-			// request body data that we receive from now on.
-			req->wantKeepAlive = canKeepAlive(req);
-		}
-
-		return true;
-	}
-
-	void endAsBadRequest(Client **client, Request **req, const StaticString &body) {
-		endWithErrorResponse(client, req, 400, body);
-	}
-
-
 	/***** Hook overrides *****/
 
 	virtual void onClientObjectCreated(Client *client) {
@@ -1079,6 +864,9 @@ public:
 		STAILQ_INIT(&freeRequests);
 	}
 
+
+	/***** Server management *****/
+
 	virtual void compact(int logLevel = LVL_NOTICE) {
 		ParentClass::compact();
 		unsigned int count = freeRequestCount;
@@ -1100,6 +888,220 @@ public:
 			"Freed " << count << " spare request objects");
 	}
 
+
+	/***** Request manipulation *****/
+
+		/** Increase request reference count. */
+	void refRequest(Request *req, const char *file, unsigned int line) {
+		int oldRefcount = req->refcount.fetch_add(1, boost::memory_order_relaxed);
+		SKC_TRACE_WITH_POS(static_cast<Client *>(req->client), 3, file, line,
+			"Request refcount increased; it is now " << (oldRefcount + 1));
+	}
+
+	/** Decrease request reference count. Adds request to the
+	 * freelist if reference count drops to 0.
+	 */
+	void unrefRequest(Request *req, const char *file, unsigned int line) {
+		int oldRefcount = req->refcount.fetch_sub(1, boost::memory_order_release);
+		assert(oldRefcount >= 1);
+
+		SKC_TRACE_WITH_POS(static_cast<Client *>(req->client), 3, file, line,
+			"Request refcount decreased; it is now " << (oldRefcount - 1));
+		if (oldRefcount == 1) {
+			boost::atomic_thread_fence(boost::memory_order_acquire);
+
+			if (this->getContext()->libev->onEventLoopThread()) {
+				requestReachedZeroRefcount(req);
+			} else {
+				// Let the event loop handle the request reaching the 0 refcount.
+				passRequestToEventLoopThread(req);
+			}
+		}
+	}
+
+	bool canKeepAlive(Request *req) const {
+		return req->wantKeepAlive
+			&& req->bodyFullyRead()
+			&& HttpServer::serverState < HttpServer::SHUTTING_DOWN;
+	}
+
+	void writeResponse(Client *client, const MemoryKit::mbuf &buffer) {
+		client->currentRequest->responseBegun = true;
+		client->output.feedWithoutRefGuard(buffer);
+	}
+
+	void writeResponse(Client *client, const char *data, unsigned int size) {
+		writeResponse(client, MemoryKit::mbuf(data, size));
+	}
+
+	void writeResponse(Client *client, const StaticString &data) {
+		writeResponse(client, data.data(), data.size());
+	}
+
+	void
+	writeSimpleResponse(Client *client, int code, const HeaderTable *headers,
+		const StaticString &body)
+	{
+		unsigned int headerBufSize = 300;
+
+		if (headers != NULL) {
+			HeaderTable::ConstIterator it(*headers);
+			while (*it != NULL) {
+				headerBufSize += it->header->key.size + sizeof(": ") - 1;
+				headerBufSize += it->header->val.size + sizeof("\r\n") - 1;
+				it.next();
+			}
+		}
+
+		Request *req = client->currentRequest;
+		char *header = (char *) psg_pnalloc(req->pool, headerBufSize);
+		char statusBuffer[50];
+		char *pos = header;
+		const char *end = header + headerBufSize;
+		const char *status;
+		const LString *value;
+
+		status = getStatusCodeAndReasonPhrase(code);
+		if (status == NULL) {
+			snprintf(statusBuffer, sizeof(statusBuffer), "%d Unknown Reason-Phrase", code);
+			status = statusBuffer;
+		}
+
+		pos += snprintf(pos, end - pos,
+			"HTTP/%d.%d %s\r\n"
+			"Status: %s\r\n",
+			(int) req->httpMajor, (int) req->httpMinor, status, status);
+
+		value = (headers != NULL) ? headers->lookup(P_STATIC_STRING("content-type")) : NULL;
+		if (value == NULL) {
+			pos = appendData(pos, end, P_STATIC_STRING("Content-Type: text/html; charset=UTF-8\r\n"));
+		} else {
+			pos = appendData(pos, end, P_STATIC_STRING("Content-Type: "));
+			pos = appendLStringData(pos, end, value);
+			pos = appendData(pos, end, P_STATIC_STRING("\r\n"));
+		}
+
+		value = (headers != NULL) ? headers->lookup(P_STATIC_STRING("date")) : NULL;
+		pos = appendData(pos, end, P_STATIC_STRING("Date: "));
+		if (value == NULL) {
+			time_t the_time = time(NULL);
+			struct tm the_tm;
+			gmtime_r(&the_time, &the_tm);
+			pos += strftime(pos, end - pos, "%a, %d %b %Y %H:%M:%S %z", &the_tm);
+		} else {
+			pos = appendLStringData(pos, end, value);
+		}
+		pos = appendData(pos, end, P_STATIC_STRING("\r\n"));
+
+		value = (headers != NULL) ? headers->lookup(P_STATIC_STRING("connection")) : NULL;
+		if (value == NULL) {
+			if (canKeepAlive(req)) {
+				pos = appendData(pos, end, P_STATIC_STRING("Connection: keep-alive\r\n"));
+			} else {
+				pos = appendData(pos, end, P_STATIC_STRING("Connection: close\r\n"));
+			}
+		} else {
+			pos = appendData(pos, end, P_STATIC_STRING("Connection: "));
+			pos = appendLStringData(pos, end, value);
+			pos = appendData(pos, end, P_STATIC_STRING("\r\n"));
+			if (!psg_lstr_cmp(value, P_STATIC_STRING("Keep-Alive"))
+			 && !psg_lstr_cmp(value, P_STATIC_STRING("keep-alive")))
+			{
+				req->wantKeepAlive = false;
+			}
+		}
+
+		value = (headers != NULL) ? headers->lookup(P_STATIC_STRING("content-length")) : NULL;
+		pos = appendData(pos, end, P_STATIC_STRING("Content-Length: "));
+		if (value == NULL) {
+			pos += snprintf(pos, end - pos, "%u", (unsigned int) body.size());
+		} else {
+			pos = appendLStringData(pos, end, value);
+		}
+		pos = appendData(pos, end, P_STATIC_STRING("\r\n"));
+
+		if (headers != NULL) {
+			HeaderTable::ConstIterator it(*headers);
+			while (*it != NULL) {
+				if (!psg_lstr_cmp(&it->header->key, P_STATIC_STRING("content-type"))
+				 && !psg_lstr_cmp(&it->header->key, P_STATIC_STRING("date"))
+				 && !psg_lstr_cmp(&it->header->key, P_STATIC_STRING("connection"))
+				 && !psg_lstr_cmp(&it->header->key, P_STATIC_STRING("content-length")))
+				{
+					pos = appendLStringData(pos, end, &it->header->origKey);
+					pos = appendData(pos, end, P_STATIC_STRING(": "));
+					pos = appendLStringData(pos, end, &it->header->val);
+					pos = appendData(pos, end, P_STATIC_STRING("\r\n"));
+				}
+				it.next();
+			}
+		}
+
+		pos = appendData(pos, end, P_STATIC_STRING("\r\n"));
+
+		writeResponse(client, header, pos - header);
+		if (!req->ended() && req->method != HTTP_HEAD) {
+			writeResponse(client, body.data(), body.size());
+		}
+	}
+
+	bool endRequest(Client **client, Request **request) {
+		Client *c = *client;
+		Request *req = *request;
+		psg_pool_t *pool;
+
+		*client = NULL;
+		*request = NULL;
+
+		if (req->ended()) {
+			return false;
+		}
+
+		SKC_TRACE(c, 2, "Ending request");
+		assert(c->currentRequest == req);
+
+		if (OXT_UNLIKELY(!req->responseBegun)) {
+			writeDefault500Response(c, req);
+			if (req->ended()) {
+				return false;
+			}
+		}
+
+		// The memory buffers that we're writing out during the
+		// FLUSHING_OUTPUT state might live in the palloc pool,
+		// so we want to deinitialize the request while preserving
+		// the pool. We'll destroy the pool when the output is
+		// flushed.
+		pool = req->pool;
+		req->pool = NULL;
+		deinitializeRequestAndAddToFreelist(c, req);
+		req->pool = pool;
+
+		if (!c->output.ended()) {
+			c->output.feedWithoutRefGuard(MemoryKit::mbuf());
+		}
+		if (c->output.endAcked()) {
+			doneWithCurrentRequest(&c);
+		} else {
+			// Call doneWithCurrentRequest() when data flushed
+			SKC_TRACE(c, 2, "Waiting until output is flushed");
+			req->httpState = Request::FLUSHING_OUTPUT;
+			// If the request body is not fully read at this time,
+			// then ensure that onClientDataReceived() discards any
+			// request body data that we receive from now on.
+			req->wantKeepAlive = canKeepAlive(req);
+		}
+
+		return true;
+	}
+
+	void endAsBadRequest(Client **client, Request **req, const StaticString &body) {
+		endWithErrorResponse(client, req, 400, body);
+	}
+
+
+	/***** Configuration and introspection *****/
+
 	virtual void configure(const Json::Value &doc) {
 		ParentClass::configure(doc);
 		if (doc.isMember("request_freelist_limit")) {
@@ -1184,6 +1186,14 @@ public:
 		return doc;
 	}
 
+
+	/***** Miscellaneous *****/
+
+	object_pool<HttpHeaderParserState> &getHeaderParserStatePool() {
+		return headerParserStatePool;
+	}
+
+
 	/***** Friend-public methods and hook implementations *****/
 
 	void _refRequest(Request *request, const char *file, unsigned int line) {