passenger 5.0.24 → 5.0.25

data/build/cxx_tests.rb

@@ -49,6 +49,9 @@ TEST_CXX_OBJECTS = {
   # "#{TEST_OUTPUT_DIR}cxx/Core/RequestHandlerTest.o" =>
   #   "test/cxx/Core/RequestHandlerTest.cpp",
 
+  "#{TEST_OUTPUT_DIR}cxx/UstRouter/TransactionTest.o" =>
+    "test/cxx/UstRouter/TransactionTest.cpp",
+
   "#{TEST_OUTPUT_DIR}cxx/ServerKit/ChannelTest.o" =>
     "test/cxx/ServerKit/ChannelTest.cpp",
   "#{TEST_OUTPUT_DIR}cxx/ServerKit/FileBufferedChannelTest.o" =>
@@ -108,10 +111,9 @@ TEST_CXX_OBJECTS = {
     "test/cxx/TemplateTest.cpp"
 }
 
-def test_cxx_flags
-  @test_cxx_flags ||= begin
+def basic_test_cxx_flags
+  @basic_test_cxx_flags ||= begin
     flags = [
-      "-include test/cxx/TestSupport.h",
       LIBEV_CFLAGS,
       LIBUV_CFLAGS,
       PlatformInfo.curl_flags,
@@ -124,6 +126,20 @@ def test_cxx_flags
   end
 end
 
+def test_cxx_include_paths
+  @test_cxx_include_paths ||= [
+    "test/cxx",
+    "test/support",
+    "src/agent",
+    *CXX_SUPPORTLIB_INCLUDE_PATHS
+  ]
+end
+
+def test_cxx_flags
+  @test_cxx_flags ||= ["-include test/cxx/TestSupport.h"] +
+    basic_test_cxx_flags
+end
+
 def test_cxx_ldflags
   @test_cxx_ldflags ||= begin
     result = "#{EXTRA_PRE_CXX_LDFLAGS} " <<
@@ -145,12 +161,7 @@ TEST_CXX_OBJECTS.each_pair do |object, source|
   define_cxx_object_compilation_task(
     object,
     source,
-    :include_paths => [
-      "test/cxx",
-      "test/support",
-      "src/agent",
-      *CXX_SUPPORTLIB_INCLUDE_PATHS
-    ],
+    :include_paths => test_cxx_include_paths,
     :flags => test_cxx_flags,
     :deps => 'test/cxx/TestSupport.h.gch'
   )
@@ -209,11 +220,12 @@ end
 
 file('test/cxx/TestSupport.h.gch' => generate_compilation_task_dependencies('test/cxx/TestSupport.h')) do
   compile_cxx(
-    'test/cxx/TestSupport.h',
     'test/cxx/TestSupport.h.gch',
+    'test/cxx/TestSupport.h',
+    :include_paths => test_cxx_include_paths,
     :flags => [
       "-x c++-header",
-      TEST_CXX_CFLAGS
-    ]
+      basic_test_cxx_flags
+    ].flatten
   )
 end

data/build/packaging.rb

@@ -642,8 +642,7 @@ task :fakeroot => [:apache2, :nginx, :doc] do
   headers.concat([
     ["src/cxx_supportlib/Exceptions.h", "cxx_supportlib/Exceptions.h"],
     ["src/cxx_supportlib/vendor-modified/modp_b64.h", "cxx_supportlib/vendor-modified/modp_b64.h"],
-    ["src/cxx_supportlib/vendor-modified/modp_b64_data.h", "cxx_supportlib/vendor-modified/modp_b64_data.h"],
-    ["src/cxx_supportlib/vendor-modified/boost/detail/endian.hpp", "cxx_supportlib/vendor-modified/boost/detail/endian.hpp"]
+    ["src/cxx_supportlib/vendor-modified/modp_b64_data.h", "cxx_supportlib/vendor-modified/modp_b64_data.h"]
   ])
   headers.each do |header|
     target = "#{fake_include_dir}/#{header[1]}"

data/dev/copy_boost_headers

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 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.
@@ -25,7 +25,7 @@
 
 ESSENTIALS = [
   "boost/detail/{limits,endian}.hpp",
-  "boost/config",
+  "boost/config*",
   "boost/mpl",
   "boost/preprocessor/stringize.hpp",
   "boost/smart_ptr/detail/sp_counted_*",
@@ -36,8 +36,15 @@ ESSENTIALS = [
   "boost/unordered*",
   "boost/thread",
   "boost/intrusive",
-  "boost/heap",
   "boost/container",
+  "boost/predef",
+  "boost/move",
+  "boost/core",
+  "boost/bind",
+  "boost/function",
+  "boost/optional.hpp",
+  "boost/optional",
+  "boost/utility",
   "libs/thread/src",
   "libs/system/src",
   "libs/regex/src",
@@ -47,10 +54,18 @@ ESSENTIALS = [
   "boost/date_time/date_formatting_limited.hpp",
   "boost/type_traits/make_signed.hpp",
   "boost/type_traits/detail/*",
+  "boost/typeof",
+  "boost/date_time",
+  "boost/type_traits",
+  "boost/cstdint.hpp",
+  "boost/*regex*",
   "boost/non_type.hpp",
   "boost/detail/fenv.hpp",
   "boost/foreach.hpp",
-  "boost/*regex*"
+  "boost/none*",
+  "boost/system/detail/error_code.ipp",
+  "boost/detail/reference_content.hpp",
+  "boost/algorithm/string"
 ]
 EXCLUDE = [
   "libs/thread/src/win32/*",
@@ -73,18 +88,21 @@ PROGRAM_SOURCE = %q{
   #include <boost/function.hpp>
   #include <boost/bind.hpp>
   #include <boost/container/vector.hpp>
-  #include <boost/heap/d_ary_heap.hpp>
   #include <boost/date_time/posix_time/posix_time.hpp>
   #include <boost/foreach.hpp>
   #include <boost/unordered_map.hpp>
   #include <boost/cregex.hpp>
   #include <boost/regex.hpp>
   #include <boost/pool/object_pool.hpp>
+  #include <boost/move/core.hpp>
+  #include <boost/move/utility.hpp>
+  #include <boost/atomic.hpp>
+  #include <boost/typeof/typeof.hpp>
 }
 
 require 'fileutils'
 BOOST_DIR = ARGV[0]
-Dir.chdir(File.dirname(__FILE__) + "/../ext")
+Dir.chdir(File.dirname(__FILE__) + "/../src/cxx_supportlib/vendor-modified")
 
 # Run the given command, and abort on error.
 def sh(*command)
@@ -143,6 +161,8 @@ def cleanup
   FileUtils.rm_rf("boost/thread/win32")
   FileUtils.rm_rf("boost/src/win32")
   FileUtils.rm_rf("boost/asio/win32")
+  FileUtils.rm_rf("boost/atomic/detail/caps_windows.hpp")
+  FileUtils.rm_rf("boost/atomic/detail/ops_windows.hpp")
   FileUtils.rm_rf("boost/smart_ptr/detail/spinlock_w32.hpp")
   FileUtils.rm_rf("boost/smart_ptr/detail/sp_counted_base_w32.hpp")
   FileUtils.rm_rf("boost/smart_ptr/detail/atomic_count_win32.hpp")
@@ -151,10 +171,12 @@ def cleanup
 end
 
 # Compile PROGRAM_SOURCE and copy whatever missing header files the compiler needs.
-def copy_dependencies
+def copy_dependencies(cflags)
   done = false
   while !done
-    missing_headers = `c++ test.cpp -c -I. 2>&1`.
+    compiler_output = `c++ test.cpp -c -I. #{cflags} 2>&1`
+    File.unlink('test.o')
+    missing_headers = compiler_output.
       split("\n").
       grep(/(error: .*: No such file|fatal error: '.*' file not found)/).
       map do |line|
@@ -188,7 +210,8 @@ def start
   begin
     prepare
     copy_essential_files
-    copy_dependencies
+    copy_dependencies("-std=gnu++11")
+    copy_dependencies("")
   ensure
     cleanup
   end

data/resources/templates/standalone/config.erb

@@ -76,4 +76,6 @@ http {
     }
     passenger_pre_start <%= listen_url(app) %>;
     <% end %>
+
+    <%= include_passenger_internal_template('footer.erb', 4) %>
 }

data/resources/templates/standalone/footer.erb

@@ -0,0 +1,3 @@
+<%
+# Reserved for future use
+%>

data/resources/templates/standalone/server.erb

@@ -56,3 +56,10 @@ passenger_enabled on;
 <%= nginx_option(app, :memory_limit) %>
 <%= nginx_option(app, :max_request_time) %>
 <%= nginx_option(app, :debugger) %>
+
+<% app[:unlimited_concurrency_paths].each do |path| %>
+    location ~ ^<%= path %>(/.*|$) {
+        passenger_app_group_name '<%= app[:root] %>#unlimited_concurrency';
+        passenger_force_max_concurrent_requests_per_process 0;
+    }
+<% end %>

data/src/agent/Core/ApplicationPool/Pool/Miscellaneous.cpp

@@ -61,10 +61,10 @@ Pool::asyncGet(const Options &options, const GetCallback &callback, bool lockNow
 			char queueMaxStr[10];
 			int queueMax = existingGroup->options.maxRequestQueueSize;
 			if (queueMax > 0) {
-				snprintf(queueMaxStr, 10, "%d", queueMax);
+				snprintf(queueMaxStr, sizeof(queueMaxStr), "%d", queueMax);
 			}
 			char message[50];
-			snprintf(message, 100, "queue: %zu / %s, spawning: %s", existingGroup->getWaitlist.size(),
+			snprintf(message, sizeof(message), "queue: %zu / %s, spawning: %s", existingGroup->getWaitlist.size(),
 					(queueMax == 0 ? "inf" : queueMaxStr),
 					(existingGroup->processesBeingSpawned == 0 ? "no" : "yes"));
 			data["message"] = message;

data/src/agent/Core/SpawningKit/DirectSpawner.h

@@ -233,12 +233,15 @@ public:
 			details.options = &options;
 			details.debugDir = debugDir;
 
+			UPDATE_TRACE_POINT();
 			Result result;
 			{
 				this_thread::restore_interruption ri(di);
 				this_thread::restore_syscall_interruption rsi(dsi);
 				result = negotiateSpawn(details);
 			}
+
+			UPDATE_TRACE_POINT();
 			detachProcess(result["pid"].asInt());
 			guard.clear();
 			P_DEBUG("Process spawning done: appRoot=" << options.appRoot <<

data/src/agent/Core/UnionStation/Transaction.h

@@ -76,7 +76,6 @@ private:
 	const string category;
 	const string unionStationKey;
 	const ExceptionHandlingMode exceptionHandlingMode;
-	bool shouldFlushToDiskAfterClose;
 
 	/**
 	 * Buffer must be at least txnId.size() + 1 + INT64_STR_BUFSIZE + 1 bytes.
@@ -144,8 +143,7 @@ public:
 		  groupName(_groupName),
 		  category(_category),
 		  unionStationKey(_unionStationKey),
-		  exceptionHandlingMode(_exceptionHandlingMode),
-		  shouldFlushToDiskAfterClose(false)
+		  exceptionHandlingMode(_exceptionHandlingMode)
 		{ }
 
 	~Transaction() {
@@ -172,14 +170,6 @@ public:
 				timestamp,
 				NULL);
 
-			if (shouldFlushToDiskAfterClose) {
-				UPDATE_TRACE_POINT();
-				timeout = IO_TIMEOUT;
-				writeArrayMessage(connection->fd, &timeout,
-					"flush", NULL);
-				readArrayMessage(connection->fd, &timeout);
-			}
-
 			_checkinConnection(context, connection);
 			guard.clear();
 		} catch (const SystemException &e) {
@@ -229,10 +219,6 @@ public:
 		message("ABORT");
 	}
 
-	void flushToDiskAfterClose(bool value) {
-		shouldFlushToDiskAfterClose = value;
-	}
-
 	bool isNull() const {
 		return connection == NULL;
 	}

data/src/agent/README.md

@@ -1,9 +1,21 @@
-This directory contains the source code of the Passenger agent. The Passenger agent consists of multiple parts. Within each subdirectory, you will find the source code of that particular part.
+# Passenger Agent
+
+This directory contains the source code of the Passenger agent. The Passenger agent is a single executable that consists of multiple parts. Within each subdirectory, you will find the source code of that particular part.
+
+## Important parts
 
 The most important parts are:
 
- * The Watchdog is the main Passenger process. It starts the Passenger core and the UstRouter, and restarts them when they crash. It also cleans everything up upon shut down.
+ * The Watchdog is the main Passenger process. It starts the Passenger Core and the UstRouter, and restarts them when they crash. It also cleans everything up upon shut down.
  * The Core performs most of the heavy lifting. It parses requests, spawns application processes, forwards requests to the correct process and forwards application responses back to the web server.
  * The UstRouter processes Union Station data and sends them to the Union Station server.
 
-There is also code that is shared between the different agent parts. That code is located in `Shared`.
+## Minor parts
+
+ * SpawnPreparer is a tool used internally by the Core to spawn application processes.
+ * SystemMetrics is a tool that shows system metrics such as CPU and memory usage. The main functionality is implemented in src/cxxUtils/SystemMetricsCollector.h. This tool is mainly useful for developing and debugging SystemMetricsCollector.h.
+ * TempDirToucher is a tool used internally by Passenger Standalone to keep a temporary directory's timestamp up-to-date so that it doesn't get removed by /tmp cleaner daemons.
+
+## Shared code
+
+There is also code that is shared between the different agent parts. That code is located in `Shared`. Unlike `src/cxx_supportlib`, which is meant to be usable outside Passenger, the code in `Shared` is Passenger-specific.

data/src/agent/UstRouter/Controller.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.
@@ -69,8 +69,6 @@ private:
 		11 +                          // space for a random identifier
 		1;                            // null terminator
 
-	friend inline void UstRouter::Controller_closeLogSink(Controller *controller, const LogSinkPtr &logSink);
-	friend inline FilterSupport::Filter &UstRouter::Controller_compileFilter(Controller *controller, const StaticString &source);
 	friend inline struct ::ev_loop *UstRouter::Controller_getLoop(Controller *controller);
 	friend inline RemoteSender &UstRouter::Controller_getRemoteSender(Controller *controller);
 
@@ -247,8 +245,6 @@ private:
 				processCloseTransactionMessage(client, args);
 			} else if (args[0] == P_STATIC_STRING("init")) {
 				processInitMessage(client, args);
-			} else if (args[0] == P_STATIC_STRING("flush")) {
-				processFlushMessage(client, args);
 			} else if (args[0] == P_STATIC_STRING("info")) {
 				processInfoMessage(client, args);
 			} else if (args[0] == P_STATIC_STRING("ping")) {
@@ -295,7 +291,7 @@ private:
 			goto done;
 		}
 
-		s_it = client->openTransactions.find(transaction->txnId);
+		s_it = client->openTransactions.find(transaction->getTxnId());
 		if (OXT_UNLIKELY(s_it == client->openTransactions.end())) {
 			SKC_ERROR(client, "Cannot log data: transaction not opened in this connection");
 			if (ack) {
@@ -439,24 +435,14 @@ private:
 				goto done;
 			}
 
-			transaction = boost::make_shared<Transaction>(this, ev_now(getLoop()));
-			if (devMode) {
-				transaction->logSink = openLogFile(client, category);
-			} else {
-				transaction->logSink = openRemoteSink(unionStationKey,
-					nodeName, category);
-			}
-			transaction->txnId.assign(txnId.data(), txnId.size());
-			transaction->dataStoreId  = DataStoreId(groupName,
-				nodeName, category);
-			transaction->crashProtect = crashProtect;
-			if (!filters.empty()) {
-				transaction->filters  = filters;
-			}
-			transaction->discarded    = false;
+			transaction = boost::make_shared<Transaction>(
+				txnId, groupName, nodeName, category,
+				unionStationKey, ev_now(getLoop()), filters
+			);
+			transaction->enableCrashProtect(crashProtect);
 			transactions.set(txnId, transaction);
 		} else {
-			if (OXT_UNLIKELY(client->openTransactions.find(transaction->txnId) !=
+			if (OXT_UNLIKELY(client->openTransactions.find(transaction->getTxnId()) !=
 				client->openTransactions.end()))
 			{
 				SKC_ERROR(client, "Cannot open transaction: transaction already opened in this connection");
@@ -468,16 +454,13 @@ private:
 				}
 				goto done;
 			}
-			if (OXT_UNLIKELY(transaction->getGroupName() != groupName)) {
-				SKC_ERROR(client,
-					"Cannot open transaction: transaction already opened with a "
-					"different group name ('" << transaction->getGroupName() <<
-					"' vs '" << groupName << "')");
+			if (OXT_UNLIKELY(transaction->getCategory() != category)) {
+				SKC_ERROR(client, "Cannot open transaction: transaction already opened with a different category name (" <<
+						transaction->getCategory() << " vs " << category << ")");
 				if (ack) {
 					sendErrorToClient(client,
-						"Cannot open transaction: transaction already opened with a "
-						"different group name ('" + transaction->getGroupName() +
-						"' vs '" + groupName + "')");
+							"Cannot open transaction: transaction already opened with a different category name (" +
+							transaction->getCategory() + " vs " + category + ")");
 					if (client->connected()) {
 						disconnect(&client);
 					}
@@ -498,13 +481,16 @@ private:
 				}
 				goto done;
 			}
-			if (OXT_UNLIKELY(transaction->getCategory() != category)) {
-				SKC_ERROR(client, "Cannot open transaction: transaction already opened with a different category name (" <<
-						transaction->getCategory() << " vs " << category << ")");
+			if (OXT_UNLIKELY(transaction->getUnionStationKey() != unionStationKey)) {
+				SKC_ERROR(client,
+					"Cannot open transaction: transaction already opened with a "
+					"different key ('" << transaction->getUnionStationKey() <<
+					"' vs '" << unionStationKey << "')");
 				if (ack) {
 					sendErrorToClient(client,
-							"Cannot open transaction: transaction already opened with a different category name (" +
-							transaction->getCategory() + " vs " + category + ")");
+						"Cannot open transaction: transaction already opened with a "
+						"different key ('" + transaction->getUnionStationKey() +
+						"' vs '" + unionStationKey + "')");
 					if (client->connected()) {
 						disconnect(&client);
 					}
@@ -513,8 +499,8 @@ private:
 			}
 		}
 
-		client->openTransactions.insert(transaction->txnId);
-		transaction->refcount++;
+		client->openTransactions.insert(transaction->getTxnId());
+		transaction->ref();
 		writeLogEntry(client, transaction, timestamp, P_STATIC_STRING("ATTACH"), ack);
 
 		if (client->connected() && ack) {
@@ -566,7 +552,7 @@ private:
 			}
 			goto done;
 		} else {
-			s_it = client->openTransactions.find(transaction->txnId);
+			s_it = client->openTransactions.find(transaction->getTxnId());
 			if (OXT_UNLIKELY(s_it == client->openTransactions.end())) {
 				SKC_ERROR(client, "Cannot close transaction " << txnId <<
 					": transaction not opened in this connection");
@@ -583,10 +569,10 @@ private:
 
 			client->openTransactions.erase(s_it);
 			writeDetachEntry(client, transaction, timestamp, ack);
-			transaction->refcount--;
-			assert(transaction->refcount >= 0);
-			if (transaction->refcount == 0) {
+			transaction->unref();
+			if (transaction->getRefCount() == 0) {
 				transactions.remove(txnId);
+				closeTransaction(client, transaction);
 			}
 		}
 
@@ -629,22 +615,6 @@ private:
 		}
 	}
 
-	void processFlushMessage(Client *client, const vector<StaticString> &args) {
-		LogSinkCache::iterator it;
-		LogSinkCache::iterator end = logSinkCache.end();
-
-		for (it = logSinkCache.begin(); it != end; it++) {
-			LogSink *sink = it->second.get();
-			sink->flush();
-		}
-
-		sendOkToClient(client);
-
-		if (client->connected()) {
-			SKC_DEBUG(client, "Done processing 'flush' message");
-		}
-	}
-
 	void processInfoMessage(Client *client, const vector<StaticString> &args) {
 		string info = inspectStateAsJson().toStyledString();
 
@@ -909,6 +879,16 @@ private:
 			|| category == P_STATIC_STRING("internal_information");
 	}
 
+	/**
+	 * Given a logSinkCache key, which may contains NULLs, converts it
+	 * into something that can be represented as a JSON string. It's not
+	 * a perfect representation, but probably good enough for display
+	 * purposes.
+	 */
+	string createJsonKey(const StaticString &key) const {
+		return replaceAll(key, P_STATIC_STRING("\0"), P_STATIC_STRING("__"));
+	}
+
 	LogSinkPtr openLogFile(Client *client, const StaticString &category) {
 		size_t cacheKeySize =
 			(sizeof("file:") - 1) +
@@ -966,14 +946,31 @@ private:
 		return sink;
 	}
 
+	/**
+	 * Close the given transaction, potentially flushing its data to a sink.
+	 */
+	void closeTransaction(Client *client, const TransactionPtr &transaction) {
+		if (!transaction->isDiscarded() && passesFilter(transaction)) {
+			LogSinkPtr logSink;
+			if (devMode) {
+				logSink = openLogFile(client, transaction->getCategory());
+			} else {
+				logSink = openRemoteSink(transaction->getUnionStationKey(),
+					transaction->getNodeName(), transaction->getCategory());
+			}
+			P_DEBUG("Closing transaction " << transaction->getTxnId() <<
+				": appending " << transaction->getBody().size() << " bytes "
+				"to sink " << logSink->inspect());
+			logSink->append(transaction);
+			closeLogSink(logSink);
+		}
+	}
+
 	/**
 	 * Decrement the reference count on the given log sink. When the refcount hits 0,
 	 * it's not actually deleted from memory; instead it's cached for later use. A
 	 * garbage collection run periodically cleans up log sinks that have zero
 	 * references.
-	 *
-	 * No need to call this manually. Automatically called by Transaction's
-	 * destructor.
 	 */
 	void closeLogSink(const LogSinkPtr &logSink) {
 		logSink->opened--;
@@ -984,7 +981,7 @@ private:
 	void writeLogEntry(Client *client, const TransactionPtr &transaction,
 		const StaticString &timestamp, const StaticString &data, bool ack)
 	{
-		if (transaction->discarded) {
+		if (transaction->isDiscarded()) {
 			return;
 		}
 		if (OXT_UNLIKELY(!validLogContent(data))) {
@@ -1004,19 +1001,7 @@ private:
 			return;
 		}
 
-		char writeCountStr[sizeof(unsigned int) * 2 + 1];
-		unsigned int writeCountStrSize = integerToHexatri(
-			transaction->writeCount, writeCountStr);
-
-		transaction->writeCount++;
-		transaction->data.append(transaction->txnId);
-		transaction->data.append(" ", 1);
-		transaction->data.append(timestamp.data(), timestamp.size());
-		transaction->data.append(" ", 1);
-		transaction->data.append(writeCountStr, writeCountStrSize);
-		transaction->data.append(" ");
-		transaction->data.append(data.data(), data.size());
-		transaction->data.append("\n", 1);
+		transaction->append(timestamp, data);
 	}
 
 	void writeDetachEntry(Client *client, const TransactionPtr &transaction, bool ack) {
@@ -1034,6 +1019,36 @@ private:
 		writeLogEntry(client, transaction, timestamp, P_STATIC_STRING("DETACH"), ack);
 	}
 
+	bool passesFilter(const TransactionPtr &transaction) {
+		StaticString filters(transaction->getFilters());
+		if (filters.empty()) {
+			return true;
+		}
+
+		StaticString body   = transaction->getBody();
+		const char *current = filters.data();
+		const char *end     = filters.data() + filters.size();
+		bool result         = true;
+		FilterSupport::ContextFromLog ctx(body);
+
+		// 'filters' may contain multiple filter sources, separated
+		// by '\1' characters. Process each.
+		while (current < end && result) {
+			StaticString tmp(current, end - current);
+			size_t pos = tmp.find('\1');
+			if (pos == string::npos) {
+				pos = tmp.size();
+			}
+
+			StaticString source(current, pos);
+			FilterSupport::Filter &filter = compileFilter(source);
+			result = filter.run(ctx);
+
+			current = tmp.data() + pos + 1;
+		}
+		return result;
+	}
+
 	FilterSupport::Filter &compileFilter(const StaticString &source) {
 		// TODO: garbage collect filters based on time
 		FilterSupport::FilterPtr filter = filters.get(source);
@@ -1069,15 +1084,15 @@ protected:
 				P_BUG("client->openTransactions is not a subset of this->transactions!");
 			}
 
-			if (transaction->crashProtect) {
+			if (transaction->crashProtectEnabled()) {
 				writeDetachEntry(client, transaction, false);
 			} else {
 				transaction->discard();
 			}
-			transaction->refcount--;
-			assert(transaction->refcount >= 0);
-			if (transaction->refcount == 0) {
-				transactions.remove(transaction->txnId);
+			transaction->unref();
+			if (transaction->getRefCount() == 0) {
+				transactions.remove(transaction->getTxnId());
+				closeTransaction(client, transaction);
 			}
 		}
 		client->openTransactions.clear();
@@ -1199,7 +1214,7 @@ public:
 		LogSinkCache::const_iterator end = logSinkCache.end();
 		for (it = logSinkCache.begin(); it != end; it++) {
 			const LogSinkPtr &logSink = it->second;
-			doc[it->first.toString()] = logSink->inspectStateAsJson();
+			doc[createJsonKey(it->first)] = logSink->inspectStateAsJson();
 		}
 		return doc;
 	}
@@ -1217,16 +1232,6 @@ public:
 };
 
 
-inline void
-Controller_closeLogSink(Controller *controller, const LogSinkPtr &logSink) {
-	controller->closeLogSink(logSink);
-}
-
-inline FilterSupport::Filter &
-Controller_compileFilter(Controller *controller, const StaticString &source) {
-	return controller->compileFilter(source);
-}
-
 inline struct ev_loop *
 Controller_getLoop(Controller *controller) {
 	return controller->getLoop();