passenger 2.0.4 → 2.0.5

data/doc/rdoc/files/lib/passenger/spawn_manager_rb.html

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Mon Dec 01 14:19:08 +0100 2008</td>
+            <td>Fri Dec 05 12:57:36 +0100 2008</td>
           </tr>
         </table>
       </td></tr>

data/doc/rdoc/files/lib/passenger/utils_rb.html

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Mon Dec 01 14:19:08 +0100 2008</td>
+            <td>Fri Dec 05 12:57:36 +0100 2008</td>
           </tr>
         </table>
       </td></tr>

data/ext/apache2/ApplicationPoolServer.h

@@ -33,6 +33,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <signal.h>
+#include <fcntl.h>
 
 #include "MessageChannel.h"
 #include "ApplicationPool.h"
@@ -507,6 +508,12 @@ private:
 		} else { // Parent process.
 			InterruptableCalls::close(fds[0]);
 			serverSocket = fds[1];
+			
+			int flags = fcntl(serverSocket, F_GETFD);
+			if (flags != -1) {
+				fcntl(serverSocket, F_SETFD, flags | FD_CLOEXEC);
+			}
+			
 			serverPid = pid;
 		}
 	}

data/ext/apache2/ApplicationPoolServerExecutable.cpp

@@ -415,6 +415,13 @@ int
 Server::start() {
 	setupSyscallInterruptionSupport();
 	
+	// Ignore SIGPIPE.
+	struct sigaction action;
+	action.sa_handler = SIG_IGN;
+	action.sa_flags   = 0;
+	sigemptyset(&action.sa_mask);
+	sigaction(SIGPIPE, &action, NULL);
+	
 	try {
 		if (!statusReportFIFO.empty()) {
 			statusReportThread = ptr(

data/ext/apache2/Configuration.h

@@ -31,7 +31,7 @@
  */
 
 /** Module version number. */
-#define PASSENGER_VERSION "2.0.4"
+#define PASSENGER_VERSION "2.0.5"
 
 #ifdef __cplusplus
 	#include <set>

data/ext/apache2/Hooks.cpp

@@ -294,8 +294,8 @@ private:
 		}
 	};
 
-	ApplicationPoolPtr applicationPool;
 	ApplicationPoolServerPtr applicationPoolServer;
+	thread_specific_ptr<ApplicationPoolPtr> threadSpecificApplicationPool;
 	
 	DirConfig *getDirConfig(request_rec *r) {
 		return (DirConfig *) ap_get_module_config(r->per_dir_config, &passenger_module);
@@ -305,6 +305,21 @@ private:
 		return (ServerConfig *) ap_get_module_config(s->module_config, &passenger_module);
 	}
 	
+	/**
+	 * When using the worker MPM and global queuing, deadlocks can occur, for
+	 * the same reason described in ApplicationPoolServer::connect(). This
+	 * method allows us to avoid this deadlock by making sure that each
+	 * thread gets its own connection to the application pool server.
+	 */
+	ApplicationPoolPtr getApplicationPool() {
+		ApplicationPoolPtr *pool_ptr = threadSpecificApplicationPool.get();
+		if (pool_ptr == NULL) {
+			pool_ptr = new ApplicationPoolPtr(applicationPoolServer->connect());
+			threadSpecificApplicationPool.reset(pool_ptr);
+		}
+		return *pool_ptr;
+	}
+	
 	int reportDocumentRootDeterminationError(request_rec *r) {
 		ap_set_content_type(r, "text/html; charset=UTF-8");
 		ap_rputs("<h1>Passenger error #1</h1>\n", r);
@@ -603,29 +618,12 @@ public:
 				applicationPoolServerExe, spawnServer, "",
 				ruby, user)
 		);
-	}
-	
-	void initChild(apr_pool_t *pchild, server_rec *s) {
-		ServerConfig *config = getServerConfig(s);
 		
-		try {
-			applicationPool = applicationPoolServer->connect();
-			applicationPoolServer->detach();
-			applicationPool->setMax(config->maxPoolSize);
-			applicationPool->setMaxPerApp(config->maxInstancesPerApp);
-			applicationPool->setMaxIdleTime(config->poolIdleTime);
-			applicationPool->setUseGlobalQueue(config->getUseGlobalQueue());
-		} catch (const thread_interrupted &) {
-			P_TRACE(3, "A system call was interrupted during initialization of "
-				"an Apache child process. Apache is probably restarting or "
-				"shutting down.");
-		} catch (const exception &e) {
-			P_WARN("Cannot initialize Passenger in an Apache child process: " <<
-				e.what() <<
-				" (this warning is harmless if you're currently restarting "
-				"or shutting down Apache)\n");
-			abort();
-		}
+		ApplicationPoolPtr pool(applicationPoolServer->connect());
+		pool->setMax(config->maxPoolSize);
+		pool->setMaxPerApp(config->maxInstancesPerApp);
+		pool->setMaxIdleTime(config->poolIdleTime);
+		pool->setUseGlobalQueue(config->getUseGlobalQueue());
 	}
 	
 	int handleRequest(request_rec *r) {
@@ -694,7 +692,7 @@ public:
 					spawnMethod = "smart";
 				}
 				
-				session = applicationPool->get(
+				session = getApplicationPool()->get(
 					canonicalizePath(mapper.getPublicDirectory() + "/.."),
 					true, defaultUser, environment, spawnMethod,
 					mapper.getApplicationTypeString());
@@ -953,13 +951,6 @@ init_module(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *
 	}
 }
 
-static void
-init_child(apr_pool_t *pchild, server_rec *s) {
-	if (hooks != NULL) {
-		return hooks->initChild(pchild, s);
-	}
-}
-
 static int
 handle_request(request_rec *r) {
 	if (hooks != NULL) {
@@ -984,7 +975,6 @@ map_to_storage(request_rec *r) {
 void
 passenger_register_hooks(apr_pool_t *p) {
 	ap_hook_post_config(init_module, NULL, NULL, APR_HOOK_MIDDLE);
-	ap_hook_child_init(init_child, NULL, NULL, APR_HOOK_MIDDLE);
 	ap_hook_map_to_storage(map_to_storage, NULL, NULL, APR_HOOK_FIRST);
 	ap_hook_handler(handle_request, NULL, NULL, APR_HOOK_MIDDLE);
 }

data/ext/apache2/StandardApplicationPool.h

@@ -449,11 +449,9 @@ private:
 					activeOrMaxChanged.notify_all();
 				}
 			} else {
-				while (!(
-					active < max &&
-					(maxPerApp == 0 || appInstanceCount[appRoot] < maxPerApp)
-				)) {
+				if (active >= max) {
 					activeOrMaxChanged.wait(l);
+					goto beginning_of_function;
 				}
 				if (count == max) {
 					container = inactiveApps.front();
@@ -654,6 +652,7 @@ public:
 		appInstanceCount.clear();
 		count = 0;
 		active = 0;
+		activeOrMaxChanged.notify_all();
 	}
 	
 	virtual void setMaxIdleTime(unsigned int seconds) {

data/ext/apache2/System.cpp

@@ -49,8 +49,18 @@ interruptionSignalHandler(int sig) {
 
 void
 Passenger::setupSyscallInterruptionSupport() {
-	signal(INTERRUPTION_SIGNAL, interruptionSignalHandler);
-	siginterrupt(INTERRUPTION_SIGNAL, 1);
+	struct sigaction action;
+	int ret;
+	
+	action.sa_handler = interruptionSignalHandler;
+	action.sa_flags   = 0;
+	sigemptyset(&action.sa_mask);
+	do {
+		ret = sigaction(INTERRUPTION_SIGNAL, &action, NULL);
+	} while (ret == -1 && errno == EINTR);
+	do {
+		ret = siginterrupt(INTERRUPTION_SIGNAL, 1);
+	} while (ret == -1 && errno == EINTR);
 }
 
 

data/ext/passenger/native_support.c

@@ -237,7 +237,7 @@ close_all_file_descriptors(VALUE self, VALUE exceptions) {
 	
 	for (i = sysconf(_SC_OPEN_MAX) - 1; i >= 0; i--) {
 		int is_exception = 0;
-		for (j = 0; j < RARRAY(exceptions)->len && !is_exception; j++) {
+		for (j = 0; j < RARRAY_LEN(exceptions) && !is_exception; j++) {
 			long fd = NUM2INT(rb_ary_entry(exceptions, j));
 			is_exception = i == fd;
 		}

data/lib/passenger/dependencies.rb

@@ -185,15 +185,21 @@ module Dependencies # :nodoc: all
 	Rake = Dependency.new do |dep|
 		dep.name = "Rake"
 		dep.define_checker do |result|
-			rake = PlatformInfo.find_command("rake")
-			if rake.nil?
-				result.not_found
-			else
+			bindir = File.dirname(PlatformInfo::RUBY)
+			rake = File.join(bindir, "rake")
+			if File.executable?(rake)
 				result.found(rake)
+			else
+				rake = PlatformInfo.find_command("rake")
+				if rake.nil?
+					result.not_found
+				else
+					result.found(rake)
+				end
 			end
 		end
 		dep.website = "http://rake.rubyforge.org/"
-		dep.install_instructions = "Please install RubyGems first, then run <b>gem install rake</b>"
+		dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo::GEM} install rake</b>"
 	end
 	
 	Apache2 = Dependency.new do |dep|
@@ -294,7 +300,7 @@ module Dependencies # :nodoc: all
 				result.not_found
 			end
 		end
-		dep.install_instructions = "Please install RubyGems first, then run <b>gem install fastthread</b>"
+		dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo::GEM} install fastthread</b>"
 	end
 
 	Rack = Dependency.new do |dep|
@@ -311,7 +317,7 @@ module Dependencies # :nodoc: all
 				result.not_found
 			end
 		end
-		dep.install_instructions = "Please install RubyGems first, then run <b>gem install rack</b>"
+		dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo::GEM} install rack</b>"
 	end
 end
 

data/lib/passenger/platform_info.rb

@@ -268,7 +268,7 @@ public
 	end
 
 	# The absolute path to the current Ruby interpreter.
-	RUBY = Config::CONFIG['bindir'] + '/' + Config::CONFIG['RUBY_INSTALL_NAME']
+	RUBY = Config::CONFIG['bindir'] + '/' + Config::CONFIG['RUBY_INSTALL_NAME'] + Config::CONFIG['EXEEXT']
 	# The correct 'gem' command for this Ruby interpreter.
 	GEM = determine_gem_command
 	

data/lib/passenger/railz/application_spawner.rb

@@ -23,6 +23,7 @@ require 'fcntl'
 require 'passenger/application'
 require 'passenger/abstract_server'
 require 'passenger/application'
+require 'passenger/rack/request_handler'
 require 'passenger/railz/request_handler'
 require 'passenger/exceptions'
 require 'passenger/utils'
@@ -304,7 +305,14 @@ private
 			end
 			
 			reader.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
-			handler = RequestHandler.new(reader)
+			
+			if Rails::VERSION::STRING >= '2.3.0'
+				rack_app = ::ActionController::Dispatcher.new
+				handler = Rack::RequestHandler.new(reader, rack_app)
+			else
+				handler = RequestHandler.new(reader)
+			end
+			
 			channel.write(Process.pid, handler.socket_name,
 				handler.using_abstract_namespace?)
 			channel.send_io(writer)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-01 00:00:00 +01:00
+date: 2008-12-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency