passenger 2.0.3 → 2.0.4

data/ext/apache2/Configuration.h

@@ -31,7 +31,7 @@
  */
 
 /** Module version number. */
-#define PASSENGER_VERSION "2.0.3"
+#define PASSENGER_VERSION "2.0.4"
 
 #ifdef __cplusplus
 	#include <set>
@@ -112,6 +112,13 @@
 			 * this server config. */
 			bool poolIdleTimeSpecified;
 			
+			/** Whether global queuing should be used. */
+			bool useGlobalQueue;
+			
+			/** Whether the useGlobalQueue option was explicitly specified
+			 * in this server config. */
+			bool useGlobalQueueSpecified;
+			
 			/** Whether user switching support is enabled. */
 			bool userSwitching;
 			
@@ -123,6 +130,14 @@
 			 * fails or is disabled. NULL means the option is not specified.
 			 */
 			const char *defaultUser;
+			
+			bool getUseGlobalQueue() const {
+				if (useGlobalQueueSpecified) {
+					return useGlobalQueue;
+				} else {
+					return false;
+				}
+			}
 		};
 	}
 

data/ext/apache2/Hooks.cpp

@@ -517,7 +517,7 @@ private:
 						errno);
 				}
 				written += ret;
-			} while (written < len);
+			} while (written < (size_t) len);
 		}
 		if (len == -1) {
 			throw IOException("An error occurred while receiving HTTP upload data.");
@@ -614,6 +614,7 @@ public:
 			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 "
@@ -700,10 +701,9 @@ public:
 				P_TRACE(3, "Forwarding " << r->uri << " to PID " << session->getPid());
 			} catch (const SpawnException &e) {
 				if (e.hasErrorPage()) {
+					r->status = 500;
 					ap_set_content_type(r, "text/html; charset=utf-8");
 					ap_rputs(e.getErrorPage().c_str(), r);
-					// Unfortunately we can't return a 500 Internal Server
-					// Error. Apache's HTTP error handler would kick in.
 					return OK;
 				} else {
 					throw;
@@ -860,6 +860,7 @@ destroy_hooks(void *arg) {
 		this_thread::disable_syscall_interruption dsi;
 		P_DEBUG("Shutting down Phusion Passenger...");
 		delete hooks;
+		hooks = NULL;
 	} catch (const thread_interrupted &) {
 		// Ignore interruptions, we're shutting down anyway.
 		P_TRACE(3, "A system call was interrupted during shutdown of mod_passenger.");
@@ -892,6 +893,7 @@ init_module(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *
 	if (hooks != NULL) {
 		P_DEBUG("Restarting Phusion Passenger....");
 		delete hooks;
+		hooks = NULL;
 	}
 	try {
 		hooks = new Hooks(pconf, plog, ptemp, s);

data/ext/apache2/StandardApplicationPool.h

@@ -177,7 +177,9 @@ private:
 	thread *cleanerThread;
 	bool detached;
 	bool done;
+	bool useGlobalQueue;
 	unsigned int maxIdleTime;
+	unsigned int waitingOnGlobalQueue;
 	condition cleanerThreadSleeper;
 	
 	// Shortcuts for instance variables in SharedData. Saves typing in get().
@@ -235,6 +237,8 @@ private:
 		result << "count    = " << count << endl;
 		result << "active   = " << active << endl;
 		result << "inactive = " << inactiveApps.size() << endl;
+		result << "Using global queue: " << (useGlobalQueue ? "yes" : "no") << endl;
+		result << "Waiting on global queue: " << waitingOnGlobalQueue << endl;
 		result << endl;
 		
 		result << "----------- Applications -----------" << endl;
@@ -360,6 +364,8 @@ private:
 		const string &spawnMethod,
 		const string &appType
 	) {
+		beginning_of_function:
+		
 		this_thread::disable_interruption di;
 		this_thread::disable_syscall_interruption dsi;
 		AppContainerPtr container;
@@ -404,19 +410,26 @@ private:
 				} else if (count >= max || (
 					maxPerApp != 0 && appInstanceCount[appRoot] >= maxPerApp )
 					) {
-					AppContainerList::iterator it(list->begin());
-					AppContainerList::iterator smallest(list->begin());
-					it++;
-					for (; it != list->end(); it++) {
-						if ((*it)->sessions < (*smallest)->sessions) {
-							smallest = it;
+					if (useGlobalQueue) {
+						waitingOnGlobalQueue++;
+						activeOrMaxChanged.wait(l);
+						waitingOnGlobalQueue--;
+						goto beginning_of_function;
+					} else {
+						AppContainerList::iterator it(list->begin());
+						AppContainerList::iterator smallest(list->begin());
+						it++;
+						for (; it != list->end(); it++) {
+							if ((*it)->sessions < (*smallest)->sessions) {
+								smallest = it;
+							}
 						}
+						container = *smallest;
+						list->erase(smallest);
+						list->push_back(container);
+						container->iterator = list->end();
+						container->iterator--;
 					}
-					container = *smallest;
-					list->erase(smallest);
-					list->push_back(container);
-					container->iterator = list->end();
-					container->iterator--;
 				} else {
 					container = ptr(new AppContainer());
 					{
@@ -547,6 +560,8 @@ public:
 		max = DEFAULT_MAX_POOL_SIZE;
 		count = 0;
 		active = 0;
+		useGlobalQueue = false;
+		waitingOnGlobalQueue = 0;
 		maxPerApp = DEFAULT_MAX_INSTANCES_PER_APP;
 		maxIdleTime = DEFAULT_MAX_IDLE_TIME;
 		cleanerThread = new thread(
@@ -667,6 +682,10 @@ public:
 		activeOrMaxChanged.notify_all();
 	}
 	
+	virtual void setUseGlobalQueue(bool value) {
+		this->useGlobalQueue = value;
+	}
+	
 	virtual pid_t getSpawnServerPid() const {
 		return spawnManager.getServerPid();
 	}

data/lib/passenger/abstract_request_handler.rb

@@ -17,6 +17,7 @@
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 require 'socket'
+require 'fcntl'
 require 'passenger/utils'
 require 'passenger/native_support'
 module Passenger
@@ -125,6 +126,7 @@ class AbstractRequestHandler
 		if !@using_abstract_namespace
 			create_unix_socket_on_filesystem
 		end
+		@socket.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
 		@owner_pipe = owner_pipe
 		@previous_signal_handlers = {}
 	end
@@ -258,6 +260,7 @@ private
 		ios = select([@socket, @owner_pipe])[0]
 		if ios.include?(@socket)
 			client = @socket.accept
+			client.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
 			
 			# The real input stream is not seekable (calling _seek_
 			# or _rewind_ on it will raise an exception). But some

data/lib/passenger/abstract_server.rb

@@ -119,12 +119,12 @@ class AbstractServer
 				# on a white list of file descriptors. That proved to be way too fragile:
 				# too many file descriptors are being left open even though they shouldn't
 				# be. So now we close file descriptors based on a black list.
-				file_descriptors_to_close = [0, 1, 2, @child_socket.fileno]
-				NativeSupport.close_all_file_descriptors(file_descriptors_to_close)
+				file_descriptors_to_leave_open = [0, 1, 2, @child_socket.fileno]
+				NativeSupport.close_all_file_descriptors(file_descriptors_to_leave_open)
 				# In addition to closing the file descriptors, one must also close
 				# the associated IO objects. This is to prevent IO.close from
 				# double-closing already closed file descriptors.
-				close_all_io_objects_for_fds(Set.new(file_descriptors_to_close))
+				close_all_io_objects_for_fds(file_descriptors_to_leave_open)
 				
 				# At this point, RubyGems might have open file handles for which
 				# the associated file descriptors have just been closed. This can

data/lib/passenger/application.rb

@@ -55,7 +55,8 @@ class Application
 			return nil
 		end
 		
-		found_version = Gem.cache.search('rails', gem_version_spec).map do |x|
+		search_results = Gem.cache.search(Gem::Dependency.new('rails', gem_version_spec), true)
+		found_version = search_results.map do |x|
 			x.version.version
 		end.sort.last
 		if found_version.nil?
@@ -63,7 +64,8 @@ class Application
 			# date because the Rails version may have been installed now.
 			# So we reload the RubyGems cache and try again.
 			Gem.clear_paths
-			found_version = Gem.cache.search('rails', gem_version_spec).map do |x|
+			search_results = Gem.cache.search(Gem::Dependency.new('rails', gem_version_spec), true)
+			found_version = search_results.map do |x|
 				x.version.version
 			end.sort.last
 		end

data/lib/passenger/dependencies.rb

@@ -216,7 +216,7 @@ module Dependencies # :nodoc: all
 			end
 		elsif RUBY_PLATFORM =~ /freebsd/
 			dep.install_command = "make -C /usr/ports/www/apache22 install"
-			dep.provides = [Apache2_DevHeaders, APR_DevHeaders]
+			dep.provides = [Apache2_DevHeaders, APR_DevHeaders, APU_DevHeaders]
 		end
 		dep.website = "http://httpd.apache.org/"
 	end
@@ -270,6 +270,15 @@ module Dependencies # :nodoc: all
 		dep.website = "http://httpd.apache.org/"
 		dep.website_comments = "APR is an integrated part of Apache."
 	end
+
+	APU_DevHeaders = Dependency.new do |dep|
+		dep.name = "Apache Portable Runtime Utility (APR) development headers"
+		dep.define_checker do |result|
+			result.found(APU_CONFIG)
+		end
+		dep.website = "http://httpd.apache.org/"
+		dep.website_comments = "APR Utility is an integrated part of Apache."
+	end
 	
 	FastThread = Dependency.new do |dep|
 		dep.name = "fastthread"

data/lib/passenger/platform_info.rb

@@ -157,6 +157,42 @@ private
 			return [flags, libs]
 		end
 	end
+
+	def self.find_apu_config
+		if env_defined?('APU_CONFIG')
+			apu_config = ENV['APU_CONFIG']
+		elsif RUBY_PLATFORM =~ /darwin/ && HTTPD == "/usr/sbin/httpd"
+			# If we're on MacOS X, and we're compiling against the
+			# default provided Apache, then we'll want to query the
+			# correct 'apu-1-config' command. However, that command
+			# is not in $PATH by default. Instead, it lives in
+			# /Developer/SDKs/MacOSX*sdk/usr/bin.
+			sdk_dir = Dir["/Developer/SDKs/MacOSX*sdk"].sort.last
+			if sdk_dir
+				apu_config = "#{sdk_dir}/usr/bin/apu-1-config"
+				if !File.executable?(apu_config)
+					apu_config = nil
+				end
+			end
+		else
+			apu_config = find_command('apu-1-config')
+			if apu_config.nil?
+				apu_config = find_command('apu-config')
+			end
+		end
+		return apu_config
+	end
+	
+	def self.determine_apu_info
+		if APU_CONFIG.nil?
+			return nil
+		else
+			flags = `#{APU_CONFIG} --includes`.strip
+			libs = `#{APU_CONFIG} --link-ld`.strip
+			flags.gsub!(/-O\d? /, '')
+			return [flags, libs]
+		end
+	end
 	
 	def self.determine_multi_arch_flags
 		if RUBY_PLATFORM =~ /darwin/ && !HTTPD.nil?
@@ -248,12 +284,15 @@ public
 	HTTPD = find_httpd
 	# The absolute path to the 'apr-config' or 'apr-1-config' executable.
 	APR_CONFIG = find_apr_config
+	APU_CONFIG = find_apu_config
 	
 	# The C compiler flags that are necessary to compile an Apache module.
 	APXS2_FLAGS = determine_apxs2_flags
 	# The C compiler flags that are necessary for programs that use APR.
 	APR_FLAGS, APR_LIBS = determine_apr_info
-	
+	# The C compiler flags that are necessary for programs that use APR-Util.
+	APU_FLAGS, APU_LIBS = determine_apu_info
+
 	# The C compiler flags that are necessary for building binaries in the same architecture(s) as Apache.
 	MULTI_ARCH_FLAGS = determine_multi_arch_flags
 	# The current platform's shared library extension ('so' on most Unices).

data/lib/passenger/rack/request_handler.rb

@@ -72,8 +72,10 @@ protected
 				end
 			end
 			output.write(CRLF)
-			body.each do |s|
-				output.write(s)
+			if body
+				body.each do |s|
+					output.write(s)
+				end
 			end
 		ensure
 			body.close if body.respond_to?(:close)

data/lib/passenger/railz/application_spawner.rb

@@ -19,6 +19,7 @@
 require 'rubygems'
 require 'socket'
 require 'etc'
+require 'fcntl'
 require 'passenger/application'
 require 'passenger/abstract_server'
 require 'passenger/application'
@@ -260,7 +261,11 @@ private
 		if !defined?(Dispatcher)
 			require 'dispatcher'
 		end
-		require_dependency 'application'
+		if File.exist?('app/controllers/application_controller.rb')
+			require_dependency 'application_controller'
+		else
+			require_dependency 'application'
+		end
 		if GC.copy_on_write_friendly?
 			Dir.glob('app/{models,controllers,helpers}/*.rb').each do |file|
 				require_dependency normalize_path(file)
@@ -298,6 +303,7 @@ private
 				::ActiveRecord::Base.establish_connection
 			end
 			
+			reader.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
 			handler = RequestHandler.new(reader)
 			channel.write(Process.pid, handler.socket_name,
 				handler.using_abstract_namespace?)

data/lib/passenger/utils.rb

@@ -81,15 +81,13 @@ protected
 		groupname && Etc.getgrnam(groupname)
 	end
 	
-	def close_all_io_objects_for_fds(file_descriptors_to_close)
-		ObjectSpace.each_object do |o|
-			if o.is_a?(IO)
-				begin
-					if o.closed? && file_descriptors_to_close.include?(o.fileno)
-						o.close
-					end
-				rescue
+	def close_all_io_objects_for_fds(file_descriptors_to_leave_open)
+		ObjectSpace.each_object(IO) do |io|
+			begin
+				if !file_descriptors_to_leave_open.include?(io.fileno) && !io.closed?
+					io.close
 				end
+			rescue
 			end
 		end
 	end

data/lib/rake/gempackagetask.rb

@@ -11,12 +11,6 @@ require 'rake/packagetask'
 require 'rubygems/user_interaction'
 require 'rubygems/builder'
 
-begin
-  Gem.manage_gems
-rescue NoMethodError => ex
-  # Using rubygems prior to 0.6.1
-end
-
 module Rake
 
   # Create a package based upon a Gem spec.  Gem packages, as well as

data/lib/rake/rdoctask.rb

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
-# Passenger note: this file is copied from Rake 0.8.1. The task names
-# have been changed.
 
 require 'rake'
 require 'rake/tasklib'
@@ -12,7 +10,7 @@ module Rake
   #
   # The RDocTask will create the following targets:
   #
-  # [<b><em>rdoc</em></b>]
+  # [<b>:<em>rdoc</em></b>]
   #   Main task for this RDOC task.  
   #
   # [<b>:clobber_<em>rdoc</em></b>]
@@ -23,13 +21,18 @@ module Rake
   #   Rebuild the rdoc files from scratch, even if they are not out
   #   of date.
   #
-  # Simple Example:
+  # Simple example:
   #
   #   Rake::RDocTask.new do |rd|
   #     rd.main = "README.rdoc"
   #     rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
   #   end
   #
+  # The +rd+ object passed to the block is an RDocTask object. See the
+  # attributes list for the RDocTask class for available customization options.
+  #
+  # == Specifying different task names
+  #
   # You may wish to give the task a different name, such as if you are
   # generating two sets of documentation.  For instance, if you want to have a
   # development set of documentation including private methods:
@@ -41,7 +44,17 @@ module Rake
   #   end
   #
   # The tasks would then be named :<em>rdoc_dev</em>, :clobber_<em>rdoc_dev</em>, and
-  # :re<em>rdoc_dev</em>.
+  # :re<em>rdoc_dev</em>. 
+  #
+  # If you wish to have completely different task names, then pass a Hash as
+  # first argument. With the <tt>:rdoc</tt>, <tt>:clobber_rdoc</tt> and
+  # <tt>:rerdoc</tt> options, you can customize the task names to your liking.
+  # For example:
+  #
+  #   Rake::RDocTask.new(:rdoc => "rdoc", :clobber_rdoc => "rdoc:clean", :rerdoc => "rdoc:force")
+  #
+  # This will create the tasks <tt>:rdoc</tt>, <tt>:rdoc_clean</tt> and
+  # <tt>:rdoc:force</tt>.
   #
   class RDocTask < TaskLib
     # Name of the main, top level task.  (default is :rdoc)
@@ -50,34 +63,45 @@ module Rake
     # Name of directory to receive the html output files. (default is "html")
     attr_accessor :rdoc_dir
 
-    # Title of RDoc documentation. (default is none)
+    # Title of RDoc documentation. (defaults to rdoc's default)
     attr_accessor :title
 
     # Name of file to be used as the main, top level file of the
     # RDoc. (default is none)
     attr_accessor :main
 
-    # Name of template to be used by rdoc. (default is 'html')
+    # Name of template to be used by rdoc. (defaults to rdoc's default)
     attr_accessor :template
 
     # List of files to be included in the rdoc generation. (default is [])
     attr_accessor :rdoc_files
 
-    # List of options to be passed rdoc.  (default is [])
+    # Additional list of options to be passed rdoc.  (default is [])
     attr_accessor :options
 
-    # Run the rdoc process as an external shell (default is false)
+    # Whether to run the rdoc process as an external shell (default is false)
     attr_accessor :external
-
-    # Create an RDoc task named <em>rdoc</em>.  Default task name is +rdoc+.
-    def initialize(name=:rdoc)  # :yield: self
+    
+    attr_accessor :inline_source
+
+    # Create an RDoc task with the given name. See the RDocTask class overview
+    # for documentation.
+    def initialize(name = :rdoc)  # :yield: self
+      if name.is_a?(Hash)
+        invalid_options = name.keys.map { |k| k.to_sym } - [:rdoc, :clobber_rdoc, :rerdoc]
+        if !invalid_options.empty?
+          raise ArgumentError, "Invalid option(s) passed to RDocTask.new: #{invalid_options.join(", ")}"
+        end
+      end
+      
       @name = name
       @rdoc_files = Rake::FileList.new
       @rdoc_dir = 'html'
       @main = nil
       @title = nil
-      @template = 'html'
+      @template = nil
       @external = false
+      @inline_source = true
       @options = []
       yield self if block_given?
       define
@@ -85,26 +109,28 @@ module Rake
     
     # Create the tasks defined by this task lib.
     def define
-      if name.to_s != "rdoc"
+      if rdoc_task_name != "rdoc"
         desc "Build the RDOC HTML Files"
+      else
+        desc "Build the #{rdoc_task_name} HTML Files"
       end
-
-      desc "Build the #{name} HTML Files"
-      task name
+      task rdoc_task_name
       
       desc "Force a rebuild of the RDOC files"
-      task paste(name, ":force") => [paste(name, ":clobber"), name]
+      task rerdoc_task_name => [clobber_task_name, rdoc_task_name]
       
       desc "Remove rdoc products" 
-      task paste(name, ":clobber") do
+      task clobber_task_name do
         rm_r rdoc_dir rescue nil
       end
-      task :clobber => [paste(name, ":clobber")]
+      
+      task :clobber => [clobber_task_name]
       
       directory @rdoc_dir
-      task name => [rdoc_target]
-      file rdoc_target => @rdoc_files + [$rakefile] do
+      task rdoc_task_name => [rdoc_target]
+      file rdoc_target => @rdoc_files + [Rake.application.rakefile] do
         rm_r @rdoc_dir rescue nil
+        @before_running_rdoc.call if @before_running_rdoc
         args = option_list + @rdoc_files
         if @external
           argstring = args.join(' ')
@@ -123,6 +149,7 @@ module Rake
       result << "--main" << quote(main) if main
       result << "--title" << quote(title) if title
       result << "-T" << quote(template) if template
+      result << "--inline-source" if inline_source && !@options.include?("--inline-source") && !@options.include?("-S")
       result
     end
 
@@ -137,12 +164,46 @@ module Rake
     def option_string
       option_list.join(' ')
     end
+    
+    # The block passed to this method will be called just before running the
+    # RDoc generator. It is allowed to modify RDocTask attributes inside the
+    # block.
+    def before_running_rdoc(&block)
+      @before_running_rdoc = block
+    end
 
     private
-
+    
     def rdoc_target
       "#{rdoc_dir}/index.html"
     end
+    
+    def rdoc_task_name
+      case name
+      when Hash
+        (name[:rdoc] || "rdoc").to_s
+      else
+        name.to_s
+      end
+    end
+    
+    def clobber_task_name
+      case name
+      when Hash
+        (name[:clobber_rdoc] || "clobber_rdoc").to_s
+      else
+        "clobber_#{name}"
+      end
+    end
+    
+    def rerdoc_task_name
+      case name
+      when Hash
+        (name[:rerdoc] || "rerdoc").to_s
+      else
+        "re#{name}"
+      end
+    end
 
   end
 end