passenger 5.0.0.beta2 → 5.0.0.beta3

data/test/cxx/ServerKit/CookieUtilsTest.cpp

@@ -0,0 +1,274 @@
+#include <TestSupport.h>
+#include <ServerKit/CookieUtils.h>
+
+using namespace Passenger;
+using namespace Passenger::ServerKit;
+using namespace std;
+
+namespace tut {
+	struct ServerKit_CookieUtilsTest {
+		psg_pool_t *pool;
+		LString name;
+		LString value;
+		LString header;
+		LString *result;
+
+		ServerKit_CookieUtilsTest() {
+			pool = psg_create_pool(PSG_DEFAULT_POOL_SIZE);
+			psg_lstr_init(&name);
+			psg_lstr_append(&name, pool, "foo");
+			psg_lstr_init(&value);
+			psg_lstr_append(&value, pool, "bar");
+			psg_lstr_init(&header);
+			result = NULL;
+		}
+
+		~ServerKit_CookieUtilsTest() {
+			psg_lstr_deinit(&name);
+			psg_lstr_deinit(&value);
+			psg_lstr_deinit(&header);
+			if (result != NULL) {
+				psg_lstr_deinit(result);
+			}
+			psg_destroy_pool(pool);
+		}
+	};
+
+	DEFINE_TEST_GROUP(ServerKit_CookieUtilsTest);
+
+	TEST_METHOD(1) {
+		set_test_name("1 cookie in 1 part");
+		psg_lstr_append(&header, pool, "foo=bar");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+
+
+	TEST_METHOD(2) {
+		set_test_name("1 cookie in multiple parts (1)");
+		psg_lstr_append(&header, pool, "fo");
+		psg_lstr_append(&header, pool, "o=");
+		psg_lstr_append(&header, pool, "bar");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+
+	TEST_METHOD(3) {
+		set_test_name("1 cookie in multiple parts (2)");
+		psg_lstr_append(&header, pool, "foo");
+		psg_lstr_append(&header, pool, "=");
+		psg_lstr_append(&header, pool, "bar");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+
+	TEST_METHOD(4) {
+		set_test_name("1 cookie in multiple parts (3)");
+		psg_lstr_append(&header, pool, "foo=");
+		psg_lstr_append(&header, pool, "bar");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+
+	TEST_METHOD(5) {
+		set_test_name("1 cookie in multiple parts (4)");
+		psg_lstr_append(&header, pool, "foo=b");
+		psg_lstr_append(&header, pool, "ar");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+
+
+	TEST_METHOD(10) {
+		set_test_name("Multiple cookies in 1 part (1)");
+		psg_lstr_append(&header, pool, "foo=bar; hello=world");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+
+	TEST_METHOD(11) {
+		set_test_name("Multiple cookies in 1 part (2)");
+		psg_lstr_append(&header, pool, "hello=world; foo=bar");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+
+	TEST_METHOD(12) {
+		set_test_name("Multiple cookies in 1 part (3)");
+		psg_lstr_append(&header, pool, "hello=world; foo=bar; a=b");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+
+
+	TEST_METHOD(15) {
+		set_test_name("Multiple cookies in multiple parts (1)");
+		psg_lstr_append(&header, pool, "fo");
+		psg_lstr_append(&header, pool, "o=bar; hello=world");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+
+	TEST_METHOD(16) {
+		set_test_name("Multiple cookies in multiple parts (2)");
+		psg_lstr_append(&header, pool, "foo");
+		psg_lstr_append(&header, pool, "=");
+		psg_lstr_append(&header, pool, "bar; hello=world");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+
+	TEST_METHOD(17) {
+		set_test_name("Multiple cookies in multiple parts (3)");
+		psg_lstr_append(&header, pool, "foo");
+		psg_lstr_append(&header, pool, "=bar; hello=world");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+
+	TEST_METHOD(18) {
+		set_test_name("Multiple cookies in multiple parts (4)");
+		psg_lstr_append(&header, pool, "foo=");
+		psg_lstr_append(&header, pool, "bar; hello=world");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+
+	TEST_METHOD(19) {
+		set_test_name("Multiple cookies in multiple parts (5)");
+		psg_lstr_append(&header, pool, "foo=b");
+		psg_lstr_append(&header, pool, "ar; hello=world");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+
+
+	TEST_METHOD(20) {
+		set_test_name("Multiple cookies in multiple parts (6)");
+		psg_lstr_append(&header, pool, "hello=world; fo");
+		psg_lstr_append(&header, pool, "o=bar");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+
+	TEST_METHOD(21) {
+		set_test_name("Multiple cookies in multiple parts (7)");
+		psg_lstr_append(&header, pool, "hello=world; foo");
+		psg_lstr_append(&header, pool, "=");
+		psg_lstr_append(&header, pool, "bar");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+
+	TEST_METHOD(22) {
+		set_test_name("Multiple cookies in multiple parts (8)");
+		psg_lstr_append(&header, pool, "hello=world; foo");
+		psg_lstr_append(&header, pool, "=bar");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+
+	TEST_METHOD(23) {
+		set_test_name("Multiple cookies in multiple parts (9)");
+		psg_lstr_append(&header, pool, "hello=world; foo=");
+		psg_lstr_append(&header, pool, "bar");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+
+	TEST_METHOD(24) {
+		set_test_name("Multiple cookies in multiple parts (10)");
+		psg_lstr_append(&header, pool, "hello=world; foo=b");
+		psg_lstr_append(&header, pool, "ar");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+
+
+	TEST_METHOD(30) {
+		set_test_name("Multiple cookies in multiple parts (11)");
+		psg_lstr_append(&header, pool, "hello=world; fo");
+		psg_lstr_append(&header, pool, "o=bar; a=b");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+
+	TEST_METHOD(31) {
+		set_test_name("Multiple cookies in multiple parts (12)");
+		psg_lstr_append(&header, pool, "hello=world; foo");
+		psg_lstr_append(&header, pool, "=");
+		psg_lstr_append(&header, pool, "bar; a=b");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+
+	TEST_METHOD(32) {
+		set_test_name("Multiple cookies in multiple parts (13)");
+		psg_lstr_append(&header, pool, "hello=world; foo");
+		psg_lstr_append(&header, pool, "=bar; a=b");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+
+	TEST_METHOD(33) {
+		set_test_name("Multiple cookies in multiple parts (14)");
+		psg_lstr_append(&header, pool, "hello=world; foo=");
+		psg_lstr_append(&header, pool, "bar; a=b");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+
+	TEST_METHOD(34) {
+		set_test_name("Multiple cookies in multiple parts (15)");
+		psg_lstr_append(&header, pool, "hello=world; foo=b");
+		psg_lstr_append(&header, pool, "ar; a=b");
+
+		result = findCookie(pool, &header, &name);
+		ensure("(1)", result != NULL);
+		ensure("(2)", psg_lstr_cmp(result, &value));
+	}
+}

data/test/cxx/ServerKit/HttpServerTest.cpp

@@ -329,6 +329,17 @@ namespace tut {
 			*result = server->totalRequestsBegun;
 		}
 
+		unsigned int getBodyBytesRead() {
+			unsigned int result;
+			bg.safe->runSync(boost::bind(&ServerKit_HttpServerTest::_getBodyBytesRead,
+				this, &result));
+			return result;
+		}
+
+		void _getBodyBytesRead(unsigned int *result) {
+			*result = server->bodyBytesRead;
+		}
+
 		unsigned int getActiveClientCount() {
 			unsigned int result;
 			bg.safe->runSync(boost::bind(&ServerKit_HttpServerTest::_getActiveClientCount,
@@ -1284,6 +1295,72 @@ namespace tut {
 		ensure_equals(body.substr(1000000), response2);
 	}
 
+	TEST_METHOD(64) {
+		set_test_name("If a request with body is ended but output is being flushed, "
+			"then any received request body data will be discard");
+
+		connectToServer();
+		sendRequest(
+			"GET /large_response HTTP/1.1\r\n"
+			"Connection: close\r\n"
+			"Host: foo\r\n"
+			"Size: 1000000\r\n"
+			"Content-Length: 4\r\n\r\n");
+		EVENTUALLY(1,
+			result = getTotalRequestsBegun() == 1;
+		);
+
+		unsigned long long previouslyBytesConsumed;
+		previouslyBytesConsumed = getTotalBytesConsumed();
+
+		writeExact(fd, "abcd");
+		string response = readAll(fd);
+		string body = stripHeaders(response);
+		ensure(startsWith(response, "HTTP/1.1 200 OK\r\n"));
+		ensure_equals(body.size(), 1000000u);
+		EVENTUALLY(1,
+			result = getTotalBytesConsumed() > previouslyBytesConsumed;
+		);
+		ensure_equals(getBodyBytesRead(), 0u);
+	}
+
+	TEST_METHOD(65) {
+		set_test_name("If a request with body is ended but output is being flushed, "
+			"then it won't attempt to keep-alive the connection after the output is flushed");
+
+		connectToServer();
+		sendRequest(
+			"GET /large_response HTTP/1.1\r\n"
+			"Connection: keep-alive\r\n"
+			"Host: foo\r\n"
+			"Size: 1000000\r\n"
+			"Content-Length: 4\r\n\r\n");
+		EVENTUALLY(1,
+			result = getTotalRequestsBegun() == 1;
+		);
+
+		unsigned long long previouslyBytesConsumed;
+		previouslyBytesConsumed = getTotalBytesConsumed();
+
+		writeExact(fd,
+			"abcd"
+			"GET /foo HTTP/1.1\r\n"
+			"Connection: close\r\n"
+			"Host: foo\r\n\r\n");
+		string response = readAll(fd);
+		string body = stripHeaders(response);
+		ensure(startsWith(response, "HTTP/1.1 200 OK\r\n"));
+		ensure_equals(body.size(), 1000000u);
+		EVENTUALLY(1,
+			result = getTotalBytesConsumed() > previouslyBytesConsumed;
+		);
+		ensure_equals(getBodyBytesRead(), 0u);
+
+		SHOULD_NEVER_HAPPEN(100,
+			result = getTotalRequestsBegun() > 1;
+		);
+	}
+
 
 	/***** Miscellaneous *****/
 

data/test/stub/rails3.0/Gemfile.lock

@@ -33,7 +33,7 @@ GEM
     erubis (2.6.6)
       abstract (>= 1.0.0)
     i18n (0.5.0)
-    json (1.7.6)
+    json (1.8.2)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -63,7 +63,7 @@ GEM
     rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
-    sqlite3 (1.3.6)
+    sqlite3 (1.3.10)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
     thor (0.14.6)

data/test/stub/rails3.1/Gemfile.lock

@@ -46,7 +46,7 @@ GEM
     jquery-rails (2.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.7.6)
+    json (1.8.2)
     mail (2.3.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -91,7 +91,7 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
+    sqlite3 (1.3.10)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.12)

data/test/stub/rails3.2/Gemfile.lock

@@ -46,7 +46,7 @@ GEM
     jquery-rails (2.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.7.6)
+    json (1.8.2)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -89,7 +89,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
+    sqlite3 (1.3.10)
     thor (0.17.0)
     tilt (1.3.3)
     treetop (1.4.12)

data/test/stub/rails4.0/Gemfile.lock

@@ -46,7 +46,7 @@ GEM
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.0)
+    json (1.8.2)
     libv8 (3.11.8.17)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -92,7 +92,7 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.7)
+    sqlite3 (1.3.10)
     therubyracer (0.11.4)
       libv8 (~> 3.11.8.12)
       ref

data/test/stub/rails4.1/Gemfile.lock

@@ -46,7 +46,7 @@ GEM
     jquery-rails (3.1.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
+    json (1.8.2)
     libv8 (3.16.14.3)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -95,7 +95,7 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.9)
+    sqlite3 (1.3.10)
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref