passenger 2.2.12 → 2.2.13

data/doc/cxxapi/group__Hooks.map

@@ -0,0 +1,3 @@
+<map id="structs" name="structs">
+<area shape="rect" id="node1" href="$group__Core.html" title="Core Apache&#45;related classes and functions" alt="" coords="5,5,315,35"/>
+</map>

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

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

data/lib/phusion_passenger/railz/application_spawner.rb

@@ -177,7 +177,14 @@ class ApplicationSpawner < AbstractServer
 					setup_bundler_support
 					
 					require File.expand_path('config/environment')
-					require 'dispatcher'
+					begin
+						require 'dispatcher'
+					rescue LoadError
+						# Early versions of Rails 3 still had the dispatcher, but
+						# later versions disposed of it, in which case we'll need
+						# to use the application object.
+						raise if Rails::VERSION::MAJOR < 3
+					end
 				end
 				if success
 					start_request_handler(channel, false)
@@ -316,8 +323,16 @@ private
 		   && ActionController::Dispatcher.respond_to?(:error_file_path)
 			ActionController::Dispatcher.error_file_path = "#{RAILS_ROOT}/public"
 		end
+		require 'rails/version' if !defined?(::Rails::VERSION)
 		if !defined?(Dispatcher)
-			require 'dispatcher'
+			begin
+				require 'dispatcher'
+			rescue LoadError
+				# Early versions of Rails 3 still had the dispatcher, but
+				# later versions disposed of it, in which case we'll need
+				# to use the application object.
+				raise if Rails::VERSION::MAJOR < 3
+			end
 		end
 		# Rails 2.2+ uses application_controller.rb while older versions use application.rb.
 		begin
@@ -353,7 +368,7 @@ private
 		if defined?(Rails::Initializer)
 			return ::Rails::Initializer.method_defined?(:load_application_classes)
 		else
-			return defined?(::Rails3)
+			return Rails::VERSION::MAJOR >= 3
 		end
 	end
 
@@ -410,7 +425,7 @@ private
 			reader.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
 			
 			if Rails::VERSION::STRING >= '2.3.0'
-				rack_app = ::ActionController::Dispatcher.new
+				rack_app = find_rack_app
 				handler = Rack::RequestHandler.new(reader, rack_app, @options)
 			else
 				handler = RequestHandler.new(reader, @options)
@@ -431,6 +446,16 @@ private
 			PhusionPassenger.call_event(:stopping_worker_process)
 		end
 	end
+	
+	def find_rack_app
+		if Rails::VERSION::MAJOR >= 3
+			File.read("config/application.rb") =~ /^module (.+)$/
+			app_module = Object.const_get($1)
+			return app_module::Application
+		else
+			return ActionController::Dispatcher.new
+		end
+	end
 end
 
 end # module Railz

data/lib/phusion_passenger/utils.rb

@@ -194,7 +194,7 @@ protected
 		
 		# 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')
+			require File.expand_path('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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: false
   segments: 
   - 2
   - 2
-  - 12
-  version: 2.2.12
+  - 13
+  version: 2.2.13
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-31 00:00:00 +02:00
+date: 2010-06-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 61
         segments: 
         - 0
         - 8
@@ -35,9 +38,11 @@ dependencies:
   name: fastthread
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 0
@@ -49,9 +54,11 @@ dependencies:
   name: rack
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -167,6 +174,7 @@ files:
 - doc/cxxapi/BCrypt_8h-source.html
 - doc/cxxapi/Blowfish_8h-source.html
 - doc/cxxapi/Bucket_8h-source.html
+- doc/cxxapi/Bucket_8h_source.html
 - doc/cxxapi/CachedFileStat_8h-source.html
 - doc/cxxapi/classAgentWatcher-members.html
 - doc/cxxapi/classAgentWatcher.html
@@ -302,10 +310,13 @@ files:
 - doc/cxxapi/classServerInstanceDirToucher-members.html
 - doc/cxxapi/classServerInstanceDirToucher.html
 - doc/cxxapi/Configuration_8h-source.html
+- doc/cxxapi/Configuration_8h_source.html
 - doc/cxxapi/Constants_8h-source.html
 - doc/cxxapi/ContentHandler_8h-source.html
 - doc/cxxapi/definitions_8h-source.html
+- doc/cxxapi/definitions_8h_source.html
 - doc/cxxapi/DirectoryMapper_8h-source.html
+- doc/cxxapi/DirectoryMapper_8h_source.html
 - doc/cxxapi/doxygen.css
 - doc/cxxapi/doxygen.png
 - doc/cxxapi/EventedServer_8h-source.html
@@ -334,15 +345,19 @@ files:
 - doc/cxxapi/graph_legend.html
 - doc/cxxapi/graph_legend.png
 - doc/cxxapi/group__Configuration.html
+- doc/cxxapi/group__Configuration.map
 - doc/cxxapi/group__Configuration.png
 - doc/cxxapi/group__Core.html
+- doc/cxxapi/group__Core.map
 - doc/cxxapi/group__Core.png
 - doc/cxxapi/group__Exceptions.html
 - doc/cxxapi/group__Hooks.html
+- doc/cxxapi/group__Hooks.map
 - doc/cxxapi/group__Hooks.png
 - doc/cxxapi/group__Support.html
 - doc/cxxapi/hierarchy.html
 - doc/cxxapi/Hooks_8h-source.html
+- doc/cxxapi/Hooks_8h_source.html
 - doc/cxxapi/HttpStatusExtractor_8h-source.html
 - doc/cxxapi/index.html
 - doc/cxxapi/inherit__graph__0.map
@@ -1369,16 +1384,20 @@ require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -1386,7 +1405,7 @@ requirements:
 - fastthread
 - Apache 2 with development headers
 rubyforge_project: passenger
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Apache module for Ruby on Rails support.