passenger 2.2.1 → 2.2.2

data/ext/nginx/config

@@ -20,7 +20,8 @@ NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
     ${ngx_addon_dir}/Configuration.h \
     ${ngx_addon_dir}/ContentHandler.h \
     ${ngx_addon_dir}/StaticContentHandler.h \
-    ${ngx_addon_dir}/ngx_http_passenger_module.h"
+    ${ngx_addon_dir}/ngx_http_passenger_module.h \
+    ${ngx_addon_dir}/../common/Version.h"
 CORE_LIBS="$CORE_LIBS  \
     ${ngx_addon_dir}/libpassenger_common.a \
     ${ngx_addon_dir}/libboost_oxt.a \

data/ext/nginx/ngx_http_passenger_module.c

@@ -49,8 +49,9 @@
 #define HELPER_SERVER_PASSWORD_SIZE     64
 
 
+static int        first_start = 1;
 static ngx_str_t  ngx_http_scgi_script_name = ngx_string("scgi_script_name");
-static pid_t      helper_server_pid;
+static pid_t      helper_server_pid = 0;
 static int        helper_server_admin_pipe;
 static u_char     helper_server_password_data[HELPER_SERVER_PASSWORD_SIZE];
 const char        passenger_temp_dir[NGX_MAX_PATH];
@@ -59,6 +60,8 @@ ngx_str_t         passenger_helper_server_password;
 const char        passenger_helper_server_socket[NGX_MAX_PATH];
 CachedMultiFileStat *passenger_stat_cache;
 
+static void shutdown_helper_server(ngx_cycle_t *cycle);
+
 
 /*
     HISTORIC NOTE:
@@ -121,14 +124,21 @@ start_helper_server(ngx_cycle_t *cycle)
     char                   buf;
     FILE                  *f;
     
-    ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+    if (helper_server_pid != 0) {
+        shutdown_helper_server(cycle);
+    }
     
-    /* Ignore SIGPIPE now so that, if the helper server fails to start,
-     * nginx doesn't get killed by the default SIGPIPE handler upon
-     * writing the password to the helper server.
-     */
-    ignore_sigpipe();
+    ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
     
+    if (first_start) {
+        first_start = 0;
+        
+        /* Ignore SIGPIPE now so that, if the helper server fails to start,
+         * nginx doesn't get killed by the default SIGPIPE handler upon
+         * writing the password to the helper server.
+         */
+        ignore_sigpipe();
+    }
     
     /* Build strings that we need later. */
     
@@ -231,12 +241,6 @@ start_helper_server(ngx_cycle_t *cycle)
             close(i);
         }
         
-        /* It seems that Nginx's Perl module unsets the
-         * PASSENGER_INSTANCE_TEMP_DIR environment variable, so here
-         * we set it again.
-         */
-        setenv("PASSENGER_INSTANCE_TEMP_DIR", passenger_temp_dir, 1);
-        
         execlp((const char *) helper_server_filename,
                "PassengerNginxHelperServer",
                main_conf->root_dir.data,
@@ -251,6 +255,7 @@ start_helper_server(ngx_cycle_t *cycle)
                main_conf->default_user.data,
                worker_uid_string,
                worker_gid_string,
+               passenger_temp_dir,
                NULL);
         e = errno;
         fprintf(stderr, "*** Could not start the Passenger helper server (%s): "
@@ -407,7 +412,7 @@ shutdown_helper_server(ngx_cycle_t *cycle)
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cycle->log, 0,
                        "Passenger helper server did not exit in time. "
                        "Killing it...");
-        kill(helper_server_pid, SIGTERM);
+        kill(helper_server_pid, SIGKILL);
         waitpid(helper_server_pid, NULL, 0);
     }
     
@@ -437,6 +442,8 @@ shutdown_helper_server(ngx_cycle_t *cycle)
                           passenger_temp_dir);
         }
     }
+    
+    helper_server_pid = 0;
 }
 
 static ngx_int_t
@@ -531,7 +538,6 @@ pre_config_init(ngx_conf_t *cf)
                       "could not create Passenger temp dir string");
         return NGX_ERROR;
     }
-    setenv("PASSENGER_INSTANCE_TEMP_DIR", passenger_temp_dir, 1);
     
     /* Temporarily create this temp directory. It must exist before the configuration is loaded,
      * because during Configuration loading Nginx's upstream module will attempt to create

data/ext/oxt/backtrace.cpp

@@ -45,9 +45,11 @@ static initialize_backtrace_support_for_this_thread main_thread_initialization("
  * than 4.1.2 have bugs (http://gcc.gnu.org/ml/gcc-bugs/2006-09/msg02275.html).
  */
 
-#define GCC_VERSION (__GNUC__ * 10000 \
+#ifndef OXT_GCC_VERSION
+	#define OXT_GCC_VERSION (__GNUC__ * 10000 \
                                + __GNUC_MINOR__ * 100 \
                                + __GNUC_PATCHLEVEL__)
+#endif
 
 /*
  * FreeBSD 5 supports the __thread keyword, and everything works fine in
@@ -62,7 +64,7 @@ static initialize_backtrace_support_for_this_thread main_thread_initialization("
  *
  * MacOS X doesn't support __thread at all.
  */
-#if GCC_VERSION >= 40102 && !defined(__FreeBSD__) && \
+#if OXT_GCC_VERSION >= 40102 && !defined(__FreeBSD__) && \
    !defined(__SOLARIS__) && !defined(__OpenBSD__) && !defined(__APPLE__)
 	static __thread spin_lock *backtrace_lock = NULL;
 	static __thread vector<trace_point *> *current_backtrace = NULL;

data/ext/oxt/spin_lock.hpp

@@ -34,13 +34,13 @@
 	#define OXT_NO_PTHREAD_SPINLOCKS
 #endif
 
-#ifndef GCC_VERSION
-	#define GCC_VERSION (__GNUC__ * 10000 \
+#ifndef OXT_GCC_VERSION
+	#define OXT_GCC_VERSION (__GNUC__ * 10000 \
 	                     + __GNUC_MINOR__ * 100 \
 	                     + __GNUC_PATCH_LEVEL__)
 #endif
 
-#if (GCC_VERSION > 40100 && defined(__i386__)) || defined(IN_DOXYGEN)
+#if (OXT_GCC_VERSION > 40100 && defined(__i386__)) || defined(IN_DOXYGEN)
 	// GCC 4.0 doesn't support __sync instructions while GCC 4.2
 	// does. I'm not sure whether support for it started in 4.1 or
 	// 4.2, so the above version check may have to be changed later.

data/lib/phusion_passenger/abstract_request_handler.rb

@@ -208,6 +208,10 @@ class AbstractRequestHandler
 				ensure
 					# 'input' is the same as 'client' so we don't
 					# need to close that.
+					# The 'close_write' here prevents forked child
+					# processes from unintentionally keeping the
+					# connection open.
+					client.close_write rescue nil
 					client.close rescue nil
 				end
 				@processed_requests += 1
@@ -382,9 +386,7 @@ private
 			
 			# We monkeypatch the 'sync=' method to a no-op so that
 			# sync mode can't be disabled.
-			client.instance_eval do
-				def client.sync=(value)
-				end
+			def client.sync=(value)
 			end
 			
 			# The real input stream is not seekable (calling _seek_

data/lib/phusion_passenger/admin_tools/control_process.rb

@@ -63,7 +63,12 @@ class ControlProcess
 	def initialize(path)
 		@path = path
 		if File.exist?("#{path}/control_process.pid")
-			@pid = File.read("#{path}/control_process.pid").strip.to_i
+			data = File.read("#{path}/control_process.pid").strip
+			if data.empty?
+				raise ArgumentError, "'#{path}' is not a valid control process directory."
+			else
+				@pid = data.to_i
+			end
 		else
 			path =~ /passenger.(\d+)\Z/
 			@pid = $1.to_i

data/lib/phusion_passenger/constants.rb

@@ -23,8 +23,8 @@
 
 module PhusionPassenger
 	# Phusion Passenger version number.
-	# Don't forget to edit Configuration.h too.
-	VERSION_STRING = '2.2.1'
+	# Don't forget to edit ext/common/Version.h too.
+	VERSION_STRING = '2.2.2'
 	
 	DEFAULT_FRAMEWORK_SPAWNER_MAX_IDLE_TIME = 30 * 60
 	DEFAULT_APP_SPAWNER_MAX_IDLE_TIME       = 10 * 60

data/lib/phusion_passenger/rack/application_spawner.rb

@@ -21,7 +21,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../../../vendor/rack-0.9.1/lib"))
+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'

data/lib/phusion_passenger/rack/request_handler.rb

@@ -21,7 +21,12 @@
 #  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'
+
 module PhusionPassenger
 module Rack
 
@@ -29,7 +34,7 @@ module Rack
 class RequestHandler < AbstractRequestHandler
 	# Constants which exist to relieve Ruby's garbage collector.
 	RACK_VERSION       = "rack.version"        # :nodoc:
-	RACK_VERSION_VALUE = [0, 1]                # :nodoc:
+	RACK_VERSION_VALUE = [1, 0]                # :nodoc:
 	RACK_INPUT         = "rack.input"          # :nodoc:
 	RACK_ERRORS        = "rack.errors"         # :nodoc:
 	RACK_MULTITHREAD   = "rack.multithread"    # :nodoc:
@@ -38,12 +43,14 @@ class RequestHandler < AbstractRequestHandler
 	RACK_URL_SCHEME	   = "rack.url_scheme"     # :nodoc:
 	SCRIPT_NAME        = "SCRIPT_NAME"         # :nodoc:
 	PATH_INFO          = "PATH_INFO"           # :nodoc:
+	REQUEST_URI        = "REQUEST_URI"         # :nodoc:
+	QUESTION_MARK      = "?"                   # :nodoc:
 	HTTPS          = "HTTPS"  # :nodoc:
 	HTTPS_DOWNCASE = "https"  # :nodoc:
 	HTTP           = "http"   # :nodoc:
 	YES            = "yes"    # :nodoc:
 	ON             = "on"     # :nodoc:
-	ONE            = "one"    # :nodoc:
+	ONE            = "1"      # :nodoc:
 	CRLF           = "\r\n"   # :nodoc:
 
 	# +app+ is the Rack application object.
@@ -55,44 +62,47 @@ class RequestHandler < AbstractRequestHandler
 protected
 	# Overrided method.
 	def process_request(env, input, output)
-		env[RACK_VERSION]      = RACK_VERSION_VALUE
-		env[RACK_INPUT]        = input
-		env[RACK_ERRORS]       = STDERR
-		env[RACK_MULTITHREAD]  = false
-		env[RACK_MULTIPROCESS] = true
-		env[RACK_RUN_ONCE]     = false
-		env[SCRIPT_NAME]     ||= ''
-		if ENV.has_key?(PATH_INFO)
-			env[PATH_INFO].sub!(/^#{Regexp.escape(env[SCRIPT_NAME])}/, "")
-		end
-		if env[HTTPS] == YES || env[HTTPS] == ON || env[HTTPS] == ONE
-			env[RACK_URL_SCHEME] = HTTPS_DOWNCASE
-		else
-			env[RACK_URL_SCHEME] = HTTP
-		end
-		
-		status, headers, body = @app.call(env)
+		rewindable_input = ::Rack::RewindableInput.new(input)
 		begin
-			output.write("Status: #{status}#{CRLF}")
-			headers[X_POWERED_BY] = PASSENGER_HEADER
-			headers.each_pair do |key, values|
-				if values.is_a?(String)
-					values = values.split("\n")
-				end
-				values.each do |value|
-					output.write("#{key}: #{value}#{CRLF}")
-				end
+			env[RACK_VERSION]      = RACK_VERSION_VALUE
+			env[RACK_INPUT]        = rewindable_input
+			env[RACK_ERRORS]       = STDERR
+			env[RACK_MULTITHREAD]  = false
+			env[RACK_MULTIPROCESS] = true
+			env[RACK_RUN_ONCE]     = false
+			env[PATH_INFO]       ||= env[REQUEST_URI].split(QUESTION_MARK, 2).first
+			env[PATH_INFO].sub!(/^#{Regexp.escape(env[SCRIPT_NAME])}/, "")
+			if env[HTTPS] == YES || env[HTTPS] == ON || env[HTTPS] == ONE
+				env[RACK_URL_SCHEME] = HTTPS_DOWNCASE
+			else
+				env[RACK_URL_SCHEME] = HTTP
 			end
-			output.write(CRLF)
-			if body.is_a?(String)
-				output.write(body)
-			elsif body
-				body.each do |s|
-					output.write(s)
+			
+			status, headers, body = @app.call(env)
+			begin
+				output.write("Status: #{status.to_i}#{CRLF}")
+				output.write("X-Powered-By: #{PASSENGER_HEADER}#{CRLF}")
+				headers.each do |key, values|
+					if values.is_a?(String)
+						values = values.split("\n")
+					end
+					values.each do |value|
+						output.write("#{key}: #{value}#{CRLF}")
+					end
+				end
+				output.write(CRLF)
+				if body.is_a?(String)
+					output.write(body)
+				elsif body
+					body.each do |s|
+						output.write(s)
+					end
 				end
+			ensure
+				body.close if body.respond_to?(:close)
 			end
 		ensure
-			body.close if body.respond_to?(:close)
+			rewindable_input.close
 		end
 	end
 end

data/lib/phusion_passenger/templates/nginx/config_snippets.txt.erb

@@ -1,6 +1,6 @@
 <banner>Nginx with Passenger support was successfully installed.</banner>
 
-Please edit your Nginx configuration file (probably <b><%= @config_file %></b>),
+Please edit your Nginx configuration file<% if @config_file %> (probably <b><%= @config_file %></b>)<% end %>,
 and set the <b>passenger_root</b> and <b>passenger_ruby</b> configuration options in the
 <b>'http'</b> block, like this:
 

data/lib/phusion_passenger/utils.rb

@@ -337,14 +337,20 @@ protected
 		return options
 	end
 	
+	@@passenger_tmpdir = nil
+	
+	def passenger_tmpdir(create = true)
+		PhusionPassenger::Utils.passenger_tmpdir(create)
+	end
+	
 	# Returns the directory in which to store Phusion Passenger-specific
 	# temporary files. If +create+ is true, then this method creates the
 	# directory if it doesn't exist.
-	def passenger_tmpdir(create = true)
-		dir = ENV['PASSENGER_INSTANCE_TEMP_DIR']
+	def self.passenger_tmpdir(create = true)
+		dir = @@passenger_tmpdir
 		if dir.nil? || dir.empty?
 			dir = "#{Dir.tmpdir}/passenger.#{Process.pid}"
-			ENV['PASSENGER_INSTANCE_TEMP_DIR'] = dir
+			@@passenger_tmpdir = dir
 		end
 		if create && !File.exist?(dir)
 			# This is a very minimal implementation of the function
@@ -357,6 +363,10 @@ protected
 		end
 		return dir
 	end
+	
+	def self.passenger_tmpdir=(dir)
+		@@passenger_tmpdir = dir
+	end
 end
 
 end # module PhusionPassenger

data/misc/rake/cplusplus.rb

@@ -32,6 +32,13 @@ def compile_cxx(source, flags = CXXFLAGS)
 end
 
 def create_static_library(target, sources)
+	# On OS X, 'ar cru' will sometimes fail with an obscure error:
+	#
+	#   ar: foo.a is a fat file (use libtool(1) or lipo(1) and ar(1) on it)
+	#   ar: foo.a: Inappropriate file type or format
+	#
+	# So here we delete the ar file before creating it, which bypasses this problem.
+	sh "rm -rf #{target}"
 	sh "ar cru #{target} #{sources}"
 	sh "ranlib #{target}"
 end

data/test/ApplicationPoolServer_ApplicationPoolTest.cpp

@@ -1,9 +1,11 @@
 #include "tut.h"
+#include "support/Support.h"
 #include <boost/thread.hpp>
 #include "ApplicationPoolServer.h"
 
 using namespace Passenger;
 using namespace boost;
+using namespace Test;
 
 namespace tut {
 	struct ApplicationPoolServer_ApplicationPoolTest {

data/test/ApplicationPoolTest.cpp

@@ -12,20 +12,7 @@
  * This file is used as a template to test the different ApplicationPool implementations.
  * It is #included in StandardApplicationPoolTest.cpp and ApplicationServer_ApplicationPoolTest.cpp
  */
-#ifdef USE_TEMPLATE
-
-	struct TempFile {
-		const char *filename;
-		
-		TempFile(const char *filename) {
-			this->filename = filename;
-		}
-		
-		~TempFile() {
-			unlink(filename);
-		}
-	};
-	
+#ifdef USE_TEMPLATE	
 	static string createRequestHeaders(const char *uri = "/foo/new") {
 		string headers;
 		#define ADD_HEADER(name, value) \
@@ -325,29 +312,25 @@
 	
 	TEST_METHOD(15) {
 		// Test whether restarting really results in code reload.
-		system("cp -f stub/railsapp/app/controllers/bar_controller_1.rb "
+		DeleteFileEventually f1("stub/railsapp/app/controllers/bar_controller.rb");
+		DeleteFileEventually f2("stub/railsapp/tmp/restart.txt");
+		
+		system("cp -f stub/railsapp/app/controllers/bar_controller_1.txt "
 			"stub/railsapp/app/controllers/bar_controller.rb");
 		Application::SessionPtr session = pool->get("stub/railsapp");
 		session->sendHeaders(createRequestHeaders("/bar"));
 		string result = readAll(session->getStream());
 		ensure(result.find("bar 1!") != string::npos);
 		session.reset();
-
-		system("cp -f stub/railsapp/app/controllers/bar_controller_2.rb "
+		
+		system("cp -f stub/railsapp/app/controllers/bar_controller_2.txt "
 			"stub/railsapp/app/controllers/bar_controller.rb");
 		system("touch stub/railsapp/tmp/restart.txt");
-		try {
-			session = pool->get("stub/railsapp");
-			session->sendHeaders(createRequestHeaders("/bar"));
-			result = readAll(session->getStream());
-			ensure("App code has been reloaded", result.find("bar 2!") != string::npos);
-		} catch (...) {
-			unlink("stub/railsapp/app/controllers/bar_controller.rb");
-			unlink("touch stub/railsapp/tmp/restart.txt");
-			throw;
-		}
-		unlink("stub/railsapp/app/controllers/bar_controller.rb");
-		unlink("touch stub/railsapp/tmp/restart.txt");
+		
+		session = pool->get("stub/railsapp");
+		session->sendHeaders(createRequestHeaders("/bar"));
+		result = readAll(session->getStream());
+		ensure("App code has been reloaded", result.find("bar 2!") != string::npos);
 	}
 	
 	TEST_METHOD(16) {
@@ -509,39 +492,33 @@
 	
 	TEST_METHOD(22) {
 		// Test whether tmp/always_restart.txt really results in code reload.
-		try {
-			system("cp -f stub/railsapp/app/controllers/bar_controller_1.rb "
-				"stub/railsapp/app/controllers/bar_controller.rb");
-			Application::SessionPtr session = pool->get("stub/railsapp");
-			session->sendHeaders(createRequestHeaders("/bar"));
-			string result = readAll(session->getStream());
-			ensure(result.find("bar 1!") != string::npos);
-			session.reset();
+		DeleteFileEventually f1("stub/railsapp/app/controllers/bar_controller.rb");
+		DeleteFileEventually f2("stub/railsapp/tmp/always_restart.txt");
+		
+		system("cp -f stub/railsapp/app/controllers/bar_controller_1.txt "
+			"stub/railsapp/app/controllers/bar_controller.rb");
+		Application::SessionPtr session = pool->get("stub/railsapp");
+		session->sendHeaders(createRequestHeaders("/bar"));
+		string result = readAll(session->getStream());
+		ensure(result.find("bar 1!") != string::npos);
+		session.reset();
 
-			system("cp -f stub/railsapp/app/controllers/bar_controller_2.rb "
-				"stub/railsapp/app/controllers/bar_controller.rb");
-			system("touch stub/railsapp/tmp/always_restart.txt");
-			session = pool->get("stub/railsapp");
-			session->sendHeaders(createRequestHeaders("/bar"));
-			result = readAll(session->getStream());
-			ensure("App code has been reloaded (1)", result.find("bar 2!") != string::npos);
-			session.reset();
+		system("cp -f stub/railsapp/app/controllers/bar_controller_2.txt "
+			"stub/railsapp/app/controllers/bar_controller.rb");
+		system("touch stub/railsapp/tmp/always_restart.txt");
+		session = pool->get("stub/railsapp");
+		session->sendHeaders(createRequestHeaders("/bar"));
+		result = readAll(session->getStream());
+		ensure("App code has been reloaded (1)", result.find("bar 2!") != string::npos);
+		session.reset();
 
-			system("cp -f stub/railsapp/app/controllers/bar_controller_1.rb "
-				"stub/railsapp/app/controllers/bar_controller.rb");
-			session = pool->get("stub/railsapp");
-			session->sendHeaders(createRequestHeaders("/bar"));
-			result = readAll(session->getStream());
-			ensure("App code has been reloaded (2)", result.find("bar 1!") != string::npos);
-			session.reset();
-		
-			unlink("stub/railsapp/app/controllers/bar_controller.rb");
-			unlink("stub/railsapp/tmp/always_restart.txt");
-		} catch (...) {
-			unlink("stub/railsapp/app/controllers/bar_controller.rb");
-			unlink("stub/railsapp/tmp/always_restart.txt");
-			throw;
-		}
+		system("cp -f stub/railsapp/app/controllers/bar_controller_1.txt "
+			"stub/railsapp/app/controllers/bar_controller.rb");
+		session = pool->get("stub/railsapp");
+		session->sendHeaders(createRequestHeaders("/bar"));
+		result = readAll(session->getStream());
+		ensure("App code has been reloaded (2)", result.find("bar 1!") != string::npos);
+		session.reset();
 	}
 	
 	TEST_METHOD(23) {
@@ -592,7 +569,7 @@
 		session1.reset();
 		session2.reset();
 		
-		TempFile tempfile("stub/rack/restart.txt");
+		DeleteFileEventually f("stub/rack/restart.txt");
 		system("touch stub/rack/restart.txt");
 		
 		pool->get(options);
@@ -617,7 +594,7 @@
 		session1.reset();
 		session2.reset();
 		
-		TempFile tempfile("stub/rack/public/restart.txt");
+		DeleteFileEventually f("stub/rack/public/restart.txt");
 		system("touch stub/rack/public/restart.txt");
 		
 		pool->get(options);