passenger 4.0.41 → 4.0.42

data/resources/templates/apache2/deployment_example.txt.erb

@@ -12,6 +12,8 @@ Apache configuration file and set its DocumentRoot to <b>/somewhere/public</b>:
          AllowOverride all
          # MultiViews must be turned off.
          Options -MultiViews
+         # Uncomment this if you're on Apache >= 2.4:
+         #Require all granted
       </Directory>
    </VirtualHost>
 </b>

data/resources/templates/standalone/config.erb

@@ -62,7 +62,9 @@ http {
     <% if @options[:rolling_restarts] %>passenger_rolling_restarts on;<% end %>
     <% if @options[:resist_deployment_errors] %>passenger_resist_deployment_errors on;<% end %>
 
-    <% unless @options[:friendly_error_pages] %>passenger_friendly_error_pages off;<% end %>
+    <% if !@options[:friendly_error_pages].nil? -%>
+        passenger_friendly_error_pages <%= boolean_config_value(@options[:friendly_error_pages]) %>;
+    <% end %>
 
     <% if @options[:union_station_gateway_address] %>
         union_station_gateway_address <%= @options[:union_station_gateway_address] %>;

data/resources/templates/undisclosed_error.html.template

@@ -4,7 +4,7 @@
   <title>We're sorry, but something went wrong (500)</title>
   <style type="text/css">
     body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
-    div.dialog {
+    .dialog {
       width: 25em;
       padding: 0 4em;
       margin: 4em auto 0 auto;
@@ -13,6 +13,14 @@
       border-bottom-color: #999;
     }
     h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+    #operator_info_panel {
+      width: 27em;
+      margin: 4em auto 0 auto;
+      line-height: 1.2em;
+    }
+    #show_operator_info { text-decoration: none; color: #99f; font-size: smaller; }
+    #show_operator_info:hover { text-decoration: underline; }
+    #operator_info { color: #444; text-align: justify; }
   </style>
 </head>
 
@@ -21,5 +29,34 @@
     <h1>We're sorry, but something went wrong.</h1>
     <p>We've been notified about this issue and we'll take a look at it shortly.</p>
   </div>
+  <div id="operator_info_panel">
+    <a id="show_operator_info" href="javascript:void(showOperatorInfo())">Information for the administrator of this website</a>
+    <div id="operator_info" style="display: none">
+      <p>The {{PROGRAM_NAME}} application server encountered an error while starting your web application.
+        Because you are running this web application in staging or production mode, the details of the error
+        have been omitted from this web page for security reasons.</p>
+      <p><strong>Please read the web server error log to find the details of the error.</strong>
+        If you don't know where the web server error log is, read the troubleshooting documentation below.</p>
+      <p>Alternatively, you can turn on the "friendly error pages" feature (see below), which will make {{PROGRAM_NAME}} show many details about the error right in the browser.</p>
+      <p>{{PROGRAM_NAME}} troubleshooting documentation:</p>
+      <ul>
+        <li><a href="{{NGINX_DOC_URL|raw}}#troubleshooting">Nginx integration mode</a></li>
+        <li><a href="{{APACHE2_DOC_URL|raw}}#troubleshooting">Apache integration mode</a></li>
+        <li><a href="{{STANDALONE_DOC_URL|raw}}#troubleshooting">Standalone mode</a></li>
+      </ul>
+      <p>To turn on friendly error pages:</p>
+      <ul>
+        <li><a href="{{NGINX_DOC_URL|raw}}#PassengerFriendlyErrorPages">Nginx integration mode</a></li>
+        <li><a href="{{APACHE2_DOC_URL|raw}}#PassengerFriendlyErrorPages">Apache integration mode</a></li>
+        <li>Standalone mode: pass the <code>--friendly-error-pages</code> parameter to the <code>passenger</code> command.</li>
+      </ul>
+    </div>
+  </div>
+
+  <script>
+    function showOperatorInfo() {
+      document.getElementById('operator_info').style.display = 'block';
+    }
+  </script>
 </body>
 </html>

data/resources/union_station_gateway.crt

@@ -30,3 +30,24 @@ Fj0lBkzVUOlt2nWhLIW/uN3bjM9TsXaw8qUGWhvn4z3FHGHEdnLy3wMzwCSVq1tg
 QilKaQe+8Y4SePo110Tmkfls6vyEhcN6KpRWdpQSXUXmMY7IxjfNJnKTeGvWd1Y9
 CaY=
 -----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDhDCCAmwCCQDb6ONI7ndilzANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC
+TkwxEzARBgNVBAgTCk92ZXJpanNzZWwxEDAOBgNVBAoTB1BodXNpb24xJDAiBgNV
+BAMTG2dhdGV3YXkudW5pb25zdGF0aW9uYXBwLmNvbTEnMCUGCSqGSIb3DQEJARYY
+aW5mb0B1bmlvbnN0YXRpb25hcHAuY29tMB4XDTE0MDQxMjE3MzUwOVoXDTQxMDgy
+NzE3MzUwOVowgYMxCzAJBgNVBAYTAk5MMRMwEQYDVQQIEwpPdmVyaWpzc2VsMRAw
+DgYDVQQKEwdQaHVzaW9uMSQwIgYDVQQDExtnYXRld2F5LnVuaW9uc3RhdGlvbmFw
+cC5jb20xJzAlBgkqhkiG9w0BCQEWGGluZm9AdW5pb25zdGF0aW9uYXBwLmNvbTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANiimsW31XeYugqhRN6UqJVz
+vkj6dIe8oEXC5kCQo9Snqt+3zXg/ETvQTFkKhpg3ZJowOX9C2D5Llu/6ddzaS/jM
+MTxVs19g1n24hINhmuuADd2ETu5pxscaRyz7B6YutQZqIzZsy36vggAlJ1lABeCv
+VqUafl09eyAYjmSUuNak2rTdAE7jM4Sa2QuhzDy1XYKxd88r1sLe4yK54Oq+mUco
+8GvEoKur8vyyQ4EC1v7Konmq8i5A1nq/BJMpUCK534EbM6tU7qFzNL4K3BwWllwo
+zOjc6wEHAP9jqomcHNjTilT+WPxv3Gyrokzh25SQjQGUe7D4FnOfMrS38s2VOVMC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAbR0lOyAJPm9xH0E3cWIeqNyJMTH9y3wa
+5HT5XAB9pd4alr0ALK0MXNFVRVqV7xmMji2ghANyObMPARkzGkqHrR1GKKcdSzec
+uk3TtwA0OkTCc4ZKc95OcNOvyy63EG89pwMIM2qc7KcPYXEAWLclpWHYWuj4YJYD
+RGgusQIrP4xlrqNGmevLL6dGXgtG0QEGJDx4J00+9W6WXHwNpsDfVI6Ai1Ghf2HN
+ril0Fx4QPiMiO1a9C4BFHW2WK69jziVveAp++xsqEf5g31lfhyrb/uY0DYB0OsEl
+73aw9eJVkpc24cJEsUe7Hwg2xH1FWBvmcGZfj7Bz+yJ/XCdBFuAZZA==
+-----END CERTIFICATE-----

data/test/cxx/ApplicationPool2/SpawnerTestCases.cpp

@@ -317,6 +317,40 @@
 				&& gatheredOutput.find("hello stderr!\n") != string::npos;
 		);
 	}
+
+	TEST_METHOD(11) {
+		// It infers the code revision from the REVISION file.
+		TempDirCopy dir("stub/rack", "tmp.rack");
+		createFile("tmp.rack/REVISION", "hello\n");
+
+		Options options = createOptions();
+		options.appRoot      = "tmp.rack";
+		options.startCommand = "ruby\t" "start.rb";
+		options.startupFile  = "start.rb";
+		SpawnerPtr spawner = createSpawner(options);
+		process = spawner->spawn(options);
+		process->requiresShutdown = false;
+		
+		ensure_equals(process->codeRevision, "hello");
+	}
+
+	TEST_METHOD(12) {
+		// It infers the code revision from the app root symlink,
+		// if the app root is called "current".
+		TempDir dir1("tmp.rack");
+		TempDirCopy dir2("stub/rack", "tmp.rack/today");
+		symlink("today", "tmp.rack/current");
+
+		Options options = createOptions();
+		options.appRoot      = "tmp.rack/current";
+		options.startCommand = "ruby\t" "start.rb";
+		options.startupFile  = "start.rb";
+		SpawnerPtr spawner = createSpawner(options);
+		process = spawner->spawn(options);
+		process->requiresShutdown = false;
+		
+		ensure_equals(process->codeRevision, "today");
+	}
 	
 	// It raises an exception if getStartupCommand() is empty.
 

data/test/cxx/RequestHandlerTest.cpp

@@ -345,7 +345,8 @@ namespace tut {
 	/***** Error page tests *****/
 
 	TEST_METHOD(10) {
-		set_test_name("If the app crashes at startup without an error page then it renders a generic error page.");
+		set_test_name("If the app crashes at startup without an error page, "
+			"and friendly error pages are turned on, then it renders a generic error page.");
 		TempDir tempdir("tmp.handler");
 		writeFile("tmp.handler/start.rb",
 			"STDERR.puts 'I have failed'");
@@ -357,6 +358,7 @@ namespace tut {
 			"PASSENGER_APP_ROOT", (root + "/test/tmp.handler").c_str(),
 			"PASSENGER_APP_TYPE", "",
 			"PASSENGER_START_COMMAND", ("ruby\t" + root + "/test/tmp.handler/start.rb").c_str(),
+			"PASSENGER_FRIENDLY_ERROR_PAGES", "true",
 			"PATH_INFO", "/",
 			NULL);
 		string response = readAll(connection);
@@ -366,7 +368,8 @@ namespace tut {
 	}
 
 	TEST_METHOD(11) {
-		set_test_name("If the app crashes at startup with an error page then it renders a friendly error page.");
+		set_test_name("If the app crashes at startup with an error page, "
+			"and friendly error pages are turned on, then it renders a friendly error page.");
 		TempDir tempdir("tmp.handler");
 		writeFile("tmp.handler/start.rb",
 			"STDERR.puts 'Error'\n"
@@ -380,6 +383,7 @@ namespace tut {
 			"PASSENGER_APP_ROOT", (root + "/test/tmp.handler").c_str(),
 			"PASSENGER_APP_TYPE", "",
 			"PASSENGER_START_COMMAND", ("ruby\t" + root + "/test/tmp.handler/start.rb").c_str(),
+			"PASSENGER_FRIENDLY_ERROR_PAGES", "true",
 			"PATH_INFO", "/",
 			NULL);
 		string response = readAll(connection);
@@ -391,7 +395,8 @@ namespace tut {
 	}
 
 	TEST_METHOD(12) {
-		set_test_name("If spawning fails because of an internal error then it reports the error appropriately.");
+		set_test_name("If spawning fails because of an internal error, "
+			"and friendly error pages are on, then it reports the error appropriately.");
 		TempDir tempdir("tmp.handler");
 		writeFile("tmp.handler/start.rb", "");
 
@@ -402,6 +407,7 @@ namespace tut {
 			"PASSENGER_APP_ROOT", (root + "/test/tmp.handler").c_str(),
 			"PASSENGER_APP_TYPE", "",
 			"PASSENGER_START_COMMAND", ("ruby\t" + root + "/test/tmp.handler/start.rb").c_str(),
+			"PASSENGER_FRIENDLY_ERROR_PAGES", "true",
 			"PASSENGER_RAISE_INTERNAL_ERROR", "true",
 			"PATH_INFO", "/",
 			NULL);
@@ -429,6 +435,7 @@ namespace tut {
 			"PASSENGER_APP_ROOT", (root + "/test/tmp.handler").c_str(),
 			"PASSENGER_APP_TYPE", "",
 			"PASSENGER_START_COMMAND", ("ruby\t" + root + "/test/tmp.handler/start.rb").c_str(),
+			"PASSENGER_FRIENDLY_ERROR_PAGES", "true",
 			"PASSENGER_STATUS_LINE", "false",
 			"PATH_INFO", "/",
 			NULL);

data/test/cxx/TemplateTest.cpp

@@ -6,7 +6,7 @@ using namespace Passenger;
 
 namespace tut {
 	struct TemplateTest {
-		string apply(const StaticString &templateContent, ...) {
+		string apply(const char *templateContent, ...) {
 			va_list ap;
 			const char *arg;
 			StringMap<StaticString> params;

data/test/integration_tests/apache2_tests.rb

@@ -271,127 +271,132 @@ describe "Apache 2 module" do
 			create_apache2_controller
 			@apache2 << "PassengerMaxPoolSize 3"
 
-			@mycook = ClassicRailsStub.new('rails2.3-mycook')
-			@mycook_url_root = "http://1.passenger.test:#{@apache2.port}"
-			@apache2.set_vhost('1.passenger.test', "#{@mycook.full_app_root}/public") do |vhost|
+			@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
 
-			@foobar = ClassicRailsStub.new('rails2.3')
-			@foobar_url_root = "http://3.passenger.test:#{@apache2.port}"
-			@apache2.set_vhost('3.passenger.test', "#{@foobar.full_app_root}/public") do |vhost|
+			@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 << "RailsEnv development"
 				vhost << "PassengerSpawnMethod conservative"
-				vhost << "PassengerRestartDir #{@foobar.full_app_root}/public"
-			end
-
-			@mycook2 = ClassicRailsStub.new('rails2.3-mycook')
-			@mycook2_url_root = "http://4.passenger.test:#{@apache2.port}"
-			@apache2.set_vhost('4.passenger.test', "#{@mycook2.full_app_root}/sites/some.site/public") do |vhost|
-				vhost << "PassengerAppRoot #{@mycook2.full_app_root}"
-			end
-
-			@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 << "PassengerRestartDir #{@stub2.full_app_root}/public"
+				vhost << "AllowEncodedSlashes off"
 			end
 
 			@apache2.start
 		end
 
 		after :all do
-			@mycook.destroy
-			@foobar.destroy
-			@mycook2.destroy
 			@stub.destroy
+			@stub2.destroy
 			@apache2.stop if @apache2
 		end
 
 		before :each do
-			@mycook.reset
-			@foobar.reset
-			@mycook2.reset
 			@stub.reset
+			@stub2.reset
 		end
 
 		specify "RailsEnv is per-virtual host" do
-			@server = @mycook_url_root
-			get('/welcome/rails_env').should == "production"
+			@server = @stub_url_root
+			get('/system_env').should =~ /RAILS_ENV = production/
 
-			@server = @foobar_url_root
-			get('/foo/rails_env').should == "development"
+			@server = @stub2_url_root
+			get('/system_env').should =~ /RAILS_ENV = development/
 		end
 
 		it "looks for restart.txt in the directory specified by PassengerRestartDir" do
-			@server = @foobar_url_root
-			controller = "#{@foobar.app_root}/app/controllers/bar_controller.rb"
-			restart_file = "#{@foobar.app_root}/public/restart.txt"
-
-			File.write(controller, %Q{
-				class BarController < ApplicationController
-					def index
-						render :text => 'hello world'
+			@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('/bar').should == "hello world"
+			get('/').should == "hello world"
+
+			File.write(startup_file, %Q{
+				require File.expand_path(File.dirname(__FILE__) + "/library")
 
-			File.write(controller, %Q{
-				class BarController < ApplicationController
-					def index
-						render :text => 'oh hai'
+				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('/bar').should == "oh hai"
+			get('/').should == "oh hai"
 		end
 
 		describe "PassengerAppRoot" do
 			before :each do
-				@server = @mycook2_url_root
+				@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('/welcome/cached.html').should =~ %r{This is the cached version of some.site/public/welcome/cached}
+				get('/cached').should == "Static cached.html"
 			end
 
-			it "supports page caching on index URIs" do
-				get('/uploads.html').should =~ %r{This is the cached version of some.site/public/uploads}
+			it "supports page caching on directory index URIs" do
+				get('/dir').should == "Static dir.html"
 			end
 
-			it "works as a rails application" do
-				result = get('/welcome/parameters_test?hello=world&recipe[name]=Green+Bananas')
-				result.should =~ %r{<hello>world</hello>}
-				result.should =~ %r{<recipe>}
-				result.should =~ %r{<name>Green Bananas</name>}
+			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
 
-		specify "it resolves symlinks in the document root if PassengerResolveSymlinksInDocumentRoot is set" do
-			orig_mycook_app_root = @mycook.app_root
-			@mycook.move(File.expand_path('tmp.mycook.symlinktest'))
-			FileUtils.mkdir_p(orig_mycook_app_root)
-			File.symlink("#{@mycook.app_root}/public", "#{orig_mycook_app_root}/public")
+		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("#{@mycook.app_root}/public/.htaccess", "PassengerResolveSymlinksInDocumentRoot on")
-				@server = @mycook_url_root
-				get('/').should =~ /Welcome to MyCook/
+				File.write("#{@stub.app_root}/public/.htaccess", "PassengerResolveSymlinksInDocumentRoot on")
+				@server = @stub_url_root
+				get('/').should == "front page"
 			ensure
-				FileUtils.rm_rf(orig_mycook_app_root)
-				@mycook.move(orig_mycook_app_root)
+				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 = @mycook_url_root
-			File.write("#{@mycook.app_root}/public/.htaccess", "PassengerAllowEncodedSlashes on")
-			get('/welcome/show_id/foo%2fbar').should == 'foo/bar'
+			@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
@@ -430,62 +435,41 @@ describe "Apache 2 module" do
 			FileUtils.mkdir_p('tmp.webdir')
 			@webdir = File.expand_path('tmp.webdir')
 			@apache2.set_vhost('1.passenger.test', @webdir) do |vhost|
-				vhost << "RailsBaseURI /app-with-nonexistant-rails-version/public"
 				vhost << "RailsBaseURI /app-that-crashes-during-startup/public"
 			end
 
-			@mycook = ClassicRailsStub.new('rails2.3-mycook')
-			@mycook_url_root = "http://2.passenger.test:#{@apache2.port}"
-			@apache2.set_vhost('2.passenger.test', "#{@mycook.full_app_root}/public")
+			@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.start
 		end
 
 		after :all do
 			FileUtils.rm_rf('tmp.webdir')
-			@mycook.destroy
+			@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">/
-			@mycook.reset
-		end
-
-		it "displays an error page if the Rails application requires a nonexistant Rails version" do
-			ClassicRailsStub.use('rails2.3', "#{@webdir}/app-with-nonexistant-rails-version") do |stub|
-				File.write(stub.environment_rb) do |content|
-					content.sub(/^RAILS_GEM_VERSION = .*$/, "RAILS_GEM_VERSION = '1.9.1234'")
-				end
-				get("/app-with-nonexistant-rails-version/public").should =~ @error_page_signature
-			end
+			@stub.reset
 		end
 
-		it "displays an error page if the Rails application crashes during startup" do
-			ClassicRailsStub.use('rails2.3', "#{@webdir}/app-that-crashes-during-startup") do |stub|
-				File.prepend(stub.environment_rb, "raise 'app crash'")
+		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 "displays an error if a filesystem permission error was encountered while autodetecting the application type" do
-			@server = @mycook_url_root
-			# This test used to fail because we were improperly blocking mod_autoindex,
-			# resulting in it displaying a directory index before we could display an
-			# error message.
-			File.chmod(0000, "#{@mycook.app_root}/config")
-			# Don't let mod_rewrite kick in so that mod_autoindex has a chance to run.
-			File.unlink("#{@mycook.app_root}/public/.htaccess")
-			get('/').should =~ /Please fix the relevant file permissions/
-		end
-
 		it "doesn't display a Ruby spawn error page if PassengerFriendlyErrorPages is off" do
-			ClassicRailsStub.use('rails2.3', "#{@webdir}/app-that-crashes-during-startup") do |stub|
+			RackStub.use('rack', "#{@webdir}/app-that-crashes-during-startup") do |stub|
 				File.write("#{stub.app_root}/public/.htaccess", "PassengerFriendlyErrorPages off")
-				File.prepend(stub.environment_rb, "raise 'app crash'")
+				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/
@@ -498,27 +482,27 @@ describe "Apache 2 module" do
 
 		before :all do
 			create_apache2_controller
-			@mycook = ClassicRailsStub.new('rails2.3-mycook')
-			@mycook_url_root = "http://1.passenger.test:#{@apache2.port}"
-			@apache2.set_vhost('1.passenger.test', "#{@mycook.full_app_root}/public")
+			@stub = RackStub.new('rack')
+			@stub_url_root = "http://1.passenger.test:#{@apache2.port}"
+			@apache2.set_vhost('1.passenger.test', "#{@stub.full_app_root}/public")
 			@apache2.start
 			@server = "http://1.passenger.test:#{@apache2.port}"
 		end
 
 		after :all do
-			@mycook.destroy
+			@stub.destroy
 			@apache2.stop if @apache2
 		end
 
 		before :each do
-			@mycook.reset
+			@stub.reset
 		end
 
 		it "is restarted if it crashes" do
 			# Make sure that all Apache worker processes have connected to
 			# the helper server.
 			10.times do
-				get('/welcome').should =~ /Welcome to MyCook/
+				get('/').should == "front page"
 				sleep 0.1
 			end
 
@@ -530,14 +514,14 @@ describe "Apache 2 module" do
 			# Each worker process should detect that the old
 			# helper server has died, and should reconnect.
 			10.times do
-				get('/welcome').should =~ /Welcome to MyCook/
+				get('/').should == "front page"
 				sleep 0.1
 			end
 		end
 
 		it "exposes the application pool for passenger-status" do
-			File.touch("#{@mycook.app_root}/tmp/restart.txt", 1)  # Get rid of all previous app processes.
-			get('/welcome').should =~ /Welcome to MyCook/
+			File.touch("#{@stub.app_root}/tmp/restart.txt", 1)  # Get rid of all previous app processes.
+			get('/').should == "front page"
 			instance = AdminTools::ServerInstance.list.first
 
 			# Wait until the server has processed the session close event.
@@ -547,7 +531,7 @@ describe "Apache 2 module" do
 				instance.processes(client)
 			end
 			processes.should have(1).item
-			processes[0].group.name.should == @mycook.full_app_root + "#default"
+			processes[0].group.name.should == @stub.full_app_root + "#default"
 			processes[0].processed.should == 1
 		end
 	end