RubyGems - passenger - Versions diffs - 4.0.30 → 4.0.31 - Mend

passenger 4.0.30 → 4.0.31

Potentially problematic release.

This version of passenger might be problematic. Click here for more details.

Files changed (409) hide show

data/test/cxx/MessagePassingTest.cpp CHANGED

@@ -51,7 +51,7 @@ namespace tut {
 		unsigned long long timeout = 0;
 		Timer timer;
 		ensure_equals(box->recv("hi", &timeout), MessagePtr());
-		ensure(timer.elapsed() < 2);
+		ensure(timer.elapsed() < 10);
 		ensure_equals(timeout, 0ull);
 	}

data/test/cxx/RequestHandlerTest.cpp CHANGED

@@ -175,9 +175,9 @@ namespace tut {
 		string response = readAll(connection);
 		string body = stripHeaders(response);
 		ensure("Status line is correct", containsSubstring(response, "HTTP/1.1 200 OK\r\n"));
-		ensure("Headers are correct", containsSubstring(response, "Content-Type: text/html\r\n"));
+		ensure("Headers are correct", containsSubstring(response, "Content-Type: text/plain\r\n"));
 		ensure("Contains a Status header", containsSubstring(response, "Status: 200 OK\r\n"));
-		ensure_equals(body, "hello <b>world</b>");
+		ensure_equals(body, "front page");
 	}
 	TEST_METHOD(2) {
@@ -192,9 +192,9 @@ namespace tut {
 			string response = readAll(connection);
 			string body = stripHeaders(response);
 			ensure("Status line is correct", containsSubstring(response, "HTTP/1.1 200 OK\r\n"));
-			ensure("Headers are correct", containsSubstring(response, "Content-Type: text/html\r\n"));
+			ensure("Headers are correct", containsSubstring(response, "Content-Type: text/plain\r\n"));
 			ensure("Contains a Status header", containsSubstring(response, "Status: 200 OK\r\n"));
-			ensure_equals(body, "hello <b>world</b>");
+			ensure_equals(body, "front page");
 		}
 	}
@@ -227,9 +227,9 @@ namespace tut {
 		string response = readAll(connection);
 		string body = stripHeaders(response);
 		ensure("Status line is correct", containsSubstring(response, "HTTP/1.1 200 OK\r\n"));
-		ensure("Headers are correct", containsSubstring(response, "Content-Type: text/html\r\n"));
+		ensure("Headers are correct", containsSubstring(response, "Content-Type: text/plain\r\n"));
 		ensure("Contains a Status header", containsSubstring(response, "Status: 200 OK\r\n"));
-		ensure_equals(body, "hello <b>world</b>");
+		ensure_equals(body, "front page");
 	}
 	TEST_METHOD(4) {
@@ -245,7 +245,7 @@ namespace tut {
 			"PATH_INFO", "/",
 			NULL
 		);
-		ensure(containsSubstring(readAll(connection), "hello <b>world</b>"));
+		ensure(containsSubstring(readAll(connection), "front page"));
 		connect();
 		try {
@@ -297,7 +297,7 @@ namespace tut {
 			"PATH_INFO", "/",
 			NULL
 		);
-		ensure(containsSubstring(readAll(connection), "hello <b>world</b>"));
+		ensure(containsSubstring(readAll(connection), "front page"));
 	}
 	TEST_METHOD(7) {
@@ -390,14 +390,14 @@ namespace tut {
 			"PATH_INFO", "/",
 			NULL);
 		string response = readAll(connection);
-		ensure(containsSubstring(response, "HTTP/1.1 500 Internal Server Error\r\n"));
-		ensure(containsSubstring(response, "Status: 500 Internal Server Error\r\n"));
-		ensure(containsSubstring(response, "Content-Type: text/html; charset=UTF-8\r\n"));
-		ensure(containsSubstring(response, "<html>"));
-		ensure(containsSubstring(response, "An internal error occurred while trying to spawn the application."));
-		ensure(containsSubstring(response, "Passenger:<wbr>:<wbr>RuntimeException"));
-		ensure(containsSubstring(response, "An internal error!"));
-		ensure(containsSubstring(response, "Spawner.h"));
+		ensure("(1)", containsSubstring(response, "HTTP/1.1 500 Internal Server Error\r\n"));
+		ensure("(2)", containsSubstring(response, "Status: 500 Internal Server Error\r\n"));
+		ensure("(3)", containsSubstring(response, "Content-Type: text/html; charset=UTF-8\r\n"));
+		ensure("(4)", containsSubstring(response, "<html>"));
+		ensure("(5)", containsSubstring(response, "An internal error occurred while trying to spawn the application."));
+		ensure("(6)", containsSubstring(response, "RuntimeException"));
+		ensure("(7)", containsSubstring(response, "An internal error!"));
+		ensure("(8)", containsSubstring(response, "Spawner.h"));
 	}
 	TEST_METHOD(13) {
@@ -458,7 +458,7 @@ namespace tut {
 		connect();
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
-			"PATH_INFO", "/upload",
+			"PATH_INFO", "/raw_upload_to_file",
 			"HTTP_X_OUTPUT", (root + "/test/tmp.output").c_str(),
 			NULL);
 		writeExact(connection, "hello\n");
@@ -482,7 +482,7 @@ namespace tut {
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
 			"PASSENGER_BUFFERING", "true",
-			"PATH_INFO", "/upload",
+			"PATH_INFO", "/raw_upload_to_file",
 			"HTTP_X_OUTPUT", (root + "/test/tmp.output").c_str(),
 			NULL);
 		writeExact(connection, "hello\n");
@@ -515,7 +515,7 @@ namespace tut {
 		connect();
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
-			"PATH_INFO", "/upload",
+			"PATH_INFO", "/raw_upload_to_file",
 			"PASSENGER_BUFFERING", "true",
 			"HTTP_X_WAIT_FOR_FILE", "/tmp/wait.txt",
 			"HTTP_X_OUTPUT", "/tmp/output.txt",
@@ -653,7 +653,7 @@ namespace tut {
 		connect();
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
-			"PATH_INFO", "/upload",
+			"PATH_INFO", "/raw_upload_to_file",
 			"CONTENT_LENGTH", toString(requestBody.size()).c_str(),
 			"PASSENGER_BUFFERING", "true",
 			"HTTP_X_OUTPUT", "/tmp/output.txt",
@@ -678,7 +678,7 @@ namespace tut {
 		connect();
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
-			"PATH_INFO", "/upload",
+			"PATH_INFO", "/raw_upload_to_file",
 			"CONTENT_LENGTH", toString(requestBody.size()).c_str(),
 			"PASSENGER_BUFFERING", "true",
 			"HTTP_X_OUTPUT", "/tmp/output.txt",
@@ -710,7 +710,7 @@ namespace tut {
 		connect();
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
-			"PATH_INFO", "/upload",
+			"PATH_INFO", "/raw_upload_to_file",
 			"CONTENT_LENGTH", toString(requestBody.size()).c_str(),
 			"HTTP_X_OUTPUT", "/tmp/output.txt",
 			NULL);
@@ -735,7 +735,7 @@ namespace tut {
 		connect();
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
-			"PATH_INFO", "/upload",
+			"PATH_INFO", "/raw_upload_to_file",
 			"CONTENT_LENGTH", toString(requestBody.size()).c_str(),
 			"HTTP_X_OUTPUT", "/tmp/output.txt",
 			NULL);
@@ -758,7 +758,7 @@ namespace tut {
 		connect();
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
-			"PATH_INFO", "/upload",
+			"PATH_INFO", "/raw_upload_to_file",
 			"CONTENT_LENGTH", "0",
 			"PASSENGER_BUFFERING", "true",
 			"HTTP_X_OUTPUT", "/tmp/output.txt",
@@ -781,7 +781,7 @@ namespace tut {
 		connect();
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
-			"PATH_INFO", "/upload",
+			"PATH_INFO", "/raw_upload_to_file",
 			"CONTENT_LENGTH", "0",
 			"HTTP_X_OUTPUT", "/tmp/output.txt",
 			NULL);
@@ -952,7 +952,7 @@ namespace tut {
 		connect();
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
-			"PATH_INFO", "/chunked",
+			"PATH_INFO", "/chunked_stream",
 			NULL
 		);

data/test/integration_tests/apache2_tests.rb CHANGED

@@ -2,14 +2,11 @@ require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
 require 'socket'
 require 'fileutils'
 require 'support/apache2_controller'
-require 'phusion_passenger/platform_info'
-require 'phusion_passenger/admin_tools'
-require 'phusion_passenger/admin_tools/server_instance'
+PhusionPassenger.require_passenger_lib 'platform_info'
+PhusionPassenger.require_passenger_lib 'admin_tools'
+PhusionPassenger.require_passenger_lib 'admin_tools/server_instance'
-require 'integration_tests/mycook_spec'
-require 'integration_tests/cgi_environment_spec'
-require 'integration_tests/hello_world_rack_spec'
-require 'integration_tests/hello_world_wsgi_spec'
+require 'integration_tests/shared/example_webapp_tests'
 # TODO: test the 'PassengerUserSwitching' and 'PassengerDefaultUser' option.
 # TODO: test custom page caching directory
@@ -21,13 +18,13 @@ describe "Apache 2 module" do
 		Dir.mkdir(@passenger_temp_dir)
 		ENV['PASSENGER_TEMP_DIR'] = @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
@@ -46,186 +43,183 @@ describe "Apache 2 module" do
 			)
 		end
 	end
-	describe ": MyCook(tm) beta running on root URI" do
+	describe "a Ruby app running on the root URI" do
 		before :all do
 			create_apache2_controller
-			@web_server_supports_chunked_transfer_encoding = true
-			@base_uri = ""
-			@server = "http://passenger.test:#{@apache2.port}"
+			@server = "http://1.passenger.test:#{@apache2.port}"
+			@stub = RackStub.new('rack')
 			@apache2 << "RailsMaxPoolSize 1"
-			@stub = ClassicRailsStub.new('rails_apps/2.3/mycook')
-			@apache2.set_vhost("passenger.test", "#{@stub.full_app_root}/public")
+			@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 "MyCook(tm) beta"
-		include_examples "CGI environment variables compliance"
-		it "doesn't block Rails while an upload is in progress" do
-			get('/') # Force spawning so that the timeout below is enough.
-			socket = TCPSocket.new('passenger.test', @apache2.port)
-			begin
-				socket.write("POST / HTTP/1.1\r\n")
-				socket.write("Host: passenger.test\r\n")
-				upload_data = File.read("stub/upload_data.txt")
-				size_of_first_half = upload_data.size / 2
-				socket.write(upload_data[0..size_of_first_half])
-				socket.flush
-				Timeout.timeout(10) do
-					get('/').should =~ /Welcome to MyCook/
-				end
-			ensure
-				socket.close rescue nil
+		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 << "RailsMaxPoolSize 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
-		it "doesn't block Rails while a large number of uploads are in progress" do
-			get('/') # Force spawning so that the timeout below is enough.
-			sockets = []
-			upload_data = File.read("stub/upload_data.txt")
-			size_of_first_half = upload_data.size / 2
-			begin
-				9.times do |i|
-					socket = TCPSocket.new('passenger.test', @apache2.port)
-					sockets << socket
-					socket.write("POST / HTTP/1.1\r\n")
-					socket.write("Host: passenger.test\r\n")
-					socket.write(upload_data[0..size_of_first_half])
-					socket.flush
-				end
-				Timeout.timeout(10) do
-					get('/').should =~ /Welcome to MyCook/
-				end
-			ensure
-				sockets.each do |socket|
-					socket.close rescue nil
-				end
-			end
+		after :all do
+			@stub.destroy
+			@apache2.stop if @apache2
 		end
-		it "appends an X-Powered-By header containing the Phusion Passenger version number" do
-			response = get_response('/')
-			response["X-Powered-By"].should include("Phusion Passenger")
-			response["X-Powered-By"].should include(PhusionPassenger::VERSION_STRING)
+		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 ": MyCook(tm) beta running in a sub-URI" do
+	describe "a Python app running on the root URI" do
 		before :all do
 			create_apache2_controller
-			@web_server_supports_chunked_transfer_encoding = true
-			@base_uri = "/mycook"
-			@stub = ClassicRailsStub.new('rails_apps/2.3/mycook')
-			FileUtils.rm_rf('tmp.webdir')
-			FileUtils.mkdir_p('tmp.webdir')
-			FileUtils.cp_r('stub/zsfa/.', 'tmp.webdir')
-			FileUtils.ln_sf(@stub.full_app_root + "/public", 'tmp.webdir/mycook')
-			@apache2.set_vhost('passenger.test', File.expand_path('tmp.webdir')) do |vhost|
-				vhost << "RailsBaseURI /mycook"
+			@server = "http://1.passenger.test:#{@apache2.port}"
+			@stub = PythonStub.new('wsgi')
+			@apache2 << "RailsMaxPoolSize 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 << "RailsMaxPoolSize 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
-			FileUtils.rm_rf('tmp.webdir')
 			@stub.destroy
 			@apache2.stop if @apache2
 		end
 		before :each do
-			@server = "http://passenger.test:#{@apache2.port}/mycook"
 			@stub.reset
 		end
-		it_should_behave_like "MyCook(tm) beta"
-		include_examples "CGI environment variables compliance"
+		it_should_behave_like "an example web app"
 		it "does not interfere with the root website" do
-			@server = "http://passenger.test:#{@apache2.port}"
-			get('/').should =~ /Zed, you rock\!/
+			@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 << "RailsMaxPoolSize 1"
-			@mycook = ClassicRailsStub.new('rails_apps/2.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')
+			@server = "http://1.passenger.test:#{@apache2.port}"
+			@apache2 << "RailsMaxPoolSize 1"
+			@apache2.set_vhost("1.passenger.test", "#{@stub.full_app_root}/public") do |vhost|
 				vhost << "RewriteEngine on"
-				vhost << "RewriteRule ^/rewritten_welcome$ /welcome [PT,QSA,L]"
-				vhost << "RewriteRule ^/rewritten_cgi_environment$ /welcome/cgi_environment [PT,QSA,L]"
+				vhost << "RewriteRule ^/rewritten_frontpage$ / [PT,QSA,L]"
+				vhost << "RewriteRule ^/rewritten_env$ /env [PT,QSA,L]"
 			end
 			@apache2.start
 		end
 		after :all do
-			@mycook.destroy
+			@stub.destroy
 			@apache2.stop if @apache2
 		end
 		before :each do
-			@mycook.reset
-			@server = @mycook_url_root
+			@stub.reset
 		end
 		it "supports environment variable passing through mod_env" do
-			File.write("#{@mycook.app_root}/public/.htaccess", 'SetEnv FOO "Foo Bar!"')
-			File.touch("#{@mycook.app_root}/tmp/restart.txt")  # Activate ENV changes.
-			get('/welcome/environment').should =~ /FOO = Foo Bar\!/
-			get('/welcome/cgi_environment').should =~ /FOO = Foo Bar\!/
+			File.write("#{@stub.app_root}/public/.htaccess", 'SetEnv FOO "Foo Bar!"')
+			File.touch("#{@stub.app_root}/tmp/restart.txt", 2)  # Activate ENV changes.
+			get('/env').should =~ /^FOO = Foo Bar\!$/
 		end
 		it "supports mod_rewrite in the virtual host block" do
-			get('/rewritten_welcome').should =~ /Welcome to MyCook/
-			cgi_envs = get('/rewritten_cgi_environment?foo=bar+baz')
-			cgi_envs.should include("REQUEST_URI = /welcome/cgi_environment?foo=bar+baz\n")
-			cgi_envs.should include("PATH_INFO = /welcome/cgi_environment\n")
+			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("#{@mycook.app_root}/public/.htaccess", %Q{
+			File.write("#{@stub.app_root}/public/.htaccess", %Q{
 				RewriteEngine on
-				RewriteRule ^htaccess_welcome$ welcome [PT,QSA,L]
-				RewriteRule ^htaccess_cgi_environment$ welcome/cgi_environment [PT,QSA,L]
+				RewriteRule ^htaccess_frontpage$ / [PT,QSA,L]
+				RewriteRule ^htaccess_env$ env [PT,QSA,L]
 			})
-			get('/htaccess_welcome').should =~ /Welcome to MyCook/
-			cgi_envs = get('/htaccess_cgi_environment?foo=bar+baz')
-			cgi_envs.should include("REQUEST_URI = /welcome/cgi_environment?foo=bar+baz\n")
-			cgi_envs.should include("PATH_INFO = /welcome/cgi_environment\n")
+			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"
-			@mycook = ClassicRailsStub.new('rails_apps/2.3/mycook')
+			@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|
 				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|
@@ -233,42 +227,42 @@ describe "Apache 2 module" do
 				vhost << "PassengerSpawnMethod conservative"
 				vhost << "PassengerRestartDir #{@foobar.full_app_root}/public"
 			end
-			@mycook2 = ClassicRailsStub.new('rails_apps/2.3/mycook')
+			@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
 			@apache2.start
 		end
 		after :all do
 			@mycook.destroy
 			@foobar.destroy
 			@mycook2.destroy
 			@apache2.stop if @apache2
 		end
 		before :each do
 			@mycook.reset
 			@foobar.reset
 			@mycook2.reset
 		end
 		specify "RailsEnv is per-virtual host" do
 			@server = @mycook_url_root
 			get('/welcome/rails_env').should == "production"
 			@server = @foobar_url_root
 			get('/foo/rails_env').should == "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
@@ -276,11 +270,11 @@ describe "Apache 2 module" do
 					end
 				end
 			})
 			now = Time.now
 			File.touch(restart_file, now - 5)
 			get('/bar').should == "hello world"
 			File.write(controller, %Q{
 				class BarController < ApplicationController
 					def index
@@ -288,24 +282,24 @@ describe "Apache 2 module" do
 					end
 				end
 			})
 			File.touch(restart_file, now - 10)
 			get('/bar').should == "oh hai"
 		end
 		describe "PassengerAppRoot" do
 			before :each do
 				@server = @mycook2_url_root
 			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}
 			end
 			it "supports page caching on index URIs" do
 				get('/uploads.html').should =~ %r{This is the cached version of some.site/public/uploads}
 			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>}
@@ -313,7 +307,7 @@ describe "Apache 2 module" do
 				result.should =~ %r{<name>Green Bananas</name>}
 			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'))
@@ -328,16 +322,16 @@ describe "Apache 2 module" do
 				@mycook.move(orig_mycook_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'
 		end
 		####################################
 	end
 	describe "error handling" do
 		before :all do
 			create_apache2_controller
@@ -348,26 +342,26 @@ describe "Apache 2 module" do
 				vhost << "RailsBaseURI /app-with-nonexistant-rails-version/public"
 				vhost << "RailsBaseURI /app-that-crashes-during-startup/public"
 			end
-			@mycook = ClassicRailsStub.new('rails_apps/2.3/mycook')
+			@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")
 			@apache2.start
 		end
 		after :all do
 			FileUtils.rm_rf('tmp.webdir')
 			@mycook.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|
@@ -376,7 +370,7 @@ describe "Apache 2 module" do
 				get("/app-with-nonexistant-rails-version/public").should =~ @error_page_signature
 			end
 		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'")
@@ -385,7 +379,7 @@ describe "Apache 2 module" do
 				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,
@@ -396,7 +390,7 @@ describe "Apache 2 module" do
 			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|
 				File.write("#{stub.app_root}/public/.htaccess", "PassengerFriendlyErrorPages off")
@@ -407,28 +401,28 @@ describe "Apache 2 module" do
 			end
 		end
 	end
 	describe "HelperAgent" do
 		AdminTools = PhusionPassenger::AdminTools
 		before :all do
 			create_apache2_controller
-			@mycook = ClassicRailsStub.new('rails_apps/2.3/mycook')
+			@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")
 			@apache2.start
 			@server = "http://1.passenger.test:#{@apache2.port}"
 		end
 		after :all do
 			@mycook.destroy
 			@apache2.stop if @apache2
 		end
 		before :each do
 			@mycook.reset
 		end
 		it "is restarted if it crashes" do
 			# Make sure that all Apache worker processes have connected to
 			# the helper server.
@@ -436,12 +430,12 @@ describe "Apache 2 module" do
 				get('/welcome').should =~ /Welcome to MyCook/
 				sleep 0.1
 			end
 			# Now kill the helper server.
 			instance = AdminTools::ServerInstance.list.first
 			Process.kill('SIGKILL', instance.helper_agent_pid)
 			sleep 0.02 # Give the signal a small amount of time to take effect.
 			# Each worker process should detect that the old
 			# helper server has died, and should reconnect.
 			10.times do
@@ -449,15 +443,15 @@ describe "Apache 2 module" do
 				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/
 			instance = AdminTools::ServerInstance.list.first
 			# Wait until the server has processed the session close event.
 			sleep 0.1
 			processes = instance.connect(:role => :passenger_status) do |client|
 				instance.processes(client)
 			end
@@ -466,84 +460,9 @@ describe "Apache 2 module" do
 			processes[0].processed.should == 1
 		end
 	end
-	describe "Rack application running in root URI" do
-		before :all do
-			create_apache2_controller
-			@stub = RackStub.new('rack')
-			@apache2.set_vhost('passenger.test', @stub.full_app_root + "/public")
-			@apache2.start
-			@server = "http://passenger.test:#{@apache2.port}"
-		end
-		after :all do
-			@stub.destroy
-			@apache2.stop if @apache2
-		end
-		it_should_behave_like "HelloWorld Rack application"
-	end
-	describe "Rack application running in sub-URI" do
-		before :all do
-			create_apache2_controller
-			FileUtils.rm_rf('tmp.webdir')
-			FileUtils.mkdir_p('tmp.webdir')
-			@stub = RackStub.new('rack')
-			@apache2.set_vhost('passenger.test', File.expand_path('tmp.webdir')) do |vhost|
-				FileUtils.ln_s(@stub.full_app_root + "/public", 'tmp.webdir/rack')
-				vhost << "RackBaseURI /rack"
-			end
-			@apache2.start
-			@server = "http://passenger.test:#{@apache2.port}/rack"
-		end
-		after :all do
-			@stub.destroy
-			FileUtils.rm_rf('tmp.webdir')
-			@apache2.stop if @apache2
-		end
-		it_should_behave_like "HelloWorld Rack application"
-	end
-	describe "Rack application running within Rails directory structure" do
-		before :all do
-			create_apache2_controller
-			@stub = ClassicRailsStub.new('rails_apps/2.3/mycook')
-			FileUtils.cp_r("stub/rack/.", @stub.app_root)
-			@apache2.set_vhost('passenger.test', @stub.full_app_root + "/public")
-			@apache2.start
-			@server = "http://passenger.test:#{@apache2.port}"
-		end
-		after :all do
-			@stub.destroy
-			@apache2.stop if @apache2
-		end
-		it_should_behave_like "HelloWorld Rack application"
-	end
-	describe "WSGI application running in root URI" do
-		before :all do
-			create_apache2_controller
-			@stub = Stub.new('wsgi')
-			@apache2.set_vhost('passenger.test', @stub.full_app_root + "/public")
-			@apache2.start
-			@server = "http://passenger.test:#{@apache2.port}"
-		end
-		after :all do
-			@stub.destroy
-			@apache2.stop if @apache2
-		end
-		it_should_behave_like "HelloWorld WSGI application"
-	end
 	##### Helper methods #####
 	def start_web_server_if_necessary
 		if !@apache2.running?
 			@apache2.start