passenger 3.0.4 → 3.0.5

data/lib/phusion_passenger/abstract_request_handler.rb

@@ -709,7 +709,10 @@ private
 				# connection until the ACK has been received, otherwise
 				# the helper agent may close the transaction before this
 				# process's openTransaction command is processed.
-				log.close
+				begin
+					log.close
+				rescue
+				end
 			end
 		end
 		

data/lib/phusion_passenger/classic_rails_extensions/analytics_logging/ac_base_extension.rb

@@ -51,7 +51,9 @@ protected
 			log.measure("view rendering") do
 				result = render_without_passenger(*args, &block)
 				view_runtime = @view_runtime || @rendering_runtime
-				log.message "View rendering time: #{(view_runtime * 1000).to_i}"
+				if view_runtime
+					log.message "View rendering time: #{(view_runtime * 1000).to_i}"
+				end
 				return result
 			end
 		else

data/lib/phusion_passenger/standalone/runtime_installer.rb

@@ -386,7 +386,7 @@ private
 			color_puts "<banner>Downloading Nginx...</banner>"
 			basename = "nginx-#{@version}.tar.gz"
 			tarball  = "#{@working_dir}/#{basename}"
-			if !download("http://sysoev.ru/nginx/#{basename}", tarball)
+			if !download("http://nginx.org/download/#{basename}", tarball)
 				return nil
 			end
 		end

data/lib/phusion_passenger/standalone/start_command.rb

@@ -207,6 +207,11 @@ private
 				          "be used instead of downloading from the Internet")) do |value|
 				@options[:nginx_tarball] = File.expand_path(value)
 			end
+			opts.on("--binaries-url-root URL", String,
+				wrap_desc("If Nginx needs to be installed, then the specified URL will be " +
+				          "checked for binaries prior to a local build.")) do |value|
+				@options[:binaries_url_root] = value
+			end
 		end
 		@plugin.call_hook(:done_parsing_options)
 	end
@@ -294,6 +299,7 @@ private
 			:nginx_dir   => nginx_dir,
 			:version     => @options[:nginx_version],
 			:tarball     => @options[:nginx_tarball],
+			:binaries_url_root => @options[:binaries_url_root],
 			:plugin      => @plugin)
 		installer.start
 	end

data/lib/phusion_passenger/templates/standalone/config.erb

@@ -86,7 +86,7 @@ http {
         passenger_spawn_method <%= app[:spawn_method] %>;
         <% if app[:min_instances] %>passenger_min_instances <%= app[:min_instances] %>;<% end %>
         <% if app[:union_station_key] %>
-            passenger_analytics on;
+            union_station_support on;
             union_station_key <%= app[:union_station_key] %>;
         <% end %>
     }

data/test/cxx/FilterSupportTest.cpp

@@ -14,6 +14,19 @@ using namespace oxt;
 namespace tut {
 	struct FilterSupportTest {
 		SimpleContext ctx;
+		
+		bool eval(const StaticString &source, bool debug = false) {
+			return Filter(source, debug).run(ctx);
+		}
+		
+		bool validate(const StaticString &source) {
+			try {
+				Filter f(source);
+				return true;
+			} catch (const SyntaxError &) {
+				return false;
+			}
+		}
 	};
 	
 	DEFINE_TEST_GROUP_WITH_LIMIT(FilterSupportTest, 100);
@@ -39,7 +52,7 @@ namespace tut {
 	}
 	
 	
-	/******** String tests *******/
+	/******** String and regexp tests *******/
 	
 	TEST_METHOD(5) {
 		// Test string comparison
@@ -114,9 +127,49 @@ namespace tut {
 	}
 	
 	TEST_METHOD(13) {
-		// String syntax supports \n, \r, \t
-		ctx.uri = "hello\r\n\tworld";
-		ensure(Filter("uri == \"hello\\r\\n\\tworld\"").run(ctx));
+		// String syntax supports \\, \n, \r, \t
+		ctx.uri = "hello\r\n\tworld\\";
+		ensure(Filter("uri == \"hello\\r\\n\\tworld\\\\\"").run(ctx));
+	}
+	
+	TEST_METHOD(14) {
+		// Strings can also start and end with single quote characters.
+		ctx.uri = "hello world";
+		ensure(Filter("uri == 'hello world'").run(ctx));
+	}
+	
+	TEST_METHOD(15) {
+		// String begin and end quote characters must match.
+		try {
+			Filter("uri == 'hello world\"");
+			fail("Syntax error expected");
+		} catch (const SyntaxError &) {
+			// Pass.
+		}
+		try {
+			Filter("uri == \"hello world'");
+			fail("Syntax error expected");
+		} catch (const SyntaxError &) {
+			// Pass.
+		}
+	}
+	
+	TEST_METHOD(16) {
+		// Regular expressions can also start with %r{ and end with }.
+		ctx.uri = "hello world";
+		ensure(Filter("uri =~ %r{hello}").run(ctx));
+		try {
+			Filter("uri =~ /hello}");
+			fail("Syntax error expected");
+		} catch (const SyntaxError &) {
+			// Pass.
+		}
+		try {
+			Filter("uri =~ %r{hello/");
+			fail("Syntax error expected");
+		} catch (const SyntaxError &) {
+			// Pass.
+		}
 	}
 	
 	
@@ -222,19 +275,96 @@ namespace tut {
 	}
 	
 	
+	/******** Boolean and expression combination tests *******/
+	
+	TEST_METHOD(30) {
+		ensure("(1)", Filter("true").run(ctx));
+		ensure("(2)", !Filter("false").run(ctx));
+		ensure("(3)", Filter("true && 1 == 1").run(ctx));
+		ensure("(4)", Filter("true || 1 == 0").run(ctx));
+		ensure("(5)", !Filter("false && 1 == 1").run(ctx));
+		ensure("(6)", !Filter("false || 1 == 0").run(ctx));
+		ensure("(7)", Filter("false || 1 == 1").run(ctx));
+	}
+	
+	TEST_METHOD(31) {
+		ensure(Filter("true == true").run(ctx));
+		ensure(!Filter("true == false").run(ctx));
+		ensure(Filter("true != false").run(ctx));
+		ensure(!Filter("true != true").run(ctx));
+		
+		ensure(Filter("false == false").run(ctx));
+		ensure(!Filter("false == true").run(ctx));
+		ensure(Filter("false != true").run(ctx));
+		ensure(!Filter("false != false").run(ctx));
+	}
+	
+	TEST_METHOD(32) {
+		ensure("(1)", eval("true && true && true"));
+		ensure("(2)", !eval("true && true && false"));
+		ensure("(3)", !eval("true && false && false"));
+		ensure("(4)", !eval("false && false && false"));
+		ensure("(5)", !eval("false && true && false"));
+		ensure("(6)", !eval("false && false && true"));
+		ensure("(7)", !eval("false && true && false"));
+		
+		ensure("(8)", eval("true || true || true"));
+		ensure("(9)", eval("true || true || false"));
+		ensure("(10)", eval("true || false || false"));
+		ensure("(11)", !eval("false || false || false"));
+		ensure("(12)", eval("false || true || false"));
+		ensure("(13)", eval("false || false || true"));
+		ensure("(14)", eval("false || true || false"));
+		
+		ensure("(15)", eval("false || true && true"));
+		ensure("(16)", !eval("true || false && false"));
+		ensure("(17)", eval("true || (false && false)"));
+		
+		ctx.uri = "foo";
+		ctx.responseTime = 10;
+		ensure("(20)", eval("uri == 'foo' && (response_time == 1 || response_time == 10)"));
+		ensure("(21)", eval("(uri == 'foo' && response_time == 1) || response_time == 10"));
+	}
+	
+	
 	/******** Error tests *******/
 	
 	TEST_METHOD(40) {
 		// < does not work if left operand is a string
+		ensure(!validate("'' < 1"));
 		// < does not work if right operand is a string
+		ensure(!validate("1 < ''"));
+		
 		// <= does not work if left operand is a string
+		ensure(!validate("'' <= 1"));
 		// <= does not work if right operand is a string
+		ensure(!validate("1 <= ''"));
+		
 		// > does not work if left operand is a string
-		// < does not work if right operand is a string
+		ensure(!validate("'' > 1"));
+		// > does not work if right operand is a string
+		ensure(!validate("1 > ''"));
+		
 		// >= does not work if left operand is a string
+		ensure(!validate("'' >= 1"));
 		// >= does not work if right operand is a string
+		ensure(!validate("1 >= ''"));
+		
 		// =~ does not work if left operand is not a string
+		ensure(!validate("1 =~ //"));
+		ensure(!validate("// =~ //"));
+		ensure(!validate("false =~ //"));
 		// =~ does not work if right operand is not a regexp
+		ensure(!validate("'' =~ ''"));
+		ensure(!validate("'' =~ 1"));
+		ensure(!validate("'' =~ false"));
+	}
+	
+	TEST_METHOD(41) {
+		// Source must evaluate to a boolean.
+		ensure(!validate("1"));
+		ensure(!validate("'hello'"));
+		ensure(!validate("/abc/"));
 	}
 	
 	

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 3
   - 0
-  - 4
-  version: 3.0.4
+  - 5
+  version: 3.0.5
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-02 00:00:00 +01:00
+date: 2011-03-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -250,6 +250,385 @@ files:
 - doc/ApplicationPool algorithm.txt
 - doc/Architectural overview.html
 - doc/Architectural overview.txt
+- doc/cxxapi/AbstractSpawnManager_8h_source.html
+- doc/cxxapi/Account_8h_source.html
+- doc/cxxapi/AccountsDatabase_8h_source.html
+- doc/cxxapi/AgentBase_8h_source.html
+- doc/cxxapi/AgentsStarter_8h_source.html
+- doc/cxxapi/annotated.html
+- doc/cxxapi/apache2_2Configuration_8h_source.html
+- doc/cxxapi/BCrypt_8h_source.html
+- doc/cxxapi/Blowfish_8h_source.html
+- doc/cxxapi/Bucket_8h_source.html
+- doc/cxxapi/classAgentWatcher-members.html
+- doc/cxxapi/classAgentWatcher.html
+- doc/cxxapi/classClient-members.html
+- doc/cxxapi/classClient.html
+- doc/cxxapi/classes.html
+- doc/cxxapi/classHooks-members.html
+- doc/cxxapi/classHooks.html
+- doc/cxxapi/classPassenger_1_1AbstractSpawnManager-members.html
+- doc/cxxapi/classPassenger_1_1AbstractSpawnManager.html
+- doc/cxxapi/classPassenger_1_1AbstractSpawnManager__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1AbstractSpawnManager__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1AbstractSpawnManager__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1ArgumentException-members.html
+- doc/cxxapi/classPassenger_1_1ArgumentException.html
+- doc/cxxapi/classPassenger_1_1ArrayMessage-members.html
+- doc/cxxapi/classPassenger_1_1ArrayMessage.html
+- doc/cxxapi/classPassenger_1_1BufferedUpload-members.html
+- doc/cxxapi/classPassenger_1_1BufferedUpload.html
+- doc/cxxapi/classPassenger_1_1BusyException-members.html
+- doc/cxxapi/classPassenger_1_1BusyException.html
+- doc/cxxapi/classPassenger_1_1ConfigurationException-members.html
+- doc/cxxapi/classPassenger_1_1ConfigurationException.html
+- doc/cxxapi/classPassenger_1_1DirectoryMapper-members.html
+- doc/cxxapi/classPassenger_1_1DirectoryMapper.html
+- doc/cxxapi/classPassenger_1_1EOFException-members.html
+- doc/cxxapi/classPassenger_1_1EOFException.html
+- doc/cxxapi/classPassenger_1_1EOFException__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1EOFException__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1EOFException__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1EventedClient-members.html
+- doc/cxxapi/classPassenger_1_1EventedClient.html
+- doc/cxxapi/classPassenger_1_1EventedMessageServer-members.html
+- doc/cxxapi/classPassenger_1_1EventedMessageServer.html
+- doc/cxxapi/classPassenger_1_1EventedMessageServer__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1EventedMessageServer__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1EventedMessageServer__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1EventedServer-members.html
+- doc/cxxapi/classPassenger_1_1EventedServer.html
+- doc/cxxapi/classPassenger_1_1EventedServer__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1EventedServer__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1EventedServer__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1EventFd-members.html
+- doc/cxxapi/classPassenger_1_1EventFd.html
+- doc/cxxapi/classPassenger_1_1FileDescriptor-members.html
+- doc/cxxapi/classPassenger_1_1FileDescriptor.html
+- doc/cxxapi/classPassenger_1_1FileDescriptorPair-members.html
+- doc/cxxapi/classPassenger_1_1FileDescriptorPair.html
+- doc/cxxapi/classPassenger_1_1FileNotFoundException-members.html
+- doc/cxxapi/classPassenger_1_1FileNotFoundException.html
+- doc/cxxapi/classPassenger_1_1FileNotFoundException__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1FileNotFoundException__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1FileNotFoundException__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1FileSystemException-members.html
+- doc/cxxapi/classPassenger_1_1FileSystemException.html
+- doc/cxxapi/classPassenger_1_1FileSystemException__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1FileSystemException__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1FileSystemException__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1HttpStatusExtractor-members.html
+- doc/cxxapi/classPassenger_1_1HttpStatusExtractor.html
+- doc/cxxapi/classPassenger_1_1IOException-members.html
+- doc/cxxapi/classPassenger_1_1IOException.html
+- doc/cxxapi/classPassenger_1_1IOException__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1IOException__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1IOException__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1MessageChannel-members.html
+- doc/cxxapi/classPassenger_1_1MessageChannel.html
+- doc/cxxapi/classPassenger_1_1MessageServer-members.html
+- doc/cxxapi/classPassenger_1_1MessageServer.html
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1ClientContext-members.html
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1ClientContext.html
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1ClientContext__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1ClientContext__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1ClientContext__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1CommonClientContext-members.html
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1CommonClientContext.html
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1CommonClientContext__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1CommonClientContext__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1CommonClientContext__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1Handler-members.html
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1Handler.html
+- doc/cxxapi/classPassenger_1_1Process-members.html
+- doc/cxxapi/classPassenger_1_1Process.html
+- doc/cxxapi/classPassenger_1_1RandomGenerator-members.html
+- doc/cxxapi/classPassenger_1_1RandomGenerator.html
+- doc/cxxapi/classPassenger_1_1ResourceLocator-members.html
+- doc/cxxapi/classPassenger_1_1ResourceLocator.html
+- doc/cxxapi/classPassenger_1_1RuntimeException-members.html
+- doc/cxxapi/classPassenger_1_1RuntimeException.html
+- doc/cxxapi/classPassenger_1_1SafeLibev-members.html
+- doc/cxxapi/classPassenger_1_1SafeLibev.html
+- doc/cxxapi/classPassenger_1_1ScalarMessage-members.html
+- doc/cxxapi/classPassenger_1_1ScalarMessage.html
+- doc/cxxapi/classPassenger_1_1ScgiRequestParser-members.html
+- doc/cxxapi/classPassenger_1_1ScgiRequestParser.html
+- doc/cxxapi/classPassenger_1_1SecurityException-members.html
+- doc/cxxapi/classPassenger_1_1SecurityException.html
+- doc/cxxapi/classPassenger_1_1Session-members.html
+- doc/cxxapi/classPassenger_1_1Session.html
+- doc/cxxapi/classPassenger_1_1Session__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1Session__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1Session__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1SpawnException-members.html
+- doc/cxxapi/classPassenger_1_1SpawnException.html
+- doc/cxxapi/classPassenger_1_1SpawnManager-members.html
+- doc/cxxapi/classPassenger_1_1SpawnManager.html
+- doc/cxxapi/classPassenger_1_1SpawnManager__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1SpawnManager__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1SpawnManager__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1StandardSession-members.html
+- doc/cxxapi/classPassenger_1_1StandardSession.html
+- doc/cxxapi/classPassenger_1_1StandardSession__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1StandardSession__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1StandardSession__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1StaticString-members.html
+- doc/cxxapi/classPassenger_1_1StaticString.html
+- doc/cxxapi/classPassenger_1_1SyntaxError-members.html
+- doc/cxxapi/classPassenger_1_1SyntaxError.html
+- doc/cxxapi/classPassenger_1_1SystemException-members.html
+- doc/cxxapi/classPassenger_1_1SystemException.html
+- doc/cxxapi/classPassenger_1_1SystemException__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1SystemException__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1SystemException__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1TimeoutException-members.html
+- doc/cxxapi/classPassenger_1_1TimeoutException.html
+- doc/cxxapi/classPassenger_1_1TimeRetrievalException-members.html
+- doc/cxxapi/classPassenger_1_1TimeRetrievalException.html
+- doc/cxxapi/classPassenger_1_1TimeRetrievalException__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1TimeRetrievalException__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1TimeRetrievalException__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1Uint16Message-members.html
+- doc/cxxapi/classPassenger_1_1Uint16Message.html
+- doc/cxxapi/classPassenger_1_1Uint32Message-members.html
+- doc/cxxapi/classPassenger_1_1Uint32Message.html
+- doc/cxxapi/classServer-members.html
+- doc/cxxapi/classServer.html
+- doc/cxxapi/classServerInstanceDirToucher-members.html
+- doc/cxxapi/classServerInstanceDirToucher.html
+- doc/cxxapi/Constants_8h_source.html
+- doc/cxxapi/ContentHandler_8h_source.html
+- doc/cxxapi/definitions_8h_source.html
+- doc/cxxapi/DirectoryMapper_8h_source.html
+- doc/cxxapi/doxygen.css
+- doc/cxxapi/doxygen.png
+- doc/cxxapi/EventedClient_8h_source.html
+- doc/cxxapi/EventedMessageServer_8h_source.html
+- doc/cxxapi/EventedServer_8h_source.html
+- doc/cxxapi/Exceptions_8h_source.html
+- doc/cxxapi/FileDescriptor_8h_source.html
+- doc/cxxapi/files.html
+- doc/cxxapi/ftv2blank.png
+- doc/cxxapi/ftv2doc.png
+- doc/cxxapi/ftv2folderclosed.png
+- doc/cxxapi/ftv2folderopen.png
+- doc/cxxapi/ftv2lastnode.png
+- doc/cxxapi/ftv2link.png
+- doc/cxxapi/ftv2mlastnode.png
+- doc/cxxapi/ftv2mnode.png
+- doc/cxxapi/ftv2node.png
+- doc/cxxapi/ftv2plastnode.png
+- doc/cxxapi/ftv2pnode.png
+- doc/cxxapi/ftv2vertline.png
+- doc/cxxapi/functions.html
+- doc/cxxapi/functions_0x62.html
+- doc/cxxapi/functions_0x63.html
+- doc/cxxapi/functions_0x64.html
+- doc/cxxapi/functions_0x65.html
+- doc/cxxapi/functions_0x66.html
+- doc/cxxapi/functions_0x67.html
+- doc/cxxapi/functions_0x68.html
+- doc/cxxapi/functions_0x69.html
+- doc/cxxapi/functions_0x6b.html
+- doc/cxxapi/functions_0x6c.html
+- doc/cxxapi/functions_0x6d.html
+- doc/cxxapi/functions_0x6e.html
+- doc/cxxapi/functions_0x6f.html
+- doc/cxxapi/functions_0x70.html
+- doc/cxxapi/functions_0x72.html
+- doc/cxxapi/functions_0x73.html
+- doc/cxxapi/functions_0x74.html
+- doc/cxxapi/functions_0x75.html
+- doc/cxxapi/functions_0x77.html
+- doc/cxxapi/functions_0x7e.html
+- doc/cxxapi/functions_enum.html
+- doc/cxxapi/functions_eval.html
+- doc/cxxapi/functions_func.html
+- doc/cxxapi/functions_vars.html
+- doc/cxxapi/graph_legend.dot
+- doc/cxxapi/graph_legend.html
+- doc/cxxapi/graph_legend.png
+- doc/cxxapi/group__Core.html
+- doc/cxxapi/group__Core.map
+- doc/cxxapi/group__Core.png
+- doc/cxxapi/group__Exceptions.html
+- doc/cxxapi/group__Hooks.html
+- doc/cxxapi/group__Hooks.map
+- doc/cxxapi/group__Hooks.png
+- doc/cxxapi/group__Support.html
+- doc/cxxapi/hierarchy.html
+- doc/cxxapi/Hooks_8h_source.html
+- doc/cxxapi/HttpStatusExtractor_8h_source.html
+- doc/cxxapi/index.html
+- doc/cxxapi/inherit__graph__0.map
+- doc/cxxapi/inherit__graph__0.md5
+- doc/cxxapi/inherit__graph__0.png
+- doc/cxxapi/inherit__graph__1.map
+- doc/cxxapi/inherit__graph__1.md5
+- doc/cxxapi/inherit__graph__1.png
+- doc/cxxapi/inherit__graph__10.map
+- doc/cxxapi/inherit__graph__10.md5
+- doc/cxxapi/inherit__graph__10.png
+- doc/cxxapi/inherit__graph__11.map
+- doc/cxxapi/inherit__graph__11.md5
+- doc/cxxapi/inherit__graph__11.png
+- doc/cxxapi/inherit__graph__12.map
+- doc/cxxapi/inherit__graph__12.md5
+- doc/cxxapi/inherit__graph__12.png
+- doc/cxxapi/inherit__graph__13.map
+- doc/cxxapi/inherit__graph__13.md5
+- doc/cxxapi/inherit__graph__13.png
+- doc/cxxapi/inherit__graph__14.map
+- doc/cxxapi/inherit__graph__14.md5
+- doc/cxxapi/inherit__graph__14.png
+- doc/cxxapi/inherit__graph__15.map
+- doc/cxxapi/inherit__graph__15.md5
+- doc/cxxapi/inherit__graph__15.png
+- doc/cxxapi/inherit__graph__16.map
+- doc/cxxapi/inherit__graph__16.md5
+- doc/cxxapi/inherit__graph__16.png
+- doc/cxxapi/inherit__graph__17.map
+- doc/cxxapi/inherit__graph__17.md5
+- doc/cxxapi/inherit__graph__17.png
+- doc/cxxapi/inherit__graph__18.map
+- doc/cxxapi/inherit__graph__18.md5
+- doc/cxxapi/inherit__graph__18.png
+- doc/cxxapi/inherit__graph__19.map
+- doc/cxxapi/inherit__graph__19.md5
+- doc/cxxapi/inherit__graph__19.png
+- doc/cxxapi/inherit__graph__2.map
+- doc/cxxapi/inherit__graph__2.md5
+- doc/cxxapi/inherit__graph__2.png
+- doc/cxxapi/inherit__graph__20.map
+- doc/cxxapi/inherit__graph__20.md5
+- doc/cxxapi/inherit__graph__20.png
+- doc/cxxapi/inherit__graph__21.map
+- doc/cxxapi/inherit__graph__21.md5
+- doc/cxxapi/inherit__graph__21.png
+- doc/cxxapi/inherit__graph__22.map
+- doc/cxxapi/inherit__graph__22.md5
+- doc/cxxapi/inherit__graph__22.png
+- doc/cxxapi/inherit__graph__23.map
+- doc/cxxapi/inherit__graph__23.md5
+- doc/cxxapi/inherit__graph__23.png
+- doc/cxxapi/inherit__graph__24.map
+- doc/cxxapi/inherit__graph__24.md5
+- doc/cxxapi/inherit__graph__24.png
+- doc/cxxapi/inherit__graph__25.map
+- doc/cxxapi/inherit__graph__25.md5
+- doc/cxxapi/inherit__graph__25.png
+- doc/cxxapi/inherit__graph__26.map
+- doc/cxxapi/inherit__graph__26.md5
+- doc/cxxapi/inherit__graph__26.png
+- doc/cxxapi/inherit__graph__27.map
+- doc/cxxapi/inherit__graph__27.md5
+- doc/cxxapi/inherit__graph__27.png
+- doc/cxxapi/inherit__graph__28.map
+- doc/cxxapi/inherit__graph__28.md5
+- doc/cxxapi/inherit__graph__28.png
+- doc/cxxapi/inherit__graph__29.map
+- doc/cxxapi/inherit__graph__29.md5
+- doc/cxxapi/inherit__graph__29.png
+- doc/cxxapi/inherit__graph__3.map
+- doc/cxxapi/inherit__graph__3.md5
+- doc/cxxapi/inherit__graph__3.png
+- doc/cxxapi/inherit__graph__30.map
+- doc/cxxapi/inherit__graph__30.md5
+- doc/cxxapi/inherit__graph__30.png
+- doc/cxxapi/inherit__graph__31.map
+- doc/cxxapi/inherit__graph__31.md5
+- doc/cxxapi/inherit__graph__31.png
+- doc/cxxapi/inherit__graph__32.map
+- doc/cxxapi/inherit__graph__32.md5
+- doc/cxxapi/inherit__graph__32.png
+- doc/cxxapi/inherit__graph__33.map
+- doc/cxxapi/inherit__graph__33.md5
+- doc/cxxapi/inherit__graph__33.png
+- doc/cxxapi/inherit__graph__34.map
+- doc/cxxapi/inherit__graph__34.md5
+- doc/cxxapi/inherit__graph__34.png
+- doc/cxxapi/inherit__graph__35.map
+- doc/cxxapi/inherit__graph__35.md5
+- doc/cxxapi/inherit__graph__35.png
+- doc/cxxapi/inherit__graph__36.map
+- doc/cxxapi/inherit__graph__36.md5
+- doc/cxxapi/inherit__graph__36.png
+- doc/cxxapi/inherit__graph__37.map
+- doc/cxxapi/inherit__graph__37.md5
+- doc/cxxapi/inherit__graph__37.png
+- doc/cxxapi/inherit__graph__38.map
+- doc/cxxapi/inherit__graph__38.md5
+- doc/cxxapi/inherit__graph__38.png
+- doc/cxxapi/inherit__graph__39.map
+- doc/cxxapi/inherit__graph__39.md5
+- doc/cxxapi/inherit__graph__39.png
+- doc/cxxapi/inherit__graph__4.map
+- doc/cxxapi/inherit__graph__4.md5
+- doc/cxxapi/inherit__graph__4.png
+- doc/cxxapi/inherit__graph__40.map
+- doc/cxxapi/inherit__graph__40.md5
+- doc/cxxapi/inherit__graph__40.png
+- doc/cxxapi/inherit__graph__41.map
+- doc/cxxapi/inherit__graph__41.md5
+- doc/cxxapi/inherit__graph__41.png
+- doc/cxxapi/inherit__graph__5.map
+- doc/cxxapi/inherit__graph__5.md5
+- doc/cxxapi/inherit__graph__5.png
+- doc/cxxapi/inherit__graph__6.map
+- doc/cxxapi/inherit__graph__6.md5
+- doc/cxxapi/inherit__graph__6.png
+- doc/cxxapi/inherit__graph__7.map
+- doc/cxxapi/inherit__graph__7.md5
+- doc/cxxapi/inherit__graph__7.png
+- doc/cxxapi/inherit__graph__8.map
+- doc/cxxapi/inherit__graph__8.md5
+- doc/cxxapi/inherit__graph__8.png
+- doc/cxxapi/inherit__graph__9.map
+- doc/cxxapi/inherit__graph__9.md5
+- doc/cxxapi/inherit__graph__9.png
+- doc/cxxapi/inherits.html
+- doc/cxxapi/IniFile_8h_source.html
+- doc/cxxapi/Logging_8h_source.html
+- doc/cxxapi/main.html
+- doc/cxxapi/MessageChannel_8h_source.html
+- doc/cxxapi/MessageClient_8h_source.html
+- doc/cxxapi/MessageReadersWriters_8h_source.html
+- doc/cxxapi/MessageServer_8h_source.html
+- doc/cxxapi/modules.html
+- doc/cxxapi/namespacemembers.html
+- doc/cxxapi/namespacemembers_enum.html
+- doc/cxxapi/namespacemembers_eval.html
+- doc/cxxapi/namespacemembers_func.html
+- doc/cxxapi/namespacemembers_type.html
+- doc/cxxapi/namespacePassenger.html
+- doc/cxxapi/namespaces.html
+- doc/cxxapi/nginx_2Configuration_8h_source.html
+- doc/cxxapi/ngx__http__passenger__module_8h_source.html
+- doc/cxxapi/PoolOptions_8h_source.html
+- doc/cxxapi/Process_8h_source.html
+- doc/cxxapi/RandomGenerator_8h_source.html
+- doc/cxxapi/ResourceLocator_8h_source.html
+- doc/cxxapi/SafeLibev_8h_source.html
+- doc/cxxapi/ScgiRequestParser_8h_source.html
+- doc/cxxapi/ServerInstanceDir_8h_source.html
+- doc/cxxapi/Session_8h_source.html
+- doc/cxxapi/SpawnManager_8h_source.html
+- doc/cxxapi/StaticContentHandler_8h_source.html
+- doc/cxxapi/StaticString_8h_source.html
+- doc/cxxapi/StringListCreator_8h_source.html
+- doc/cxxapi/structPassenger_1_1MessageServer_1_1DisconnectEventBroadcastGuard-members.html
+- doc/cxxapi/structPassenger_1_1MessageServer_1_1DisconnectEventBroadcastGuard.html
+- doc/cxxapi/structPassenger_1_1PoolOptions-members.html
+- doc/cxxapi/structPassenger_1_1PoolOptions.html
+- doc/cxxapi/structPassenger_1_1StaticString_1_1Hash-members.html
+- doc/cxxapi/structPassenger_1_1StaticString_1_1Hash.html
+- doc/cxxapi/tab_b.gif
+- doc/cxxapi/tab_l.gif
+- doc/cxxapi/tab_r.gif
+- doc/cxxapi/tabs.css
+- doc/cxxapi/tree.html
+- doc/cxxapi/Utils_8h_source.html
 - doc/definitions.h
 - doc/Doxyfile
 - doc/images/by_sa.png
@@ -290,6 +669,167 @@ files:
 - doc/images/spawn_server_architecture.svg
 - doc/images/typical_isolated_web_application.png
 - doc/images/typical_isolated_web_application.svg
+- doc/rdoc/classes/ConditionVariable.html
+- doc/rdoc/classes/Exception.html
+- doc/rdoc/classes/GC.html
+- doc/rdoc/classes/IO.html
+- doc/rdoc/classes/PhusionPassenger/AbstractInstaller.html
+- doc/rdoc/classes/PhusionPassenger/AbstractRequestHandler.html
+- doc/rdoc/classes/PhusionPassenger/AbstractServer/InvalidPassword.html
+- doc/rdoc/classes/PhusionPassenger/AbstractServer/ServerAlreadyStarted.html
+- doc/rdoc/classes/PhusionPassenger/AbstractServer/ServerError.html
+- doc/rdoc/classes/PhusionPassenger/AbstractServer/ServerNotStarted.html
+- doc/rdoc/classes/PhusionPassenger/AbstractServer/UnknownMessage.html
+- doc/rdoc/classes/PhusionPassenger/AbstractServer.html
+- doc/rdoc/classes/PhusionPassenger/AbstractServerCollection.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools/MemoryStats/Process.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools/MemoryStats.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/CorruptedDirectoryError.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/GenerationsAbsentError.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/Group.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/Process.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/RoleDeniedError.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/StaleDirectoryError.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/Stats.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/UnsupportedGenerationStructureVersionError.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools.html
+- doc/rdoc/classes/PhusionPassenger/AnalyticsLogger/Lock.html
+- doc/rdoc/classes/PhusionPassenger/AnalyticsLogger/Log.html
+- doc/rdoc/classes/PhusionPassenger/AnalyticsLogger/SharedData.html
+- doc/rdoc/classes/PhusionPassenger/AnalyticsLogger.html
+- doc/rdoc/classes/PhusionPassenger/AppInitError.html
+- doc/rdoc/classes/PhusionPassenger/AppProcess.html
+- doc/rdoc/classes/PhusionPassenger/ClassicRails/ApplicationSpawner/Error.html
+- doc/rdoc/classes/PhusionPassenger/ClassicRails/ApplicationSpawner.html
+- doc/rdoc/classes/PhusionPassenger/ClassicRails/CGIFixed.html
+- doc/rdoc/classes/PhusionPassenger/ClassicRails/FrameworkSpawner/Error.html
+- doc/rdoc/classes/PhusionPassenger/ClassicRails/FrameworkSpawner.html
+- doc/rdoc/classes/PhusionPassenger/ClassicRails/RequestHandler.html
+- doc/rdoc/classes/PhusionPassenger/ClassicRails.html
+- doc/rdoc/classes/PhusionPassenger/ClassicRailsExtensions/AnalyticsLogging.html
+- doc/rdoc/classes/PhusionPassenger/ClassicRailsExtensions.html
+- doc/rdoc/classes/PhusionPassenger/ConsoleTextTemplate.html
+- doc/rdoc/classes/PhusionPassenger/DebugLogging.html
+- doc/rdoc/classes/PhusionPassenger/FrameworkInitError.html
+- doc/rdoc/classes/PhusionPassenger/HTMLTemplate.html
+- doc/rdoc/classes/PhusionPassenger/InitializationError.html
+- doc/rdoc/classes/PhusionPassenger/InvalidPath.html
+- doc/rdoc/classes/PhusionPassenger/MessageChannel/InvalidHashError.html
+- doc/rdoc/classes/PhusionPassenger/MessageChannel.html
+- doc/rdoc/classes/PhusionPassenger/MessageClient.html
+- doc/rdoc/classes/PhusionPassenger/NativeSupportLoader.html
+- doc/rdoc/classes/PhusionPassenger/Packaging.html
+- doc/rdoc/classes/PhusionPassenger/PlatformInfo.html
+- doc/rdoc/classes/PhusionPassenger/Plugin.html
+- doc/rdoc/classes/PhusionPassenger/Rack/ApplicationSpawner/Error.html
+- doc/rdoc/classes/PhusionPassenger/Rack/ApplicationSpawner.html
+- doc/rdoc/classes/PhusionPassenger/Rack/RequestHandler.html
+- doc/rdoc/classes/PhusionPassenger/Rack.html
+- doc/rdoc/classes/PhusionPassenger/Rails3Extensions/AnalyticsLogging/ACExtension.html
+- doc/rdoc/classes/PhusionPassenger/Rails3Extensions/AnalyticsLogging/ASBenchmarkableExtension.html
+- doc/rdoc/classes/PhusionPassenger/Rails3Extensions/AnalyticsLogging/ExceptionLogger.html
+- doc/rdoc/classes/PhusionPassenger/Rails3Extensions/AnalyticsLogging.html
+- doc/rdoc/classes/PhusionPassenger/Rails3Extensions.html
+- doc/rdoc/classes/PhusionPassenger/SpawnManager.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/AppFinder.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/Command.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/ConfigFile/DisallowedContextError.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/ConfigFile.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/HelpCommand.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/Main.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/PackageRuntimeCommand.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/RuntimeInstaller.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/StartCommand.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/StatusCommand.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/StopCommand.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/Utils.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/VersionCommand.html
+- doc/rdoc/classes/PhusionPassenger/Standalone.html
+- doc/rdoc/classes/PhusionPassenger/UnknownError.html
+- doc/rdoc/classes/PhusionPassenger/Utils/FileSystemWatcher/DirInfo.html
+- doc/rdoc/classes/PhusionPassenger/Utils/FileSystemWatcher/FileInfo.html
+- doc/rdoc/classes/PhusionPassenger/Utils/FileSystemWatcher.html
+- doc/rdoc/classes/PhusionPassenger/Utils/HostsFileParser.html
+- doc/rdoc/classes/PhusionPassenger/Utils/PseudoIO.html
+- doc/rdoc/classes/PhusionPassenger/Utils/RewindableInput/Tempfile.html
+- doc/rdoc/classes/PhusionPassenger/Utils/RewindableInput.html
+- doc/rdoc/classes/PhusionPassenger/Utils/UnseekableSocket.html
+- doc/rdoc/classes/PhusionPassenger/Utils.html
+- doc/rdoc/classes/PhusionPassenger/VersionNotFound.html
+- doc/rdoc/classes/PhusionPassenger/WSGI/ApplicationSpawner.html
+- doc/rdoc/classes/PhusionPassenger/WSGI.html
+- doc/rdoc/classes/PhusionPassenger.html
+- doc/rdoc/classes/Process.html
+- doc/rdoc/classes/Signal.html
+- doc/rdoc/created.rid
+- doc/rdoc/files/DEVELOPERS_TXT.html
+- doc/rdoc/files/lib/phusion_passenger/abstract_installer_rb.html
+- doc/rdoc/files/lib/phusion_passenger/abstract_request_handler_rb.html
+- doc/rdoc/files/lib/phusion_passenger/abstract_server_collection_rb.html
+- doc/rdoc/files/lib/phusion_passenger/abstract_server_rb.html
+- doc/rdoc/files/lib/phusion_passenger/admin_tools/memory_stats_rb.html
+- doc/rdoc/files/lib/phusion_passenger/admin_tools/server_instance_rb.html
+- doc/rdoc/files/lib/phusion_passenger/admin_tools_rb.html
+- doc/rdoc/files/lib/phusion_passenger/analytics_logger_rb.html
+- doc/rdoc/files/lib/phusion_passenger/app_process_rb.html
+- doc/rdoc/files/lib/phusion_passenger/classic_rails/application_spawner_rb.html
+- doc/rdoc/files/lib/phusion_passenger/classic_rails/cgi_fixed_rb.html
+- doc/rdoc/files/lib/phusion_passenger/classic_rails/framework_spawner_rb.html
+- doc/rdoc/files/lib/phusion_passenger/classic_rails/request_handler_rb.html
+- doc/rdoc/files/lib/phusion_passenger/classic_rails_extensions/init_rb.html
+- doc/rdoc/files/lib/phusion_passenger/console_text_template_rb.html
+- doc/rdoc/files/lib/phusion_passenger/constants_rb.html
+- doc/rdoc/files/lib/phusion_passenger/debug_logging_rb.html
+- doc/rdoc/files/lib/phusion_passenger/dependencies_rb.html
+- doc/rdoc/files/lib/phusion_passenger/exceptions_rb.html
+- doc/rdoc/files/lib/phusion_passenger/html_template_rb.html
+- doc/rdoc/files/lib/phusion_passenger/message_channel_rb.html
+- doc/rdoc/files/lib/phusion_passenger/message_client_rb.html
+- doc/rdoc/files/lib/phusion_passenger/native_support_rb.html
+- doc/rdoc/files/lib/phusion_passenger/packaging_rb.html
+- doc/rdoc/files/lib/phusion_passenger/platform_info/apache_rb.html
+- doc/rdoc/files/lib/phusion_passenger/platform_info/binary_compatibility_rb.html
+- doc/rdoc/files/lib/phusion_passenger/platform_info/compiler_rb.html
+- doc/rdoc/files/lib/phusion_passenger/platform_info/curl_rb.html
+- doc/rdoc/files/lib/phusion_passenger/platform_info/documentation_tools_rb.html
+- doc/rdoc/files/lib/phusion_passenger/platform_info/linux_rb.html
+- doc/rdoc/files/lib/phusion_passenger/platform_info/operating_system_rb.html
+- doc/rdoc/files/lib/phusion_passenger/platform_info/ruby_rb.html
+- doc/rdoc/files/lib/phusion_passenger/platform_info/zlib_rb.html
+- doc/rdoc/files/lib/phusion_passenger/platform_info_rb.html
+- doc/rdoc/files/lib/phusion_passenger/plugin_rb.html
+- doc/rdoc/files/lib/phusion_passenger/public_api_rb.html
+- doc/rdoc/files/lib/phusion_passenger/rack/application_spawner_rb.html
+- doc/rdoc/files/lib/phusion_passenger/rack/request_handler_rb.html
+- doc/rdoc/files/lib/phusion_passenger/rails3_extensions/init_rb.html
+- doc/rdoc/files/lib/phusion_passenger/simple_benchmarking_rb.html
+- doc/rdoc/files/lib/phusion_passenger/spawn_manager_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/app_finder_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/command_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/config_file_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/help_command_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/main_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/package_runtime_command_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/runtime_installer_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/start_command_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/status_command_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/stop_command_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/utils_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/version_command_rb.html
+- doc/rdoc/files/lib/phusion_passenger/utils/file_system_watcher_rb.html
+- doc/rdoc/files/lib/phusion_passenger/utils/hosts_file_parser_rb.html
+- doc/rdoc/files/lib/phusion_passenger/utils/rewindable_input_rb.html
+- doc/rdoc/files/lib/phusion_passenger/utils/tmpdir_rb.html
+- doc/rdoc/files/lib/phusion_passenger/utils/unseekable_socket_rb.html
+- doc/rdoc/files/lib/phusion_passenger/utils_rb.html
+- doc/rdoc/files/lib/phusion_passenger/wsgi/application_spawner_rb.html
+- doc/rdoc/files/README.html
+- doc/rdoc/fr_class_index.html
+- doc/rdoc/fr_file_index.html
+- doc/rdoc/fr_method_index.html
+- doc/rdoc/index.html
+- doc/rdoc/rdoc-style.css
 - doc/Security of user switching support.html
 - doc/Security of user switching support.txt
 - doc/template/horo.rb
@@ -333,7 +873,10 @@ files:
 - ext/common/AgentBase.cpp
 - ext/common/AgentsStarter.cpp
 - ext/common/BCrypt.cpp
+- ext/common/libboost_oxt/aggregate.cpp
+- ext/common/libpassenger_common/aggregate.cpp
 - ext/common/Logging.cpp
+- ext/common/LoggingAgent/FilterSupport.cpp
 - ext/common/LoggingAgent/Main.cpp
 - ext/common/Utils/Base64.cpp
 - ext/common/Utils/CachedFileStat.cpp