passenger 4.0.45 → 4.0.46

data/test/cxx/ApplicationPool2/SpawnerTestCases.cpp

@@ -99,6 +99,7 @@
 		options.startupFile  = ".";
 		options.startTimeout = 300;
 		SpawnerPtr spawner = createSpawner(options);
+		setLogLevel(LVL_CRIT);
 		try {
 			process = spawner->spawn(options);
 			process->requiresShutdown = false;
@@ -117,6 +118,7 @@
 		options.startCommand = "echo\t" "!> hello world";
 		options.startupFile  = ".";
 		SpawnerPtr spawner = createSpawner(options);
+		setLogLevel(LVL_CRIT);
 		try {
 			process = spawner->spawn(options);
 			process->requiresShutdown = false;
@@ -135,6 +137,7 @@
 		options.startCommand = "perl\t" "start_error.pl";
 		options.startupFile  = "start_error.pl";
 		SpawnerPtr spawner = createSpawner(options);
+		setLogLevel(LVL_CRIT);
 		try {
 			process = spawner->spawn(options);
 			process->requiresShutdown = false;
@@ -157,6 +160,7 @@
 		options.startupFile  = "start_error.pl";
 		options.startTimeout = 300;
 		SpawnerPtr spawner = createSpawner(options);
+		setLogLevel(LVL_CRIT);
 		try {
 			process = spawner->spawn(options);
 			process->requiresShutdown = false;
@@ -213,6 +217,7 @@
 		options.startupFile  = ".";
 		options.environmentVariables.push_back(make_pair("PASSENGER_FOO", "foo"));
 		SpawnerPtr spawner = createSpawner(options);
+		setLogLevel(LVL_CRIT);
 		try {
 			process = spawner->spawn(options);
 			process->requiresShutdown = false;
@@ -236,6 +241,7 @@
 		options.appRoot = "tmp.check/a/b/c/d";
 		options.appType = "rack";
 		SpawnerPtr spawner = createSpawner(options);
+		setLogLevel(LVL_CRIT);
 
 		if (getuid() != 0) {
 			// TODO: implement this test for root too

data/test/cxx/FileBackedPipeTest.cpp

@@ -27,7 +27,7 @@ namespace tut {
 		AtomicInt commitCount;
 
 		FileBackedPipeTest()
-			: tmpdir("tmp.pipe")
+			: tmpdir("tmp.pipe", true) // Removing the directory may not work over NFS
 		{
 			consumeImmediately = true;
 			toConsume = 9999;

data/test/cxx/RequestHandlerTest.cpp

@@ -43,7 +43,8 @@ namespace tut {
 		
 		RequestHandlerTest() {
 			createServerInstanceDirAndGeneration(serverInstanceDir, generation);
-			spawnerFactory = boost::make_shared<SpawnerFactory>(*resourceLocator, generation);
+			spawnerFactory = boost::make_shared<SpawnerFactory>(generation,
+				make_shared<SpawnerConfig>(*resourceLocator));
 			pool = boost::make_shared<Pool>(spawnerFactory);
 			pool->initialize();
 			serverFilename = generation->getPath() + "/server";
@@ -1243,10 +1244,165 @@ namespace tut {
 		ensure_equals(io.readLine(), "Echo: hello\n");
 	}
 
+	TEST_METHOD(61) {
+		set_test_name("If the response contains Transfer-Encoding chunked, "
+			"it dechunks the response body and forwards it until the "
+			"zero-length chunk is encountered.");
 
-	/***** Out-of-band work tests *****/
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/chunked",
+			NULL);
+
+		string response = readAll(connection);
+		string body = stripHeaders(response);
+		ensure_equals(body,
+			"chunk1\n"
+			"chunk2\n"
+			"chunk3\n");
+	}
+
+	TEST_METHOD(62) {
+		set_test_name("If the response contains Transfer-Encoding chunked, "
+			"it closes the connection with the app when the zero-length chunk is encountered.");
+
+		DeleteFileEventually statusFile("/tmp/passenger-tail-status.txt");
+		createFile("/tmp/passenger-tail-status.txt", "",
+			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
+
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/chunked",
+			"HTTP_X_SLEEP_WHEN_DONE", "0.01",
+			"HTTP_X_EXTRA_DATA", "true",
+			"HTTP_X_TAIL_STATUS_FILE", "/tmp/passenger-tail-status.txt",
+			NULL);
+
+		string response = readAll(connection);
+		string body = stripHeaders(response);
+		ensure_equals(body,
+			"chunk1\n"
+			"chunk2\n"
+			"chunk3\n");
+		EVENTUALLY(5,
+			result = readAll("/tmp/passenger-tail-status.txt") == "False";
+		);
+	}
+
+	TEST_METHOD(63) {
+		set_test_name("If the response contains Transfer-Encoding chunked, "
+			"it discards any additional response body data after the zero-length chunk is encountered.");
+
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/chunked",
+			"HTTP_X_EXTRA_DATA", "true",
+			NULL);
+
+		string response = readAll(connection);
+		string body = stripHeaders(response);
+		ensure_equals(body,
+			"chunk1\n"
+			"chunk2\n"
+			"chunk3\n");
+	}
+
+	TEST_METHOD(64) {
+		set_test_name("If the response contains Content-Length, "
+			"it forwards exactly Content-Length bytes of the response body.");
+
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/blob",
+			"HTTP_X_SIZE", "5000000",
+			"HTTP_X_CONTENT_LENGTH", "true",
+			NULL);
+
+		string response = readAll(connection);
+		string body = stripHeaders(response);
+		FILE *f = fopen("/tmp/debug.txt", "w");
+		fwrite(response.data(), 1, response.size(), f);
+		fclose(f);
+		ensure_equals(body.size(), 5000000u);
+	}
 
 	TEST_METHOD(65) {
+		set_test_name("If the response contains Content-Length, "
+			"it closes the connection with the app after forwarding exactly Content-Length bytes.");
+
+		DeleteFileEventually statusFile("/tmp/passenger-tail-status.txt");
+		createFile("/tmp/passenger-tail-status.txt", "",
+			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
+
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/blob",
+			"HTTP_X_SIZE", "5000000",
+			"HTTP_X_CONTENT_LENGTH", "true",
+			"HTTP_X_SLEEP_WHEN_DONE", "0.01",
+			"HTTP_X_EXTRA_DATA", "true",
+			"HTTP_X_TAIL_STATUS_FILE", "/tmp/passenger-tail-status.txt",
+			NULL);
+
+		string response = readAll(connection);
+		string body = stripHeaders(response);
+		ensure_equals(body.size(), 5000000u);
+		EVENTUALLY(5,
+			result = readAll("/tmp/passenger-tail-status.txt") == "False";
+		);
+	}
+
+	TEST_METHOD(66) {
+		set_test_name("If the response contains Content-Length, "
+			"it discards any additional response body data after Content-Length bytes.");
+
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/blob",
+			"HTTP_X_SIZE", "5000000",
+			"HTTP_X_CONTENT_LENGTH", "true",
+			"HTTP_X_EXTRA_DATA", "true",
+			NULL);
+
+		string response = readAll(connection);
+		string body = stripHeaders(response);
+		ensure_equals(body.size(), 5000000u);
+	}
+
+	TEST_METHOD(67) {
+		set_test_name("If the response contains neither Transfer-Encoding chunked nor Content-Length, "
+			"it forwards the response body until EOF.");
+
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/blob",
+			"HTTP_X_SIZE", "5000000",
+			"HTTP_X_EXTRA_DATA", "true",
+			NULL);
+
+		string response = readAll(connection);
+		string body = stripHeaders(response);
+		ensure_equals(body.size(), 5000004u);
+	}
+
+
+	/***** Out-of-band work tests *****/
+
+	TEST_METHOD(75) {
 		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 "

data/test/cxx/ServerInstanceDirTest.cpp

@@ -27,6 +27,7 @@ namespace tut {
 		// The (string) constructor creates a ServerInstanceDir object that's
 		// associated with the given directory, and creates the directory
 		// if it doesn't exist.
+		DONT_RUN_IN_VAGRANT();
 		ServerInstanceDir dir(parentDir + "/passenger-test.1234");
 		ServerInstanceDir dir2(dir.getPath());
 		ServerInstanceDir dir3(parentDir + "/foo");
@@ -167,6 +168,7 @@ namespace tut {
 	TEST_METHOD(14) {
 		// It's possible to have two ServerInstanceDir objects constructed
 		// with the same (pid_t, string) constructor arguments.
+		DONT_RUN_IN_VAGRANT();
 		ServerInstanceDir dir(parentDir + "/passenger-test.1234");
 		ServerInstanceDir dir2(parentDir + "/passenger-test.1234");
 	}

data/test/cxx/TestSupport.h

@@ -86,6 +86,15 @@ using namespace oxt;
 		}									\
 	} while (0)
 
+// Do not run some tests in the Vagrant development environment because
+// they don't work over NFS.
+#define DONT_RUN_IN_VAGRANT() \
+	do { \
+		if (getenv("PASSENGER_VAGRANT_ENVIRONMENT") != NULL) { \
+			return; \
+		} \
+	} while (false)
+
 
 extern ResourceLocator *resourceLocator;
 extern Json::Value testConfig;
@@ -154,8 +163,9 @@ string getPrimaryGroupName(const string &username);
 class TempDir {
 private:
 	string name;
+	bool ignoreRemoveErrors;
 public:
-	TempDir(const string &name) {
+	TempDir(const string &name, bool _ignoreRemoveErrors = false) {
 		this->name = name;
 		if (mkdir(name.c_str(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) != 0 && errno != EEXIST) {
 			int e = errno;
@@ -164,10 +174,19 @@ public:
 			message.append("'");
 			throw FileSystemException(message, e, name);
 		}
+		ignoreRemoveErrors = _ignoreRemoveErrors;
 	}
 	
 	~TempDir() {
-		removeDirTree(name);
+		if (ignoreRemoveErrors) {
+			try {
+				removeDirTree(name);
+			} catch (const RuntimeException &) {
+				// Do nothing.
+			}
+		} else {
+			removeDirTree(name);
+		}
 	}
 };
 

data/test/cxx/UtilsTest.cpp

@@ -171,6 +171,7 @@ namespace tut {
 	
 	TEST_METHOD(21) {
 		// It immediately unlinks the temp file.
+		DONT_RUN_IN_VAGRANT();
 		TempDir td("utils_test.tmp");
 		BufferedUpload t("utils_test.tmp");
 		ensure_equals(listDir("utils_test.tmp").size(), 0u);

data/test/ruby/classic_rails/loader_spec.rb

@@ -1,7 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'ruby/shared/loader_sharedspec'
 require 'ruby/shared/ruby_loader_sharedspec'
-require 'ruby/shared/rails/analytics_logging_extensions_sharedspec'
 
 module PhusionPassenger
 

data/test/ruby/classic_rails/preloader_spec.rb

@@ -1,7 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'ruby/shared/loader_sharedspec'
 require 'ruby/shared/ruby_loader_sharedspec'
-require 'ruby/shared/rails/analytics_logging_extensions_sharedspec'
 
 module PhusionPassenger
 

data/test/ruby/rails3.0/loader_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'ruby/shared/loader_sharedspec'
-require 'ruby/shared/rails/analytics_logging_extensions_sharedspec'
+require 'ruby/shared/rails/union_station_extensions_sharedspec'
 
 module PhusionPassenger
 
@@ -20,7 +20,7 @@ describe "Rack loader with Rails 3.0" do
 		return "3.0"
 	end
 
-	include_examples "analytics logging extensions for Rails"
+	include_examples "Union Station extensions for Rails"
 end
 
 end # module PhusionPassenger

data/test/ruby/rails3.0/preloader_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'ruby/shared/loader_sharedspec'
-require 'ruby/shared/rails/analytics_logging_extensions_sharedspec'
+require 'ruby/shared/rails/union_station_extensions_sharedspec'
 
 module PhusionPassenger
 
@@ -26,7 +26,7 @@ describe "Rack loader with Rails 3.0" do
 		return "3.0"
 	end
 
-	include_examples "analytics logging extensions for Rails"
+	include_examples "Union Station extensions for Rails"
 end
 
 end # module PhusionPassenger

data/test/ruby/rails3.1/loader_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'ruby/shared/loader_sharedspec'
-require 'ruby/shared/rails/analytics_logging_extensions_sharedspec'
+require 'ruby/shared/rails/union_station_extensions_sharedspec'
 
 module PhusionPassenger
 
@@ -20,7 +20,7 @@ describe "Rack loader with Rails 3.1" do
 		return "3.1"
 	end
 
-	include_examples "analytics logging extensions for Rails"
+	include_examples "Union Station extensions for Rails"
 end
 
 end # module PhusionPassenger

data/test/ruby/rails3.1/preloader_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'ruby/shared/loader_sharedspec'
-require 'ruby/shared/rails/analytics_logging_extensions_sharedspec'
+require 'ruby/shared/rails/union_station_extensions_sharedspec'
 
 module PhusionPassenger
 
@@ -26,7 +26,7 @@ describe "Rack loader with Rails 3.1" do
 		return "3.1"
 	end
 
-	include_examples "analytics logging extensions for Rails"
+	include_examples "Union Station extensions for Rails"
 end
 
 end # module PhusionPassenger

data/test/ruby/rails3.2/loader_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'ruby/shared/loader_sharedspec'
-require 'ruby/shared/rails/analytics_logging_extensions_sharedspec'
+require 'ruby/shared/rails/union_station_extensions_sharedspec'
 
 module PhusionPassenger
 
@@ -20,7 +20,7 @@ describe "Rack loader with Rails 3.2" do
 		return "3.2"
 	end
 
-	include_examples "analytics logging extensions for Rails"
+	include_examples "Union Station extensions for Rails"
 end
 
 end # module PhusionPassenger

data/test/ruby/rails3.2/preloader_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'ruby/shared/loader_sharedspec'
-require 'ruby/shared/rails/analytics_logging_extensions_sharedspec'
+require 'ruby/shared/rails/union_station_extensions_sharedspec'
 
 module PhusionPassenger
 
@@ -26,7 +26,7 @@ describe "Rack loader with Rails 3.2" do
 		return "3.2"
 	end
 
-	include_examples "analytics logging extensions for Rails"
+	include_examples "Union Station extensions for Rails"
 end
 
 end # module PhusionPassenger

data/test/ruby/rails4.0/loader_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'ruby/shared/loader_sharedspec'
-require 'ruby/shared/rails/analytics_logging_extensions_sharedspec'
+require 'ruby/shared/rails/union_station_extensions_sharedspec'
 
 if RUBY_VERSION_INT >= 190
 module PhusionPassenger
@@ -21,7 +21,7 @@ describe "Rack loader with Rails 4.0" do
 		return "4.0"
 	end
 
-	include_examples "analytics logging extensions for Rails"
+	include_examples "Union Station extensions for Rails"
 end
 
 end # module PhusionPassenger

data/test/ruby/rails4.0/preloader_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'ruby/shared/loader_sharedspec'
-require 'ruby/shared/rails/analytics_logging_extensions_sharedspec'
+require 'ruby/shared/rails/union_station_extensions_sharedspec'
 
 if RUBY_VERSION_INT >= 190
 module PhusionPassenger
@@ -27,7 +27,7 @@ describe "Rack loader with Rails 4.0" do
 		return "4.0"
 	end
 
-	include_examples "analytics logging extensions for Rails"
+	include_examples "Union Station extensions for Rails"
 end
 
 end # module PhusionPassenger