RubyGems - passenger - Versions diffs - 2.2.9 → 2.2.10 - Mend

passenger 2.2.9 → 2.2.10

Potentially problematic release.

This version of passenger might be problematic. Click here for more details.

Files changed (435) hide show

data/doc/cxxapi/structPassenger_1_1StaticString_1_1Hash-members.html ADDED

@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<title>Passenger: Member List</title>
+<link href="tabs.css" rel="stylesheet" type="text/css">
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+</head><body>
+<!-- Generated by Doxygen 1.5.8 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="namespaces.html"><span>Namespaces</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Class&nbsp;List</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&nbsp;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&nbsp;Members</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>Passenger::StaticString::StaticString::Hash Member List</h1>This is the complete list of members for <a class="el" href="structPassenger_1_1StaticString_1_1Hash.html">Passenger::StaticString::StaticString::Hash</a>, including all inherited members.<p><table>
+</table></div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Feb 21 12:22:48 2010 for Passenger by&nbsp;
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
+</body>
+</html>

data/doc/cxxapi/structPassenger_1_1StaticString_1_1Hash.html ADDED

@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<title>Passenger: Passenger::StaticString::StaticString::Hash Struct Reference</title>
+<link href="tabs.css" rel="stylesheet" type="text/css">
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+</head><body>
+<!-- Generated by Doxygen 1.5.8 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="namespaces.html"><span>Namespaces</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="annotated.html"><span>Class&nbsp;List</span></a></li>
+      <li><a href="hierarchy.html"><span>Class&nbsp;Hierarchy</span></a></li>
+      <li><a href="functions.html"><span>Class&nbsp;Members</span></a></li>
+    </ul>
+  </div>
+  <div class="navpath"><a class="el" href="namespacePassenger.html">Passenger</a>::<a class="el" href="classPassenger_1_1StaticString.html">StaticString</a>::<a class="el" href="structPassenger_1_1StaticString_1_1Hash.html">Hash</a>
+  </div>
+</div>
+<div class="contents">
+<h1>Passenger::StaticString::StaticString::Hash Struct Reference</h1><!-- doxytag: class="Passenger::StaticString::Hash" -->A hash function object for <a class="el" href="classPassenger_1_1StaticString.html" title="An immutable, static byte buffer.">StaticString</a>.
+<a href="#_details">More...</a>
+<p>
+<code>#include &lt;<a class="el" href="StaticString_8h-source.html">StaticString.h</a>&gt;</code>
+<p>
+<p>
+<a href="structPassenger_1_1StaticString_1_1Hash-members.html">List of all members.</a><table border="0" cellpadding="0" cellspacing="0">
+<tr><td></td></tr>
+</table>
+<hr><a name="_details"></a><h2>Detailed Description</h2>
+A hash function object for <a class="el" href="classPassenger_1_1StaticString.html" title="An immutable, static byte buffer.">StaticString</a>.
+<p>
+<hr>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="StaticString_8h-source.html">StaticString.h</a></ul>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Feb 21 12:22:48 2010 for Passenger by&nbsp;
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
+</body>
+</html>

data/ext/common/MessageChannel.h CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

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

data/ext/nginx/ScgiRequestParser.h CHANGED

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

data/ext/phusion_passenger/native_support.c CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 2.2.9
+  version: 2.2.10
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-01-08 00:00:00 +01:00
+date: 2010-02-22 00:00:00 +01:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -141,28 +141,37 @@ files:
 - doc/Users guide Apache.txt
 - doc/Users guide Nginx.html
 - doc/Users guide Nginx.txt
+- doc/cxxapi/AbstractSpawnManager_8h-source.html
+- doc/cxxapi/Account_8h-source.html
+- doc/cxxapi/AccountsDatabase_8h-source.html
+- doc/cxxapi/AgentsStarter_8h-source.html
 - doc/cxxapi/annotated.html
-- doc/cxxapi/Application_8h-source.html
-- doc/cxxapi/ApplicationPool_8h-source.html
-- doc/cxxapi/ApplicationPoolServer_8h-source.html
+- doc/cxxapi/apache2_2Configuration_8h-source.html
+- doc/cxxapi/BacktracesServer_8h-source.html
+- doc/cxxapi/Base64_8h-source.html
+- doc/cxxapi/BCrypt_8h-source.html
+- doc/cxxapi/Blowfish_8h-source.html
 - doc/cxxapi/Bucket_8h-source.html
 - doc/cxxapi/CachedFileStat_8h-source.html
+- doc/cxxapi/classAgentWatcher-members.html
+- doc/cxxapi/classAgentWatcher.html
 - doc/cxxapi/classClient-members.html
 - doc/cxxapi/classClient.html
 - doc/cxxapi/classes.html
 - doc/cxxapi/classHooks-members.html
 - doc/cxxapi/classHooks.html
-- doc/cxxapi/classPassenger_1_1Application-members.html
-- doc/cxxapi/classPassenger_1_1Application.html
-- doc/cxxapi/classPassenger_1_1Application_1_1Session-members.html
-- doc/cxxapi/classPassenger_1_1Application_1_1Session.html
-- doc/cxxapi/classPassenger_1_1ApplicationPool-members.html
-- doc/cxxapi/classPassenger_1_1ApplicationPool.html
-- doc/cxxapi/classPassenger_1_1ApplicationPool__inherit__graph.map
-- doc/cxxapi/classPassenger_1_1ApplicationPool__inherit__graph.md5
-- doc/cxxapi/classPassenger_1_1ApplicationPool__inherit__graph.png
-- doc/cxxapi/classPassenger_1_1ApplicationPoolServer-members.html
-- doc/cxxapi/classPassenger_1_1ApplicationPoolServer.html
+- doc/cxxapi/classPassenger_1_1AbstractSpawnManager-members.html
+- doc/cxxapi/classPassenger_1_1AbstractSpawnManager.html
+- doc/cxxapi/classPassenger_1_1AbstractSpawnManager__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1AbstractSpawnManager__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1AbstractSpawnManager__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1ArgumentException-members.html
+- doc/cxxapi/classPassenger_1_1ArgumentException.html
+- doc/cxxapi/classPassenger_1_1BacktracesServer-members.html
+- doc/cxxapi/classPassenger_1_1BacktracesServer.html
+- doc/cxxapi/classPassenger_1_1BacktracesServer__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1BacktracesServer__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1BacktracesServer__inherit__graph.png
 - doc/cxxapi/classPassenger_1_1BufferedUpload-members.html
 - doc/cxxapi/classPassenger_1_1BufferedUpload.html
 - doc/cxxapi/classPassenger_1_1BusyException-members.html
@@ -171,10 +180,17 @@ files:
 - doc/cxxapi/classPassenger_1_1ConfigurationException.html
 - doc/cxxapi/classPassenger_1_1DirectoryMapper-members.html
 - doc/cxxapi/classPassenger_1_1DirectoryMapper.html
-- doc/cxxapi/classPassenger_1_1DummySpawnManager-members.html
-- doc/cxxapi/classPassenger_1_1DummySpawnManager.html
-- doc/cxxapi/classPassenger_1_1FileChecker-members.html
-- doc/cxxapi/classPassenger_1_1FileChecker.html
+- doc/cxxapi/classPassenger_1_1EOFException-members.html
+- doc/cxxapi/classPassenger_1_1EOFException.html
+- doc/cxxapi/classPassenger_1_1EOFException__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1EOFException__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1EOFException__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1EventFd-members.html
+- doc/cxxapi/classPassenger_1_1EventFd.html
+- doc/cxxapi/classPassenger_1_1FileChangeChecker-members.html
+- doc/cxxapi/classPassenger_1_1FileChangeChecker.html
+- doc/cxxapi/classPassenger_1_1FileDescriptor-members.html
+- doc/cxxapi/classPassenger_1_1FileDescriptor.html
 - doc/cxxapi/classPassenger_1_1FileNotFoundException-members.html
 - doc/cxxapi/classPassenger_1_1FileNotFoundException.html
 - doc/cxxapi/classPassenger_1_1FileNotFoundException__inherit__graph.map
@@ -185,24 +201,63 @@ files:
 - doc/cxxapi/classPassenger_1_1FileSystemException__inherit__graph.map
 - doc/cxxapi/classPassenger_1_1FileSystemException__inherit__graph.md5
 - doc/cxxapi/classPassenger_1_1FileSystemException__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1HttpStatusExtractor-members.html
+- doc/cxxapi/classPassenger_1_1HttpStatusExtractor.html
 - doc/cxxapi/classPassenger_1_1IOException-members.html
 - doc/cxxapi/classPassenger_1_1IOException.html
 - doc/cxxapi/classPassenger_1_1IOException__inherit__graph.map
 - doc/cxxapi/classPassenger_1_1IOException__inherit__graph.md5
 - doc/cxxapi/classPassenger_1_1IOException__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1MemZeroGuard-members.html
+- doc/cxxapi/classPassenger_1_1MemZeroGuard.html
 - doc/cxxapi/classPassenger_1_1MessageChannel-members.html
 - doc/cxxapi/classPassenger_1_1MessageChannel.html
+- doc/cxxapi/classPassenger_1_1MessageServer-members.html
+- doc/cxxapi/classPassenger_1_1MessageServer.html
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1ClientContext-members.html
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1ClientContext.html
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1ClientContext__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1ClientContext__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1ClientContext__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1CommonClientContext-members.html
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1CommonClientContext.html
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1CommonClientContext__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1CommonClientContext__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1CommonClientContext__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1Handler-members.html
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1Handler.html
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1Handler__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1Handler__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1MessageServer_1_1Handler__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1Process-members.html
+- doc/cxxapi/classPassenger_1_1Process.html
+- doc/cxxapi/classPassenger_1_1RandomGenerator-members.html
+- doc/cxxapi/classPassenger_1_1RandomGenerator.html
 - doc/cxxapi/classPassenger_1_1RuntimeException-members.html
 - doc/cxxapi/classPassenger_1_1RuntimeException.html
+- doc/cxxapi/classPassenger_1_1ScgiRequestParser-members.html
+- doc/cxxapi/classPassenger_1_1ScgiRequestParser.html
+- doc/cxxapi/classPassenger_1_1SecurityException-members.html
+- doc/cxxapi/classPassenger_1_1SecurityException.html
+- doc/cxxapi/classPassenger_1_1Session-members.html
+- doc/cxxapi/classPassenger_1_1Session.html
+- doc/cxxapi/classPassenger_1_1Session__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1Session__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1Session__inherit__graph.png
 - doc/cxxapi/classPassenger_1_1SpawnException-members.html
 - doc/cxxapi/classPassenger_1_1SpawnException.html
 - doc/cxxapi/classPassenger_1_1SpawnManager-members.html
 - doc/cxxapi/classPassenger_1_1SpawnManager.html
-- doc/cxxapi/classPassenger_1_1StandardApplicationPool-members.html
-- doc/cxxapi/classPassenger_1_1StandardApplicationPool.html
-- doc/cxxapi/classPassenger_1_1StandardApplicationPool__inherit__graph.map
-- doc/cxxapi/classPassenger_1_1StandardApplicationPool__inherit__graph.md5
-- doc/cxxapi/classPassenger_1_1StandardApplicationPool__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1SpawnManager__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1SpawnManager__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1SpawnManager__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1StandardSession-members.html
+- doc/cxxapi/classPassenger_1_1StandardSession.html
+- doc/cxxapi/classPassenger_1_1StandardSession__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1StandardSession__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1StandardSession__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1StaticString-members.html
+- doc/cxxapi/classPassenger_1_1StaticString.html
 - doc/cxxapi/classPassenger_1_1SystemException-members.html
 - doc/cxxapi/classPassenger_1_1SystemException.html
 - doc/cxxapi/classPassenger_1_1SystemException__inherit__graph.map
@@ -210,14 +265,29 @@ files:
 - doc/cxxapi/classPassenger_1_1SystemException__inherit__graph.png
 - doc/cxxapi/classPassenger_1_1SystemTime-members.html
 - doc/cxxapi/classPassenger_1_1SystemTime.html
+- doc/cxxapi/classPassenger_1_1TimeoutException-members.html
+- doc/cxxapi/classPassenger_1_1TimeoutException.html
+- doc/cxxapi/classPassenger_1_1Timer-members.html
+- doc/cxxapi/classPassenger_1_1Timer.html
+- doc/cxxapi/classPassenger_1_1TimeRetrievalException-members.html
+- doc/cxxapi/classPassenger_1_1TimeRetrievalException.html
+- doc/cxxapi/classPassenger_1_1TimeRetrievalException__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1TimeRetrievalException__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1TimeRetrievalException__inherit__graph.png
+- doc/cxxapi/classServer-members.html
+- doc/cxxapi/classServer.html
+- doc/cxxapi/classServerInstanceDirToucher-members.html
+- doc/cxxapi/classServerInstanceDirToucher.html
 - doc/cxxapi/Configuration_8h-source.html
+- doc/cxxapi/Constants_8h-source.html
+- doc/cxxapi/ContentHandler_8h-source.html
 - doc/cxxapi/definitions_8h-source.html
 - doc/cxxapi/DirectoryMapper_8h-source.html
 - doc/cxxapi/doxygen.css
 - doc/cxxapi/doxygen.png
-- doc/cxxapi/DummySpawnManager_8h-source.html
 - doc/cxxapi/Exceptions_8h-source.html
-- doc/cxxapi/FileChecker_8h-source.html
+- doc/cxxapi/FileChangeChecker_8h-source.html
+- doc/cxxapi/FileDescriptor_8h-source.html
 - doc/cxxapi/files.html
 - doc/cxxapi/ftv2blank.png
 - doc/cxxapi/ftv2doc.png
@@ -232,8 +302,9 @@ files:
 - doc/cxxapi/ftv2pnode.png
 - doc/cxxapi/ftv2vertline.png
 - doc/cxxapi/functions.html
+- doc/cxxapi/functions_enum.html
+- doc/cxxapi/functions_eval.html
 - doc/cxxapi/functions_func.html
-- doc/cxxapi/functions_type.html
 - doc/cxxapi/functions_vars.html
 - doc/cxxapi/graph_legend.dot
 - doc/cxxapi/graph_legend.html
@@ -248,6 +319,7 @@ files:
 - doc/cxxapi/group__Support.html
 - doc/cxxapi/hierarchy.html
 - doc/cxxapi/Hooks_8h-source.html
+- doc/cxxapi/HttpStatusExtractor_8h-source.html
 - doc/cxxapi/index.html
 - doc/cxxapi/inherit__graph__0.map
 - doc/cxxapi/inherit__graph__0.md5
@@ -294,9 +366,54 @@ files:
 - doc/cxxapi/inherit__graph__21.map
 - doc/cxxapi/inherit__graph__21.md5
 - doc/cxxapi/inherit__graph__21.png
+- doc/cxxapi/inherit__graph__22.map
+- doc/cxxapi/inherit__graph__22.md5
+- doc/cxxapi/inherit__graph__22.png
+- doc/cxxapi/inherit__graph__23.map
+- doc/cxxapi/inherit__graph__23.md5
+- doc/cxxapi/inherit__graph__23.png
+- doc/cxxapi/inherit__graph__24.map
+- doc/cxxapi/inherit__graph__24.md5
+- doc/cxxapi/inherit__graph__24.png
+- doc/cxxapi/inherit__graph__25.map
+- doc/cxxapi/inherit__graph__25.md5
+- doc/cxxapi/inherit__graph__25.png
+- doc/cxxapi/inherit__graph__26.map
+- doc/cxxapi/inherit__graph__26.md5
+- doc/cxxapi/inherit__graph__26.png
+- doc/cxxapi/inherit__graph__27.map
+- doc/cxxapi/inherit__graph__27.md5
+- doc/cxxapi/inherit__graph__27.png
+- doc/cxxapi/inherit__graph__28.map
+- doc/cxxapi/inherit__graph__28.md5
+- doc/cxxapi/inherit__graph__28.png
+- doc/cxxapi/inherit__graph__29.map
+- doc/cxxapi/inherit__graph__29.md5
+- doc/cxxapi/inherit__graph__29.png
 - doc/cxxapi/inherit__graph__3.map
 - doc/cxxapi/inherit__graph__3.md5
 - doc/cxxapi/inherit__graph__3.png
+- doc/cxxapi/inherit__graph__30.map
+- doc/cxxapi/inherit__graph__30.md5
+- doc/cxxapi/inherit__graph__30.png
+- doc/cxxapi/inherit__graph__31.map
+- doc/cxxapi/inherit__graph__31.md5
+- doc/cxxapi/inherit__graph__31.png
+- doc/cxxapi/inherit__graph__32.map
+- doc/cxxapi/inherit__graph__32.md5
+- doc/cxxapi/inherit__graph__32.png
+- doc/cxxapi/inherit__graph__33.map
+- doc/cxxapi/inherit__graph__33.md5
+- doc/cxxapi/inherit__graph__33.png
+- doc/cxxapi/inherit__graph__34.map
+- doc/cxxapi/inherit__graph__34.md5
+- doc/cxxapi/inherit__graph__34.png
+- doc/cxxapi/inherit__graph__35.map
+- doc/cxxapi/inherit__graph__35.md5
+- doc/cxxapi/inherit__graph__35.png
+- doc/cxxapi/inherit__graph__36.map
+- doc/cxxapi/inherit__graph__36.md5
+- doc/cxxapi/inherit__graph__36.png
 - doc/cxxapi/inherit__graph__4.map
 - doc/cxxapi/inherit__graph__4.md5
 - doc/cxxapi/inherit__graph__4.png
@@ -317,25 +434,52 @@ files:
 - doc/cxxapi/inherit__graph__9.png
 - doc/cxxapi/inherits.html
 - doc/cxxapi/Logging_8h-source.html
+- doc/cxxapi/LoggingServer_8h-source.html
 - doc/cxxapi/main.html
+- doc/cxxapi/md5_8h-source.html
 - doc/cxxapi/MessageChannel_8h-source.html
+- doc/cxxapi/MessageClient_8h-source.html
+- doc/cxxapi/MessageServer_8h-source.html
 - doc/cxxapi/modules.html
+- doc/cxxapi/namespacemembers.html
+- doc/cxxapi/namespacemembers_enum.html
+- doc/cxxapi/namespacemembers_eval.html
+- doc/cxxapi/namespacemembers_func.html
+- doc/cxxapi/namespacemembers_type.html
+- doc/cxxapi/namespacePassenger.html
+- doc/cxxapi/namespaces.html
+- doc/cxxapi/nginx_2Configuration_8h-source.html
+- doc/cxxapi/ngx__http__passenger__module_8h-source.html
 - doc/cxxapi/PoolOptions_8h-source.html
+- doc/cxxapi/Process_8h-source.html
+- doc/cxxapi/RandomGenerator_8h-source.html
+- doc/cxxapi/ResourceLocator_8h-source.html
+- doc/cxxapi/ScgiRequestParser_8h-source.html
+- doc/cxxapi/ServerInstanceDir_8h-source.html
+- doc/cxxapi/Session_8h-source.html
 - doc/cxxapi/SpawnManager_8h-source.html
-- doc/cxxapi/StandardApplicationPool_8h-source.html
+- doc/cxxapi/StaticContentHandler_8h-source.html
+- doc/cxxapi/StaticString_8h-source.html
+- doc/cxxapi/StringListCreator_8h-source.html
 - doc/cxxapi/structPassenger_1_1AnythingToString-members.html
 - doc/cxxapi/structPassenger_1_1AnythingToString.html
 - doc/cxxapi/structPassenger_1_1AnythingToString_3_01vector_3_01string_01_4_01_4-members.html
 - doc/cxxapi/structPassenger_1_1AnythingToString_3_01vector_3_01string_01_4_01_4.html
+- doc/cxxapi/structPassenger_1_1MessageServer_1_1DisconnectEventBroadcastGuard-members.html
+- doc/cxxapi/structPassenger_1_1MessageServer_1_1DisconnectEventBroadcastGuard.html
 - doc/cxxapi/structPassenger_1_1PoolOptions-members.html
 - doc/cxxapi/structPassenger_1_1PoolOptions.html
+- doc/cxxapi/structPassenger_1_1StaticString_1_1Hash-members.html
+- doc/cxxapi/structPassenger_1_1StaticString_1_1Hash.html
 - doc/cxxapi/SystemTime_8h-source.html
 - doc/cxxapi/tab_b.gif
 - doc/cxxapi/tab_l.gif
 - doc/cxxapi/tab_r.gif
 - doc/cxxapi/tabs.css
+- doc/cxxapi/Timer_8h-source.html
 - doc/cxxapi/tree.html
 - doc/cxxapi/Utils_8h-source.html
+- doc/cxxapi/Version_8h-source.html
 - doc/images/by_sa.png
 - doc/images/conservative_spawning.png
 - doc/images/conservative_spawning.svg
@@ -348,12 +492,6 @@ files:
 - doc/images/spawn_server_architecture.svg
 - doc/images/typical_isolated_web_application.png
 - doc/images/typical_isolated_web_application.svg
-- doc/rdoc/created.rid
-- doc/rdoc/fr_class_index.html
-- doc/rdoc/fr_file_index.html
-- doc/rdoc/fr_method_index.html
-- doc/rdoc/index.html
-- doc/rdoc/rdoc-style.css
 - doc/template/horo.rb
 - doc/users_guide_snippets/analysis_and_system_maintenance_tools.txt
 - doc/users_guide_snippets/appendix_a_about.txt
@@ -374,16 +512,6 @@ files:
 - doc/images/icons/tip.png
 - doc/images/icons/up.png
 - doc/images/icons/warning.png
-- doc/rdoc/classes/ConditionVariable.html
-- doc/rdoc/classes/Exception.html
-- doc/rdoc/classes/GC.html
-- doc/rdoc/classes/IO.html
-- doc/rdoc/classes/PhusionPassenger.html
-- doc/rdoc/classes/PlatformInfo.html
-- doc/rdoc/classes/RakeExtensions.html
-- doc/rdoc/classes/Signal.html
-- doc/rdoc/files/DEVELOPERS_TXT.html
-- doc/rdoc/files/README.html
 - doc/images/icons/callouts/1.png
 - doc/images/icons/callouts/10.png
 - doc/images/icons/callouts/11.png
@@ -399,74 +527,6 @@ files:
 - doc/images/icons/callouts/7.png
 - doc/images/icons/callouts/8.png
 - doc/images/icons/callouts/9.png
-- doc/rdoc/classes/PhusionPassenger/AbstractInstaller.html
-- doc/rdoc/classes/PhusionPassenger/AbstractRequestHandler.html
-- doc/rdoc/classes/PhusionPassenger/AbstractServer.html
-- doc/rdoc/classes/PhusionPassenger/AbstractServerCollection.html
-- doc/rdoc/classes/PhusionPassenger/AdminTools.html
-- doc/rdoc/classes/PhusionPassenger/AppInitError.html
-- doc/rdoc/classes/PhusionPassenger/Application.html
-- doc/rdoc/classes/PhusionPassenger/ConsoleTextTemplate.html
-- doc/rdoc/classes/PhusionPassenger/FrameworkInitError.html
-- doc/rdoc/classes/PhusionPassenger/HTMLTemplate.html
-- doc/rdoc/classes/PhusionPassenger/InitializationError.html
-- doc/rdoc/classes/PhusionPassenger/InvalidPath.html
-- doc/rdoc/classes/PhusionPassenger/MessageChannel.html
-- doc/rdoc/classes/PhusionPassenger/NativeSupport.html
-- doc/rdoc/classes/PhusionPassenger/Rack.html
-- doc/rdoc/classes/PhusionPassenger/Railz.html
-- doc/rdoc/classes/PhusionPassenger/SpawnManager.html
-- doc/rdoc/classes/PhusionPassenger/UnknownError.html
-- doc/rdoc/classes/PhusionPassenger/Utils.html
-- doc/rdoc/classes/PhusionPassenger/VersionNotFound.html
-- doc/rdoc/classes/PhusionPassenger/WSGI.html
-- doc/rdoc/classes/PhusionPassenger/AbstractServer/ServerAlreadyStarted.html
-- doc/rdoc/classes/PhusionPassenger/AbstractServer/ServerError.html
-- doc/rdoc/classes/PhusionPassenger/AbstractServer/ServerNotStarted.html
-- doc/rdoc/classes/PhusionPassenger/AbstractServer/UnknownMessage.html
-- doc/rdoc/classes/PhusionPassenger/AdminTools/ControlProcess.html
-- doc/rdoc/classes/PhusionPassenger/Rack/ApplicationSpawner.html
-- doc/rdoc/classes/PhusionPassenger/Rack/RequestHandler.html
-- doc/rdoc/classes/PhusionPassenger/Railz/ApplicationSpawner.html
-- doc/rdoc/classes/PhusionPassenger/Railz/CGIFixed.html
-- doc/rdoc/classes/PhusionPassenger/Railz/FrameworkSpawner.html
-- doc/rdoc/classes/PhusionPassenger/Railz/RequestHandler.html
-- doc/rdoc/classes/PhusionPassenger/Utils/PseudoIO.html
-- doc/rdoc/classes/PhusionPassenger/Utils/RewindableInput.html
-- doc/rdoc/classes/PhusionPassenger/WSGI/ApplicationSpawner.html
-- doc/rdoc/files/ext/phusion_passenger/native_support_c.html
-- doc/rdoc/files/lib/phusion_passenger/abstract_installer_rb.html
-- doc/rdoc/files/lib/phusion_passenger/abstract_request_handler_rb.html
-- doc/rdoc/files/lib/phusion_passenger/abstract_server_collection_rb.html
-- doc/rdoc/files/lib/phusion_passenger/abstract_server_rb.html
-- doc/rdoc/files/lib/phusion_passenger/admin_tools_rb.html
-- doc/rdoc/files/lib/phusion_passenger/application_rb.html
-- doc/rdoc/files/lib/phusion_passenger/console_text_template_rb.html
-- doc/rdoc/files/lib/phusion_passenger/constants_rb.html
-- doc/rdoc/files/lib/phusion_passenger/dependencies_rb.html
-- doc/rdoc/files/lib/phusion_passenger/events_rb.html
-- doc/rdoc/files/lib/phusion_passenger/exceptions_rb.html
-- doc/rdoc/files/lib/phusion_passenger/html_template_rb.html
-- doc/rdoc/files/lib/phusion_passenger/message_channel_rb.html
-- doc/rdoc/files/lib/phusion_passenger/packaging_rb.html
-- doc/rdoc/files/lib/phusion_passenger/platform_info_rb.html
-- doc/rdoc/files/lib/phusion_passenger/simple_benchmarking_rb.html
-- doc/rdoc/files/lib/phusion_passenger/spawn_manager_rb.html
-- doc/rdoc/files/lib/phusion_passenger/utils_rb.html
-- doc/rdoc/files/misc/rake/extensions_rb.html
-- doc/rdoc/classes/PhusionPassenger/AdminTools/ControlProcess/Instance.html
-- doc/rdoc/classes/PhusionPassenger/Railz/ApplicationSpawner/Error.html
-- doc/rdoc/classes/PhusionPassenger/Railz/FrameworkSpawner/Error.html
-- doc/rdoc/classes/PhusionPassenger/Utils/RewindableInput/Tempfile.html
-- doc/rdoc/files/lib/phusion_passenger/admin_tools/control_process_rb.html
-- doc/rdoc/files/lib/phusion_passenger/rack/application_spawner_rb.html
-- doc/rdoc/files/lib/phusion_passenger/rack/request_handler_rb.html
-- doc/rdoc/files/lib/phusion_passenger/railz/application_spawner_rb.html
-- doc/rdoc/files/lib/phusion_passenger/railz/cgi_fixed_rb.html
-- doc/rdoc/files/lib/phusion_passenger/railz/framework_spawner_rb.html
-- doc/rdoc/files/lib/phusion_passenger/railz/request_handler_rb.html
-- doc/rdoc/files/lib/phusion_passenger/utils/rewindable_input_rb.html
-- doc/rdoc/files/lib/phusion_passenger/wsgi/application_spawner_rb.html
 - man/passenger-config.1
 - man/passenger-make-enterprisey.8
 - man/passenger-memory-stats.8