0
@@ -15,10 +15,9 @@
0
 #  with this program; if not, write to the Free Software Foundation, Inc.,
0
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
0
 
0
-require 'pathname'
0
-$LOAD_PATH.unshift(File.expand_path("#{File.dirname(__FILE__)}/../lib"))
0
-$LOAD_PATH.unshift(File.expand_path("#{File.dirname(__FILE__)}/../ext"))
0
-require 'passenger/spawn_manager'
0
+root = File.expand_path("#{File.dirname(__FILE__)}/..")
0
+$LOAD_PATH.unshift("#{root}/lib", "#{root}/ext")
0
+DEFAULT_INPUT_FD = 3
0
 
0
 begin
0
   STDOUT.sync = true
0
@@ -28,11 +27,22 @@ begin
0
     GC.copy_on_write_friendly = true
0
   end
0
   
0
+	input = IO.new(DEFAULT_INPUT_FD)
0
+	# Optimization for decreasing startup time. Since Apache starts the spawn
0
+	# server twice during startup, we don't want to load the Passenger classes
0
+	# if we don't need them.
0
+	# So we check whether Apache immediately closes the connection. If so,
0
+	# we exit without loading the rest of Passenger.
0
+	if input.eof?
0
+		exit
0
+	end
0
+	
0
+	require 'passenger/spawn_manager'
0
   spawn_manager = Passenger::SpawnManager.new
0
-	input = IO.new(Passenger::SpawnManager::DEFAULT_INPUT_FD)
0
   spawn_manager.start_synchronously(input)
0
   spawn_manager.cleanup
0
 rescue => e
0
+	require 'passenger/utils'
0
   include Passenger::Utils
0
   print_exception("spawn manager", e)
0
   exit 10

0
@@ -37,7 +37,6 @@ module Passenger
0
 # tested. Don't forget to call cleanup after the server's main loop has
0
 # finished.
0
 class SpawnManager < AbstractServer
0
-	DEFAULT_INPUT_FD = 3
0
   FRAMEWORK_SPAWNER_MAX_IDLE_TIME = 30 * 60
0
   APP_SPAWNER_MAX_IDLE_TIME = FrameworkSpawner::APP_SPAWNER_MAX_IDLE_TIME
0
   SPAWNER_CLEAN_INTERVAL = [FRAMEWORK_SPAWNER_MAX_IDLE_TIME,

0
@@ -11,7 +11,9 @@ class SpawnManager
0
   end
0
 end
0
 
0
+DEFAULT_INPUT_FD = 3
0
+
0
 manager = SpawnManager.new
0
-input = IO.new(Passenger::SpawnManager::DEFAULT_INPUT_FD)
0
+input = IO.new(DEFAULT_INPUT_FD)
0
 manager.start_synchronously(input)
0
 manager.cleanup