passenger 5.0.0.beta3 → 5.0.0.rc1

data/build/cplusplus_support.rb

@@ -24,73 +24,73 @@
 # Rake functions for compiling/linking C++ stuff.
 
 def run_compiler(*command)
-	PhusionPassenger.require_passenger_lib 'utils/ansi_colors' if !defined?(PhusionPassenger::Utils::AnsiColors)
-	show_command = command.join(' ')
-	puts show_command
-	if !system(*command)
-		if $? && $?.exitstatus == 4
-			# This probably means the compiler ran out of memory.
-			msg = "<b>" +
-			      "-----------------------------------------------\n" +
-			      "Your compiler failed with the exit status 4. This " +
-			      "probably means that it ran out of memory. To solve " +
-			      "this problem, try increasing your swap space: " +
-			      "https://www.digitalocean.com/community/articles/how-to-add-swap-on-ubuntu-12-04" +
-			      "</b>"
-			fail(PhusionPassenger::Utils::AnsiColors.ansi_colorize(msg))
-		elsif $? && $?.termsig == 9
-			msg = "<b>" +
-			      "-----------------------------------------------\n" +
-			      "Your compiler was killed by the operating system. This " +
-			      "probably means that it ran out of memory. To solve " +
-			      "this problem, try increasing your swap space: " +
-			      "https://www.digitalocean.com/community/articles/how-to-add-swap-on-ubuntu-12-04" +
-			      "</b>"
-			fail(PhusionPassenger::Utils::AnsiColors.ansi_colorize(msg))
-		else
-			fail "Command failed with status (#{$? ? $?.exitstatus : 1}): [#{show_command}]"
-		end
-	end
+  PhusionPassenger.require_passenger_lib 'utils/ansi_colors' if !defined?(PhusionPassenger::Utils::AnsiColors)
+  show_command = command.join(' ')
+  puts show_command
+  if !system(*command)
+    if $? && $?.exitstatus == 4
+      # This probably means the compiler ran out of memory.
+      msg = "<b>" +
+            "-----------------------------------------------\n" +
+            "Your compiler failed with the exit status 4. This " +
+            "probably means that it ran out of memory. To solve " +
+            "this problem, try increasing your swap space: " +
+            "https://www.digitalocean.com/community/articles/how-to-add-swap-on-ubuntu-12-04" +
+            "</b>"
+      fail(PhusionPassenger::Utils::AnsiColors.ansi_colorize(msg))
+    elsif $? && $?.termsig == 9
+      msg = "<b>" +
+            "-----------------------------------------------\n" +
+            "Your compiler was killed by the operating system. This " +
+            "probably means that it ran out of memory. To solve " +
+            "this problem, try increasing your swap space: " +
+            "https://www.digitalocean.com/community/articles/how-to-add-swap-on-ubuntu-12-04" +
+            "</b>"
+      fail(PhusionPassenger::Utils::AnsiColors.ansi_colorize(msg))
+    else
+      fail "Command failed with status (#{$? ? $?.exitstatus : 1}): [#{show_command}]"
+    end
+  end
 end
 
 def compile_c(source, flags = "#{EXTRA_PRE_CFLAGS} #{EXTRA_CFLAGS}")
-	run_compiler "#{CC} #{flags} -c #{source}"
+  run_compiler "#{CC} #{flags} -c #{source}"
 end
 
 def compile_cxx(source, flags = "#{EXTRA_PRE_CXXFLAGS} #{EXTRA_CXXFLAGS}")
-	run_compiler "#{CXX} #{flags} -c #{source}"
+  run_compiler "#{CXX} #{flags} -c #{source}"
 end
 
 def create_static_library(target, sources)
-	# On OS X, 'ar cru' will sometimes fail with an obscure error:
-	#
-	#   ar: foo.a is a fat file (use libtool(1) or lipo(1) and ar(1) on it)
-	#   ar: foo.a: Inappropriate file type or format
-	#
-	# So here we delete the ar file before creating it, which bypasses this problem.
-	sh "rm -rf #{target}"
-	sh "ar cru #{target} #{sources}"
-	sh "ranlib #{target}"
+  # On OS X, 'ar cru' will sometimes fail with an obscure error:
+  #
+  #   ar: foo.a is a fat file (use libtool(1) or lipo(1) and ar(1) on it)
+  #   ar: foo.a: Inappropriate file type or format
+  #
+  # So here we delete the ar file before creating it, which bypasses this problem.
+  sh "rm -rf #{target}"
+  sh "ar cru #{target} #{sources}"
+  sh "ranlib #{target}"
 end
 
 def create_executable(target, sources, linkflags = "#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_C_LDFLAGS} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_cxx_ldflags} #{EXTRA_CXX_LDFLAGS}")
-	run_compiler "#{CXX} #{sources} -o #{target} #{linkflags}"
+  run_compiler "#{CXX} #{sources} -o #{target} #{linkflags}"
 end
 
 def create_c_executable(target, sources, linkflags = "#{EXTRA_PRE_CFLAGS} #{EXTRA_PRE_CXX_LDFLAGS}#{EXTRA_CFLAGS} #{PlatformInfo.portability_c_ldflags} #{EXTRA_C_LDFLAGS}")
-	run_compiler "#{CC} #{sources} -o #{target} #{linkflags}"
+  run_compiler "#{CC} #{sources} -o #{target} #{linkflags}"
 end
 
 def create_shared_library(target, sources, flags = "#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_CXX_LDFLAGS} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_cxx_ldflags} #{EXTRA_CXX_LDFLAGS}")
-	if PlatformInfo.os_name == "macosx"
-		shlib_flag = "-flat_namespace -bundle -undefined dynamic_lookup"
-	else
-		shlib_flag = "-shared"
-	end
-	if PhusionPassenger::PlatformInfo.cxx_is_sun_studio?
-		fPIC = "-KPIC"
-	else
-		fPIC = "-fPIC"
-	end
-	run_compiler "#{CXX} #{shlib_flag} #{sources} #{fPIC} -o #{target} #{flags}"
+  if PlatformInfo.os_name == "macosx"
+    shlib_flag = "-flat_namespace -bundle -undefined dynamic_lookup"
+  else
+    shlib_flag = "-shared"
+  end
+  if PhusionPassenger::PlatformInfo.cxx_is_sun_studio?
+    fPIC = "-KPIC"
+  else
+    fPIC = "-fPIC"
+  end
+  run_compiler "#{CXX} #{shlib_flag} #{sources} #{fPIC} -o #{target} #{flags}"
 end

data/build/cxx_tests.rb

@@ -24,298 +24,298 @@
 ### C++ components tests ###
 
 TEST_CXX_CFLAGS = "-Iext -Iext/common " <<
-	"#{EXTRA_PRE_CXXFLAGS} " <<
-	"#{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} #{PlatformInfo.curl_flags} -Itest/cxx -Itest/support " <<
-	"#{TEST_COMMON_CFLAGS}"
+  "#{EXTRA_PRE_CXXFLAGS} " <<
+  "#{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} #{PlatformInfo.curl_flags} -Itest/cxx -Itest/support " <<
+  "#{TEST_COMMON_CFLAGS}"
 TEST_CXX_CFLAGS << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
 TEST_CXX_LDFLAGS = "#{EXTRA_PRE_CXX_LDFLAGS} " <<
-	"#{TEST_COMMON_LIBRARY.link_objects_as_string} " <<
-	"#{TEST_BOOST_OXT_LIBRARY} #{LIBEV_LIBS} #{LIBEIO_LIBS} " <<
-	"#{PlatformInfo.curl_libs} " <<
-	"#{PlatformInfo.zlib_libs} " <<
-	"#{PlatformInfo.portability_cxx_ldflags}"
+  "#{TEST_COMMON_LIBRARY.link_objects_as_string} " <<
+  "#{TEST_BOOST_OXT_LIBRARY} #{LIBEV_LIBS} #{LIBEIO_LIBS} " <<
+  "#{PlatformInfo.curl_libs} " <<
+  "#{PlatformInfo.zlib_libs} " <<
+  "#{PlatformInfo.portability_cxx_ldflags}"
 TEST_CXX_LDFLAGS << " #{PlatformInfo.dmalloc_ldflags}" if USE_DMALLOC
 TEST_CXX_LDFLAGS << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
 TEST_CXX_LDFLAGS << " #{EXTRA_CXX_LDFLAGS}"
 TEST_CXX_LDFLAGS.strip!
 TEST_CXX_OBJECTS = {
-	'test/cxx/CxxTestMain.o' => %w(
-		test/cxx/CxxTestMain.cpp),
-	'test/cxx/TestSupport.o' => %w(
-		test/cxx/TestSupport.cpp
-		test/cxx/TestSupport.h
-		ext/common/SafeLibev.h
-		ext/common/BackgroundEventLoop.cpp
-		ext/common/Exceptions.h
-		ext/common/Utils.h),
-	'test/cxx/ApplicationPool2/OptionsTest.o' => %w(
-		test/cxx/ApplicationPool2/OptionsTest.cpp
-		ext/common/ApplicationPool2/Options.h),
-	'test/cxx/ApplicationPool2/DirectSpawnerTest.o' => %w(
-		test/cxx/ApplicationPool2/DirectSpawnerTest.cpp
-		test/cxx/ApplicationPool2/SpawnerTestCases.cpp
-		ext/common/ApplicationPool2/Options.h
-		ext/common/ApplicationPool2/Process.h
-		ext/common/ApplicationPool2/Socket.h
-		ext/common/ApplicationPool2/Spawner.h
-		ext/common/ApplicationPool2/DirectSpawner.h),
-	'test/cxx/ApplicationPool2/SmartSpawnerTest.o' => %w(
-		test/cxx/ApplicationPool2/SmartSpawnerTest.cpp
-		test/cxx/ApplicationPool2/SpawnerTestCases.cpp
-		ext/common/ApplicationPool2/Options.h
-		ext/common/ApplicationPool2/Process.h
-		ext/common/ApplicationPool2/Socket.h
-		ext/common/ApplicationPool2/Spawner.h
-		ext/common/ApplicationPool2/SmartSpawner.h),
-	'test/cxx/ApplicationPool2/ProcessTest.o' => %w(
-		test/cxx/ApplicationPool2/ProcessTest.cpp
-		ext/common/ApplicationPool2/Process.h
-		ext/common/ApplicationPool2/Socket.h
-		ext/common/ApplicationPool2/Session.h),
-	'test/cxx/ApplicationPool2/PoolTest.o' => %w(
-		test/cxx/ApplicationPool2/PoolTest.cpp
-		ext/common/ApplicationPool2/SuperGroup.h
-		ext/common/ApplicationPool2/Group.h
-		ext/common/ApplicationPool2/Pool.h
-		ext/common/ApplicationPool2/Process.h
-		ext/common/ApplicationPool2/Socket.h
-		ext/common/ApplicationPool2/Options.h
-		ext/common/ApplicationPool2/Spawner.h
-		ext/common/ApplicationPool2/SpawnerFactory.h
-		ext/common/ApplicationPool2/SmartSpawner.h
-		ext/common/ApplicationPool2/DirectSpawner.h
-		ext/common/ApplicationPool2/DummySpawner.h),
-	'test/cxx/MemoryKit/MbufTest.o' => %w(
-		test/cxx/MemoryKit/MbufTest.cpp
-		ext/common/MemoryKit/mbuf.h),
-	'test/cxx/ServerKit/ChannelTest.o' => %w(
-		test/cxx/ServerKit/ChannelTest.cpp
-		ext/common/ServerKit/Channel.h
-		ext/common/ServerKit/Context.h),
-	'test/cxx/ServerKit/FileBufferedChannelTest.o' => %w(
-		test/cxx/ServerKit/FileBufferedChannelTest.cpp
-		ext/common/ServerKit/FileBufferedChannel.h
-		ext/common/ServerKit/Context.h),
-	'test/cxx/ServerKit/HeaderTableTest.o' => %w(
-		test/cxx/ServerKit/HeaderTableTest.cpp
-		ext/common/ServerKit/HeaderTable.h
-		ext/common/DataStructures/LString.h),
-	'test/cxx/ServerKit/ServerTest.o' => %w(
-		test/cxx/ServerKit/ServerTest.cpp
-		ext/common/ServerKit/Server.h
-		ext/common/ServerKit/Client.h
-		ext/common/ServerKit/Channel.h
-		ext/common/ServerKit/FdSourceChannel.h
-		ext/common/ServerKit/FileBufferedChannel.h
-		ext/common/ServerKit/FileBufferedFdSinkChannel.h
-		ext/common/ServerKit/Context.h),
-	'test/cxx/ServerKit/HttpServerTest.o' => %w(
-		test/cxx/ServerKit/HttpServerTest.cpp
-		ext/common/ServerKit/Server.h
-		ext/common/ServerKit/Client.h
-		ext/common/ServerKit/Channel.h
-		ext/common/ServerKit/FdSourceChannel.h
-		ext/common/ServerKit/FileBufferedChannel.h
-		ext/common/ServerKit/FileBufferedFdSinkChannel.h
-		ext/common/ServerKit/Context.h
-		ext/common/ServerKit/HttpServer.h
-		ext/common/ServerKit/HttpClient.h
-		ext/common/ServerKit/HttpRequest.h
-		ext/common/ServerKit/HttpHeaderParser.h
-		ext/common/ServerKit/HttpChunkedBodyParser.h),
-	'test/cxx/ServerKit/CookieUtilsTest.o' => %w(
-		test/cxx/ServerKit/CookieUtilsTest.cpp
-		ext/common/ServerKit/CookieUtils.h
-		ext/common/DataStructures/LString.h),
-	'test/cxx/DataStructures/LStringTest.o' => %w(
-		test/cxx/DataStructures/LStringTest.cpp
-		ext/common/DataStructures/LString.h),
-	'test/cxx/DataStructures/StringKeyTableTest.o' => %w(
-		test/cxx/DataStructures/StringKeyTableTest.cpp
-		ext/common/DataStructures/StringKeyTable.h),
-	'test/cxx/MessageReadersWritersTest.o' => %w(
-		test/cxx/MessageReadersWritersTest.cpp
-		ext/common/MessageReadersWriters.h
-		ext/common/Exceptions.h
-		ext/common/StaticString.h
-		ext/common/Utils/MemZeroGuard.h),
-	'test/cxx/StaticStringTest.o' => %w(
-		test/cxx/StaticStringTest.cpp
-		ext/common/StaticString.h),
-	'test/cxx/DechunkerTest.o' => %w(
-		test/cxx/DechunkerTest.cpp
-		ext/common/Utils/Dechunker.h),
-	'test/cxx/ResponseCacheTest.o' => %w(
-		test/cxx/ResponseCacheTest.cpp
-		ext/common/agents/HelperAgent/ResponseCache.h
-		ext/common/agents/HelperAgent/RequestHandler/Request.h
-		ext/common/agents/HelperAgent/RequestHandler/AppResponse.h
-		ext/common/ServerKit/HttpRequest.h),
-	'test/cxx/UnionStationTest.o' => %w(
-		test/cxx/UnionStationTest.cpp
-		ext/common/agents/LoggingAgent/LoggingServer.h
-		ext/common/agents/LoggingAgent/RemoteSender.h
-		ext/common/agents/LoggingAgent/DataStoreId.h
-		ext/common/agents/LoggingAgent/FilterSupport.h
-		ext/common/UnionStation/Connection.h
-		ext/common/UnionStation/Core.h
-		ext/common/UnionStation/Transaction.h
-		ext/common/Utils.h
-		ext/common/EventedServer.h
-		ext/common/EventedClient.h
-		ext/common/EventedMessageServer.h
-		ext/common/MessageReadersWriters.h
-		ext/common/MessageClient.h),
-	'test/cxx/EventedClientTest.o' => %w(
-		test/cxx/EventedClientTest.cpp
-		ext/common/EventedClient.h),
-	'test/cxx/EventedBufferedInput.o' => %w(
-		test/cxx/EventedBufferedInputTest.cpp
-		ext/common/EventedBufferedInput.h),
-	'test/cxx/MessageServerTest.o' => %w(
-		test/cxx/MessageServerTest.cpp
-		ext/common/Logging.h
-		ext/common/Account.h
-		ext/common/AccountsDatabase.h
-		ext/common/MessageServer.h),
-	# 'test/cxx/RequestHandlerTest.o' => %w(
-	# 	test/cxx/RequestHandlerTest.cpp
-	# 	ext/common/agents/HelperAgent/RequestHandler.h
-	# 	ext/common/agents/HelperAgent/FileBackedPipe.h
-	# 	ext/common/agents/HelperAgent/ScgiRequestParser.h
-	# 	ext/common/agents/HelperAgent/AgentOptions.h
-	# 	ext/common/UnionStation/Connection.h
-	# 	ext/common/UnionStation/Core.h
-	# 	ext/common/UnionStation/Transaction.h
-	# 	ext/common/UnionStation/ScopeLog.h
-	# 	ext/common/ApplicationPool2/Pool.h
-	# 	ext/common/ApplicationPool2/SuperGroup.h
-	# 	ext/common/ApplicationPool2/Group.h
-	# 	ext/common/ApplicationPool2/Process.h
-	# 	ext/common/ApplicationPool2/Options.h
-	# 	ext/common/ApplicationPool2/Spawner.h
-	# 	ext/common/ApplicationPool2/SpawnerFactory.h
-	# 	ext/common/ApplicationPool2/SmartSpawner.h
-	# 	ext/common/ApplicationPool2/DirectSpawner.h
-	# 	ext/common/ApplicationPool2/DummySpawner.h),
-	'test/cxx/FileChangeCheckerTest.o' => %w(
-		test/cxx/FileChangeCheckerTest.cpp
-		ext/common/Utils/FileChangeChecker.h
-		ext/common/Utils/CachedFileStat.hpp),
-	'test/cxx/FileDescriptorTest.o' => %w(
-		test/cxx/FileDescriptorTest.cpp
-		ext/common/FileDescriptor.h),
-	'test/cxx/SystemTimeTest.o' => %w(
-		test/cxx/SystemTimeTest.cpp
-		ext/common/Utils/SystemTime.h
-		ext/common/Utils/SystemTime.cpp),
-	'test/cxx/FilterSupportTest.o' => %w(
-		test/cxx/FilterSupportTest.cpp
-		ext/common/agents/LoggingAgent/FilterSupport.h),
-	'test/cxx/CachedFileStatTest.o' => %w(
-		test/cxx/CachedFileStatTest.cpp
-		ext/common/Utils/CachedFileStat.hpp
-		ext/common/Utils/CachedFileStat.cpp),
-	'test/cxx/BufferedIOTest.o' => %w(
-		test/cxx/BufferedIOTest.cpp
-		ext/common/Utils/BufferedIO.h
-		ext/common/Utils/Timer.h),
-	'test/cxx/MessageIOTest.o' => %w(
-		test/cxx/MessageIOTest.cpp
-		ext/common/Utils/MessageIO.h
-		ext/common/Utils/IOUtils.h),
-	'test/cxx/MessagePassingTest.o' => %w(
-		test/cxx/MessagePassingTest.cpp
-		ext/common/Utils/MessagePassing.h),
-	'test/cxx/VariantMapTest.o' => %w(
-		test/cxx/VariantMapTest.cpp
-		ext/common/Utils/VariantMap.h),
-	'test/cxx/StringMapTest.o' => %w(
-		test/cxx/StringMapTest.cpp
-		ext/common/Utils/StringMap.h
-		ext/common/Utils/HashMap.h),
-	'test/cxx/ProcessMetricsCollectorTest.o' => %w(
-		test/cxx/ProcessMetricsCollectorTest.cpp
-		ext/common/Utils/ProcessMetricsCollector.h),
-	'test/cxx/DateParsingTest.o' => %w(
-		test/cxx/DateParsingTest.cpp
-		ext/common/Utils/DateParsing.h),
-	'test/cxx/UtilsTest.o' => %w(
-		test/cxx/UtilsTest.cpp
-		ext/common/Utils.h),
-	'test/cxx/IOUtilsTest.o' => %w(
-		test/cxx/IOUtilsTest.cpp
-		ext/common/Utils/IOUtils.h),
-	'test/cxx/TemplateTest.o' => %w(
-		test/cxx/TemplateTest.cpp
-		ext/common/Utils/Template.h)
+  'test/cxx/CxxTestMain.o' => %w(
+    test/cxx/CxxTestMain.cpp),
+  'test/cxx/TestSupport.o' => %w(
+    test/cxx/TestSupport.cpp
+    test/cxx/TestSupport.h
+    ext/common/SafeLibev.h
+    ext/common/BackgroundEventLoop.cpp
+    ext/common/Exceptions.h
+    ext/common/Utils.h),
+  'test/cxx/ApplicationPool2/OptionsTest.o' => %w(
+    test/cxx/ApplicationPool2/OptionsTest.cpp
+    ext/common/ApplicationPool2/Options.h),
+  'test/cxx/ApplicationPool2/DirectSpawnerTest.o' => %w(
+    test/cxx/ApplicationPool2/DirectSpawnerTest.cpp
+    test/cxx/ApplicationPool2/SpawnerTestCases.cpp
+    ext/common/ApplicationPool2/Options.h
+    ext/common/ApplicationPool2/Process.h
+    ext/common/ApplicationPool2/Socket.h
+    ext/common/ApplicationPool2/Spawner.h
+    ext/common/ApplicationPool2/DirectSpawner.h),
+  'test/cxx/ApplicationPool2/SmartSpawnerTest.o' => %w(
+    test/cxx/ApplicationPool2/SmartSpawnerTest.cpp
+    test/cxx/ApplicationPool2/SpawnerTestCases.cpp
+    ext/common/ApplicationPool2/Options.h
+    ext/common/ApplicationPool2/Process.h
+    ext/common/ApplicationPool2/Socket.h
+    ext/common/ApplicationPool2/Spawner.h
+    ext/common/ApplicationPool2/SmartSpawner.h),
+  'test/cxx/ApplicationPool2/ProcessTest.o' => %w(
+    test/cxx/ApplicationPool2/ProcessTest.cpp
+    ext/common/ApplicationPool2/Process.h
+    ext/common/ApplicationPool2/Socket.h
+    ext/common/ApplicationPool2/Session.h),
+  'test/cxx/ApplicationPool2/PoolTest.o' => %w(
+    test/cxx/ApplicationPool2/PoolTest.cpp
+    ext/common/ApplicationPool2/SuperGroup.h
+    ext/common/ApplicationPool2/Group.h
+    ext/common/ApplicationPool2/Pool.h
+    ext/common/ApplicationPool2/Process.h
+    ext/common/ApplicationPool2/Socket.h
+    ext/common/ApplicationPool2/Options.h
+    ext/common/ApplicationPool2/Spawner.h
+    ext/common/ApplicationPool2/SpawnerFactory.h
+    ext/common/ApplicationPool2/SmartSpawner.h
+    ext/common/ApplicationPool2/DirectSpawner.h
+    ext/common/ApplicationPool2/DummySpawner.h),
+  'test/cxx/MemoryKit/MbufTest.o' => %w(
+    test/cxx/MemoryKit/MbufTest.cpp
+    ext/common/MemoryKit/mbuf.h),
+  'test/cxx/ServerKit/ChannelTest.o' => %w(
+    test/cxx/ServerKit/ChannelTest.cpp
+    ext/common/ServerKit/Channel.h
+    ext/common/ServerKit/Context.h),
+  'test/cxx/ServerKit/FileBufferedChannelTest.o' => %w(
+    test/cxx/ServerKit/FileBufferedChannelTest.cpp
+    ext/common/ServerKit/FileBufferedChannel.h
+    ext/common/ServerKit/Context.h),
+  'test/cxx/ServerKit/HeaderTableTest.o' => %w(
+    test/cxx/ServerKit/HeaderTableTest.cpp
+    ext/common/ServerKit/HeaderTable.h
+    ext/common/DataStructures/LString.h),
+  'test/cxx/ServerKit/ServerTest.o' => %w(
+    test/cxx/ServerKit/ServerTest.cpp
+    ext/common/ServerKit/Server.h
+    ext/common/ServerKit/Client.h
+    ext/common/ServerKit/Channel.h
+    ext/common/ServerKit/FdSourceChannel.h
+    ext/common/ServerKit/FileBufferedChannel.h
+    ext/common/ServerKit/FileBufferedFdSinkChannel.h
+    ext/common/ServerKit/Context.h),
+  'test/cxx/ServerKit/HttpServerTest.o' => %w(
+    test/cxx/ServerKit/HttpServerTest.cpp
+    ext/common/ServerKit/Server.h
+    ext/common/ServerKit/Client.h
+    ext/common/ServerKit/Channel.h
+    ext/common/ServerKit/FdSourceChannel.h
+    ext/common/ServerKit/FileBufferedChannel.h
+    ext/common/ServerKit/FileBufferedFdSinkChannel.h
+    ext/common/ServerKit/Context.h
+    ext/common/ServerKit/HttpServer.h
+    ext/common/ServerKit/HttpClient.h
+    ext/common/ServerKit/HttpRequest.h
+    ext/common/ServerKit/HttpHeaderParser.h
+    ext/common/ServerKit/HttpChunkedBodyParser.h),
+  'test/cxx/ServerKit/CookieUtilsTest.o' => %w(
+    test/cxx/ServerKit/CookieUtilsTest.cpp
+    ext/common/ServerKit/CookieUtils.h
+    ext/common/DataStructures/LString.h),
+  'test/cxx/DataStructures/LStringTest.o' => %w(
+    test/cxx/DataStructures/LStringTest.cpp
+    ext/common/DataStructures/LString.h),
+  'test/cxx/DataStructures/StringKeyTableTest.o' => %w(
+    test/cxx/DataStructures/StringKeyTableTest.cpp
+    ext/common/DataStructures/StringKeyTable.h),
+  'test/cxx/MessageReadersWritersTest.o' => %w(
+    test/cxx/MessageReadersWritersTest.cpp
+    ext/common/MessageReadersWriters.h
+    ext/common/Exceptions.h
+    ext/common/StaticString.h
+    ext/common/Utils/MemZeroGuard.h),
+  'test/cxx/StaticStringTest.o' => %w(
+    test/cxx/StaticStringTest.cpp
+    ext/common/StaticString.h),
+  'test/cxx/DechunkerTest.o' => %w(
+    test/cxx/DechunkerTest.cpp
+    ext/common/Utils/Dechunker.h),
+  'test/cxx/ResponseCacheTest.o' => %w(
+    test/cxx/ResponseCacheTest.cpp
+    ext/common/agents/HelperAgent/ResponseCache.h
+    ext/common/agents/HelperAgent/RequestHandler/Request.h
+    ext/common/agents/HelperAgent/RequestHandler/AppResponse.h
+    ext/common/ServerKit/HttpRequest.h),
+  'test/cxx/UnionStationTest.o' => %w(
+    test/cxx/UnionStationTest.cpp
+    ext/common/agents/LoggingAgent/LoggingServer.h
+    ext/common/agents/LoggingAgent/RemoteSender.h
+    ext/common/agents/LoggingAgent/DataStoreId.h
+    ext/common/agents/LoggingAgent/FilterSupport.h
+    ext/common/UnionStation/Connection.h
+    ext/common/UnionStation/Core.h
+    ext/common/UnionStation/Transaction.h
+    ext/common/Utils.h
+    ext/common/EventedServer.h
+    ext/common/EventedClient.h
+    ext/common/EventedMessageServer.h
+    ext/common/MessageReadersWriters.h
+    ext/common/MessageClient.h),
+  'test/cxx/EventedClientTest.o' => %w(
+    test/cxx/EventedClientTest.cpp
+    ext/common/EventedClient.h),
+  'test/cxx/EventedBufferedInput.o' => %w(
+    test/cxx/EventedBufferedInputTest.cpp
+    ext/common/EventedBufferedInput.h),
+  'test/cxx/MessageServerTest.o' => %w(
+    test/cxx/MessageServerTest.cpp
+    ext/common/Logging.h
+    ext/common/Account.h
+    ext/common/AccountsDatabase.h
+    ext/common/MessageServer.h),
+  # 'test/cxx/RequestHandlerTest.o' => %w(
+  #   test/cxx/RequestHandlerTest.cpp
+  #   ext/common/agents/HelperAgent/RequestHandler.h
+  #   ext/common/agents/HelperAgent/FileBackedPipe.h
+  #   ext/common/agents/HelperAgent/ScgiRequestParser.h
+  #   ext/common/agents/HelperAgent/AgentOptions.h
+  #   ext/common/UnionStation/Connection.h
+  #   ext/common/UnionStation/Core.h
+  #   ext/common/UnionStation/Transaction.h
+  #   ext/common/UnionStation/ScopeLog.h
+  #   ext/common/ApplicationPool2/Pool.h
+  #   ext/common/ApplicationPool2/SuperGroup.h
+  #   ext/common/ApplicationPool2/Group.h
+  #   ext/common/ApplicationPool2/Process.h
+  #   ext/common/ApplicationPool2/Options.h
+  #   ext/common/ApplicationPool2/Spawner.h
+  #   ext/common/ApplicationPool2/SpawnerFactory.h
+  #   ext/common/ApplicationPool2/SmartSpawner.h
+  #   ext/common/ApplicationPool2/DirectSpawner.h
+  #   ext/common/ApplicationPool2/DummySpawner.h),
+  'test/cxx/FileChangeCheckerTest.o' => %w(
+    test/cxx/FileChangeCheckerTest.cpp
+    ext/common/Utils/FileChangeChecker.h
+    ext/common/Utils/CachedFileStat.hpp),
+  'test/cxx/FileDescriptorTest.o' => %w(
+    test/cxx/FileDescriptorTest.cpp
+    ext/common/FileDescriptor.h),
+  'test/cxx/SystemTimeTest.o' => %w(
+    test/cxx/SystemTimeTest.cpp
+    ext/common/Utils/SystemTime.h
+    ext/common/Utils/SystemTime.cpp),
+  'test/cxx/FilterSupportTest.o' => %w(
+    test/cxx/FilterSupportTest.cpp
+    ext/common/agents/LoggingAgent/FilterSupport.h),
+  'test/cxx/CachedFileStatTest.o' => %w(
+    test/cxx/CachedFileStatTest.cpp
+    ext/common/Utils/CachedFileStat.hpp
+    ext/common/Utils/CachedFileStat.cpp),
+  'test/cxx/BufferedIOTest.o' => %w(
+    test/cxx/BufferedIOTest.cpp
+    ext/common/Utils/BufferedIO.h
+    ext/common/Utils/Timer.h),
+  'test/cxx/MessageIOTest.o' => %w(
+    test/cxx/MessageIOTest.cpp
+    ext/common/Utils/MessageIO.h
+    ext/common/Utils/IOUtils.h),
+  'test/cxx/MessagePassingTest.o' => %w(
+    test/cxx/MessagePassingTest.cpp
+    ext/common/Utils/MessagePassing.h),
+  'test/cxx/VariantMapTest.o' => %w(
+    test/cxx/VariantMapTest.cpp
+    ext/common/Utils/VariantMap.h),
+  'test/cxx/StringMapTest.o' => %w(
+    test/cxx/StringMapTest.cpp
+    ext/common/Utils/StringMap.h
+    ext/common/Utils/HashMap.h),
+  'test/cxx/ProcessMetricsCollectorTest.o' => %w(
+    test/cxx/ProcessMetricsCollectorTest.cpp
+    ext/common/Utils/ProcessMetricsCollector.h),
+  'test/cxx/DateParsingTest.o' => %w(
+    test/cxx/DateParsingTest.cpp
+    ext/common/Utils/DateParsing.h),
+  'test/cxx/UtilsTest.o' => %w(
+    test/cxx/UtilsTest.cpp
+    ext/common/Utils.h),
+  'test/cxx/IOUtilsTest.o' => %w(
+    test/cxx/IOUtilsTest.cpp
+    ext/common/Utils/IOUtils.h),
+  'test/cxx/TemplateTest.o' => %w(
+    test/cxx/TemplateTest.cpp
+    ext/common/Utils/Template.h)
 }
 
 dependencies = [
-	'test/cxx/CxxTestMain',
-	'test/support/allocate_memory',
-	NATIVE_SUPPORT_TARGET,
-	AGENT_OUTPUT_DIR + AGENT_EXE
+  'test/cxx/CxxTestMain',
+  'test/support/allocate_memory',
+  NATIVE_SUPPORT_TARGET,
+  AGENT_OUTPUT_DIR + AGENT_EXE
 ].compact
 desc "Run unit tests for the Apache 2 and Nginx C++ components"
 task 'test:cxx' => dependencies do
-	args = ENV['GROUPS'].to_s.split(";").map{ |name| "-g #{name}" }
-	command = "./cxx/CxxTestMain #{args.join(' ')}".strip
-	if boolean_option('GDB')
-		command = "gdb --args #{command}"
-	elsif boolean_option('VALGRIND')
-		command = "valgrind --dsymutil=yes --db-attach=yes --child-silent-after-fork=yes #{command}"
-	end
-	if boolean_option('SUDO')
-		command = "#{PlatformInfo.ruby_sudo_command} #{command}"
-	end
-	if boolean_option('REPEAT')
-		if boolean_option('GDB')
-			abort "You cannot set both REPEAT=1 and GDB=1."
-		end
-		sh "cd test && while #{command}; do echo -------------------------------------------; done"
-	elsif boolean_option('REPEAT_FOREVER')
-		if boolean_option('GDB')
-			abort "You cannot set both REPEAT_FOREVER=1 and GDB=1."
-		end
-		sh "cd test && while true; do #{command}; echo -------------------------------------------; done"
-	else
-		sh "cd test && exec #{command}"
-	end
+  args = ENV['GROUPS'].to_s.split(";").map{ |name| "-g #{name}" }
+  command = "./cxx/CxxTestMain #{args.join(' ')}".strip
+  if boolean_option('GDB')
+    command = "gdb --args #{command}"
+  elsif boolean_option('VALGRIND')
+    command = "valgrind --dsymutil=yes --db-attach=yes --child-silent-after-fork=yes #{command}"
+  end
+  if boolean_option('SUDO')
+    command = "#{PlatformInfo.ruby_sudo_command} #{command}"
+  end
+  if boolean_option('REPEAT')
+    if boolean_option('GDB')
+      abort "You cannot set both REPEAT=1 and GDB=1."
+    end
+    sh "cd test && while #{command}; do echo -------------------------------------------; done"
+  elsif boolean_option('REPEAT_FOREVER')
+    if boolean_option('GDB')
+      abort "You cannot set both REPEAT_FOREVER=1 and GDB=1."
+    end
+    sh "cd test && while true; do #{command}; echo -------------------------------------------; done"
+  else
+    sh "cd test && exec #{command}"
+  end
 end
 
 dependencies = [
-	TEST_CXX_OBJECTS.keys,
-	LIBEV_TARGET,
-	LIBEIO_TARGET,
-	TEST_BOOST_OXT_LIBRARY,
-	TEST_COMMON_LIBRARY.link_objects,
-	'ext/common/Constants.h'
+  TEST_CXX_OBJECTS.keys,
+  LIBEV_TARGET,
+  LIBEIO_TARGET,
+  TEST_BOOST_OXT_LIBRARY,
+  TEST_COMMON_LIBRARY.link_objects,
+  'ext/common/Constants.h'
 ].flatten.compact
 file 'test/cxx/CxxTestMain' => dependencies.flatten do
-	objects = TEST_CXX_OBJECTS.keys.join(' ')
-	create_executable("test/cxx/CxxTestMain", objects, TEST_CXX_LDFLAGS)
+  objects = TEST_CXX_OBJECTS.keys.join(' ')
+  create_executable("test/cxx/CxxTestMain", objects, TEST_CXX_LDFLAGS)
 end
 
 deps = [
-	'test/cxx/TestSupport.h',
-	'test/tut/tut.h',
-	'ext/oxt/thread.hpp',
-	'ext/oxt/tracable_exception.hpp',
-	'ext/common/Constants.h',
-	'ext/common/Exceptions.h',
-	'ext/common/InstanceDirectory.h',
-	'ext/common/Utils.h',
-	'ext/common/Utils/SystemTime.h'
+  'test/cxx/TestSupport.h',
+  'test/tut/tut.h',
+  'ext/oxt/thread.hpp',
+  'ext/oxt/tracable_exception.hpp',
+  'ext/common/Constants.h',
+  'ext/common/Exceptions.h',
+  'ext/common/InstanceDirectory.h',
+  'ext/common/Utils.h',
+  'ext/common/Utils/SystemTime.h'
 ]
 file 'test/cxx/TestSupport.h.gch' => deps do
-	compile_cxx 'test/cxx/TestSupport.h', "-x c++-header -o test/cxx/TestSupport.h.gch #{TEST_CXX_CFLAGS}"
+  compile_cxx 'test/cxx/TestSupport.h', "-x c++-header -o test/cxx/TestSupport.h.gch #{TEST_CXX_CFLAGS}"
 end
 
 TEST_CXX_OBJECTS.each_pair do |target, sources|
-	extra_deps = ['test/cxx/TestSupport.h', 'test/cxx/TestSupport.h.gch', 'ext/common/Constants.h']
-	file(target => sources + extra_deps) do
-		# To use precompiled headers in Clang, we must -include them on them command line.
-		compile_cxx sources[0], "-o #{target} -include test/cxx/TestSupport.h #{TEST_CXX_CFLAGS}"
-	end
+  extra_deps = ['test/cxx/TestSupport.h', 'test/cxx/TestSupport.h.gch', 'ext/common/Constants.h']
+  file(target => sources + extra_deps) do
+    # To use precompiled headers in Clang, we must -include them on them command line.
+    compile_cxx sources[0], "-o #{target} -include test/cxx/TestSupport.h #{TEST_CXX_CFLAGS}"
+  end
 end