passenger 5.0.19 → 5.0.20

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDc5ZmMyZjkyOTcwYTE3YmVlZDZlZDRlM2UyMGY1ZDUwNDIxNjBlMw==
+    OGU3ZWRlNTY4YTI4N2JiYjg2M2U2YTlmMjg0OTEwNWU1M2JkZWRjMQ==
   data.tar.gz: !binary |-
-    MzIxYTE0ZDg0NTdlNmQyN2ZhZjE3NmI4ZDM0YTBhZDQyYmZhMTNhYQ==
+    NGFhZjc4YWI1MTNhZTU5NTk3ZGY2MWZkYmUwZjZmMDBhNDdmODk4Nw==
 SHA512:
   metadata.gz: !binary |-
-    MjEyNzVjMDJkMzkxYjk5OWM2NzQxMjcwYmRjYzI2YTY2MjU3YTgwMDhlZGIz
-    OGEyYmMzYjBkOGRhNDg3YTExY2U5MTdiZGIwMDQ4NTJkOTUwYzY0ZWMyMWE2
-    OTE0MzMyNDRjMTI1MzA5NjliZDRiZDVjMWExMmRmNDVkZDFhMDI=
+    NDA0ZmIyNmY2ODQ0ODdhMDlkNzkzODgwNjk1MTQ1ZTc0ODhmZDdjNDRkOWI2
+    OWMyYTM4ZmIyZjA3NTQ3NmRiMTM2NjNmMmNmNmJkZjliODg3MDQ0M2FiZjIy
+    NDYyNzY1ZTBhMmQ3MWMyZDM0MDdhOTVmOTczZjNmMTNjOWQxZjI=
   data.tar.gz: !binary |-
-    NDM4Zjk2N2FkOTViNmE0YzI0ZTJjNTlhYmU3M2M5MzUzYmFjY2M1MjFkZjhi
-    YTMzOWViZDQxMTNhZDk3ZGVjYjA2ZGY0MDFiYWRiNDA5MTc5OWRjNjg1ZTU1
-    YmZhNmJjYTg1NDU4YTdjMDk4YTU2MjQxNGExZDM2M2NlMDlkZmM=
+    NDU4YjAxNzc4YTIxODNiYTRjYjY4Y2VkNWZhYTY0ZWU2ZWQyODE0MGI1NDJh
+    MDJkYjg4NDgzOTdmYmNkMTcyYjkzMWVkM2QyOTg0MWI0MjQ0MWRjNTFkM2Zl
+    NDMzODhjZmE3NTAzN2FhMWM4MjUwYzE2OWJhYmZlODJjNGYzMzI=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJWA7ACAAoJECrHRaUKISqMhsMH/1v7Wd/pi016ufbPzUAP47kR
-0OUx+LRS46aBqH6+b1nkDS00XZTyQyU3lfkUNCfvq+e5q9Ct64Fh6E09JxQl5Fzf
-dzjGtOqKFkWKC1FsJHzL0v8srqZ8UJXJMymRgJUmq3/txK79NCiqFf1YjiD6CKOX
-0dzhFHAvLOO4iRw2N4ntAWYwcrwGjy9+Dkpmijgc9Q+IpBn+4UYiDXeMLp1VD3s1
-n/+QmzJH/Wn+gXO5lPvN6V1zW2+7S486CASC6A1qF23TJYG6A4obPTRV8jN8G0BJ
-zXrojyRe+U8HKcWsYws9rVGl0GklTajTvEBTjJuxJYr7lSVouzf0C7cyOpW4bLo=
-=aqnU
+iQEcBAABAgAGBQJWBVguAAoJECrHRaUKISqM9UYH/Rex0SrCvVUTeChbuA/c4qSK
+r6Kt0FDl+krahxG3FReSg0sIB86uvUL0r8Axqd32VnOIpbYBgmzBw3+RKW9p15Cg
+UGpeKpphF+vV42V8pJTTbfOzqLmkVZdiqXj8bStOD5HGguIKUJSQlO1vgT1dXiMu
+SXZVl+2l7yredGoh/J+NxGdLVrXGyHsR9SK2/aOWayC/271jl1038ATIjLpg5Sx4
+mH0WBDCjbj7EE2dLG9ihsd9O6FRQLc2LHkenqULzbJasOEWBUmiI4UMmGhSuRa/+
++NPpYdok38hYlHBzClyXOV/7AmMLG97MBZOa6X/Dall5v/lCMpVhdpJHJzrzO7E=
+=55ZZ
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJWA7ACAAoJECrHRaUKISqMhRUH/iTg+aF3zM3Gin7BWOGBGjnw
-YkMKTmkJOzd9Nv/jDzVhUTK+cW3gY7wdHjNVaG7uaHOm2aTkT0YmRuy8fUeTF9mb
-rnFwWIuroRTncqCyl8M1IuF1LEZ1tTYWICkcO3/aQjR2bp3ujYPCYlMhE4az7DGH
-lFNQzFi2O8FrkPMri8fJyBKAdlJMeiu8qj1TqWs5CsjxqXD146dDyVQy9ABFc051
-Rgcu5KmCo5wkRZ2kTYtcNgUQT53VjkJ1B0Pr4lWf1QEUARbVGiPlALnBIHo9Agg2
-aYVEV+iMQl5jfqSZtozvg3KLRNNMrpQjPu6EZR/3yaiJnvy7EjoD+DXY2DJEe2A=
-=AFTj
+iQEcBAABAgAGBQJWBVguAAoJECrHRaUKISqMnD0H/RmCI5vqS9MtfHzF9CRTJ8mG
+2izv4FJ6Te1JU272ZijuVR9A62lT5bdsaJQG93Gm6XVmQEFuMSeM9rlyB96F0UfP
+Bc47/Bt5mRd1S5TxK67bhQKifmjt9601uD1GgXa4cqiYLtYDcOQFY5YR52uj8U1A
+13GxzAWWEfqHxhMFR6IGSErYLhqtwy7g24DnyQtmHhn5qy2eL0ECnshczMoah6FI
+4rgPH7cY86LiRugDBAKq9Jp4KgBfIU7i2pKkgtUzE4PVVirq9ZeqdBpQGIiznMHX
+glxwM2XGuXm0/8K8N2iMefULIU9XUPmYxA6+1wADIC0KK5fp0Ai6vThFrI/+dko=
+=1Jp0
 -----END PGP SIGNATURE-----

data/CHANGELOG

@@ -1,3 +1,11 @@
+Release 5.0.20
+--------------
+
+ * Fixes memory management bugs in Union Station support.
+ * Improves the error handling in Union Station support.
+ * `passenger-config validate-install` now properly handles CR characters in Apache configuration files.
+
+
 Release 5.0.19
 --------------
 

data/src/agent/UstRouter/Controller.h

@@ -191,11 +191,21 @@ private:
 		int errcode)
 	{
 		size_t consumed = client->arrayReader.feed(buffer.start, buffer.size());
+
+		if (client->arrayReader.hasError()) {
+			disconnectWithError(&client,
+				string("Error processing message: array message parse error: ")
+				+ client->arrayReader.errorString());
+			return Channel::Result(consumed, true);
+		}
+
 		if (client->arrayReader.done()) {
+			// No error
 			const vector<StaticString> &message = client->arrayReader.value();
 			SKC_DEBUG(client, "Message received: " << toString(message));
 			if (message.size() < 1) {
-				disconnectWithError(&client, "Error processing message: too few parameters");
+				disconnectWithError(&client, "Error processing message:"
+					" too few parameters");
 				return Channel::Result(consumed, true);
 			}
 
@@ -209,7 +219,16 @@ private:
 		int errcode)
 	{
 		size_t consumed = client->scalarReader.feed(buffer.start, buffer.size());
+
+		if (client->scalarReader.hasError()) {
+			disconnectWithError(&client,
+				string("Error processing message: scalar message parse error: ")
+				+ client->scalarReader.errorString());
+			return Channel::Result(consumed, true);
+		}
+
 		if (client->scalarReader.done()) {
+			// No error
 			processLogMessageBody(client, client->scalarReader.value());
 			client->scalarReader.reset();
 		}
@@ -308,6 +327,23 @@ private:
 	void processLogMessageBody(Client *client, const StaticString &body) {
 		// In here we process the scalar message that's expected to come
 		// after the "log" command.
+
+		if (getLogLevel() == LVL_DEBUG) {
+			string truncatedBody;
+			if (body.size() > 97) {
+				string truncatedBody = body.substr(0, 97);
+				truncatedBody.append("...");
+				SKC_DEBUG(client, "Processing message body (" << body.size() <<
+					" bytes): " << truncatedBody);
+			} else {
+				SKC_DEBUG(client, "Processing message body (" << body.size() <<
+					" bytes): " << body);
+			}
+		} else if (getLogLevel() >= LVL_DEBUG2) {
+			SKC_TRACE(client, 2, "Processing message body (" << body.size() <<
+				" bytes): " << body);
+		}
+
 		writeLogEntry(client,
 			client->logCommandParams.transaction,
 			client->logCommandParams.timestamp,
@@ -999,7 +1035,7 @@ protected:
 	virtual void reinitializeClient(Client *client, int fd) {
 		ParentClass::reinitializeClient(client, fd);
 		client->arrayReader.setMaxSize(1024 * 16);
-		client->scalarReader.setMaxSize(1024 * 128);
+		client->scalarReader.setMaxSize(1024 * 1024);
 		client->state = Client::READING_AUTH_USERNAME;
 		client->type = Client::UNINITIALIZED;
 	}

data/src/agent/UstRouter/DataStoreId.h

@@ -56,6 +56,13 @@ private:
 	}
 
 public:
+	DataStoreId()
+		: id(NULL),
+		  groupNameSize(0),
+		  nodeNameSize(0),
+		  categorySize(0)
+		{ }
+
 	DataStoreId(const StaticString &groupName, const StaticString &nodeName,
 		const StaticString &category)
 	{
@@ -87,13 +94,12 @@ public:
 		*end = '\0';
 	}
 
-	DataStoreId() {
-		id = NULL;
-	}
-
 	DataStoreId(const DataStoreId &other) {
 		if (other.id == NULL) {
 			id = NULL;
+			groupNameSize = 0;
+			nodeNameSize = 0;
+			categorySize = 0;
 		} else {
 			id = new char[other.totalSize()];
 			memcpy(id, other.id, other.totalSize());
@@ -104,17 +110,17 @@ public:
 	}
 
 	~DataStoreId() {
-		delete id;
+		delete[] id;
 	}
 
 	DataStoreId &operator=(const DataStoreId &other) {
 		if (other.id == NULL) {
-			delete id;
+			delete[] id;
 			id = NULL;
 			return *this;
 		} else {
 			if (totalSize() != other.totalSize()) {
-				delete id;
+				delete[] id;
 				id = NULL;
 			}
 			if (id == NULL) {

data/src/agent/UstRouter/RemoteSender.h

@@ -73,6 +73,34 @@ private:
 	};
 
 	class Server {
+	public:
+		enum SendResult {
+			/**
+			 * The gateway accepted the packet.
+			 */
+			SR_OK,
+
+			/**
+			 * Unable to contact the gateway: it appears to be down.
+			 * Unable to obtain a valid HTTP response from the gateway.
+			 */
+			SR_DOWN,
+
+			/**
+			 * We were able to contact the gateway, but it appears to be
+			 * responding with gibberish. It might be so that the gateway
+			 * machine is up, but the actual service running inside is
+			 * down or malfunctioning.
+			 */
+			SR_MALFUNCTION,
+
+			/**
+			 * We were able to contact the gateway, but the
+			 * rejected the packet by responding with an error.
+			 */
+			SR_REJECTED
+		};
+
 	private:
 		string ip;
 		unsigned short port;
@@ -88,7 +116,14 @@ private:
 		string pingURL;
 		string sinkURL;
 
+		mutable boost::mutex syncher;
 		string lastErrorMessage;
+		unsigned long long lastErrorTime;
+		unsigned long long lastSuccessTime;
+		unsigned int pingErrors;
+		unsigned int packetsAccepted;
+		unsigned int packetsRejected;
+		unsigned int packetsDropped;
 
 		void resetConnection() {
 			if (curl != NULL) {
@@ -146,7 +181,7 @@ private:
 			}
 		}
 
-		bool handleSendResponse() {
+		SendResult handleSendResponse(const Item &item) {
 			Json::Reader reader;
 			Json::Value response;
 			long httpCode = -1;
@@ -154,42 +189,88 @@ private:
 			curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &httpCode);
 
 			if (!reader.parse(responseBody, response, false) || !validateResponse(response)) {
-				lastErrorMessage = "The Union Station gateway server "
-					+ ip + " encountered an error while processing sent analytics data. "
-					"It sent an invalid response (parse error: "
-					+ reader.getFormattedErrorMessages()
+				setRequestError(
+					"The Union Station gateway server " + ip +
+					" encountered an error while processing sent analytics data. "
+					"It sent an invalid response. Key: " + item.unionStationKey
+					+ ". Parse error: " + reader.getFormattedErrorMessages()
 					+ "; HTTP code: " + toString(httpCode)
-					+ "; data: \"" + cEscapeString(responseBody) + "\")";
-				P_ERROR(lastErrorMessage);
-				return false;
+					+ "; data: \"" + cEscapeString(responseBody) + "\"");
+				return SR_MALFUNCTION;
 			} else if (response["status"].asString() == "ok") {
 				if (httpCode == 200) {
-					P_DEBUG("The Union Station gateway server " << ip << " accepted the packet.");
-					return true;
+					handleResponseSuccess();
+					P_DEBUG("The Union Station gateway server " << ip
+						<< " accepted the packet. Key: "
+						<< item.unionStationKey);
+					return SR_OK;
 				} else {
-					lastErrorMessage = "The Union Station gateway server "
-						+ ip + " encountered an error while processing sent "
-						"analytics data. It sent an invalid response "
-						"(HTTP code: " + toString(httpCode)
-						+ "; data: \"" + cEscapeString(responseBody) + "\")";
-					P_ERROR(lastErrorMessage);
-					return false;
+					setRequestError(
+						"The Union Station gateway server " + ip
+						+ " encountered an error while processing sent "
+						"analytics data. It sent an invalid response. Key: "
+						+ item.unionStationKey + ". HTTP code: "
+						+ toString(httpCode) + ". Data: \""
+						+ cEscapeString(responseBody) + "\"");
+					return SR_MALFUNCTION;
 				}
 			} else {
 				// response == error
-				lastErrorMessage = "The Union Station gateway server "
+				setPacketRejectedError(
+					"The Union Station gateway server "
 					+ ip + " did not accept the sent analytics data. "
-					"Error message: " + response["message"].asString();
-				P_ERROR(lastErrorMessage);
-				// Return value of true is intentional. See comment for send().
-				return true;
+					"Key: " + item.unionStationKey + ". "
+					"Error: " + response["message"].asString());
+				return SR_REJECTED;
 			}
 		}
 
-		void handleSendError() {
-			lastErrorMessage = "Could not send data to Union Station gateway server " +
-				ip + ": " + lastCurlErrorMessage;
-			P_ERROR(lastErrorMessage);
+		void handleSendError(const Item &item) {
+			setRequestError(
+				"Could not send data to Union Station gateway server " +
+				ip + ". It might be down. Key: " + item.unionStationKey +
+				". Error: " + lastCurlErrorMessage);
+		}
+
+		void setPingError(const string &message) {
+			boost::lock_guard<boost::mutex> l(syncher);
+			P_INFO(message);
+			setLastErrorMessage(message);
+			pingErrors++;
+		}
+
+		/**
+		 * Handles the case when SendResult == SR_DOWN
+		 * or SendResult == SR_MALFUNCTION.
+		 * See SendResult comments for notes.
+		 */
+		void setRequestError(const string &message) {
+			boost::lock_guard<boost::mutex> l(syncher);
+			P_ERROR(message);
+			setLastErrorMessage(message);
+			packetsDropped++;
+		}
+
+		/**
+		 * Handles the case when SendResult == SR_REJECTED.
+		 * See SendResult comments for notes.
+		 */
+		void setPacketRejectedError(const string &message) {
+			boost::lock_guard<boost::mutex> l(syncher);
+			P_ERROR(message);
+			setLastErrorMessage(message);
+			packetsRejected++;
+		}
+
+		void setLastErrorMessage(const string &message) {
+			lastErrorMessage = message;
+			lastErrorTime = SystemTime::getUsec();
+		}
+
+		void handleResponseSuccess() {
+			boost::lock_guard<boost::mutex> l(syncher);
+			lastSuccessTime = SystemTime::getUsec();
+			packetsAccepted++;
 		}
 
 		static size_t curlDataReceived(void *buffer, size_t size, size_t nmemb, void *userData) {
@@ -199,12 +280,12 @@ private:
 		}
 
 	public:
-		Server(const string &ip, const string &hostName, unsigned short port, const string &cert,
-			const CurlProxyInfo *proxyInfo)
+		Server(const string &ip, const string &hostName, unsigned short port,
+			const string &cert, const CurlProxyInfo *proxyInfo)
 		{
 			this->ip = ip;
 			this->port = port;
-			certificate = cert;
+			this->certificate = cert;
 			this->proxyInfo = proxyInfo;
 
 			hostHeader = "Host: " + hostName;
@@ -222,6 +303,12 @@ private:
 				"/sink";
 
 			curl = NULL;
+			lastErrorTime = 0;
+			lastSuccessTime = 0;
+			pingErrors = 0;
+			packetsAccepted = 0;
+			packetsRejected = 0;
+			packetsDropped = 0;
 			resetConnection();
 		}
 
@@ -243,32 +330,24 @@ private:
 
 			curl_easy_setopt(curl, CURLOPT_HTTPGET, 1);
 			if (curl_easy_perform(curl) != 0) {
-				lastErrorMessage = "Could not ping Union Station gateway server " +
-					ip + ": " + lastCurlErrorMessage;
-				P_INFO(lastErrorMessage);
+				setPingError(
+					"Could not ping Union Station gateway server " +
+					ip + ": " + lastCurlErrorMessage);
 				return false;
 			}
 			if (responseBody == "pong") {
 				guard.clear();
 				return true;
 			} else {
-				lastErrorMessage = "Union Station gateway server " + ip +
+				setPingError(
+					"Union Station gateway server " + ip +
 					" returned an unexpected ping message: " +
-					responseBody;
-				P_INFO(lastErrorMessage);
+					responseBody);
 				return false;
 			}
 		}
 
-		/** Returns true if the server is up, false if the server is down.
-		 * The return value does NOT indicate whether the server accepted the data!
-		 * Thus, if (for example) the Union Station key is invalid or disabled,
-		 * but the connection is fine, then this method still returns true.
-		 * This is because the return value is used to determine whether a different
-		 * gateway server should be used. If the server is up but rejects the data
-		 * then we'll want the code to keep sending future packets.
-		 */
-		bool send(const Item &item) {
+		SendResult send(const Item &item) {
 			ScopeGuard guard(boost::bind(&Server::resetConnection, this));
 			prepareRequest(sinkURL);
 
@@ -320,21 +399,41 @@ private:
 
 			if (code == CURLE_OK) {
 				guard.clear();
-				return handleSendResponse();
+				return handleSendResponse(item);
 			} else {
-				handleSendError();
-				return false;
+				handleSendError(item);
+				return SR_DOWN;
 			}
 		}
 
 		Json::Value inspectStateAsJson() const {
-			Json::Value doc;
-			doc["ip"] = ip;
-			doc["port"] = port;
+			Json::Value doc, errorDoc;
+			doc["sink_url"] = sinkURL;
 			doc["ping_url"] = pingURL;
+
+			boost::lock_guard<boost::mutex> l(syncher);
+
+			if (lastErrorTime == 0) {
+				doc["last_error_time"] = Json::Value(Json::nullValue);
+			} else {
+				doc["last_error_time"] = timeToJson(lastErrorTime);
+			}
 			if (!lastErrorMessage.empty()) {
 				doc["last_error_message"] = lastErrorMessage;
 			}
+			if (lastSuccessTime == 0) {
+				doc["last_success_time"] = Json::Value(Json::nullValue);
+			} else {
+				doc["last_success_time"] = timeToJson(lastSuccessTime);
+			}
+
+			errorDoc["ping_errors"] = pingErrors;
+			errorDoc["packets_dropped"] = packetsDropped;
+			errorDoc["packets_rejected"] = packetsRejected;
+
+			doc["errors"] = errorDoc;
+			doc["packets_accepted"] = packetsAccepted;
+
 			return doc;
 		}
 	};
@@ -353,7 +452,7 @@ private:
 	vector<ServerPtr> downServers;
 	time_t lastCheckupTime, nextCheckupTime;
 	string lastDnsErrorMessage;
-	unsigned int packetsSent, packetsDropped;
+	unsigned int packetsAccepted, packetsRejected, packetsDropped;
 
 	void threadMain() {
 		ScopeGuard guard(boost::bind(&RemoteSender::freeThreadData, this));
@@ -417,8 +516,9 @@ private:
 		P_INFO(ips.size() << " Union Station gateway servers found");
 
 		for (it = ips.begin(); it != ips.end(); it++) {
-			ServerPtr server = boost::make_shared<Server>(*it, gatewayAddress, gatewayPort,
-				certificate, &proxyInfo);
+			ServerPtr server = boost::make_shared<Server>(
+				*it, gatewayAddress, gatewayPort, certificate,
+				&proxyInfo);
 			if (server->ping()) {
 				upServers.push_back(server);
 			} else {
@@ -479,29 +579,36 @@ private:
 
 	void sendOut(const Item &item) {
 		boost::unique_lock<boost::mutex> l(syncher);
-		bool sent = false;
-		bool someServersWentDown = false;
+		bool done = false;
+		bool accepted = false;
+		bool rejected = false;
 
-		while (!sent && !upServers.empty()) {
+		while (!done && !upServers.empty()) {
 			// Pick first available server and put it on the back of the list
 			// for round-robin load balancing.
 			ServerPtr server = upServers.front();
+
 			l.unlock();
-			if (server->send(item)) {
-				l.lock();
+			Server::SendResult result = server->send(item);
+			l.lock();
+
+			if (result == Server::SR_OK) {
+				upServers.pop_front();
+				upServers.push_back(server);
+				accepted = true;
+				done = true;
+			} else if (result == Server::SR_REJECTED) {
 				upServers.pop_front();
 				upServers.push_back(server);
-				sent = true;
-				packetsSent++;
+				rejected = true;
+				done = true;
 			} else {
-				l.lock();
 				upServers.pop_front();
 				downServers.push_back(server);
-				someServersWentDown = true;
 			}
 		}
 
-		if (someServersWentDown) {
+		if (!downServers.empty()) {
 			if (upServers.empty()) {
 				scheduleNextCheckup(5 * 60);
 			} else {
@@ -509,13 +616,21 @@ private:
 			}
 		}
 
-		/* If all servers went down then all items in the queue will be
-		 * effectively dropped until after the next checkup has detected
-		 * servers that are up.
-		 */
-		if (!sent) {
+		if (accepted) {
+			packetsAccepted++;
+		} else if (rejected) {
+			packetsRejected++;
+		} else {
 			packetsDropped++;
-			l.unlock();
+		}
+		l.unlock();
+
+		if (!accepted && !rejected) {
+			assert(upServers.empty());
+			/* If all servers went down then all items in the queue will be
+			 * effectively dropped until after the next checkup has detected
+			 * servers that are up.
+			 */
 			P_WARN("Dropping Union Station packet because no servers are"
 				" available. Run `passenger-status --show=union_station` to"
 				" view server status. Details of dropped packet:"
@@ -583,8 +698,8 @@ private:
 	}
 
 public:
-	RemoteSender(const string &gatewayAddress, unsigned short gatewayPort, const string &certificate,
-		const string &proxyAddress)
+	RemoteSender(const string &gatewayAddress, unsigned short gatewayPort,
+		const string &certificate, const string &proxyAddress)
 		: queue(1024)
 	{
 		TRACE_POINT();
@@ -599,7 +714,8 @@ public:
 		}
 		lastCheckupTime = 0;
 		nextCheckupTime = 0;
-		packetsSent = 0;
+		packetsAccepted = 0;
+		packetsRejected = 0;
 		packetsDropped = 0;
 		thr = new oxt::thread(
 			boost::bind(&RemoteSender::threadMain, this),
@@ -667,7 +783,8 @@ public:
 		doc["up_servers"] = inspectUpServersStateAsJson();
 		doc["down_servers"] = inspectDownServersStateAsJson();
 		doc["queue_size"] = queue.size();
-		doc["packets_sent_to_gateway"] = packetsSent;
+		doc["packets_accepted"] = packetsAccepted;
+		doc["packets_rejected"] = packetsRejected;
 		doc["packets_dropped"] = packetsDropped;
 		if (certificate.empty()) {
 			doc["certificate"] = Json::nullValue;
@@ -678,13 +795,13 @@ public:
 			doc["last_server_checkup_time"] = Json::Value(Json::nullValue);
 			doc["last_server_checkup_time_note"] = "not yet started";
 		} else {
-			doc["last_server_checkout_time"] = timeToJson(lastCheckupTime * 1000000.0);
+			doc["last_server_checkup_time"] = timeToJson(lastCheckupTime * 1000000.0);
 		}
 		if (nextCheckupTime == 0) {
 			doc["next_server_checkup_time"] = Json::Value(Json::nullValue);
 			doc["next_server_checkup_time_note"] = "not yet scheduled, waiting for first packet";
 		} else {
-			doc["next_server_checkout_time"] = timeToJson(nextCheckupTime * 1000000.0);
+			doc["next_server_checkup_time"] = timeToJson(nextCheckupTime * 1000000.0);
 		}
 		if (!lastDnsErrorMessage.empty()) {
 			doc["last_dns_error_message"] = lastDnsErrorMessage;

data/src/agent/Watchdog/UstRouterWatcher.cpp

@@ -37,9 +37,16 @@ protected:
 	}
 
 	virtual void execProgram() const {
-		execl(agentFilename.c_str(), AGENT_EXE, "ust-router",
-			// Some extra space to allow the child process to change its process title.
-			"                                                ", (char *) 0);
+		if (hasEnvOption("PASSENGER_RUN_UST_ROUTER_IN_VALGRIND", false)) {
+			execlp("valgrind", "valgrind", "--dsymutil=yes", "--track-origins=yes", "--leak-check=full",
+				agentFilename.c_str(), "ust-router",
+				// Some extra space to allow the child process to change its process title.
+				"                                                ", (char *) 0);
+		} else {
+			execl(agentFilename.c_str(), AGENT_EXE, "ust-router",
+				// Some extra space to allow the child process to change its process title.
+				"                                                ", (char *) 0);
+		}
 	}
 
 	virtual void sendStartupArguments(pid_t pid, FileDescriptor &fd) {

data/src/cxx_supportlib/Constants.h

@@ -118,7 +118,7 @@
 
 	#define PASSENGER_DEFAULT_USER "nobody"
 
-	#define PASSENGER_VERSION "5.0.19"
+	#define PASSENGER_VERSION "5.0.20"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/src/cxx_supportlib/MessageReadersWriters.h

@@ -433,6 +433,7 @@ public:
 		}
 		headerReader.reset();
 		buffer.clear();
+		result = StaticString();
 	}
 
 	size_t feed(const char *data, size_t size) {

data/src/cxx_supportlib/Utils/StrIntUtils.cpp

@@ -589,7 +589,11 @@ cEscapeString(const StaticString &input) {
 		char c = *current;
 		if (c >= 32 && c <= 126) {
 			// Printable ASCII.
-			result.append(1, c);
+			if (c == '"') {
+				result.append("\"");
+			} else {
+				result.append(1, c);
+			}
 		} else {
 			char buf[sizeof("000")];
 			unsigned int size;

data/src/ruby_supportlib/phusion_passenger.rb

@@ -30,7 +30,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h' after changing this number.
-  VERSION_STRING = '5.0.19'
+  VERSION_STRING = '5.0.20'
 
   PREFERRED_NGINX_VERSION = '1.8.0'
   NGINX_SHA256_CHECKSUM = '23cca1239990c818d8f6da118320c4979aadf5386deda691b1b7c2c96b9df3d5'

data/src/ruby_supportlib/phusion_passenger/config/validate_install_command.rb

@@ -505,6 +505,9 @@ module PhusionPassenger
             f.read.split("\n")
           end
           lines.each do |line|
+            # Get rid of trailing CR
+            line = line.strip
+
             if line !~ /^[\s\t]*#/ && line =~ /LoadModule[\s\t]+passenger_module[\s\t]+(.*)/
               module_path = $1
               occurrences += 1

data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core/README.md

@@ -28,7 +28,7 @@ If your application is a Rails application, then you should use the [union_stati
 
 ### Using with Passenger
 
-**Note: This documentation section only applies to Passenger X.X.X or later!**
+**Note: This documentation section only applies to Passenger 5.0.20 or later!**
 
 If you use [Passenger](https://www.phusionpassenger.com/), then you do not need to install the `union_station_hooks_core` gem. `union_station_hooks_core` is bundled with Passenger.
 

data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core/Rakefile

@@ -1,6 +1,29 @@
+#  Union Station - https://www.unionstationapp.com/
+#  Copyright (c) 2015 Phusion Holding B.V.
+#
+#  "Union Station" and "Passenger" are 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.
+
 require 'shellwords'
 
-TRAVIS_PASSENGER_BRANCH = 'ust_router_rewrite'
+TRAVIS_PASSENGER_BRANCH = 'master'
 
 desc 'Run tests'
 task :spec do

data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core.rb

@@ -42,7 +42,7 @@ end
 
 # The UnionStationHooks module is the entry point to the
 # `union_station_hooks_core` gem's public API. Note that this API is only
-# available since Passenger X.X.X!
+# available since Passenger 5.0.20!
 #
 # **_Not familiar with `union_station_hooks_core`? Please read the
 # [README](https://github.com/phusion/union_station_hooks_core)

data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/version_data.rb

@@ -39,6 +39,6 @@
 {
   :major  => 2,
   :minor  => 0,
-  :tiny   => 0,
-  :string => '2.0.0'
+  :tiny   => 1,
+  :string => '2.0.1'
 }

data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_rails/README.md

@@ -1,4 +1,4 @@
-# Union Station Ruby hooks core
+# Union Station Ruby hooks rails
 
 [![Build Status](https://travis-ci.org/phusion/union_station_hooks_rails.svg?branch=master)](https://travis-ci.org/phusion/union_station_hooks_rails)
 
@@ -23,7 +23,7 @@
 
 ### Using with Passenger
 
-**Note: This documentation section only applies to Passenger X.X.X or later!**
+**Note: This documentation section only applies to Passenger 5.0.20 or later!**
 
 If you use [Passenger](https://www.phusionpassenger.com/), then you do not need to install the `union_station_hooks_rails` gem. `union_station_hooks_rails` is bundled with Passenger.
 
@@ -87,11 +87,11 @@ It is currently not possible to use Union Station without Passenger. If you woul
 
 ## Legacy code
 
-Before Passenger X.X.X, the Union Station setup instructions used to tell you to create a `config/initializers/passenger.rb` in which you call the following code:
+Before Passenger 5.0.20, the Union Station setup instructions used to tell you to create a `config/initializers/passenger.rb` in which you call the following code:
 
     PhusionPassenger.install_framework_extensions! if defined?(PhusionPassenger)
 
-Since Passenger X.X.X, `PhusionPassenger.install_framework_extensions!` has become an alias for `UnionStationHooks.initialize!`, but the former is considered deprecated. Please replace the above code with:
+Since Passenger 5.0.20, `PhusionPassenger.install_framework_extensions!` has become an alias for `UnionStationHooks.initialize!`, but the former is considered deprecated. Please replace the above code with:
 
     if defined?(UnionStationHooks)
       UnionStationHooks.initialize!

data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_rails/Rakefile

@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-TRAVIS_PASSENGER_BRANCH = 'ust_router_rewrite'
+TRAVIS_PASSENGER_BRANCH = 'master'
 
 if defined?(Bundler)
   # Undo Bundler environment so that calls to 'bundle install' won't try to

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 5.0.19
+  version: 5.0.20
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJWA7ACAAoJECrHRaUKISqM+rsIALHKdaseCTlPU8SRc1HEnQpJ
-Uha8cRLPB0ljub3xbMK6LPzPNdSF/5KN6TRYW6hFqsCmPTUmNiZ+fkK2c8z3NCyV
-G7sQHlN8qF47rNqejKlavQPKDUMKSWduvwzRsv0IEJgi2AABxmXrJF/POPB6zt9P
-JMIuMJGZURx5jFbt0216laOhteZ6vJPoD5kXHzJoKGQhSRwiLoQvCFcsrNR3GUt3
-zXPB7j4yF8ZpdxJE43PmiWz7qRcozQ0xAs3N+z0QWhnnfVjcwz9WQ/Exl/W32UqT
-XQ0FQeFjb4DcZTrg+jGISDVWP+faBY/9+sKVUR+0W+2CuJfJprobZhABWLa4fKE=
-=5KHy
+iQEcBAABAgAGBQJWBVgtAAoJECrHRaUKISqMRaUH/ifqMnFYPxS/1O49K5nb4gkb
+FcOkj3cz5RDAm2jtLifuwAVOmYb9XLyTsxcgc71qpfrJpC5e2O7Sufl7+ECMicdj
+EeyxxtwvQxUl0QbPxKrgYDga3ezDtPMiBf7vXNyafHxep8jppuQ3N67+eE9VjA/H
+S5/ZPqoQVqYZzKLEYUuB6eNrubCVKbTZcJXkx5ns9rs3QWsiZK/RNyuQdAanJNmM
+z8ZpOXjaIW6QKn9e1lQMmtzXWD3KTARzVa0XiV0srd2nNF/+olOa1vTN+dpO71tP
+RrjWwhrkjjdSnNmhJCLhU3b7sdsgtpHyzT99elyAxRmbEQEDlC74A727GRw+Hzc=
+=X4J3
 -----END PGP SIGNATURE-----