passenger 2.2.5 → 2.2.6

data/ext/apache2/DirectoryMapper.h

@@ -170,20 +170,20 @@ public:
 		}
 		
 		UPDATE_TRACE_POINT();
-		if (shouldAutoDetectRails()
-		 && verifyRailsDir(config->getAppRoot(ap_document_root(r)), cstat, throttleRate)) {
+		if (shouldAutoDetectRack()
+		 && verifyRackDir(config->getAppRoot(ap_document_root(r)), cstat, throttleRate)) {
 			baseURIKnown = true;
 			baseURI = "/";
-			appType = RAILS;
+			appType = RACK;
 			return baseURI;
 		}
 		
 		UPDATE_TRACE_POINT();
-		if (shouldAutoDetectRack()
-		 && verifyRackDir(config->getAppRoot(ap_document_root(r)), cstat, throttleRate)) {
+		if (shouldAutoDetectRails()
+		 && verifyRailsDir(config->getAppRoot(ap_document_root(r)), cstat, throttleRate)) {
 			baseURIKnown = true;
 			baseURI = "/";
-			appType = RACK;
+			appType = RAILS;
 			return baseURI;
 		}
 		

data/ext/common/Utils.cpp

@@ -348,6 +348,31 @@ setPassengerTempDir(const string &dir) {
 	passengerTempDir = dir;
 }
 
+/* Creates a non-writable FIFO file in order to prevent /tmp cleaners from removing
+ * passenger temp dir subdirectories. See http://code.google.com/p/phusion-passenger/issues/detail?id=365
+ * for details.
+ */
+static void
+createNonWritableFifo(const string &filename) {
+	int ret, e;
+	
+	do {
+		ret = mkfifo(filename.c_str(), 0);
+	} while (ret == -1 && errno == EINTR);
+	if (ret == -1 && errno != EEXIST) {
+		e = errno;
+		throw FileSystemException("Cannot create FIFO file " + filename, e, filename);
+	}
+	
+	do {
+		ret = chmod(filename.c_str(), 0);
+	} while (ret == -1 && errno == EINTR);
+	if (ret == -1) {
+		e = errno;
+		throw FileSystemException("Cannot set permissions on file " + filename, e, filename);
+	}
+}
+
 void
 createPassengerTempDir(const string &parentDir, bool userSwitching,
                        const string &lowestUser, uid_t workerUid, gid_t workerGid) {
@@ -364,6 +389,7 @@ createPassengerTempDir(const string &parentDir, bool userSwitching,
 	 * whether a user may access that specific subdirectory.
 	 */
 	makeDirTree(tmpDir, "u=wxs,g=x,o=x");
+	createNonWritableFifo(tmpDir + "/.guard");
 	
 	/* We want this upload buffer directory to be only accessible by the web server's
 	 * worker processs.
@@ -377,6 +403,7 @@ createPassengerTempDir(const string &parentDir, bool userSwitching,
 	} else {
 		makeDirTree(tmpDir + "/webserver_private", "u=wxs,g=,o=");
 	}
+	createNonWritableFifo(tmpDir + "/webserver_private/.guard");
 	
 	/* If the web server is running as root (i.e. user switching is possible to begin with)
 	 * but user switching is off...
@@ -393,6 +420,7 @@ createPassengerTempDir(const string &parentDir, bool userSwitching,
 		 */
 		makeDirTree(tmpDir + "/info", "u=rwxs,g=,o=");
 	}
+	createNonWritableFifo(tmpDir + "/info/.guard");
 	
 	if (geteuid() == 0) {
 		if (userSwitching) {
@@ -403,6 +431,7 @@ createPassengerTempDir(const string &parentDir, bool userSwitching,
 	} else {
 		makeDirTree(tmpDir + "/master", "u=wxs,g=,o=");
 	}
+	createNonWritableFifo(tmpDir + "/master/.guard");
 	
 	if (geteuid() == 0) {
 		if (userSwitching) {
@@ -436,6 +465,7 @@ createPassengerTempDir(const string &parentDir, bool userSwitching,
 		 */
 		makeDirTree(tmpDir + "/backends", "u=wxs,g=,o=");
 	}
+	createNonWritableFifo(tmpDir + "/backends/.guard");
 }
 
 void
@@ -579,11 +609,7 @@ createUnixServer(const char *filename, unsigned int backlogSize, bool autoDelete
 	}
 	
 	if (backlogSize == 0) {
-		#ifdef SOMAXCONN
-			backlogSize = SOMAXCONN;
-		#else
-			backlogSize = 128;
-		#endif
+		backlogSize = 1024;
 	}
 	try {
 		ret = syscalls::listen(fd, backlogSize);

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.5"
+#define PASSENGER_VERSION "2.2.6"
 
 #endif /* _PASSENGER_VERSION_H */

data/ext/nginx/Configuration.c

@@ -153,8 +153,8 @@ passenger_create_loc_conf(ngx_conf_t *cf)
     conf->spawn_method.data = NULL;
     conf->spawn_method.len = 0;
     conf->base_uris = NGX_CONF_UNSET_PTR;
-    conf->framework_spawner_idle_time = -1;
-    conf->app_spawner_idle_time = -1;
+    conf->framework_spawner_idle_time = NGX_CONF_UNSET;
+    conf->app_spawner_idle_time = NGX_CONF_UNSET;
 
     conf->upstream.store = NGX_CONF_UNSET;
     conf->upstream.store_access = NGX_CONF_UNSET_UINT;
@@ -232,12 +232,8 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->use_global_queue, prev->use_global_queue, 0);
     ngx_conf_merge_str_value(conf->environment, prev->environment, "production");
     ngx_conf_merge_str_value(conf->spawn_method, prev->spawn_method, "smart-lv2");
-    if (conf->framework_spawner_idle_time == -1 && prev->framework_spawner_idle_time != -1) {
-        conf->framework_spawner_idle_time = prev->framework_spawner_idle_time;
-    }
-    if (conf->app_spawner_idle_time == -1 && prev->app_spawner_idle_time != -1) {
-        conf->app_spawner_idle_time = prev->app_spawner_idle_time;
-    }
+    ngx_conf_merge_value(conf->framework_spawner_idle_time, prev->framework_spawner_idle_time, (ngx_int_t) -1);
+    ngx_conf_merge_value(conf->app_spawner_idle_time, prev->app_spawner_idle_time, (ngx_int_t) -1);
     
     if (prev->base_uris != NGX_CONF_UNSET_PTR) {
         if (conf->base_uris == NGX_CONF_UNSET_PTR) {

data/ext/nginx/Configuration.h

@@ -43,8 +43,8 @@ typedef struct {
     ngx_flag_t   use_global_queue;
     ngx_str_t    environment;
     ngx_str_t    spawn_method;
-    int          framework_spawner_idle_time;
-    int          app_spawner_idle_time;
+    ngx_int_t    framework_spawner_idle_time;
+    ngx_int_t    app_spawner_idle_time;
     ngx_array_t *base_uris;
 } passenger_loc_conf_t;
 

data/ext/nginx/ContentHandler.c

@@ -91,18 +91,18 @@ detect_application_type(const ngx_str_t *public_dir) {
     
     ngx_memzero(filename, sizeof(filename));
     ngx_snprintf(filename, sizeof(filename), "%s/%s",
-                 public_dir->data, "../config/environment.rb");
+                 public_dir->data, "../config.ru");
     if (file_exists(filename, 1)) {
-        return AP_RAILS;
+        return AP_RACK;
     }
     
     ngx_memzero(filename, sizeof(filename));
     ngx_snprintf(filename, sizeof(filename), "%s/%s",
-                 public_dir->data, "../config.ru");
+                 public_dir->data, "../config/environment.rb");
     if (file_exists(filename, 1)) {
-        return AP_RACK;
+        return AP_RAILS;
     }
-    
+        
     ngx_memzero(filename, sizeof(filename));
     ngx_snprintf(filename, sizeof(filename), "%s/%s",
                  public_dir->data, "../passenger_wsgi.py");
@@ -325,14 +325,18 @@ create_request(ngx_http_request_t *r)
     
     end = ngx_snprintf(framework_spawner_idle_time_string,
                        sizeof(framework_spawner_idle_time_string) - 1,
-                       "%d", slcf->framework_spawner_idle_time);
+                       "%d",
+                       (slcf->framework_spawner_idle_time == (ngx_int_t) -1) ?
+                           -1 : slcf->framework_spawner_idle_time);
     *end = '\0';
     len += sizeof("PASSENGER_FRAMEWORK_SPAWNER_IDLE_TIME") +
            ngx_strlen(framework_spawner_idle_time_string) + 1;
     
     end = ngx_snprintf(app_spawner_idle_time_string,
                        sizeof(app_spawner_idle_time_string) - 1,
-                       "%d", slcf->app_spawner_idle_time);
+                       "%d",
+                       (slcf->app_spawner_idle_time == (ngx_int_t) -1) ?
+                           -1 : slcf->app_spawner_idle_time);
     *end = '\0';
     len += sizeof("PASSENGER_APP_SPAWNER_IDLE_TIME") +
            ngx_strlen(app_spawner_idle_time_string) + 1;

data/ext/oxt/thread.hpp

@@ -108,15 +108,6 @@ private:
 	}
 	
 public:
-	/**
-	 * The platform's minimum stack size, in bytes.
-	 */
-	#if defined(PTHREAD_STACK_MIN)
-		static const unsigned int MIN_STACK_SIZE = PTHREAD_STACK_MIN;
-	#else
-		static const unsigned int MIN_STACK_SIZE = 1024 * 128;
-	#endif
-	
 	/**
 	 * Create a new thread.
 	 *
@@ -139,8 +130,18 @@ public:
 		initialize_data(name);
 		
 		set_thread_main_function(boost::bind(thread_main, func, data));
-		if (stack_size < MIN_STACK_SIZE) {
-			stack_size = MIN_STACK_SIZE;
+		
+		unsigned long min_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;
+		#else
+			// Assume minimum stack size is 128 KB.
+			min_stack_size = 128 * 1024;
+		#endif
+		if (stack_size < min_stack_size) {
+			stack_size = min_stack_size;
 		}
 		start_thread(stack_size);
 	}

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.5'
+	VERSION_STRING = '2.2.6'
 	
 	DEFAULT_FRAMEWORK_SPAWNER_MAX_IDLE_TIME = 30 * 60
 	DEFAULT_APP_SPAWNER_MAX_IDLE_TIME       = 10 * 60

data/lib/phusion_passenger/dependencies.rb

@@ -112,12 +112,14 @@ module Dependencies # :nodoc: all
 			end
 		end
 		if RUBY_PLATFORM =~ /linux/
-			case PlatformInfo.linux_distro
-			when :ubuntu, :debian
+			tags = PlatformInfo.linux_distro_tags
+			if tags.include?(:debian)
 				dep.install_command = "apt-get install build-essential"
-			when :rhel, :fedora, :centos
+			elsif tags.include?(:mandriva)
+				dep.install_command = "urpmi gcc-c++"
+			elsif tags.include?(:redhat)
 				dep.install_command = "yum install gcc-c++"
-			when :gentoo
+			elsif tags.include?(:gentoo)
 				dep.install_command = "emerge -av gcc"
 			end
 		elsif RUBY_PLATFORM =~ /darwin/
@@ -142,12 +144,14 @@ module Dependencies # :nodoc: all
 			end
 		end
 		if RUBY_PLATFORM =~ /linux/
-			case PlatformInfo.linux_distro
-			when :ubuntu, :debian
+			tags = PlatformInfo.linux_distro_tags
+			if tags.include?(:debian)
 				dep.install_command = "apt-get install ruby1.8-dev"
-			when :rhel, :fedora, :centos
+			elsif tags.include?(:mandriva)
+				dep.install_command = "urpmi urpmi ruby-RubyGems"
+			elsif tags.include?(:redhat)
 				dep.install_command = "yum install ruby-devel"
-			when :gentoo
+			elsif tags.include?(:gentoo)
 				dep.install_command = "emerge -av ruby"
 			end
 		elsif RUBY_PLATFORM =~ /freebsd/
@@ -218,12 +222,14 @@ module Dependencies # :nodoc: all
 			end
 		end
 		if RUBY_PLATFORM =~ /linux/
-			case PlatformInfo.linux_distro
-			when :ubuntu, :debian
+			tags = PlatformInfo.linux_distro_tags
+			if tags.include?(:debian)
 				dep.install_command = "apt-get install apache2-mpm-prefork"
-			when :rhel, :fedora, :centos
+			elsif tags.include?(:mandriva)
+				dep.install_command = "urpmi apache"
+			elsif tags.include?(:redhat)
 				dep.install_command = "yum install httpd"
-			when :gentoo
+			elsif tags.include?(:gentoo)
 				dep.install_command = "emerge -av apache"
 			end
 		elsif RUBY_PLATFORM =~ /freebsd/
@@ -243,14 +249,17 @@ module Dependencies # :nodoc: all
 			end
 		end
 		if RUBY_PLATFORM =~ /linux/
-			case PlatformInfo.linux_distro
-			when :ubuntu, :debian
+			tags = PlatformInfo.linux_distro_tags
+			if tags.include?(:debian)
 				dep.install_command = "apt-get install apache2-prefork-dev"
 				dep.provides = [Apache2]
-			when :rhel, :fedora, :centos
+			elsif tags.include?(:mandriva)
+				dep.install_command = "urpmi apache-devel"
+				dep.provides = [Apache2]
+			elsif tags.include?(:redhat)
 				dep.install_command = "yum install httpd-devel"
 				dep.provides = [Apache2]
-			when :gentoo
+			elsif tags.include?(:gentoo)
 				dep.install_command = "emerge -av apache"
 				dep.provides = [Apache2]
 			end
@@ -270,12 +279,14 @@ module Dependencies # :nodoc: all
 			end
 		end
 		if RUBY_PLATFORM =~ /linux/
-			case PlatformInfo.linux_distro
-			when :ubuntu, :debian
+			tags = PlatformInfo.linux_distro_tags
+			if tags.include?(:debian)
 				dep.install_command = "apt-get install libapr1-dev"
-			when :rhel, :fedora, :centos
+			elsif tags.include?(:mandriva)
+				dep.install_command = "urpmi libapr-devel"
+			elsif tags.include?(:redhat)
 				dep.install_command = "yum install apr-devel"
-			when :gentoo
+			elsif tags.include?(:gentoo)
 				dep.install_command = "emerge -av apr"
 			end
 		elsif RUBY_PLATFORM =~ /darwin/
@@ -297,9 +308,11 @@ module Dependencies # :nodoc: all
 			end
 		end
 		if RUBY_PLATFORM =~ /linux/
-			case PlatformInfo.linux_distro
-			when :ubuntu, :debian
+			tags = PlatformInfo.linux_distro_tags
+			if tags.include?(:debian)
 				dep.install_command = "apt-get install libaprutil1-dev"
+			elsif tags.include?(:mandriva)
+				dep.install_command = "urpmi libapr-util-devel"
 			end
 		elsif RUBY_PLATFORM =~ /darwin/
 			dep.install_instructions = "Please install Apache from MacPorts, which will " <<
@@ -364,10 +377,12 @@ module Dependencies # :nodoc: all
 			end
 		end
 		if RUBY_PLATFORM =~ /linux/
-			case PlatformInfo.linux_distro
-			when :ubuntu, :debian
+			tags = PlatformInfo.linux_distro_tags
+			if tags.include?(:debian)
 				dep.install_command = "apt-get install zlib1g-dev"
-			when :rhel, :fedora, :centos
+			elsif tags.include?(:mandriva)
+				dep.install_command = "urpmi zlib1-devel"
+			elsif tags.include?(:redhat)
 				dep.install_command = "yum install zlib-devel"
 			end
 		end

data/lib/phusion_passenger/platform_info.rb

@@ -397,6 +397,8 @@ public
 				options = apxs2_flags.split
 				options.reject! { |f| f =~ /^\-x/ }
 				options.reject! { |f| f =~ /^\-Xa/ }
+				options.reject! { |f| f =~ /^\-fast/ }
+				options.reject! { |f| f =~ /^\-mt/ }
 				apxs2_flags = options.join(' ')
 			end
 			
@@ -501,33 +503,48 @@ public
 	
 	# An identifier for the current Linux distribution. nil if the operating system is not Linux.
 	def self.linux_distro
+		tags = linux_distro_tags
+		if tags
+			return tags.first
+		else
+			return nil
+		end
+	end
+	
+	# Autodetects the current Linux distribution and return a number of identifier tags.
+	# The first tag identifies the distribution while the other tags indicate which
+	# distributions it is likely compatible with.
+	# Returns nil if the operating system is not Linux.
+	def self.linux_distro_tags
 		if RUBY_PLATFORM !~ /linux/
 			return nil
 		end
 		lsb_release = read_file("/etc/lsb-release")
 		if lsb_release =~ /Ubuntu/
-			return :ubuntu
+			return [:ubuntu, :debian]
 		elsif File.exist?("/etc/debian_version")
-			return :debian
+			return [:debian]
 		elsif File.exist?("/etc/redhat-release")
 			redhat_release = read_file("/etc/redhat-release")
 			if redhat_release =~ /CentOS/
-				return :centos
-			elsif redhat_release =~ /Fedora/  # is this correct?
-				return :fedora
+				return [:centos, :redhat]
+			elsif redhat_release =~ /Fedora/
+				return [:fedora, :redhat]
+			elsif redhat_release =~ /Mandriva/
+				return [:mandriva, :redhat]
 			else
 				# On official RHEL distros, the content is in the form of
 				# "Red Hat Enterprise Linux Server release 5.1 (Tikanga)"
-				return :rhel
+				return [:rhel, :redhat]
 			end
 		elsif File.exist?("/etc/suse-release")
-			return :suse
+			return [:suse]
 		elsif File.exist?("/etc/gentoo-release")
-			return :gentoo
+			return [:gentoo]
 		else
-			return :unknown
+			return [:unknown]
 		end
-		# TODO: Slackware, Mandrake/Mandriva
+		# TODO: Slackware
 	end
-	memoize :linux_distro
+	memoize :linux_distro_tags
 end

data/lib/phusion_passenger/railz/application_spawner.rb

@@ -169,12 +169,8 @@ class ApplicationSpawner < AbstractServer
 					if @lower_privilege
 						lower_privilege('config/environment.rb', @lowest_user)
 					end
-
-					# require Rails' environment, using the same path as the original rails dispatcher,
-					# which normally does: require File.dirname(__FILE__) + "/../config/environment"
-					# thus avoiding the possibility of including the same file twice.
-					require 'public/../config/environment'
-
+					
+					require File.expand_path('config/environment')
 					require 'dispatcher'
 				end
 				if success
@@ -298,7 +294,7 @@ private
 			end
 		end
 		if File.exist?('config/preinitializer.rb')
-			require 'config/preinitializer'
+			require File.expand_path('config/preinitializer')
 		end
 		require File.expand_path('config/environment')
 		if ActionController::Base.page_cache_directory.blank?