passenger 3.9.2.beta → 4.0.0.rc4

data/test/cxx/ApplicationPool2/SpawnerTestCases.cpp

@@ -21,7 +21,7 @@
 		spawner = createSpawner(options)
 
 	#define RUN_USER_SWITCHING_TEST() \
-		spawner->spawn(options); \
+		process = spawner->spawn(options); \
 		BufferedIO io(FileDescriptor(open("/tmp/info.txt", O_RDONLY))); \
 		uid_t uid = (uid_t) atol(io.readLine().c_str()); \
 		gid_t gid = (gid_t) atol(io.readLine().c_str()); \
@@ -73,16 +73,6 @@
 		return getgrgid(gid)->gr_name;
 	}
 
-	static string strip(const string &str) {
-		if (!str.empty() && str[str.size() - 1] == '\n') {
-			string result = str;
-			result.erase(str.size() - 1,  1);
-			return result;
-		} else {
-			return str;
-		}
-	}
-
 	TEST_METHOD(1) {
 		// Basic spawning test.
 		Options options = createOptions();
@@ -90,7 +80,7 @@
 		options.startCommand = "ruby\1" "start.rb";
 		options.startupFile  = "start.rb";
 		SpawnerPtr spawner = createSpawner(options);
-		ProcessPtr process = spawner->spawn(options);
+		process = spawner->spawn(options);
 		ensure_equals(process->sockets->size(), 1u);
 		
 		Connection conn = process->sockets->front().checkoutConnection();
@@ -178,7 +168,7 @@
 		options.startCommand = "ruby\1" "start.rb";
 		options.startupFile  = "start.rb";
 		SpawnerPtr spawner = createSpawner(options);
-		ProcessPtr process = spawner->spawn(options);
+		process = spawner->spawn(options);
 		ensure_equals(process->sockets->size(), 1u);
 		
 		Connection conn = process->sockets->front().checkoutConnection();
@@ -196,7 +186,7 @@
 		options.environmentVariables.push_back(make_pair("PASSENGER_FOO", "foo"));
 		options.environmentVariables.push_back(make_pair("PASSENGER_BAR", "bar"));
 		SpawnerPtr spawner = createSpawner(options);
-		ProcessPtr process = spawner->spawn(options);
+		process = spawner->spawn(options);
 		ensure_equals(process->sockets->size(), 1u);
 		
 		Connection conn = process->sockets->front().checkoutConnection();
@@ -245,7 +235,7 @@
 			runShellCommand("chmod 600 tmp.check/a");
 
 			try {
-				spawner->spawn(options);
+				process = spawner->spawn(options);
 				fail("SpawnException expected");
 			} catch (const SpawnException &e) {
 				ensure("(1)", containsSubstring(e.getErrorPage(),
@@ -254,7 +244,7 @@
 
 			runShellCommand("chmod 700 tmp.check/a");
 			try {
-				spawner->spawn(options);
+				process = spawner->spawn(options);
 				fail("SpawnException expected");
 			} catch (const SpawnException &e) {
 				ensure("(2)", containsSubstring(e.getErrorPage(),
@@ -263,7 +253,7 @@
 
 			runShellCommand("chmod 700 tmp.check/a/b/c");
 			try {
-				spawner->spawn(options);
+				process = spawner->spawn(options);
 				fail("SpawnException expected");
 			} catch (const SpawnException &e) {
 				ensure("(3)", containsSubstring(e.getErrorPage(),
@@ -271,7 +261,7 @@
 			}
 
 			runShellCommand("chmod 700 tmp.check/a/b/c/d");
-			spawner->spawn(options); // Should not throw.
+			process = spawner->spawn(options); // Should not throw.
 		}
 	}
 
@@ -279,19 +269,19 @@
 		// It forwards all stdout and stderr output, even after the corresponding
 		// Process object has been destroyed.
 		DeleteFileEventually d("tmp.output");
-		FileDescriptor output(open("tmp.output", O_WRONLY | O_CREAT | O_TRUNC, 0600));
+		PipeWatcher::onData = gatherOutput;
 
 		Options options = createOptions();
 		options.appRoot = "stub/rack";
 		options.appType = "rack";
 		SpawnerPtr spawner = createSpawner(options);
-		spawner->getConfig()->forwardStdoutTo = output;
-		spawner->getConfig()->forwardStderrTo = output;
-		ProcessPtr process = spawner->spawn(options);
+		process = spawner->spawn(options);
+		process->requiresShutdown = false;
 		
 		SessionPtr session = process->newSession();
 		session->initiate();
 		
+		setLogLevel(LVL_ERROR); // TODO: should be LVL_WARN
 		const char header[] =
 			"REQUEST_METHOD\0GET\0"
 			"PATH_INFO\0/print_stdout_and_stderr\0";
@@ -304,10 +294,14 @@
 		writeScalarMessage(session->fd(), data);
 		shutdown(session->fd(), SHUT_WR);
 		readAll(session->fd());
+		session->close(true);
+		session.reset();
+		process.reset();
+
 		EVENTUALLY(2,
-			string data = readAll("tmp.output");
-			result = data.find("hello stdout!\n") != string::npos
-				&& data.find("hello stderr!\n") != string::npos;
+			lock_guard<boost::mutex> l(gatheredOutputSyncher);
+			result = gatheredOutput.find("hello stdout!\n") != string::npos
+				&& gatheredOutput.find("hello stderr!\n") != string::npos;
 		);
 	}
 	
@@ -762,6 +756,17 @@
 		RUN_USER_SWITCHING_TEST();
 		runShellCommand(("groups " + testConfig["normal_user_1"].asString() + " > /tmp/info2.txt").c_str());
 		string defaultGroups = strip(readAll("/tmp/info2.txt"));
-		// default_groups.gsub!(/.*: */, '')
+
+		// On Linux, the 'groups' output is prepended by the group name so
+		// get rid of that.
+		string::size_type pos = defaultGroups.find(':');
+		if (pos != string::npos) {
+			pos++;
+			while (pos < defaultGroups.size() && defaultGroups[pos] == ' ') {
+				pos++;
+			}
+			defaultGroups.erase(0, pos);
+		}
+		
 		ensure_equals(groups, defaultGroups);
 	}

data/test/cxx/RequestHandlerTest.cpp

@@ -41,9 +41,11 @@ namespace tut {
 			createServerInstanceDirAndGeneration(serverInstanceDir, generation);
 			spawnerFactory = make_shared<SpawnerFactory>(bg.safe, *resourceLocator, generation);
 			pool = make_shared<Pool>(bg.safe.get(), spawnerFactory);
+			pool->initialize();
 			serverFilename = generation->getPath() + "/server";
 			requestSocket = createUnixServer(serverFilename);
 			setNonBlocking(requestSocket);
+			setLogLevel(LVL_ERROR); // TODO: set to LVL_WARN
 
 			agentOptions.passengerRoot = resourceLocator->getRoot();
 			root = resourceLocator->getRoot();
@@ -56,7 +58,7 @@ namespace tut {
 		}
 		
 		~RequestHandlerTest() {
-			setLogLevel(0);
+			setLogLevel(DEFAULT_LOG_LEVEL);
 			unlink(serverFilename.c_str());
 			handler.reset();
 			pool->destroy();
@@ -832,6 +834,20 @@ namespace tut {
 		}
 	}
 
+	TEST_METHOD(47) {
+		set_test_name("The RequestHandler should append a Date header if the app doesn't output one.");
+
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/pid",
+			NULL);
+
+		string result = readAll(connection);
+		ensure(result.find("Date: ") != string::npos);
+	}
+
 	// Test small response buffering.
 	// Test large response buffering.
 }

data/test/cxx/UtilsTest.cpp

@@ -1,7 +1,7 @@
-#include "TestSupport.h"
-#include "Utils.h"
-#include "Utils/StrIntUtils.h"
-#include "Utils/MemZeroGuard.h"
+#include <TestSupport.h>
+#include <Utils.h>
+#include <Utils/StrIntUtils.h>
+#include <Utils/MemZeroGuard.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
@@ -49,14 +49,20 @@ namespace tut {
 
 	TEST_METHOD(1) {
 		split("", ':', output);
-		ensure_equals(output.size(), 1u);
-		ensure_equals(output[0], "");
+		ensure_equals(output.size(), 0u);
+
+		splitIncludeSep("", ':', output);
+		ensure_equals(output.size(), 0u);
 	}
 	
 	TEST_METHOD(2) {
 		split("hello world", ':', output);
 		ensure_equals(output.size(), 1u);
 		ensure_equals(output[0], "hello world");
+
+		splitIncludeSep("hello world", ':', output);
+		ensure_equals(output.size(), 1u);
+		ensure_equals(output[0], "hello world");
 	}
 	
 	TEST_METHOD(3) {
@@ -64,13 +70,22 @@ namespace tut {
 		ensure_equals(output.size(), 2u);
 		ensure_equals(output[0], "hello world");
 		ensure_equals(output[1], "foo bar");
+
+		splitIncludeSep("hello world:foo bar", ':', output);
+		ensure_equals(output.size(), 2u);
+		ensure_equals(output[0], "hello world:");
+		ensure_equals(output[1], "foo bar");
 	}
 	
 	TEST_METHOD(4) {
 		split("hello world:", ':', output);
-		ensure_equals(output.size(), 2u);
-		ensure_equals(output[0], "hello world");
-		ensure_equals(output[1], "");
+		ensure_equals("(1)", output.size(), 2u);
+		ensure_equals("(2)", output[0], "hello world");
+		ensure_equals("(3)", output[1], "");
+
+		splitIncludeSep("hello world:", ':', output);
+		ensure_equals("(4)", output.size(), 1u);
+		ensure_equals("(5)", output[0], "hello world:");
 	}
 	
 	TEST_METHOD(5) {
@@ -78,6 +93,11 @@ namespace tut {
 		ensure_equals(output.size(), 2u);
 		ensure_equals(output[0], "");
 		ensure_equals(output[1], "hello world");
+
+		splitIncludeSep(":hello world", ':', output);
+		ensure_equals(output.size(), 2u);
+		ensure_equals(output[0], ":");
+		ensure_equals(output[1], "hello world");
 	}
 	
 	TEST_METHOD(6) {
@@ -87,6 +107,13 @@ namespace tut {
 		ensure_equals(output[1], "def");
 		ensure_equals(output[2], "");
 		ensure_equals(output[3], "ghi");
+
+		splitIncludeSep("abc:def::ghi", ':', output);
+		ensure_equals(output.size(), 4u);
+		ensure_equals(output[0], "abc:");
+		ensure_equals(output[1], "def:");
+		ensure_equals(output[2], ":");
+		ensure_equals(output[3], "ghi");
 	}
 	
 	TEST_METHOD(7) {
@@ -96,6 +123,13 @@ namespace tut {
 		ensure_equals(output[1], "");
 		ensure_equals(output[2], "");
 		ensure_equals(output[3], "def");
+
+		splitIncludeSep("abc:::def", ':', output);
+		ensure_equals(output.size(), 4u);
+		ensure_equals(output[0], "abc:");
+		ensure_equals(output[1], ":");
+		ensure_equals(output[2], ":");
+		ensure_equals(output[3], "def");
 	}
 	
 	
@@ -167,11 +201,30 @@ namespace tut {
 		ensure_equals("Test 8", extractDirName(".."), ".");
 		ensure_equals("Test 9", extractDirName("./foo"), ".");
 		ensure_equals("Test 10", extractDirName("../foo"), "..");
+		ensure_equals("Test 11", extractDirName(""), ".");
+		ensure_equals("Test 12", extractDirName(".///"), ".");
+		ensure_equals("Test 13", extractDirName("foo//bar"), "foo");
+	}
+
+	TEST_METHOD(27) {
+		ensure_equals("Test 1", extractDirNameStatic("/usr/lib"), "/usr");
+		ensure_equals("Test 2", extractDirNameStatic("/usr/lib/"), "/usr");
+		ensure_equals("Test 3", extractDirNameStatic("/usr/"), "/");
+		ensure_equals("Test 4", extractDirNameStatic("usr"), ".");
+		ensure_equals("Test 5", extractDirNameStatic("/"), "/");
+		ensure_equals("Test 6", extractDirNameStatic("///"), "/");
+		ensure_equals("Test 7", extractDirNameStatic("."), ".");
+		ensure_equals("Test 8", extractDirNameStatic(".."), ".");
+		ensure_equals("Test 9", extractDirNameStatic("./foo"), ".");
+		ensure_equals("Test 10", extractDirNameStatic("../foo"), "..");
+		ensure_equals("Test 11", extractDirNameStatic(""), ".");
+		ensure_equals("Test 12", extractDirNameStatic(".///"), ".");
+		ensure_equals("Test 13", extractDirNameStatic("foo//bar"), "foo");
 	}
 	
 	/***** Test resolveSymlink() *****/
 	
-	TEST_METHOD(27) {
+	TEST_METHOD(28) {
 		TempDir d("tmp.symlinks");
 		runShellCommand("touch tmp.symlinks/foo.txt");
 		runShellCommand("ln -s /usr/bin tmp.symlinks/absolute_symlink");
@@ -585,4 +638,25 @@ namespace tut {
 		ensure_equals(absolutizePath("../../foo", "/usr/local/bin"), "/usr/foo");
 		ensure_equals(absolutizePath("../.././foo/bar", "/usr/local/bin"), "/usr/foo/bar");
 	}
+
+	/***** Test constantTimeCompare() *****/
+
+	TEST_METHOD(54) {
+		ensure("(1)", constantTimeCompare("", ""));
+		ensure("(2)", constantTimeCompare("a", "a"));
+		ensure("(3)", constantTimeCompare("aa", "aa"));
+		ensure("(4)", constantTimeCompare("abc", "abc"));
+
+		ensure("(5)", !constantTimeCompare("", "a"));
+		ensure("(6)", !constantTimeCompare("", "abcd"));
+		ensure("(7)", !constantTimeCompare("ab", "cd"));
+		ensure("(8)", !constantTimeCompare("ab", "abc"));
+		ensure("(9)", !constantTimeCompare("ab", "abcd"));
+		
+		ensure("(10)", !constantTimeCompare("a", ""));
+		ensure("(11)", !constantTimeCompare("abcd", ""));
+		ensure("(12)", !constantTimeCompare("cd", "ab"));
+		ensure("(13)", !constantTimeCompare("abc", "ab"));
+		ensure("(14)", !constantTimeCompare("abcd", "ab"));
+	}
 }

data/test/integration_tests/apache2_tests.rb

@@ -11,27 +11,19 @@ require 'integration_tests/cgi_environment_spec'
 require 'integration_tests/hello_world_rack_spec'
 require 'integration_tests/hello_world_wsgi_spec'
 
-# TODO: test the 'RailsUserSwitching' and 'RailsDefaultUser' option.
+# TODO: test the 'PassengerUserSwitching' and 'PassengerDefaultUser' option.
 # TODO: test custom page caching directory
 
 describe "Apache 2 module" do
 	before :all do
 		check_hosts_configuration
-		@apache2 = Apache2Controller.new
 		@passenger_temp_dir = "/tmp/passenger-test.#{$$}"
 		Dir.mkdir(@passenger_temp_dir)
 		ENV['PASSENGER_TEMP_DIR'] = @passenger_temp_dir
-		@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
 	
 	after :all do
-		@apache2.stop
+		@apache2.stop if @apache2
 		FileUtils.chmod_R(0777, @passenger_temp_dir)
 		FileUtils.rm_rf(@passenger_temp_dir)
 	end
@@ -40,23 +32,36 @@ describe "Apache 2 module" 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#### #{self.class.description} : #{description}"
+			f.puts "\n#### #{Time.now}: #{example.full_description}"
+		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
 	
 	describe ": MyCook(tm) beta running on root URI" do
 		before :all do
+			create_apache2_controller
 			@web_server_supports_chunked_transfer_encoding = true
 			@base_uri = ""
 			@server = "http://passenger.test:#{@apache2.port}"
 			@apache2 << "RailsMaxPoolSize 1"
-			@stub = RailsStub.new('2.3/mycook')
+			@stub = ClassicRailsStub.new('rails_apps/2.3/mycook')
 			@apache2.set_vhost("passenger.test", "#{@stub.full_app_root}/public")
 			@apache2.start
 		end
 		
 		after :all do
 			@stub.destroy
+			@apache2.stop if @apache2
 		end
 		
 		before :each do
@@ -64,7 +69,7 @@ describe "Apache 2 module" do
 		end
 		
 		it_should_behave_like "MyCook(tm) beta"
-		include_shared_example_group "CGI environment variables compliance"
+		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.
@@ -123,9 +128,10 @@ describe "Apache 2 module" do
 	
 	describe ": MyCook(tm) beta running in a sub-URI" do
 		before :all do
+			create_apache2_controller
 			@web_server_supports_chunked_transfer_encoding = true
 			@base_uri = "/mycook"
-			@stub = RailsStub.new('2.3/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')
@@ -140,6 +146,7 @@ describe "Apache 2 module" do
 		after :all do
 			FileUtils.rm_rf('tmp.webdir')
 			@stub.destroy
+			@apache2.stop if @apache2
 		end
 		
 		before :each do
@@ -148,7 +155,7 @@ describe "Apache 2 module" do
 		end
 		
 		it_should_behave_like "MyCook(tm) beta"
-		include_shared_example_group "CGI environment variables compliance"
+		include_examples "CGI environment variables compliance"
 		
 		it "does not interfere with the root website" do
 			@server = "http://passenger.test:#{@apache2.port}"
@@ -158,9 +165,10 @@ describe "Apache 2 module" do
 	
 	describe "compatibility with other modules" do
 		before :all do
+			create_apache2_controller
 			@apache2 << "RailsMaxPoolSize 1"
 			
-			@mycook = RailsStub.new('2.3/mycook')
+			@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|
 				vhost << "RewriteEngine on"
@@ -172,6 +180,7 @@ describe "Apache 2 module" do
 		
 		after :all do
 			@mycook.destroy
+			@apache2.stop if @apache2
 		end
 		
 		before :each do
@@ -208,18 +217,16 @@ describe "Apache 2 module" do
 	
 	describe "configuration options" do
 		before :all do
+			create_apache2_controller
 			@apache2 << "PassengerMaxPoolSize 3"
 			
-			@mycook = RailsStub.new('2.3/mycook')
+			@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|
 				vhost << "AllowEncodedSlashes on"
 			end
-			@apache2.set_vhost('2.passenger.test', "#{@mycook.full_app_root}/public") do |vhost|
-				vhost << "RailsAutoDetect off"
-			end
 			
-			@foobar = RailsStub.new('2.3/foobar')
+			@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|
 				vhost << "RailsEnv development"
@@ -227,26 +234,12 @@ describe "Apache 2 module" do
 				vhost << "PassengerRestartDir #{@foobar.full_app_root}/public"
 			end
 			
-			@mycook2 = RailsStub.new('2.3/mycook')
+			@mycook2 = ClassicRailsStub.new('rails_apps/2.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
 			
-			# These are used by global queueing tests.
-			@mycook3 = RailsStub.new('2.3/mycook')
-			@mycook3_url_root = "http://5.passenger.test:#{@apache2.port}"
-			@apache2.set_vhost('5.passenger.test', "#{@mycook3.full_app_root}/sites/some.site/public") do |vhost|
-				vhost << "PassengerAppRoot #{@mycook3.full_app_root}"
-				vhost << "PassengerMinInstances 3"
-			end
-			@mycook4 = RailsStub.new('2.3/mycook')
-			@mycook4_url_root = "http://6.passenger.test:#{@apache2.port}"
-			@apache2.set_vhost('6.passenger.test', "#{@mycook4.full_app_root}/public") do |vhost|
-				vhost << "PassengerUseGlobalQueue on"
-				vhost << "PassengerMinInstances 3"
-			end
-			
 			@apache2.start
 		end
 		
@@ -254,26 +247,13 @@ describe "Apache 2 module" do
 			@mycook.destroy
 			@foobar.destroy
 			@mycook2.destroy
-			@mycook3.destroy
-			@mycook4.destroy
+			@apache2.stop if @apache2
 		end
 		
 		before :each do
 			@mycook.reset
 			@foobar.reset
 			@mycook2.reset
-			@mycook3.reset
-			@mycook4.reset
-		end
-		
-		it "ignores the Rails application if RailsAutoDetect is off" do
-			@server = "http://2.passenger.test:#{@apache2.port}"
-			get('/').should_not =~ /MyCook/
-		end
-		
-		specify "setting RailsAutoDetect for one virtual host should not interfere with others" do
-			@server = @mycook_url_root
-			get('/').should =~ /MyCook/
 		end
 		
 		specify "RailsEnv is per-virtual host" do
@@ -284,18 +264,6 @@ describe "Apache 2 module" do
 			get('/foo/rails_env').should == "development"
 		end
 		
-		it "supports conservative spawning" do
-			@server = @foobar_url_root
-			# TODO: I think this assertion is no longer valid now that
-			# smart-lv2 is the default spawn method...
-			get('/foo/backtrace').should_not =~ /framework_spawner/
-		end
-		
-		specify "PassengerSpawnMethod spawning is per-virtual host" do
-			@server = @mycook_url_root
-			get('/welcome/backtrace').should =~ /application_spawner/
-		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"
@@ -325,88 +293,6 @@ describe "Apache 2 module" do
 			get('/bar').should == "oh hai"
 		end
 		
-		describe "PassengerUseGlobalQueue" do
-			before :each do
-				
-			end
-			
-			after :each do
-				# Restart Apache in order to reset the application pool's state.
-				@apache2.stop
-			end
-			
-			it "works and is per-virtual host" do
-				@server = @mycook4_url_root
-				
-				# Spawn 3 application processes.
-				get('/')
-				eventually do
-					inspect_server(:processes).size == 3
-				end
-				
-				# Reserve all application pool slots.
-				threads = []
-				3.times do |i|
-					thread = Thread.new do
-						File.unlink("#{@mycook4.app_root}/#{i}.txt") rescue nil
-						get("/welcome/sleep_until_exists?name=#{i}.txt")
-					end
-					threads << thread
-				end
-				
-				# Wait until all application instances are waiting
-				# for the quit file.
-				eventually(5) do
-					File.exist?("#{@mycook4.app_root}/waiting_0.txt") &&
-					File.exist?("#{@mycook4.app_root}/waiting_1.txt") &&
-					File.exist?("#{@mycook4.app_root}/waiting_2.txt")
-				end
-				processes = inspect_server(:processes)
-				processes.should have(3).items
-				processes.each do |process|
-					process.sessions.should == 1
-				end
-				inspect_server(:global_queue_size).should == 0
-				
-				# While all slots are reserved, make two more requests.
-				first_request_done = false
-				second_request_done = false
-				thread = Thread.new do
-					get("/")
-					first_request_done = true
-				end
-				threads << thread
-				thread = Thread.new do
-					get("/")
-					second_request_done = true
-				end
-				threads << thread
-				
-				# These requests should both be waiting on the global queue.
-				sleep 1
-				processes = inspect_server(:processes)
-				processes.should have(3).items
-				processes.each do |process|
-					process.sessions.should == 1
-				end
-				inspect_server(:global_queue_size).should == 2
-				
-				# Both requests should be processed if one application instance frees up.
-				File.touch("#{@mycook4.app_root}/2.txt")
-				eventually(5) do
-					first_request_done && second_request_done
-				end
-				inspect_server(:global_queue_size).should == 0
-				
-				File.touch("#{@mycook4.app_root}/0.txt")
-				File.touch("#{@mycook4.app_root}/1.txt")
-				File.touch("#{@mycook4.app_root}/2.txt")
-				threads.each do |thread|
-					thread.join
-				end
-			end
-		end
-		
 		describe "PassengerAppRoot" do
 			before :each do
 				@server = @mycook2_url_root
@@ -454,16 +340,16 @@ describe "Apache 2 module" do
 	
 	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 << "RailsBaseURI /app-with-nonexistant-rails-version/public"
 				vhost << "RailsBaseURI /app-that-crashes-during-startup/public"
-				vhost << "RailsBaseURI /app-with-crashing-vendor-rails/public"
 			end
 			
-			@mycook = RailsStub.new('2.3/mycook')
+			@mycook = ClassicRailsStub.new('rails_apps/2.3/mycook')
 			@mycook_url_root = "http://2.passenger.test:#{@apache2.port}"
 			@apache2.set_vhost('2.passenger.test', "#{@mycook.full_app_root}/public")
 			
@@ -473,6 +359,7 @@ describe "Apache 2 module" do
 		after :all do
 			FileUtils.rm_rf('tmp.webdir')
 			@mycook.destroy
+			@apache2.stop if @apache2
 		end
 		
 		before :each do
@@ -482,7 +369,7 @@ describe "Apache 2 module" do
 		end
 		
 		it "displays an error page if the Rails application requires a nonexistant Rails version" do
-			RailsStub.use('2.3/foobar', "#{@webdir}/app-with-nonexistant-rails-version") do |stub|
+			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
@@ -491,7 +378,7 @@ describe "Apache 2 module" do
 		end
 		
 		it "displays an error page if the Rails application crashes during startup" do
-			RailsStub.use('2.3/foobar', "#{@webdir}/app-that-crashes-during-startup") do |stub|
+			ClassicRailsStub.use('rails2.3', "#{@webdir}/app-that-crashes-during-startup") do |stub|
 				File.prepend(stub.environment_rb, "raise 'app crash'")
 				result = get("/app-that-crashes-during-startup/public")
 				result.should =~ @error_page_signature
@@ -499,17 +386,6 @@ describe "Apache 2 module" do
 			end
 		end
 		
-		it "displays an error page if the Rails application's vendor'ed Rails crashes" do
-			RailsStub.use('2.3/foobar', "#{@webdir}/app-with-crashing-vendor-rails") do |stub|
-				stub.use_vendor_rails('minimal')
-				File.append("#{stub.app_root}/vendor/rails/railties/lib/initializer.rb",
-					"raise 'vendor crash'")
-				result = get("/app-with-crashing-vendor-rails/public")
-				result.should =~ @error_page_signature
-				result.should =~ /vendor 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,
@@ -522,7 +398,7 @@ describe "Apache 2 module" do
 		end
 		
 		it "doesn't display a Ruby spawn error page if PassengerFriendlyErrorPages is off" do
-			RailsStub.use('2.3/foobar', "#{@webdir}/app-that-crashes-during-startup") do |stub|
+			ClassicRailsStub.use('rails2.3', "#{@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'")
 				result = get("/app-that-crashes-during-startup/public")
@@ -536,7 +412,8 @@ describe "Apache 2 module" do
 		AdminTools = PhusionPassenger::AdminTools
 		
 		before :all do
-			@mycook = RailsStub.new('2.3/mycook')
+			create_apache2_controller
+			@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")
 			@apache2.start
@@ -545,6 +422,7 @@ describe "Apache 2 module" do
 		
 		after :all do
 			@mycook.destroy
+			@apache2.stop if @apache2
 		end
 		
 		before :each do
@@ -584,13 +462,14 @@ describe "Apache 2 module" do
 				instance.processes
 			end
 			processes.should have(1).item
-			processes[0].group.name.should == @mycook.full_app_root
+			processes[0].group.name.should == @mycook.full_app_root + "#default"
 			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
@@ -599,6 +478,7 @@ describe "Apache 2 module" do
 		
 		after :all do
 			@stub.destroy
+			@apache2.stop if @apache2
 		end
 		
 		it_should_behave_like "HelloWorld Rack application"
@@ -606,6 +486,7 @@ describe "Apache 2 module" do
 	
 	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')
@@ -620,6 +501,7 @@ describe "Apache 2 module" do
 		after :all do
 			@stub.destroy
 			FileUtils.rm_rf('tmp.webdir')
+			@apache2.stop if @apache2
 		end
 		
 		it_should_behave_like "HelloWorld Rack application"
@@ -627,7 +509,8 @@ describe "Apache 2 module" do
 	
 	describe "Rack application running within Rails directory structure" do
 		before :all do
-			@stub = RailsStub.new('2.3/mycook')
+			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
@@ -636,6 +519,7 @@ describe "Apache 2 module" do
 
 		after :all do
 			@stub.destroy
+			@apache2.stop if @apache2
 		end
 
 		it_should_behave_like "HelloWorld Rack application"
@@ -643,6 +527,7 @@ describe "Apache 2 module" do
 
 	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
@@ -651,6 +536,7 @@ describe "Apache 2 module" do
 		
 		after :all do
 			@stub.destroy
+			@apache2.stop if @apache2
 		end
 		
 		it_should_behave_like "HelloWorld WSGI application"