passenger 2.2.7 → 2.2.8

data/ext/apache2/Hooks.cpp

@@ -175,8 +175,10 @@ private:
 			env_arr = apr_table_elts(r->subprocess_env);
 			env_entries = (apr_table_entry_t *) env_arr->elts;
 			for (int i = 0; i < env_arr->nelts; ++i) {
-				result->push_back(env_entries[i].key);
-				result->push_back(env_entries[i].val);
+				if (env_entries[i].key != NULL && env_entries[i].val != NULL) {
+					result->push_back(env_entries[i].key);
+					result->push_back(env_entries[i].val);
+				}
 			}
 			return result;
 		}

data/ext/common/StandardApplicationPool.h

@@ -34,6 +34,7 @@
 
 #include <oxt/system_calls.hpp>
 #include <oxt/backtrace.hpp>
+#include <oxt/thread.hpp>
 
 #include <string>
 #include <sstream>
@@ -242,7 +243,7 @@ private:
 		SpawnManager spawnManager;
 	#endif
 	SharedDataPtr data;
-	boost::thread *cleanerThread;
+	oxt::thread *cleanerThread;
 	bool detached;
 	bool done;
 	unsigned int maxIdleTime;
@@ -632,8 +633,9 @@ public:
 		waitingOnGlobalQueue = 0;
 		maxPerApp = DEFAULT_MAX_INSTANCES_PER_APP;
 		maxIdleTime = DEFAULT_MAX_IDLE_TIME;
-		cleanerThread = new boost::thread(
+		cleanerThread = new oxt::thread(
 			bind(&StandardApplicationPool::cleanerThreadMainLoop, this),
+			"ApplicationPool cleaner",
 			CLEANER_THREAD_STACK_SIZE
 		);
 	}

data/ext/common/Version.h

@@ -26,6 +26,6 @@
 #define _PASSENGER_VERSION_H_
 
 /* Don't forget to update lib/phusion_passenger/constants.rb too. */
-#define PASSENGER_VERSION "2.2.7"
+#define PASSENGER_VERSION "2.2.8"
 
 #endif /* _PASSENGER_VERSION_H */

data/ext/nginx/Configuration.c

@@ -194,7 +194,7 @@ passenger_create_loc_conf(ngx_conf_t *cf)
     DEFINE_VAR_TO_PASS("SCGI",            "1");
     DEFINE_VAR_TO_PASS("QUERY_STRING",    "$query_string");
     DEFINE_VAR_TO_PASS("REQUEST_METHOD",  "$request_method");
-    DEFINE_VAR_TO_PASS("REQUEST_URI",     "$request_uri");
+    DEFINE_VAR_TO_PASS("REQUEST_URI",     "$uri$is_args$args");
     DEFINE_VAR_TO_PASS("SERVER_PROTOCOL", "$server_protocol");
     DEFINE_VAR_TO_PASS("SERVER_SOFTWARE", "nginx/$nginx_version");
     DEFINE_VAR_TO_PASS("REMOTE_ADDR",     "$remote_addr");

data/ext/oxt/system_calls.cpp

@@ -42,8 +42,19 @@ interruption_signal_handler(int sig) {
 void
 oxt::setup_syscall_interruption_support() {
 	struct sigaction action;
+	sigset_t signal_set;
 	int ret;
 	
+	/* Very important! The signal mask is inherited across fork()
+	 * and exec() and we don't know what the parent process did to
+	 * us. At least on OS X, having a signal mask blocking important
+	 * signals can lead to stuff like waitpid() malfunction.
+	 */
+	sigemptyset(&signal_set);
+	do {
+		ret = sigprocmask(SIG_SETMASK, &signal_set, NULL);
+	} while (ret == -1 && errno == EINTR);
+	
 	action.sa_handler = interruption_signal_handler;
 	action.sa_flags   = 0;
 	sigemptyset(&action.sa_mask);

data/ext/oxt/system_calls.hpp

@@ -102,7 +102,8 @@ namespace oxt {
 	 * Setup system call interruption support.
 	 * This function may only be called once. It installs a signal handler
 	 * for INTERRUPTION_SIGNAL, so one should not install a different signal
-	 * handler for that signal after calling this function.
+	 * handler for that signal after calling this function. It also resets
+	 * the process signal mask.
 	 *
 	 * @warning
 	 * After oxt::setup_syscall_interruption_support() is called, sending a signal

data/ext/oxt/thread.hpp

@@ -34,6 +34,9 @@
 #ifdef OXT_BACKTRACE_IS_ENABLED
 	#include <sstream>
 #endif
+#include <string>
+#include <list>
+#include <unistd.h>
 #include <limits.h>  // for PTHREAD_STACK_MIN
 
 namespace oxt {
@@ -132,17 +135,45 @@ public:
 		set_thread_main_function(boost::bind(thread_main, func, data));
 		
 		unsigned long min_stack_size;
+		bool stack_min_size_defined;
+		bool round_stack_size;
+		
 		#ifdef PTHREAD_STACK_MIN
 			// PTHREAD_STACK_MIN may not be a constant macro so we need
 			// to evaluate it dynamically.
 			min_stack_size = PTHREAD_STACK_MIN;
+			stack_min_size_defined = true;
 		#else
 			// Assume minimum stack size is 128 KB.
 			min_stack_size = 128 * 1024;
+			stack_min_size_defined = false;
 		#endif
-		if (stack_size < min_stack_size) {
+		if (stack_size != 0 && stack_size < min_stack_size) {
 			stack_size = min_stack_size;
+			round_stack_size = !stack_min_size_defined;
+		} else {
+			round_stack_size = true;
+		}
+		
+		if (round_stack_size) {
+			// Round stack size up to page boundary.
+			long page_size;
+			#if defined(_SC_PAGESIZE)
+				page_size = sysconf(_SC_PAGESIZE);
+			#elif defined(_SC_PAGE_SIZE)
+				page_size = sysconf(_SC_PAGE_SIZE);
+			#elif defined(PAGESIZE)
+				page_size = sysconf(PAGESIZE);
+			#elif defined(PAGE_SIZE)
+				page_size = sysconf(PAGE_SIZE);
+			#else
+				page_size = getpagesize();
+			#endif
+			if (stack_size % page_size != 0) {
+				stack_size = stack_size - (stack_size % page_size) + page_size;
+			}
 		}
+		
 		start_thread(stack_size);
 	}
 	
@@ -231,6 +262,71 @@ public:
 			done = timed_join(boost::posix_time::millisec(10));
 		}
 	}
+	
+	/**
+	 * Keep interrupting the thread until it's done, then join it.
+	 * This method will keep trying for at most <em>timeout</em> milliseconds.
+	 *
+	 * @param timeout The maximum number of milliseconds that this method
+	 *                should keep trying.
+	 * @return True if the thread was successfully joined, false if the
+	 *         timeout has been reached.
+	 * @throws boost::thread_interrupted The calling thread has been
+	 *    interrupted before we could join this thread.
+	 */
+	bool interrupt_and_join(unsigned int timeout) {
+		bool joined = false, timed_out = false;
+		boost::posix_time::ptime deadline =
+			boost::posix_time::microsec_clock::local_time() +
+			boost::posix_time::millisec(timeout);
+		while (!joined && !timed_out) {
+			interrupt();
+			joined = timed_join(boost::posix_time::millisec(10));
+			timed_out = !joined && boost::posix_time::microsec_clock::local_time() > deadline;
+		}
+		return joined;
+	}
+	
+	/**
+	 * Interrupt and join multiple threads in a way that's more efficient than calling
+	 * interrupt_and_join() on each thread individually. It iterates over all threads,
+	 * interrupts each one without joining it, then waits until at least one thread
+	 * is joinable. This is repeated until all threads are joined.
+	 *
+	 * @param threads An array of threads to join.
+	 * @param size The number of elements in <em>threads</em>.
+	 * @throws boost::thread_interrupted The calling thread has been
+	 *    interrupted before all threads have been joined. Some threads
+	 *    may have been successfully joined while others haven't.
+	 */
+	static void interrupt_and_join_multiple(oxt::thread **threads, unsigned int size) {
+		std::list<oxt::thread *> remaining_threads;
+		std::list<oxt::thread *>::iterator it, current;
+		oxt::thread *thread;
+		unsigned int i;
+		
+		for (i = 0; i < size; i++) {
+			remaining_threads.push_back(threads[i]);
+		}
+		
+		while (!remaining_threads.empty()) {
+			for (it = remaining_threads.begin(); it != remaining_threads.end(); it++) {
+				thread = *it;
+				thread->interrupt();
+			}
+			for (it = remaining_threads.begin(); it != remaining_threads.end(); it++) {
+				thread = *it;
+				if (thread->timed_join(boost::posix_time::millisec(0))) {
+					current = it;
+					it--;
+					remaining_threads.erase(current);
+				}
+			}
+			if (!remaining_threads.empty()) {
+				syscalls::usleep(10000);
+			}
+		}
+	}
 };
 
 } // namespace oxt

data/lib/phusion_passenger/constants.rb

@@ -24,7 +24,7 @@
 module PhusionPassenger
 	# Phusion Passenger version number.
 	# Don't forget to edit ext/common/Version.h too.
-	VERSION_STRING = '2.2.7'
+	VERSION_STRING = '2.2.8'
 	
 	DEFAULT_FRAMEWORK_SPAWNER_MAX_IDLE_TIME = 30 * 60
 	DEFAULT_APP_SPAWNER_MAX_IDLE_TIME       = 10 * 60

data/lib/phusion_passenger/dependencies.rb

@@ -357,6 +357,38 @@ module Dependencies # :nodoc: all
 		dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo::GEM || "gem"} install rack</b>"
 	end
 	
+	OpenSSL_Dev = Dependency.new do |dep|
+		dep.name = "OpenSSL development headers"
+		dep.define_checker do |result|
+			source_file = '/tmp/passenger-openssl-check.c'
+			object_file = '/tmp/passenger-openssl-check.o'
+			begin
+				File.open(source_file, 'w') do |f|
+					f.write("#include <openssl/ssl.h>")
+				end
+				Dir.chdir(File.dirname(source_file)) do
+					if system("(gcc #{ENV['CFLAGS']} -c '#{source_file}') >/dev/null 2>/dev/null")
+						result.found
+					else
+						result.not_found
+					end
+				end
+			ensure
+				File.unlink(source_file) rescue nil
+				File.unlink(object_file) rescue nil
+			end
+		end
+		if RUBY_PLATFORM =~ /linux/
+			tags = PlatformInfo.linux_distro_tags
+			if tags.include?(:debian)
+				dep.install_command = "apt-get install libssl-dev"
+			elsif tags.include?(:redhat)
+				dep.install_command = "yum install openssl-devel"
+			end
+		end
+		dep.website = "http://www.openssl.org/"
+	end
+	
 	Zlib_Dev = Dependency.new do |dep|
 		dep.name = "Zlib development headers"
 		dep.define_checker do |result|

data/lib/phusion_passenger/platform_info.rb

@@ -346,7 +346,7 @@ public
 			flags << '-DBOOST_HAS_STDINT_H -D_GLIBCPP__PTHREADS'
 		elsif RUBY_PLATFORM =~ /aix/
 			flags << '-DOXT_DISABLE_BACKTRACES'
-		elsif RUBY_PLATFORM =~ /(sparc-linux|arm-linux)/
+		elsif RUBY_PLATFORM =~ /(sparc-linux|arm-linux|sh4-linux)/
 			# http://code.google.com/p/phusion-passenger/issues/detail?id=200
 			# http://groups.google.com/group/phusion-passenger/t/6b904a962ee28e5c
 			flags << '-DBOOST_SP_USE_PTHREADS'

data/lib/phusion_passenger/rack/application_spawner.rb

@@ -21,10 +21,6 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-rack_dir = File.expand_path(File.dirname(__FILE__) + "/../../../vendor/rack-1.0.0-git/lib")
-$LOAD_PATH.unshift(rack_dir) if !$LOAD_PATH.include?(rack_dir)
-require 'rack'
-
 require 'socket'
 require 'phusion_passenger/application'
 require 'phusion_passenger/events'
@@ -137,6 +133,10 @@ private
 	end
 
 	def load_rack_app
+		# Load Rack inside the spawned child process so that the spawn manager
+		# itself doesn't preload Rack. This is necessary because some broken
+		# Rails apps explicitly specify a Rack version as dependency.
+		require 'rack'
 		rackup_code = ::File.read("config.ru")
 		eval("Rack::Builder.new {( #{rackup_code}\n )}.to_app", TOPLEVEL_BINDING, "config.ru")
 	end

data/lib/phusion_passenger/rack/request_handler.rb

@@ -22,11 +22,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-rack_dir = File.expand_path(File.dirname(__FILE__) + "/../../../vendor/rack-1.0.0-git/lib")
-$LOAD_PATH.unshift(rack_dir) if !$LOAD_PATH.include?(rack_dir)
-require 'rack/rewindable_input'
-
 require 'phusion_passenger/abstract_request_handler'
+require 'phusion_passenger/utils/rewindable_input'
 
 module PhusionPassenger
 module Rack
@@ -64,7 +61,7 @@ class RequestHandler < AbstractRequestHandler
 protected
 	# Overrided method.
 	def process_request(env, input, output)
-		rewindable_input = ::Rack::RewindableInput.new(input)
+		rewindable_input = Utils::RewindableInput.new(input)
 		begin
 			env[RACK_VERSION]      = RACK_VERSION_VALUE
 			env[RACK_INPUT]        = rewindable_input

data/lib/phusion_passenger/railz/application_spawner.rb

@@ -307,10 +307,21 @@ private
 		if !defined?(Dispatcher)
 			require 'dispatcher'
 		end
+		# Rails 2.2+ uses application_controller.rb while older versions use application.rb.
 		begin
 			require_dependency 'application_controller'
-		rescue LoadError
-			require_dependency 'application'
+		rescue LoadError => e
+			begin
+				require_dependency 'application'
+			rescue LoadError
+				# Considering that most apps these das are written in Rails
+				# 2.2+, if application.rb cannot be loaded either then it
+				# probably just means that application_controller.rb threw
+				# a LoadError. So we raise the original error here; if the
+				# app is based on Rails < 2.2 then the error will make less
+				# sense but we can only choose one or the other.
+				raise e
+			end
 		end
 		
 		# - No point in preloading the application sources if the garbage collector

data/lib/phusion_passenger/utils.rb

@@ -559,7 +559,6 @@ module Signal
 			result = Signal.list
 			result.delete("ALRM")
 			result.delete("VTALRM")
-			return result
 		when "jruby"
 			result = Signal.list
 			result.delete("QUIT")
@@ -567,12 +566,21 @@ module Signal
 			result.delete("FPE")
 			result.delete("KILL")
 			result.delete("SEGV")
-			result.delete("STOP")
 			result.delete("USR1")
-			return result
 		else
-			return Signal.list
+			result = Signal.list
 		end
+		
+		# Don't touch SIGCHLD no matter what! On OS X waitpid() will
+		# malfunction if SIGCHLD doesn't have a correct handler.
+		result.delete("CLD")
+		result.delete("CHLD")
+		
+		# Other stuff that we don't want to trap no matter which
+		# Ruby engine.
+		result.delete("STOP")
+		
+		return result
 	end
 end
 

data/{vendor/rack-1.0.0-git/lib/rack → lib/phusion_passenger/utils}/rewindable_input.rb

@@ -1,6 +1,10 @@
+# Modified version of Rack::RewindableInput with Ruby 1.9 fix.
+
 require 'tempfile'
 
-module Rack
+module PhusionPassenger
+module Utils
+
   # Class which can make any IO object rewindable, including non-rewindable ones. It does
   # this by buffering the data into a tempfile, which is rewindable.
   #
@@ -74,7 +78,7 @@ module Rack
       @rewindable_io.chmod(0000)
       @rewindable_io.set_encoding(Encoding::BINARY) if @rewindable_io.respond_to?(:set_encoding)
       @rewindable_io.binmode
-      if filesystem_has_posix_semantics?
+      if filesystem_has_posix_semantics? && !tempfile_unlink_contains_bug?
         @rewindable_io.unlink
         @unlinked = true
       end
@@ -96,5 +100,17 @@ module Rack
     def filesystem_has_posix_semantics?
       RUBY_PLATFORM !~ /(mswin|mingw|cygwin|java)/
     end
+    
+    def tempfile_unlink_contains_bug?
+      # The tempfile library as included in Ruby 1.9.1-p152 and later
+      # contains a bug: unlinking an open Tempfile object also closes
+      # it, which breaks our expected POSIX semantics. This problem
+      # has been fixed in Ruby 1.9.2, but the Ruby team chose not to
+      # include the bug fix in later versions of the 1.9.1 series.
+      ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
+      ruby_engine == "ruby" && RUBY_VERSION == "1.9.1" && RUBY_PATCHLEVEL >= 152
+    end
   end
-end
+
+end # module Utils
+end # module PhusionPassenger

data/test/ApplicationPoolTest.cpp

@@ -182,7 +182,7 @@
 		Application::SessionPtr session3;
 		bool done;
 		
-		shared_ptr<thread> thr = ptr(new thread(PoolWaitTestThread(pool2, session3, done)));
+		shared_ptr<boost::thread> thr = ptr(new boost::thread(PoolWaitTestThread(pool2, session3, done)));
 		usleep(500000);
 		ensure("ApplicationPool is still waiting", !done);
 		ensure_equals(pool->getActive(), 2u);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  version: 2.2.7
+  version: 2.2.8
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-18 00:00:00 +01:00
+date: 2009-12-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Passenger is an Apache module for Ruby on Rails support.
 email: info@phusion.nl
 executables: 
@@ -78,6 +88,7 @@ files:
 - lib/phusion_passenger/railz/request_handler.rb
 - lib/phusion_passenger/simple_benchmarking.rb
 - lib/phusion_passenger/spawn_manager.rb
+- lib/phusion_passenger/utils/rewindable_input.rb
 - lib/phusion_passenger/utils.rb
 - lib/phusion_passenger/wsgi/application_spawner.rb
 - lib/phusion_passenger/wsgi/request_handler.py
@@ -1092,63 +1103,6 @@ files:
 - misc/rake/gempackagetask.rb
 - misc/rake/packagetask.rb
 - misc/rake/rdoctask.rb
-- vendor/rack-1.0.0-git/COPYING
-- vendor/rack-1.0.0-git/KNOWN-ISSUES
-- vendor/rack-1.0.0-git/lib/rack/adapter/camping.rb
-- vendor/rack-1.0.0-git/lib/rack/auth/abstract/handler.rb
-- vendor/rack-1.0.0-git/lib/rack/auth/abstract/request.rb
-- vendor/rack-1.0.0-git/lib/rack/auth/basic.rb
-- vendor/rack-1.0.0-git/lib/rack/auth/digest/md5.rb
-- vendor/rack-1.0.0-git/lib/rack/auth/digest/nonce.rb
-- vendor/rack-1.0.0-git/lib/rack/auth/digest/params.rb
-- vendor/rack-1.0.0-git/lib/rack/auth/digest/request.rb
-- vendor/rack-1.0.0-git/lib/rack/auth/openid.rb
-- vendor/rack-1.0.0-git/lib/rack/builder.rb
-- vendor/rack-1.0.0-git/lib/rack/cascade.rb
-- vendor/rack-1.0.0-git/lib/rack/chunked.rb
-- vendor/rack-1.0.0-git/lib/rack/commonlogger.rb
-- vendor/rack-1.0.0-git/lib/rack/conditionalget.rb
-- vendor/rack-1.0.0-git/lib/rack/content_length.rb
-- vendor/rack-1.0.0-git/lib/rack/content_type.rb
-- vendor/rack-1.0.0-git/lib/rack/deflater.rb
-- vendor/rack-1.0.0-git/lib/rack/directory.rb
-- vendor/rack-1.0.0-git/lib/rack/file.rb
-- vendor/rack-1.0.0-git/lib/rack/handler/cgi.rb
-- vendor/rack-1.0.0-git/lib/rack/handler/evented_mongrel.rb
-- vendor/rack-1.0.0-git/lib/rack/handler/fastcgi.rb
-- vendor/rack-1.0.0-git/lib/rack/handler/lsws.rb
-- vendor/rack-1.0.0-git/lib/rack/handler/mongrel.rb
-- vendor/rack-1.0.0-git/lib/rack/handler/scgi.rb
-- vendor/rack-1.0.0-git/lib/rack/handler/swiftiplied_mongrel.rb
-- vendor/rack-1.0.0-git/lib/rack/handler/thin.rb
-- vendor/rack-1.0.0-git/lib/rack/handler/webrick.rb
-- vendor/rack-1.0.0-git/lib/rack/handler.rb
-- vendor/rack-1.0.0-git/lib/rack/head.rb
-- vendor/rack-1.0.0-git/lib/rack/lint.rb
-- vendor/rack-1.0.0-git/lib/rack/lobster.rb
-- vendor/rack-1.0.0-git/lib/rack/lock.rb
-- vendor/rack-1.0.0-git/lib/rack/methodoverride.rb
-- vendor/rack-1.0.0-git/lib/rack/mime.rb
-- vendor/rack-1.0.0-git/lib/rack/mock.rb
-- vendor/rack-1.0.0-git/lib/rack/recursive.rb
-- vendor/rack-1.0.0-git/lib/rack/reloader.rb
-- vendor/rack-1.0.0-git/lib/rack/request.rb
-- vendor/rack-1.0.0-git/lib/rack/response.rb
-- vendor/rack-1.0.0-git/lib/rack/rewindable_input.rb
-- vendor/rack-1.0.0-git/lib/rack/session/abstract/id.rb
-- vendor/rack-1.0.0-git/lib/rack/session/cookie.rb
-- vendor/rack-1.0.0-git/lib/rack/session/memcache.rb
-- vendor/rack-1.0.0-git/lib/rack/session/pool.rb
-- vendor/rack-1.0.0-git/lib/rack/showexceptions.rb
-- vendor/rack-1.0.0-git/lib/rack/showstatus.rb
-- vendor/rack-1.0.0-git/lib/rack/static.rb
-- vendor/rack-1.0.0-git/lib/rack/urlmap.rb
-- vendor/rack-1.0.0-git/lib/rack/utils.rb
-- vendor/rack-1.0.0-git/lib/rack.rb
-- vendor/rack-1.0.0-git/Rakefile
-- vendor/rack-1.0.0-git/README
-- vendor/README
-- vendor/README_FOR_PACKAGERS
 - test/ApplicationPoolServer_ApplicationPoolTest.cpp
 - test/ApplicationPoolServerTest.cpp
 - test/ApplicationPoolTest.cpp