passenger 3.0.0.pre3 → 3.0.0.pre4

data/doc/Architectural overview.html

@@ -885,7 +885,7 @@ Attribution-Share Alike 3.0 Unported License</a>.</p></div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-11-24 13:33:45 CET
+Last updated 2010-09-25 20:09:08 CEST
 </div>
 </div>
 </body>

data/doc/Security of user switching support.html

@@ -762,7 +762,7 @@ feel free to discuss it with us.</p></div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-11-24 13:33:45 CET
+Last updated 2010-09-25 20:09:08 CEST
 </div>
 </div>
 </body>

data/ext/common/Constants.h

@@ -26,7 +26,7 @@
 #define _PASSENGER_CONSTANTS_H_
 
 /* Don't forget to update lib/phusion_passenger.rb too. */
-#define PASSENGER_VERSION "3.0.0.pre3"
+#define PASSENGER_VERSION "3.0.0.pre4"
 
 #define FEEDBACK_FD 3
 

data/ext/nginx/config

@@ -9,6 +9,18 @@ if ! test -f "$ngx_addon_dir/../common/libpassenger_common.a" || \
     fi
 fi
 
+ngx_feature="Math library"
+ngx_feature_name=
+ngx_feature_run=no
+ngx_feature_incs="#include <math.h>"
+ngx_feature_path=
+ngx_feature_libs="-lm"
+ngx_feature_test="pow(1, 2)"
+. auto/feature
+if [ $ngx_found = yes ]; then
+    CORE_LIBS="$CORE_LIBS -lm"
+fi
+
 ngx_addon_name=ngx_http_passenger_module
 HTTP_MODULES="$HTTP_MODULES ngx_http_passenger_module"
 NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
@@ -26,9 +38,6 @@ CORE_LIBS="$CORE_LIBS  \
     ${ngx_addon_dir}/../common/libpassenger_common.a \
     ${ngx_addon_dir}/../common/libboost_oxt.a \
     -lstdc++ -lpthread"
-if test x`uname` = xOpenBSD; then
-    CORE_LIBS="$CORE_LIBS -lm"
-fi
 
 nginx_version=`grep 'NGINX_VERSION ' src/core/nginx.h | awk '{ print $3 }' | sed 's/"//g'`
 

data/lib/phusion_passenger.rb

@@ -25,10 +25,10 @@ module PhusionPassenger
 	###### Version numbers ######
 	
 	# Phusion Passenger version number. Don't forget to edit ext/common/Constants.h too.
-	VERSION_STRING = '3.0.0.pre3'
+	VERSION_STRING = '3.0.0.pre4'
 	
 	PREFERRED_NGINX_VERSION = '0.7.67'
-	PREFERRED_PCRE_VERSION  = '8.02'
+	PREFERRED_PCRE_VERSION  = '8.10'
 	STANDALONE_INTERFACE_VERSION  = 1
 	
 	

data/lib/phusion_passenger/platform_info/ruby.rb

@@ -97,7 +97,7 @@ module PlatformInfo
 	end
 	
 	# Returns whether the Ruby interpreter supports process forking.
-	def self.fork_supported?
+	def self.ruby_supports_fork?
 		# MRI >= 1.9.2's respond_to? returns false for methods
 		# that are not implemented.
 		return Process.respond_to?(:fork) &&
@@ -108,7 +108,7 @@ module PlatformInfo
 	
 	# Returns the correct 'gem' command for this Ruby interpreter.
 	def self.gem_command
-		return locate_ruby_executable('gem')
+		return locate_ruby_tool('gem')
 	end
 	memoize :gem_command
 	
@@ -119,7 +119,7 @@ module PlatformInfo
 	# The return value may not be the actual correct invocation
 	# for Rake. Use rake_command for that.
 	def self.rake
-		return locate_ruby_executable('rake')
+		return locate_ruby_tool('rake')
 	end
 	memoize :rake
 	
@@ -146,7 +146,7 @@ module PlatformInfo
 	# belongs to the current Ruby interpreter. Returns nil if it
 	# doesn't exist.
 	def self.rspec
-		return locate_ruby_executable('spec')
+		return locate_ruby_tool('spec')
 	end
 	memoize :rspec
 	
@@ -237,12 +237,32 @@ module PlatformInfo
 		end
 	end
 	
-	# Locate a Ruby tool command, e.g. 'gem', 'rake', 'bundle', etc. Instead of
+	# Locates a Ruby tool command, e.g. 'gem', 'rake', 'bundle', etc. Instead of
 	# naively looking in $PATH, this function uses a variety of search heuristics
 	# to find the command that's really associated with the current Ruby interpreter.
 	# It should never locate a command that's actually associated with a different
 	# Ruby interpreter.
-	def self.locate_ruby_executable(name)
+	# Returns nil when nothing's found.
+	def self.locate_ruby_tool(name)
+		result = locate_ruby_tool_by_basename(name)
+		if !result
+			exeext = Config::CONFIG['EXEEXT']
+			exeext = nil if exeext.empty?
+			if exeext
+				result = locate_ruby_tool_by_basename("#{name}#{exeext}")
+			end
+			if !result
+				result = locate_ruby_tool_by_basename(transform_according_to_ruby_exec_format(name))
+			end
+			if !result && exeext
+				result = locate_ruby_tool_by_basename(transform_according_to_ruby_exec_format(name) + exeext)
+			end
+		end
+		return result
+	end
+
+private
+	def self.locate_ruby_tool_by_basename(name)
 		if RUBY_PLATFORM =~ /darwin/ &&
 		   ruby_command =~ %r(\A/System/Library/Frameworks/Ruby.framework/Versions/.*?/usr/bin/ruby\Z)
 			# On OS X we must look for Ruby binaries in /usr/bin.
@@ -288,8 +308,8 @@ module PlatformInfo
 
 		filename
 	end
-
-private
+	private_class_method :locate_ruby_tool_by_basename
+	
 	def self.is_ruby_program?(filename)
 		File.open(filename, 'rb') do |f|
 			return f.readline =~ /ruby/
@@ -298,6 +318,21 @@ private
 		return false
 	end
 	private_class_method :is_ruby_program?
+	
+	# Deduce Ruby's --program-prefix and --program-suffix from its install name
+	# and transforms the given input name accordingly.
+	#
+	#   transform_according_to_ruby_exec_format("rake")    => "jrake", "rake1.8", etc
+	def self.transform_according_to_ruby_exec_format(name)
+		install_name = Config::CONFIG['RUBY_INSTALL_NAME']
+		if install_name.include?('ruby')
+			format = install_name.sub('ruby', '%s')
+			return sprintf(format, name)
+		else
+			return name
+		end
+	end
+	private_class_method :transform_according_to_ruby_exec_format
 end
 
 end # module PhusionPassenger

data/lib/phusion_passenger/standalone/start_command.rb

@@ -375,7 +375,7 @@ private
 		pid = fork
 		if pid
 			# Parent
-			exit!
+			exit!(0)
 		else
 			# Child
 			trap "HUP", "IGNORE"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  hash: -1876988210
+  hash: -1876988209
   prerelease: true
   segments: 
   - 3
   - 0
   - 0
-  - pre3
-  version: 3.0.0.pre3
+  - pre4
+  version: 3.0.0.pre4
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 +02:00
+date: 2010-10-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency