0
@@ -49,12 +49,14 @@ class ApplicationSpawner
0
     }.merge(options)
0
     
0
     a, b = UNIXSocket.pair
0
-		# Double fork in order to prevent zombie processes.
0
-		pid = safe_fork(self.class.to_s) do
0
-			safe_fork(self.class.to_s) do
0
-				a.close
0
-				run(MessageChannel.new(b), app_root, options)
0
-			end
0
+		pid = safe_fork(self.class.to_s, true) do
0
+			a.close
0
+			
0
+			file_descriptors_to_leave_open = [0, 1, 2, b.fileno]
0
+			NativeSupport.close_all_file_descriptors(file_descriptors_to_leave_open)
0
+			close_all_io_objects_for_fds(file_descriptors_to_leave_open)
0
+			
0
+			run(MessageChannel.new(b), app_root, options)
0
     end
0
     b.close
0
     Process.waitpid(pid) rescue nil

0
@@ -134,31 +134,33 @@ class ApplicationSpawner < AbstractServer
0
   #   or called exit() during startup.
0
   # - SystemCallError, IOError, SocketError: Something went wrong.
0
   def spawn_application!
0
-		# Double fork to prevent zombie processes.
0
     a, b = UNIXSocket.pair
0
-		pid = safe_fork(self.class.to_s) do
0
-			safe_fork('application') do
0
-				begin
0
-					a.close
0
-					channel = MessageChannel.new(b)
0
-					success = report_app_init_status(channel) do
0
-						ENV['RAILS_ENV'] = @environment
0
-						Dir.chdir(@app_root)
0
-						if @lower_privilege
0
-							lower_privilege('config/environment.rb', @lowest_user)
0
-						end
0
-						remove_phusion_passenger_namespace
0
-						require 'config/environment'
0
-						require 'dispatcher'
0
-					end
0
-					if success
0
-						start_request_handler(channel)
0
-					end
0
-				rescue SignalException => e
0
-					if e.message != AbstractRequestHandler::HARD_TERMINATION_SIGNAL &&
0
-					   e.message != AbstractRequestHandler::SOFT_TERMINATION_SIGNAL
0
-						raise
0
+		pid = safe_fork('application', true) do
0
+			begin
0
+				a.close
0
+				
0
+				file_descriptors_to_leave_open = [0, 1, 2, b.fileno]
0
+				NativeSupport.close_all_file_descriptors(file_descriptors_to_leave_open)
0
+				close_all_io_objects_for_fds(file_descriptors_to_leave_open)
0
+				
0
+				channel = MessageChannel.new(b)
0
+				success = report_app_init_status(channel) do
0
+					ENV['RAILS_ENV'] = @environment
0
+					Dir.chdir(@app_root)
0
+					if @lower_privilege
0
+						lower_privilege('config/environment.rb', @lowest_user)
0
           end
0
+					remove_phusion_passenger_namespace
0
+					require 'config/environment'
0
+					require 'dispatcher'
0
+				end
0
+				if success
0
+					start_request_handler(channel)
0
+				end
0
+			rescue SignalException => e
0
+				if e.message != AbstractRequestHandler::HARD_TERMINATION_SIGNAL &&
0
+				   e.message != AbstractRequestHandler::SOFT_TERMINATION_SIGNAL
0
+					raise
0
         end
0
       end
0
     end

0
@@ -188,7 +188,7 @@ protected
0
       end
0
     else
0
       if double_fork
0
-				Process.waitpid(pid)
0
+				Process.waitpid(pid) rescue nil
0
         return pid
0
       else
0
         return pid

0
@@ -41,12 +41,14 @@ class ApplicationSpawner
0
   # - SystemCallError, IOError, SocketError: Something went wrong.
0
   def spawn_application(app_root, lower_privilege = true, lowest_user = "nobody", environment = "production")
0
     a, b = UNIXSocket.pair
0
-		# Double fork in order to prevent zombie processes.
0
-		pid = safe_fork(self.class.to_s) do
0
-			safe_fork(self.class.to_s) do
0
-				a.close
0
-				run(MessageChannel.new(b), app_root, lower_privilege, lowest_user, environment)
0
-			end
0
+		pid = safe_fork(self.class.to_s, true) do
0
+			a.close
0
+			
0
+			file_descriptors_to_leave_open = [0, 1, 2, b.fileno]
0
+			NativeSupport.close_all_file_descriptors(file_descriptors_to_leave_open)
0
+			close_all_io_objects_for_fds(file_descriptors_to_leave_open)
0
+			
0
+			run(MessageChannel.new(b), app_root, lower_privilege, lowest_user, environment)
0
     end
0
     b.close
0
     Process.waitpid(pid) rescue nil