passenger 4.0.38 → 4.0.39

data/lib/phusion_passenger/utils/unseekable_socket.rb

@@ -92,14 +92,6 @@ class UnseekableSocket
 		@socket
 	end
 
-	def simulate_eof!
-		@simulate_eof = true
-	end
-
-	def stop_simulating_eof!
-		@simulate_eof = false
-	end
-
 	def fileno
 		@socket.fileno
 	end
@@ -165,82 +157,60 @@ class UnseekableSocket
 	end
 	
 	def gets
-		return nil if @simulate_eof
 		@socket.gets
 	rescue => e
 		raise annotate(e)
 	end
 	
 	def read(*args)
-		if @simulate_eof
-			length, buffer = args
-			if buffer
-				buffer.replace(binary_string(""))
-			else
-				buffer = binary_string("")
-			end
-			if length
-				return nil
-			else
-				return buffer
-			end
-		end
 		@socket.read(*args)
 	rescue => e
 		raise annotate(e)
 	end
 
 	def read_nonblock(*args)
-		raise EOFError, "end of file reached" if @simulate_eof
 		@socket.read_nonblock(*args)
 	rescue => e
 		raise annotate(e)
 	end
 	
 	def readpartial(*args)
-		raise EOFError, "end of file reached" if @simulate_eof
 		@socket.readpartial(*args)
 	rescue => e
 		raise annotate(e)
 	end
 	
 	def readline
-		raise EOFError, "end of file reached" if @simulate_eof
 		@socket.readline
 	rescue => e
 		raise annotate(e)
 	end
 
 	def recv(*args)
-		raise EOFError, "end of file reached" if @simulate_eof
 		@socket.recv(*args)
 	rescue => e
 		raise annotate(e)
 	end
 
 	def recvfrom(*args)
-		raise EOFError, "end of file reached" if @simulate_eof
 		@socket.recvfrom(*args)
 	rescue => e
 		raise annotate(e)
 	end
 
 	def recvfrom_nonblock(*args)
-		raise EOFError, "end of file reached" if @simulate_eof
 		@socket.recvfrom_nonblock(*args)
 	rescue => e
 		raise annotate(e)
 	end
 	
 	def each(&block)
-		return if @simulate_eof
 		@socket.each(&block)
 	rescue => e
 		raise annotate(e)
 	end
 
 	def eof?
-		return true if @simulate_eof
 		@socket.eof?
 	rescue => e
 		raise annotate(e)

data/resources/templates/error_layout.html.template

@@ -36,7 +36,7 @@
 				<dl>
 				<dt>Application root</dt>
 				<dd>{{APP_ROOT}}</dd>
-				<dt>Environment (value of RAILS_ENV, RACK_ENV, WSGI_ENV and PASSENGER_ENV)</dt>
+				<dt>Environment (value of RAILS_ENV, RACK_ENV, WSGI_ENV, NODE_ENV and PASSENGER_APP_ENV)</dt>
 				<dd>{{ENVIRONMENT}}</dd>
 				{{if IS_RUBY_APP}}
 					<dt>Ruby interpreter command</dt>

data/resources/templates/standalone/config.erb

@@ -1,8 +1,21 @@
-#####################################################
-#  This file is autogenerated by Phusion Passenger Standalone
-#  from <%= template_filename %>
-#  Please edit that file instead.
-#####################################################
+##############################################################
+#  Phusion Passenger Standalone uses a template file to
+#  generate an Nginx configuration file. The original template
+#  file can be found by running the following command:
+#
+#    ls $(passenger-config about resourcesdir)/templates/standalone/config.erb
+#
+#  You can create a copy of this template file and customize it
+#  to your liking. Just make sure you tell Phusion Passenger Standalone
+#  to use your template file by passing the --nginx-config-template
+#  parameter.
+#
+#  *** NOTE ***
+#  If you customize the template file, make sure you keep an eye
+#  on the original template file and merge any changes.
+#  New Phusion Passenger features may require changes to the template
+#  file.
+##############################################################
 
 
 master_process on;

data/test/cxx/RequestHandlerTest.cpp

@@ -100,32 +100,39 @@ namespace tut {
 		void sendHeaders(const map<string, string> &headers, ...) {
 			va_list ap;
 			const char *arg;
+			map<string, string> finalHeaders;
 			map<string, string>::const_iterator it;
 			vector<StaticString> args;
+			unsigned int totalSize = 0;
 
 			for (it = headers.begin(); it != headers.end(); it++) {
-				args.push_back(StaticString(it->first.data(), it->first.size() + 1));
-				args.push_back(StaticString(it->second.data(), it->second.size() + 1));
+				string key = string(it->first.data(), it->first.size() + 1);
+				string value = string(it->second.data(), it->second.size() + 1);
+				finalHeaders[key] = value;
 			}
 
 			va_start(ap, headers);
 			while ((arg = va_arg(ap, const char *)) != NULL) {
-				args.push_back(StaticString(arg, strlen(arg) + 1));
+				string key(arg, strlen(arg) + 1);
+				arg = va_arg(ap, const char *);
+				string value(arg, strlen(arg) + 1);
+				finalHeaders[key] = value;
 			}
 			va_end(ap);
 
-			shared_array<StaticString> args_array(new StaticString[args.size() + 2]);
-			unsigned int totalSize = 0;
-			for (unsigned int i = 0; i < args.size(); i++) {
-				args_array[i + 1] = args[i];
-				totalSize += args[i].size();
+			for (it = finalHeaders.begin(); it != finalHeaders.end(); it++) {
+				args.push_back(it->first);
+				args.push_back(it->second);
+				totalSize += it->first.size();
+				totalSize += it->second.size();
 			}
+
 			char totalSizeString[10];
 			snprintf(totalSizeString, sizeof(totalSizeString), "%u:", totalSize);
-			args_array[0] = StaticString(totalSizeString);
-			args_array[args.size() + 1] = ",";
-			
-			gatheredWrite(connection, args_array.get(), args.size() + 2, NULL);
+			args.insert(args.begin(), StaticString(totalSizeString));
+			args.push_back(",");
+
+			gatheredWrite(connection, &args[0], args.size(), NULL);
 		}
 
 		string stripHeaders(const string &str) {
@@ -166,8 +173,11 @@ namespace tut {
 
 	DEFINE_TEST_GROUP_WITH_LIMIT(RequestHandlerTest, 80);
 
+
+	/***** Basic tests *****/
+
 	TEST_METHOD(1) {
-		// Test one normal request.
+		set_test_name("A request is forwarded to the app process, and its response is forwarded back.");
 		init();
 		connect();
 		sendHeaders(defaultHeaders,
@@ -183,7 +193,7 @@ namespace tut {
 	}
 
 	TEST_METHOD(2) {
-		// Test multiple normal requests.
+		set_test_name("It can handle multiple requests in serial.");
 		init();
 		for (int i = 0; i < 10; i++) {
 			connect();
@@ -201,7 +211,7 @@ namespace tut {
 	}
 
 	TEST_METHOD(3) {
-		// Test sending request data in pieces.
+		set_test_name("It can handle request data that is sent piece-wise.");
 		defaultHeaders["PASSENGER_APP_ROOT"] = wsgiAppPath;
 		defaultHeaders["PATH_INFO"] = "/";
 
@@ -235,7 +245,36 @@ namespace tut {
 	}
 
 	TEST_METHOD(4) {
-		// It denies access if the connect password is wrong.
+		set_test_name("It closes the connection with the application if the client has closed the connection.");
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/stream",
+			NULL
+		);
+		BufferedIO io(connection);
+		ensure_equals(io.readLine(), "HTTP/1.1 200 OK\r\n");
+		ProcessPtr process;
+		{
+			LockGuard l(pool->syncher);
+			ensure_equals(pool->getProcessCount(false), 1u);
+			SuperGroupPtr superGroup = pool->superGroups.get(wsgiAppPath);
+			process = superGroup->defaultGroup->enabledProcesses.front();
+			ensure_equals(process->sessions, 1);
+		}
+		connection.close();
+		EVENTUALLY(5,
+			LockGuard l(pool->syncher);
+			result = process->sessions == 0;
+		);
+	}
+
+
+	/***** Connect password tests *****/
+
+	TEST_METHOD(5) {
+		set_test_name("It denies access if the connect password is wrong.");
 		agentOptions.requestSocketPassword = "hello world";
 		setLogLevel(-1);
 		init();
@@ -270,8 +309,8 @@ namespace tut {
 		ensure_equals(response, "");
 	}
 
-	TEST_METHOD(5) {
-		// It disconnects us if the connect password is not sent within a certain time.
+	TEST_METHOD(6) {
+		set_test_name("It disconnects the client if the connect password is not sent within a certain time.");
 		agentOptions.requestSocketPassword = "hello world";
 		setLogLevel(-1);
 		handler = boost::make_shared<RequestHandler>(bg.safe, requestSocket, pool, agentOptions);
@@ -285,8 +324,8 @@ namespace tut {
 		ensure(timer.elapsed() <= 60);
 	}
 
-	TEST_METHOD(6) {
-		// It works correct if the connect password is sent in pieces.
+	TEST_METHOD(7) {
+		set_test_name("It works correctly if the connect password is sent piece-wise.");
 		agentOptions.requestSocketPassword = "hello world";
 		init();
 		connect();
@@ -302,35 +341,11 @@ namespace tut {
 		ensure(containsSubstring(readAll(connection), "front page"));
 	}
 
-	TEST_METHOD(7) {
-		// It closes the connection with the application if the client has closed the connection.
-		init();
-		connect();
-		sendHeaders(defaultHeaders,
-			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
-			"PATH_INFO", "/stream",
-			NULL
-		);
-		BufferedIO io(connection);
-		ensure_equals(io.readLine(), "HTTP/1.1 200 OK\r\n");
-		ProcessPtr process;
-		{
-			LockGuard l(pool->syncher);
-			ensure_equals(pool->getProcessCount(false), 1u);
-			SuperGroupPtr superGroup = pool->superGroups.get(wsgiAppPath);
-			process = superGroup->defaultGroup->enabledProcesses.front();
-			ensure_equals(process->sessions, 1);
-		}
-		connection.close();
-		EVENTUALLY(5,
-			LockGuard l(pool->syncher);
-			result = process->sessions == 0;
-		);
-	}
-	
+
+	/***** Error page tests *****/
+
 	TEST_METHOD(10) {
-		// 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 then it renders a generic error page.");
 		TempDir tempdir("tmp.handler");
 		writeFile("tmp.handler/start.rb",
 			"STDERR.puts 'I have failed'");
@@ -351,8 +366,7 @@ namespace tut {
 	}
 
 	TEST_METHOD(11) {
-		// 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 then it renders a friendly error page.");
 		TempDir tempdir("tmp.handler");
 		writeFile("tmp.handler/start.rb",
 			"STDERR.puts 'Error'\n"
@@ -377,7 +391,7 @@ namespace tut {
 	}
 
 	TEST_METHOD(12) {
-		// 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 then it reports the error appropriately.");
 		TempDir tempdir("tmp.handler");
 		writeFile("tmp.handler/start.rb", "");
 
@@ -403,7 +417,7 @@ namespace tut {
 	}
 
 	TEST_METHOD(13) {
-		// Error pages respect the PASSENGER_STATUS_LINE option.
+		set_test_name("Error pages respect the PASSENGER_STATUS_LINE option.");
 		TempDir tempdir("tmp.handler");
 		writeFile("tmp.handler/start.rb",
 			"STDERR.puts 'I have failed'");
@@ -425,8 +439,7 @@ namespace tut {
 	}
 
 	TEST_METHOD(14) {
-		// If PASSENGER_FRIENDLY_ERROR_PAGES is false then it does not render
-		// a friendly error page.
+		set_test_name("If PASSENGER_FRIENDLY_ERROR_PAGES is false then it does not render a friendly error page.");
 		TempDir tempdir("tmp.handler");
 		writeFile("tmp.handler/start.rb",
 			"STDERR.puts 'Error'\n"
@@ -452,31 +465,36 @@ namespace tut {
 		ensure(containsSubstring(response, "We're sorry, but something went wrong"));
 	}
 
-	TEST_METHOD(20) {
-		// It streams the request body to the application.
+
+	/***** Buffering tests *****/
+
+	TEST_METHOD(21) {
+		set_test_name("If PASSENGER_BUFFERING is true, and Content-Length is given, it buffers the request body.");
 		DeleteFileEventually file("tmp.output");
 
 		init();
 		connect();
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PASSENGER_BUFFERING", "true",
+			"REQUEST_METHOD", "POST",
 			"PATH_INFO", "/raw_upload_to_file",
+			"CONTENT_LENGTH", "12",
 			"HTTP_X_OUTPUT", (root + "/test/tmp.output").c_str(),
 			NULL);
 		writeExact(connection, "hello\n");
-		EVENTUALLY(5,
-			result = fileExists("tmp.output") && readAll("tmp.output") == "hello\n";
+		SHOULD_NEVER_HAPPEN(200,
+			result = fileExists("tmp.output");
 		);
 		writeExact(connection, "world\n");
-		EVENTUALLY(3,
-			result = readAll("tmp.output") == "hello\nworld\n";
+		EVENTUALLY(1,
+			result = fileExists("tmp.output");
 		);
-		shutdown(connection, SHUT_WR);
 		ensure_equals(stripHeaders(readAll(connection)), "ok");
 	}
 
-	TEST_METHOD(21) {
-		// It buffers the request body if PASSENGER_BUFFERING is true.
+	TEST_METHOD(22) {
+		set_test_name("If PASSENGER_BUFFERING is true, and Transfer-Encoding is given, it buffers the request body.");
 		DeleteFileEventually file("tmp.output");
 
 		init();
@@ -484,7 +502,9 @@ namespace tut {
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
 			"PASSENGER_BUFFERING", "true",
+			"REQUEST_METHOD", "POST",
 			"PATH_INFO", "/raw_upload_to_file",
+			"HTTP_TRANSFER_ENCODING", "chunked",
 			"HTTP_X_OUTPUT", (root + "/test/tmp.output").c_str(),
 			NULL);
 		writeExact(connection, "hello\n");
@@ -499,7 +519,7 @@ namespace tut {
 		ensure_equals(stripHeaders(readAll(connection)), "ok");
 	}
 
-	TEST_METHOD(22) {
+	TEST_METHOD(24) {
 		set_test_name("Test buffering of large request bodies that fit in neither the socket "
 		              "buffer nor the FileBackedPipe memory buffer, and that the application "
 		              "cannot read quickly enough.");
@@ -517,8 +537,10 @@ namespace tut {
 		connect();
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"REQUEST_METHOD", "POST",
 			"PATH_INFO", "/raw_upload_to_file",
 			"PASSENGER_BUFFERING", "true",
+			"CONTENT_LENGTH", toString(requestBody.size()).c_str(),
 			"HTTP_X_WAIT_FOR_FILE", "/tmp/wait.txt",
 			"HTTP_X_OUTPUT", "/tmp/output.txt",
 			NULL);
@@ -539,12 +561,38 @@ namespace tut {
 		ensure_equals(buf.st_size, (off_t) requestBody.size());
 	}
 
-	TEST_METHOD(30) {
-		// It replaces HTTP_CONTENT_LENGTH with CONTENT_LENGTH.
+	TEST_METHOD(25) {
+		set_test_name("Test handling of slow clients that can't receive response data fast enough (response buffering).");
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/blob",
+			"HTTP_X_SIZE", "10485760",
+			NULL);
+		EVENTUALLY(10,
+			result = containsSubstring(inspect(), "appInput reachedEnd         = true");
+		);
+		string result = stripHeaders(readAll(connection));
+		ensure_equals(result.size(), 10485760u);
+		const char *data = result.data();
+		const char *end  = result.data() + result.size();
+		while (data < end) {
+			ensure_equals(*data, 'x');
+			data++;
+		}
+	}
+
+
+	/***** Header handling tests *****/
+
+	TEST_METHOD(26) {
+		set_test_name("It replaces HTTP_CONTENT_LENGTH with CONTENT_LENGTH.");
 		init();
 		connect();
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"REQUEST_METHOD", "POST",
 			"PATH_INFO", "/env",
 			"HTTP_CONTENT_LENGTH", "5",
 			NULL);
@@ -554,8 +602,8 @@ namespace tut {
 		ensure(!containsSubstring(response, "HTTP_CONTENT_LENGTH"));
 	}
 	
-	TEST_METHOD(31) {
-		// It replaces HTTP_CONTENT_TYPE with CONTENT_TYPE.
+	TEST_METHOD(27) {
+		set_test_name("It replaces HTTP_CONTENT_TYPE with CONTENT_TYPE.");
 		init();
 		connect();
 		sendHeaders(defaultHeaders,
@@ -568,8 +616,8 @@ namespace tut {
 		ensure(!containsSubstring(response, "HTTP_CONTENT_TYPE"));
 	}
 
-	TEST_METHOD(35) {
-		// The response doesn't contain an HTTP status line if PASSENGER_STATUS_LINE is false.
+	TEST_METHOD(28) {
+		set_test_name("The response doesn't contain an HTTP status line if PASSENGER_STATUS_LINE is false.");
 		init();
 		connect();
 		sendHeaders(defaultHeaders,
@@ -582,9 +630,8 @@ namespace tut {
 		ensure(containsSubstring(response, "Status: 200 OK\r\n"));
 	}
 
-	TEST_METHOD(36) {
-		// If the application outputs a status line without a reason phrase,
-		// then a reason phrase is automatically appended.
+	TEST_METHOD(29) {
+		set_test_name("If the application outputs a status line without a reason phrase, then a reason phrase is automatically appended.");
 		init();
 		connect();
 		sendHeaders(defaultHeaders,
@@ -597,9 +644,8 @@ namespace tut {
 		ensure(containsSubstring(response, "Status: 201 Created\r\n"));
 	}
 
-	TEST_METHOD(37) {
-		// If the application outputs a status line with a custom reason phrase,
-		// then that reason phrase is used.
+	TEST_METHOD(30) {
+		set_test_name("If the application outputs a status line with a custom reason phrase, then that reason phrase is used.");
 		init();
 		connect();
 		sendHeaders(defaultHeaders,
@@ -611,37 +657,187 @@ namespace tut {
 		ensure(containsSubstring(response, "HTTP/1.1 201 Bunnies Jump\r\n"));
 		ensure(containsSubstring(response, "Status: 201 Bunnies Jump\r\n"));
 	}
-	
-	TEST_METHOD(38) {
-		// If the application doesn't output a status line then it rejects the application response.
-		// TODO
+
+	TEST_METHOD(31) {
+		set_test_name("It appends 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_METHOD(39) {
-		// Test handling of slow clients that can't receive response data fast enough (response buffering).
+	TEST_METHOD(32) {
+		set_test_name("It rejects non-GET, non-HEAD requests with an Upgrade header.");
+
 		init();
 		connect();
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
-			"PATH_INFO", "/blob",
-			"HTTP_X_SIZE", "10485760",
+			"PATH_INFO", "/",
+			"REQUEST_METHOD", "POST",
+			"HTTP_UPGRADE", "WebSocket",
 			NULL);
-		EVENTUALLY(10,
-			result = containsSubstring(inspect(), "appInput reachedEnd         = true");
+		string response = readAll(connection);
+		ensure(containsSubstring(response, "HTTP/1.1 400 Bad Request"));
+	}
+
+	TEST_METHOD(33) {
+		set_test_name("It rejects GET/HEAD requests with a Content-Length header.");
+
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/",
+			"REQUEST_METHOD", "GET",
+			"CONTENT_LENGTH", "2",
+			NULL);
+		string response = readAll(connection);
+		ensure(containsSubstring(response, "HTTP/1.1 400 Bad Request"));
+
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/",
+			"REQUEST_METHOD", "HEAD",
+			"CONTENT_LENGTH", "2",
+			NULL);
+		response = readAll(connection);
+		ensure(containsSubstring(response, "HTTP/1.1 400 Bad Request"));
+	}
+
+	TEST_METHOD(34) {
+		set_test_name("It rejects GET/HEAD requests with a Transfer-Encoding header.");
+
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/",
+			"REQUEST_METHOD", "GET",
+			"HTTP_TRANSFER_ENCODING", "chunked",
+			NULL);
+		string response = readAll(connection);
+		ensure(containsSubstring(response, "HTTP/1.1 400 Bad Request"));
+
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/",
+			"REQUEST_METHOD", "HEAD",
+			"HTTP_TRANSFER_ENCODING", "chunked",
+			NULL);
+		response = readAll(connection);
+		ensure(containsSubstring(response, "HTTP/1.1 400 Bad Request"));
+	}
+	
+
+	/***** Advanced connection handling tests *****/
+
+	TEST_METHOD(40) {
+		set_test_name("It streams the request body to the application.");
+		DeleteFileEventually file("tmp.output");
+
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"REQUEST_METHOD", "POST",
+			"PATH_INFO", "/raw_upload_to_file",
+			"HTTP_TRANSFER_ENCODING", "chunked",
+			"HTTP_X_OUTPUT", (root + "/test/tmp.output").c_str(),
+			NULL);
+		writeExact(connection, "hello\n");
+		EVENTUALLY(5,
+			result = fileExists("tmp.output") && readAll("tmp.output") == "hello\n";
+		);
+		writeExact(connection, "world\n");
+		EVENTUALLY(3,
+			result = readAll("tmp.output") == "hello\nworld\n";
 		);
+		shutdown(connection, SHUT_WR);
+		ensure_equals(stripHeaders(readAll(connection)), "ok");
+	}
+
+	TEST_METHOD(41) {
+		set_test_name("If no Content-Length and no Transfer-Encoding are given, and buffering is on:  "
+			"it does not pass any request body data.");
+		
+		DeleteFileEventually d("/tmp/output.txt");
+
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/raw_upload_to_file",
+			"REQUEST_METHOD", "POST",
+			"PASSENGER_BUFFERING", "true",
+			"HTTP_X_OUTPUT", "/tmp/output.txt",
+			NULL);
+		writeExact(connection, "hello\n");
+
 		string result = stripHeaders(readAll(connection));
-		ensure_equals(result.size(), 10485760u);
-		const char *data = result.data();
-		const char *end  = result.data() + result.size();
-		while (data < end) {
-			ensure_equals(*data, 'x');
-			data++;
-		}
+		ensure_equals(result, "ok");
+		struct stat buf;
+		ensure(stat("/tmp/output.txt", &buf) == 0);
+		ensure_equals(buf.st_size, (off_t) 0);
 	}
 
-	TEST_METHOD(40) {
-		set_test_name("Test that RequestHandler does not read more than CONTENT_LENGTH bytes "
-		              "from the client body (when buffering is on and request body is large).");
+	TEST_METHOD(42) {
+		set_test_name("If no Content-Length and no Transfer-Encoding are given, and buffering is off: "
+			"it does not pass any request body data.");
+		
+		DeleteFileEventually d("/tmp/output.txt");
+
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/raw_upload_to_file",
+			"REQUEST_METHOD", "POST",
+			"HTTP_X_OUTPUT", "/tmp/output.txt",
+			NULL);
+		writeExact(connection, "hello\n");
+
+		string result = stripHeaders(readAll(connection));
+		ensure_equals(result, "ok");
+		struct stat buf;
+		ensure(stat("/tmp/output.txt", &buf) == 0);
+		ensure_equals(buf.st_size, (off_t) 0);
+	}
+
+	TEST_METHOD(43) {
+		set_test_name("If Upgrade is given, it keeps passing the request body until end of stream.");
+
+		DeleteFileEventually d("/tmp/output.txt");
+
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/raw_upload_to_file",
+			"HTTP_UPGRADE", "websocket",
+			"HTTP_X_OUTPUT", "/tmp/output.txt",
+			NULL);
+		writeExact(connection, "hello\n");
+		shutdown(connection, SHUT_WR);
+
+		string result = stripHeaders(readAll(connection));
+		ensure_equals(result, "ok");
+		struct stat buf;
+		ensure(stat("/tmp/output.txt", &buf) == 0);
+		ensure_equals(buf.st_size, (off_t) 6);
+	}
+
+	TEST_METHOD(45) {
+		set_test_name("If Content-Length is given, buffering is on, and request body is large:  "
+			"it passes Content-Length bytes of the request body.");
 
 		DeleteFileEventually d("/tmp/output.txt");
 
@@ -656,6 +852,7 @@ namespace tut {
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
 			"PATH_INFO", "/raw_upload_to_file",
+			"REQUEST_METHOD", "POST",
 			"CONTENT_LENGTH", toString(requestBody.size()).c_str(),
 			"PASSENGER_BUFFERING", "true",
 			"HTTP_X_OUTPUT", "/tmp/output.txt",
@@ -669,9 +866,9 @@ namespace tut {
 		ensure_equals(buf.st_size, (off_t) requestBody.size());
 	}
 
-	TEST_METHOD(41) {
-		set_test_name("Test that RequestHandler does not read more than CONTENT_LENGTH bytes "
-		              "from the client body (when buffering is on and request body is small).");
+	TEST_METHOD(46) {
+		set_test_name("If Content-Length is given, buffering is on, and request body is small:  "
+			"it passes Content-Length bytes of the request body.");
 
 		DeleteFileEventually d("/tmp/output.txt");
 		string requestBody = "hello world";
@@ -681,6 +878,7 @@ namespace tut {
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
 			"PATH_INFO", "/raw_upload_to_file",
+			"REQUEST_METHOD", "POST",
 			"CONTENT_LENGTH", toString(requestBody.size()).c_str(),
 			"PASSENGER_BUFFERING", "true",
 			"HTTP_X_OUTPUT", "/tmp/output.txt",
@@ -694,9 +892,9 @@ namespace tut {
 		ensure_equals(buf.st_size, (off_t) requestBody.size());
 	}
 
-	TEST_METHOD(42) {
-		set_test_name("Test that RequestHandler does not read more than CONTENT_LENGTH bytes "
-		              "from the client body (when buffering is off and request body is large).");
+	TEST_METHOD(47) {
+		set_test_name("If Content-Length is given, buffering is off, and request body is large: "
+			"it passes Content-Length bytes of the request body.");
 
 		DeleteFileEventually d("/tmp/output.txt");
 
@@ -713,6 +911,7 @@ namespace tut {
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
 			"PATH_INFO", "/raw_upload_to_file",
+			"REQUEST_METHOD", "POST",
 			"CONTENT_LENGTH", toString(requestBody.size()).c_str(),
 			"HTTP_X_OUTPUT", "/tmp/output.txt",
 			NULL);
@@ -726,9 +925,9 @@ namespace tut {
 		ensure_equals(buf.st_size, (off_t) requestBody.size());
 	}
 
-	TEST_METHOD(43) {
-		set_test_name("Test that RequestHandler does not read more than CONTENT_LENGTH bytes "
-		              "from the client body (when buffering is off and request body is small).");
+	TEST_METHOD(48) {
+		set_test_name("If Content-Length is given, buffering is off, and request body is small: "
+			"it passes Content-Length bytes of the request body.");
 
 		DeleteFileEventually d("/tmp/output.txt");
 		string requestBody = "hello world";
@@ -738,6 +937,7 @@ namespace tut {
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
 			"PATH_INFO", "/raw_upload_to_file",
+			"REQUEST_METHOD", "POST",
 			"CONTENT_LENGTH", toString(requestBody.size()).c_str(),
 			"HTTP_X_OUTPUT", "/tmp/output.txt",
 			NULL);
@@ -751,122 +951,78 @@ namespace tut {
 		ensure_equals(buf.st_size, (off_t) requestBody.size());
 	}
 
-	TEST_METHOD(44) {
-		set_test_name("Test that RequestHandler does not pass any client body data when CONTENT_LENGTH == 0 (when buffering is on).");
+	TEST_METHOD(49) {
+		set_test_name("If Transfer-Encoding is given and buffering is on:  "
+			"it keeps passing the request body until end of stream.");
 
 		DeleteFileEventually d("/tmp/output.txt");
 
+		// 2.6 MB of request body. Guaranteed not to fit in any socket buffer.
+		string requestBody;
+		for (int i = 0; i < 204800; i++) {
+			requestBody.append("hello world!\n");
+		}
+
 		init();
 		connect();
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
 			"PATH_INFO", "/raw_upload_to_file",
-			"CONTENT_LENGTH", "0",
+			"REQUEST_METHOD", "POST",
 			"PASSENGER_BUFFERING", "true",
+			"HTTP_TRANSFER_ENCODING", "chunked",
 			"HTTP_X_OUTPUT", "/tmp/output.txt",
 			NULL);
-		writeExact(connection, "hello world");
+		writeExact(connection, requestBody);
+		shutdown(connection, SHUT_WR);
 
 		string result = stripHeaders(readAll(connection));
 		ensure_equals(result, "ok");
 		struct stat buf;
 		ensure(stat("/tmp/output.txt", &buf) == 0);
-		ensure_equals(buf.st_size, (off_t) 0);
+		ensure_equals(buf.st_size, (off_t) requestBody.size());
 	}
 
-	TEST_METHOD(45) {
-		set_test_name("Test that RequestHandler does not pass any client body data when CONTENT_LENGTH == 0 (when buffering is off).");
+	TEST_METHOD(50) {
+		set_test_name("If Transfer-Encoding is given and buffering is off: "
+			"it keeps passing the request body until end of stream.");
 
 		DeleteFileEventually d("/tmp/output.txt");
 
+		// 2.6 MB of request body. Guaranteed not to fit in any socket buffer.
+		string requestBody;
+		for (int i = 0; i < 204800; i++) {
+			requestBody.append("hello world!\n");
+		}
+
 		init();
 		connect();
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
 			"PATH_INFO", "/raw_upload_to_file",
-			"CONTENT_LENGTH", "0",
+			"REQUEST_METHOD", "POST",
+			"HTTP_TRANSFER_ENCODING", "chunked",
 			"HTTP_X_OUTPUT", "/tmp/output.txt",
 			NULL);
-		writeExact(connection, "hello world");
+		writeExact(connection, requestBody);
+		shutdown(connection, SHUT_WR);
 
 		string result = stripHeaders(readAll(connection));
 		ensure_equals(result, "ok");
 		struct stat buf;
 		ensure(stat("/tmp/output.txt", &buf) == 0);
-		ensure_equals(buf.st_size, (off_t) 0);
-	}
-
-	TEST_METHOD(46) {
-		// If the application outputs a request oobw header, handler should remove the header, mark
-		// the process as oobw requested. The process should continue to process requests until the
-		// spawner spawns another process (to avoid the group being empty). As soon as the new 
-		// process is spawned, the original process will make the oobw request. Afterwards, the 
-		// original process is re-enabled.
-		init();
-		connect();
-		sendHeaders(defaultHeaders,
-			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
-			"PATH_INFO", "/oobw",
-			NULL);
-		string response = readAll(connection);
-		ensure("status is not 200", containsSubstring(response, "Status: 200 OK\r\n"));
-		ensure("contains oowb header", !containsSubstring(response, "X-Passenger-Request-OOB-Work:"));
-		pid_t origPid = atoi(stripHeaders(response));
-		
-		// Get a reference to the orignal process and verify oobw has been requested.
-		ProcessPtr origProcess;
-		{
-			LockGuard l(pool->syncher);
-			origProcess = pool->superGroups.get(wsgiAppPath)->defaultGroup->disablingProcesses.front();
-			ensure("OOBW requested", origProcess->oobwStatus == Process::OOBW_IN_PROGRESS);
-		}
-		ensure("sanity check", origPid == origProcess->pid); // just a sanity check
-		
-		// Issue requests until the new process handles it.
-		pid_t pid;
-		EVENTUALLY(2,
-			connect();
-			sendHeaders(defaultHeaders,
-				"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
-				"PATH_INFO", "/pid",
-				NULL);
-			string response = readAll(connection);
-			ensure("status is 200", containsSubstring(response, "Status: 200 OK\r\n"));
-			pid = atoi(stripHeaders(response));
-			result = (pid != origPid);
-		);
-		
-		// Wait for the original process to finish oobw request.
-		EVENTUALLY(2,
-			boost::unique_lock<boost::mutex> lock(pool->syncher);
-			result = origProcess->oobwStatus == Process::OOBW_NOT_ACTIVE;
-		);
-		
-		// Final asserts.
-		{
-			boost::unique_lock<boost::mutex> lock(pool->syncher);
-			ensure_equals("2 enabled processes", pool->superGroups.get(wsgiAppPath)->defaultGroup->enabledProcesses.size(), 2u);
-			ensure_equals("oobw is reset", origProcess->oobwStatus, Process::OOBW_NOT_ACTIVE);
-			ensure_equals("process is enabled", origProcess->enabled, Process::ENABLED);
-		}
+		ensure_equals(buf.st_size, (off_t) requestBody.size());
 	}
 
-	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);
+	TEST_METHOD(51) {
+		set_test_name("If Transfer-Encoding is given and the application socket uses the HTTP protocol, "
+			"rechunk the body when forwarding it to the application.");
 
-		string result = readAll(connection);
-		ensure(result.find("Date: ") != string::npos);
+		fprintf(stderr, "TODO: implement test 51\n");
 	}
 
-	TEST_METHOD(48) {
-		set_test_name("It should write an appropriate response if the request queue is overflown");
+	TEST_METHOD(54) {
+		set_test_name("It writes an appropriate response if the request queue is overflown.");
 
 		initPoolDebugging();
 		debug->restarting = false;
@@ -883,8 +1039,8 @@ namespace tut {
 		ensure(response.find("This website is under heavy load") != string::npos);
 	}
 
-	TEST_METHOD(49) {
-		set_test_name("It should use the status code dictated by PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE "
+	TEST_METHOD(55) {
+		set_test_name("It uses the status code dictated by PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE "
 			"if the request queue is overflown");
 
 		initPoolDebugging();
@@ -903,7 +1059,7 @@ namespace tut {
 		ensure(response.find("This website is under heavy load") != string::npos);
 	}
 
-	TEST_METHOD(50) {
+	TEST_METHOD(56) {
 		set_test_name("PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE should work even if it is an unknown code");
 
 		initPoolDebugging();
@@ -922,8 +1078,8 @@ namespace tut {
 		ensure(response.find("This website is under heavy load") != string::npos);
 	}
 
-	TEST_METHOD(51) {
-		set_test_name("It relieves the application process after having read its entire response data");
+	TEST_METHOD(57) {
+		set_test_name("It relieves the application process after having read its entire response data.");
 
 		init();
 		connect();
@@ -947,8 +1103,8 @@ namespace tut {
 		}
 	}
 
-	TEST_METHOD(52) {
-		set_test_name("It supports responses in chunked transfer encoding");
+	TEST_METHOD(58) {
+		set_test_name("It supports responses in chunked transfer encoding.");
 
 		init();
 		connect();
@@ -974,8 +1130,8 @@ namespace tut {
 		ensure(containsSubstring(response, "Counter: 2\n"));
 	}
 
-	TEST_METHOD(53) {
-		set_test_name("It supports switching protocols when communicating over application session sockets");
+	TEST_METHOD(59) {
+		set_test_name("It supports switching protocols when communicating over application session sockets.");
 
 		init();
 		connect();
@@ -1008,8 +1164,8 @@ namespace tut {
 		ensure_equals(io.readLine(), "Echo: hello\n");
 	}
 
-	TEST_METHOD(54) {
-		set_test_name("It supports switching protocols when communication over application http_session sockets");
+	TEST_METHOD(60) {
+		set_test_name("It supports switching protocols when communication over application http_session sockets.");
 
 		init();
 		connect();
@@ -1052,6 +1208,66 @@ namespace tut {
 		ensure_equals(io.readLine(), "Echo: hello\n");
 	}
 
+
+	/***** Out-of-band work tests *****/
+
+	TEST_METHOD(65) {
+		set_test_name("If the application outputs a request oobw header, handler should remove the header, mark "
+			"the process as oobw requested. The process should continue to process requests until the "
+			"spawner spawns another process (to avoid the group being empty). As soon as the new "
+			"process is spawned, the original process will make the oobw request. Afterwards, the "
+			"original process is re-enabled.");
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/oobw",
+			NULL);
+		string response = readAll(connection);
+		ensure("status is not 200", containsSubstring(response, "Status: 200 OK\r\n"));
+		ensure("contains oowb header", !containsSubstring(response, "X-Passenger-Request-OOB-Work:"));
+		pid_t origPid = atoi(stripHeaders(response));
+		
+		// Get a reference to the orignal process and verify oobw has been requested.
+		ProcessPtr origProcess;
+		{
+			LockGuard l(pool->syncher);
+			origProcess = pool->superGroups.get(wsgiAppPath)->defaultGroup->disablingProcesses.front();
+			ensure("OOBW requested", origProcess->oobwStatus == Process::OOBW_IN_PROGRESS);
+		}
+		ensure("sanity check", origPid == origProcess->pid); // just a sanity check
+		
+		// Issue requests until the new process handles it.
+		pid_t pid;
+		EVENTUALLY(2,
+			connect();
+			sendHeaders(defaultHeaders,
+				"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+				"PATH_INFO", "/pid",
+				NULL);
+			string response = readAll(connection);
+			ensure("status is 200", containsSubstring(response, "Status: 200 OK\r\n"));
+			pid = atoi(stripHeaders(response));
+			result = (pid != origPid);
+		);
+		
+		// Wait for the original process to finish oobw request.
+		EVENTUALLY(2,
+			boost::unique_lock<boost::mutex> lock(pool->syncher);
+			result = origProcess->oobwStatus == Process::OOBW_NOT_ACTIVE;
+		);
+		
+		// Final asserts.
+		{
+			boost::unique_lock<boost::mutex> lock(pool->syncher);
+			ensure_equals("2 enabled processes", pool->superGroups.get(wsgiAppPath)->defaultGroup->enabledProcesses.size(), 2u);
+			ensure_equals("oobw is reset", origProcess->oobwStatus, Process::OOBW_NOT_ACTIVE);
+			ensure_equals("process is enabled", origProcess->enabled, Process::ENABLED);
+		}
+	}
+
 	// Test small response buffering.
 	// Test large response buffering.
+	
+	/***************************/
 }