passenger 4.0.48 → 4.0.49

data/test/cxx/ApplicationPool2/ProcessTest.cpp

@@ -13,39 +13,39 @@ namespace tut {
 		SocketPair adminSocket;
 		Pipe errorPipe;
 		FileDescriptor server1, server2, server3;
-		
+
 		ApplicationPool2_ProcessTest() {
 			bg.start();
-			
+
 			struct sockaddr_in addr;
 			socklen_t len = sizeof(addr);
 			sockets = boost::make_shared<SocketList>();
-			
+
 			server1 = createTcpServer("127.0.0.1", 0);
 			getsockname(server1, (struct sockaddr *) &addr, &len);
 			sockets->add("main1",
 				"tcp://127.0.0.1:" + toString(addr.sin_port),
 				"session", 3);
-			
+
 			server2 = createTcpServer("127.0.0.1", 0);
 			getsockname(server2, (struct sockaddr *) &addr, &len);
 			sockets->add("main2",
 				"tcp://127.0.0.1:" + toString(addr.sin_port),
 				"session", 3);
-			
+
 			server3 = createTcpServer("127.0.0.1", 0);
 			getsockname(server3, (struct sockaddr *) &addr, &len);
 			sockets->add("main3",
 				"tcp://127.0.0.1:" + toString(addr.sin_port),
 				"session", 3);
-			
+
 			adminSocket = createUnixSocketPair();
 			errorPipe = createPipe();
 		}
 	};
-	
+
 	DEFINE_TEST_GROUP(ApplicationPool2_ProcessTest);
-	
+
 	TEST_METHOD(1) {
 		// Test initial state.
 		ProcessPtr process = boost::make_shared<Process>(
@@ -56,7 +56,7 @@ namespace tut {
 		ensure_equals(process->busyness(), 0);
 		ensure(!process->isTotallyBusy());
 	}
-	
+
 	TEST_METHOD(2) {
 		// Test opening and closing sessions.
 		ProcessPtr process = boost::make_shared<Process>(
@@ -72,7 +72,7 @@ namespace tut {
 		process->sessionClosed(session2.get());
 		ensure_equals(process->sessions, 0);
 	}
-	
+
 	TEST_METHOD(3) {
 		// newSession() checks out the socket with the smallest busyness number
 		// and sessionClosed() restores the session busyness statistics.
@@ -81,7 +81,7 @@ namespace tut {
 			errorPipe[0], sockets, 0, 0);
 		process->dummy = true;
 		process->requiresShutdown = false;
-		
+
 		// The first 3 newSession() commands check out an idle socket.
 		SessionPtr session1 = process->newSession();
 		SessionPtr session2 = process->newSession();
@@ -89,12 +89,12 @@ namespace tut {
 		ensure(session1->getSocket()->name != session2->getSocket()->name);
 		ensure(session1->getSocket()->name != session3->getSocket()->name);
 		ensure(session2->getSocket()->name != session3->getSocket()->name);
-		
+
 		// The next 2 newSession() commands check out sockets with sessions == 1.
 		SessionPtr session4 = process->newSession();
 		SessionPtr session5 = process->newSession();
 		ensure(session4->getSocket()->name != session5->getSocket()->name);
-		
+
 		// There should now be 1 process with 1 session
 		// and 2 processes with 2 sessions.
 		map<int, int> sessionCount;
@@ -105,7 +105,7 @@ namespace tut {
 		ensure_equals(sessionCount.size(), 2u);
 		ensure_equals(sessionCount[1], 1);
 		ensure_equals(sessionCount[2], 2);
-		
+
 		// Closing the first 3 sessions will result in no processes having 1 session
 		// and 1 process having 2 sessions.
 		process->sessionClosed(session1.get());
@@ -118,7 +118,7 @@ namespace tut {
 		ensure_equals(sessionCount[0], 1);
 		ensure_equals(sessionCount[1], 2);
 	}
-	
+
 	TEST_METHOD(4) {
 		// If all sockets are at their full capacity then newSession() will fail.
 		ProcessPtr process = boost::make_shared<Process>(

data/test/cxx/ApplicationPool2/SmartSpawnerTest.cpp

@@ -19,7 +19,7 @@ namespace tut {
 		PipeWatcher::DataCallback gatherOutput;
 		string gatheredOutput;
 		boost::mutex gatheredOutputSyncher;
-		
+
 		ApplicationPool2_SmartSpawnerTest() {
 			createServerInstanceDirAndGeneration(serverInstanceDir, generation);
 			PipeWatcher::onData = PipeWatcher::DataCallback();
@@ -27,32 +27,32 @@ namespace tut {
 			setLogLevel(LVL_ERROR); // TODO: should be LVL_WARN
 			setPrintAppOutputAsDebuggingMessages(true);
 		}
-		
+
 		~ApplicationPool2_SmartSpawnerTest() {
 			setLogLevel(DEFAULT_LOG_LEVEL);
 			setPrintAppOutputAsDebuggingMessages(false);
 			unlink("stub/wsgi/passenger_wsgi.pyc");
 			PipeWatcher::onData = PipeWatcher::DataCallback();
 		}
-		
+
 		boost::shared_ptr<SmartSpawner> createSpawner(const Options &options, bool exitImmediately = false) {
 			char buf[PATH_MAX + 1];
 			getcwd(buf, PATH_MAX);
-			
+
 			vector<string> command;
 			command.push_back("ruby");
 			command.push_back(string(buf) + "/support/placebo-preloader.rb");
 			if (exitImmediately) {
 				command.push_back("exit-immediately");
 			}
-			
+
 			return boost::make_shared<SmartSpawner>(
 				generation,
 				command,
 				options,
 				make_shared<SpawnerConfig>(*resourceLocator));
 		}
-		
+
 		Options createOptions() {
 			Options options;
 			options.spawnMethod = "smart";
@@ -65,11 +65,11 @@ namespace tut {
 			gatheredOutput.append(data, size);
 		}
 	};
-	
+
 	DEFINE_TEST_GROUP_WITH_LIMIT(ApplicationPool2_SmartSpawnerTest, 90);
-	
+
 	#include "SpawnerTestCases.cpp"
-	
+
 	TEST_METHOD(80) {
 		// If the preloader has crashed then SmartSpawner will
 		// restart it and try again.
@@ -81,16 +81,16 @@ namespace tut {
 		setLogLevel(LVL_CRIT);
 		process = spawner->spawn(options);
 		process->requiresShutdown = false;
-		
+
 		kill(spawner->getPreloaderPid(), SIGTERM);
 		// Give it some time to exit.
 		usleep(300000);
-		
+
 		// No exception at next spawn.
 		process = spawner->spawn(options);
 		process->requiresShutdown = false;
 	}
-	
+
 	TEST_METHOD(81) {
 		// If the preloader still crashes after the restart then
 		// SmartSpawner will throw an exception.
@@ -108,7 +108,7 @@ namespace tut {
 			// Pass.
 		}
 	}
-	
+
 	TEST_METHOD(82) {
 		// If the preloader didn't start within the timeout
 		// then it's killed and an exception is thrown, with
@@ -118,7 +118,7 @@ namespace tut {
 		options.startCommand = "ruby\t" "start.rb";
 		options.startupFile  = "start.rb";
 		options.startTimeout = 300;
-		
+
 		vector<string> preloaderCommand;
 		preloaderCommand.push_back("bash");
 		preloaderCommand.push_back("-c");
@@ -129,7 +129,7 @@ namespace tut {
 			options,
 			make_shared<SpawnerConfig>(*resourceLocator));
 		setLogLevel(LVL_CRIT);
-		
+
 		try {
 			process = spawner.spawn(options);
 			process->requiresShutdown = false;
@@ -140,7 +140,7 @@ namespace tut {
 			ensure(e.getErrorPage().find("hello world\n") != string::npos);
 		}
 	}
-	
+
 	TEST_METHOD(83) {
 		// If the preloader crashed during startup without returning
 		// a proper error response, then its stderr output is used
@@ -149,7 +149,7 @@ namespace tut {
 		options.appRoot      = "stub/rack";
 		options.startCommand = "ruby\t" "start.rb";
 		options.startupFile  = "start.rb";
-		
+
 		vector<string> preloaderCommand;
 		preloaderCommand.push_back("bash");
 		preloaderCommand.push_back("-c");
@@ -180,7 +180,7 @@ namespace tut {
 		options.startCommand = "ruby\t" "start.rb";
 		options.startupFile  = "start.rb";
 		options.environmentVariables.push_back(make_pair("PASSENGER_FOO", "foo"));
-		
+
 		vector<string> preloaderCommand;
 		preloaderCommand.push_back("bash");
 		preloaderCommand.push_back("-c");
@@ -191,7 +191,7 @@ namespace tut {
 			options,
 			make_shared<SpawnerConfig>(*resourceLocator));
 		setLogLevel(LVL_CRIT);
-		
+
 		try {
 			process = spawner.spawn(options);
 			process->requiresShutdown = false;
@@ -208,7 +208,7 @@ namespace tut {
 		PipeWatcher::onData = gatherOutput;
 		Options options = createOptions();
 		options.appRoot = "stub/rack";
-		
+
 		{
 			vector<string> preloaderCommand;
 			preloaderCommand.push_back("ruby");
@@ -221,10 +221,10 @@ namespace tut {
 			process = spawner.spawn(options);
 			process->requiresShutdown = false;
 		}
-		
+
 		SessionPtr session = process->newSession();
 		session->initiate();
-		
+
 		const char header[] =
 			"REQUEST_METHOD\0GET\0"
 			"PATH_INFO\0/print_stderr\0";

data/test/cxx/ApplicationPool2/SpawnerTestCases.cpp

@@ -31,7 +31,7 @@
 		(void) uid; (void) gid; (void) groups
 
 	typedef boost::shared_ptr<Spawner> SpawnerPtr;
-	
+
 	static void addUserSwitchingCode() {
 		FILE *f = fopen("tmp.wsgi/passenger_wsgi.py", "a");
 		fputs(
@@ -84,7 +84,7 @@
 		process = spawner->spawn(options);
 		process->requiresShutdown = false;
 		ensure_equals(process->sockets->size(), 1u);
-		
+
 		Connection conn = process->sockets->front().checkoutConnection();
 		ScopeGuard guard(boost::bind(checkin, process, &conn));
 		writeExact(conn.fd, "ping\n");
@@ -181,13 +181,13 @@
 		process = spawner->spawn(options);
 		process->requiresShutdown = false;
 		ensure_equals(process->sockets->size(), 1u);
-		
+
 		Connection conn = process->sockets->front().checkoutConnection();
 		ScopeGuard guard(boost::bind(checkin, process, &conn));
 		writeExact(conn.fd, "pid\n");
 		ensure_equals(readAll(conn.fd), toString(process->pid) + "\n");
 	}
-	
+
 	TEST_METHOD(7) {
 		// Custom environment variables can be passed.
 		Options options = createOptions();
@@ -200,7 +200,7 @@
 		process = spawner->spawn(options);
 		process->requiresShutdown = false;
 		ensure_equals(process->sockets->size(), 1u);
-		
+
 		Connection conn = process->sockets->front().checkoutConnection();
 		ScopeGuard guard(boost::bind(checkin, process, &conn));
 		writeExact(conn.fd, "envvars\n");
@@ -296,10 +296,10 @@
 		SpawnerPtr spawner = createSpawner(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"
@@ -336,7 +336,7 @@
 		SpawnerPtr spawner = createSpawner(options);
 		process = spawner->spawn(options);
 		process->requiresShutdown = false;
-		
+
 		ensure_equals(process->codeRevision, "hello");
 	}
 
@@ -354,10 +354,10 @@
 		SpawnerPtr spawner = createSpawner(options);
 		process = spawner->spawn(options);
 		process->requiresShutdown = false;
-		
+
 		ensure_equals(process->codeRevision, "today");
 	}
-	
+
 	// It raises an exception if getStartupCommand() is empty.
 
 	/******* User switching tests *******/
@@ -820,6 +820,6 @@
 			}
 			defaultGroups.erase(0, pos);
 		}
-		
+
 		ensure_equals(groups, defaultGroups);
 	}

data/test/cxx/ScgiRequestParserTest.cpp

@@ -8,7 +8,7 @@ namespace tut {
 	struct ScgiRequestParserTest {
 		ScgiRequestParser parser;
 	};
-	
+
 	DEFINE_TEST_GROUP(ScgiRequestParserTest);
 
 	TEST_METHOD(1) {
@@ -17,9 +17,9 @@ namespace tut {
 		ensure_equals(parser.getState(), ScgiRequestParser::READING_LENGTH_STRING);
 		ensure(parser.getHeaderData().empty());
 	}
-	
+
 	/***** Test parsing a complete SCGI request in a single pass. *****/
-	
+
 	TEST_METHOD(2) {
 		// Parsing a request with a single header and no body.
 		static const char data[] = "12:hello\0world\0,";
@@ -33,7 +33,7 @@ namespace tut {
 			string("hello\0world\0", 12));
 		ensure(parser.getHeader("hello") == "world");
 	}
-	
+
 	TEST_METHOD(3) {
 		// Parsing a request with a single header and a body.
 		static const char data[] = "12:hello\0world\0,data";
@@ -47,7 +47,7 @@ namespace tut {
 			string("hello\0world\0", 12));
 		ensure(parser.getHeader("hello") == "world");
 	}
-	
+
 	TEST_METHOD(4) {
 		// Parsing a request with multiple headers and no body.
 		static const char data[] = "19:hello\0world\0SCGI\0001\0,";
@@ -62,7 +62,7 @@ namespace tut {
 		ensure(parser.getHeader("hello") == "world");
 		ensure(parser.getHeader("SCGI") == "1");
 	}
-	
+
 	TEST_METHOD(5) {
 		// Parsing a request with multiple headers and a body.
 		static const char data[] = "19:hello\0world\0SCGI\0001\0,body";
@@ -77,7 +77,7 @@ namespace tut {
 		ensure(parser.getHeader("hello") == "world");
 		ensure(parser.getHeader("SCGI") == "1");
 	}
-	
+
 	TEST_METHOD(6) {
 		// Parsing a request that's larger than the limit.
 		parser = ScgiRequestParser(9);
@@ -87,9 +87,9 @@ namespace tut {
 		ensure_equals(parser.getErrorReason(),
 			ScgiRequestParser::LIMIT_REACHED);
 	}
-	
+
 	/***** Test parsing a complete SCGI request in multiple passes. *****/
-	
+
 	TEST_METHOD(8) {
 		// Parsing a request with multiple headers and a body.
 		// 1 byte per pass.
@@ -105,7 +105,7 @@ namespace tut {
 		ensure(parser.getHeader("hello") == "world");
 		ensure(parser.getHeader("foo") == "bar");
 	}
-	
+
 	TEST_METHOD(9) {
 		// Parsing a request with multiple headers and a body.
 		// Half element per pass.
@@ -125,7 +125,7 @@ namespace tut {
 		ensure(parser.getHeader("hello") == "world");
 		ensure(parser.getHeader("foo") == "bar");
 	}
-	
+
 	TEST_METHOD(10) {
 		// Parsing a request with multiple headers and a body.
 		// 1 element per pass.
@@ -142,7 +142,7 @@ namespace tut {
 		ensure(parser.getHeader("hello") == "world");
 		ensure(parser.getHeader("foo") == "bar");
 	}
-	
+
 	TEST_METHOD(11) {
 		// Parsing a request with multiple headers and a body.
 		// 2 elements per pass.
@@ -157,7 +157,7 @@ namespace tut {
 		ensure(parser.getHeader("hello") == "world");
 		ensure(parser.getHeader("foo") == "bar");
 	}
-	
+
 	TEST_METHOD(12) {
 		// Parsing a request with multiple headers and a body.
 		// Variable number of elements per pass.
@@ -185,9 +185,9 @@ namespace tut {
 		ensure(parser.getHeader("hello") == "world");
 		ensure(parser.getHeader("foo") == "bar");
 	}
-	
+
 	/***** Test parsing invalid SCGI requests in one pass. *****/
-	
+
 	TEST_METHOD(16) {
 		// Invalid first character for length string.
 		ensure_equals("Parser did not accept anything.",
@@ -195,56 +195,56 @@ namespace tut {
 		ensure_equals("Parser is in the error state.",
 			parser.getState(), ScgiRequestParser::ERROR);
 	}
-	
+
 	TEST_METHOD(17) {
 		// Invalid character inside length string.
 		ensure_equals(parser.feed("12x:hello world!", 16), 2u);
 		ensure_equals("Parser is in the error state.",
 			parser.getState(), ScgiRequestParser::ERROR);
 	}
-	
+
 	TEST_METHOD(18) {
 		// Invalid character in place of colon.
 		ensure_equals(parser.feed("12#hello world!", 15), 2u);
 		ensure_equals("Parser is in the error state.",
 			parser.getState(), ScgiRequestParser::ERROR);
 	}
-	
+
 	TEST_METHOD(19) {
 		// Invalid character in place of comma.
 		ensure_equals(parser.feed("12:hello\0world\0!", 16), 15u);
 		ensure_equals("Parser is in the error state.",
 			parser.getState(), ScgiRequestParser::ERROR);
 	}
-	
+
 	TEST_METHOD(20) {
 		// Only a header name, without even a null terminator.
 		ensure_equals(parser.feed("5:hello,", 8), (size_t) 8);
 		ensure_equals("Parser is in the error state.",
 			parser.getState(), ScgiRequestParser::ERROR);
 	}
-	
+
 	TEST_METHOD(21) {
 		// Only a header name, with a null terminator.
 		ensure_equals(parser.feed("6:hello\0,", 9), (size_t) 9);
 		ensure_equals("Parser is in the error state.",
 			parser.getState(), ScgiRequestParser::ERROR);
 	}
-	
+
 	TEST_METHOD(22) {
 		// A header name with its value not having a null terminator.
 		ensure_equals(parser.feed("7:foo\0bar,", 10), (size_t) 10);
 		ensure_equals("Parser is in the error state.",
 			parser.getState(), ScgiRequestParser::ERROR);
 	}
-	
+
 	TEST_METHOD(23) {
 		// A header name without corresponding value.
 		ensure_equals(parser.feed("10:foo\0bar\0a\0,", 14), (size_t) 14);
 		ensure_equals("Parser is in the error state.",
 			parser.getState(), ScgiRequestParser::ERROR);
 	}
-	
+
 	TEST_METHOD(24) {
 		// Length string is too large.
 		static const char data[] = "999999999999999999999";
@@ -252,88 +252,102 @@ namespace tut {
 		ensure_equals("Parser is in the error state.",
 			parser.getState(), ScgiRequestParser::ERROR);
 	}
-	
+
 	TEST_METHOD(25) {
 		// An empty header name.
 		ensure_equals(parser.feed("5:\0bar\0,", 8), (size_t) 8);
 		ensure_equals("Parser is in the error state.",
 			parser.getState(), ScgiRequestParser::ERROR);
 	}
-	
+
 	TEST_METHOD(26) {
 		// An empty header.
 		ensure_equals(parser.feed("0:,", 3), (size_t) 2);
 		ensure_equals("Parser is in the error state.",
 			parser.getState(), ScgiRequestParser::ERROR);
 	}
-	
-	/***** Test parsing invalid SCGI requests in multiple passes. *****/
-	
+
 	TEST_METHOD(27) {
+		// An empty length string.
+		ensure_equals(parser.feed(":", 1), (size_t) 0);
+		ensure_equals("Parser is in the error state.",
+			parser.getState(), ScgiRequestParser::ERROR);
+	}
+
+	TEST_METHOD(28) {
+		// Empty header names.
+		ensure_equals(parser.feed("2:\0\0,", 5), (size_t) 5);
+		ensure_equals("Parser is in the error state.",
+			parser.getState(), ScgiRequestParser::ERROR);
+	}
+
+	/***** Test parsing invalid SCGI requests in multiple passes. *****/
+
+	TEST_METHOD(30) {
 		// Once the parser has entered the error state, it stays there.
 		ensure_equals(parser.feed("hello world!", 12), 0u);
 		ensure_equals(parser.feed("1", 1), 0u);
 		ensure_equals("Parser is in the error state.",
 			parser.getState(), ScgiRequestParser::ERROR);
 	}
-	
-	TEST_METHOD(28) {
+
+	TEST_METHOD(31) {
 		// Invalid character inside length string.
 		ensure_equals(parser.feed("12", 2), 2u);
 		ensure_equals(parser.feed("x:", 2), 0u);
 		ensure_equals("Parser is in the error state.",
 			parser.getState(), ScgiRequestParser::ERROR);
 	}
-	
-	TEST_METHOD(29) {
+
+	TEST_METHOD(32) {
 		// Invalid character in place of colon.
 		ensure_equals(parser.feed("12", 2), 2u);
 		ensure_equals(parser.feed("#", 1), 0u);
 		ensure_equals("Parser is in the error state.",
 			parser.getState(), ScgiRequestParser::ERROR);
 	}
-	
-	TEST_METHOD(30) {
+
+	TEST_METHOD(33) {
 		// Invalid character in place of comma.
 		ensure_equals(parser.feed("12:hello\0world\0", 15), 15u);
 		ensure_equals(parser.feed("!", 1), 0u);
 		ensure_equals("Parser is in the error state.",
 			parser.getState(), ScgiRequestParser::ERROR);
 	}
-	
-	TEST_METHOD(31) {
+
+	TEST_METHOD(34) {
 		// Only a header name, without even a null terminator.
 		ensure_equals(parser.feed("5:hell", 6), (size_t) 6);
 		ensure_equals(parser.feed("o,", 2), (size_t) 2);
 		ensure_equals("Parser is in the error state.",
 			parser.getState(), ScgiRequestParser::ERROR);
 	}
-	
-	TEST_METHOD(32) {
+
+	TEST_METHOD(35) {
 		// Only a header name, with a null terminator.
 		ensure_equals(parser.feed("6:hello", 7), (size_t) 7);
 		ensure_equals(parser.feed("\0,", 2), (size_t) 2);
 		ensure_equals("Parser is in the error state.",
 			parser.getState(), ScgiRequestParser::ERROR);
 	}
-	
-	TEST_METHOD(33) {
+
+	TEST_METHOD(36) {
 		// A header name with its value not having a null terminator.
 		ensure_equals(parser.feed("7:foo\0ba", 8), (size_t) 8);
 		ensure_equals(parser.feed("r,", 2), (size_t) 2);
 		ensure_equals("Parser is in the error state.",
 			parser.getState(), ScgiRequestParser::ERROR);
 	}
-	
-	TEST_METHOD(34) {
+
+	TEST_METHOD(37) {
 		// A header name without corresponding value.
 		ensure_equals(parser.feed("10:foo\0bar\0a", 12), (size_t) 12);
 		ensure_equals(parser.feed("\0,", 2), (size_t) 2);
 		ensure_equals("Parser is in the error state.",
 			parser.getState(), ScgiRequestParser::ERROR);
 	}
-	
-	TEST_METHOD(35) {
+
+	TEST_METHOD(38) {
 		// Length string is too large.
 		static const char data[] = "999999999999999999999";
 		ensure_equals(parser.feed("99", 2), 2u);
@@ -341,8 +355,8 @@ namespace tut {
 		ensure_equals("Parser is in the error state.",
 			parser.getState(), ScgiRequestParser::ERROR);
 	}
-	
-	TEST_METHOD(36) {
+
+	TEST_METHOD(39) {
 		// Parsing a request that's larger than the limit.
 		parser = ScgiRequestParser(9);
 		parser.feed("1", 1);
@@ -353,54 +367,54 @@ namespace tut {
 		ensure_equals(parser.getErrorReason(),
 			ScgiRequestParser::LIMIT_REACHED);
 	}
-	
-	TEST_METHOD(37) {
+
+	TEST_METHOD(40) {
 		// An empty header name.
 		ensure_equals(parser.feed("5:\0", 3), (size_t) 3);
 		ensure_equals(parser.feed("bar\0,", 5), (size_t) 5);
 		ensure_equals("Parser is in the error state.",
 			parser.getState(), ScgiRequestParser::ERROR);
 	}
-	
+
 	/***** Test parsing incomplete SCGI requests. *****/
-	
-	TEST_METHOD(40) {
+
+	TEST_METHOD(45) {
 		// Incomplete length string.
 		ensure_equals(parser.feed("2", 1), 1u);
 		ensure_equals("Parser is still waiting for length string input.",
 			parser.getState(), ScgiRequestParser::READING_LENGTH_STRING);
 	}
-	
-	TEST_METHOD(41) {
+
+	TEST_METHOD(46) {
 		// Incomplete header.
 		ensure_equals(parser.feed("21:", 3), 3u);
 		ensure_equals("Parser is waiting for header data input.",
 			parser.getState(), ScgiRequestParser::READING_HEADER_DATA);
 	}
-	
-	TEST_METHOD(42) {
+
+	TEST_METHOD(47) {
 		// Incomplete header.
 		ensure_equals(parser.feed("20:hel", 6), 6u);
 		ensure_equals("Parser is waiting for header data input.",
 			parser.getState(), ScgiRequestParser::READING_HEADER_DATA);
 	}
-	
-	TEST_METHOD(43) {
+
+	TEST_METHOD(48) {
 		// Complete header but no comma.
 		ensure_equals(parser.feed("8:foo\0bar\0", 10), 10u);
 		ensure_equals("Parser is waiting for comma.",
 			parser.getState(), ScgiRequestParser::EXPECTING_COMMA);
 	}
-	
-	TEST_METHOD(44) {
+
+	TEST_METHOD(49) {
 		// Parsing a request that's smaller than the limit.
 		static const char data[] = "10:";
-		
+
 		parser = ScgiRequestParser(11);
 		parser.feed(data, sizeof(data) - 1);
 		ensure_equals("It accepted the data (9)",
 			parser.getState(), ScgiRequestParser::READING_HEADER_DATA);
-		
+
 		parser = ScgiRequestParser(10);
 		parser.feed(data, sizeof(data) - 1);
 		ensure_equals("It accepted the data (10)",