passenger 2.2.4 → 2.2.5

data/ext/common/ApplicationPoolServerExecutable.cpp

@@ -266,7 +266,7 @@ public:
  */
 class Client {
 private:
-	static const int CLIENT_THREAD_STACK_SIZE = 1024 * 128;
+	static const int CLIENT_THREAD_STACK_SIZE = 1024 * 64;
 
 	/** The Server that this Client object belongs to. */
 	Server &server;

data/ext/common/MessageChannel.h

@@ -328,7 +328,7 @@ public:
 		struct msghdr msg;
 		struct iovec vec;
 		char dummy[1];
-		#if defined(__APPLE__) || defined(__SOLARIS__)
+		#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
 			struct {
 				struct cmsghdr header;
 				int fd;
@@ -356,7 +356,7 @@ public:
 		control_header = CMSG_FIRSTHDR(&msg);
 		control_header->cmsg_level = SOL_SOCKET;
 		control_header->cmsg_type  = SCM_RIGHTS;
-		#if defined(__APPLE__) || defined(__SOLARIS__)
+		#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
 			control_header->cmsg_len = sizeof(control_data);
 			control_data.fd = fileDescriptor;
 		#else
@@ -504,7 +504,7 @@ public:
 		struct msghdr msg;
 		struct iovec vec;
 		char dummy[1];
-		#if defined(__APPLE__) || defined(__SOLARIS__)
+		#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
 			// File descriptor passing macros (CMSG_*) seem to be broken
 			// on 64-bit MacOS X. This structure works around the problem.
 			struct {
@@ -543,7 +543,7 @@ public:
 		 || control_header->cmsg_type  != SCM_RIGHTS) {
 			throw IOException("No valid file descriptor received.");
 		}
-		#if defined(__APPLE__) || defined(__SOLARIS__)
+		#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
 			return control_data.fd;
 		#else
 			return *((int *) CMSG_DATA(control_header));

data/ext/common/StandardApplicationPool.h

@@ -104,7 +104,7 @@ private:
 	static const int DEFAULT_MAX_IDLE_TIME = 120;
 	static const int DEFAULT_MAX_POOL_SIZE = 20;
 	static const int DEFAULT_MAX_INSTANCES_PER_APP = 0;
-	static const int CLEANER_THREAD_STACK_SIZE = 1024 * 128;
+	static const int CLEANER_THREAD_STACK_SIZE = 1024 * 64;
 	static const unsigned int MAX_GET_ATTEMPTS = 10;
 	static const unsigned int GET_TIMEOUT = 5000; // In milliseconds.
 

data/ext/common/Timer.h

@@ -63,6 +63,8 @@ public:
 	 * restart the timer.
 	 */
 	void start() {
+		// TODO: We really use should clock_gettime() and the monotonic
+		// clock whenever possible, instead of gettimeofday()...
 		gettimeofday(&startTime, NULL);
 	}
 	

data/ext/common/Version.h

@@ -26,6 +26,6 @@
 #define _PASSENGER_VERSION_H_
 
 /* Don't forget to update lib/phusion_passenger/constants.rb too. */
-#define PASSENGER_VERSION "2.2.4"
+#define PASSENGER_VERSION "2.2.5"
 
 #endif /* _PASSENGER_VERSION_H */

data/ext/nginx/Configuration.c

@@ -278,13 +278,13 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                               prev->upstream.ignore_client_abort, 0);
 
     ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
-                              prev->upstream.connect_timeout, 60000);
+                              prev->upstream.connect_timeout, 600000);
 
     ngx_conf_merge_msec_value(conf->upstream.send_timeout,
-                              prev->upstream.send_timeout, 60000);
+                              prev->upstream.send_timeout, 600000);
 
     ngx_conf_merge_msec_value(conf->upstream.read_timeout,
-                              prev->upstream.read_timeout, 60000);
+                              prev->upstream.read_timeout, 600000);
 
     ngx_conf_merge_size_value(conf->upstream.send_lowat,
                               prev->upstream.send_lowat, 0);

data/ext/nginx/ContentHandler.c

@@ -288,14 +288,16 @@ create_request(ngx_http_request_t *r)
     /* +1 for trailing null */
     len = sizeof("CONTENT_LENGTH") + ngx_strlen(buf) + 1;
     
-    /* DOCUMENT_ROOT, SCRIPT_NAME and base URI */
+    /* DOCUMENT_ROOT, SCRIPT_NAME, RAILS_RELATIVE_URL_ROOT and PATH_INFO. */
     len += sizeof("DOCUMENT_ROOT") + context->public_dir.len + 1;
     if (context->base_uri.len > 0) {
         len += sizeof("SCRIPT_NAME") + context->base_uri.len + 1;
         len += sizeof("RAILS_RELATIVE_URL_ROOT") +
                context->base_uri.len + 1;
+        len += sizeof("PATH_INFO") + r->uri.len - context->base_uri.len + 1;
     } else {
         len += sizeof("SCRIPT_NAME") + sizeof("");
+        len += sizeof("PATH_INFO") + r->uri.len + 1;
     }
     
     /* Various other HTTP headers. */
@@ -445,7 +447,7 @@ create_request(ngx_http_request_t *r)
     b->last = ngx_snprintf(b->last, 10, "%ui", content_length);
     *b->last++ = (u_char) 0;
     
-    /* Build DOCUMENT_ROOT, SCRIPT_NAME and base URI. */
+    /* Build DOCUMENT_ROOT, SCRIPT_NAME, RAILS_RELATIVE_URL_ROOT and PATH_INFO. */
     b->last = ngx_copy(b->last, "DOCUMENT_ROOT", sizeof("DOCUMENT_ROOT"));
     b->last = ngx_copy(b->last, context->public_dir.data,
                        context->public_dir.len + 1);
@@ -459,9 +461,18 @@ create_request(ngx_http_request_t *r)
                            sizeof("RAILS_RELATIVE_URL_ROOT"));
         b->last = ngx_copy(b->last, context->base_uri.data,
                            context->base_uri.len + 1);
+        
+        b->last = ngx_copy(b->last, "PATH_INFO", sizeof("PATH_INFO"));
+        b->last = ngx_copy(b->last, r->uri.data + context->base_uri.len,
+                           r->uri.len - context->base_uri.len);
+        b->last = ngx_copy(b->last, "", 1);
     } else {
         b->last = ngx_copy(b->last, "SCRIPT_NAME", sizeof("SCRIPT_NAME"));
         b->last = ngx_copy(b->last, "", sizeof(""));
+        
+        b->last = ngx_copy(b->last, "PATH_INFO", sizeof("PATH_INFO"));
+        b->last = ngx_copy(b->last, r->uri.data, r->uri.len);
+        b->last = ngx_copy(b->last, "", 1);
     }
     
     /* Various other HTTP headers. */
@@ -469,7 +480,8 @@ create_request(ngx_http_request_t *r)
      && r->headers_in.content_type->value.len > 0) {
         b->last = ngx_copy(b->last, "CONTENT_TYPE", sizeof("CONTENT_TYPE"));
         b->last = ngx_copy(b->last, r->headers_in.content_type->value.data,
-                           r->headers_in.content_type->value.len + 1);
+                           r->headers_in.content_type->value.len);
+        b->last = ngx_copy(b->last, "", 1);
     }
     
     #if (NGX_HTTP_SSL)
@@ -1187,7 +1199,7 @@ passenger_content_handler(ngx_http_request_t *r)
     u->abort_request    = abort_request;
     u->finalize_request = finalize_request;
 
-    u->buffering = 1;
+    u->buffering = 0;
 
     u->pipe = ngx_pcalloc(r->pool, sizeof(ngx_event_pipe_t));
     if (u->pipe == NULL) {

data/ext/nginx/HelperServer.cpp

@@ -139,7 +139,7 @@ struct ClientDisconnectedException { };
 class Client {
 private:
 	/** The client thread stack size in bytes. */
-	static const int CLIENT_THREAD_STACK_SIZE = 1024 * 128;
+	static const int CLIENT_THREAD_STACK_SIZE = 1024 * 64;
 	
 	/** The client number for this Client object, assigned by Server. */
 	unsigned int number;

data/ext/oxt/system_calls.cpp

@@ -127,6 +127,8 @@ syscalls::bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen) {
 int
 syscalls::connect(int sockfd, const struct sockaddr *serv_addr, socklen_t addrlen) {
 	int ret;
+	// FIXME: I don't think this is entirely correct.
+	// http://www.madore.org/~david/computers/connect-intr.html
 	CHECK_INTERRUPTION(
 		ret == -1,
 		ret = ::connect(sockfd, serv_addr, addrlen);
@@ -264,9 +266,12 @@ syscalls::time(time_t *t) {
 
 int
 syscalls::usleep(useconds_t usec) {
+	// We use syscalls::nanosleep() here to reuse the code that sleeps
+	// for the remaining amount of time, if a signal was received but
+	// system call interruption is disabled.
 	struct timespec spec;
 	spec.tv_sec = usec / 1000000;
-	spec.tv_nsec = usec % 1000000;
+	spec.tv_nsec = usec % 1000000 * 1000;
 	return syscalls::nanosleep(&spec, NULL);
 }
 

data/ext/oxt/thread.hpp

@@ -2,7 +2,7 @@
  * OXT - OS eXtensions for boosT
  * Provides important functionality necessary for writing robust server software.
  *
- * Copyright (c) 2008 Phusion
+ * Copyright (c) 2008, 2009 Phusion
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -34,6 +34,7 @@
 #ifdef OXT_BACKTRACE_IS_ENABLED
 	#include <sstream>
 #endif
+#include <limits.h>  // for PTHREAD_STACK_MIN
 
 namespace oxt {
 
@@ -107,6 +108,15 @@ private:
 	}
 	
 public:
+	/**
+	 * The platform's minimum stack size, in bytes.
+	 */
+	#if defined(PTHREAD_STACK_MIN)
+		static const unsigned int MIN_STACK_SIZE = PTHREAD_STACK_MIN;
+	#else
+		static const unsigned int MIN_STACK_SIZE = 1024 * 128;
+	#endif
+	
 	/**
 	 * Create a new thread.
 	 *
@@ -118,7 +128,9 @@ public:
 	 *     a name will be automatically chosen.
 	 * @param stack_size The stack size, in bytes, that the thread should
 	 *     have. If 0 is specified, the operating system's default stack
-	 *     size is used.
+	 *     size is used. If non-zero is specified, and the size is smaller
+	 *     than the operating system's minimum stack size, then the operating
+	 *     system's minimum stack size will be used.
 	 * @pre func must be copyable.
 	 * @throws boost::thread_resource_error Something went wrong during
 	 *     creation of the thread.
@@ -127,6 +139,9 @@ public:
 		initialize_data(name);
 		
 		set_thread_main_function(boost::bind(thread_main, func, data));
+		if (stack_size < MIN_STACK_SIZE) {
+			stack_size = MIN_STACK_SIZE;
+		}
 		start_thread(stack_size);
 	}
 	

data/ext/phusion_passenger/native_support.c

@@ -65,7 +65,7 @@ send_fd(VALUE self, VALUE socket_fd, VALUE fd_to_send) {
 	struct msghdr msg;
 	struct iovec vec;
 	char dummy[1];
-	#if defined(__APPLE__) || defined(__SOLARIS__)
+	#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
 		struct {
 			struct cmsghdr header;
 			int fd;
@@ -94,7 +94,7 @@ send_fd(VALUE self, VALUE socket_fd, VALUE fd_to_send) {
 	control_header->cmsg_level = SOL_SOCKET;
 	control_header->cmsg_type  = SCM_RIGHTS;
 	control_payload = NUM2INT(fd_to_send);
-	#if defined(__APPLE__) || defined(__SOLARIS__)
+	#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
 		control_header->cmsg_len = sizeof(control_data);
 		control_data.fd = control_payload;
 	#else
@@ -125,7 +125,7 @@ recv_fd(VALUE self, VALUE socket_fd) {
 	struct msghdr msg;
 	struct iovec vec;
 	char dummy[1];
-	#if defined(__APPLE__) || defined(__SOLARIS__)
+	#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
 		// File descriptor passing macros (CMSG_*) seem to be broken
 		// on 64-bit MacOS X. This structure works around the problem.
 		struct {
@@ -164,7 +164,7 @@ recv_fd(VALUE self, VALUE socket_fd) {
 		rb_sys_fail("No valid file descriptor received.");
 		return Qnil;
 	}
-	#if defined(__APPLE__) || defined(__SOLARIS__)
+	#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
 		return INT2NUM(control_data.fd);
 	#else
 		return INT2NUM(*((int *) CMSG_DATA(control_header)));

data/lib/phusion_passenger/abstract_request_handler.rb

@@ -1,3 +1,4 @@
+# encoding: binary
 #  Phusion Passenger - http://www.modrails.com/
 #  Copyright (c) 2008, 2009 Phusion
 #
@@ -404,9 +405,8 @@ private
 				undef rewind if respond_to?(:rewind)
 			end
 			
-			# Set encoding for Ruby 1.9 compatibility.
-			client.set_encoding(Encoding::BINARY) if client.respond_to?(:set_encoding)
-			client.binmode
+			# There's no need to set the encoding for Ruby 1.9 because this
+			# source file is tagged with 'encoding: binary'.
 			
 			return client
 		else

data/lib/phusion_passenger/abstract_server.rb

@@ -1,3 +1,4 @@
+# encoding: binary
 #  Phusion Passenger - http://www.modrails.com/
 #  Copyright (c) 2008, 2009 Phusion
 #

data/lib/phusion_passenger/constants.rb

@@ -24,7 +24,7 @@
 module PhusionPassenger
 	# Phusion Passenger version number.
 	# Don't forget to edit ext/common/Version.h too.
-	VERSION_STRING = '2.2.4'
+	VERSION_STRING = '2.2.5'
 	
 	DEFAULT_FRAMEWORK_SPAWNER_MAX_IDLE_TIME = 30 * 60
 	DEFAULT_APP_SPAWNER_MAX_IDLE_TIME       = 10 * 60

data/lib/phusion_passenger/message_channel.rb

@@ -1,3 +1,4 @@
+# encoding: binary
 #  Phusion Passenger - http://www.modrails.com/
 #  Copyright (c) 2008, 2009 Phusion
 #

data/lib/phusion_passenger/platform_info.rb

@@ -336,7 +336,6 @@ public
 	# for portability reasons. These flags should be specified as last
 	# when invoking the compiler.
 	def self.portability_cflags
-		# _GLIBCPP__PTHREADS is for fixing Boost compilation on OpenBSD.
 		flags = ["-D_REENTRANT -I/usr/local/include"]
 		if RUBY_PLATFORM =~ /solaris/
 			flags << '-D_XOPEN_SOURCE=500 -D_XPG4_2 -D__EXTENSIONS__ -D__SOLARIS__ -D_FILE_OFFSET_BITS=64'
@@ -347,7 +346,9 @@ public
 			flags << '-DBOOST_HAS_STDINT_H -D_GLIBCPP__PTHREADS'
 		elsif RUBY_PLATFORM =~ /aix/
 			flags << '-DOXT_DISABLE_BACKTRACES'
-		elsif RUBY_PLATFORM =~ /sparc-linux/
+		elsif RUBY_PLATFORM =~ /(sparc-linux|arm-linux)/
+			# http://code.google.com/p/phusion-passenger/issues/detail?id=200
+			# http://groups.google.com/group/phusion-passenger/t/6b904a962ee28e5c
 			flags << '-DBOOST_SP_USE_PTHREADS'
 		end
 		return flags.compact.join(" ").strip

data/lib/phusion_passenger/rack/request_handler.rb

@@ -1,3 +1,4 @@
+# encoding: binary
 #  Phusion Passenger - http://www.modrails.com/
 #  Copyright (c) 2008, 2009 Phusion
 #
@@ -42,12 +43,10 @@ class RequestHandler < AbstractRequestHandler
 	RACK_RUN_ONCE      = "rack.run_once"       # :nodoc:
 	RACK_URL_SCHEME	   = "rack.url_scheme"     # :nodoc:
 	SCRIPT_NAME        = "SCRIPT_NAME"         # :nodoc:
-	PATH_INFO          = "PATH_INFO"           # :nodoc:
-	REQUEST_URI        = "REQUEST_URI"         # :nodoc:
-	QUESTION_MARK      = "?"                   # :nodoc:
-	QUERY_STRING       = "QUERY_STRING"        # :nodoc:
 	CONTENT_LENGTH      = "CONTENT_LENGTH"       # :nodoc:
+	CONTENT_TYPE        = "CONTENT_TYPE"         # :nodoc:
 	HTTP_CONTENT_LENGTH = "HTTP_CONTENT_LENGTH"  # :nodoc:
+	HTTP_CONTENT_TYPE = "HTTP_CONTENT_TYPE"      # :nodoc:
 	HTTPS          = "HTTPS"  # :nodoc:
 	HTTPS_DOWNCASE = "https"  # :nodoc:
 	HTTP           = "http"   # :nodoc:
@@ -73,15 +72,20 @@ protected
 			env[RACK_MULTITHREAD]  = false
 			env[RACK_MULTIPROCESS] = true
 			env[RACK_RUN_ONCE]     = false
-			env[QUERY_STRING]    ||= ""
-			env[PATH_INFO]       ||= env[REQUEST_URI].split(QUESTION_MARK, 2).first
-			env[PATH_INFO].sub!(/^#{Regexp.escape(env[SCRIPT_NAME])}/, "")
+			
 			if env[HTTP_CONTENT_LENGTH] && env[CONTENT_LENGTH]
 				env.delete(HTTP_CONTENT_LENGTH)
 			elsif env[HTTP_CONTENT_LENGTH] && !env[CONTENT_LENGTH]
 				env[CONTENT_LENGTH] = env[HTTP_CONTENT_LENGTH]
 				env.delete(HTTP_CONTENT_LENGTH)
 			end
+			if env[HTTP_CONTENT_TYPE] && env[CONTENT_TYPE]
+				env.delete(HTTP_CONTENT_TYPE)
+			elsif env[HTTP_CONTENT_TYPE] && !env[CONTENT_TYPE]
+				env[CONTENT_TYPE] = env[HTTP_CONTENT_TYPE]
+				env.delete(HTTP_CONTENT_TYPE)
+			end
+			
 			if env[HTTPS] == YES || env[HTTPS] == ON || env[HTTPS] == ONE
 				env[RACK_URL_SCHEME] = HTTPS_DOWNCASE
 			else

data/lib/phusion_passenger/railz/application_spawner.rb

@@ -300,7 +300,7 @@ private
 		if File.exist?('config/preinitializer.rb')
 			require 'config/preinitializer'
 		end
-		require 'config/environment'
+		require File.expand_path('config/environment')
 		if ActionController::Base.page_cache_directory.blank?
 			ActionController::Base.page_cache_directory = "#{RAILS_ROOT}/public"
 		end
@@ -321,9 +321,11 @@ private
 		#   isn't copy-on-write friendly.
 		# - Rails >= 2.2 already preloads application sources by default, so no need
 		#   to do that again.
-		if GC.copy_on_write_friendly? && !::Rails::Initializer.respond_to?(:load_application_classes)
-			Dir.glob('app/{models,controllers,helpers}/*.rb').each do |file|
-				require_dependency canonicalize_path(file)
+		if GC.copy_on_write_friendly? && !::Rails::Initializer.method_defined?(:load_application_classes)
+			['models','controllers','helpers'].each do |section|
+				Dir.glob("app/#{section}}/*.rb").each do |file|
+					require_dependency canonicalize_path(file)
+				end
 			end
 		end
 	end
@@ -385,3 +387,4 @@ end
 
 end # module Railz
 end # module PhusionPassenger
+

data/lib/phusion_passenger/railz/request_handler.rb

@@ -1,3 +1,4 @@
+# encoding: binary
 #  Phusion Passenger - http://www.modrails.com/
 #  Copyright (c) 2008, 2009 Phusion
 #

data/lib/phusion_passenger/spawn_manager.rb

@@ -1,3 +1,4 @@
+# encoding: binary
 #  Phusion Passenger - http://www.modrails.com/
 #  Copyright (c) 2008, 2009 Phusion
 #

data/lib/phusion_passenger/utils.rb

@@ -1,3 +1,4 @@
+# encoding: binary
 #  Phusion Passenger - http://www.modrails.com/
 #  Copyright (c) 2008, 2009 Phusion
 #
@@ -200,16 +201,37 @@ protected
 		end
 	end
 	
+	class PseudoIO
+		def initialize(sink)
+			@sink = sink || File.open("/dev/null", "w")
+			@buffer = StringIO.new
+		end
+		
+		def done!
+			result = @buffer.string
+			@buffer = nil
+			return result
+		end
+		
+		def method_missing(*args, &block)
+			@buffer.send(*args, &block) if @buffer && args.first != :reopen
+			return @sink.send(*args, &block)
+		end
+		
+		def respond_to?(symbol, include_private = false)
+			return @sink.respond_to?(symbol, include_private)
+		end
+	end
+	
 	# Run the given block. A message will be sent through +channel+ (a
 	# MessageChannel object), telling the remote side whether the block
 	# raised an exception, called exit(), or succeeded.
 	#
-	# Anything written to $stderr and STDERR during execution of the block
-	# will be buffered. If <tt>write_stderr_contents_to</tt> is non-nil,
-	# then the buffered stderr data will be written to this object. In this
-	# case, <tt>write_stderr_contents_to</tt> must be an IO-like object.
-	# If <tt>write_stderr_contents_to</tt> is nil, then the stder data will
-	# be discarded.
+	# If _sink_ is non-nil, then every operation on $stderr/STDERR inside
+	# the block will be performed on _sink_ as well. If _sink_ is nil
+	# then all operations on $stderr/STDERR inside the block will be
+	# silently discarded, i.e. if one writes to $stderr/STDERR then nothing
+	# will be actually written to the console.
 	# 
 	# Returns whether the block succeeded, i.e. whether it didn't raise an
 	# exception.
@@ -217,30 +239,26 @@ protected
 	# Exceptions are not propagated, except SystemExit and a few
 	# non-StandardExeption classes such as SignalException. Of the
 	# exceptions that are propagated, only SystemExit will be reported.
-	def report_app_init_status(channel, write_stderr_contents_to = STDERR)
+	def report_app_init_status(channel, sink = STDERR)
 		begin
 			old_global_stderr = $stderr
 			old_stderr = STDERR
 			stderr_output = ""
-			tempfile = Tempfile.new('passenger-stderr')
-			tempfile.unlink
+			
+			pseudo_stderr = PseudoIO.new(sink)
 			Object.send(:remove_const, 'STDERR') rescue nil
-			Object.const_set('STDERR', tempfile)
+			Object.const_set('STDERR', pseudo_stderr)
+			$stderr = pseudo_stderr
+			
 			begin
 				yield
 			ensure
 				Object.send(:remove_const, 'STDERR') rescue nil
 				Object.const_set('STDERR', old_stderr)
 				$stderr = old_global_stderr
-				tempfile.rewind
-				stderr_output = tempfile.read
-				tempfile.close rescue nil
-				
-				if write_stderr_contents_to
-					write_stderr_contents_to.write(stderr_output)
-					write_stderr_contents_to.flush
-				end
+				stderr_output = pseudo_stderr.done!
 			end
+			
 			channel.write('success')
 			return true
 		rescue StandardError, ScriptError, NoMemoryError => e
@@ -558,9 +576,9 @@ module Signal
 end
 
 # Ruby's implementation of UNIXSocket#recv_io and UNIXSocket#send_io
-# are broken on 64-bit FreeBSD 7 and x86_64/ppc64 OS X. So we override them
+# are broken on 64-bit FreeBSD 7, OpenBSD and x86_64/ppc64 OS X. So we override them
 # with our own implementation.
-if RUBY_PLATFORM =~ /freebsd/ || (RUBY_PLATFORM =~ /darwin/ && RUBY_PLATFORM !~ /universal/)
+if RUBY_PLATFORM =~ /freebsd/ || RUBY_PLATFORM =~ /openbsd/ || (RUBY_PLATFORM =~ /darwin/ && RUBY_PLATFORM !~ /universal/)
 	require 'socket'
 	UNIXSocket.class_eval do
 		def recv_io