passenger 3.0.0 → 3.0.1

data/doc/cxxapi/inherit__graph__29.map

@@ -1,3 +1,3 @@
 <map id="G" name="G">
-<area shape="rect" id="node1" href="$classPassenger_1_1SpawnException.html" title="Thrown when SpawnManager or ApplicationPool fails to spawn an application instance..." alt="" coords="5,5,205,35"/>
+<area shape="rect" id="node1" href="$classPassenger_1_1ScgiRequestParser.html" title="A parser for SCGI requests." alt="" coords="5,5,221,35"/>
 </map>

data/doc/cxxapi/inherit__graph__29.md5

@@ -1 +1 @@
-addca4402f675f47f9f3f62e4f51de86
+c811567720f8da79b1f587be59990802

data/doc/cxxapi/inherit__graph__30.map

@@ -1,3 +1,3 @@
 <map id="G" name="G">
-<area shape="rect" id="node1" href="$classPassenger_1_1StaticString.html" title="An immutable, static byte buffer." alt="" coords="7,5,177,35"/>
+<area shape="rect" id="node1" href="$classPassenger_1_1SecurityException.html" title="Represents some kind of security error." alt="" coords="5,5,216,35"/>
 </map>

data/doc/cxxapi/inherit__graph__30.md5

@@ -1 +1 @@
-1599db2305d2a5afab533e74ee13ae7c
+a30aec8b73c6ee386e251d2a0565e3b0

data/doc/cxxapi/inherit__graph__31.map

@@ -1,3 +1,4 @@
 <map id="G" name="G">
-<area shape="rect" id="node1" href="$structPassenger_1_1StaticString_1_1Hash.html" title="A hash function object for StaticString." alt="" coords="7,5,217,35"/>
+<area shape="rect" id="node1" href="$classPassenger_1_1Session.html" title="Represents a single request/response pair of an application process." alt="" coords="5,5,152,35"/>
+<area shape="rect" id="node3" href="$classPassenger_1_1StandardSession.html" title="A &quot;standard&quot; implementation of Session." alt="" coords="200,5,405,35"/>
 </map>

data/doc/cxxapi/inherit__graph__31.md5

@@ -1 +1 @@
-ca2589e91690cdcd4599a12183031cbe
+bf5acc7223718bf4ec0457df83296d9a

data/doc/cxxapi/inherit__graph__32.map

@@ -1,5 +1,3 @@
 <map id="G" name="G">
-<area shape="rect" id="node1" href="$classPassenger_1_1SystemException.html" title="Represents an error returned by a system call or a standard library call." alt="" coords="5,32,213,61"/>
-<area shape="rect" id="node3" href="$classPassenger_1_1FileSystemException.html" title="A filesystem error, as returned by the operating system." alt="" coords="271,5,497,35"/>
-<area shape="rect" id="node5" href="$classPassenger_1_1TimeRetrievalException.html" title="Unable to retrieve the system time using time()." alt="" coords="263,59,505,88"/>
+<area shape="rect" id="node1" href="$classPassenger_1_1SpawnException.html" title="Thrown when SpawnManager or ApplicationPool fails to spawn an application instance..." alt="" coords="5,5,205,35"/>
 </map>

data/doc/cxxapi/inherit__graph__32.md5

@@ -1 +1 @@
-42770577cc354ad419416644abc40e70
+addca4402f675f47f9f3f62e4f51de86

data/doc/cxxapi/inherit__graph__33.map

@@ -1,3 +1,3 @@
 <map id="G" name="G">
-<area shape="rect" id="node1" href="$classPassenger_1_1TimeoutException.html" title="An exception indicating that some timeout expired." alt="" coords="5,5,216,35"/>
+<area shape="rect" id="node1" href="$classPassenger_1_1StaticString.html" title="An immutable, static byte buffer." alt="" coords="7,5,177,35"/>
 </map>

data/doc/cxxapi/inherit__graph__33.md5

@@ -1 +1 @@
-e011e6aaa3322750aa4eb2b9038df83b
+1599db2305d2a5afab533e74ee13ae7c

data/doc/cxxapi/inherit__graph__34.map

@@ -1,3 +1,3 @@
 <map id="G" name="G">
-<area shape="rect" id="node1" href="$classPassenger_1_1Uint16Message.html" title="For 16&#45;bit big&#45;endian integers." alt="" coords="7,5,201,35"/>
+<area shape="rect" id="node1" href="$structPassenger_1_1StaticString_1_1Hash.html" title="A hash function object for StaticString." alt="" coords="7,5,217,35"/>
 </map>

data/doc/cxxapi/inherit__graph__34.md5

@@ -1 +1 @@
-f4e847cb129a1a1896a506f463bb7b63
+ca2589e91690cdcd4599a12183031cbe

data/doc/cxxapi/inherit__graph__35.map

@@ -1,3 +1,5 @@
 <map id="G" name="G">
-<area shape="rect" id="node1" href="$classPassenger_1_1Uint32Message.html" title="For 32&#45;bit big&#45;endian integers." alt="" coords="7,5,201,35"/>
+<area shape="rect" id="node1" href="$classPassenger_1_1SystemException.html" title="Represents an error returned by a system call or a standard library call." alt="" coords="5,32,213,61"/>
+<area shape="rect" id="node3" href="$classPassenger_1_1FileSystemException.html" title="A filesystem error, as returned by the operating system." alt="" coords="271,5,497,35"/>
+<area shape="rect" id="node5" href="$classPassenger_1_1TimeRetrievalException.html" title="Unable to retrieve the system time using time()." alt="" coords="263,59,505,88"/>
 </map>

data/doc/cxxapi/inherit__graph__35.md5

@@ -1 +1 @@
-c443ee7bdc3e4ed0dd4bb3e420a207e8
+42770577cc354ad419416644abc40e70

data/doc/cxxapi/inherit__graph__36.map

@@ -1,3 +1,3 @@
 <map id="G" name="G">
-<area shape="rect" id="node1" href="$classServer.html" title="A representation of the Server responsible for handling Client instances." alt="" coords="5,5,69,35"/>
+<area shape="rect" id="node1" href="$classPassenger_1_1TimeoutException.html" title="An exception indicating that some timeout expired." alt="" coords="5,5,216,35"/>
 </map>

data/doc/cxxapi/inherit__graph__36.md5

@@ -1 +1 @@
-49c26619ea57b6fab68bb69492ab64b3
+e011e6aaa3322750aa4eb2b9038df83b

data/doc/cxxapi/inherit__graph__37.map

@@ -1,3 +1,3 @@
 <map id="G" name="G">
-<area shape="rect" id="node1" href="$classServerInstanceDirToucher.html" title="Touch all files in the server instance dir every 6 hours in order to prevent /tmp..." alt="" coords="7,5,191,35"/>
+<area shape="rect" id="node1" href="$classPassenger_1_1Uint16Message.html" title="For 16&#45;bit big&#45;endian integers." alt="" coords="7,5,201,35"/>
 </map>

data/doc/cxxapi/inherit__graph__37.md5

@@ -1 +1 @@
-895fbb1cabd5da8622d5341648d91bb3
+f4e847cb129a1a1896a506f463bb7b63

data/doc/cxxapi/inherit__graph__38.map

@@ -1 +1,3 @@
-<area shape="rect" href="$classServer.html" title="A representation of the Server responsible for handling Client instances." alt="" coords="7,5,68,32">
+<map id="G" name="G">
+<area shape="rect" id="node1" href="$classPassenger_1_1Uint32Message.html" title="For 32&#45;bit big&#45;endian integers." alt="" coords="7,5,201,35"/>
+</map>

data/doc/cxxapi/inherit__graph__38.md5

@@ -1 +1 @@
-49c26619ea57b6fab68bb69492ab64b3
+c443ee7bdc3e4ed0dd4bb3e420a207e8

data/doc/cxxapi/inherit__graph__39.map

@@ -1 +1,3 @@
-<area shape="rect" href="$classServerInstanceDirToucher.html" title="Touch all files in the server instance dir every 6 hours in order to prevent /tmp..." alt="" coords="5,5,187,32">
+<map id="G" name="G">
+<area shape="rect" id="node1" href="$classServer.html" title="A representation of the Server responsible for handling Client instances." alt="" coords="5,5,69,35"/>
+</map>

data/doc/cxxapi/inherit__graph__39.md5

@@ -1 +1 @@
-895fbb1cabd5da8622d5341648d91bb3
+49c26619ea57b6fab68bb69492ab64b3

data/doc/cxxapi/inherits.html

@@ -72,76 +72,85 @@
 <tr><td><img src="inherit__graph__13.png" border="0" alt="" usemap="#Passenger_1_1FileDescriptor_map"/>
 <map name="Passenger_1_1FileDescriptor_map" id="Passenger_1_1FileDescriptor">
 <area shape="rect" id="node1" href="classPassenger_1_1FileDescriptor.html" title="Wrapper class around a file descriptor integer, for RAII behavior." alt="" coords="5,5,189,35"/></map></td></tr>
-<tr><td><img src="inherit__graph__14.png" border="0" alt="" usemap="#Passenger_1_1HttpStatusExtractor_map"/>
+<tr><td><img src="inherit__graph__14.png" border="0" alt="" usemap="#Passenger_1_1FileDescriptorPair_map"/>
+<map name="Passenger_1_1FileDescriptorPair_map" id="Passenger_1_1FileDescriptorPair">
+<area shape="rect" id="node1" href="classPassenger_1_1FileDescriptorPair.html" title="A structure containing two FileDescriptor objects." alt="" coords="5,5,213,35"/></map></td></tr>
+<tr><td><img src="inherit__graph__15.png" border="0" alt="" usemap="#Passenger_1_1HttpStatusExtractor_map"/>
 <map name="Passenger_1_1HttpStatusExtractor_map" id="Passenger_1_1HttpStatusExtractor">
 <area shape="rect" id="node1" href="classPassenger_1_1HttpStatusExtractor.html" title="Utility class for extracting the HTTP status value from an HTTP response." alt="" coords="5,5,229,35"/></map></td></tr>
-<tr><td><img src="inherit__graph__15.png" border="0" alt="" usemap="#Passenger_1_1IOException_map"/>
+<tr><td><img src="inherit__graph__16.png" border="0" alt="" usemap="#Passenger_1_1IOException_map"/>
 <map name="Passenger_1_1IOException_map" id="Passenger_1_1IOException">
 <area shape="rect" id="node1" href="classPassenger_1_1IOException.html" title="Represents an error that occured during an I/O operation." alt="" coords="7,32,177,61"/><area shape="rect" id="node3" href="classPassenger_1_1EOFException.html" title="An unexpected end&#45;of&#45;file I/O error." alt="" coords="256,5,440,35"/><area shape="rect" id="node5" href="classPassenger_1_1FileNotFoundException.html" title="Thrown when a certain file cannot be found." alt="" coords="228,59,468,88"/></map></td></tr>
-<tr><td><img src="inherit__graph__16.png" border="0" alt="" usemap="#Passenger_1_1MessageChannel_map"/>
+<tr><td><img src="inherit__graph__17.png" border="0" alt="" usemap="#Passenger_1_1MessageChannel_map"/>
 <map name="Passenger_1_1MessageChannel_map" id="Passenger_1_1MessageChannel">
 <area shape="rect" id="node1" href="classPassenger_1_1MessageChannel.html" title="Convenience class for I/O operations on file descriptors." alt="" coords="5,5,211,35"/></map></td></tr>
-<tr><td><img src="inherit__graph__17.png" border="0" alt="" usemap="#Passenger_1_1MessageServer_map"/>
+<tr><td><img src="inherit__graph__18.png" border="0" alt="" usemap="#Passenger_1_1MessageServer_map"/>
 <map name="Passenger_1_1MessageServer_map" id="Passenger_1_1MessageServer">
 <area shape="rect" id="node1" href="classPassenger_1_1MessageServer.html" title="Simple pluggable request/response messaging server framework." alt="" coords="7,5,201,35"/></map></td></tr>
-<tr><td><img src="inherit__graph__18.png" border="0" alt="" usemap="#Passenger_1_1MessageServer_1_1ClientContext_map"/>
+<tr><td><img src="inherit__graph__19.png" border="0" alt="" usemap="#Passenger_1_1MessageServer_1_1ClientContext_map"/>
 <map name="Passenger_1_1MessageServer_1_1ClientContext_map" id="Passenger_1_1MessageServer_1_1ClientContext">
 <area shape="rect" id="node1" href="classPassenger_1_1MessageServer_1_1ClientContext.html" title="Interface for client context objects." alt="" coords="7,5,295,35"/><area shape="rect" id="node3" href="classPassenger_1_1MessageServer_1_1CommonClientContext.html" title="A common client context, containing client&#45;specific information used by MessageServer..." alt="" coords="345,5,692,35"/></map></td></tr>
-<tr><td><img src="inherit__graph__19.png" border="0" alt="" usemap="#Passenger_1_1MessageServer_1_1DisconnectEventBroadcastGuard_map"/>
+<tr><td><img src="inherit__graph__20.png" border="0" alt="" usemap="#Passenger_1_1MessageServer_1_1DisconnectEventBroadcastGuard_map"/>
 <map name="Passenger_1_1MessageServer_1_1DisconnectEventBroadcastGuard_map" id="Passenger_1_1MessageServer_1_1DisconnectEventBroadcastGuard">
 <area shape="rect" id="node1" href="structPassenger_1_1MessageServer_1_1DisconnectEventBroadcastGuard.html" title="Calls clientDisconnected() on all handlers when destroyed." alt="" coords="7,5,420,35"/></map></td></tr>
-<tr><td><img src="inherit__graph__20.png" border="0" alt="" usemap="#Passenger_1_1MessageServer_1_1Handler_map"/>
+<tr><td><img src="inherit__graph__21.png" border="0" alt="" usemap="#Passenger_1_1MessageServer_1_1Handler_map"/>
 <map name="Passenger_1_1MessageServer_1_1Handler_map" id="Passenger_1_1MessageServer_1_1Handler">
 <area shape="rect" id="node1" href="classPassenger_1_1MessageServer_1_1Handler.html" title="An abstract message handler class." alt="" coords="5,5,259,35"/></map></td></tr>
-<tr><td><img src="inherit__graph__21.png" border="0" alt="" usemap="#Passenger_1_1PoolOptions_map"/>
+<tr><td><img src="inherit__graph__22.png" border="0" alt="" usemap="#Passenger_1_1PoolOptions_map"/>
 <map name="Passenger_1_1PoolOptions_map" id="Passenger_1_1PoolOptions">
 <area shape="rect" id="node1" href="structPassenger_1_1PoolOptions.html" title="This struct encapsulates information for ApplicationPool::get() and for SpawnManager::spawn()..." alt="" coords="7,5,177,35"/></map></td></tr>
-<tr><td><img src="inherit__graph__22.png" border="0" alt="" usemap="#Passenger_1_1Process_map"/>
+<tr><td><img src="inherit__graph__23.png" border="0" alt="" usemap="#Passenger_1_1Process_map"/>
 <map name="Passenger_1_1Process_map" id="Passenger_1_1Process">
 <area shape="rect" id="node1" href="classPassenger_1_1Process.html" title="Represents a single application process, as spawned by SpawnManager or by ApplicationPool::Interface..." alt="" coords="5,5,152,35"/></map></td></tr>
-<tr><td><img src="inherit__graph__23.png" border="0" alt="" usemap="#Passenger_1_1RandomGenerator_map"/>
+<tr><td><img src="inherit__graph__24.png" border="0" alt="" usemap="#Passenger_1_1RandomGenerator_map"/>
 <map name="Passenger_1_1RandomGenerator_map" id="Passenger_1_1RandomGenerator">
 <area shape="rect" id="node1" href="classPassenger_1_1RandomGenerator.html" title="A random data generator." alt="" coords="7,5,220,35"/></map></td></tr>
-<tr><td><img src="inherit__graph__24.png" border="0" alt="" usemap="#Passenger_1_1RuntimeException_map"/>
+<tr><td><img src="inherit__graph__25.png" border="0" alt="" usemap="#Passenger_1_1ResourceLocator_map"/>
+<map name="Passenger_1_1ResourceLocator_map" id="Passenger_1_1ResourceLocator">
+<area shape="rect" id="node1" href="classPassenger_1_1ResourceLocator.html" title="Locates various Phusion Passenger resources on the filesystem." alt="" coords="7,5,209,35"/></map></td></tr>
+<tr><td><img src="inherit__graph__26.png" border="0" alt="" usemap="#Passenger_1_1RuntimeException_map"/>
 <map name="Passenger_1_1RuntimeException_map" id="Passenger_1_1RuntimeException">
 <area shape="rect" id="node1" href="classPassenger_1_1RuntimeException.html" title="A generic runtime exception." alt="" coords="7,5,217,35"/></map></td></tr>
-<tr><td><img src="inherit__graph__25.png" border="0" alt="" usemap="#Passenger_1_1ScalarMessage_map"/>
+<tr><td><img src="inherit__graph__27.png" border="0" alt="" usemap="#Passenger_1_1SafeLibev_map"/>
+<map name="Passenger_1_1SafeLibev_map" id="Passenger_1_1SafeLibev">
+<area shape="rect" id="node1" href="classPassenger_1_1SafeLibev.html" title="Class for thread&#45;safely using libev." alt="" coords="7,5,164,35"/></map></td></tr>
+<tr><td><img src="inherit__graph__28.png" border="0" alt="" usemap="#Passenger_1_1ScalarMessage_map"/>
 <map name="Passenger_1_1ScalarMessage_map" id="Passenger_1_1ScalarMessage">
 <area shape="rect" id="node1" href="classPassenger_1_1ScalarMessage.html" title="Class for reading a scalar message." alt="" coords="7,5,199,35"/></map></td></tr>
-<tr><td><img src="inherit__graph__26.png" border="0" alt="" usemap="#Passenger_1_1ScgiRequestParser_map"/>
+<tr><td><img src="inherit__graph__29.png" border="0" alt="" usemap="#Passenger_1_1ScgiRequestParser_map"/>
 <map name="Passenger_1_1ScgiRequestParser_map" id="Passenger_1_1ScgiRequestParser">
 <area shape="rect" id="node1" href="classPassenger_1_1ScgiRequestParser.html" title="A parser for SCGI requests." alt="" coords="5,5,221,35"/></map></td></tr>
-<tr><td><img src="inherit__graph__27.png" border="0" alt="" usemap="#Passenger_1_1SecurityException_map"/>
+<tr><td><img src="inherit__graph__30.png" border="0" alt="" usemap="#Passenger_1_1SecurityException_map"/>
 <map name="Passenger_1_1SecurityException_map" id="Passenger_1_1SecurityException">
 <area shape="rect" id="node1" href="classPassenger_1_1SecurityException.html" title="Represents some kind of security error." alt="" coords="5,5,216,35"/></map></td></tr>
-<tr><td><img src="inherit__graph__28.png" border="0" alt="" usemap="#Passenger_1_1Session_map"/>
+<tr><td><img src="inherit__graph__31.png" border="0" alt="" usemap="#Passenger_1_1Session_map"/>
 <map name="Passenger_1_1Session_map" id="Passenger_1_1Session">
 <area shape="rect" id="node1" href="classPassenger_1_1Session.html" title="Represents a single request/response pair of an application process." alt="" coords="5,5,152,35"/><area shape="rect" id="node3" href="classPassenger_1_1StandardSession.html" title="A &quot;standard&quot; implementation of Session." alt="" coords="200,5,405,35"/></map></td></tr>
-<tr><td><img src="inherit__graph__29.png" border="0" alt="" usemap="#Passenger_1_1SpawnException_map"/>
+<tr><td><img src="inherit__graph__32.png" border="0" alt="" usemap="#Passenger_1_1SpawnException_map"/>
 <map name="Passenger_1_1SpawnException_map" id="Passenger_1_1SpawnException">
 <area shape="rect" id="node1" href="classPassenger_1_1SpawnException.html" title="Thrown when SpawnManager or ApplicationPool fails to spawn an application instance..." alt="" coords="5,5,205,35"/></map></td></tr>
-<tr><td><img src="inherit__graph__30.png" border="0" alt="" usemap="#Passenger_1_1StaticString_map"/>
+<tr><td><img src="inherit__graph__33.png" border="0" alt="" usemap="#Passenger_1_1StaticString_map"/>
 <map name="Passenger_1_1StaticString_map" id="Passenger_1_1StaticString">
 <area shape="rect" id="node1" href="classPassenger_1_1StaticString.html" title="An immutable, static byte buffer." alt="" coords="7,5,177,35"/></map></td></tr>
-<tr><td><img src="inherit__graph__31.png" border="0" alt="" usemap="#Passenger_1_1StaticString_1_1Hash_map"/>
+<tr><td><img src="inherit__graph__34.png" border="0" alt="" usemap="#Passenger_1_1StaticString_1_1Hash_map"/>
 <map name="Passenger_1_1StaticString_1_1Hash_map" id="Passenger_1_1StaticString_1_1Hash">
 <area shape="rect" id="node1" href="structPassenger_1_1StaticString_1_1Hash.html" title="A hash function object for StaticString." alt="" coords="7,5,217,35"/></map></td></tr>
-<tr><td><img src="inherit__graph__32.png" border="0" alt="" usemap="#Passenger_1_1SystemException_map"/>
+<tr><td><img src="inherit__graph__35.png" border="0" alt="" usemap="#Passenger_1_1SystemException_map"/>
 <map name="Passenger_1_1SystemException_map" id="Passenger_1_1SystemException">
 <area shape="rect" id="node1" href="classPassenger_1_1SystemException.html" title="Represents an error returned by a system call or a standard library call." alt="" coords="5,32,213,61"/><area shape="rect" id="node3" href="classPassenger_1_1FileSystemException.html" title="A filesystem error, as returned by the operating system." alt="" coords="271,5,497,35"/><area shape="rect" id="node5" href="classPassenger_1_1TimeRetrievalException.html" title="Unable to retrieve the system time using time()." alt="" coords="263,59,505,88"/></map></td></tr>
-<tr><td><img src="inherit__graph__33.png" border="0" alt="" usemap="#Passenger_1_1TimeoutException_map"/>
+<tr><td><img src="inherit__graph__36.png" border="0" alt="" usemap="#Passenger_1_1TimeoutException_map"/>
 <map name="Passenger_1_1TimeoutException_map" id="Passenger_1_1TimeoutException">
 <area shape="rect" id="node1" href="classPassenger_1_1TimeoutException.html" title="An exception indicating that some timeout expired." alt="" coords="5,5,216,35"/></map></td></tr>
-<tr><td><img src="inherit__graph__34.png" border="0" alt="" usemap="#Passenger_1_1Uint16Message_map"/>
+<tr><td><img src="inherit__graph__37.png" border="0" alt="" usemap="#Passenger_1_1Uint16Message_map"/>
 <map name="Passenger_1_1Uint16Message_map" id="Passenger_1_1Uint16Message">
 <area shape="rect" id="node1" href="classPassenger_1_1Uint16Message.html" title="For 16&#45;bit big&#45;endian integers." alt="" coords="7,5,201,35"/></map></td></tr>
-<tr><td><img src="inherit__graph__35.png" border="0" alt="" usemap="#Passenger_1_1Uint32Message_map"/>
+<tr><td><img src="inherit__graph__38.png" border="0" alt="" usemap="#Passenger_1_1Uint32Message_map"/>
 <map name="Passenger_1_1Uint32Message_map" id="Passenger_1_1Uint32Message">
 <area shape="rect" id="node1" href="classPassenger_1_1Uint32Message.html" title="For 32&#45;bit big&#45;endian integers." alt="" coords="7,5,201,35"/></map></td></tr>
-<tr><td><img src="inherit__graph__36.png" border="0" alt="" usemap="#Server_map"/>
+<tr><td><img src="inherit__graph__39.png" border="0" alt="" usemap="#Server_map"/>
 <map name="Server_map" id="Server">
 <area shape="rect" id="node1" href="classServer.html" title="A representation of the Server responsible for handling Client instances." alt="" coords="5,5,69,35"/></map></td></tr>
-<tr><td><img src="inherit__graph__37.png" border="0" alt="" usemap="#ServerInstanceDirToucher_map"/>
+<tr><td><img src="inherit__graph__40.png" border="0" alt="" usemap="#ServerInstanceDirToucher_map"/>
 <map name="ServerInstanceDirToucher_map" id="ServerInstanceDirToucher">
 <area shape="rect" id="node1" href="classServerInstanceDirToucher.html" title="Touch all files in the server instance dir every 6 hours in order to prevent /tmp..." alt="" coords="7,5,191,35"/></map></td></tr>
 </table>

data/doc/cxxapi/namespacePassenger.html

@@ -69,6 +69,8 @@
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The application pool is too busy and cannot fulfill a get() request.  <a href="classPassenger_1_1BusyException.html#_details">More...</a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classPassenger_1_1FileDescriptor.html">FileDescriptor</a></td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Wrapper class around a file descriptor integer, for RAII behavior.  <a href="classPassenger_1_1FileDescriptor.html#_details">More...</a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classPassenger_1_1FileDescriptorPair.html">FileDescriptorPair</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A structure containing two <a class="el" href="classPassenger_1_1FileDescriptor.html" title="Wrapper class around a file descriptor integer, for RAII behavior.">FileDescriptor</a> objects.  <a href="classPassenger_1_1FileDescriptorPair.html#_details">More...</a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classPassenger_1_1EventFd.html">EventFd</a></td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A synchronization mechanism that's implemented with file descriptors, and as such can be used in combination with select() and friends.  <a href="classPassenger_1_1EventFd.html#_details">More...</a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classPassenger_1_1MessageChannel.html">MessageChannel</a></td></tr>
@@ -89,6 +91,10 @@
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Represents a single application process, as spawned by <a class="el" href="classPassenger_1_1SpawnManager.html" title="An AbstractSpawnManager implementation.">SpawnManager</a> or by ApplicationPool::Interface::get().  <a href="classPassenger_1_1Process.html#_details">More...</a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classPassenger_1_1RandomGenerator.html">RandomGenerator</a></td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A random data generator.  <a href="classPassenger_1_1RandomGenerator.html#_details">More...</a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classPassenger_1_1ResourceLocator.html">ResourceLocator</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Locates various Phusion <a class="el" href="namespacePassenger.html" title="Common code for all agents.">Passenger</a> resources on the filesystem.  <a href="classPassenger_1_1ResourceLocator.html#_details">More...</a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classPassenger_1_1SafeLibev.html">SafeLibev</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Class for thread-safely using libev.  <a href="classPassenger_1_1SafeLibev.html#_details">More...</a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classPassenger_1_1Session.html">Session</a></td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Represents a single request/response pair of an application process.  <a href="classPassenger_1_1Session.html#_details">More...</a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classPassenger_1_1StandardSession.html">StandardSession</a></td></tr>
@@ -161,6 +167,10 @@ string&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gr
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a979cb43cef743bf261c329b13e712366"></a><!-- doxytag: member="Passenger::getSignalName" ref="a979cb43cef743bf261c329b13e712366" args="(int sig)" -->
 string&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="namespacePassenger.html#a979cb43cef743bf261c329b13e712366">getSignalName</a> (int sig)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Convert a signal number to its associated name. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="namespacePassenger.html#a2029ad8cb57611ab161b20ef9df39c86">resetSignalHandlersAndMask</a> ()</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Resets the current process's signal handler disposition and signal mask to default values.  <a href="#a2029ad8cb57611ab161b20ef9df39c86"></a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="namespacePassenger.html#af116b11276c90901729b6ce541dd2a07">closeAllFileDescriptors</a> (int lastToKeepOpen)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Close all file descriptors that are higher than <em>lastToKeepOpen</em>.  <a href="#af116b11276c90901729b6ce541dd2a07"></a><br/></td></tr>
 <tr><td class="memTemplParams" colspan="2">template&lt;typename T &gt; </td></tr>
 <tr><td class="memTemplItemLeft" align="right" valign="top">shared_ptr&lt; T &gt;&nbsp;</td><td class="memTemplItemRight" valign="bottom"><a class="el" href="group__Support.html#ga41b6c4a82fed72531a147de0505a8396">ptr</a> (T *pointer)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Convenience shortcut for creating a <code>shared_ptr</code>.  <a href="group__Support.html#ga41b6c4a82fed72531a147de0505a8396"></a><br/></td></tr>
@@ -280,6 +290,27 @@ string&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="na
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
+<a class="anchor" id="af116b11276c90901729b6ce541dd2a07"></a><!-- doxytag: member="Passenger::closeAllFileDescriptors" ref="af116b11276c90901729b6ce541dd2a07" args="(int lastToKeepOpen)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void Passenger::closeAllFileDescriptors </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>lastToKeepOpen</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Close all file descriptors that are higher than <em>lastToKeepOpen</em>. </p>
+<p>This function is async-signal safe. But make sure there are no other threads running that might open file descriptors! </p>
+
+</div>
+</div>
 <a class="anchor" id="a1d0a66b0e207c46dc6124ff3b2f331e6"></a><!-- doxytag: member="Passenger::getHostName" ref="a1d0a66b0e207c46dc6124ff3b2f331e6" args="()" -->
 <div class="memitem">
 <div class="memproto">
@@ -489,6 +520,27 @@ string&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="na
   </dd>
 </dl>
 
+</div>
+</div>
+<a class="anchor" id="a2029ad8cb57611ab161b20ef9df39c86"></a><!-- doxytag: member="Passenger::resetSignalHandlersAndMask" ref="a2029ad8cb57611ab161b20ef9df39c86" args="()" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void Passenger::resetSignalHandlersAndMask </td>
+          <td>(</td>
+          <td class="paramname"></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Resets the current process's signal handler disposition and signal mask to default values. </p>
+<p>One should call this every time one forks a child process; non-default signal masks/handler dispositions can cause all kinds of weird quirks, like waitpid() malfunctioning on OS X.</p>
+<p>This function is async-signal safe. </p>
+
 </div>
 </div>
 </div>

data/doc/cxxapi/namespacemembers.html

@@ -42,6 +42,9 @@ Here is a list of all documented namespace members with links to the namespaces
 <li>canonicalizePath()
 : <a class="el" href="group__Support.html#gaf3b0a483f0a252ae08d9de9f8b267d36">Passenger</a>
 </li>
+<li>closeAllFileDescriptors()
+: <a class="el" href="namespacePassenger.html#af116b11276c90901729b6ce541dd2a07">Passenger</a>
+</li>
 <li>createFile()
 : <a class="el" href="group__Support.html#ga6f414070373465da2e12947463f69953">Passenger</a>
 </li>
@@ -105,6 +108,9 @@ Here is a list of all documented namespace members with links to the namespaces
 <li>removeDirTree()
 : <a class="el" href="namespacePassenger.html#a8422d210cbd2f62d21254415b5a7f747">Passenger</a>
 </li>
+<li>resetSignalHandlersAndMask()
+: <a class="el" href="namespacePassenger.html#a2029ad8cb57611ab161b20ef9df39c86">Passenger</a>
+</li>
 <li>resolveSymlink()
 : <a class="el" href="group__Support.html#gac3d2b3d608188527d888e63d22c5163c">Passenger</a>
 </li>

data/doc/cxxapi/namespacemembers_func.html

@@ -39,6 +39,9 @@
 <li>canonicalizePath()
 : <a class="el" href="group__Support.html#gaf3b0a483f0a252ae08d9de9f8b267d36">Passenger</a>
 </li>
+<li>closeAllFileDescriptors()
+: <a class="el" href="namespacePassenger.html#af116b11276c90901729b6ce541dd2a07">Passenger</a>
+</li>
 <li>createFile()
 : <a class="el" href="group__Support.html#ga6f414070373465da2e12947463f69953">Passenger</a>
 </li>
@@ -84,6 +87,9 @@
 <li>removeDirTree()
 : <a class="el" href="namespacePassenger.html#a8422d210cbd2f62d21254415b5a7f747">Passenger</a>
 </li>
+<li>resetSignalHandlersAndMask()
+: <a class="el" href="namespacePassenger.html#a2029ad8cb57611ab161b20ef9df39c86">Passenger</a>
+</li>
 <li>resolveSymlink()
 : <a class="el" href="group__Support.html#gac3d2b3d608188527d888e63d22c5163c">Passenger</a>
 </li>

data/doc/cxxapi/tree.html

@@ -93,6 +93,7 @@
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1EventedServer.html" target="basefrm">Passenger::EventedServer</a></p>
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1EventFd.html" target="basefrm">Passenger::EventFd</a></p>
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1FileDescriptor.html" target="basefrm">Passenger::FileDescriptor</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1FileDescriptorPair.html" target="basefrm">Passenger::FileDescriptorPair</a></p>
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1FileNotFoundException.html" target="basefrm">Passenger::FileNotFoundException</a></p>
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1FileSystemException.html" target="basefrm">Passenger::FileSystemException</a></p>
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1MessageServer_1_1Handler.html" target="basefrm">Passenger::MessageServer::Handler</a></p>
@@ -105,7 +106,9 @@
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="structPassenger_1_1PoolOptions.html" target="basefrm">Passenger::PoolOptions</a></p>
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1Process.html" target="basefrm">Passenger::Process</a></p>
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1RandomGenerator.html" target="basefrm">Passenger::RandomGenerator</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1ResourceLocator.html" target="basefrm">Passenger::ResourceLocator</a></p>
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1RuntimeException.html" target="basefrm">Passenger::RuntimeException</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1SafeLibev.html" target="basefrm">Passenger::SafeLibev</a></p>
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1ScalarMessage.html" target="basefrm">Passenger::ScalarMessage</a></p>
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1ScgiRequestParser.html" target="basefrm">Passenger::ScgiRequestParser</a></p>
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1SecurityException.html" target="basefrm">Passenger::SecurityException</a></p>
@@ -148,6 +151,7 @@
           </div>
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1EventFd.html" target="basefrm">Passenger::EventFd</a></p>
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1FileDescriptor.html" target="basefrm">Passenger::FileDescriptor</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1FileDescriptorPair.html" target="basefrm">Passenger::FileDescriptorPair</a></p>
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1MessageServer_1_1Handler.html" target="basefrm">Passenger::MessageServer::Handler</a></p>
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="structPassenger_1_1StaticString_1_1Hash.html" target="basefrm">Passenger::StaticString::Hash</a></p>
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classHooks.html" target="basefrm">Hooks</a></p>
@@ -162,7 +166,9 @@
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="structPassenger_1_1PoolOptions.html" target="basefrm">Passenger::PoolOptions</a></p>
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1Process.html" target="basefrm">Passenger::Process</a></p>
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1RandomGenerator.html" target="basefrm">Passenger::RandomGenerator</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1ResourceLocator.html" target="basefrm">Passenger::ResourceLocator</a></p>
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1RuntimeException.html" target="basefrm">Passenger::RuntimeException</a></p>
+          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1SafeLibev.html" target="basefrm">Passenger::SafeLibev</a></p>
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1ScalarMessage.html" target="basefrm">Passenger::ScalarMessage</a></p>
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1ScgiRequestParser.html" target="basefrm">Passenger::ScgiRequestParser</a></p>
           <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classPassenger_1_1SecurityException.html" target="basefrm">Passenger::SecurityException</a></p>
@@ -213,6 +219,7 @@
           <p><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>FileDescriptor.h</b></p>
           <p><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Hooks.h</b></p>
           <p><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>HttpStatusExtractor.h</b></p>
+          <p><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>IniFile.h</b></p>
           <p><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Logging.h</b></p>
           <p><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>MessageChannel.h</b></p>
           <p><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>MessageClient.h</b></p>
@@ -223,6 +230,7 @@
           <p><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Process.h</b></p>
           <p><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>RandomGenerator.h</b></p>
           <p><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>ResourceLocator.h</b></p>
+          <p><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>SafeLibev.h</b></p>
           <p><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>ScgiRequestParser.h</b></p>
           <p><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>ServerInstanceDir.h</b></p>
           <p><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Session.h</b></p>

data/ext/apache2/Configuration.cpp

@@ -176,8 +176,7 @@ passenger_config_create_dir(apr_pool_t *p, char *dirspec) {
 	config->autoDetectRails = DirConfig::UNSET;
 	config->autoDetectRack = DirConfig::UNSET;
 	config->autoDetectWSGI = DirConfig::UNSET;
-	config->railsEnv = NULL;
-	config->rackEnv = NULL;
+	config->environment = NULL;
 	config->appRoot = NULL;
 	config->user = NULL;
 	config->group = NULL;
@@ -222,8 +221,7 @@ passenger_config_merge_dir(apr_pool_t *p, void *basev, void *addv) {
 	MERGE_THREEWAY_CONFIG(autoDetectRails);
 	MERGE_THREEWAY_CONFIG(autoDetectRack);
 	MERGE_THREEWAY_CONFIG(autoDetectWSGI);
-	MERGE_STR_CONFIG(railsEnv);
-	MERGE_STR_CONFIG(rackEnv);
+	MERGE_STR_CONFIG(environment);
 	MERGE_STR_CONFIG(appRoot);
 	MERGE_STRING_CONFIG(appGroupName);
 	MERGE_STR_CONFIG(user);
@@ -238,6 +236,7 @@ passenger_config_merge_dir(apr_pool_t *p, void *basev, void *addv) {
 	MERGE_INT_CONFIG(statThrottleRate);
 	MERGE_STR_CONFIG(restartDir);
 	MERGE_STR_CONFIG(uploadBufferDir);
+	MERGE_STRING_CONFIG(unionStationKey);
 	MERGE_THREEWAY_CONFIG(resolveSymlinksInDocRoot);
 	MERGE_THREEWAY_CONFIG(allowEncodedSlashes);
 	MERGE_THREEWAY_CONFIG(friendlyErrorPages);
@@ -262,6 +261,9 @@ DEFINE_SERVER_BOOLEAN_CONFIG_SETTER(cmd_passenger_user_switching, userSwitching)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_default_user, defaultUser)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_default_group, defaultGroup)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_temp_dir, tempDir)
+DEFINE_SERVER_STR_CONFIG_SETTER(cmd_union_station_gateway_address, unionStationGatewayAddress)
+DEFINE_SERVER_INT_CONFIG_SETTER(cmd_union_station_gateway_port, unionStationGatewayPort, int, 1)
+DEFINE_SERVER_STR_CONFIG_SETTER(cmd_union_station_gateway_cert, unionStationGatewayCert)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_analytics_log_dir, analyticsLogDir)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_analytics_log_user, analyticsLogUser)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_analytics_log_group, analyticsLogGroup)
@@ -278,6 +280,7 @@ DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_passenger_use_global_queue, useGlobalQueue
 DEFINE_DIR_INT_CONFIG_SETTER(cmd_passenger_max_requests, maxRequests, unsigned long, 0)
 DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_passenger_high_performance, highPerformance)
 DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_passenger_enabled, enabled)
+DEFINE_DIR_STR_CONFIG_SETTER(cmd_environment, environment)
 DEFINE_DIR_INT_CONFIG_SETTER(cmd_passenger_stat_throttle_rate, statThrottleRate, unsigned long, 0)
 DEFINE_DIR_STR_CONFIG_SETTER(cmd_passenger_app_root, appRoot)
 DEFINE_DIR_STR_CONFIG_SETTER(cmd_passenger_app_group_name, appGroupName)
@@ -285,6 +288,7 @@ DEFINE_DIR_STR_CONFIG_SETTER(cmd_passenger_user, user)
 DEFINE_DIR_STR_CONFIG_SETTER(cmd_passenger_group, group)
 DEFINE_DIR_STR_CONFIG_SETTER(cmd_passenger_restart_dir, restartDir)
 DEFINE_DIR_STR_CONFIG_SETTER(cmd_passenger_upload_buffer_dir, uploadBufferDir)
+DEFINE_DIR_STR_CONFIG_SETTER(cmd_union_station_key, unionStationKey)
 DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_passenger_resolve_symlinks_in_document_root, resolveSymlinksInDocRoot)
 DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_passenger_allow_encoded_slashes, allowEncodedSlashes)
 DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_passenger_friendly_error_pages, friendlyErrorPages)
@@ -326,7 +330,6 @@ cmd_rails_base_uri(cmd_parms *cmd, void *pcfg, const char *arg) {
 }
 
 DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_rails_auto_detect, autoDetectRails)
-DEFINE_DIR_STR_CONFIG_SETTER(cmd_rails_env, railsEnv)
 
 static const char *
 cmd_rails_framework_spawner_idle_time(cmd_parms *cmd, void *pcfg, const char *arg) {
@@ -383,7 +386,6 @@ cmd_rack_base_uri(cmd_parms *cmd, void *pcfg, const char *arg) {
 }
 
 DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_rack_auto_detect, autoDetectRack)
-DEFINE_DIR_STR_CONFIG_SETTER(cmd_rack_env, rackEnv)
 
 
 /*************************************************
@@ -536,6 +538,11 @@ const command_rec passenger_commands[] = {
 		NULL,
 		OR_OPTIONS,
 		"The directory in which upload buffer files should be placed."),
+	AP_INIT_TAKE1("UnionStationKey",
+		(Take1Func) cmd_union_station_key,
+		NULL,
+		OR_ALL,
+		"The Union Station key."),
 	AP_INIT_FLAG("PassengerResolveSymlinksInDocumentRoot",
 		(FlagFunc) cmd_passenger_resolve_symlinks_in_document_root,
 		NULL,
@@ -556,6 +563,21 @@ const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"The spawn method to use."),
+	AP_INIT_TAKE1("UnionStationGatewayAddress",
+		(Take1Func) cmd_union_station_gateway_address,
+		NULL,
+		RSRC_CONF,
+		"The Union Station Gateway host name."),
+	AP_INIT_TAKE1("UnionStationGatewayPort",
+		(Take1Func) cmd_union_station_gateway_port,
+		NULL,
+		RSRC_CONF,
+		"The Union Station Gateway port number."),
+	AP_INIT_TAKE1("UnionStationGatewayCert",
+		(Take1Func) cmd_union_station_gateway_cert,
+		NULL,
+		RSRC_CONF,
+		"The Union Station Gateway certificate."),
 	AP_INIT_TAKE1("PassengerAnalyticsLogDir",
 		(Take1Func) cmd_passenger_analytics_log_dir,
 		NULL,
@@ -601,7 +623,7 @@ const command_rec passenger_commands[] = {
 		RSRC_CONF,
 		"Whether auto-detection of Ruby on Rails applications should be enabled."),
 	AP_INIT_TAKE1("RailsEnv",
-		(Take1Func) cmd_rails_env,
+		(Take1Func) cmd_environment,
 		NULL,
 		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
 		"The environment under which a Rails app must run."),
@@ -628,7 +650,7 @@ const command_rec passenger_commands[] = {
 		RSRC_CONF,
 		"Whether auto-detection of Rack applications should be enabled."),
 	AP_INIT_TAKE1("RackEnv",
-		(Take1Func) cmd_rack_env,
+		(Take1Func) cmd_environment,
 		NULL,
 		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
 		"The environment under which a Rack app must run."),