passenger-jmazzi 2.2.9 → 2.2.10

data/NEWS

@@ -1,3 +1,13 @@
+Release 2.2.10
+--------------
+
+ * Fixed some Bundler compatibility problems.
+ * Fixed some file descriptor passing problems, which previously
+   could lead to mysterious crashes.
+ * Fixed some compilation problems on newer GCC versions. Issue #430.
+ * Support #size method in rack.input.
+
+
 Release 2.2.9
 -------------
 

data/ext/common/MessageChannel.h

@@ -319,12 +319,24 @@ public:
 	 * descriptor is a Unix socket.
 	 *
 	 * @param fileDescriptor The file descriptor to pass.
+	 * @param negotiate See Ruby's MessageChannel#send_io method's comments.
 	 * @throws SystemException Something went wrong during file descriptor passing.
 	 * @throws boost::thread_interrupted
 	 * @pre <tt>fileDescriptor >= 0</tt>
 	 * @see readFileDescriptor()
 	 */
-	void writeFileDescriptor(int fileDescriptor) {
+	void writeFileDescriptor(int fileDescriptor, bool negotiate = true) {
+		// See message_channel.rb for more info about negotiation.
+		if (negotiate) {
+			vector<string> args;
+			
+			if (!read(args)) {
+				throw IOException("Unexpected end of stream encountered while pre-negotiating a file descriptor");
+			} else if (args.size() != 1 || args[0] != "pass IO") {
+				throw IOException("FD passing pre-negotiation message expected.");
+			}
+		}
+		
 		struct msghdr msg;
 		struct iovec vec;
 		char dummy[1];
@@ -368,6 +380,16 @@ public:
 		if (ret == -1) {
 			throw SystemException("Cannot send file descriptor with sendmsg()", errno);
 		}
+		
+		if (negotiate) {
+			vector<string> args;
+			
+			if (!read(args)) {
+				throw IOException("Unexpected end of stream encountered while post-negotiating a file descriptor");
+			} else if (args.size() != 1 || args[0] != "got IO") {
+				throw IOException("FD passing post-negotiation message expected.");
+			}
+		}
 	}
 	
 	/**
@@ -492,6 +514,7 @@ public:
 	 * Receive a file descriptor, which had been passed over the underlying
 	 * file descriptor.
 	 *
+	 * @param negotiate See Ruby's MessageChannel#send_io method's comments.
 	 * @return The passed file descriptor.
 	 * @throws SystemException If something went wrong during the
 	 *            receiving of a file descriptor. Perhaps the underlying
@@ -500,7 +523,12 @@ public:
 	 *            file descriptor.
 	 * @throws boost::thread_interrupted
 	 */
-	int readFileDescriptor() {
+	int readFileDescriptor(bool negotiate = true) {
+		// See message_channel.rb for more info about negotiation.
+		if (negotiate) {
+			write("pass IO", NULL);
+		}
+		
 		struct msghdr msg;
 		struct iovec vec;
 		char dummy[1];
@@ -538,16 +566,32 @@ public:
 		}
 		
 		control_header = CMSG_FIRSTHDR(&msg);
+		if (control_header == NULL) {
+			throw IOException("No valid file descriptor received.");
+		}
 		if (control_header->cmsg_len   != EXPECTED_CMSG_LEN
 		 || control_header->cmsg_level != SOL_SOCKET
 		 || control_header->cmsg_type  != SCM_RIGHTS) {
 			throw IOException("No valid file descriptor received.");
 		}
+		
 		#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
-			return control_data.fd;
+			int fd = control_data.fd;
 		#else
-			return *((int *) CMSG_DATA(control_header));
+			int fd = *((int *) CMSG_DATA(control_header));
 		#endif
+		
+		if (negotiate) {
+			try {
+				write("got IO", NULL);
+			} catch (...) {
+				this_thread::disable_syscall_interruption dsi;
+				syscalls::close(fd);
+				throw;
+			}
+		}
+		
+		return fd;
 	}
 	
 	/**

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.9"
+#define PASSENGER_VERSION "2.2.10"
 
 #endif /* _PASSENGER_VERSION_H */

data/ext/nginx/HttpStatusExtractor.h

@@ -26,6 +26,7 @@
 #include <string>
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
 
 namespace Passenger {
 

data/ext/nginx/ScgiRequestParser.h

@@ -25,6 +25,7 @@
 
 #include <string>
 #include <map>
+#include <cstdlib>
 
 #include "StaticString.h"
 

data/ext/phusion_passenger/native_support.c

@@ -158,10 +158,14 @@ recv_fd(VALUE self, VALUE socket_fd) {
 	}
 	
 	control_header = CMSG_FIRSTHDR(&msg);
+	if (control_header == NULL) {
+		rb_raise(rb_eIOError, "No valid file descriptor received.");
+		return Qnil;
+	}
 	if (control_header->cmsg_len   != EXPECTED_CMSG_LEN
 	 || control_header->cmsg_level != SOL_SOCKET
 	 || control_header->cmsg_type  != SCM_RIGHTS) {
-		rb_sys_fail("No valid file descriptor received.");
+		rb_raise(rb_eIOError, "No valid file descriptor received.");
 		return Qnil;
 	}
 	#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)

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.9'
+	VERSION_STRING = '2.2.10'
 	
 	DEFAULT_FRAMEWORK_SPAWNER_MAX_IDLE_TIME = 30 * 60
 	DEFAULT_APP_SPAWNER_MAX_IDLE_TIME       = 10 * 60

data/lib/phusion_passenger/message_channel.rb

@@ -193,8 +193,11 @@ class MessageChannel
 	#
 	# Might raise SystemCallError, IOError or SocketError when something
 	# goes wrong.
-	def recv_io
-		return @io.recv_io
+	def recv_io(klass = IO, negotiate = true)
+		write("pass IO") if negotiate
+		io = @io.recv_io(klass)
+		write("got IO") if negotiate
+		return io
 	end
 	
 	# Send an IO object (a file descriptor) over the channel. The other
@@ -204,7 +207,46 @@ class MessageChannel
 	# Might raise SystemCallError, IOError or SocketError when something
 	# goes wrong.
 	def send_io(io)
-		@io.send_io(io)
+		# We read a message before actually calling #send_io
+		# in order to prevent the other side from accidentally
+		# read()ing past the normal data and reading our file
+		# descriptor too.
+		#
+		# For example suppose that side A looks like this:
+		#
+		#   read(fd, buf, 1024)
+		#   read_io(fd)
+		#
+		# and side B:
+		#
+		#   write(fd, buf, 100)
+		#   send_io(fd_to_pass)
+		#
+		# If B completes both write() and send_io(), then A's read() call
+		# reads past the 100 bytes that B sent. On some platforms, like
+		# Linux, this will cause read_io() to fail. And it just so happens
+		# that Ruby's IO#read method slurps more than just the given amount
+		# of bytes.
+		result = read
+		if !result
+			raise EOFError, "End of stream"
+		elsif result != ["pass IO"]
+			raise IOError, "IO passing pre-negotiation header expected"
+		else
+			@io.send_io(io)
+			# Once you've sent the IO you expect to be able to close it on the
+			# sender's side, even if the other side hasn't read the IO yet.
+			# Not so: on some operating systems (I'm looking at you OS X) this
+			# can cause the receiving side to receive a bad file descriptor.
+			# The post negotiation protocol ensures that we block until the
+			# other side has really received the IO.
+			result = read
+			if !result
+				raise EOFError, "End of stream"
+			elsif result != ["got IO"]
+				raise IOError, "IO passing post-negotiation header expected"
+			end
+		end
 	end
 	
 	# Return the file descriptor of the underlying IO object.

data/lib/phusion_passenger/rack/application_spawner.rb

@@ -97,6 +97,10 @@ private
 			if options["lower_privilege"]
 				lower_privilege('config.ru', options["lowest_user"])
 			end
+			# Make sure RubyGems uses any new environment variable values
+			# that have been set now (e.g. $HOME, $GEM_HOME, etc) and that
+			# it is able to detect newly installed gems.
+			Gem.clear_paths
 			app = load_rack_app
 		end
 		

data/lib/phusion_passenger/railz/application_spawner.rb

@@ -169,6 +169,10 @@ class ApplicationSpawner < AbstractServer
 					if @lower_privilege
 						lower_privilege('config/environment.rb', @lowest_user)
 					end
+					# Make sure RubyGems uses any new environment variable values
+					# that have been set now (e.g. $HOME, $GEM_HOME, etc) and that
+					# it is able to detect newly installed gems.
+					Gem.clear_paths
 					
 					require File.expand_path('config/environment')
 					require 'dispatcher'
@@ -346,9 +350,12 @@ private
 	end
 
 	def handle_spawn_application
+		a, b = UNIXSocket.pair
 		safe_fork('application', true) do
 			begin
-				start_request_handler(client, true)
+				a.close
+				client.close
+				start_request_handler(MessageChannel.new(b), true)
 			rescue SignalException => e
 				if e.message != AbstractRequestHandler::HARD_TERMINATION_SIGNAL &&
 				   e.message != AbstractRequestHandler::SOFT_TERMINATION_SIGNAL
@@ -356,6 +363,17 @@ private
 				end
 			end
 		end
+		
+		b.close
+		worker_channel = MessageChannel.new(a)
+		info = worker_channel.read
+		owner_pipe = worker_channel.recv_io
+		client.write(*info)
+		client.send_io(owner_pipe)
+	ensure
+		a.close if a
+		b.close if b && !b.closed?
+		owner_pipe.close if owner_pipe
 	end
 	
 	# Initialize the request handler and enter its main loop.

data/lib/phusion_passenger/utils.rb

@@ -538,8 +538,8 @@ class IO
 		# This only works if this IO channel is a Unix socket.
 		#
 		# Raises SystemCallError if something went wrong.
-		def recv_io
-			return IO.new(PhusionPassenger::NativeSupport.recv_fd(self.fileno))
+		def recv_io(klass = IO)
+			return klass.for_fd(PhusionPassenger::NativeSupport.recv_fd(self.fileno))
 		end
 	end
 	
@@ -590,7 +590,7 @@ end
 if RUBY_PLATFORM =~ /freebsd/ || RUBY_PLATFORM =~ /openbsd/ || (RUBY_PLATFORM =~ /darwin/ && RUBY_PLATFORM !~ /universal/)
 	require 'socket'
 	UNIXSocket.class_eval do
-		def recv_io
+		def recv_io(klass = IO)
 			super
 		end
 

data/lib/phusion_passenger/utils/rewindable_input.rb

@@ -41,6 +41,11 @@ module Utils
       @rewindable_io.rewind
     end
     
+    def size
+      make_rewindable unless @rewindable_io
+      @rewindable_io.size
+    end
+    
     # Closes this RewindableInput object without closing the originally
     # wrapped IO oject. Cleans up any temporary resources that this RewindableInput
     # has created.

data/test/MessageChannelTest.cpp

@@ -1,6 +1,8 @@
 #include "tut.h"
 #include "MessageChannel.h"
 
+#include <boost/bind.hpp>
+#include <boost/thread.hpp>
 #include <cstring>
 #include <cstdio>
 
@@ -144,8 +146,14 @@ namespace tut {
 		MessageChannel channel2(s[1]);
 		
 		pipe(my_pipe);
-		channel1.writeFileDescriptor(my_pipe[1]);
+		boost::thread thr(boost::bind(
+			&MessageChannel::writeFileDescriptor,
+			&channel1,
+			my_pipe[1],
+			true
+		));
 		fd = channel2.readFileDescriptor();
+		thr.join();
 		
 		char buf[5];
 		write(fd, "hello", 5);

data/test/stub/message_channel.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-$LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib"
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../../lib")
 require 'phusion_passenger/message_channel'
 
 include PhusionPassenger

data/test/stub/message_channel_2.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-$LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib"
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../../lib")
 require 'phusion_passenger/message_channel'
 
 include PhusionPassenger

data/test/stub/message_channel_3.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
-$LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib"
-$LOAD_PATH << "#{File.dirname(__FILE__)}/../../ext"
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../../lib")
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../../ext")
 require 'phusion_passenger/message_channel'
 require 'phusion_passenger/utils'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: passenger-jmazzi
 version: !ruby/object:Gem::Version 
-  version: 2.2.9
+  version: 2.2.10
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 -05:00
+date: 2010-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency