0
@@ -351,12 +351,19 @@ class ConditionVariable
0
 end
0
 
0
 class IO
0
+	# ApplicationSpawner/FrameworkSpawner might temporarily undefine
0
+	# the 'Passenger' module in order to avoid namespace collissions
0
+	# with the spawned application. So we save the NativeSupport
0
+	# module in a constant so that we can access it whether
0
+	# our 'Passenger' module is defined or not.
0
+	NATIVE_SUPPORT = Passenger::NativeSupport
0
+
0
   # Send an IO object (i.e. a file descriptor) over this IO channel.
0
   # This only works if this IO channel is a Unix socket.
0
   #
0
   # Raises SystemCallError if something went wrong.
0
   def send_io(io)
0
-		Passenger::NativeSupport.send_fd(self.fileno, io.fileno)
0
+		NATIVE_SUPPORT.send_fd(self.fileno, io.fileno)
0
   end
0
   
0
   # Receive an IO object (i.e. a file descriptor) from this IO channel.
0
@@ -364,7 +371,23 @@ class IO
0
   #
0
   # Raises SystemCallError if something went wrong.
0
   def recv_io
0
-		return IO.new(Passenger::NativeSupport.recv_fd(self.fileno))
0
+		return IO.new(NATIVE_SUPPORT.recv_fd(self.fileno))
0
+	end
0
+end
0
+
0
+# Ruby's implementation of UNIXSocket#recv_io and UNIXSocket#send_io
0
+# are broken on 64-bit FreeBSD 7. So we override them with our own
0
+# implementation.
0
+if RUBY_PLATFORM =~ /freebsd/
0
+	require 'socket'
0
+	UNIXSocket.class_eval do
0
+		def recv_io
0
+			super
0
+		end
0
+
0
+		def send_io(io)
0
+			super
0
+		end
0
   end
0
 end
0
 
0
@@ -377,4 +400,3 @@ module GC
0
     end
0
   end
0
 end
0
-