0
@@ -233,6 +233,21 @@
0
     Object.const_set(:RAILS_ROOT, @app_root)
0
     if defined?(Rails::Initializer)
0
       Rails::Initializer.run(:set_load_path)
0
+			
0
+			# The Rails framework is loaded at the moment.
0
+			# environment.rb may set ENV['RAILS_ENV']. So we re-initialize
0
+			# RAILS_ENV in Rails::Initializer.load_environment.
0
+			Rails::Initializer.class_eval do
0
+				def load_environment_with_passenger
0
+					if defined?(::RAILS_ENV)
0
+						Object.send(:remove_const, :RAILS_ENV)
0
+					end
0
+					Object.const_set(:RAILS_ENV, (ENV['RAILS_ENV'] || 'development').dup)
0
+					load_environment_without_passenger
0
+				end
0
+				
0
+				alias_method_chain :load_environment, :passenger
0
+			end
0
     end
0
     require 'config/environment'
0
     if ActionController::Base.page_cache_directory.blank?
0
@@ -246,8 +261,10 @@
0
       require 'dispatcher'
0
     end
0
     require_dependency 'application'
0
-		Dir.glob('app/{models,controllers,helpers}/*.rb').each do |file|
0
-			require_dependency normalize_path(file)
0
+		if GC.copy_on_write_friendly?
0
+			Dir.glob('app/{models,controllers,helpers}/*.rb').each do |file|
0
+				require_dependency normalize_path(file)
0
+			end
0
     end
0
   end
0
 

0
@@ -6,6 +6,8 @@
0
 require 'spawner_error_handling_spec'
0
 include Passenger
0
 
0
+# TODO: write unit test which checks whether setting ENV['RAILS_ENV'] in environment.rb is respected (issue #6)
0
+
0
 describe ApplicationSpawner do
0
   before :all do
0
     ENV['RAILS_ENV'] = 'production'