0
@@ -146,8 +146,8 @@ class ApplicationSpawner < AbstractServer
0
             start_request_handler(channel)
0
           end
0
         rescue SignalException => e
0
-					if e.message != RequestHandler::HARD_TERMINATION_SIGNAL &&
0
-					   e.message != RequestHandler::SOFT_TERMINATION_SIGNAL
0
+					if e.message != AbstractRequestHandler::HARD_TERMINATION_SIGNAL &&
0
+					   e.message != AbstractRequestHandler::SOFT_TERMINATION_SIGNAL
0
             raise
0
           end
0
         end
0
@@ -352,8 +352,8 @@ private
0
         begin
0
           start_request_handler(client)
0
         rescue SignalException => e
0
-					if e.message != RequestHandler::HARD_TERMINATION_SIGNAL &&
0
-					   e.message != RequestHandler::SOFT_TERMINATION_SIGNAL
0
+					if e.message != AbstractRequestHandler::HARD_TERMINATION_SIGNAL &&
0
+					   e.message != AbstractRequestHandler::SOFT_TERMINATION_SIGNAL
0
             raise
0
           end
0
         end
0
@@ -375,7 +375,7 @@ private
0
         ::ActiveRecord::Base.establish_connection
0
       end
0
       
0
-			handler = RequestHandler.new(reader)
0
+			handler = Rails::RequestHandler.new(reader)
0
       channel.write(Process.pid, handler.socket_name,
0
         handler.using_abstract_namespace?)
0
       channel.send_io(writer)

0
@@ -18,31 +18,41 @@ module Passenger
0
   ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
0
   $LOAD_PATH.unshift("#{ROOT}/ext")
0
 
0
-	autoload 'AbstractServer',      'passenger/abstract_server'
0
-	autoload 'HTMLTemplate',        'passenger/html_template'
0
-	autoload 'MessageChannel',      'passenger/message_channel'
0
-	autoload 'CGIFixed',            'passenger/cgi_fixed'
0
-	autoload 'Application',         'passenger/application'
0
-	autoload 'ApplicationSpawner',  'passenger/application_spawner'
0
-	autoload 'FrameworkSpawner',    'passenger/framework_spawner'
0
-	autoload 'RackSpawner',         'passenger/rack_spawner'
0
-	autoload 'SpawnManager',        'passenger/spawn_manager'
0
-	autoload 'PlatformInfo',        'passenger/platform_info'
0
-	autoload 'RequestHandler',      'passenger/request_handler'
0
-	autoload 'Utils',               'passenger/utils'
0
-	autoload 'NativeSupport',       'passenger/native_support'
0
+	autoload 'AbstractServer',         'passenger/abstract_server'
0
+	autoload 'AbstractRequestHandler', 'passenger/abstract_request_handler'
0
+	autoload 'HTMLTemplate',           'passenger/html_template'
0
+	autoload 'MessageChannel',         'passenger/message_channel'
0
+	autoload 'CGIFixed',               'passenger/cgi_fixed'
0
+	autoload 'Application',            'passenger/application'
0
+	autoload 'ApplicationSpawner',     'passenger/application_spawner'
0
+	autoload 'FrameworkSpawner',       'passenger/framework_spawner'
0
+	autoload 'RackSpawner',            'passenger/rack_spawner'
0
+	autoload 'SpawnManager',           'passenger/spawn_manager'
0
+	autoload 'PlatformInfo',           'passenger/platform_info'
0
+	autoload 'Utils',                  'passenger/utils'
0
+	autoload 'NativeSupport',          'passenger/native_support'
0
   
0
-	autoload 'VersionNotFound',     'passenger/exceptions'
0
-	autoload 'AppInitError',        'passenger/exceptions'
0
-	autoload 'InitializationError', 'passenger/exceptions'
0
-	autoload 'FrameworkInitError',  'passenger/exceptions'
0
-	autoload 'UnknownError',        'passenger/exceptions'
0
+	module Rails
0
+		autoload 'RequestHandler', 'passenger/rails/request_handler'
0
+	end
0
+	
0
+	module Rack
0
+		autoload 'ApplicationSpawner', 'passenger/rack/application_spawner'
0
+		autoload 'RequestHandler',     'passenger/rack/request_handler'
0
+	end
0
+	
0
+	autoload 'VersionNotFound',        'passenger/exceptions'
0
+	autoload 'AppInitError',           'passenger/exceptions'
0
+	autoload 'InitializationError',    'passenger/exceptions'
0
+	autoload 'FrameworkInitError',     'passenger/exceptions'
0
+	autoload 'UnknownError',           'passenger/exceptions'
0
 
0
   @@all_loaded = false
0
   
0
   def self.load_all_classes!
0
     return if @@all_loaded
0
     AbstractServer
0
+		AbstractRequestHandler
0
     HTMLTemplate
0
     MessageChannel
0
     CGIFixed
0
@@ -51,10 +61,14 @@ module Passenger
0
     FrameworkSpawner
0
     SpawnManager
0
     PlatformInfo
0
-		RequestHandler
0
     Utils
0
     NativeSupport
0
     
0
+		Rails::RequestHandler
0
+		
0
+		Rack::ApplicationSpawner
0
+		Rack::RequestHandler
0
+		
0
     VersionNotFound
0
     AppInitError
0
     InitializationError

0
@@ -93,8 +93,8 @@ class SpawnManager < AbstractServer
0
     end
0
     
0
     if app_type == "rack"
0
-			return RackSpawner.spawn_application(app_root, lower_privilege,
0
-				lowest_user, environment)
0
+			return Rack::ApplicationSpawner.spawn_application(app_root,
0
+				lower_privilege, lowest_user, environment)
0
     else
0
       return spawn_rails_application(app_root, lower_privilege, lowest_user,
0
         environment, spawn_method)