passenger 4.0.0.rc6 → 4.0.1

data/test/cxx/ApplicationPool2/SpawnerTestCases.cpp

@@ -22,6 +22,7 @@
 
 	#define RUN_USER_SWITCHING_TEST() \
 		process = spawner->spawn(options); \
+		process->requiresShutdown = false; \
 		BufferedIO io(FileDescriptor(open("/tmp/info.txt", O_RDONLY))); \
 		uid_t uid = (uid_t) atol(io.readLine().c_str()); \
 		gid_t gid = (gid_t) atol(io.readLine().c_str()); \
@@ -81,6 +82,7 @@
 		options.startupFile  = "start.rb";
 		SpawnerPtr spawner = createSpawner(options);
 		process = spawner->spawn(options);
+		process->requiresShutdown = false;
 		ensure_equals(process->sockets->size(), 1u);
 		
 		Connection conn = process->sockets->front().checkoutConnection();
@@ -98,7 +100,8 @@
 		options.startTimeout = 300;
 		SpawnerPtr spawner = createSpawner(options);
 		try {
-			spawner->spawn(options);
+			process = spawner->spawn(options);
+			process->requiresShutdown = false;
 			fail("Timeout expected");
 		} catch (const SpawnException &e) {
 			ensure_equals(e.getErrorKind(),
@@ -115,7 +118,8 @@
 		options.startupFile  = ".";
 		SpawnerPtr spawner = createSpawner(options);
 		try {
-			spawner->spawn(options);
+			process = spawner->spawn(options);
+			process->requiresShutdown = false;
 			fail("Exception expected");
 		} catch (const SpawnException &e) {
 			ensure_equals(e.getErrorKind(),
@@ -132,7 +136,8 @@
 		options.startupFile  = "start_error.pl";
 		SpawnerPtr spawner = createSpawner(options);
 		try {
-			spawner->spawn(options);
+			process = spawner->spawn(options);
+			process->requiresShutdown = false;
 			fail("SpawnException expected");
 		} catch (const SpawnException &e) {
 			ensure_equals(e.getErrorKind(),
@@ -153,7 +158,8 @@
 		options.startTimeout = 300;
 		SpawnerPtr spawner = createSpawner(options);
 		try {
-			spawner->spawn(options);
+			process = spawner->spawn(options);
+			process->requiresShutdown = false;
 			fail("Timeout expected");
 		} catch (const SpawnException &e) {
 			ensure_equals(e.getErrorKind(),
@@ -169,6 +175,7 @@
 		options.startupFile  = "start.rb";
 		SpawnerPtr spawner = createSpawner(options);
 		process = spawner->spawn(options);
+		process->requiresShutdown = false;
 		ensure_equals(process->sockets->size(), 1u);
 		
 		Connection conn = process->sockets->front().checkoutConnection();
@@ -187,6 +194,7 @@
 		options.environmentVariables.push_back(make_pair("PASSENGER_BAR", "bar"));
 		SpawnerPtr spawner = createSpawner(options);
 		process = spawner->spawn(options);
+		process->requiresShutdown = false;
 		ensure_equals(process->sockets->size(), 1u);
 		
 		Connection conn = process->sockets->front().checkoutConnection();
@@ -206,7 +214,8 @@
 		options.environmentVariables.push_back(make_pair("PASSENGER_FOO", "foo"));
 		SpawnerPtr spawner = createSpawner(options);
 		try {
-			spawner->spawn(options);
+			process = spawner->spawn(options);
+			process->requiresShutdown = false;
 			fail("Exception expected");
 		} catch (const SpawnException &e) {
 			ensure(containsSubstring(e["envvars"], "PASSENGER_FOO=foo\n"));
@@ -236,6 +245,7 @@
 
 			try {
 				process = spawner->spawn(options);
+				process->requiresShutdown = false;
 				fail("SpawnException expected");
 			} catch (const SpawnException &e) {
 				ensure("(1)", containsSubstring(e.getErrorPage(),
@@ -245,6 +255,7 @@
 			runShellCommand("chmod 700 tmp.check/a");
 			try {
 				process = spawner->spawn(options);
+				process->requiresShutdown = false;
 				fail("SpawnException expected");
 			} catch (const SpawnException &e) {
 				ensure("(2)", containsSubstring(e.getErrorPage(),
@@ -254,6 +265,7 @@
 			runShellCommand("chmod 700 tmp.check/a/b/c");
 			try {
 				process = spawner->spawn(options);
+				process->requiresShutdown = false;
 				fail("SpawnException expected");
 			} catch (const SpawnException &e) {
 				ensure("(3)", containsSubstring(e.getErrorPage(),
@@ -262,6 +274,7 @@
 
 			runShellCommand("chmod 700 tmp.check/a/b/c/d");
 			process = spawner->spawn(options); // Should not throw.
+			process->requiresShutdown = false;
 		}
 	}
 

data/test/cxx/RequestHandlerTest.cpp

@@ -3,6 +3,7 @@
 #include <agents/HelperAgent/RequestHandler.cpp>
 #include <agents/HelperAgent/AgentOptions.h>
 #include <ApplicationPool2/Pool.h>
+#include <Utils/json.h>
 #include <Utils/IOUtils.h>
 #include <Utils/Timer.h>
 
@@ -48,6 +49,8 @@ namespace tut {
 			setLogLevel(LVL_ERROR); // TODO: set to LVL_WARN
 
 			agentOptions.passengerRoot = resourceLocator->getRoot();
+			agentOptions.defaultUser   = testConfig["default_user"].asString();
+			agentOptions.defaultGroup  = testConfig["default_group"].asString();
 			root = resourceLocator->getRoot();
 			rackAppPath = root + "/test/stub/rack";
 			wsgiAppPath = root + "/test/stub/wsgi";

data/test/ruby/shared/loader_sharedspec.rb

@@ -37,6 +37,10 @@ class Loader
 	end
 
 	def close
+		@input.close_write
+		# Wait at most 100 msec for process to exit.
+		select([@output], nil, nil, 0.1)
+
 		@input.close if !@input.closed?
 		@output.close if !@output.closed?
 		if @pid

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc6
-  prerelease: 6
+  version: 4.0.1
+  prerelease: 
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -226,7 +226,6 @@ files:
 - doc/templates/markdown.html.erb
 - doc/Users guide Apache.html
 - doc/Users guide Apache.idmap.txt
-- doc/Users guide Apache.index.sqlite3
 - doc/Users guide Apache.txt
 - doc/Users guide Nginx.html
 - doc/Users guide Nginx.idmap.txt
@@ -2725,9 +2724,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: passenger
 rubygems_version: 1.8.25

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJRZAnsAAoJECrHRaUKISqMnUkIALsTpow4UO6t7iY6uyUeVQg6
-We42umF91RGnAIPF/jhXwEhK5bmwxGgzYte8BBk79oh5U5+Y5WM4WwSnnKLRbiBO
-34SbieXr8gCSoPZIP8Jz34Zn6h7Rit+ETcasFkrq+PojmyeNeE+0ygU/nY+3GoQR
-5tx8M6wvpPhbjpbiWOqmf+kf5SJT3Kx6bLrJveHd+HEzQS6Gek8d8uif+d/hi3AT
-oUt/1L9AA/qX7H3ucuVNUA2ohMjuX1+vtFqezK6h6GcVwDvy91aepLGuCWn/TA2f
-wbExtgfZ8DHrW6y/whEbiii21ZlVohpIpbxshnu4/LtEYG42kkNM3ExgeoPV9/s=
-=EKr1
+iQEcBAABAgAGBQJRh4ZKAAoJECrHRaUKISqMAQAH/jFHy9rLAO/8bYVs8+M329/M
+vu8LA/dGFzpYoR1uyUP2R0uDwGIif+vuawrCDsowtFXmPYPj7I+1vjP0Z3egiytn
+KTBjwPG1yRXvmBdoS7T/L6CoIfbxawrbbVaDpUEx/wsq8V4wOMrpvvNuSWsCBVnF
+V1JnCm6/O5+ZVrXbheEUKEw4/KhXQ4v80lvjMGzOD+LiFeDvPOpONDgZIhfRBWsl
+OMLhHjtLi0QfQVLb7KbY18atgEY8vPd0xbAfK5rR8hWhsHsv97zWgU+G/xJgJqIZ
+pjWnkZL/8H6H4ZkbEb4JDLQhyFQeI2Atym+4MR+Sb/ru90BxSlNWXyCQC2LcSNo=
+=+ZYC
 -----END PGP SIGNATURE-----