passenger 3.0.2 → 3.0.3

data/test/cxx/LoggingTest.cpp

@@ -910,5 +910,33 @@ namespace tut {
 		ensure(fileExists(filename));
 	}
 	
+	TEST_METHOD(33) {
+		// A transaction is only written to the sink if it passes all given filters.
+		// Test logging of new transaction.
+		SystemTime::forceAll(YESTERDAY);
+		
+		AnalyticsLogPtr log = logger->newTransaction("foobar", "requests", "",
+			"uri == \"/foo\""
+			"\1"
+			"uri != \"/bar\"");
+		log->message("URI: /foo");
+		log->message("transaction 1");
+		log->flushToDiskAfterClose(true);
+		log.reset();
+		
+		log = logger->newTransaction("foobar", "requests", "",
+			"uri == \"/foo\""
+			"\1"
+			"uri == \"/bar\"");
+		log->message("URI: /foo");
+		log->message("transaction 2");
+		log->flushToDiskAfterClose(true);
+		log.reset();
+		
+		string data = readAll(loggingDir + "/1/" FOOBAR_LOCALHOST_PREFIX "/requests/2010/01/12/12/log.txt");
+		ensure("(1)", data.find("transaction 1\n") != string::npos);
+		ensure("(2)", data.find("transaction 2\n") == string::npos);
+	}
+	
 	/************************************/
 }

data/test/cxx/StringMapTest.cpp

@@ -0,0 +1,70 @@
+#include "TestSupport.h"
+#include "Utils/StringMap.h"
+#include <string>
+
+using namespace Passenger;
+using namespace std;
+
+namespace tut {
+	struct StringMapTest {
+	};
+	
+	DEFINE_TEST_GROUP(StringMapTest);
+	
+	TEST_METHOD(1) {
+		// get()ing a nonexistant key returns the default value.
+		StringMap<string> m;
+		ensure_equals(m.get("hello"), "");
+	}
+	
+	TEST_METHOD(2) {
+		// set() works.
+		StringMap<string> m;
+		m.set("hello", "world");
+		m.set("foo", "bar");
+		ensure_equals(m.get("hello"), "world");
+		ensure_equals(m.get("foo"), "bar");
+		ensure_equals(m.get("something"), "");
+	}
+	
+	TEST_METHOD(3) {
+		// set() overwrites old value.
+		StringMap<string> m;
+		m.set("hello", "world");
+		m.set("foo", "bar");
+		m.set("hello", "new world");
+		ensure_equals(m.get("hello"), "new world");
+		ensure_equals(m.get("foo"), "bar");
+	}
+	
+	TEST_METHOD(4) {
+		// The key is interned so changing the original has no effect.
+		StringMap<string> m;
+		char key1[] = "hello";
+		char key2[] = "world";
+		
+		m.set(key1, "xxx");
+		m.set(key2, "yyy");
+		
+		key1[4] = 'p';
+		strcpy(key2, "zzzzz");
+		
+		ensure_equals(m.get("hello"), "xxx");
+		ensure_equals(m.get("hellp"), "");
+		
+		ensure_equals(m.get("world"), "yyy");
+		ensure_equals(m.get("zzzzz"), "");
+	}
+	
+	TEST_METHOD(5) {
+		// remove() works.
+		StringMap<string> m;
+		m.set("hello", "world");
+		m.set("foo", "bar");
+		
+		ensure(m.remove("hello"));
+		ensure_equals(m.get("hello"), "");
+		ensure_equals(m.get("foo"), "bar");
+		ensure(!m.remove("hello"));
+	}
+}

data/test/integration_tests/cgi_environment_spec.rb

@@ -4,11 +4,21 @@ shared_examples_for "CGI environment variables compliance" do
 		cgi_envs.should include("REQUEST_URI = #{@base_uri}/welcome/cgi_environment?foo=escaped%20string\n")
 	end
 	
+	specify "REQUEST_URI contains the original escaped URI" do
+		cgi_envs = get('/welcome/cgi_environment/%C3%BC?foo=escaped%20string')
+		cgi_envs.downcase.should include("request_uri = #{@base_uri}/welcome/cgi_environment/%c3%bc?foo=escaped%20string\n")
+	end
+	
 	specify "PATH_INFO contains the request URI without the base URI and without the query string" do
 		cgi_envs = get('/welcome/cgi_environment?foo=escaped%20string')
 		cgi_envs.should include("PATH_INFO = /welcome/cgi_environment\n")
 	end
 	
+	specify "PATH_INFO contains the original escaped URI" do
+		cgi_envs = get('/welcome/cgi_environment/%C3%BC')
+		cgi_envs.downcase.should include("path_info = /welcome/cgi_environment/%c3%bc\n")
+	end
+	
 	specify "QUERY_STRING contains the query string" do
 		cgi_envs = get('/welcome/cgi_environment?foo=escaped%20string')
 		cgi_envs.should include("QUERY_STRING = foo=escaped%20string\n")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
+  hash: 1
+  prerelease: 
   segments: 
   - 3
   - 0
-  - 2
-  version: 3.0.2
+  - 3
+  version: 3.0.3
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-16 00:00:00 +01:00
+date: 2011-02-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -744,6 +744,166 @@ 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/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
@@ -787,8 +947,6 @@ 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/Main.cpp
 - ext/common/Utils/Base64.cpp
@@ -822,6 +980,7 @@ files:
 - ext/common/Logging.h
 - ext/common/LoggingAgent/ChangeNotifier.h
 - ext/common/LoggingAgent/DataStoreId.h
+- ext/common/LoggingAgent/FilterSupport.h
 - ext/common/LoggingAgent/LoggingServer.h
 - ext/common/LoggingAgent/RemoteSender.h
 - ext/common/MessageChannel.h
@@ -848,6 +1007,7 @@ files:
 - ext/common/Utils/MemZeroGuard.h
 - ext/common/Utils/ProcessMetricsCollector.h
 - ext/common/Utils/ScopeGuard.h
+- ext/common/Utils/StringMap.h
 - ext/common/Utils/StrIntUtils.h
 - ext/common/Utils/SystemTime.h
 - ext/common/Utils/Timer.h
@@ -1602,6 +1762,7 @@ files:
 - test/cxx/EventedClientTest.cpp
 - test/cxx/FileChangeCheckerTest.cpp
 - test/cxx/FileDescriptorTest.cpp
+- test/cxx/FilterSupportTest.cpp
 - test/cxx/HttpStatusExtractorTest.cpp
 - test/cxx/IOUtilsTest.cpp
 - test/cxx/LoggingTest.cpp
@@ -1614,6 +1775,7 @@ files:
 - test/cxx/ServerInstanceDirTest.cpp
 - test/cxx/SpawnManagerTest.cpp
 - test/cxx/StaticStringTest.cpp
+- test/cxx/StringMapTest.cpp
 - test/cxx/SystemTimeTest.cpp
 - test/cxx/TestSupport.cpp
 - test/cxx/UtilsTest.cpp
@@ -2009,7 +2171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: passenger
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Easy and robust Ruby web application deployment

data/ext/common/libboost_oxt/aggregate.cpp

@@ -1,10 +0,0 @@
-
-				#ifndef _GNU_SOURCE
-					#define _GNU_SOURCE
-				#endif
-			#include "boost/src/pthread/once.cpp"
-#include "boost/src/pthread/thread.cpp"
-#include "oxt/backtrace.cpp"
-#include "oxt/system_calls.cpp"
-#include "oxt/thread.cpp"
-#include "oxt/tracable_exception.cpp"

data/ext/common/libpassenger_common/aggregate.cpp

@@ -1,15 +0,0 @@
-
-				#ifndef _GNU_SOURCE
-					#define _GNU_SOURCE
-				#endif
-			#include "common/AccountsDatabase.cpp"
-#include "common/AgentBase.cpp"
-#include "common/AgentsStarter.cpp"
-#include "common/Logging.cpp"
-#include "common/Utils.cpp"
-#include "common/Utils/Base64.cpp"
-#include "common/Utils/CachedFileStat.cpp"
-#include "common/Utils/IOUtils.cpp"
-#include "common/Utils/MD5.cpp"
-#include "common/Utils/StrIntUtils.cpp"
-#include "common/Utils/SystemTime.cpp"