passenger 5.0.26 → 5.0.27

data/src/apache2_module/Hooks.cpp

@@ -58,7 +58,7 @@
 #include <Utils.h>
 #include <Utils/IOUtils.h>
 #include <Utils/StrIntUtils.h>
-#include <Utils/Timer.h>
+#include <Utils/SystemTime.h>
 #include <Utils/HttpConstants.h>
 #include <Utils/ReleaseableScopedPointer.h>
 #include <Logging.h>
@@ -630,7 +630,6 @@ private:
 			 * util_script.c's source. :-(
 			 */
 			char backendData[MAX_STRING_LEN];
-			Timer timer;
 			getsfunc_BRIGADE(backendData, MAX_STRING_LEN, bb);
 
 			// The bucket brigade is an interface to the HTTP response sent by the
@@ -1601,6 +1600,7 @@ init_module(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *
 	 */
 	if (hooks == NULL) {
 		oxt::initialize();
+		SystemTime::initialize();
 	} else {
 		P_DEBUG("Restarting Phusion Passenger....");
 		delete hooks;

data/src/cxx_supportlib/BackgroundEventLoop.cpp

@@ -44,6 +44,7 @@
 	#if defined(__APPLE__) || \
 		defined(__DragonFly__) || \
 		defined(__FreeBSD__) || \
+		defined(__FreeBSD_kernel__) || \
 		defined(__OpenBSD__) || \
 		defined(__NetBSD__)
 		#define HAVE_KQUEUE 1
@@ -271,7 +272,6 @@ BackgroundEventLoop::BackgroundEventLoop(bool scalable, bool usesLibuv)
 	P_LOG_FILE_DESCRIPTOR_OPEN2(ev_backend_fd(libev_loop), "libev event loop: backend FD");
 
 	ev_async_init(&priv->exitSignaller, signalLibevExit);
-	ev_async_start(libev_loop, &priv->exitSignaller);
 	P_LOG_FILE_DESCRIPTOR_OPEN2(ev_loop_get_pipe(libev_loop, 0), "libev event loop: async pipe 0");
 	P_LOG_FILE_DESCRIPTOR_OPEN2(ev_loop_get_pipe(libev_loop, 1), "libev event loop: async pipe 1");
 	priv->exitSignaller.data = this;
@@ -281,7 +281,6 @@ BackgroundEventLoop::BackgroundEventLoop(bool scalable, bool usesLibuv)
 
 	if (usesLibuv) {
 		ev_async_init(&priv->libuvActivitySignaller, onLibuvActivity);
-		ev_async_start(libev_loop, &priv->libuvActivitySignaller);
 		priv->libuvActivitySignaller.data = this;
 
 		libuv_loop = &priv->libuv_loop;
@@ -303,6 +302,7 @@ BackgroundEventLoop::BackgroundEventLoop(bool scalable, bool usesLibuv)
 BackgroundEventLoop::~BackgroundEventLoop() {
 	stop();
 	if (priv->usesLibuv) {
+		uv_close((uv_handle_t *) &priv->libuv_timer, NULL);
 		while (uv_loop_alive(libuv_loop)) {
 			uv_run(libuv_loop, UV_RUN_NOWAIT);
 			syscalls::usleep(10000);
@@ -312,6 +312,12 @@ BackgroundEventLoop::~BackgroundEventLoop() {
 		P_LOG_FILE_DESCRIPTOR_CLOSE(libuv_loop->signal_pipefd[0]);
 		P_LOG_FILE_DESCRIPTOR_CLOSE(libuv_loop->signal_pipefd[1]);
 		uv_loop_close(libuv_loop);
+		if (ev_is_active(&priv->libuvActivitySignaller)) {
+			ev_async_stop(libev_loop, &priv->libuvActivitySignaller);
+		}
+	}
+	if (ev_is_active(&priv->exitSignaller)) {
+		ev_async_stop(libev_loop, &priv->exitSignaller);
 	}
 	uv_barrier_destroy(&priv->startBarrier);
 	delete priv;
@@ -320,6 +326,10 @@ BackgroundEventLoop::~BackgroundEventLoop() {
 void
 BackgroundEventLoop::start(const string &threadName, unsigned int stackSize) {
 	assert(priv->thr == NULL);
+	ev_async_start(libev_loop, &priv->exitSignaller);
+	if (priv->usesLibuv) {
+		ev_async_start(libev_loop, &priv->libuvActivitySignaller);
+	}
 	priv->thr = new oxt::thread(
 		boost::bind(runBackgroundLoop, this),
 		threadName,

data/src/cxx_supportlib/Constants.h

@@ -121,7 +121,7 @@
 
 	#define PASSENGER_DEFAULT_USER "nobody"
 
-	#define PASSENGER_VERSION "5.0.26"
+	#define PASSENGER_VERSION "5.0.27"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/src/cxx_supportlib/DataStructures/LString.cpp

@@ -0,0 +1,39 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2016 Phusion Holding B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Phusion Holding B.V.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+#include <DataStructures/LString.h>
+
+namespace Passenger {
+
+
+LString::Part emptyLStringPart = {
+	NULL,
+	NULL,
+	"",
+	0
+};
+
+
+}

data/src/cxx_supportlib/DataStructures/LString.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014 Phusion Holding B.V.
+ *  Copyright (c) 2014-2016 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -27,6 +27,8 @@
 #define _PASSENGER_DATA_STRUCTURES_LSTRING_H_
 
 #include <boost/cstdint.hpp>
+#include <oxt/backtrace.hpp>
+#include <stdexcept>
 #include <cstring>
 #include <cassert>
 #include <algorithm>
@@ -48,8 +50,8 @@ using namespace std;
  * we just store the headers non-contiguously using LString. Each LString
  * references the mbuf_block that the HTTP header data comes from.
  *
- * The empty string is repesented by `size == 0 && start == NULL && end == NULL`.
- * Parts may never contain the empty string.
+ * The empty string is represented by `size == 0 && start == &emptyLStringPart && end == &emptyLStringPart`.
+ * Except for emptyLStringPart, parts may never contain the empty string.
  *
  * This struct must be a POD so that we can allocate it with psg_pool_t.
  */
@@ -67,6 +69,8 @@ struct LString {
 	unsigned int size;
 };
 
+extern LString::Part emptyLStringPart;
+
 
 namespace {
 	OXT_FORCE_INLINE char
@@ -87,14 +91,18 @@ inline void psg_lstr_append(LString *str, psg_pool_t *pool, const char *data,
 
 inline void
 psg_lstr_init(LString *str) {
-	str->start = NULL;
-	str->end   = NULL;
+	str->start = &emptyLStringPart;
+	str->end   = &emptyLStringPart;
 	str->size  = 0;
 }
 
 inline LString *
 psg_lstr_create(psg_pool_t *pool, const char *data, unsigned int size) {
 	LString *result = (LString *) psg_palloc(pool, sizeof(LString));
+	if (result == NULL) {
+		TRACE_POINT();
+		throw std::bad_alloc();
+	}
 	psg_lstr_init(result);
 	psg_lstr_append(result, pool, data, size);
 	return result;
@@ -107,7 +115,7 @@ psg_lstr_create(psg_pool_t *pool, const StaticString &str) {
 
 inline void
 psg_lstr_append_part(LString *str, LString::Part *part) {
-	if (str->end == NULL) {
+	if (str->size == 0) {
 		str->start = part;
 		str->end = part;
 	} else {
@@ -121,6 +129,10 @@ psg_lstr_append_part(LString *str, LString::Part *part) {
 inline void
 psg_lstr_append_part_from_another_lstr(LString *str, psg_pool_t *pool, const LString::Part *part) {
 	LString::Part *copy = (LString::Part *) psg_palloc(pool, sizeof(LString::Part));
+	if (copy == NULL) {
+		TRACE_POINT();
+		throw std::bad_alloc();
+	}
 	*copy = *part;
 	if (part->mbuf_block != NULL) {
 		mbuf_block_ref(part->mbuf_block);
@@ -136,6 +148,10 @@ psg_lstr_append(LString *str, psg_pool_t *pool, const MemoryKit::mbuf &buffer,
 		return;
 	}
 	LString::Part *part = (LString::Part *) psg_palloc(pool, sizeof(LString::Part));
+	if (part == NULL) {
+		TRACE_POINT();
+		throw std::bad_alloc();
+	}
 	part->mbuf_block = buffer.mbuf_block;
 	part->data = data;
 	part->size = size;
@@ -154,6 +170,10 @@ psg_lstr_append(LString *str, psg_pool_t *pool, const char *data, unsigned int s
 		return;
 	}
 	LString::Part *part = (LString::Part *) psg_palloc(pool, sizeof(LString::Part));
+	if (part == NULL) {
+		TRACE_POINT();
+		throw std::bad_alloc();
+	}
 	part->next = NULL;
 	part->mbuf_block = NULL;
 	part->data = data;
@@ -173,6 +193,11 @@ psg_lstr_null_terminate(const LString *str, psg_pool_t *pool) {
 	char *data, *pos;
 
 	data = (char *) psg_pnalloc(pool, str->size + 1);
+	if (data == NULL) {
+		TRACE_POINT();
+		throw std::bad_alloc();
+	}
+
 	pos = data;
 	part = str->start;
 	while (part != NULL) {
@@ -183,6 +208,10 @@ psg_lstr_null_terminate(const LString *str, psg_pool_t *pool) {
 	*pos = '\0';
 
 	newstr = (LString *) psg_palloc(pool, sizeof(LString));
+	if (newstr == NULL) {
+		TRACE_POINT();
+		throw std::bad_alloc();
+	}
 	psg_lstr_init(newstr);
 	psg_lstr_append(newstr, pool, data, str->size);
 	return newstr;

data/src/cxx_supportlib/FileDescriptor.h

@@ -139,7 +139,9 @@ public:
 			int e = errno;
 			data = boost::make_shared<SharedData>(fd, autoClose);
 			errno = e;
-			P_LOG_FILE_DESCRIPTOR_OPEN3(fd, file, line);
+			if (file != NULL) {
+				P_LOG_FILE_DESCRIPTOR_OPEN3(fd, file, line);
+			}
 		}
 	}
 

data/src/cxx_supportlib/Integrations/LibevJsonUtils.h

@@ -0,0 +1,92 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2016 Phusion Holding B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Phusion Holding B.V.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+#ifndef _PASSENGER_LIBEV_JSON_UTILS_H_
+#define _PASSENGER_LIBEV_JSON_UTILS_H_
+
+#include <ev.h>
+#include <jsoncpp/json.h>
+#include <cstring>
+#include <ctime>
+#include <Utils/StrIntUtils.h>
+#include <Utils/SystemTime.h>
+
+namespace Passenger {
+
+using namespace std;
+
+
+/**
+ * Encodes the given libev timestamp into a JSON object that
+ * describes it.
+ *
+ *     evTimeToJson(ev_now(loop) - 10);
+ *     // {
+ *     //   "timestamp": 1424887842,
+ *     //   "local": "Wed Feb 25 19:10:34 CET 2015",
+ *     //   "relative_timestamp": -10,
+ *     //   "relative": "10s ago"
+ *     // }
+ */
+inline Json::Value
+evTimeToJson(ev_tstamp evTime, ev_tstamp evNow, unsigned long long now = 0) {
+	if (evTime <= 0) {
+		return Json::Value(Json::nullValue);
+	}
+
+	if (now == 0) {
+		now = SystemTime::getUsec();
+	}
+
+	Json::Value doc;
+	unsigned long long wallClockTimeUsec = now
+		+ (evTime - evNow) * 1000000ull;
+	time_t wallClockTime = (time_t) (wallClockTimeUsec / 1000000ull);
+	char buf[32];
+	size_t len;
+
+	ctime_r(&wallClockTime, buf);
+	len = strlen(buf);
+	if (len > 0) {
+		// Get rid of trailing newline
+		buf[len - 1] = '\0';
+	}
+
+	doc["timestamp"] = wallClockTimeUsec / 1000000.0;
+	doc["local"] = buf;
+
+	doc["relative_timestamp"] = evTime - evNow;
+	if (evTime > evNow) {
+		doc["relative"] = distanceOfTimeInWords(evTime, evNow) + " from now";
+	} else {
+		doc["relative"] = distanceOfTimeInWords(evTime, evNow) + " ago";
+	}
+	return doc;
+}
+
+
+} // namespace Passenger
+
+#endif /* _PASSENGER_LIBEV_JSON_UTILS_H_ */

data/src/cxx_supportlib/ResourceLocator.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 Phusion Holding B.V.
+ *  Copyright (c) 2010-2016 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -52,7 +52,7 @@ using namespace boost;
  */
 class ResourceLocator {
 private:
-	string root;
+	string installSpec;
 	string binDir;
 	string supportBinariesDir;
 	string helperScriptsDir;
@@ -81,9 +81,11 @@ private:
 public:
 	ResourceLocator() { }
 
-	ResourceLocator(const string &installSpec) {
-		if (getFileType(installSpec) == FT_REGULAR) {
-			const string &file = installSpec;
+	ResourceLocator(const string &_installSpec)
+		: installSpec(_installSpec)
+	{
+		if (getFileType(_installSpec) == FT_REGULAR) {
+			const string &file = _installSpec;
 			IniFileSectionPtr options = IniFile(file).section("locations");
 			binDir              = getOption(file, options, "bin_dir");
 			supportBinariesDir  = getOption(file, options, "support_binaries_dir");
@@ -94,7 +96,7 @@ public:
 			nodeLibDir          = getOption(file, options, "node_libdir");
 			buildSystemDir      = getOptionalSection(file, options, "node_libdir");
 		} else {
-			const string &root = installSpec;
+			const string &root = _installSpec;
 			binDir              = root + "/bin";
 			supportBinariesDir  = root + "/buildout/support-binaries";
 			helperScriptsDir    = root + "/src/helper-scripts";
@@ -106,8 +108,8 @@ public:
 		}
 	}
 
-	const string &getRoot() const {
-		return root;
+	const string &getInstallSpec() const {
+		return installSpec;
 	}
 
 	const string &getBinDir() const {

data/src/cxx_supportlib/ServerKit/CookieUtils.h

@@ -59,6 +59,10 @@ findCookie(psg_pool_t *pool, const LString *cookieHeaderValue, const LString *na
 	bool done = part == NULL;
 	LString *result = NULL;
 
+	if (cookieHeaderValue->size == 0) {
+		return NULL;
+	}
+
 	while (!done) {
 		if (findCookieNameValueSeparator(part, index, &separatorPart, &separatorIndex)) {
 			if (!findCookieEnd(separatorPart, separatorIndex, &endPart, &endIndex)) {

data/src/cxx_supportlib/ServerKit/FileBufferedChannel.h

@@ -1028,6 +1028,7 @@ private:
 
 		if (req->result == UV_ECANCELED) {
 			uv_fs_req_cleanup(req);
+			free(req);
 			delete fcContext;
 			return;
 		}
@@ -1042,6 +1043,7 @@ private:
 		}
 
 		uv_fs_req_cleanup(req);
+		free(req);
 		delete fcContext;
 	}
 

data/src/cxx_supportlib/ServerKit/HttpServer.h

@@ -43,6 +43,7 @@
 #include <ServerKit/HttpHeaderParser.h>
 #include <ServerKit/HttpChunkedBodyParser.h>
 #include <Algorithms/MovingAverage.h>
+#include <Integrations/LibevJsonUtils.h>
 #include <Utils/SystemTime.h>
 #include <Utils/StrIntUtils.h>
 #include <Utils/HttpConstants.h>
@@ -1227,6 +1228,9 @@ public:
 		doc["http_state"] = req->getHttpStateString();
 
 		if (req->begun()) {
+			ev_tstamp evNow = ev_now(this->getLoop());
+			unsigned long long now = SystemTime::getUsec();
+
 			doc["http_major"] = req->httpMajor;
 			doc["http_minor"] = req->httpMinor;
 			doc["want_keep_alive"] = req->wantKeepAlive;
@@ -1234,8 +1238,8 @@ public:
 			doc["request_body_fully_read"] = req->bodyFullyRead();
 			doc["request_body_already_read"] = (Json::Value::UInt64) req->bodyAlreadyRead;
 			doc["response_begun"] = req->responseBegun;
-			doc["last_data_receive_time"] = timeToJson(req->lastDataReceiveTime * 1000000);
-			doc["last_data_send_time"] = timeToJson(req->lastDataSendTime * 1000000);
+			doc["last_data_receive_time"] = evTimeToJson(req->lastDataReceiveTime, evNow, now);
+			doc["last_data_send_time"] = evTimeToJson(req->lastDataSendTime, evNow, now);
 			doc["method"] = http_method_str(req->method);
 			if (req->httpState != Request::ERROR) {
 				if (req->bodyType == Request::RBT_CONTENT_LENGTH) {