passenger 2.1.3 → 2.2.0

data/lib/phusion_passenger/wsgi/application_spawner.rb

@@ -1,18 +1,25 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008  Phusion
+#  Copyright (c) 2008, 2009 Phusion
 #
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; version 2 of the License.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
 #
-#  You should have received a copy of the GNU General Public License along
-#  with this program; if not, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
 
 require 'socket'
 require 'phusion_passenger/application'

data/lib/phusion_passenger/wsgi/request_handler.py

@@ -1,4 +1,27 @@
 #!/usr/bin/env python
+#  Phusion Passenger - http://www.modrails.com/
+#  Copyright (c) 2008, 2009 Phusion
+#
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
 import socket, os, random, sys, struct, select, imp
 import exceptions, traceback
 

data/misc/copy_boost_headers.rb

@@ -1,4 +1,27 @@
 #!/usr/bin/env ruby
+#  Phusion Passenger - http://www.modrails.com/
+#  Copyright (c) 2008, 2009 Phusion
+#
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
 ESSENTIALS = [
 	"boost/detail/{limits,endian}.hpp",
 	"boost/config/*",

data/misc/find_owner_pipe_leaks.rb

@@ -1,19 +1,26 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008  Phusion
+#  Copyright (c) 2008, 2009 Phusion
 #
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; version 2 of the License.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
 #
-#  You should have received a copy of the GNU General Public License along
-#  with this program; if not, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
 ##############################################################################
 # A script for finding owner pipe leaks in Apache. An owner pipe is considered
 # to be leaked if it is owned by two or more Apache processes.

data/misc/rake/cplusplus.rb

@@ -1,18 +1,25 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008  Phusion
+#  Copyright (c) 2008, 2009 Phusion
 #
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; version 2 of the License.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
 #
-#  You should have received a copy of the GNU General Public License along
-#  with this program; if not, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
 
 # Rake functions for compiling/linking C++ stuff.
 

data/misc/rake/extensions.rb

@@ -1,18 +1,25 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008  Phusion
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; version 2 of the License.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License along
-#  with this program; if not, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#  Copyright (c) 2008, 2009 Phusion
+#
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
 
 require 'pathname'
 

data/misc/render_error_pages.rb

@@ -1,19 +1,26 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008  Phusion
+#  Copyright (c) 2008, 2009 Phusion
 #
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; version 2 of the License.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
 #
-#  You should have received a copy of the GNU General Public License along
-#  with this program; if not, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
 
 $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib")
 $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../ext")

data/test/ApplicationPoolServerTest.cpp

@@ -14,11 +14,9 @@ namespace tut {
 		
 		ApplicationPoolServerTest() {
 			server = ptr(new ApplicationPoolServer(
-				"../ext/apache2/ApplicationPoolServerExecutable",
+				"./ApplicationPoolServerExecutable",
 				"stub/spawn_server.rb"));
 		}
-		
-		
 	};
 
 	DEFINE_TEST_GROUP(ApplicationPoolServerTest);

data/test/ApplicationPoolServer_ApplicationPoolTest.cpp

@@ -12,7 +12,7 @@ namespace tut {
 		
 		ApplicationPoolServer_ApplicationPoolTest() {
 			server = ptr(new ApplicationPoolServer(
-				"../ext/apache2/ApplicationPoolServerExecutable",
+				"./ApplicationPoolServerExecutable",
 				"../bin/passenger-spawn-server"));
 			pool = server->connect();
 			pool2 = server->connect();

data/test/CxxTestMain.cpp

@@ -5,6 +5,7 @@
 #include <signal.h>
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
 
 #include "Utils.h"
 
@@ -83,8 +84,23 @@ parseOptions(int argc, char *argv[]) {
 	}
 }
 
-struct Finalizer {
-	~Finalizer() {
+/**
+ * Creates a Phusion Passenger temp dir at the beginning, and deletes it
+ * at program exit.
+ */
+struct TempDirGuard {
+	TempDirGuard() {
+		char command[1024];
+		
+		Passenger::createPassengerTempDir(Passenger::getSystemTempDir(),
+			geteuid() == 0, "nobody", geteuid(), getgid());
+		
+		snprintf(command, sizeof(command), "chmod -R u=rwx,g=rwx,o=rwx \"%s\"",
+			Passenger::getPassengerTempDir().c_str());
+		system(command);
+	}
+	
+	~TempDirGuard() {
 		Passenger::removeDirTree(Passenger::getPassengerTempDir());
 	}
 };
@@ -101,7 +117,7 @@ main(int argc, char *argv[]) {
 	allGroups = tut::runner.get().list_groups();
 	parseOptions(argc, argv);
 	
-	Finalizer finalizer;
+	TempDirGuard tg;
 	
 	try {
 		bool all_ok = true;

data/test/HttpStatusExtractorTest.cpp

@@ -0,0 +1,181 @@
+#include "tut.h"
+#include "HttpStatusExtractor.h"
+
+using namespace Passenger;
+using namespace std;
+
+namespace tut {
+	struct HttpStatusExtractorTest {
+		HttpStatusExtractor ex;
+	};
+	
+	DEFINE_TEST_GROUP(HttpStatusExtractorTest);
+	
+	/* TODO:
+	 * "\r\n" in this test file should really be replaced with "\x0D\x0A".
+	 * So far I haven't countered a platform on which "\r\n" is not equal
+	 * to "\x0D\x0A" but the possibility that they're not equal exists.
+	 */
+	
+	TEST_METHOD(1) {
+		// Status defaults to "200 OK" and buffer is initially empty.
+		ensure_equals(ex.getStatusLine(), "200 OK\r\n");
+		ensure_equals(ex.getBuffer(), "");
+	}
+	
+	TEST_METHOD(2) {
+		// Test feeding an entire HTTP response (header + body)
+		// in 1 pass. The first header is the status line.
+		const char data[] =
+			"Status: 201 OK\r\n"
+			"Content-Type: text/html\r\n"
+			"\r\n"
+			"hello world!";
+		ensure("Parsing completed.", ex.feed(data, sizeof(data) - 1));
+		ensure_equals("Status was properly extracted.",
+			ex.getStatusLine(), "201 OK\r\n");
+		ensure_equals("All data that we've fed so far has been buffered.",
+			ex.getBuffer(), data);
+	}
+	
+	TEST_METHOD(3) {
+		// Test feeding a single byte initially, and the
+		// rest of the status line later.
+		ensure("Parsing is not complete.", !ex.feed("S", 1));
+		ensure_equals("Status line hasn't changed.",
+			ex.getStatusLine(), "200 OK\r\n");
+		ensure_equals("All data that we've fed so far has been buffered.",
+			ex.getBuffer(), "S");
+		
+		const char data2[] = "tatus: 300 Abc\r\n";
+		ensure("Parsing not yet complete.", !ex.feed(data2, sizeof(data2) - 1));
+		
+		// Parsing completes when full header has been fed.
+		ensure("Parsing is complete.", ex.feed("\r\n", 2));
+		ensure_equals("Status line recognized.",
+			ex.getStatusLine(), "300 Abc\r\n");
+		ensure_equals("All data that we've fed so far has been buffered.",
+			ex.getBuffer(), "Status: 300 Abc\r\n\r\n");
+	}
+	
+	TEST_METHOD(4) {
+		// Test feeding an incomplete non-status line, which
+		// is completed later. The status line is feeded later.
+		const char data[] = "Content-Type: text/html";
+		ensure(!ex.feed(data, sizeof(data) - 1));
+		ensure_equals(ex.getStatusLine(), "200 OK\r\n");
+		ensure_equals(ex.getBuffer(), data);
+		
+		const char data2[] = "\r\nStatus: 201 Hello\r\n\r\n";
+		ensure(ex.feed(data2, sizeof(data2) - 1));
+		ensure_equals(ex.getStatusLine(), "201 Hello\r\n");
+		ensure_equals(ex.getBuffer(),
+			"Content-Type: text/html\r\n"
+			"Status: 201 Hello\r\n"
+			"\r\n");
+	}
+	
+	TEST_METHOD(5) {
+		// Test feeding multiple complete lines, none of which
+		// is the status line. The status line is feeded later.
+		const char data[] =
+			"Content-Type: text/html\r\n"
+			"Foo: bar\r\n";
+		ensure(!ex.feed(data, sizeof(data) - 1));
+		ensure_equals(ex.getStatusLine(), "200 OK\r\n");
+		ensure_equals(ex.getBuffer(), data);
+		
+		const char data2[] = "Status: 404 Not Found\r\n";
+		ensure(!ex.feed(data2, sizeof(data2) - 1));
+		
+		// Parsing completes when full header has been fed.
+		ensure(ex.feed("\r\n", 2));
+		ensure_equals(ex.getStatusLine(), "404 Not Found\r\n");
+		ensure_equals(ex.getBuffer(), string(data) + data2 + "\r\n");
+	}
+	
+	TEST_METHOD(6) {
+		// Test feeding multiple complete lines and a single incomplete line,
+		// none of which is the status line. The header is completed
+		// later, but without status line.
+		const char data[] =
+			"Content-Type: text/html\r\n"
+			"Hello: world";
+		ensure(!ex.feed(data, sizeof(data) - 1));
+		ensure_equals(ex.getStatusLine(), "200 OK\r\n");
+		ensure_equals(ex.getBuffer(), data);
+		
+		const char data2[] = "\r\n\r\nbody data";
+		ensure(ex.feed(data2, sizeof(data2) - 1));
+		ensure_equals(ex.getStatusLine(), "200 OK\r\n");
+		ensure_equals(ex.getBuffer(), string(data) + data2);
+	}
+	
+	TEST_METHOD(7) {
+		// Test feeding an incomplete status line which is larger
+		// than 3 bytes, which is completed later.
+		const char data[] = "Status: 500 Internal Se";
+		ensure(!ex.feed(data, sizeof(data) - 1));
+		ensure_equals(ex.getStatusLine(), "200 OK\r\n");
+		ensure_equals(ex.getBuffer(), data);
+		
+		const char data2[] = "rver Error\r\n\r\n";
+		ensure(ex.feed(data2, sizeof(data2) - 1));
+		ensure_equals(ex.getStatusLine(), "500 Internal Server Error\r\n");
+		ensure_equals(ex.getBuffer(), string(data) + data2);
+	}
+	
+	TEST_METHOD(8) {
+		// Test feeding an entire HTTP response (header + body)
+		// in 1 pass. There is a status line, but it is NOT the first
+		// header.
+		const char data[] =
+			"Content-Type: text/html\r\n"
+			"Status: 405 Testing\r\n"
+			"Hello: world\r\n"
+			"\r\n"
+			"bla bla";
+		ensure(ex.feed(data, sizeof(data) - 1));
+		ensure_equals(ex.getStatusLine(), "405 Testing\r\n");
+		ensure_equals(ex.getBuffer(), data);
+	}
+	
+	TEST_METHOD(9) {
+		// Test feeding multiple complete lines and a single incomplete
+		// line. One of the complete lines is the status line, but it
+		// is not the first line.
+		// The response is completed later.
+		const char data[] =
+			"Content-Type: text/html\r\n"
+			"Status: 100 Foo\r\n"
+			"B";
+		ensure(!ex.feed(data, sizeof(data) - 1));
+		ensure_equals(ex.getStatusLine(), "200 OK\r\n");
+		ensure_equals(ex.getBuffer(), data);
+		
+		const char data2[] = "la: bla\r\n\r\n";
+		ensure(ex.feed(data2, sizeof(data2) - 1));
+		ensure_equals(ex.getStatusLine(), "100 Foo\r\n");
+		ensure_equals(ex.getBuffer(), string(data) + data2);
+	}
+	
+	TEST_METHOD(10) {
+		// Test feeding multiple complete lines and a single
+		// incomplete status line. The response is completed
+		// later
+		const char data[] =
+			"Content-Type: text/html\r\n"
+			"Statu";
+		ensure(!ex.feed(data, sizeof(data) - 1));
+		ensure_equals(ex.getStatusLine(), "200 OK\r\n");
+		ensure_equals(ex.getBuffer(), data);
+		
+		const char data2[] =
+			"s: 202 Blabla\r\n"
+			"Frobnicate: true\r\n"
+			"\r\n";
+		ensure(ex.feed(data2, sizeof(data2) - 1));
+		ensure_equals(ex.getStatusLine(), "202 Blabla\r\n");
+		ensure_equals(ex.getBuffer(), string(data) + data2);
+	}
+}