passenger 2.2.4 → 2.2.5

data/doc/rdoc/files/lib/phusion_passenger/spawn_manager_rb.html

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Wed Jun 10 10:12:29 +0200 2009</td>
+            <td>Mon Aug 31 15:39:27 +0200 2009</td>
           </tr>
         </table>
       </td></tr>
@@ -76,34 +76,32 @@
       <div id="content">
 
   <div class="description"><p>
-Phusion Passenger - <a href="http://www.modrails.com">www.modrails.com</a>/
-Copyright (c) 2008, 2009 Phusion
-</p>
-<p>
-&quot;Phusion Passenger&quot; is a trademark of Hongli Lai &amp; Ninh Bui.
-</p>
-<p>
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-&quot;Software&quot;), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to the
-following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+encoding: binary
 </p>
+<pre>
+ Phusion Passenger - http://www.modrails.com/
+ Copyright (c) 2008, 2009 Phusion
+
+ &quot;Phusion Passenger&quot; is a trademark of Hongli Lai &amp; Ninh Bui.
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the &quot;Software&quot;), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+</pre>
 </div>
 
   <div class="sectiontitle">Required Files</div>

data/doc/rdoc/files/lib/phusion_passenger/utils_rb.html

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Wed Jun 10 10:12:29 +0200 2009</td>
+            <td>Mon Aug 31 15:39:27 +0200 2009</td>
           </tr>
         </table>
       </td></tr>
@@ -76,34 +76,32 @@
       <div id="content">
 
   <div class="description"><p>
-Phusion Passenger - <a href="http://www.modrails.com">www.modrails.com</a>/
-Copyright (c) 2008, 2009 Phusion
-</p>
-<p>
-&quot;Phusion Passenger&quot; is a trademark of Hongli Lai &amp; Ninh Bui.
-</p>
-<p>
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-&quot;Software&quot;), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to the
-following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+encoding: binary
 </p>
+<pre>
+ Phusion Passenger - http://www.modrails.com/
+ Copyright (c) 2008, 2009 Phusion
+
+ &quot;Phusion Passenger&quot; is a trademark of Hongli Lai &amp; Ninh Bui.
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the &quot;Software&quot;), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+</pre>
 </div>
 
   <div class="sectiontitle">Required Files</div>
@@ -143,10 +141,10 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
   <p class="source-link">[ <a href="javascript:toggleSource('M000001_source')" id="l_M000001_source">show source</a> ]</p>
   <div id="M000001_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/utils.rb, line 566</span>
-566:                 <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">recv_io</span>
-567:                         <span class="ruby-keyword kw">super</span>
-568:                 <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/utils.rb, line 584</span>
+584:                 <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">recv_io</span>
+585:                         <span class="ruby-keyword kw">super</span>
+586:                 <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -159,10 +157,10 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
   <p class="source-link">[ <a href="javascript:toggleSource('M000002_source')" id="l_M000002_source">show source</a> ]</p>
   <div id="M000002_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/utils.rb, line 570</span>
-570:                 <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">send_io</span>(<span class="ruby-identifier">io</span>)
-571:                         <span class="ruby-keyword kw">super</span>
-572:                 <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/utils.rb, line 588</span>
+588:                 <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">send_io</span>(<span class="ruby-identifier">io</span>)
+589:                         <span class="ruby-keyword kw">super</span>
+590:                 <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>

data/doc/rdoc/fr_class_index.html

@@ -80,6 +80,7 @@
 <a href="classes/PhusionPassenger/SpawnManager.html">PhusionPassenger::SpawnManager</a><br />
 <a href="classes/PhusionPassenger/UnknownError.html">PhusionPassenger::UnknownError</a><br />
 <a href="classes/PhusionPassenger/Utils.html">PhusionPassenger::Utils</a><br />
+<a href="classes/PhusionPassenger/Utils/PseudoIO.html">PhusionPassenger::Utils::PseudoIO</a><br />
 <a href="classes/PhusionPassenger/VersionNotFound.html">PhusionPassenger::VersionNotFound</a><br />
 <a href="classes/PhusionPassenger/WSGI.html">PhusionPassenger::WSGI</a><br />
 <a href="classes/PhusionPassenger/WSGI/ApplicationSpawner.html">PhusionPassenger::WSGI::ApplicationSpawner</a><br />

data/doc/rdoc/fr_method_index.html

@@ -42,8 +42,8 @@
 <body>
 <div class="banner">Methods</div>
 <div class="entries">
-<a href="classes/PhusionPassenger/HTMLTemplate.html#M000111">[]= (PhusionPassenger::HTMLTemplate)</a><br />
-<a href="classes/PhusionPassenger/ConsoleTextTemplate.html#M000127">[]= (PhusionPassenger::ConsoleTextTemplate)</a><br />
+<a href="classes/PhusionPassenger/ConsoleTextTemplate.html#M000131">[]= (PhusionPassenger::ConsoleTextTemplate)</a><br />
+<a href="classes/PhusionPassenger/HTMLTemplate.html#M000115">[]= (PhusionPassenger::HTMLTemplate)</a><br />
 <a href="classes/PhusionPassenger/NativeSupport.html#M000061">accept (PhusionPassenger::NativeSupport)</a><br />
 <a href="classes/PlatformInfo.html#M000019">apache2_bindir (PlatformInfo)</a><br />
 <a href="classes/PlatformInfo.html#M000024">apache2_module_cflags (PlatformInfo)</a><br />
@@ -66,72 +66,75 @@
 <a href="classes/PhusionPassenger/Utils.html#M000078">assert_valid_username (PhusionPassenger::Utils)</a><br />
 <a href="classes/Exception.html#M000008">backtrace_string (Exception)</a><br />
 <a href="classes/PhusionPassenger/AdminTools/ControlProcess.html#M000070">backtraces (PhusionPassenger::AdminTools::ControlProcess)</a><br />
-<a href="classes/PhusionPassenger/AbstractServer.html#M000135">before_fork (PhusionPassenger::AbstractServer)</a><br />
+<a href="classes/PhusionPassenger/AbstractServer.html#M000139">before_fork (PhusionPassenger::AbstractServer)</a><br />
 <a href="classes/PhusionPassenger.html#M000035">call_event (PhusionPassenger)</a><br />
 <a href="classes/PhusionPassenger/Utils.html#M000074">canonicalize_path (PhusionPassenger::Utils)</a><br />
-<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000104">check_idle_servers! (PhusionPassenger::AbstractServerCollection)</a><br />
-<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000108">cleanup (PhusionPassenger::AbstractServerCollection)</a><br />
-<a href="classes/PhusionPassenger/AbstractRequestHandler.html#M000121">cleanup (PhusionPassenger::AbstractRequestHandler)</a><br />
-<a href="classes/PhusionPassenger/SpawnManager.html#M000119">cleanup (PhusionPassenger::SpawnManager)</a><br />
-<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000107">clear (PhusionPassenger::AbstractServerCollection)</a><br />
-<a href="classes/PhusionPassenger/AbstractServer.html#M000141">client (PhusionPassenger::AbstractServer)</a><br />
-<a href="classes/PhusionPassenger/Application.html#M000115">close (PhusionPassenger::Application)</a><br />
-<a href="classes/PhusionPassenger/MessageChannel.html#M000152">close (PhusionPassenger::MessageChannel)</a><br />
+<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000108">check_idle_servers! (PhusionPassenger::AbstractServerCollection)</a><br />
+<a href="classes/PhusionPassenger/AbstractRequestHandler.html#M000125">cleanup (PhusionPassenger::AbstractRequestHandler)</a><br />
+<a href="classes/PhusionPassenger/SpawnManager.html#M000123">cleanup (PhusionPassenger::SpawnManager)</a><br />
+<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000112">cleanup (PhusionPassenger::AbstractServerCollection)</a><br />
+<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000111">clear (PhusionPassenger::AbstractServerCollection)</a><br />
+<a href="classes/PhusionPassenger/AbstractServer.html#M000145">client (PhusionPassenger::AbstractServer)</a><br />
+<a href="classes/PhusionPassenger/MessageChannel.html#M000156">close (PhusionPassenger::MessageChannel)</a><br />
+<a href="classes/PhusionPassenger/Application.html#M000119">close (PhusionPassenger::Application)</a><br />
 <a href="classes/PhusionPassenger/NativeSupport.html#M000062">close_all_file_descriptors (PhusionPassenger::NativeSupport)</a><br />
 <a href="classes/PhusionPassenger/Utils.html#M000080">close_all_io_objects_for_fds (PhusionPassenger::Utils)</a><br />
 <a href="classes/IO.html#M000007">close_on_exec! (IO)</a><br />
 <a href="classes/GC.html#M000033">copy_on_write_friendly? (GC)</a><br />
 <a href="classes/PhusionPassenger/NativeSupport.html#M000060">create_unix_socket (PhusionPassenger::NativeSupport)</a><br />
 <a href="classes/PlatformInfo.html#M000023">debugging_cflags (PlatformInfo)</a><br />
-<a href="classes/PhusionPassenger/AbstractServer.html#M000138">define_message_handler (PhusionPassenger::AbstractServer)</a><br />
-<a href="classes/PhusionPassenger/AbstractServer.html#M000139">define_signal_handler (PhusionPassenger::AbstractServer)</a><br />
-<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000102">delete (PhusionPassenger::AbstractServerCollection)</a><br />
-<a href="classes/PhusionPassenger/Application.html#M000113">detect_framework_version (PhusionPassenger::Application)</a><br />
+<a href="classes/PhusionPassenger/AbstractServer.html#M000142">define_message_handler (PhusionPassenger::AbstractServer)</a><br />
+<a href="classes/PhusionPassenger/AbstractServer.html#M000143">define_signal_handler (PhusionPassenger::AbstractServer)</a><br />
+<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000106">delete (PhusionPassenger::AbstractServerCollection)</a><br />
+<a href="classes/PhusionPassenger/Application.html#M000117">detect_framework_version (PhusionPassenger::Application)</a><br />
 <a href="classes/PhusionPassenger/NativeSupport.html#M000063">disable_stdio_buffering (PhusionPassenger::NativeSupport)</a><br />
 <a href="classes/PhusionPassenger/AdminTools/ControlProcess.html#M000072">domains (PhusionPassenger::AdminTools::ControlProcess)</a><br />
-<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000105">each (PhusionPassenger::AbstractServerCollection)</a><br />
-<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000106">each_pair (PhusionPassenger::AbstractServerCollection)</a><br />
-<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000101">empty? (PhusionPassenger::AbstractServerCollection)</a><br />
+<a href="classes/PhusionPassenger/Utils/PseudoIO.html#M000095">done! (PhusionPassenger::Utils::PseudoIO)</a><br />
+<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000109">each (PhusionPassenger::AbstractServerCollection)</a><br />
+<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000110">each_pair (PhusionPassenger::AbstractServerCollection)</a><br />
+<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000105">empty? (PhusionPassenger::AbstractServerCollection)</a><br />
 <a href="classes/PhusionPassenger/Railz/CGIFixed.html#M000045">env_table (PhusionPassenger::Railz::CGIFixed)</a><br />
-<a href="classes/PhusionPassenger/MessageChannel.html#M000151">fileno (PhusionPassenger::MessageChannel)</a><br />
-<a href="classes/PhusionPassenger/AbstractServer.html#M000143">fileno_of (PhusionPassenger::AbstractServer)</a><br />
-<a href="classes/PhusionPassenger/AbstractServer.html#M000137">finalize_server (PhusionPassenger::AbstractServer)</a><br />
+<a href="classes/PhusionPassenger/MessageChannel.html#M000155">fileno (PhusionPassenger::MessageChannel)</a><br />
+<a href="classes/PhusionPassenger/AbstractServer.html#M000147">fileno_of (PhusionPassenger::AbstractServer)</a><br />
+<a href="classes/PhusionPassenger/AbstractServer.html#M000141">finalize_server (PhusionPassenger::AbstractServer)</a><br />
 <a href="classes/PlatformInfo.html#M000011">find_command (PlatformInfo)</a><br />
 <a href="classes/PhusionPassenger/AdminTools/ControlProcess.html#M000067">for_pid (PhusionPassenger::AdminTools::ControlProcess)</a><br />
-<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000100">has_key? (PhusionPassenger::AbstractServerCollection)</a><br />
+<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000104">has_key? (PhusionPassenger::AbstractServerCollection)</a><br />
 <a href="classes/PlatformInfo.html#M000016">httpd (PlatformInfo)</a><br />
-<a href="classes/PhusionPassenger/AbstractServer.html#M000136">initialize_server (PhusionPassenger::AbstractServer)</a><br />
+<a href="classes/PhusionPassenger/AbstractServer.html#M000140">initialize_server (PhusionPassenger::AbstractServer)</a><br />
 <a href="classes/PhusionPassenger/AdminTools/ControlProcess.html#M000073">instances (PhusionPassenger::AdminTools::ControlProcess)</a><br />
 <a href="classes/PlatformInfo.html#M000031">library_extension (PlatformInfo)</a><br />
 <a href="classes/PlatformInfo.html#M000032">linux_distro (PlatformInfo)</a><br />
 <a href="classes/PhusionPassenger/AdminTools/ControlProcess.html#M000066">list (PhusionPassenger::AdminTools::ControlProcess)</a><br />
 <a href="classes/Signal.html#M000010">list_trappable (Signal)</a><br />
-<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000099">lookup_or_add (PhusionPassenger::AbstractServerCollection)</a><br />
+<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000103">lookup_or_add (PhusionPassenger::AbstractServerCollection)</a><br />
 <a href="classes/PhusionPassenger/Utils.html#M000087">lower_privilege (PhusionPassenger::Utils)</a><br />
-<a href="classes/PhusionPassenger/AbstractRequestHandler.html#M000123">main_loop (PhusionPassenger::AbstractRequestHandler)</a><br />
-<a href="classes/PhusionPassenger/AbstractRequestHandler.html#M000122">main_loop_running? (PhusionPassenger::AbstractRequestHandler)</a><br />
+<a href="classes/PhusionPassenger/AbstractRequestHandler.html#M000127">main_loop (PhusionPassenger::AbstractRequestHandler)</a><br />
+<a href="classes/PhusionPassenger/AbstractRequestHandler.html#M000126">main_loop_running? (PhusionPassenger::AbstractRequestHandler)</a><br />
 <a href="classes/PhusionPassenger/Utils.html#M000081">marshal_exception (PhusionPassenger::Utils)</a><br />
+<a href="classes/PhusionPassenger/Utils/PseudoIO.html#M000096">method_missing (PhusionPassenger::Utils::PseudoIO)</a><br />
 <a href="classes/PhusionPassenger.html#M000036">natively_packaged? (PhusionPassenger)</a><br />
-<a href="classes/PhusionPassenger/AbstractRequestHandler.html#M000120">new (PhusionPassenger::AbstractRequestHandler)</a><br />
-<a href="classes/PhusionPassenger/AdminTools/ControlProcess.html#M000068">new (PhusionPassenger::AdminTools::ControlProcess)</a><br />
+<a href="classes/PhusionPassenger/AbstractServer.html#M000133">new (PhusionPassenger::AbstractServer)</a><br />
 <a href="classes/PhusionPassenger/Railz/FrameworkSpawner.html#M000039">new (PhusionPassenger::Railz::FrameworkSpawner)</a><br />
-<a href="classes/PhusionPassenger/Railz/CGIFixed.html#M000043">new (PhusionPassenger::Railz::CGIFixed)</a><br />
 <a href="classes/PhusionPassenger/Rack/RequestHandler.html#M000056">new (PhusionPassenger::Rack::RequestHandler)</a><br />
-<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000097">new (PhusionPassenger::AbstractServerCollection)</a><br />
-<a href="classes/PhusionPassenger/VersionNotFound.html#M000094">new (PhusionPassenger::VersionNotFound)</a><br />
-<a href="classes/PhusionPassenger/AbstractServer.html#M000129">new (PhusionPassenger::AbstractServer)</a><br />
-<a href="classes/PhusionPassenger/UnknownError.html#M000125">new (PhusionPassenger::UnknownError)</a><br />
-<a href="classes/PhusionPassenger/InitializationError.html#M000096">new (PhusionPassenger::InitializationError)</a><br />
-<a href="classes/PhusionPassenger/AbstractInstaller.html#M000153">new (PhusionPassenger::AbstractInstaller)</a><br />
-<a href="classes/PhusionPassenger/Railz/RequestHandler.html#M000052">new (PhusionPassenger::Railz::RequestHandler)</a><br />
-<a href="classes/PhusionPassenger/AppInitError.html#M000095">new (PhusionPassenger::AppInitError)</a><br />
-<a href="classes/PhusionPassenger/Application.html#M000114">new (PhusionPassenger::Application)</a><br />
-<a href="classes/PhusionPassenger/ConsoleTextTemplate.html#M000126">new (PhusionPassenger::ConsoleTextTemplate)</a><br />
-<a href="classes/PhusionPassenger/MessageChannel.html#M000144">new (PhusionPassenger::MessageChannel)</a><br />
+<a href="classes/PhusionPassenger/AbstractRequestHandler.html#M000124">new (PhusionPassenger::AbstractRequestHandler)</a><br />
+<a href="classes/PhusionPassenger/AdminTools/ControlProcess.html#M000068">new (PhusionPassenger::AdminTools::ControlProcess)</a><br />
+<a href="classes/PhusionPassenger/MessageChannel.html#M000148">new (PhusionPassenger::MessageChannel)</a><br />
 <a href="classes/PhusionPassenger/Railz/ApplicationSpawner.html#M000048">new (PhusionPassenger::Railz::ApplicationSpawner)</a><br />
-<a href="classes/PhusionPassenger/HTMLTemplate.html#M000110">new (PhusionPassenger::HTMLTemplate)</a><br />
-<a href="classes/PhusionPassenger/FrameworkInitError.html#M000109">new (PhusionPassenger::FrameworkInitError)</a><br />
-<a href="classes/PhusionPassenger/SpawnManager.html#M000116">new (PhusionPassenger::SpawnManager)</a><br />
+<a href="classes/PhusionPassenger/SpawnManager.html#M000120">new (PhusionPassenger::SpawnManager)</a><br />
+<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000101">new (PhusionPassenger::AbstractServerCollection)</a><br />
+<a href="classes/PhusionPassenger/InitializationError.html#M000100">new (PhusionPassenger::InitializationError)</a><br />
+<a href="classes/PhusionPassenger/AppInitError.html#M000099">new (PhusionPassenger::AppInitError)</a><br />
+<a href="classes/PhusionPassenger/Application.html#M000118">new (PhusionPassenger::Application)</a><br />
+<a href="classes/PhusionPassenger/VersionNotFound.html#M000098">new (PhusionPassenger::VersionNotFound)</a><br />
+<a href="classes/PhusionPassenger/AbstractInstaller.html#M000157">new (PhusionPassenger::AbstractInstaller)</a><br />
+<a href="classes/PhusionPassenger/ConsoleTextTemplate.html#M000130">new (PhusionPassenger::ConsoleTextTemplate)</a><br />
+<a href="classes/PhusionPassenger/HTMLTemplate.html#M000114">new (PhusionPassenger::HTMLTemplate)</a><br />
+<a href="classes/PhusionPassenger/FrameworkInitError.html#M000113">new (PhusionPassenger::FrameworkInitError)</a><br />
+<a href="classes/PhusionPassenger/Railz/RequestHandler.html#M000052">new (PhusionPassenger::Railz::RequestHandler)</a><br />
+<a href="classes/PhusionPassenger/Utils/PseudoIO.html#M000094">new (PhusionPassenger::Utils::PseudoIO)</a><br />
+<a href="classes/PhusionPassenger/Railz/CGIFixed.html#M000043">new (PhusionPassenger::Railz::CGIFixed)</a><br />
+<a href="classes/PhusionPassenger/UnknownError.html#M000129">new (PhusionPassenger::UnknownError)</a><br />
 <a href="classes/PhusionPassenger.html#M000034">on_event (PhusionPassenger)</a><br />
 <a href="classes/PhusionPassenger/Utils.html#M000092">passenger_tmpdir (PhusionPassenger::Utils)</a><br />
 <a href="classes/PhusionPassenger/Utils.html#M000091">passenger_tmpdir (PhusionPassenger::Utils)</a><br />
@@ -140,61 +143,62 @@
 <a href="classes/PlatformInfo.html#M000022">portability_ldflags (PlatformInfo)</a><br />
 <a href="classes/PhusionPassenger/Utils.html#M000083">print_exception (PhusionPassenger::Utils)</a><br />
 <a href="classes/PhusionPassenger/AdminTools.html#M000065">process_is_alive? (PhusionPassenger::AdminTools)</a><br />
-<a href="classes/PhusionPassenger/Railz/RequestHandler.html#M000053">process_request (PhusionPassenger::Railz::RequestHandler)</a><br />
 <a href="classes/PhusionPassenger/Rack/RequestHandler.html#M000057">process_request (PhusionPassenger::Rack::RequestHandler)</a><br />
-<a href="classes/PhusionPassenger/AbstractServer.html#M000142">quit_main (PhusionPassenger::AbstractServer)</a><br />
+<a href="classes/PhusionPassenger/Railz/RequestHandler.html#M000053">process_request (PhusionPassenger::Railz::RequestHandler)</a><br />
+<a href="classes/PhusionPassenger/AbstractServer.html#M000146">quit_main (PhusionPassenger::AbstractServer)</a><br />
 <a href="classes/PlatformInfo.html#M000012">rake (PlatformInfo)</a><br />
-<a href="classes/PhusionPassenger/MessageChannel.html#M000145">read (PhusionPassenger::MessageChannel)</a><br />
-<a href="classes/PhusionPassenger/MessageChannel.html#M000146">read_scalar (PhusionPassenger::MessageChannel)</a><br />
+<a href="classes/PhusionPassenger/MessageChannel.html#M000149">read (PhusionPassenger::MessageChannel)</a><br />
+<a href="classes/PhusionPassenger/MessageChannel.html#M000150">read_scalar (PhusionPassenger::MessageChannel)</a><br />
 <a href="classes/PhusionPassenger/NativeSupport.html#M000059">recv_fd (PhusionPassenger::NativeSupport)</a><br />
 <a href="files/lib/phusion_passenger/utils_rb.html#M000001">recv_io (lib/phusion_passenger/utils.rb)</a><br />
+<a href="classes/PhusionPassenger/MessageChannel.html#M000153">recv_io (PhusionPassenger::MessageChannel)</a><br />
 <a href="classes/IO.html#M000006">recv_io (IO)</a><br />
-<a href="classes/PhusionPassenger/MessageChannel.html#M000149">recv_io (PhusionPassenger::MessageChannel)</a><br />
-<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000103">register_activity (PhusionPassenger::AbstractServerCollection)</a><br />
+<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000107">register_activity (PhusionPassenger::AbstractServerCollection)</a><br />
 <a href="classes/PhusionPassenger/Railz/FrameworkSpawner.html#M000042">reload (PhusionPassenger::Railz::FrameworkSpawner)</a><br />
-<a href="classes/PhusionPassenger/SpawnManager.html#M000118">reload (PhusionPassenger::SpawnManager)</a><br />
+<a href="classes/PhusionPassenger/SpawnManager.html#M000122">reload (PhusionPassenger::SpawnManager)</a><br />
 <a href="classes/PhusionPassenger/Utils.html#M000085">report_app_init_status (PhusionPassenger::Utils)</a><br />
-<a href="classes/PhusionPassenger/ConsoleTextTemplate.html#M000128">result (PhusionPassenger::ConsoleTextTemplate)</a><br />
-<a href="classes/PhusionPassenger/HTMLTemplate.html#M000112">result (PhusionPassenger::HTMLTemplate)</a><br />
+<a href="classes/PhusionPassenger/Utils/PseudoIO.html#M000097">respond_to? (PhusionPassenger::Utils::PseudoIO)</a><br />
+<a href="classes/PhusionPassenger/ConsoleTextTemplate.html#M000132">result (PhusionPassenger::ConsoleTextTemplate)</a><br />
+<a href="classes/PhusionPassenger/HTMLTemplate.html#M000116">result (PhusionPassenger::HTMLTemplate)</a><br />
 <a href="classes/PlatformInfo.html#M000013">rspec (PlatformInfo)</a><br />
 <a href="classes/PhusionPassenger/Utils.html#M000084">safe_fork (PhusionPassenger::Utils)</a><br />
 <a href="classes/PhusionPassenger/Utils.html#M000090">sanitize_spawn_options (PhusionPassenger::Utils)</a><br />
 <a href="classes/PhusionPassenger/NativeSupport.html#M000058">send_fd (PhusionPassenger::NativeSupport)</a><br />
-<a href="files/lib/phusion_passenger/utils_rb.html#M000002">send_io (lib/phusion_passenger/utils.rb)</a><br />
 <a href="classes/IO.html#M000005">send_io (IO)</a><br />
-<a href="classes/PhusionPassenger/MessageChannel.html#M000150">send_io (PhusionPassenger::MessageChannel)</a><br />
-<a href="classes/PhusionPassenger/AbstractServer.html#M000140">server (PhusionPassenger::AbstractServer)</a><br />
-<a href="classes/PhusionPassenger/AbstractServer.html#M000134">server_pid (PhusionPassenger::AbstractServer)</a><br />
-<a href="classes/PhusionPassenger/SpawnManager.html#M000117">spawn_application (PhusionPassenger::SpawnManager)</a><br />
+<a href="classes/PhusionPassenger/MessageChannel.html#M000154">send_io (PhusionPassenger::MessageChannel)</a><br />
+<a href="files/lib/phusion_passenger/utils_rb.html#M000002">send_io (lib/phusion_passenger/utils.rb)</a><br />
+<a href="classes/PhusionPassenger/AbstractServer.html#M000144">server (PhusionPassenger::AbstractServer)</a><br />
+<a href="classes/PhusionPassenger/AbstractServer.html#M000138">server_pid (PhusionPassenger::AbstractServer)</a><br />
+<a href="classes/PhusionPassenger/WSGI/ApplicationSpawner.html#M000038">spawn_application (PhusionPassenger::WSGI::ApplicationSpawner)</a><br />
 <a href="classes/PhusionPassenger/Rack/ApplicationSpawner.html#M000054">spawn_application (PhusionPassenger::Rack::ApplicationSpawner)</a><br />
+<a href="classes/PhusionPassenger/Railz/FrameworkSpawner.html#M000041">spawn_application (PhusionPassenger::Railz::FrameworkSpawner)</a><br />
+<a href="classes/PhusionPassenger/SpawnManager.html#M000121">spawn_application (PhusionPassenger::SpawnManager)</a><br />
 <a href="classes/PhusionPassenger/Rack/ApplicationSpawner.html#M000055">spawn_application (PhusionPassenger::Rack::ApplicationSpawner)</a><br />
-<a href="classes/PhusionPassenger/WSGI/ApplicationSpawner.html#M000038">spawn_application (PhusionPassenger::WSGI::ApplicationSpawner)</a><br />
 <a href="classes/PhusionPassenger/WSGI/ApplicationSpawner.html#M000037">spawn_application (PhusionPassenger::WSGI::ApplicationSpawner)</a><br />
 <a href="classes/PhusionPassenger/Railz/ApplicationSpawner.html#M000049">spawn_application (PhusionPassenger::Railz::ApplicationSpawner)</a><br />
-<a href="classes/PhusionPassenger/Railz/FrameworkSpawner.html#M000041">spawn_application (PhusionPassenger::Railz::FrameworkSpawner)</a><br />
 <a href="classes/PhusionPassenger/Railz/ApplicationSpawner.html#M000050">spawn_application! (PhusionPassenger::Railz::ApplicationSpawner)</a><br />
 <a href="classes/PhusionPassenger/Railz/ApplicationSpawner.html#M000051">start (PhusionPassenger::Railz::ApplicationSpawner)</a><br />
-<a href="classes/PhusionPassenger/AbstractServer.html#M000130">start (PhusionPassenger::AbstractServer)</a><br />
 <a href="classes/PhusionPassenger/Railz/FrameworkSpawner.html#M000040">start (PhusionPassenger::Railz::FrameworkSpawner)</a><br />
-<a href="classes/PhusionPassenger/AbstractInstaller.html#M000154">start (PhusionPassenger::AbstractInstaller)</a><br />
-<a href="classes/PhusionPassenger/AbstractRequestHandler.html#M000124">start_main_loop_thread (PhusionPassenger::AbstractRequestHandler)</a><br />
-<a href="classes/PhusionPassenger/AbstractServer.html#M000131">start_synchronously (PhusionPassenger::AbstractServer)</a><br />
-<a href="classes/PhusionPassenger/AbstractServer.html#M000133">started? (PhusionPassenger::AbstractServer)</a><br />
+<a href="classes/PhusionPassenger/AbstractInstaller.html#M000158">start (PhusionPassenger::AbstractInstaller)</a><br />
+<a href="classes/PhusionPassenger/AbstractServer.html#M000134">start (PhusionPassenger::AbstractServer)</a><br />
+<a href="classes/PhusionPassenger/AbstractRequestHandler.html#M000128">start_main_loop_thread (PhusionPassenger::AbstractRequestHandler)</a><br />
+<a href="classes/PhusionPassenger/AbstractServer.html#M000135">start_synchronously (PhusionPassenger::AbstractServer)</a><br />
+<a href="classes/PhusionPassenger/AbstractServer.html#M000137">started? (PhusionPassenger::AbstractServer)</a><br />
 <a href="classes/PhusionPassenger/AdminTools/ControlProcess.html#M000069">status (PhusionPassenger::AdminTools::ControlProcess)</a><br />
 <a href="classes/PhusionPassenger/Railz/CGIFixed.html#M000046">stdinput (PhusionPassenger::Railz::CGIFixed)</a><br />
 <a href="classes/PhusionPassenger/Railz/CGIFixed.html#M000047">stdoutput (PhusionPassenger::Railz::CGIFixed)</a><br />
-<a href="classes/PhusionPassenger/AbstractServer.html#M000132">stop (PhusionPassenger::AbstractServer)</a><br />
+<a href="classes/PhusionPassenger/AbstractServer.html#M000136">stop (PhusionPassenger::AbstractServer)</a><br />
 <a href="classes/RakeExtensions.html#M000009">subdir (RakeExtensions)</a><br />
 <a href="classes/PhusionPassenger/Utils.html#M000088">switch_to_user (PhusionPassenger::Utils)</a><br />
-<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000098">synchronize (PhusionPassenger::AbstractServerCollection)</a><br />
+<a href="classes/PhusionPassenger/AbstractServerCollection.html#M000102">synchronize (PhusionPassenger::AbstractServerCollection)</a><br />
 <a href="classes/ConditionVariable.html#M000003">timed_wait (ConditionVariable)</a><br />
 <a href="classes/ConditionVariable.html#M000004">timed_wait! (ConditionVariable)</a><br />
 <a href="classes/PhusionPassenger/AdminTools.html#M000064">tmpdir (PhusionPassenger::AdminTools)</a><br />
 <a href="classes/PhusionPassenger/Utils.html#M000089">to_boolean (PhusionPassenger::Utils)</a><br />
 <a href="classes/PhusionPassenger/Utils.html#M000086">unmarshal_and_raise_errors (PhusionPassenger::Utils)</a><br />
 <a href="classes/PhusionPassenger/Utils.html#M000082">unmarshal_exception (PhusionPassenger::Utils)</a><br />
-<a href="classes/PhusionPassenger/MessageChannel.html#M000147">write (PhusionPassenger::MessageChannel)</a><br />
-<a href="classes/PhusionPassenger/MessageChannel.html#M000148">write_scalar (PhusionPassenger::MessageChannel)</a><br />
+<a href="classes/PhusionPassenger/MessageChannel.html#M000151">write (PhusionPassenger::MessageChannel)</a><br />
+<a href="classes/PhusionPassenger/MessageChannel.html#M000152">write_scalar (PhusionPassenger::MessageChannel)</a><br />
 <a href="classes/PhusionPassenger/AdminTools/ControlProcess.html#M000071">xml (PhusionPassenger::AdminTools::ControlProcess)</a><br />
 </div>
 </body></html>

data/ext/apache2/Configuration.cpp

@@ -24,6 +24,16 @@
  */
 #include <algorithm>
 #include <cstdlib>
+
+/* ap_config.h checks whether the compiler has support for C99's designated
+ * initializers, and defines AP_HAVE_DESIGNATED_INITIALIZER if it does. However,
+ * g++ does not support designated initializers, even when ap_config.h thinks
+ * it does. Here we undefine the macro to force httpd_config.h to not use
+ * designated initializers. This should fix compilation problems on some systems.
+ */
+#include <ap_config.h>
+#undef AP_HAVE_DESIGNATED_INITIALIZER
+
 #include "Configuration.h"
 #include "Utils.h"
 
@@ -84,6 +94,8 @@ passenger_config_create_dir(apr_pool_t *p, char *dirspec) {
 	config->memoryLimitSpecified = false;
 	config->highPerformance = DirConfig::UNSET;
 	config->useGlobalQueue = DirConfig::UNSET;
+	config->resolveSymlinksInDocRoot = DirConfig::UNSET;
+	config->allowEncodedSlashes = DirConfig::UNSET;
 	config->statThrottleRate = 0;
 	config->statThrottleRateSpecified = false;
 	config->restartDir = NULL;
@@ -129,6 +141,8 @@ passenger_config_merge_dir(apr_pool_t *p, void *basev, void *addv) {
 	config->statThrottleRateSpecified = base->statThrottleRateSpecified || add->statThrottleRateSpecified;
 	config->restartDir = (add->restartDir == NULL) ? base->restartDir : add->restartDir;
 	config->uploadBufferDir = (add->uploadBufferDir == NULL) ? base->uploadBufferDir : add->uploadBufferDir;
+	config->resolveSymlinksInDocRoot = (add->resolveSymlinksInDocRoot == DirConfig::UNSET) ? base->resolveSymlinksInDocRoot : add->resolveSymlinksInDocRoot;
+	config->allowEncodedSlashes = (add->allowEncodedSlashes == DirConfig::UNSET) ? base->allowEncodedSlashes : add->allowEncodedSlashes;
 	/*************************************/
 	return config;
 }
@@ -410,6 +424,20 @@ cmd_passenger_upload_buffer_dir(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return NULL;
 }
 
+static const char *
+cmd_passenger_resolve_symlinks_in_document_root(cmd_parms *cmd, void *pcfg, int arg) {
+	DirConfig *config = (DirConfig *) pcfg;
+	config->resolveSymlinksInDocRoot = (arg) ? DirConfig::ENABLED : DirConfig::DISABLED;
+	return NULL;
+}
+
+static const char *
+cmd_passenger_allow_encoded_slashes(cmd_parms *cmd, void *pcfg, int arg) {
+	DirConfig *config = (DirConfig *) pcfg;
+	config->allowEncodedSlashes = (arg) ? DirConfig::ENABLED : DirConfig::DISABLED;
+	return NULL;
+}
+
 
 /*************************************************
  * Rails-specific settings
@@ -418,8 +446,16 @@ cmd_passenger_upload_buffer_dir(cmd_parms *cmd, void *pcfg, const char *arg) {
 static const char *
 cmd_rails_base_uri(cmd_parms *cmd, void *pcfg, const char *arg) {
 	DirConfig *config = (DirConfig *) pcfg;
-	config->railsBaseURIs.insert(arg);
-	return NULL;
+	if (strlen(arg) == 0) {
+		return "RailsBaseURI may not be set to the empty string";
+	} else if (arg[0] != '/') {
+		return "RailsBaseURI must start with a slash (/)";
+	} else if (strlen(arg) > 1 && arg[strlen(arg) - 1] == '/') {
+		return "RailsBaseURI must not end with a slash (/)";
+	} else {
+		config->railsBaseURIs.insert(arg);
+		return NULL;
+	}
 }
 
 static const char *
@@ -500,8 +536,16 @@ cmd_rails_app_spawner_idle_time(cmd_parms *cmd, void *pcfg, const char *arg) {
 static const char *
 cmd_rack_base_uri(cmd_parms *cmd, void *pcfg, const char *arg) {
 	DirConfig *config = (DirConfig *) pcfg;
-	config->rackBaseURIs.insert(arg);
-	return NULL;
+	if (strlen(arg) == 0) {
+		return "RackBaseURI may not be set to the empty string";
+	} else if (arg[0] != '/') {
+		return "RackBaseURI must start with a slash (/)";
+	} else if (strlen(arg) > 1 && arg[strlen(arg) - 1] == '/') {
+		return "RackBaseURI must not end with a slash (/)";
+	} else {
+		config->rackBaseURIs.insert(arg);
+		return NULL;
+	}
 }
 
 static const char *
@@ -545,9 +589,8 @@ cmd_rails_spawn_server(cmd_parms *cmd, void *pcfg, const char *arg) {
 }
 
 
-// Workaround for some weird C++-specific compiler error.
-typedef const char * (*Take0Func)();
 typedef const char * (*Take1Func)();
+typedef const char * (*FlagFunc)();
 
 const command_rec passenger_commands[] = {
 	// Passenger settings.
@@ -582,12 +625,12 @@ const command_rec passenger_commands[] = {
 		RSRC_CONF,
 		"The maximum number of seconds that an application may be idle before it gets terminated."),
 	AP_INIT_FLAG("PassengerUseGlobalQueue",
-		(Take1Func) cmd_passenger_use_global_queue,
+		(FlagFunc) cmd_passenger_use_global_queue,
 		NULL,
 		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
 		"Enable or disable Passenger's global queuing mode mode."),
 	AP_INIT_FLAG("PassengerUserSwitching",
-		(Take1Func) cmd_passenger_user_switching,
+		(FlagFunc) cmd_passenger_user_switching,
 		NULL,
 		RSRC_CONF,
 		"Whether to enable user switching support."),
@@ -607,12 +650,12 @@ const command_rec passenger_commands[] = {
 		OR_LIMIT | ACCESS_CONF | RSRC_CONF,
 		"The maximum number of requests that an application instance may process."),
 	AP_INIT_FLAG("PassengerHighPerformance",
-		(Take1Func) cmd_passenger_high_performance,
+		(FlagFunc) cmd_passenger_high_performance,
 		NULL,
 		OR_ALL,
 		"Enable or disable Passenger's high performance mode."),
 	AP_INIT_FLAG("PassengerEnabled",
-		(Take1Func) cmd_passenger_enabled,
+		(FlagFunc) cmd_passenger_enabled,
 		NULL,
 		OR_ALL,
 		"Enable or disable Phusion Passenger."),
@@ -636,6 +679,17 @@ const command_rec passenger_commands[] = {
 		NULL,
 		OR_OPTIONS,
 		"The directory in which upload buffer files should be placed."),
+	AP_INIT_FLAG("PassengerResolveSymlinksInDocumentRoot",
+		(FlagFunc) cmd_passenger_resolve_symlinks_in_document_root,
+		NULL,
+		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+		"Whether to resolve symlinks in the DocumentRoot path"),
+	AP_INIT_FLAG("PassengerAllowEncodedSlashes",
+		(FlagFunc) cmd_passenger_allow_encoded_slashes,
+		NULL,
+		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+		"Whether to support encoded slashes in the URL"),
+	
 	/*****************************/
 
 	// Rails-specific settings.
@@ -645,12 +699,12 @@ const command_rec passenger_commands[] = {
 		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
 		"Reserve the given URI to a Rails application."),
 	AP_INIT_FLAG("RailsAutoDetect",
-		(Take1Func) cmd_rails_auto_detect,
+		(FlagFunc) cmd_rails_auto_detect,
 		NULL,
 		RSRC_CONF,
 		"Whether auto-detection of Ruby on Rails applications should be enabled."),
 	AP_INIT_FLAG("RailsAllowModRewrite",
-		(Take1Func) cmd_rails_allow_mod_rewrite,
+		(FlagFunc) cmd_rails_allow_mod_rewrite,
 		NULL,
 		RSRC_CONF,
 		"Whether custom mod_rewrite rules should be allowed."),
@@ -682,7 +736,7 @@ const command_rec passenger_commands[] = {
 		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
 		"Reserve the given URI to a Rack application."),
 	AP_INIT_FLAG("RackAutoDetect",
-		(Take1Func) cmd_rack_auto_detect,
+		(FlagFunc) cmd_rack_auto_detect,
 		NULL,
 		RSRC_CONF,
 		"Whether auto-detection of Rack applications should be enabled."),
@@ -694,7 +748,7 @@ const command_rec passenger_commands[] = {
 	
 	// WSGI-specific settings.
 	AP_INIT_FLAG("PassengerWSGIAutoDetect",
-		(Take1Func) cmd_wsgi_auto_detect,
+		(FlagFunc) cmd_wsgi_auto_detect,
 		NULL,
 		RSRC_CONF,
 		"Whether auto-detection of WSGI applications should be enabled."),
@@ -721,7 +775,7 @@ const command_rec passenger_commands[] = {
 		RSRC_CONF,
 		"Deprecated option."),
 	AP_INIT_FLAG("RailsUserSwitching",
-		(Take1Func) cmd_passenger_user_switching,
+		(FlagFunc) cmd_passenger_user_switching,
 		NULL,
 		RSRC_CONF,
 		"Deprecated option."),