passenger 2.2.11 → 2.2.12

data/lib/phusion_passenger/abstract_request_handler.rb

@@ -316,6 +316,7 @@ private
 			end
 		end
 		trap('HUP', IGNORE)
+		PhusionPassenger.call_event(:after_installing_signal_handlers)
 	end
 	
 	def install_useful_signal_handlers

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

data/lib/phusion_passenger/events.rb

@@ -24,6 +24,7 @@
 module PhusionPassenger
 	@@event_starting_worker_process = []
 	@@event_stopping_worker_process = []
+	@@after_installing_signal_handlers = []
 	
 	def self.on_event(name, &block)
 		callback_list_for_event(name) << block
@@ -42,6 +43,8 @@ private
 			@@event_starting_worker_process
 		when :stopping_worker_process
 			@@event_stopping_worker_process
+		when :after_installing_signal_handlers
+			@@after_installing_signal_handlers
 		else
 			raise ArgumentError, "Unknown event name '#{name}'"
 		end

data/lib/phusion_passenger/platform_info.rb

@@ -346,9 +346,10 @@ public
 			flags << '-DBOOST_HAS_STDINT_H -D_GLIBCPP__PTHREADS'
 		elsif RUBY_PLATFORM =~ /aix/
 			flags << '-DOXT_DISABLE_BACKTRACES'
-		elsif RUBY_PLATFORM =~ /(sparc-linux|arm-linux|sh4-linux)/
+		elsif RUBY_PLATFORM =~ /(sparc-linux|arm-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
+			# http://groups.google.com/group/phusion-passenger/browse_thread/thread/aad4bd9d8d200561
 			flags << '-DBOOST_SP_USE_PTHREADS'
 		end
 		return flags.compact.join(" ").strip

data/lib/phusion_passenger/rack/application_spawner.rb

@@ -86,6 +86,7 @@ private
 		app = nil
 		success = report_app_init_status(channel) do
 			ENV['RACK_ENV'] = options["environment"]
+			ENV['RAILS_ENV'] = options["environment"]
 			if options["base_uri"] && options["base_uri"] != "/"
 				ENV['RACK_BASE_URI'] = options["base_uri"]
 				ENV['RAILS_RELATIVE_URL_ROOT'] = options["base_uri"]
@@ -101,6 +102,7 @@ private
 			# that have been set now (e.g. $HOME, $GEM_HOME, etc) and that
 			# it is able to detect newly installed gems.
 			Gem.clear_paths
+			setup_bundler_support
 			app = load_rack_app
 		end
 		

data/lib/phusion_passenger/railz/application_spawner.rb

@@ -161,6 +161,7 @@ class ApplicationSpawner < AbstractServer
 				channel = MessageChannel.new(b)
 				success = report_app_init_status(channel) do
 					ENV['RAILS_ENV'] = @environment
+					ENV['RACK_ENV'] = @environment
 					ENV['RAILS_RELATIVE_URL_ROOT'] = @base_uri
 					Dir.chdir(@app_root)
 					if @encoded_environment_variables
@@ -173,6 +174,7 @@ class ApplicationSpawner < AbstractServer
 					# that have been set now (e.g. $HOME, $GEM_HOME, etc) and that
 					# it is able to detect newly installed gems.
 					Gem.clear_paths
+					setup_bundler_support
 					
 					require File.expand_path('config/environment')
 					require 'dispatcher'
@@ -237,6 +239,7 @@ protected
 		report_app_init_status(client) do
 			$0 = "Passenger ApplicationSpawner: #{@app_root}"
 			ENV['RAILS_ENV'] = @environment
+			ENV['RACK_ENV'] = @environment
 			ENV['RAILS_RELATIVE_URL_ROOT'] = @base_uri
 			if defined?(RAILS_ENV)
 				Object.send(:remove_const, :RAILS_ENV)
@@ -249,6 +252,11 @@ protected
 			if @lower_privilege
 				lower_privilege('config/environment.rb', @lowest_user)
 			end
+			# Make sure RubyGems uses any new environment variable values
+			# that have been set now (e.g. $HOME, $GEM_HOME, etc) and that
+			# it is able to detect newly installed gems.
+			Gem.clear_paths
+			setup_bundler_support
 			preload_application
 		end
 	end

data/lib/phusion_passenger/utils.rb

@@ -32,6 +32,7 @@ require 'etc'
 require 'fcntl'
 require 'tempfile'
 require 'stringio'
+require 'phusion_passenger/packaging'
 require 'phusion_passenger/exceptions'
 if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby"
 	require 'phusion_passenger/native_support'
@@ -163,6 +164,73 @@ protected
 		end
 	end
 	
+	def setup_bundler_support(options = {})
+		# Rack::ApplicationSpawner depends on the 'rack' library, but the app
+		# might want us to use a bundled version instead of a
+		# gem/apt-get/yum/whatever-installed version. Therefore we must setup
+		# the correct load paths before requiring 'rack'.
+		#
+		# The most popular tool for bundling dependencies is Bundler. Bundler
+		# works as follows:
+		# - If the bundle is locked then a file .bundle/environment.rb exists
+		#   which will setup the load paths.
+		# - If the bundle is not locked then the load paths must be set up by
+		#   calling Bundler.setup.
+		# - Rails 3's boot.rb automatically loads .bundle/environment.rb or
+		#   calls Bundler.setup if that's not available.
+		# - Other Rack apps might not have a boot.rb but we still want to setup
+		#   Bundler.
+		# - Some Rails 2 apps might have explicitly added Bundler support.
+		#   These apps call Bundler.setup in their preinitializer.rb.
+		#
+		# So the strategy is as follows:
+
+		# Our strategy might be completely unsuitable for the app or the
+		# developer is using something other than Bundler (or possibly an
+		# older version of Bundler which is API incompatible with the latest
+		# version), so we let the user manually specify a load path setup file.
+		if options["load_path_setup_file"]
+			require File.expand(options["load_path_setup_file"])
+		
+		# The app developer may also override our strategy with this magic file.
+		elsif File.exist?('config/setup_load_paths.rb')
+			require File.expand('config/setup_load_paths')
+		
+		# If the Bundler lock environment file exists then load that. If it
+		# exists then there's a 99.9% chance that loading it is the correct
+		# thing to do.
+		elsif File.exist?('.bundle/environment.rb')
+			require File.expand_path('.bundle/environment')
+
+		# If the Bundler environment file doesn't exist then there are two
+		# possibilities:
+		# 1. Bundler is not used, in which case we don't have to do anything.
+		# 2. Bundler *is* used, but the gems are not locked and we're supposed
+		#    to call Bundler.setup.
+		#
+		# The existence of Gemfile indicates whether (2) is true:
+		elsif File.exist?('Gemfile')
+			# In case of Rails 3, config/boot.rb already calls Bundler.setup.
+			# However older versions of Rails may not so loading boot.rb might
+			# not be the correct thing to do. To be on the safe side we
+			# call Bundler.setup ourselves; calling Bundler.setup twice is
+			# harmless. If this isn't the correct thing to do after all then
+			# there's always the load_path_setup_file option and
+			# setup_load_paths.rb.
+			require 'rubygems'
+			require 'bundler'
+			Bundler.setup
+		end
+
+		# Bundler might remove Phusion Passenger from the load path in its zealous
+		# attempt to un-require RubyGems, so here we put Phusion Passenger back
+		# into the load path.
+		if $LOAD_PATH.first != LIBDIR
+			$LOAD_PATH.unshift(LIBDIR)
+			$LOAD_PATH.uniq!
+		end
+	end
+	
 	# Fork a new process and run the given block inside the child process, just like
 	# fork(). Unlike fork(), this method is safe, i.e. there's no way for the child
 	# process to escape the block. Any uncaught exceptions in the child process will
@@ -371,15 +439,7 @@ protected
 		if uid == 0
 			return false
 		else
-			# Some systems are broken. initgroups can fail because of
-			# all kinds of stupid reasons. So we ignore any errors
-			# raised by initgroups.
-			begin
-				Process.groups = Process.initgroups(username, gid)
-			rescue
-			end
-			Process::Sys.setgid(gid)
-			Process::Sys.setuid(uid)
+			NativeSupport.switch_user(username, uid, gid)
 			ENV['HOME'] = pw.dir
 			return true
 		end

data/lib/phusion_passenger/utils/rewindable_input.rb

@@ -64,12 +64,16 @@ module Utils
     
     private
     
-    # Ruby's Tempfile class has a bug. Subclass it and fix it.
-    class Tempfile < ::Tempfile
-      def _close
-        @tmpfile.close if @tmpfile
-        @data[1] = nil if @data
-        @tmpfile = nil
+    if RUBY_VERSION < '1.9.0'
+      # Many Ruby 1.8's tempfile libraries have a bug that can cause
+      # the #close method to raise an exception. Subclass it and fix
+      # it.
+      class Tempfile < ::Tempfile
+        def _close
+          @tmpfile.close if @tmpfile
+          @data[1] = nil if @data
+          @tmpfile = nil
+        end
       end
     end
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  version: 2.2.11
+  prerelease: false
+  segments: 
+  - 2
+  - 2
+  - 12
+  version: 2.2.12
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -9,39 +14,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-05 00:00:00 +01:00
+date: 2010-05-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
+        - 1
         version: 0.8.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: fastthread
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 1
         version: 1.0.1
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: Passenger is an Apache module for Ruby on Rails support.
 email: info@phusion.nl
 executables: 
@@ -167,6 +182,8 @@ files:
 - doc/cxxapi/classPassenger_1_1AbstractSpawnManager__inherit__graph.png
 - doc/cxxapi/classPassenger_1_1ArgumentException-members.html
 - doc/cxxapi/classPassenger_1_1ArgumentException.html
+- doc/cxxapi/classPassenger_1_1ArrayReader-members.html
+- doc/cxxapi/classPassenger_1_1ArrayReader.html
 - doc/cxxapi/classPassenger_1_1BacktracesServer-members.html
 - doc/cxxapi/classPassenger_1_1BacktracesServer.html
 - doc/cxxapi/classPassenger_1_1BacktracesServer__inherit__graph.map
@@ -235,6 +252,8 @@ files:
 - doc/cxxapi/classPassenger_1_1RandomGenerator.html
 - doc/cxxapi/classPassenger_1_1RuntimeException-members.html
 - doc/cxxapi/classPassenger_1_1RuntimeException.html
+- doc/cxxapi/classPassenger_1_1ScalarReader-members.html
+- doc/cxxapi/classPassenger_1_1ScalarReader.html
 - doc/cxxapi/classPassenger_1_1ScgiRequestParser-members.html
 - doc/cxxapi/classPassenger_1_1ScgiRequestParser.html
 - doc/cxxapi/classPassenger_1_1SecurityException-members.html
@@ -274,6 +293,10 @@ files:
 - doc/cxxapi/classPassenger_1_1TimeRetrievalException__inherit__graph.map
 - doc/cxxapi/classPassenger_1_1TimeRetrievalException__inherit__graph.md5
 - doc/cxxapi/classPassenger_1_1TimeRetrievalException__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1Uint16Reader-members.html
+- doc/cxxapi/classPassenger_1_1Uint16Reader.html
+- doc/cxxapi/classPassenger_1_1Uint32Reader-members.html
+- doc/cxxapi/classPassenger_1_1Uint32Reader.html
 - doc/cxxapi/classServer-members.html
 - doc/cxxapi/classServer.html
 - doc/cxxapi/classServerInstanceDirToucher-members.html
@@ -285,6 +308,7 @@ files:
 - doc/cxxapi/DirectoryMapper_8h-source.html
 - doc/cxxapi/doxygen.css
 - doc/cxxapi/doxygen.png
+- doc/cxxapi/EventedServer_8h-source.html
 - doc/cxxapi/Exceptions_8h-source.html
 - doc/cxxapi/FileChangeChecker_8h-source.html
 - doc/cxxapi/FileDescriptor_8h-source.html
@@ -414,6 +438,15 @@ files:
 - doc/cxxapi/inherit__graph__36.map
 - doc/cxxapi/inherit__graph__36.md5
 - doc/cxxapi/inherit__graph__36.png
+- doc/cxxapi/inherit__graph__37.map
+- doc/cxxapi/inherit__graph__37.md5
+- doc/cxxapi/inherit__graph__37.png
+- doc/cxxapi/inherit__graph__38.map
+- doc/cxxapi/inherit__graph__38.md5
+- doc/cxxapi/inherit__graph__38.png
+- doc/cxxapi/inherit__graph__39.map
+- doc/cxxapi/inherit__graph__39.md5
+- doc/cxxapi/inherit__graph__39.png
 - doc/cxxapi/inherit__graph__4.map
 - doc/cxxapi/inherit__graph__4.md5
 - doc/cxxapi/inherit__graph__4.png
@@ -439,6 +472,7 @@ files:
 - doc/cxxapi/md5_8h-source.html
 - doc/cxxapi/MessageChannel_8h-source.html
 - doc/cxxapi/MessageClient_8h-source.html
+- doc/cxxapi/MessageReadersWriters_8h-source.html
 - doc/cxxapi/MessageServer_8h-source.html
 - doc/cxxapi/modules.html
 - doc/cxxapi/namespacemembers.html
@@ -463,6 +497,8 @@ files:
 - doc/cxxapi/StringListCreator_8h-source.html
 - doc/cxxapi/structPassenger_1_1AnythingToString-members.html
 - doc/cxxapi/structPassenger_1_1AnythingToString.html
+- doc/cxxapi/structPassenger_1_1AnythingToString_3_01vector_3_01StaticString_01_4_01_4-members.html
+- doc/cxxapi/structPassenger_1_1AnythingToString_3_01vector_3_01StaticString_01_4_01_4.html
 - doc/cxxapi/structPassenger_1_1AnythingToString_3_01vector_3_01string_01_4_01_4-members.html
 - doc/cxxapi/structPassenger_1_1AnythingToString_3_01vector_3_01string_01_4_01_4.html
 - doc/cxxapi/structPassenger_1_1MessageServer_1_1DisconnectEventBroadcastGuard-members.html
@@ -1336,19 +1372,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
 - fastthread
 - Apache 2 with development headers
 rubyforge_project: passenger
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Apache module for Ruby on Rails support.