passenger 5.0.0.beta3 → 5.0.0.rc1

data/lib/phusion_passenger/vendor/daemon_controller/lock_file.rb

@@ -0,0 +1,127 @@
+# daemon_controller, library for robust daemon management
+# Copyright (c) 2010-2015 Phusion
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'fcntl'
+
+module PhusionPassenger
+class DaemonController
+  # A lock file is a synchronization mechanism, like a Mutex, but it also allows
+  # inter-process synchronization (as opposed to only inter-thread synchronization
+  # within a single process).
+  #
+  # Processes can obtain either a shared lock or an exclusive lock. It's possible
+  # for multiple processes to obtain a shared lock on a file as long as no
+  # exclusive lock has been obtained by a process. If a process has obtained an
+  # exclusive lock, then no other processes can lock the file, whether they're
+  # trying to obtain a shared lock or an exclusive lock.
+  #
+  # Note that on JRuby, LockFile can only guarantee synchronization between
+  # threads if the different threads use the same LockFile object. Specifying the
+  # same filename is not enough.
+  class LockFile
+    class AlreadyLocked < StandardError
+    end
+
+    # Create a LockFile object. The lock file is initially not locked.
+    #
+    # +filename+ may point to a nonexistant file. In that case, the lock
+    # file will not be created until one's trying to obtain a lock.
+    #
+    # Note that LockFile will use this exact filename. So if +filename+
+    # is a relative filename, then the actual lock file that will be used
+    # depends on the current working directory.
+    def initialize(filename)
+      @filename = filename
+    end
+
+    # Obtain an exclusive lock on the lock file, yield the given block,
+    # then unlock the lockfile. If the lock file was already locked (whether
+    # shared or exclusively) by another process/thread then this method will
+    # block until the lock file has been unlocked.
+    #
+    # The lock file *must* be writable, otherwise an Errno::EACCESS
+    # exception will be raised.
+    def exclusive_lock
+      File.open(@filename, 'w') do |f|
+        if Fcntl.const_defined? :F_SETFD
+          f.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+        end
+        f.flock(File::LOCK_EX)
+        yield
+      end
+    end
+
+    # Obtain an exclusive lock on the lock file, yield the given block,
+    # then unlock the lockfile. If the lock file was already exclusively
+    # locked by another process/thread then this method will
+    # block until the exclusive lock has been released. This method will not
+    # block if only shared locks have been obtained.
+    #
+    # The lock file *must* be writable, otherwise an Errno::EACCESS
+    # exception will be raised.
+    def shared_lock
+      File.open(@filename, 'w+') do |f|
+        if Fcntl.const_defined? :F_SETFD
+          f.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+        end
+        f.flock(File::LOCK_SH)
+        yield
+      end
+    end
+
+    # Try to obtain a shared lock on the lock file, similar to #shared_lock.
+    # But unlike #shared_lock, this method will raise AlreadyLocked if
+    # no lock can be obtained, instead of blocking.
+    #
+    # If a lock can be obtained, then the given block will be yielded.
+    def try_shared_lock
+      File.open(@filename, 'w+') do |f|
+        if Fcntl.const_defined? :F_SETFD
+          f.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+        end
+        if f.flock(File::LOCK_SH | File::LOCK_NB)
+          yield
+        else
+          raise AlreadyLocked
+        end
+      end
+    end
+
+    # Try to obtain an exclusive lock on the lock file, similar to #exclusive_lock.
+    # But unlike #exclusive_lock, this method will raise AlreadyLocked if
+    # no lock can be obtained, instead of blocking.
+    #
+    # If a lock can be obtained, then the given block will be yielded.
+    def try_exclusive_lock
+      File.open(@filename, 'w') do |f|
+        if Fcntl.const_defined? :F_SETFD
+          f.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+        end
+        if f.flock(File::LOCK_EX | File::LOCK_NB)
+          yield
+        else
+          raise AlreadyLocked
+        end
+      end
+    end
+  end # class LockFile
+end # class DaemonController
+end # module PhusionPassenger

data/lib/phusion_passenger/vendor/daemon_controller/spawn.rb

@@ -0,0 +1,26 @@
+# daemon_controller, library for robust daemon management
+# Copyright (c) 2010 Phusion
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+# This helper script is used for daemonizing a command by executing it and
+# then exiting ourselves. Used on Ruby 1.9 and JRuby because forking may not
+# be safe/supported on all platforms.
+Process.setsid
+Process.spawn(ARGV[0])

data/lib/phusion_passenger/vendor/daemon_controller/version.rb

@@ -0,0 +1,29 @@
+# daemon_controller, library for robust daemon management
+# Copyright (c) 2010-2015 Phusion
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module PhusionPassenger
+class DaemonController
+  MAJOR = 1
+  MINOR = 2
+  TINY  = 1
+  VERSION_STRING = "#{MAJOR}.#{MINOR}.#{TINY}"
+end # class DaemonController
+end # module PhusionPassenger

data/packaging/rpm/passenger_spec/passenger.spec.template

@@ -74,7 +74,6 @@ Patch107:       rubygem-passenger-4.0.18-GLIBC_HAVE_LONG_LONG.patch
 
 Requires: rubygems
 # XXX: Needed to run passenger standalone
-Requires: rubygem(daemon_controller) >= 1.1.0
 Requires: rubygem(rack)
 Requires: rubygem(rake)
 %if 0%{?uses_rubyabi}

data/passenger.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |s|
 	s.email = "software-signing@phusion.nl"
 	s.require_paths = ["lib"]
 	s.add_dependency 'rake', '>= 0.8.1'
-	s.add_dependency 'daemon_controller', '>= 1.2.0'
 	s.add_dependency 'rack'
 	s.files = Dir[*PhusionPassenger::Packaging::GLOB] -
 		Dir[*PhusionPassenger::Packaging::EXCLUDE_GLOB]

data/resources/templates/config/nginx_engine_compiler/possible_solutions_for_download_and_extraction_problems.txt.erb

@@ -0,0 +1,27 @@
+<red><b>Unable to download or extract Nginx source tarball</b></red>
+
+Possible reasons:
+
+ <b>* Your Internet connection is unstable.</b>
+   If this is the case, try re-running this installer with higher connection
+   timeouts:
+
+     passenger-config compile-nginx-engine --connect-timeout 60 --idle-timeout 60
+
+ <b>* You are not connected to the Internet.</b>
+   If this is the case, then please connect to the Internet and try again.
+
+ <b>* The URL that this installer tried to download from no longer exists.</b>
+   Please file a bug report if this is the case:
+   https://github.com/phusion/passenger/issues
+
+ <b>* The download was corrupted.</b>
+   Please try to re-run this installer:
+
+     passenger-config compile-nginx-engine
+
+ <b>* Phusion Passenger Standalone is not able to write to /tmp.</b>
+   Please fix the permissions for this directory, or run this installer with
+   root privileges:
+
+     <%= PlatformInfo.ruby_sudo_command %> passenger-config compile-nginx-engine

data/resources/templates/standalone/config.erb

@@ -73,7 +73,7 @@ http {
         union_station_gateway_port <%= @options[:union_station_gateway_port] %>;
         union_station_gateway_cert -;
     <% end %>
-    
+
     <% @options[:ctls].each do |ctl| %>
         passenger_ctl '<%= ctl.split("=", 2)[0] %>' '<%= ctl.split("=", 2)[1] %>';
     <% end %>
@@ -93,22 +93,22 @@ http {
         application/javascript application/x-javascript application/json \
         application/rss+xml application/vnd.ms-fontobject application/x-font-ttf \
         application/xml font/opentype image/svg+xml text/xml;
-    
-    <% if @apps.size > 1 %>
-    # Default server entry.
-    server {
-        <% if @options[:ssl] %>
-            <% if @options[:ssl_port] %>
-                listen <%= nginx_listen_address %>;
-                listen <%= nginx_listen_address_with_ssl_port %> ssl;
+
+    <% if @app_finder.multi_mode? %>
+        # Default server entry for mass deployment mode.
+        server {
+            <% if @options[:ssl] %>
+                <% if @options[:ssl_port] %>
+                    listen <%= nginx_listen_address %>;
+                    listen <%= nginx_listen_address_with_ssl_port %> ssl;
+                <% else %>
+                    listen <%= nginx_listen_address %> ssl;
+                <% end %>
             <% else %>
-                listen <%= nginx_listen_address %> ssl;
+                listen <%= nginx_listen_address %>;
             <% end %>
-        <% else %>
-            listen <%= nginx_listen_address %>;
-        <% end %>
-        root '<%= PhusionPassenger.resources_dir %>/standalone_default_root';
-    }
+            root '<%= PhusionPassenger.resources_dir %>/standalone_default_root';
+        }
     <% end %>
 
     <% for app in @apps %>
@@ -151,6 +151,10 @@ http {
             ssl_certificate_key <%= app[:ssl_certificate_key] %>;
         <% end %>
 
+        <% @options[:envvars].each_pair do |name, value| %>
+            passenger_env_var '<%= name %>' '<%= value %>';
+        <% end %>
+
         # Rails asset pipeline support.
         location ~ "^/assets/.+-[0-9a-f]{32}\..+" {
             error_page 490 = @static_asset;

data/test/integration_tests/apache2_tests.rb

@@ -16,570 +16,570 @@ require 'integration_tests/shared/example_webapp_tests'
 # TODO: test custom page caching directory
 
 describe "Apache 2 module" do
-	before :all do
-		check_hosts_configuration
-		@passenger_temp_dir = "/tmp/passenger-test.#{$$}"
-		Dir.mkdir(@passenger_temp_dir)
-		FileUtils.chmod_R(0777, @passenger_temp_dir)
-		ENV['TMPDIR'] = @passenger_temp_dir
-	end
-
-	after :all do
-		@apache2.stop if @apache2
-		FileUtils.chmod_R(0777, @passenger_temp_dir)
-		FileUtils.rm_rf(@passenger_temp_dir)
-	end
-
-	before :each do
-		File.open("test.log", "a") do |f|
-			# Make sure that all Apache log output is prepended by the test description
-			# so that we know which messages are associated with which tests.
-			f.puts "\n#### #{Time.now}: #{example.full_description}"
-			@test_log_pos = f.pos
-		end
-	end
-
-	after :each do
-		log "End of test"
-		if example.exception
-			puts "\t---------------- Begin logs -------------------"
-			File.open("test.log", "r") do |f|
-				f.seek(@test_log_pos)
-				puts f.read.split("\n").map{ |line| "\t#{line}" }.join("\n")
-			end
-			puts "\t---------------- End logs -------------------"
-			puts "\tThe following test failed. The web server logs are printed above."
-		end
-	end
-
-	def create_apache2_controller
-		@apache2 = Apache2Controller.new
-		@apache2.set(:passenger_temp_dir => @passenger_temp_dir)
-		if Process.uid == 0
-			@apache2.set(
-				:www_user => CONFIG['normal_user_1'],
-				:www_group => Etc.getgrgid(Etc.getpwnam(CONFIG['normal_user_1']).gid).name
-			)
-		end
-	end
-
-	def log(message)
-		File.open("test.log", "a") do |f|
-			f.puts "[#{Time.now}] Spec: #{message}"
-		end
-	end
-
-	describe "a Ruby app running on the root URI" do
-		before :all do
-			create_apache2_controller
-			@server = "http://1.passenger.test:#{@apache2.port}"
-			@stub = RackStub.new('rack')
-			@apache2 << "PassengerMaxPoolSize 1"
-			@apache2.set_vhost("1.passenger.test", "#{@stub.full_app_root}/public")
-			@apache2.start
-		end
-
-		after :all do
-			@stub.destroy
-			@apache2.stop if @apache2
-		end
-
-		before :each do
-			@stub.reset
-		end
-
-		it_should_behave_like "an example web app"
-	end
-
-	describe "a Ruby app running in a sub-URI" do
-		before :all do
-			create_apache2_controller
-			@server = "http://1.passenger.test:#{@apache2.port}/subapp"
-			@stub = RackStub.new('rack')
-			@apache2 << "PassengerMaxPoolSize 1"
-			@apache2.set_vhost("1.passenger.test", File.expand_path("stub")) do |vhost|
-				vhost << %Q{
-					Alias /subapp #{@stub.full_app_root}/public
-					<Location /subapp>
-						PassengerBaseURI /subapp
-						PassengerAppRoot #{@stub.full_app_root}
-					</Location>
-				}
-			end
-			@apache2.start
-		end
-
-		after :all do
-			@stub.destroy
-			@apache2.stop if @apache2
-		end
-
-		before :each do
-			@stub.reset
-		end
-
-		it_should_behave_like "an example web app"
-
-		it "does not interfere with the root website" do
-			@server = "http://1.passenger.test:#{@apache2.port}"
-			get('/').should == "This is the stub directory."
-		end
-	end
-
-	describe "a Python app running on the root URI" do
-		before :all do
-			create_apache2_controller
-			@server = "http://1.passenger.test:#{@apache2.port}"
-			@stub = PythonStub.new('wsgi')
-			@apache2 << "PassengerMaxPoolSize 1"
-			@apache2.set_vhost("1.passenger.test", "#{@stub.full_app_root}/public")
-			@apache2.start
-		end
-
-		after :all do
-			@stub.destroy
-			@apache2.stop if @apache2
-		end
-
-		before :each do
-			@stub.reset
-		end
-
-		it_should_behave_like "an example web app"
-	end
-
-	describe "a Python app running in a sub-URI" do
-		before :all do
-			create_apache2_controller
-			@server = "http://1.passenger.test:#{@apache2.port}/subapp"
-			@stub = PythonStub.new('wsgi')
-			@apache2 << "PassengerMaxPoolSize 1"
-			@apache2.set_vhost("1.passenger.test", File.expand_path("stub")) do |vhost|
-				vhost << %Q{
-					Alias /subapp #{@stub.full_app_root}/public
-					<Location /subapp>
-						PassengerBaseURI /subapp
-						PassengerAppRoot #{@stub.full_app_root}
-					</Location>
-				}
-			end
-			@apache2.start
-		end
-
-		after :all do
-			@stub.destroy
-			@apache2.stop if @apache2
-		end
-
-		before :each do
-			@stub.reset
-		end
-
-		it_should_behave_like "an example web app"
-
-		it "does not interfere with the root website" do
-			@server = "http://1.passenger.test:#{@apache2.port}"
-			get('/').should == "This is the stub directory."
-		end
-	end
-
-	describe "a Node.js app running on the root URI" do
-		before :all do
-			create_apache2_controller
-			@server = "http://1.passenger.test:#{@apache2.port}"
-			@stub = NodejsStub.new('node')
-			@apache2 << "PassengerMaxPoolSize 1"
-			@apache2.set_vhost("1.passenger.test", "#{@stub.full_app_root}/public")
-			@apache2.start
-		end
-
-		after :all do
-			@stub.destroy
-			@apache2.stop if @apache2
-		end
-
-		before :each do
-			@stub.reset
-		end
-
-		it_should_behave_like "an example web app"
-	end
-
-	describe "a Node.js app running in a sub-URI" do
-		before :all do
-			create_apache2_controller
-			@server = "http://1.passenger.test:#{@apache2.port}/subapp"
-			@stub = NodejsStub.new('node')
-			@apache2 << "PassengerMaxPoolSize 1"
-			@apache2.set_vhost("1.passenger.test", File.expand_path("stub")) do |vhost|
-				vhost << %Q{
-					Alias /subapp #{@stub.full_app_root}/public
-					<Location /subapp>
-						PassengerBaseURI /subapp
-						PassengerAppRoot #{@stub.full_app_root}
-					</Location>
-				}
-			end
-			@apache2.start
-		end
-
-		after :all do
-			@stub.destroy
-			@apache2.stop if @apache2
-		end
-
-		before :each do
-			@stub.reset
-		end
-
-		it_should_behave_like "an example web app"
-
-		it "does not interfere with the root website" do
-			@server = "http://1.passenger.test:#{@apache2.port}"
-			get('/').should == "This is the stub directory."
-		end
-	end
-
-	describe "compatibility with other modules" do
-		before :all do
-			create_apache2_controller
-			@apache2 << "PassengerMaxPoolSize 1"
-			@apache2 << "PassengerStatThrottleRate 0"
-
-			@stub = RackStub.new('rack')
-			@server = "http://1.passenger.test:#{@apache2.port}"
-			@apache2.set_vhost("1.passenger.test", "#{@stub.full_app_root}/public") do |vhost|
-				vhost << "RewriteEngine on"
-				vhost << "RewriteRule ^/rewritten_frontpage$ / [PT,QSA,L]"
-				vhost << "RewriteRule ^/rewritten_env$ /env [PT,QSA,L]"
-			end
-			@apache2.start
-		end
-
-		after :all do
-			@stub.destroy
-			@apache2.stop if @apache2
-		end
-
-		before :each do
-			@stub.reset
-		end
-
-		it "supports environment variable passing through mod_env" do
-			File.write("#{@stub.app_root}/public/.htaccess", 'SetEnv FOO "Foo Bar!"')
-			File.touch("#{@stub.app_root}/tmp/restart.txt", 2)  # Activate ENV changes.
-			get('/system_env').should =~ /^FOO = Foo Bar\!$/
-		end
-
-		it "supports mod_rewrite in the virtual host block" do
-			get('/rewritten_frontpage').should == "front page"
-			cgi_envs = get('/rewritten_env?foo=bar+baz')
-			cgi_envs.should include("REQUEST_URI = /env?foo=bar+baz\n")
-			cgi_envs.should include("PATH_INFO = /env\n")
-		end
-
-		it "supports mod_rewrite in .htaccess" do
-			File.write("#{@stub.app_root}/public/.htaccess", %Q{
-				RewriteEngine on
-				RewriteRule ^htaccess_frontpage$ / [PT,QSA,L]
-				RewriteRule ^htaccess_env$ env [PT,QSA,L]
-			})
-			get('/htaccess_frontpage').should == "front page"
-			cgi_envs = get('/htaccess_env?foo=bar+baz')
-			cgi_envs.should include("REQUEST_URI = /env?foo=bar+baz\n")
-			cgi_envs.should include("PATH_INFO = /env\n")
-		end
-	end
-
-	describe "configuration options" do
-		before :all do
-			create_apache2_controller
-			@apache2 << "PassengerMaxPoolSize 3"
-			@apache2 << "PassengerStatThrottleRate 0"
-
-			@stub = RackStub.new('rack')
-			@stub_url_root = "http://5.passenger.test:#{@apache2.port}"
-			@apache2.set_vhost('5.passenger.test', "#{@stub.full_app_root}/public") do |vhost|
-				vhost << "PassengerBufferUpload off"
-				vhost << "PassengerFriendlyErrorPages on"
-				vhost << "AllowEncodedSlashes on"
-			end
-
-			@stub2 = RackStub.new('rack')
-			@stub2_url_root = "http://6.passenger.test:#{@apache2.port}"
-			@apache2.set_vhost('6.passenger.test', "#{@stub2.full_app_root}/public") do |vhost|
-				vhost << "PassengerAppEnv development"
-				vhost << "PassengerSpawnMethod conservative"
-				vhost << "PassengerRestartDir #{@stub2.full_app_root}/public"
-				vhost << "AllowEncodedSlashes off"
-			end
-
-			@apache2.start
-		end
-
-		after :all do
-			@stub.destroy
-			@stub2.destroy
-			@apache2.stop if @apache2
-		end
-
-		before :each do
-			@stub.reset
-			@stub2.reset
-		end
-
-		specify "PassengerAppEnv is per-virtual host" do
-			@server = @stub_url_root
-			get('/system_env').should =~ /PASSENGER_APP_ENV = production/
-
-			@server = @stub2_url_root
-			get('/system_env').should =~ /PASSENGER_APP_ENV = development/
-		end
-
-		it "looks for restart.txt in the directory specified by PassengerRestartDir" do
-			@server = @stub2_url_root
-			startup_file = "#{@stub2.app_root}/config.ru"
-			restart_file = "#{@stub2.app_root}/public/restart.txt"
-
-			File.write(startup_file, %Q{
-				require File.expand_path(File.dirname(__FILE__) + "/library")
-
-				app = lambda do |env|
-					case env['PATH_INFO']
-					when '/'
-						text_response("hello world")
-					else
-						[404, { "Content-Type" => "text/plain" }, ["Unknown URI"]]
-					end
-				end
-
-				run app
-			})
-
-			now = Time.now
-			File.touch(restart_file, now - 5)
-			get('/').should == "hello world"
-
-			File.write(startup_file, %Q{
-				require File.expand_path(File.dirname(__FILE__) + "/library")
-
-				app = lambda do |env|
-					case env['PATH_INFO']
-					when '/'
-						text_response("oh hai")
-					else
-						[404, { "Content-Type" => "text/plain" }, ["Unknown URI"]]
-					end
-				end
-
-				run app
-			})
-
-			File.touch(restart_file, now - 10)
-			get('/').should == "oh hai"
-		end
-
-		describe "PassengerAppRoot" do
-			before :each do
-				@server = @stub_url_root
-				File.write("#{@stub.full_app_root}/public/cached.html", "Static cached.html")
-				File.write("#{@stub.full_app_root}/public/dir.html", "Static dir.html")
-				Dir.mkdir("#{@stub.full_app_root}/public/dir")
-			end
-
-			it "supports page caching on non-index URIs" do
-				get('/cached').should == "Static cached.html"
-			end
-
-			it "supports page caching on directory index URIs" do
-				get('/dir').should == "Static dir.html"
-			end
-
-			it "works" do
-				result = get('/parameters?first=one&second=Green+Bananas')
-				result.should =~ %r{First: one\n}
-				result.should =~ %r{Second: Green Bananas\n}
-			end
-		end
-
-		it "resolves symlinks in the document root if PassengerResolveSymlinksInDocumentRoot is set" do
-			orig_app_root = @stub.app_root
-			@stub.move(File.expand_path('tmp.mycook.symlinktest'))
-			FileUtils.mkdir_p(orig_app_root)
-			File.symlink("#{@stub.app_root}/public", "#{orig_app_root}/public")
-			begin
-				File.write("#{@stub.app_root}/public/.htaccess", "PassengerResolveSymlinksInDocumentRoot on")
-				@server = @stub_url_root
-				get('/').should == "front page"
-			ensure
-				FileUtils.rm_rf(orig_app_root)
-				@stub.move(orig_app_root)
-			end
-		end
-
-		it "supports encoded slashes in the URL if AllowEncodedSlashes is turned on" do
-			@server = @stub_url_root
-			get('/env/foo%2fbar').should =~ %r{PATH_INFO = /env/foo/bar\n}
-
-			@server = @stub2_url_root
-			get('/env/foo%2fbar').should =~ %r{404 Not Found}
-		end
-
-		describe "when handling POST requests with 'chunked' transfer encoding, if PassengerBufferUpload is off" do
-			it "sets Transfer-Encoding to 'chunked' and removes Content-Length" do
-				@uri = URI.parse(@stub_url_root)
-				socket = TCPSocket.new(@uri.host, @uri.port)
-				begin
-					socket.write("POST #{@stub_url_root}/env HTTP/1.1\r\n")
-					socket.write("Host: #{@uri.host}:#{@uri.port}\r\n")
-					socket.write("Transfer-Encoding: chunked\r\n")
-					socket.write("Content-Type: text/plain\r\n")
-					socket.write("Connection: close\r\n")
-					socket.write("\r\n")
-
-					chunk = "foo=bar!"
-					socket.write("%X\r\n%s\r\n" % [chunk.size, chunk])
-					socket.write("0\r\n\r\n")
-					socket.flush
-
-					response = socket.read
-					response.should_not include("CONTENT_LENGTH = ")
-					response.should include("HTTP_TRANSFER_ENCODING = chunked\n")
-				ensure
-					socket.close
-				end
-			end
-		end
-
-		####################################
-	end
-
-	describe "error handling" do
-		before :all do
-			create_apache2_controller
-			FileUtils.rm_rf('tmp.webdir')
-			FileUtils.mkdir_p('tmp.webdir')
-			@webdir = File.expand_path('tmp.webdir')
-			@apache2.set_vhost('1.passenger.test', @webdir) do |vhost|
-				vhost << "PassengerBaseURI /app-that-crashes-during-startup/public"
-			end
-
-			@stub = RackStub.new('rack')
-			@stub_url_root = "http://2.passenger.test:#{@apache2.port}"
-			@apache2.set_vhost('2.passenger.test', "#{@stub.full_app_root}/public")
-
-			@apache2 << "PassengerFriendlyErrorPages on"
-			@apache2.start
-		end
-
-		after :all do
-			FileUtils.rm_rf('tmp.webdir')
-			@stub.destroy
-			@apache2.stop if @apache2
-		end
-
-		before :each do
-			@server = "http://1.passenger.test:#{@apache2.port}"
-			@error_page_signature = /<meta name="generator" content="Phusion Passenger">/
-			@stub.reset
-		end
-
-		it "displays an error page if the application crashes during startup" do
-			RackStub.use('rack', "#{@webdir}/app-that-crashes-during-startup") do |stub|
-				File.prepend(stub.startup_file, "raise 'app crash'")
-				result = get("/app-that-crashes-during-startup/public")
-				result.should =~ @error_page_signature
-				result.should =~ /app crash/
-			end
-		end
-
-		it "doesn't display a Ruby spawn error page if PassengerFriendlyErrorPages is off" do
-			RackStub.use('rack', "#{@webdir}/app-that-crashes-during-startup") do |stub|
-				File.write("#{stub.app_root}/public/.htaccess", "PassengerFriendlyErrorPages off")
-				File.prepend(stub.startup_file, "raise 'app crash'")
-				result = get("/app-that-crashes-during-startup/public")
-				result.should_not =~ @error_page_signature
-				result.should_not =~ /app crash/
-			end
-		end
-	end
-
-	describe "HelperAgent" do
-		AdminTools = PhusionPassenger::AdminTools
-
-		before :all do
-			create_apache2_controller
-			@stub = RackStub.new('rack')
-			@stub_url_root = "http://1.passenger.test:#{@apache2.port}"
-			@apache2 << "PassengerStatThrottleRate 0"
-			@apache2.set_vhost('1.passenger.test', "#{@stub.full_app_root}/public")
-			@apache2.start
-			@server = "http://1.passenger.test:#{@apache2.port}"
-		end
-
-		after :all do
-			@stub.destroy
-			@apache2.stop if @apache2
-		end
-
-		before :each do
-			@stub.reset
-		end
-
-		it "is restarted if it crashes" do
-			# Make sure that all Apache worker processes have connected to
-			# the helper agent.
-			10.times do
-				get('/').should == "front page"
-				sleep 0.1
-			end
-
-			# Now kill the helper agent.
-			instance = AdminTools::InstanceRegistry.new.list.first
-			Process.kill('SIGKILL', instance.server_pid)
-			sleep 0.02 # Give the signal a small amount of time to take effect.
-
-			# Each worker process should detect that the old
-			# helper agent has died, and should reconnect.
-			10.times do
-				get('/').should == "front page"
-				sleep 0.1
-			end
-		end
-
-		it "exposes the application pool for passenger-status" do
-			File.touch("#{@stub.app_root}/tmp/restart.txt", 1)  # Get rid of all previous app processes.
-			get('/').should == "front page"
-			instance = AdminTools::InstanceRegistry.new.list.first
-
-			# Wait until the server has processed the session close event.
-			sleep 0.1
-
-			request = Net::HTTP::Get.new("/pool.xml")
-			request.basic_auth("ro_admin", instance.read_only_admin_password)
-			response = instance.http_request("agents.s/server_admin", request)
-			if response.code.to_i / 100 == 2
-				doc = REXML::Document.new(response.body)
-			else
-				raise response.body
-			end
-
-			groups = doc.get_elements("info/supergroups/supergroup/group")
-			groups.should have(1).item
-			groups.each do |group|
-				group.elements["name"].text.should == "#{@stub.full_app_root} (production)#default"
-				processes = group.get_elements("processes/process")
-				processes.should have(1).item
-				processes[0].elements["processed"].text.should == "1"
-			end
-		end
-	end
-
-	##### Helper methods #####
-
-	def start_web_server_if_necessary
-		if !@apache2.running?
-			@apache2.start
-		end
-	end
+  before :all do
+    check_hosts_configuration
+    @passenger_temp_dir = "/tmp/passenger-test.#{$$}"
+    Dir.mkdir(@passenger_temp_dir)
+    FileUtils.chmod_R(0777, @passenger_temp_dir)
+    ENV['TMPDIR'] = @passenger_temp_dir
+  end
+
+  after :all do
+    @apache2.stop if @apache2
+    FileUtils.chmod_R(0777, @passenger_temp_dir)
+    FileUtils.rm_rf(@passenger_temp_dir)
+  end
+
+  before :each do
+    File.open("test.log", "a") do |f|
+      # Make sure that all Apache log output is prepended by the test description
+      # so that we know which messages are associated with which tests.
+      f.puts "\n#### #{Time.now}: #{example.full_description}"
+      @test_log_pos = f.pos
+    end
+  end
+
+  after :each do
+    log "End of test"
+    if example.exception
+      puts "\t---------------- Begin logs -------------------"
+      File.open("test.log", "r") do |f|
+        f.seek(@test_log_pos)
+        puts f.read.split("\n").map{ |line| "\t#{line}" }.join("\n")
+      end
+      puts "\t---------------- End logs -------------------"
+      puts "\tThe following test failed. The web server logs are printed above."
+    end
+  end
+
+  def create_apache2_controller
+    @apache2 = Apache2Controller.new
+    @apache2.set(:passenger_temp_dir => @passenger_temp_dir)
+    if Process.uid == 0
+      @apache2.set(
+        :www_user => CONFIG['normal_user_1'],
+        :www_group => Etc.getgrgid(Etc.getpwnam(CONFIG['normal_user_1']).gid).name
+      )
+    end
+  end
+
+  def log(message)
+    File.open("test.log", "a") do |f|
+      f.puts "[#{Time.now}] Spec: #{message}"
+    end
+  end
+
+  describe "a Ruby app running on the root URI" do
+    before :all do
+      create_apache2_controller
+      @server = "http://1.passenger.test:#{@apache2.port}"
+      @stub = RackStub.new('rack')
+      @apache2 << "PassengerMaxPoolSize 1"
+      @apache2.set_vhost("1.passenger.test", "#{@stub.full_app_root}/public")
+      @apache2.start
+    end
+
+    after :all do
+      @stub.destroy
+      @apache2.stop if @apache2
+    end
+
+    before :each do
+      @stub.reset
+    end
+
+    it_should_behave_like "an example web app"
+  end
+
+  describe "a Ruby app running in a sub-URI" do
+    before :all do
+      create_apache2_controller
+      @server = "http://1.passenger.test:#{@apache2.port}/subapp"
+      @stub = RackStub.new('rack')
+      @apache2 << "PassengerMaxPoolSize 1"
+      @apache2.set_vhost("1.passenger.test", File.expand_path("stub")) do |vhost|
+        vhost << %Q{
+          Alias /subapp #{@stub.full_app_root}/public
+          <Location /subapp>
+            PassengerBaseURI /subapp
+            PassengerAppRoot #{@stub.full_app_root}
+          </Location>
+        }
+      end
+      @apache2.start
+    end
+
+    after :all do
+      @stub.destroy
+      @apache2.stop if @apache2
+    end
+
+    before :each do
+      @stub.reset
+    end
+
+    it_should_behave_like "an example web app"
+
+    it "does not interfere with the root website" do
+      @server = "http://1.passenger.test:#{@apache2.port}"
+      get('/').should == "This is the stub directory."
+    end
+  end
+
+  describe "a Python app running on the root URI" do
+    before :all do
+      create_apache2_controller
+      @server = "http://1.passenger.test:#{@apache2.port}"
+      @stub = PythonStub.new('wsgi')
+      @apache2 << "PassengerMaxPoolSize 1"
+      @apache2.set_vhost("1.passenger.test", "#{@stub.full_app_root}/public")
+      @apache2.start
+    end
+
+    after :all do
+      @stub.destroy
+      @apache2.stop if @apache2
+    end
+
+    before :each do
+      @stub.reset
+    end
+
+    it_should_behave_like "an example web app"
+  end
+
+  describe "a Python app running in a sub-URI" do
+    before :all do
+      create_apache2_controller
+      @server = "http://1.passenger.test:#{@apache2.port}/subapp"
+      @stub = PythonStub.new('wsgi')
+      @apache2 << "PassengerMaxPoolSize 1"
+      @apache2.set_vhost("1.passenger.test", File.expand_path("stub")) do |vhost|
+        vhost << %Q{
+          Alias /subapp #{@stub.full_app_root}/public
+          <Location /subapp>
+            PassengerBaseURI /subapp
+            PassengerAppRoot #{@stub.full_app_root}
+          </Location>
+        }
+      end
+      @apache2.start
+    end
+
+    after :all do
+      @stub.destroy
+      @apache2.stop if @apache2
+    end
+
+    before :each do
+      @stub.reset
+    end
+
+    it_should_behave_like "an example web app"
+
+    it "does not interfere with the root website" do
+      @server = "http://1.passenger.test:#{@apache2.port}"
+      get('/').should == "This is the stub directory."
+    end
+  end
+
+  describe "a Node.js app running on the root URI" do
+    before :all do
+      create_apache2_controller
+      @server = "http://1.passenger.test:#{@apache2.port}"
+      @stub = NodejsStub.new('node')
+      @apache2 << "PassengerMaxPoolSize 1"
+      @apache2.set_vhost("1.passenger.test", "#{@stub.full_app_root}/public")
+      @apache2.start
+    end
+
+    after :all do
+      @stub.destroy
+      @apache2.stop if @apache2
+    end
+
+    before :each do
+      @stub.reset
+    end
+
+    it_should_behave_like "an example web app"
+  end
+
+  describe "a Node.js app running in a sub-URI" do
+    before :all do
+      create_apache2_controller
+      @server = "http://1.passenger.test:#{@apache2.port}/subapp"
+      @stub = NodejsStub.new('node')
+      @apache2 << "PassengerMaxPoolSize 1"
+      @apache2.set_vhost("1.passenger.test", File.expand_path("stub")) do |vhost|
+        vhost << %Q{
+          Alias /subapp #{@stub.full_app_root}/public
+          <Location /subapp>
+            PassengerBaseURI /subapp
+            PassengerAppRoot #{@stub.full_app_root}
+          </Location>
+        }
+      end
+      @apache2.start
+    end
+
+    after :all do
+      @stub.destroy
+      @apache2.stop if @apache2
+    end
+
+    before :each do
+      @stub.reset
+    end
+
+    it_should_behave_like "an example web app"
+
+    it "does not interfere with the root website" do
+      @server = "http://1.passenger.test:#{@apache2.port}"
+      get('/').should == "This is the stub directory."
+    end
+  end
+
+  describe "compatibility with other modules" do
+    before :all do
+      create_apache2_controller
+      @apache2 << "PassengerMaxPoolSize 1"
+      @apache2 << "PassengerStatThrottleRate 0"
+
+      @stub = RackStub.new('rack')
+      @server = "http://1.passenger.test:#{@apache2.port}"
+      @apache2.set_vhost("1.passenger.test", "#{@stub.full_app_root}/public") do |vhost|
+        vhost << "RewriteEngine on"
+        vhost << "RewriteRule ^/rewritten_frontpage$ / [PT,QSA,L]"
+        vhost << "RewriteRule ^/rewritten_env$ /env [PT,QSA,L]"
+      end
+      @apache2.start
+    end
+
+    after :all do
+      @stub.destroy
+      @apache2.stop if @apache2
+    end
+
+    before :each do
+      @stub.reset
+    end
+
+    it "supports environment variable passing through mod_env" do
+      File.write("#{@stub.app_root}/public/.htaccess", 'SetEnv FOO "Foo Bar!"')
+      File.touch("#{@stub.app_root}/tmp/restart.txt", 2)  # Activate ENV changes.
+      get('/system_env').should =~ /^FOO = Foo Bar\!$/
+    end
+
+    it "supports mod_rewrite in the virtual host block" do
+      get('/rewritten_frontpage').should == "front page"
+      cgi_envs = get('/rewritten_env?foo=bar+baz')
+      cgi_envs.should include("REQUEST_URI = /env?foo=bar+baz\n")
+      cgi_envs.should include("PATH_INFO = /env\n")
+    end
+
+    it "supports mod_rewrite in .htaccess" do
+      File.write("#{@stub.app_root}/public/.htaccess", %Q{
+        RewriteEngine on
+        RewriteRule ^htaccess_frontpage$ / [PT,QSA,L]
+        RewriteRule ^htaccess_env$ env [PT,QSA,L]
+      })
+      get('/htaccess_frontpage').should == "front page"
+      cgi_envs = get('/htaccess_env?foo=bar+baz')
+      cgi_envs.should include("REQUEST_URI = /env?foo=bar+baz\n")
+      cgi_envs.should include("PATH_INFO = /env\n")
+    end
+  end
+
+  describe "configuration options" do
+    before :all do
+      create_apache2_controller
+      @apache2 << "PassengerMaxPoolSize 3"
+      @apache2 << "PassengerStatThrottleRate 0"
+
+      @stub = RackStub.new('rack')
+      @stub_url_root = "http://5.passenger.test:#{@apache2.port}"
+      @apache2.set_vhost('5.passenger.test', "#{@stub.full_app_root}/public") do |vhost|
+        vhost << "PassengerBufferUpload off"
+        vhost << "PassengerFriendlyErrorPages on"
+        vhost << "AllowEncodedSlashes on"
+      end
+
+      @stub2 = RackStub.new('rack')
+      @stub2_url_root = "http://6.passenger.test:#{@apache2.port}"
+      @apache2.set_vhost('6.passenger.test', "#{@stub2.full_app_root}/public") do |vhost|
+        vhost << "PassengerAppEnv development"
+        vhost << "PassengerSpawnMethod conservative"
+        vhost << "PassengerRestartDir #{@stub2.full_app_root}/public"
+        vhost << "AllowEncodedSlashes off"
+      end
+
+      @apache2.start
+    end
+
+    after :all do
+      @stub.destroy
+      @stub2.destroy
+      @apache2.stop if @apache2
+    end
+
+    before :each do
+      @stub.reset
+      @stub2.reset
+    end
+
+    specify "PassengerAppEnv is per-virtual host" do
+      @server = @stub_url_root
+      get('/system_env').should =~ /PASSENGER_APP_ENV = production/
+
+      @server = @stub2_url_root
+      get('/system_env').should =~ /PASSENGER_APP_ENV = development/
+    end
+
+    it "looks for restart.txt in the directory specified by PassengerRestartDir" do
+      @server = @stub2_url_root
+      startup_file = "#{@stub2.app_root}/config.ru"
+      restart_file = "#{@stub2.app_root}/public/restart.txt"
+
+      File.write(startup_file, %Q{
+        require File.expand_path(File.dirname(__FILE__) + "/library")
+
+        app = lambda do |env|
+          case env['PATH_INFO']
+          when '/'
+            text_response("hello world")
+          else
+            [404, { "Content-Type" => "text/plain" }, ["Unknown URI"]]
+          end
+        end
+
+        run app
+      })
+
+      now = Time.now
+      File.touch(restart_file, now - 5)
+      get('/').should == "hello world"
+
+      File.write(startup_file, %Q{
+        require File.expand_path(File.dirname(__FILE__) + "/library")
+
+        app = lambda do |env|
+          case env['PATH_INFO']
+          when '/'
+            text_response("oh hai")
+          else
+            [404, { "Content-Type" => "text/plain" }, ["Unknown URI"]]
+          end
+        end
+
+        run app
+      })
+
+      File.touch(restart_file, now - 10)
+      get('/').should == "oh hai"
+    end
+
+    describe "PassengerAppRoot" do
+      before :each do
+        @server = @stub_url_root
+        File.write("#{@stub.full_app_root}/public/cached.html", "Static cached.html")
+        File.write("#{@stub.full_app_root}/public/dir.html", "Static dir.html")
+        Dir.mkdir("#{@stub.full_app_root}/public/dir")
+      end
+
+      it "supports page caching on non-index URIs" do
+        get('/cached').should == "Static cached.html"
+      end
+
+      it "supports page caching on directory index URIs" do
+        get('/dir').should == "Static dir.html"
+      end
+
+      it "works" do
+        result = get('/parameters?first=one&second=Green+Bananas')
+        result.should =~ %r{First: one\n}
+        result.should =~ %r{Second: Green Bananas\n}
+      end
+    end
+
+    it "resolves symlinks in the document root if PassengerResolveSymlinksInDocumentRoot is set" do
+      orig_app_root = @stub.app_root
+      @stub.move(File.expand_path('tmp.mycook.symlinktest'))
+      FileUtils.mkdir_p(orig_app_root)
+      File.symlink("#{@stub.app_root}/public", "#{orig_app_root}/public")
+      begin
+        File.write("#{@stub.app_root}/public/.htaccess", "PassengerResolveSymlinksInDocumentRoot on")
+        @server = @stub_url_root
+        get('/').should == "front page"
+      ensure
+        FileUtils.rm_rf(orig_app_root)
+        @stub.move(orig_app_root)
+      end
+    end
+
+    it "supports encoded slashes in the URL if AllowEncodedSlashes is turned on" do
+      @server = @stub_url_root
+      get('/env/foo%2fbar').should =~ %r{PATH_INFO = /env/foo/bar\n}
+
+      @server = @stub2_url_root
+      get('/env/foo%2fbar').should =~ %r{404 Not Found}
+    end
+
+    describe "when handling POST requests with 'chunked' transfer encoding, if PassengerBufferUpload is off" do
+      it "sets Transfer-Encoding to 'chunked' and removes Content-Length" do
+        @uri = URI.parse(@stub_url_root)
+        socket = TCPSocket.new(@uri.host, @uri.port)
+        begin
+          socket.write("POST #{@stub_url_root}/env HTTP/1.1\r\n")
+          socket.write("Host: #{@uri.host}:#{@uri.port}\r\n")
+          socket.write("Transfer-Encoding: chunked\r\n")
+          socket.write("Content-Type: text/plain\r\n")
+          socket.write("Connection: close\r\n")
+          socket.write("\r\n")
+
+          chunk = "foo=bar!"
+          socket.write("%X\r\n%s\r\n" % [chunk.size, chunk])
+          socket.write("0\r\n\r\n")
+          socket.flush
+
+          response = socket.read
+          response.should_not include("CONTENT_LENGTH = ")
+          response.should include("HTTP_TRANSFER_ENCODING = chunked\n")
+        ensure
+          socket.close
+        end
+      end
+    end
+
+    ####################################
+  end
+
+  describe "error handling" do
+    before :all do
+      create_apache2_controller
+      FileUtils.rm_rf('tmp.webdir')
+      FileUtils.mkdir_p('tmp.webdir')
+      @webdir = File.expand_path('tmp.webdir')
+      @apache2.set_vhost('1.passenger.test', @webdir) do |vhost|
+        vhost << "PassengerBaseURI /app-that-crashes-during-startup/public"
+      end
+
+      @stub = RackStub.new('rack')
+      @stub_url_root = "http://2.passenger.test:#{@apache2.port}"
+      @apache2.set_vhost('2.passenger.test', "#{@stub.full_app_root}/public")
+
+      @apache2 << "PassengerFriendlyErrorPages on"
+      @apache2.start
+    end
+
+    after :all do
+      FileUtils.rm_rf('tmp.webdir')
+      @stub.destroy
+      @apache2.stop if @apache2
+    end
+
+    before :each do
+      @server = "http://1.passenger.test:#{@apache2.port}"
+      @error_page_signature = /<meta name="generator" content="Phusion Passenger">/
+      @stub.reset
+    end
+
+    it "displays an error page if the application crashes during startup" do
+      RackStub.use('rack', "#{@webdir}/app-that-crashes-during-startup") do |stub|
+        File.prepend(stub.startup_file, "raise 'app crash'")
+        result = get("/app-that-crashes-during-startup/public")
+        result.should =~ @error_page_signature
+        result.should =~ /app crash/
+      end
+    end
+
+    it "doesn't display a Ruby spawn error page if PassengerFriendlyErrorPages is off" do
+      RackStub.use('rack', "#{@webdir}/app-that-crashes-during-startup") do |stub|
+        File.write("#{stub.app_root}/public/.htaccess", "PassengerFriendlyErrorPages off")
+        File.prepend(stub.startup_file, "raise 'app crash'")
+        result = get("/app-that-crashes-during-startup/public")
+        result.should_not =~ @error_page_signature
+        result.should_not =~ /app crash/
+      end
+    end
+  end
+
+  describe "HelperAgent" do
+    AdminTools = PhusionPassenger::AdminTools
+
+    before :all do
+      create_apache2_controller
+      @stub = RackStub.new('rack')
+      @stub_url_root = "http://1.passenger.test:#{@apache2.port}"
+      @apache2 << "PassengerStatThrottleRate 0"
+      @apache2.set_vhost('1.passenger.test', "#{@stub.full_app_root}/public")
+      @apache2.start
+      @server = "http://1.passenger.test:#{@apache2.port}"
+    end
+
+    after :all do
+      @stub.destroy
+      @apache2.stop if @apache2
+    end
+
+    before :each do
+      @stub.reset
+    end
+
+    it "is restarted if it crashes" do
+      # Make sure that all Apache worker processes have connected to
+      # the helper agent.
+      10.times do
+        get('/').should == "front page"
+        sleep 0.1
+      end
+
+      # Now kill the helper agent.
+      instance = AdminTools::InstanceRegistry.new.list.first
+      Process.kill('SIGKILL', instance.server_pid)
+      sleep 0.02 # Give the signal a small amount of time to take effect.
+
+      # Each worker process should detect that the old
+      # helper agent has died, and should reconnect.
+      10.times do
+        get('/').should == "front page"
+        sleep 0.1
+      end
+    end
+
+    it "exposes the application pool for passenger-status" do
+      File.touch("#{@stub.app_root}/tmp/restart.txt", 1)  # Get rid of all previous app processes.
+      get('/').should == "front page"
+      instance = AdminTools::InstanceRegistry.new.list.first
+
+      # Wait until the server has processed the session close event.
+      sleep 0.1
+
+      request = Net::HTTP::Get.new("/pool.xml")
+      request.basic_auth("ro_admin", instance.read_only_admin_password)
+      response = instance.http_request("agents.s/server_admin", request)
+      if response.code.to_i / 100 == 2
+        doc = REXML::Document.new(response.body)
+      else
+        raise response.body
+      end
+
+      groups = doc.get_elements("info/supergroups/supergroup/group")
+      groups.should have(1).item
+      groups.each do |group|
+        group.elements["name"].text.should == "#{@stub.full_app_root} (production)#default"
+        processes = group.get_elements("processes/process")
+        processes.should have(1).item
+        processes[0].elements["processed"].text.should == "1"
+      end
+    end
+  end
+
+  ##### Helper methods #####
+
+  def start_web_server_if_necessary
+    if !@apache2.running?
+      @apache2.start
+    end
+  end
 end