passenger 5.0.5 → 5.0.6

data/ext/common/BackgroundEventLoop.cpp

@@ -162,6 +162,7 @@ BackgroundEventLoop::stop() {
 	if (priv->thr != NULL) {
 		ev_async_send(loop, async);
 		priv->thr->join();
+		delete priv->thr;
 		priv->thr = NULL;
 	}
 }

data/ext/common/Constants.h

@@ -114,7 +114,7 @@
 
 	#define NGINX_DOC_URL "https://www.phusionpassenger.com/documentation/Users%20guide%20Nginx.html"
 
-	#define PASSENGER_VERSION "5.0.5"
+	#define PASSENGER_VERSION "5.0.6"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/ext/common/MemoryKit/mbuf.cpp

@@ -151,6 +151,10 @@ mbuf_block_put(struct mbuf_block *mbuf_block)
 	mbuf_block->pool->nfree_mbuf_blockq++;
 	mbuf_block->pool->nactive_mbuf_blockq--;
 	STAILQ_INSERT_HEAD(&mbuf_block->pool->free_mbuf_blockq, mbuf_block, next);
+
+	#ifdef MBUF_ENABLE_DEBUGGING
+		TAILQ_REMOVE(&mbuf_block->pool->active_mbuf_blockq, mbuf_block, active_q);
+	#endif
 }
 
 /*

data/ext/common/ResourceLocator.h

@@ -169,7 +169,7 @@ public:
 			return path;
 		}
 
-		throw RuntimeException("Support binary " + name + " not found");
+		throw RuntimeException("Support binary " + name + " not found (tried: " + getSupportBinariesDir() + "/" + name + " and " + path + ")");
 	}
 };
 

data/ext/common/ServerKit/Context.h

@@ -98,6 +98,26 @@ public:
 			* mbuf_pool.mbuf_block_chunk_size);
 		mbufDoc["active_memory"] = byteSizeToJson(mbuf_pool.nactive_mbuf_blockq
 			* mbuf_pool.mbuf_block_chunk_size);
+		#ifdef MBUF_ENABLE_DEBUGGING
+			struct MemoryKit::active_mbuf_block_list *list =
+				const_cast<struct MemoryKit::active_mbuf_block_list *>(
+					&mbuf_pool.active_mbuf_blockq);
+			struct MemoryKit::mbuf_block *block;
+			Json::Value listJson(Json::arrayValue);
+
+			TAILQ_FOREACH (block, list, active_q) {
+				Json::Value blockJson;
+				blockJson["refcount"] = block->refcount;
+				#ifdef MBUF_ENABLE_BACKTRACES
+					blockJson["backtrace"] =
+						(block->backtrace == NULL)
+						? "(null)"
+						: block->backtrace;
+				#endif
+				listJson.append(blockJson);
+			}
+			mbufDoc["active_blocks_list"] = listJson;
+		#endif
 
 		doc["mbuf_pool"] = mbufDoc;
 

data/ext/common/ServerKit/HeaderTable.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014 Phusion
+ *  Copyright (c) 2014-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -239,8 +239,13 @@ public:
 		return const_cast<LString *>(static_cast<const HeaderTable *>(this)->lookup(key));
 	}
 
-	/** header must stay alive */
-	void insert(Header *header, psg_pool_t *pool) {
+	/**
+	 * HeaderTable takes over ownership of `header`. But you must ensure that the pool
+	 * that the header was allocated from is not destroyed before the HeaderTable
+	 * is destroyed or cleared.
+	 */
+	void insert(Header **headerPtr, psg_pool_t *pool) {
+		Header *header = *headerPtr;
 		assert(header->key.size < MAX_KEY_LENGTH);
 
 		if (m_cells == NULL) {
@@ -260,6 +265,7 @@ public:
 					m_population++;
 
 					cell->header = header;
+					*headerPtr = NULL;
 					return;
 				} else if (psg_lstr_cmp(&cell->header->key, &header->key)) {
 					// Cell matches, so merge value into header.
@@ -278,6 +284,8 @@ public:
 						psg_lstr_append_part(&cell->header->val, part);
 						part = next;
 					}
+					psg_lstr_deinit(&header->key);
+					*headerPtr = NULL;
 					return;
 				} else {
 					cell = PHT_CIRCULAR_NEXT(cell);
@@ -295,7 +303,7 @@ public:
 		psg_lstr_init(&header->val);
 		psg_lstr_append(&header->val, pool, value.data(), value.size());
 		header->hash = name.hash();
-		insert(header, pool);
+		insert(&header, pool);
 		return header;
 	}
 

data/ext/common/ServerKit/HttpHeaderParser.h

@@ -106,9 +106,9 @@ private:
 
 	void insertCurrentHeader() {
 		if (!state->secureMode) {
-			message->headers.insert(state->currentHeader, pool);
+			message->headers.insert(&state->currentHeader, pool);
 		} else {
-			message->secureHeaders.insert(state->currentHeader, pool);
+			message->secureHeaders.insert(&state->currentHeader, pool);
 		}
 	}
 

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

@@ -45,6 +45,8 @@
 #include <utility>
 #include <typeinfo>
 #include <cstdio>
+#include <cstdlib>
+#include <cstddef>
 #include <cassert>
 #include <cctype>
 

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

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2014 Phusion
+ *  Copyright (c) 2011-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -34,6 +34,7 @@ beginBufferingBody(Client *client, Request *req) {
 	req->bodyChannel.start();
 	req->bodyBuffer.reinitialize();
 	req->bodyBuffer.stop();
+	req->beginScopeLog(&req->scopeLogs.bufferingRequestBody, "buffering request body");
 }
 
 Channel::Result
@@ -77,8 +78,9 @@ whenBufferingBody_onRequestBody(Client *client, Request *req,
 				sizeof("content-length") - 1).hash();
 
 			req->headers.erase(HTTP_TRANSFER_ENCODING);
-			req->headers.insert(header, req->pool);
+			req->headers.insert(&header, req->pool);
 		}
+		req->endScopeLog(&req->scopeLogs.bufferingRequestBody);
 		checkoutSession(client, req);
 		return Channel::Result(0, true);
 	} else {

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

@@ -43,7 +43,9 @@ public:
 
 	Client(void *server)
 		: ServerKit::BaseHttpClient<Request>(server)
-		{ }
+	{
+		SERVER_KIT_BASE_HTTP_CLIENT_INIT();
+	}
 
 	DEFINE_SERVER_KIT_BASE_HTTP_CLIENT_FOOTER(Client, Request);
 };

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

@@ -981,6 +981,7 @@ void
 handleAppResponseBodyEnd(Client *client, Request *req) {
 	keepAliveAppConnection(client, req);
 	storeAppResponseInTurboCache(client, req);
+	finalizeUnionStationWithSuccess(client, req);
 }
 
 OXT_FORCE_INLINE void
@@ -1022,3 +1023,9 @@ storeAppResponseInTurboCache(Client *client, Request *req) {
 		}
 	}
 }
+
+void
+finalizeUnionStationWithSuccess(Client *client, Request *req) {
+	req->endScopeLog(&req->scopeLogs.requestProcessing, true);
+	req->endScopeLog(&req->scopeLogs.requestProxying, true);
+}

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

@@ -114,6 +114,8 @@ virtual void deinitializeRequest(Client *client, Request *req) {
 	req->endScopeLog(&req->scopeLogs.bufferingRequestBody, false);
 	req->endScopeLog(&req->scopeLogs.requestProcessing, false);
 
+	req->options.transaction.reset();
+
 	req->appSink.setConsumedCallback(NULL);
 	req->appSink.deinitialize();
 	req->appSource.deinitialize();
@@ -185,6 +187,9 @@ void deinitializeAppResponse(Client *client, Request *req) {
 	resp->headers.clear();
 	resp->secureHeaders.clear();
 
+	if (resp->setCookie != NULL) {
+		psg_lstr_deinit(resp->setCookie);
+	}
 	psg_lstr_deinit(&resp->bodyCacheBuffer);
 }
 

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

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2014 Phusion
+ *  Copyright (c) 2011-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -89,7 +89,17 @@ struct SessionProtocolWorkingState {
 	const LString *remoteUser;
 	const LString *contentType;
 	const LString *contentLength;
+	char *environmentVariablesData;
+	size_t environmentVariablesSize;
 	bool hasBaseURI;
+
+	SessionProtocolWorkingState()
+		: environmentVariablesData(NULL)
+		{ }
+
+	~SessionProtocolWorkingState() {
+		free(environmentVariablesData);
+	}
 };
 
 void
@@ -183,6 +193,21 @@ determineHeaderSizeForSessionProtocol(Request *req,
 	} else {
 		state.contentLength = NULL;
 	}
+	if (!req->options.environmentVariables.empty()) {
+		size_t len = modp_b64_decode_len(req->options.environmentVariables.size());
+		state.environmentVariablesData = (char *) malloc(len);
+		if (state.environmentVariablesData == NULL) {
+			throw RuntimeException("Unable to allocate memory for base64 "
+				"decoding of environment variables");
+		}
+		len = modp_b64_decode(state.environmentVariablesData,
+			req->options.environmentVariables.data(),
+			req->options.environmentVariables.size());
+		if (len == (size_t) -1) {
+			throw RuntimeException("Unable to base64 decode environment variables");
+		}
+		state.environmentVariablesSize = len;
+	}
 
 	dataSize += sizeof("REQUEST_URI");
 	dataSize += req->path.size + 1;
@@ -289,6 +314,10 @@ determineHeaderSizeForSessionProtocol(Request *req,
 		it.next();
 	}
 
+	if (state.environmentVariablesData != NULL) {
+		dataSize += state.environmentVariablesSize;
+	}
+
 	return dataSize + 1;
 }
 
@@ -427,6 +456,10 @@ constructHeaderForSessionProtocol(Request *req, char * restrict buffer, unsigned
 		it.next();
 	}
 
+	if (state.environmentVariablesData != NULL) {
+		pos = appendData(pos, end, state.environmentVariablesData, state.environmentVariablesSize);
+	}
+
 	Uint32Message::generate(buffer, pos - buffer - sizeof(boost::uint32_t));
 
 	size = pos - buffer;

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

@@ -60,7 +60,10 @@ public:
 		time_t date;
 
 		Header()
-			: valid(false)
+			: valid(false),
+			  keySize(0),
+			  hash(0),
+			  date(0)
 			{ }
 	};
 
@@ -72,6 +75,14 @@ public:
 		char httpHeaderData[MAX_HEADER_SIZE];
 		// This data is dechunked.
 		char httpBodyData[MAX_BODY_SIZE];
+
+		Body()
+			: httpHeaderSize(0),
+			  httpBodySize(0),
+			  expiryDate(0)
+		{
+			key[0] = httpHeaderData[0] = httpBodyData[0] = '\0';
+		}
 	};
 
 	struct Entry {
@@ -571,7 +582,8 @@ public:
 				req->appResponse.cacheControl->start->data,
 				req->appResponse.cacheControl->size);
 			if (cacheControl.find(P_STATIC_STRING("no-store")) != string::npos
-			 || cacheControl.find(P_STATIC_STRING("private")) != string::npos)
+			 || cacheControl.find(P_STATIC_STRING("private")) != string::npos
+			 || cacheControl.find(P_STATIC_STRING("no-cache")) != string::npos)
 			{
 				return false;
 			}

data/ext/common/agents/Watchdog/HelperAgentWatcher.cpp

@@ -37,8 +37,8 @@ protected:
 
 	virtual void execProgram() const {
 		if (hasEnvOption("PASSENGER_RUN_HELPER_AGENT_IN_VALGRIND", false)) {
-			execlp("valgrind", "valgrind", "--dsymutil=yes",
-				agentFilename.c_str(), AGENT_EXE, "server",
+			execlp("valgrind", "valgrind", "--dsymutil=yes", "--track-origins=yes", "--leak-check=full",
+				agentFilename.c_str(), "server",
 				// Some extra space to allow the child process to change its process title.
 				"                                                ", (char *) 0);
 		} else {

data/lib/phusion_passenger.rb

@@ -30,7 +30,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake ext/common/Constants.h' after changing this number.
-  VERSION_STRING = '5.0.5'
+  VERSION_STRING = '5.0.6'
 
   PREFERRED_NGINX_VERSION = '1.6.2'
   NGINX_SHA256_CHECKSUM = 'b5608c2959d3e7ad09b20fc8f9e5bd4bc87b3bc8ba5936a513c04ed8f1391a18'

data/lib/phusion_passenger/config/admin_command_command.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014 Phusion
+#  Copyright (c) 2014-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -37,13 +37,13 @@ module PhusionPassenger
       include PhusionPassenger::Config::Utils
 
       def self.create_default_options
-        return { :socket => "server_admin" }
+        return { :agent_name => "server_admin" }
       end
 
       def run
         parse_options
         initialize_objects
-        select_passenger_instance
+        infer_socket_path_and_credentials
         invoke
       end
 
@@ -62,17 +62,22 @@ module PhusionPassenger
           opts.separator "  METHOD is an HTTP verb, like 'GET', 'POST', 'PUT' or 'DELETE'."
           opts.separator "  PATH is the admin URI. You can pass POST data with '-d'."
           opts.separator ""
-          opts.separator "  Example: passenger-config admin-command GET /server.json"
+          opts.separator "  Example 1: passenger-config admin-command GET /server.json"
           opts.separator "  Sends the 'GET /server.json' command to the HTTP server agent."
           opts.separator ""
-          opts.separator "  Example: passenger-config admin-command PUT /config.json \\"
-          opts.separator "           -d '{\"log_level\", 7}'"
+          opts.separator "  Example 2: passenger-config admin-command PUT /config.json \\"
+          opts.separator "             -d '{\"log_level\", 7}'"
           opts.separator "  Sends the 'PUT /config.json' command to the HTTP server agent, with the"
           opts.separator "  given PUT data."
           opts.separator ""
-          opts.separator "  Example: passenger-config admin-command POST /shutdown.json -a watchdog"
+          opts.separator "  Example 3: passenger-config admin-command POST /shutdown.json -a watchdog"
           opts.separator "  Sends the 'POST /shutdown.json' command to the watchdog, with no POST data."
           opts.separator ""
+          opts.separator "  Example 4: passenger-config admin-command POST /shutdown.json \\"
+          opts.separator "             -S /tmp/watchdog.sock"
+          opts.separator "  Sends the 'POST /shutdown.json' command to the watchdog listening at the"
+          opts.separator "  specific socket file /tmp/watchdog.sock. No POST data."
+          opts.separator ""
 
           opts.separator "Options:"
           opts.on("-d", "--data DATA", String, "Specify HTTP request body data") do |value|
@@ -90,12 +95,19 @@ module PhusionPassenger
             "is sent to. Choices: watchdog,#{nl}" +
             "server_admin, logging_admin.#{nl}" +
             "Default: server_admin") do |val|
-            options[:socket] = val
+            options[:agent_name] = val
+          end
+          opts.on("-S", "--socket PATH", String, "Instead of inferring the socket path from#{nl}" +
+            "the #{PROGRAM_NAME} instance directory#{nl}" +
+            "and agent name, send the command to a#{nl}" +
+            "specific Unix domain socket directly") do |val|
+            options[:socket_path] = val
           end
           opts.on("--show-headers", "Show HTTP response headers") do
             options[:show_headers] = true
           end
-          opts.on("--ignore-response-code", "Exit successfully even if a non-2xx response was returned") do
+          opts.on("--ignore-response-code", "Exit successfully even if a non-2xx#{nl}" +
+            "response was returned") do
             options[:ignore_response_code] = true
           end
           opts.on("--instance NAME", String, "The #{PROGRAM_NAME} instance to select") do |value|
@@ -144,15 +156,43 @@ module PhusionPassenger
         end
       end
 
+      def infer_socket_path_and_credentials
+        if @options[:socket_path]
+          @socket_path = @options[:socket_path]
+        else
+          select_passenger_instance
+          @socket_path = "#{@instance.path}/agents.s/#{@options[:agent_name]}"
+          @password = obtain_full_admin_password(@instance)
+        end
+      end
+
       def invoke
-        password = obtain_full_admin_password(@instance)
-        @request.basic_auth("admin", password)
+        if @password
+          @request.basic_auth("admin", @password)
+        end
         @request["connection"] = "close"
         if @options[:data]
           @request.content_type = "application/json"
           @request.body = @options[:data]
         end
-        response = @instance.http_request("agents.s/#{@options[:socket]}", @request)
+
+        sock = Net::BufferedIO.new(UNIXSocket.new(@socket_path))
+        begin
+          @request.exec(sock, "1.1", @request.path)
+
+          done = false
+          while !done
+            response = Net::HTTPResponse.read_new(sock)
+            done = !response.kind_of?(Net::HTTPContinue)
+          end
+
+          response.reading_body(sock, @request.response_body_permitted?) do
+            # Nothing
+          end
+        ensure
+          sock.close
+        end
+
         if @options[:show_headers]
           print_headers(response)
         end