passenger 2.2.8 → 2.2.9

data/doc/rdoc/files/lib/phusion_passenger/utils_rb.html

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Tue Dec 15 11:58:39 -0800 2009</td>
+            <td>Fri Jan 08 11:24:07 +0100 2010</td>
           </tr>
         </table>
       </td></tr>

data/doc/rdoc/files/lib/phusion_passenger/wsgi/application_spawner_rb.html

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Tue Dec 15 11:58:39 -0800 2009</td>
+            <td>Fri Jan 08 11:24:07 +0100 2010</td>
           </tr>
         </table>
       </td></tr>

data/doc/rdoc/files/misc/rake/extensions_rb.html

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Thu Apr 16 10:42:12 -0700 2009</td>
+            <td>Thu Apr 16 19:42:12 +0200 2009</td>
           </tr>
         </table>
       </td></tr>

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.8"
+#define PASSENGER_VERSION "2.2.9"
 
 #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.8'
+	VERSION_STRING = '2.2.9'
 	
 	DEFAULT_FRAMEWORK_SPAWNER_MAX_IDLE_TIME = 30 * 60
 	DEFAULT_APP_SPAWNER_MAX_IDLE_TIME       = 10 * 60

data/lib/phusion_passenger/railz/application_spawner.rb

@@ -328,7 +328,7 @@ private
 		#   isn't copy-on-write friendly.
 		# - Rails >= 2.2 already preloads application sources by default, so no need
 		#   to do that again.
-		if GC.copy_on_write_friendly? && !::Rails::Initializer.method_defined?(:load_application_classes)
+		if GC.copy_on_write_friendly? && !rails_will_preload_app_code?
 			['models','controllers','helpers'].each do |section|
 				Dir.glob("app/#{section}}/*.rb").each do |file|
 					require_dependency canonicalize_path(file)
@@ -336,6 +336,14 @@ private
 			end
 		end
 	end
+	
+	def rails_will_preload_app_code?
+		if defined?(Rails::Initializer)
+			return ::Rails::Initializer.method_defined?(:load_application_classes)
+		else
+			return defined?(::Rails3)
+		end
+	end
 
 	def handle_spawn_application
 		safe_fork('application', true) do
@@ -359,11 +367,18 @@ private
 		$0 = "Rails: #{@app_root}"
 		reader, writer = IO.pipe
 		begin
-			# Re-establish connection if a connection was established
+			# Clear or re-establish connection if a connection was established
 			# in environment.rb. This prevents us from concurrently
 			# accessing the same MySQL connection handle.
-			if defined?(::ActiveRecord::Base) && ::ActiveRecord::Base.connected?
-				::ActiveRecord::Base.establish_connection
+			if defined?(::ActiveRecord::Base)
+				if ::ActiveRecord::Base.respond_to?(:clear_all_connections!)
+					::ActiveRecord::Base.clear_all_connections!
+				elsif ::ActiveRecord::Base.respond_to?(:clear_active_connections!)
+					::ActiveRecord::Base.clear_active_connections!
+				elsif ::ActiveRecord::Base.respond_to?(:connected?) &&
+				      ::ActiveRecord::Base.connected?
+					::ActiveRecord::Base.establish_connection
+				end
 			end
 			
 			reader.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  version: 2.2.8
+  version: 2.2.9
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-15 00:00:00 -08:00
+date: 2010-01-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -432,6 +432,7 @@ files:
 - doc/rdoc/classes/PhusionPassenger/Railz/FrameworkSpawner.html
 - doc/rdoc/classes/PhusionPassenger/Railz/RequestHandler.html
 - doc/rdoc/classes/PhusionPassenger/Utils/PseudoIO.html
+- doc/rdoc/classes/PhusionPassenger/Utils/RewindableInput.html
 - doc/rdoc/classes/PhusionPassenger/WSGI/ApplicationSpawner.html
 - doc/rdoc/files/ext/phusion_passenger/native_support_c.html
 - doc/rdoc/files/lib/phusion_passenger/abstract_installer_rb.html
@@ -456,6 +457,7 @@ files:
 - doc/rdoc/classes/PhusionPassenger/AdminTools/ControlProcess/Instance.html
 - doc/rdoc/classes/PhusionPassenger/Railz/ApplicationSpawner/Error.html
 - doc/rdoc/classes/PhusionPassenger/Railz/FrameworkSpawner/Error.html
+- doc/rdoc/classes/PhusionPassenger/Utils/RewindableInput/Tempfile.html
 - doc/rdoc/files/lib/phusion_passenger/admin_tools/control_process_rb.html
 - doc/rdoc/files/lib/phusion_passenger/rack/application_spawner_rb.html
 - doc/rdoc/files/lib/phusion_passenger/rack/request_handler_rb.html
@@ -463,6 +465,7 @@ files:
 - doc/rdoc/files/lib/phusion_passenger/railz/cgi_fixed_rb.html
 - doc/rdoc/files/lib/phusion_passenger/railz/framework_spawner_rb.html
 - doc/rdoc/files/lib/phusion_passenger/railz/request_handler_rb.html
+- doc/rdoc/files/lib/phusion_passenger/utils/rewindable_input_rb.html
 - doc/rdoc/files/lib/phusion_passenger/wsgi/application_spawner_rb.html
 - man/passenger-config.1
 - man/passenger-make-enterprisey.8