passenger 2.1.2 → 2.1.3

data/doc/rdoc/classes/Exception.html

@@ -97,17 +97,17 @@ Object
   <p class="source-link">[ <a href="javascript:toggleSource('M000008_source')" id="l_M000008_source">show source</a> ]</p>
   <div id="M000008_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/utils.rb, line 353</span>
-353:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">backtrace_string</span>(<span class="ruby-identifier">current_location</span> = <span class="ruby-keyword kw">nil</span>)
-354:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">current_location</span>.<span class="ruby-identifier">nil?</span>
-355:                         <span class="ruby-identifier">location</span> = <span class="ruby-keyword kw">nil</span>
-356:                 <span class="ruby-keyword kw">else</span>
-357:                         <span class="ruby-identifier">location</span> = <span class="ruby-node">&quot;in #{current_location} &quot;</span>
-358:                 <span class="ruby-keyword kw">end</span>
-359:                 <span class="ruby-keyword kw">return</span> <span class="ruby-node">&quot;*** Exception #{self.class} #{location}&quot;</span> <span class="ruby-operator">&lt;&lt;</span>
-360:                         <span class="ruby-node">&quot;(#{self}) (process #{$$}):\n&quot;</span> <span class="ruby-operator">&lt;&lt;</span>
-361:                         <span class="ruby-value str">&quot;\tfrom &quot;</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">backtrace</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">&quot;\n\tfrom &quot;</span>)
-362:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/utils.rb, line 360</span>
+360:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">backtrace_string</span>(<span class="ruby-identifier">current_location</span> = <span class="ruby-keyword kw">nil</span>)
+361:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">current_location</span>.<span class="ruby-identifier">nil?</span>
+362:                         <span class="ruby-identifier">location</span> = <span class="ruby-keyword kw">nil</span>
+363:                 <span class="ruby-keyword kw">else</span>
+364:                         <span class="ruby-identifier">location</span> = <span class="ruby-node">&quot;in #{current_location} &quot;</span>
+365:                 <span class="ruby-keyword kw">end</span>
+366:                 <span class="ruby-keyword kw">return</span> <span class="ruby-node">&quot;*** Exception #{self.class} #{location}&quot;</span> <span class="ruby-operator">&lt;&lt;</span>
+367:                         <span class="ruby-node">&quot;(#{self}) (process #{$$}):\n&quot;</span> <span class="ruby-operator">&lt;&lt;</span>
+368:                         <span class="ruby-value str">&quot;\tfrom &quot;</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">backtrace</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">&quot;\n\tfrom &quot;</span>)
+369:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>

data/doc/rdoc/classes/GC.html

@@ -97,10 +97,10 @@ copy-on-write friendly.
   <p class="source-link">[ <a href="javascript:toggleSource('M000033_source')" id="l_M000033_source">show source</a> ]</p>
   <div id="M000033_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/utils.rb, line 506</span>
-506:                 <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">copy_on_write_friendly?</span>
-507:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span>
-508:                 <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/utils.rb, line 513</span>
+513:                 <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">copy_on_write_friendly?</span>
+514:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span>
+515:                 <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>

data/doc/rdoc/classes/IO.html

@@ -99,12 +99,12 @@ Object
   <p class="source-link">[ <a href="javascript:toggleSource('M000007_source')" id="l_M000007_source">show source</a> ]</p>
   <div id="M000007_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/utils.rb, line 450</span>
-450:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">close_on_exec!</span>
-451:                 <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">defined?</span>(<span class="ruby-constant">Fcntl</span><span class="ruby-operator">::</span><span class="ruby-constant">F_SETFD</span>)
-452:                         <span class="ruby-identifier">fcntl</span>(<span class="ruby-constant">Fcntl</span><span class="ruby-operator">::</span><span class="ruby-constant">F_SETFD</span>, <span class="ruby-constant">Fcntl</span><span class="ruby-operator">::</span><span class="ruby-constant">FD_CLOEXEC</span>)
-453:                 <span class="ruby-keyword kw">end</span>
-454:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/utils.rb, line 457</span>
+457:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">close_on_exec!</span>
+458:                 <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">defined?</span>(<span class="ruby-constant">Fcntl</span><span class="ruby-operator">::</span><span class="ruby-constant">F_SETFD</span>)
+459:                         <span class="ruby-identifier">fcntl</span>(<span class="ruby-constant">Fcntl</span><span class="ruby-operator">::</span><span class="ruby-constant">F_SETFD</span>, <span class="ruby-constant">Fcntl</span><span class="ruby-operator">::</span><span class="ruby-constant">FD_CLOEXEC</span>)
+460:                 <span class="ruby-keyword kw">end</span>
+461:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -127,10 +127,10 @@ Raises SystemCallError if something went wrong.
   <p class="source-link">[ <a href="javascript:toggleSource('M000006_source')" id="l_M000006_source">show source</a> ]</p>
   <div id="M000006_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/utils.rb, line 445</span>
-445:                 <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">recv_io</span>
-446:                         <span class="ruby-keyword kw">return</span> <span class="ruby-constant">IO</span>.<span class="ruby-identifier">new</span>(<span class="ruby-constant">PhusionPassenger</span><span class="ruby-operator">::</span><span class="ruby-constant">NativeSupport</span>.<span class="ruby-identifier">recv_fd</span>(<span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">fileno</span>))
-447:                 <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/utils.rb, line 452</span>
+452:                 <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">recv_io</span>
+453:                         <span class="ruby-keyword kw">return</span> <span class="ruby-constant">IO</span>.<span class="ruby-identifier">new</span>(<span class="ruby-constant">PhusionPassenger</span><span class="ruby-operator">::</span><span class="ruby-constant">NativeSupport</span>.<span class="ruby-identifier">recv_fd</span>(<span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">fileno</span>))
+454:                 <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -153,10 +153,10 @@ Raises SystemCallError if something went wrong.
   <p class="source-link">[ <a href="javascript:toggleSource('M000005_source')" id="l_M000005_source">show source</a> ]</p>
   <div id="M000005_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/utils.rb, line 437</span>
-437:                 <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">send_io</span>(<span class="ruby-identifier">io</span>)
-438:                         <span class="ruby-constant">PhusionPassenger</span><span class="ruby-operator">::</span><span class="ruby-constant">NativeSupport</span>.<span class="ruby-identifier">send_fd</span>(<span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">fileno</span>, <span class="ruby-identifier">io</span>.<span class="ruby-identifier">fileno</span>)
-439:                 <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/utils.rb, line 444</span>
+444:                 <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">send_io</span>(<span class="ruby-identifier">io</span>)
+445:                         <span class="ruby-constant">PhusionPassenger</span><span class="ruby-operator">::</span><span class="ruby-constant">NativeSupport</span>.<span class="ruby-identifier">send_fd</span>(<span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">fileno</span>, <span class="ruby-identifier">io</span>.<span class="ruby-identifier">fileno</span>)
+446:                 <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>

data/doc/rdoc/classes/PhusionPassenger.html

@@ -57,28 +57,28 @@
       <tr valign="top">
         <td>In:</td>
         <td>
-<a href="../files/lib/phusion_passenger/dependencies_rb.html">lib/phusion_passenger/dependencies.rb</a>
-<a href="../files/lib/phusion_passenger/html_template_rb.html">lib/phusion_passenger/html_template.rb</a>
-<a href="../files/lib/phusion_passenger/admin_tools_rb.html">lib/phusion_passenger/admin_tools.rb</a>
-<a href="../files/lib/phusion_passenger/spawn_manager_rb.html">lib/phusion_passenger/spawn_manager.rb</a>
-<a href="../files/lib/phusion_passenger/abstract_request_handler_rb.html">lib/phusion_passenger/abstract_request_handler.rb</a>
 <a href="../files/lib/phusion_passenger/abstract_server_rb.html">lib/phusion_passenger/abstract_server.rb</a>
+<a href="../files/lib/phusion_passenger/exceptions_rb.html">lib/phusion_passenger/exceptions.rb</a>
+<a href="../files/lib/phusion_passenger/dependencies_rb.html">lib/phusion_passenger/dependencies.rb</a>
 <a href="../files/lib/phusion_passenger/abstract_server_collection_rb.html">lib/phusion_passenger/abstract_server_collection.rb</a>
+<a href="../files/lib/phusion_passenger/console_text_template_rb.html">lib/phusion_passenger/console_text_template.rb</a>
+<a href="../files/lib/phusion_passenger/application_rb.html">lib/phusion_passenger/application.rb</a>
 <a href="../files/lib/phusion_passenger/message_channel_rb.html">lib/phusion_passenger/message_channel.rb</a>
+<a href="../files/lib/phusion_passenger/constants_rb.html">lib/phusion_passenger/constants.rb</a>
+<a href="../files/lib/phusion_passenger/spawn_manager_rb.html">lib/phusion_passenger/spawn_manager.rb</a>
 <a href="../files/lib/phusion_passenger/utils_rb.html">lib/phusion_passenger/utils.rb</a>
-<a href="../files/lib/phusion_passenger/exceptions_rb.html">lib/phusion_passenger/exceptions.rb</a>
 <a href="../files/lib/phusion_passenger/events_rb.html">lib/phusion_passenger/events.rb</a>
-<a href="../files/lib/phusion_passenger/constants_rb.html">lib/phusion_passenger/constants.rb</a>
-<a href="../files/lib/phusion_passenger/application_rb.html">lib/phusion_passenger/application.rb</a>
-<a href="../files/lib/phusion_passenger/console_text_template_rb.html">lib/phusion_passenger/console_text_template.rb</a>
-<a href="../files/lib/phusion_passenger/admin_tools/control_process_rb.html">lib/phusion_passenger/admin_tools/control_process.rb</a>
+<a href="../files/lib/phusion_passenger/admin_tools_rb.html">lib/phusion_passenger/admin_tools.rb</a>
+<a href="../files/lib/phusion_passenger/html_template_rb.html">lib/phusion_passenger/html_template.rb</a>
+<a href="../files/lib/phusion_passenger/abstract_request_handler_rb.html">lib/phusion_passenger/abstract_request_handler.rb</a>
 <a href="../files/lib/phusion_passenger/wsgi/application_spawner_rb.html">lib/phusion_passenger/wsgi/application_spawner.rb</a>
+<a href="../files/lib/phusion_passenger/admin_tools/control_process_rb.html">lib/phusion_passenger/admin_tools/control_process.rb</a>
 <a href="../files/lib/phusion_passenger/rack/application_spawner_rb.html">lib/phusion_passenger/rack/application_spawner.rb</a>
 <a href="../files/lib/phusion_passenger/rack/request_handler_rb.html">lib/phusion_passenger/rack/request_handler.rb</a>
 <a href="../files/lib/phusion_passenger/railz/application_spawner_rb.html">lib/phusion_passenger/railz/application_spawner.rb</a>
-<a href="../files/lib/phusion_passenger/railz/framework_spawner_rb.html">lib/phusion_passenger/railz/framework_spawner.rb</a>
 <a href="../files/lib/phusion_passenger/railz/request_handler_rb.html">lib/phusion_passenger/railz/request_handler.rb</a>
 <a href="../files/lib/phusion_passenger/railz/cgi_fixed_rb.html">lib/phusion_passenger/railz/cgi_fixed.rb</a>
+<a href="../files/lib/phusion_passenger/railz/framework_spawner_rb.html">lib/phusion_passenger/railz/framework_spawner.rb</a>
 <a href="../files/ext/phusion_passenger/native_support_c.html">ext/phusion_passenger/native_support.c</a>
         </td>
       </tr>

data/doc/rdoc/classes/PhusionPassenger/AdminTools.html

@@ -121,7 +121,7 @@
 <pre>
     <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools.rb, line 4</span>
  4:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">tmpdir</span>
- 5:                 [<span class="ruby-value str">&quot;PASSENGER_TMPDIR&quot;</span>, <span class="ruby-value str">&quot;TMPDIR&quot;</span>].<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">name</span><span class="ruby-operator">|</span>
+ 5:                 [<span class="ruby-value str">&quot;PASSENGER_TEMP_DIR&quot;</span>, <span class="ruby-value str">&quot;PASSENGER_TMPDIR&quot;</span>].<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">name</span><span class="ruby-operator">|</span>
  6:                         <span class="ruby-keyword kw">if</span> <span class="ruby-constant">ENV</span>.<span class="ruby-identifier">has_key?</span>(<span class="ruby-identifier">name</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-operator">!</span><span class="ruby-constant">ENV</span>[<span class="ruby-identifier">name</span>].<span class="ruby-identifier">empty?</span>
  7:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-constant">ENV</span>[<span class="ruby-identifier">name</span>]
  8:                         <span class="ruby-keyword kw">end</span>

data/doc/rdoc/classes/PhusionPassenger/AdminTools/ControlProcess.html

@@ -135,12 +135,13 @@ Object
 27:                                 <span class="ruby-comment cmt"># Stale Passenger temp folder. Clean it up if instructed.</span>
 28:                                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">clean_stale</span>
 29:                                         <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;*** Cleaning stale folder #{dir}&quot;</span>
-30:                                         <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">rm_rf</span>(<span class="ruby-identifier">dir</span>)
-31:                                 <span class="ruby-keyword kw">end</span>
-32:                         <span class="ruby-keyword kw">end</span>
-33:                 <span class="ruby-keyword kw">end</span>
-34:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">results</span>
-35:         <span class="ruby-keyword kw">end</span>
+30:                                         <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">chmod_R</span>(<span class="ruby-value">0700</span>, <span class="ruby-identifier">dir</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-identifier">dir</span>)
+31:                                         <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">rm_rf</span>(<span class="ruby-identifier">dir</span>)
+32:                                 <span class="ruby-keyword kw">end</span>
+33:                         <span class="ruby-keyword kw">end</span>
+34:                 <span class="ruby-keyword kw">end</span>
+35:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">results</span>
+36:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -153,18 +154,18 @@ Object
   <p class="source-link">[ <a href="javascript:toggleSource('M000066_source')" id="l_M000066_source">show source</a> ]</p>
   <div id="M000066_source" class="dyn-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 37</span>
-37:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">pid</span>, <span class="ruby-identifier">path</span> = <span class="ruby-keyword kw">nil</span>)
-38:                 <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-constant">AdminTools</span>.<span class="ruby-identifier">process_is_alive?</span>(<span class="ruby-identifier">pid</span>)
-39:                         <span class="ruby-identifier">raise</span> <span class="ruby-constant">ArgumentError</span>, <span class="ruby-node">&quot;There is no control process with PID #{pid}.&quot;</span>
-40:                 <span class="ruby-keyword kw">end</span>
-41:                 <span class="ruby-ivar">@pid</span> = <span class="ruby-identifier">pid</span>
-42:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">path</span>
-43:                         <span class="ruby-ivar">@path</span> = <span class="ruby-identifier">path</span>
-44:                 <span class="ruby-keyword kw">else</span>
-45:                         <span class="ruby-ivar">@path</span> = <span class="ruby-node">&quot;#{AdminTools.tmpdir}/passenger.#{pid}&quot;</span>
-46:                 <span class="ruby-keyword kw">end</span>
-47:         <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 38</span>
+38:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">pid</span>, <span class="ruby-identifier">path</span> = <span class="ruby-keyword kw">nil</span>)
+39:                 <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-constant">AdminTools</span>.<span class="ruby-identifier">process_is_alive?</span>(<span class="ruby-identifier">pid</span>)
+40:                         <span class="ruby-identifier">raise</span> <span class="ruby-constant">ArgumentError</span>, <span class="ruby-node">&quot;There is no control process with PID #{pid}.&quot;</span>
+41:                 <span class="ruby-keyword kw">end</span>
+42:                 <span class="ruby-ivar">@pid</span> = <span class="ruby-identifier">pid</span>
+43:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">path</span>
+44:                         <span class="ruby-ivar">@path</span> = <span class="ruby-identifier">path</span>
+45:                 <span class="ruby-keyword kw">else</span>
+46:                         <span class="ruby-ivar">@path</span> = <span class="ruby-node">&quot;#{AdminTools.tmpdir}/passenger.#{pid}&quot;</span>
+47:                 <span class="ruby-keyword kw">end</span>
+48:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -178,11 +179,11 @@ Object
   <p class="source-link">[ <a href="javascript:toggleSource('M000069_source')" id="l_M000069_source">show source</a> ]</p>
   <div id="M000069_source" class="dyn-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 59</span>
-59:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">domains</span>
-60:                 <span class="ruby-identifier">reload</span>
-61:                 <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@domains</span>
-62:         <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 60</span>
+60:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">domains</span>
+61:                 <span class="ruby-identifier">reload</span>
+62:                 <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@domains</span>
+63:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -195,12 +196,12 @@ Object
   <p class="source-link">[ <a href="javascript:toggleSource('M000070_source')" id="l_M000070_source">show source</a> ]</p>
   <div id="M000070_source" class="dyn-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 64</span>
-64:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">instances</span>
-65:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">domains</span>.<span class="ruby-identifier">map</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">domain</span><span class="ruby-operator">|</span>
-66:                         <span class="ruby-identifier">domain</span>[<span class="ruby-identifier">:instances</span>]
-67:                 <span class="ruby-keyword kw">end</span>.<span class="ruby-identifier">flatten</span>
-68:         <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 65</span>
+65:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">instances</span>
+66:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">domains</span>.<span class="ruby-identifier">map</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">domain</span><span class="ruby-operator">|</span>
+67:                         <span class="ruby-identifier">domain</span>[<span class="ruby-identifier">:instances</span>]
+68:                 <span class="ruby-keyword kw">end</span>.<span class="ruby-identifier">flatten</span>
+69:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -213,11 +214,11 @@ Object
   <p class="source-link">[ <a href="javascript:toggleSource('M000067_source')" id="l_M000067_source">show source</a> ]</p>
   <div id="M000067_source" class="dyn-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 49</span>
-49:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">status</span>
-50:                 <span class="ruby-identifier">reload</span>
-51:                 <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@status</span>
-52:         <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 50</span>
+50:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">status</span>
+51:                 <span class="ruby-identifier">reload</span>
+52:                 <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@status</span>
+53:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -230,11 +231,11 @@ Object
   <p class="source-link">[ <a href="javascript:toggleSource('M000068_source')" id="l_M000068_source">show source</a> ]</p>
   <div id="M000068_source" class="dyn-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 54</span>
-54:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">xml</span>
-55:                 <span class="ruby-identifier">reload</span>
-56:                 <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@xml</span>
-57:         <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 55</span>
+55:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">xml</span>
+56:                 <span class="ruby-identifier">reload</span>
+57:                 <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@xml</span>
+58:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>

data/doc/rdoc/classes/PhusionPassenger/Application.html

@@ -84,9 +84,9 @@ Represents a single application instance.
 
   <div class="sectiontitle">Methods</div>
   <ul>
-  <li><a href="#M000106">close</a></li>
-  <li><a href="#M000104">detect_framework_version</a></li>
-  <li><a href="#M000105">new</a></li>
+  <li><a href="#M000109">close</a></li>
+  <li><a href="#M000107">detect_framework_version</a></li>
+  <li><a href="#M000108">new</a></li>
   </ul>
 
 
@@ -113,7 +113,7 @@ The root directory of this application, i.e. the directory that contains
     <td class='attr-name'>listen_socket_name</td>
     <td class='attr-desc'>
 The name of the socket on which the application instance will accept <a
-href="Application.html#M000105">new</a> connections. See
+href="Application.html#M000108">new</a> connections. See
 #listen_socket_type on how one should interpret this value.
 
 </td>
@@ -156,7 +156,7 @@ The process ID of this application instance.
 <div class="sectiontitle">Public Class methods</div>
 <div class="method">
   <div class="title">
-    <a name="M000104"></a><b>detect_framework_version</b>(app_root)
+    <a name="M000107"></a><b>detect_framework_version</b>(app_root)
   </div>
   <div class="description">
   <ul>
@@ -176,8 +176,8 @@ Rails version is not installed.
 </p>
   </div>
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000104_source')" id="l_M000104_source">show source</a> ]</p>
-  <div id="M000104_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000107_source')" id="l_M000107_source">show source</a> ]</p>
+  <div id="M000107_source" class="dyn-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/phusion_passenger/application.rb, line 50</span>
 50:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">detect_framework_version</span>(<span class="ruby-identifier">app_root</span>)
@@ -223,18 +223,18 @@ Rails version is not installed.
 </div>
 <div class="method">
   <div class="title">
-    <a name="M000105"></a><b>new</b>(app_root, pid, listen_socket_name, listen_socket_type, owner_pipe)
+    <a name="M000108"></a><b>new</b>(app_root, pid, listen_socket_name, listen_socket_type, owner_pipe)
   </div>
   <div class="description">
   <p>
-Creates a <a href="Application.html#M000105">new</a> instance of <a
+Creates a <a href="Application.html#M000108">new</a> instance of <a
 href="Application.html">Application</a>. The parameters correspond with the
 attributes of the same names. No exceptions will be thrown.
 </p>
   </div>
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000105_source')" id="l_M000105_source">show source</a> ]</p>
-  <div id="M000105_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000108_source')" id="l_M000108_source">show source</a> ]</p>
+  <div id="M000108_source" class="dyn-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/phusion_passenger/application.rb, line 90</span>
 90:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">app_root</span>, <span class="ruby-identifier">pid</span>, <span class="ruby-identifier">listen_socket_name</span>, <span class="ruby-identifier">listen_socket_type</span>, <span class="ruby-identifier">owner_pipe</span>)
@@ -251,7 +251,7 @@ attributes of the same names. No exceptions will be thrown.
 <div class="sectiontitle">Public Instance methods</div>
 <div class="method">
   <div class="title">
-    <a name="M000106"></a><b>close</b>()
+    <a name="M000109"></a><b>close</b>()
   </div>
   <div class="description">
   <p>
@@ -264,8 +264,8 @@ See also AbstractRequestHandler#owner_pipe.
 </p>
   </div>
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000106_source')" id="l_M000106_source">show source</a> ]</p>
-  <div id="M000106_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000109_source')" id="l_M000109_source">show source</a> ]</p>
+  <div id="M000109_source" class="dyn-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/phusion_passenger/application.rb, line 103</span>
 103:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">close</span>

data/doc/rdoc/classes/PhusionPassenger/HTMLTemplate.html

@@ -84,9 +84,9 @@ A convenience utility class for rendering our error pages.
 
   <div class="sectiontitle">Methods</div>
   <ul>
-  <li><a href="#M000108">[]=</a></li>
-  <li><a href="#M000107">new</a></li>
-  <li><a href="#M000109">result</a></li>
+  <li><a href="#M000105">[]=</a></li>
+  <li><a href="#M000104">new</a></li>
+  <li><a href="#M000106">result</a></li>
   </ul>
 
 <div class="sectiontitle">Included Modules</div>
@@ -114,11 +114,11 @@ A convenience utility class for rendering our error pages.
 <div class="sectiontitle">Public Class methods</div>
 <div class="method">
   <div class="title">
-    <a name="M000107"></a><b>new</b>(template_name, options = {})
+    <a name="M000104"></a><b>new</b>(template_name, options = {})
   </div>
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000107_source')" id="l_M000107_source">show source</a> ]</p>
-  <div id="M000107_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000104_source')" id="l_M000104_source">show source</a> ]</p>
+  <div id="M000104_source" class="dyn-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/phusion_passenger/html_template.rb, line 28</span>
 28:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">template_name</span>, <span class="ruby-identifier">options</span> = {})
@@ -136,11 +136,11 @@ A convenience utility class for rendering our error pages.
 <div class="sectiontitle">Public Instance methods</div>
 <div class="method">
   <div class="title">
-    <a name="M000108"></a><b>[]=</b>(name, value)
+    <a name="M000105"></a><b>[]=</b>(name, value)
   </div>
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000108_source')" id="l_M000108_source">show source</a> ]</p>
-  <div id="M000108_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000105_source')" id="l_M000105_source">show source</a> ]</p>
+  <div id="M000105_source" class="dyn-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/phusion_passenger/html_template.rb, line 37</span>
 37:         <span class="ruby-keyword kw">def</span> <span class="ruby-operator">[]=</span>(<span class="ruby-identifier">name</span>, <span class="ruby-identifier">value</span>)
@@ -153,11 +153,11 @@ A convenience utility class for rendering our error pages.
 </div>
 <div class="method">
   <div class="title">
-    <a name="M000109"></a><b>result</b>()
+    <a name="M000106"></a><b>result</b>()
   </div>
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000109_source')" id="l_M000109_source">show source</a> ]</p>
-  <div id="M000109_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000106_source')" id="l_M000106_source">show source</a> ]</p>
+  <div id="M000106_source" class="dyn-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/phusion_passenger/html_template.rb, line 42</span>
 42:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">result</span>

data/doc/rdoc/classes/PhusionPassenger/Railz.html

@@ -58,9 +58,9 @@
         <td>In:</td>
         <td>
 <a href="../../files/lib/phusion_passenger/railz/application_spawner_rb.html">lib/phusion_passenger/railz/application_spawner.rb</a>
-<a href="../../files/lib/phusion_passenger/railz/framework_spawner_rb.html">lib/phusion_passenger/railz/framework_spawner.rb</a>
 <a href="../../files/lib/phusion_passenger/railz/request_handler_rb.html">lib/phusion_passenger/railz/request_handler.rb</a>
 <a href="../../files/lib/phusion_passenger/railz/cgi_fixed_rb.html">lib/phusion_passenger/railz/cgi_fixed.rb</a>
+<a href="../../files/lib/phusion_passenger/railz/framework_spawner_rb.html">lib/phusion_passenger/railz/framework_spawner.rb</a>
         </td>
       </tr>
          </table>

data/doc/rdoc/classes/PhusionPassenger/Utils.html

@@ -355,15 +355,22 @@ directory if it doesn‘t exist.
 <pre>
      <span class="ruby-comment cmt"># File lib/phusion_passenger/utils.rb, line 338</span>
 338:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">passenger_tmpdir</span>(<span class="ruby-identifier">create</span> = <span class="ruby-keyword kw">true</span>)
-339:                 <span class="ruby-identifier">dir</span> = <span class="ruby-constant">ENV</span>[<span class="ruby-value str">'PHUSION_PASSENGER_TMP'</span>]
+339:                 <span class="ruby-identifier">dir</span> = <span class="ruby-constant">ENV</span>[<span class="ruby-value str">'PASSENGER_INSTANCE_TEMP_DIR'</span>]
 340:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">dir</span>.<span class="ruby-identifier">nil?</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">dir</span>.<span class="ruby-identifier">empty?</span>
-341:                         <span class="ruby-identifier">dir</span> = <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">tmpdir</span>
-342:                 <span class="ruby-keyword kw">end</span>
-343:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">create</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-operator">!</span><span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-identifier">dir</span>)
-344:                         <span class="ruby-identifier">system</span>(<span class="ruby-value str">&quot;mkdir&quot;</span>, <span class="ruby-value str">&quot;-p&quot;</span>, <span class="ruby-value str">&quot;-m&quot;</span>, <span class="ruby-value str">&quot;u=rwxs,g=wx,o=wx&quot;</span>, <span class="ruby-identifier">dir</span>)
-345:                 <span class="ruby-keyword kw">end</span>
-346:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">dir</span>
-347:         <span class="ruby-keyword kw">end</span>
+341:                         <span class="ruby-identifier">dir</span> = <span class="ruby-node">&quot;#{Dir.tmpdir}/passenger.#{Process.pid}&quot;</span>
+342:                         <span class="ruby-constant">ENV</span>[<span class="ruby-value str">'PASSENGER_INSTANCE_TEMP_DIR'</span>] = <span class="ruby-identifier">dir</span>
+343:                 <span class="ruby-keyword kw">end</span>
+344:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">create</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-operator">!</span><span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-identifier">dir</span>)
+345:                         <span class="ruby-comment cmt"># This is a very minimal implementation of the function</span>
+346:                         <span class="ruby-comment cmt"># passengerCreateTempDir() in Utils.cpp. This implementation</span>
+347:                         <span class="ruby-comment cmt"># is only meant to make the unit tests pass. For production</span>
+348:                         <span class="ruby-comment cmt"># systems one should pre-create the temp directory with</span>
+349:                         <span class="ruby-comment cmt"># passengerCreateTempDir().</span>
+350:                         <span class="ruby-identifier">system</span>(<span class="ruby-value str">&quot;mkdir&quot;</span>, <span class="ruby-value str">&quot;-p&quot;</span>, <span class="ruby-value str">&quot;-m&quot;</span>, <span class="ruby-value str">&quot;u=wxs,g=wx,o=wx&quot;</span>, <span class="ruby-identifier">dir</span>)
+351:                         <span class="ruby-identifier">system</span>(<span class="ruby-value str">&quot;mkdir&quot;</span>, <span class="ruby-value str">&quot;-p&quot;</span>, <span class="ruby-value str">&quot;-m&quot;</span>, <span class="ruby-value str">&quot;u=wxs,g=wx,o=wx&quot;</span>, <span class="ruby-node">&quot;#{dir}/backends&quot;</span>)
+352:                 <span class="ruby-keyword kw">end</span>
+353:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">dir</span>
+354:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>

data/doc/rdoc/classes/PlatformInfo.html

@@ -155,14 +155,14 @@ The absolute path to the Apache 2 ‘bin’ directory.
   <p class="source-link">[ <a href="javascript:toggleSource('M000019_source')" id="l_M000019_source">show source</a> ]</p>
   <div id="M000019_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 305</span>
-305:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apache2_bindir</span>
-306:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">apxs2</span>.<span class="ruby-identifier">nil?</span>
-307:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
-308:                 <span class="ruby-keyword kw">else</span>
-309:                         <span class="ruby-keyword kw">return</span> <span class="ruby-node">`#{apxs2} -q BINDIR 2&gt;/dev/null`</span>.<span class="ruby-identifier">strip</span>
-310:                 <span class="ruby-keyword kw">end</span>
-311:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 307</span>
+307:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apache2_bindir</span>
+308:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">apxs2</span>.<span class="ruby-identifier">nil?</span>
+309:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
+310:                 <span class="ruby-keyword kw">else</span>
+311:                         <span class="ruby-keyword kw">return</span> <span class="ruby-node">`#{apxs2} -q BINDIR 2&gt;/dev/null`</span>.<span class="ruby-identifier">strip</span>
+312:                 <span class="ruby-keyword kw">end</span>
+313:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -181,41 +181,41 @@ Includes <a href="PlatformInfo.html#M000021">portability_cflags</a>.
   <p class="source-link">[ <a href="javascript:toggleSource('M000024_source')" id="l_M000024_source">show source</a> ]</p>
   <div id="M000024_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 372</span>
-372:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apache2_module_cflags</span>(<span class="ruby-identifier">with_apr_flags</span> = <span class="ruby-keyword kw">true</span>)
-373:                 <span class="ruby-identifier">flags</span> = [<span class="ruby-value str">&quot;-fPIC&quot;</span>]
-374:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">with_apr_flags</span>
-375:                         <span class="ruby-identifier">flags</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">apr_flags</span>
-376:                         <span class="ruby-identifier">flags</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">apu_flags</span>
-377:                 <span class="ruby-keyword kw">end</span>
-378:                 <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-identifier">apxs2</span>.<span class="ruby-identifier">nil?</span>
-379:                         <span class="ruby-identifier">apxs2_flags</span> = <span class="ruby-node">`#{apxs2} -q CFLAGS`</span>.<span class="ruby-identifier">strip</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">&quot; -I&quot;</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">`#{apxs2} -q INCLUDEDIR`</span>.<span class="ruby-identifier">strip</span>
-380:                         <span class="ruby-identifier">apxs2_flags</span>.<span class="ruby-identifier">gsub!</span>(<span class="ruby-regexp re">/-O\d? /</span>, <span class="ruby-value str">''</span>)
-381: 
-382:                         <span class="ruby-comment cmt"># Remove flags not supported by GCC</span>
-383:                         <span class="ruby-keyword kw">if</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/solaris/</span> <span class="ruby-comment cmt"># TODO: Add support for people using SunStudio</span>
-384:                                 <span class="ruby-comment cmt"># The big problem is Coolstack apxs includes a bunch of solaris -x directives.</span>
-385:                                 <span class="ruby-identifier">options</span> = <span class="ruby-identifier">apxs2_flags</span>.<span class="ruby-identifier">split</span>
-386:                                 <span class="ruby-identifier">options</span>.<span class="ruby-identifier">reject!</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span> <span class="ruby-identifier">f</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/^\-x/</span> }
-387:                                 <span class="ruby-identifier">options</span>.<span class="ruby-identifier">reject!</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span> <span class="ruby-identifier">f</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/^\-Xa/</span> }
-388:                                 <span class="ruby-identifier">apxs2_flags</span> = <span class="ruby-identifier">options</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">' '</span>)
-389:                         <span class="ruby-keyword kw">end</span>
-390:                         
-391:                         <span class="ruby-identifier">apxs2_flags</span>.<span class="ruby-identifier">strip!</span>
-392:                         <span class="ruby-identifier">flags</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">apxs2_flags</span>
-393:                 <span class="ruby-keyword kw">end</span>
-394:                 <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-identifier">httpd</span>.<span class="ruby-identifier">nil?</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/darwin/</span>
-395:                         <span class="ruby-comment cmt"># Add possible universal binary flags.</span>
-396:                         <span class="ruby-identifier">architectures</span> = []
-397:                         <span class="ruby-node">`file &quot;#{httpd}&quot;`</span>.<span class="ruby-identifier">split</span>(<span class="ruby-value str">&quot;\n&quot;</span>).<span class="ruby-identifier">grep</span>(<span class="ruby-regexp re">/for architecture/</span>).<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">line</span><span class="ruby-operator">|</span>
-398:                                 <span class="ruby-identifier">line</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/for architecture (.*?)\)/</span>
-399:                                 <span class="ruby-identifier">architectures</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">&quot;-arch #{$1}&quot;</span>
-400:                         <span class="ruby-keyword kw">end</span>
-401:                         <span class="ruby-identifier">flags</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">architectures</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">' '</span>)
-402:                 <span class="ruby-keyword kw">end</span>
-403:                 <span class="ruby-identifier">flags</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">portability_cflags</span>
-404:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">flags</span>.<span class="ruby-identifier">compact</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">' '</span>).<span class="ruby-identifier">strip</span>
-405:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 378</span>
+378:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apache2_module_cflags</span>(<span class="ruby-identifier">with_apr_flags</span> = <span class="ruby-keyword kw">true</span>)
+379:                 <span class="ruby-identifier">flags</span> = [<span class="ruby-value str">&quot;-fPIC&quot;</span>]
+380:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">with_apr_flags</span>
+381:                         <span class="ruby-identifier">flags</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">apr_flags</span>
+382:                         <span class="ruby-identifier">flags</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">apu_flags</span>
+383:                 <span class="ruby-keyword kw">end</span>
+384:                 <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-identifier">apxs2</span>.<span class="ruby-identifier">nil?</span>
+385:                         <span class="ruby-identifier">apxs2_flags</span> = <span class="ruby-node">`#{apxs2} -q CFLAGS`</span>.<span class="ruby-identifier">strip</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">&quot; -I&quot;</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">`#{apxs2} -q INCLUDEDIR`</span>.<span class="ruby-identifier">strip</span>
+386:                         <span class="ruby-identifier">apxs2_flags</span>.<span class="ruby-identifier">gsub!</span>(<span class="ruby-regexp re">/-O\d? /</span>, <span class="ruby-value str">''</span>)
+387: 
+388:                         <span class="ruby-comment cmt"># Remove flags not supported by GCC</span>
+389:                         <span class="ruby-keyword kw">if</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/solaris/</span> <span class="ruby-comment cmt"># TODO: Add support for people using SunStudio</span>
+390:                                 <span class="ruby-comment cmt"># The big problem is Coolstack apxs includes a bunch of solaris -x directives.</span>
+391:                                 <span class="ruby-identifier">options</span> = <span class="ruby-identifier">apxs2_flags</span>.<span class="ruby-identifier">split</span>
+392:                                 <span class="ruby-identifier">options</span>.<span class="ruby-identifier">reject!</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span> <span class="ruby-identifier">f</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/^\-x/</span> }
+393:                                 <span class="ruby-identifier">options</span>.<span class="ruby-identifier">reject!</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span> <span class="ruby-identifier">f</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/^\-Xa/</span> }
+394:                                 <span class="ruby-identifier">apxs2_flags</span> = <span class="ruby-identifier">options</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">' '</span>)
+395:                         <span class="ruby-keyword kw">end</span>
+396:                         
+397:                         <span class="ruby-identifier">apxs2_flags</span>.<span class="ruby-identifier">strip!</span>
+398:                         <span class="ruby-identifier">flags</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">apxs2_flags</span>
+399:                 <span class="ruby-keyword kw">end</span>
+400:                 <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-identifier">httpd</span>.<span class="ruby-identifier">nil?</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/darwin/</span>
+401:                         <span class="ruby-comment cmt"># Add possible universal binary flags.</span>
+402:                         <span class="ruby-identifier">architectures</span> = []
+403:                         <span class="ruby-node">`file &quot;#{httpd}&quot;`</span>.<span class="ruby-identifier">split</span>(<span class="ruby-value str">&quot;\n&quot;</span>).<span class="ruby-identifier">grep</span>(<span class="ruby-regexp re">/for architecture/</span>).<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">line</span><span class="ruby-operator">|</span>
+404:                                 <span class="ruby-identifier">line</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/for architecture (.*?)\)/</span>
+405:                                 <span class="ruby-identifier">architectures</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">&quot;-arch #{$1}&quot;</span>
+406:                         <span class="ruby-keyword kw">end</span>
+407:                         <span class="ruby-identifier">flags</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">architectures</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">' '</span>)
+408:                 <span class="ruby-keyword kw">end</span>
+409:                 <span class="ruby-identifier">flags</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">portability_cflags</span>
+410:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">flags</span>.<span class="ruby-identifier">compact</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">' '</span>).<span class="ruby-identifier">strip</span>
+411:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -234,12 +234,12 @@ href="PlatformInfo.html#M000022">portability_ldflags</a>
   <p class="source-link">[ <a href="javascript:toggleSource('M000025_source')" id="l_M000025_source">show source</a> ]</p>
   <div id="M000025_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 410</span>
-410:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apache2_module_ldflags</span>
-411:                 <span class="ruby-identifier">flags</span> = <span class="ruby-node">&quot;-fPIC #{apr_libs} #{apu_libs} #{portability_ldflags}&quot;</span>
-412:                 <span class="ruby-identifier">flags</span>.<span class="ruby-identifier">strip!</span>
-413:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">flags</span>
-414:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 416</span>
+416:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apache2_module_ldflags</span>
+417:                 <span class="ruby-identifier">flags</span> = <span class="ruby-node">&quot;-fPIC #{apr_libs} #{apu_libs} #{portability_ldflags}&quot;</span>
+418:                 <span class="ruby-identifier">flags</span>.<span class="ruby-identifier">strip!</span>
+419:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">flags</span>
+420:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -257,14 +257,14 @@ The absolute path to the Apache 2 &#8216;sbin&#8217; directory.
   <p class="source-link">[ <a href="javascript:toggleSource('M000020_source')" id="l_M000020_source">show source</a> ]</p>
   <div id="M000020_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 315</span>
-315:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apache2_sbindir</span>
-316:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">apxs2</span>.<span class="ruby-identifier">nil?</span>
-317:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
-318:                 <span class="ruby-keyword kw">else</span>
-319:                         <span class="ruby-keyword kw">return</span> <span class="ruby-node">`#{apxs2} -q SBINDIR`</span>.<span class="ruby-identifier">strip</span>
-320:                 <span class="ruby-keyword kw">end</span>
-321:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 317</span>
+317:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apache2_sbindir</span>
+318:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">apxs2</span>.<span class="ruby-identifier">nil?</span>
+319:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
+320:                 <span class="ruby-keyword kw">else</span>
+321:                         <span class="ruby-keyword kw">return</span> <span class="ruby-node">`#{apxs2} -q SBINDIR`</span>.<span class="ruby-identifier">strip</span>
+322:                 <span class="ruby-keyword kw">end</span>
+323:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -283,10 +283,10 @@ href="PlatformInfo.html#M000015">apache2ctl</a>&#8217; binary.
   <p class="source-link">[ <a href="javascript:toggleSource('M000015_source')" id="l_M000015_source">show source</a> ]</p>
   <div id="M000015_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 227</span>
-227:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apache2ctl</span>
-228:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">find_apache2_executable</span>(<span class="ruby-value str">'apache2ctl'</span>, <span class="ruby-value str">'apachectl2'</span>, <span class="ruby-value str">'apachectl'</span>)
-229:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 229</span>
+229:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apache2ctl</span>
+230:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">find_apache2_executable</span>(<span class="ruby-value str">'apache2ctl'</span>, <span class="ruby-value str">'apachectl2'</span>, <span class="ruby-value str">'apachectl'</span>)
+231:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -305,29 +305,29 @@ The absolute path to the &#8216;apr-config&#8217; or
   <p class="source-link">[ <a href="javascript:toggleSource('M000017_source')" id="l_M000017_source">show source</a> ]</p>
   <div id="M000017_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 251</span>
-251:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apr_config</span>
-252:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">env_defined?</span>(<span class="ruby-value str">'APR_CONFIG'</span>)
-253:                         <span class="ruby-keyword kw">return</span> <span class="ruby-constant">ENV</span>[<span class="ruby-value str">'APR_CONFIG'</span>]
-254:                 <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">apxs2</span>.<span class="ruby-identifier">nil?</span>
-255:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
-256:                 <span class="ruby-keyword kw">else</span>
-257:                         <span class="ruby-identifier">filename</span> = <span class="ruby-node">`#{apxs2} -q APR_CONFIG 2&gt;/dev/null`</span>.<span class="ruby-identifier">strip</span>
-258:                         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">filename</span>.<span class="ruby-identifier">empty?</span>
-259:                                 <span class="ruby-identifier">apr_bindir</span> = <span class="ruby-node">`#{apxs2} -q APR_BINDIR 2&gt;/dev/null`</span>.<span class="ruby-identifier">strip</span>
-260:                                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">apr_bindir</span>.<span class="ruby-identifier">empty?</span>
-261:                                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
-262:                                 <span class="ruby-keyword kw">else</span>
-263:                                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">select_executable</span>(<span class="ruby-identifier">apr_bindir</span>,
-264:                                                 <span class="ruby-value str">&quot;apr-1-config&quot;</span>, <span class="ruby-value str">&quot;apr-config&quot;</span>)
-265:                                 <span class="ruby-keyword kw">end</span>
-266:                         <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-identifier">filename</span>)
-267:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">filename</span>
-268:                         <span class="ruby-keyword kw">else</span>
-269:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
-270:                         <span class="ruby-keyword kw">end</span>
-271:                 <span class="ruby-keyword kw">end</span>
-272:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 253</span>
+253:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apr_config</span>
+254:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">env_defined?</span>(<span class="ruby-value str">'APR_CONFIG'</span>)
+255:                         <span class="ruby-keyword kw">return</span> <span class="ruby-constant">ENV</span>[<span class="ruby-value str">'APR_CONFIG'</span>]
+256:                 <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">apxs2</span>.<span class="ruby-identifier">nil?</span>
+257:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
+258:                 <span class="ruby-keyword kw">else</span>
+259:                         <span class="ruby-identifier">filename</span> = <span class="ruby-node">`#{apxs2} -q APR_CONFIG 2&gt;/dev/null`</span>.<span class="ruby-identifier">strip</span>
+260:                         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">filename</span>.<span class="ruby-identifier">empty?</span>
+261:                                 <span class="ruby-identifier">apr_bindir</span> = <span class="ruby-node">`#{apxs2} -q APR_BINDIR 2&gt;/dev/null`</span>.<span class="ruby-identifier">strip</span>
+262:                                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">apr_bindir</span>.<span class="ruby-identifier">empty?</span>
+263:                                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
+264:                                 <span class="ruby-keyword kw">else</span>
+265:                                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">select_executable</span>(<span class="ruby-identifier">apr_bindir</span>,
+266:                                                 <span class="ruby-value str">&quot;apr-1-config&quot;</span>, <span class="ruby-value str">&quot;apr-config&quot;</span>)
+267:                                 <span class="ruby-keyword kw">end</span>
+268:                         <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-identifier">filename</span>)
+269:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">filename</span>
+270:                         <span class="ruby-keyword kw">else</span>
+271:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
+272:                         <span class="ruby-keyword kw">end</span>
+273:                 <span class="ruby-keyword kw">end</span>
+274:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -350,19 +350,19 @@ won&#8216;t be necessary in that case.
   <p class="source-link">[ <a href="javascript:toggleSource('M000030_source')" id="l_M000030_source">show source</a> ]</p>
   <div id="M000030_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 446</span>
-446:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apr_config_needed_for_building_apache_modules?</span>
-447:                 <span class="ruby-identifier">filename</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">join</span>(<span class="ruby-node">&quot;/tmp/passenger-platform-check-#{Process.pid}.c&quot;</span>)
-448:                 <span class="ruby-constant">File</span>.<span class="ruby-identifier">open</span>(<span class="ruby-identifier">filename</span>, <span class="ruby-value str">&quot;w&quot;</span>) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span>
-449:                         <span class="ruby-identifier">f</span>.<span class="ruby-identifier">puts</span>(<span class="ruby-value str">&quot;#include &lt;apr.h&gt;&quot;</span>)
-450:                 <span class="ruby-keyword kw">end</span>
-451:                 <span class="ruby-keyword kw">begin</span>
-452:                         <span class="ruby-keyword kw">return</span> <span class="ruby-operator">!</span><span class="ruby-identifier">system</span>(<span class="ruby-node">&quot;(gcc #{apache2_module_cflags(false)} -c '#{filename}' -o '#{filename}.o') &gt;/dev/null 2&gt;/dev/null&quot;</span>)
-453:                 <span class="ruby-keyword kw">ensure</span>
-454:                         <span class="ruby-constant">File</span>.<span class="ruby-identifier">unlink</span>(<span class="ruby-identifier">filename</span>) <span class="ruby-keyword kw">rescue</span> <span class="ruby-keyword kw">nil</span>
-455:                         <span class="ruby-constant">File</span>.<span class="ruby-identifier">unlink</span>(<span class="ruby-node">&quot;#{filename}.o&quot;</span>) <span class="ruby-keyword kw">rescue</span> <span class="ruby-keyword kw">nil</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 452</span>
+452:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apr_config_needed_for_building_apache_modules?</span>
+453:                 <span class="ruby-identifier">filename</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">join</span>(<span class="ruby-node">&quot;/tmp/passenger-platform-check-#{Process.pid}.c&quot;</span>)
+454:                 <span class="ruby-constant">File</span>.<span class="ruby-identifier">open</span>(<span class="ruby-identifier">filename</span>, <span class="ruby-value str">&quot;w&quot;</span>) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span>
+455:                         <span class="ruby-identifier">f</span>.<span class="ruby-identifier">puts</span>(<span class="ruby-value str">&quot;#include &lt;apr.h&gt;&quot;</span>)
 456:                 <span class="ruby-keyword kw">end</span>
-457:         <span class="ruby-keyword kw">end</span>
+457:                 <span class="ruby-keyword kw">begin</span>
+458:                         <span class="ruby-keyword kw">return</span> <span class="ruby-operator">!</span><span class="ruby-identifier">system</span>(<span class="ruby-node">&quot;(gcc #{apache2_module_cflags(false)} -c '#{filename}' -o '#{filename}.o') &gt;/dev/null 2&gt;/dev/null&quot;</span>)
+459:                 <span class="ruby-keyword kw">ensure</span>
+460:                         <span class="ruby-constant">File</span>.<span class="ruby-identifier">unlink</span>(<span class="ruby-identifier">filename</span>) <span class="ruby-keyword kw">rescue</span> <span class="ruby-keyword kw">nil</span>
+461:                         <span class="ruby-constant">File</span>.<span class="ruby-identifier">unlink</span>(<span class="ruby-node">&quot;#{filename}.o&quot;</span>) <span class="ruby-keyword kw">rescue</span> <span class="ruby-keyword kw">nil</span>
+462:                 <span class="ruby-keyword kw">end</span>
+463:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -380,10 +380,10 @@ The C compiler flags that are necessary for programs that use APR.
   <p class="source-link">[ <a href="javascript:toggleSource('M000026_source')" id="l_M000026_source">show source</a> ]</p>
   <div id="M000026_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 418</span>
-418:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apr_flags</span>
-419:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">determine_apr_info</span>[<span class="ruby-value">0</span>]
-420:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 424</span>
+424:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apr_flags</span>
+425:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">determine_apr_info</span>[<span class="ruby-value">0</span>]
+426:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -401,10 +401,10 @@ The linker flags that are necessary for linking programs that use APR.
   <p class="source-link">[ <a href="javascript:toggleSource('M000027_source')" id="l_M000027_source">show source</a> ]</p>
   <div id="M000027_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 423</span>
-423:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apr_libs</span>
-424:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">determine_apr_info</span>[<span class="ruby-value">1</span>]
-425:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 429</span>
+429:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apr_libs</span>
+430:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">determine_apr_info</span>[<span class="ruby-value">1</span>]
+431:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -423,29 +423,29 @@ The absolute path to the &#8216;apu-config&#8217; or
   <p class="source-link">[ <a href="javascript:toggleSource('M000018_source')" id="l_M000018_source">show source</a> ]</p>
   <div id="M000018_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 276</span>
-276:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apu_config</span>
-277:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">env_defined?</span>(<span class="ruby-value str">'APU_CONFIG'</span>)
-278:                         <span class="ruby-keyword kw">return</span> <span class="ruby-constant">ENV</span>[<span class="ruby-value str">'APU_CONFIG'</span>]
-279:                 <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">apxs2</span>.<span class="ruby-identifier">nil?</span>
-280:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
-281:                 <span class="ruby-keyword kw">else</span>
-282:                         <span class="ruby-identifier">filename</span> = <span class="ruby-node">`#{apxs2} -q APU_CONFIG 2&gt;/dev/null`</span>.<span class="ruby-identifier">strip</span>
-283:                         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">filename</span>.<span class="ruby-identifier">empty?</span>
-284:                                 <span class="ruby-identifier">apu_bindir</span> = <span class="ruby-node">`#{apxs2} -q APU_BINDIR 2&gt;/dev/null`</span>.<span class="ruby-identifier">strip</span>
-285:                                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">apu_bindir</span>.<span class="ruby-identifier">empty?</span>
-286:                                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
-287:                                 <span class="ruby-keyword kw">else</span>
-288:                                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">select_executable</span>(<span class="ruby-identifier">apu_bindir</span>,
-289:                                                 <span class="ruby-value str">&quot;apu-1-config&quot;</span>, <span class="ruby-value str">&quot;apu-config&quot;</span>)
-290:                                 <span class="ruby-keyword kw">end</span>
-291:                         <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-identifier">filename</span>)
-292:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">filename</span>
-293:                         <span class="ruby-keyword kw">else</span>
-294:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
-295:                         <span class="ruby-keyword kw">end</span>
-296:                 <span class="ruby-keyword kw">end</span>
-297:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 278</span>
+278:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apu_config</span>
+279:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">env_defined?</span>(<span class="ruby-value str">'APU_CONFIG'</span>)
+280:                         <span class="ruby-keyword kw">return</span> <span class="ruby-constant">ENV</span>[<span class="ruby-value str">'APU_CONFIG'</span>]
+281:                 <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">apxs2</span>.<span class="ruby-identifier">nil?</span>
+282:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
+283:                 <span class="ruby-keyword kw">else</span>
+284:                         <span class="ruby-identifier">filename</span> = <span class="ruby-node">`#{apxs2} -q APU_CONFIG 2&gt;/dev/null`</span>.<span class="ruby-identifier">strip</span>
+285:                         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">filename</span>.<span class="ruby-identifier">empty?</span>
+286:                                 <span class="ruby-identifier">apu_bindir</span> = <span class="ruby-node">`#{apxs2} -q APU_BINDIR 2&gt;/dev/null`</span>.<span class="ruby-identifier">strip</span>
+287:                                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">apu_bindir</span>.<span class="ruby-identifier">empty?</span>
+288:                                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
+289:                                 <span class="ruby-keyword kw">else</span>
+290:                                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">select_executable</span>(<span class="ruby-identifier">apu_bindir</span>,
+291:                                                 <span class="ruby-value str">&quot;apu-1-config&quot;</span>, <span class="ruby-value str">&quot;apu-config&quot;</span>)
+292:                                 <span class="ruby-keyword kw">end</span>
+293:                         <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-identifier">filename</span>)
+294:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">filename</span>
+295:                         <span class="ruby-keyword kw">else</span>
+296:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
+297:                         <span class="ruby-keyword kw">end</span>
+298:                 <span class="ruby-keyword kw">end</span>
+299:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -463,10 +463,10 @@ The C compiler flags that are necessary for programs that use APR-Util.
   <p class="source-link">[ <a href="javascript:toggleSource('M000028_source')" id="l_M000028_source">show source</a> ]</p>
   <div id="M000028_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 428</span>
-428:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apu_flags</span>
-429:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">determine_apu_info</span>[<span class="ruby-value">0</span>]
-430:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 434</span>
+434:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apu_flags</span>
+435:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">determine_apu_info</span>[<span class="ruby-value">0</span>]
+436:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -484,10 +484,10 @@ The linker flags that are necessary for linking programs that use APR-Util.
   <p class="source-link">[ <a href="javascript:toggleSource('M000029_source')" id="l_M000029_source">show source</a> ]</p>
   <div id="M000029_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 433</span>
-433:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apu_libs</span>
-434:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">determine_apu_info</span>[<span class="ruby-value">1</span>]
-435:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 439</span>
+439:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apu_libs</span>
+440:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">determine_apu_info</span>[<span class="ruby-value">1</span>]
+441:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -507,19 +507,19 @@ found.
   <p class="source-link">[ <a href="javascript:toggleSource('M000014_source')" id="l_M000014_source">show source</a> ]</p>
   <div id="M000014_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 212</span>
-212:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apxs2</span>
-213:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">env_defined?</span>(<span class="ruby-value str">&quot;APXS2&quot;</span>)
-214:                         <span class="ruby-keyword kw">return</span> <span class="ruby-constant">ENV</span>[<span class="ruby-value str">&quot;APXS2&quot;</span>]
-215:                 <span class="ruby-keyword kw">end</span>
-216:                 [<span class="ruby-value str">'apxs2'</span>, <span class="ruby-value str">'apxs'</span>].<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">name</span><span class="ruby-operator">|</span>
-217:                         <span class="ruby-identifier">command</span> = <span class="ruby-identifier">find_command</span>(<span class="ruby-identifier">name</span>)
-218:                         <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-identifier">command</span>.<span class="ruby-identifier">nil?</span>
-219:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">command</span>
-220:                         <span class="ruby-keyword kw">end</span>
-221:                 <span class="ruby-keyword kw">end</span>
-222:                 <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
-223:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 214</span>
+214:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">apxs2</span>
+215:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">env_defined?</span>(<span class="ruby-value str">&quot;APXS2&quot;</span>)
+216:                         <span class="ruby-keyword kw">return</span> <span class="ruby-constant">ENV</span>[<span class="ruby-value str">&quot;APXS2&quot;</span>]
+217:                 <span class="ruby-keyword kw">end</span>
+218:                 [<span class="ruby-value str">'apxs2'</span>, <span class="ruby-value str">'apxs'</span>].<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">name</span><span class="ruby-operator">|</span>
+219:                         <span class="ruby-identifier">command</span> = <span class="ruby-identifier">find_command</span>(<span class="ruby-identifier">name</span>)
+220:                         <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-identifier">command</span>.<span class="ruby-identifier">nil?</span>
+221:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">command</span>
+222:                         <span class="ruby-keyword kw">end</span>
+223:                 <span class="ruby-keyword kw">end</span>
+224:                 <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
+225:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -538,17 +538,17 @@ information.
   <p class="source-link">[ <a href="javascript:toggleSource('M000023_source')" id="l_M000023_source">show source</a> ]</p>
   <div id="M000023_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 359</span>
-359:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">debugging_cflags</span>
-360:                 <span class="ruby-keyword kw">if</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/openbsd/</span>
-361:                         <span class="ruby-comment cmt"># According to OpenBSD's pthreads man page, pthreads do not work</span>
-362:                         <span class="ruby-comment cmt"># correctly when an app is compiled with -g. It recommends using</span>
-363:                         <span class="ruby-comment cmt"># -ggdb instead.</span>
-364:                         <span class="ruby-keyword kw">return</span> <span class="ruby-value str">'-ggdb'</span>
-365:                 <span class="ruby-keyword kw">else</span>
-366:                         <span class="ruby-keyword kw">return</span> <span class="ruby-value str">'-g'</span>
-367:                 <span class="ruby-keyword kw">end</span>
-368:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 365</span>
+365:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">debugging_cflags</span>
+366:                 <span class="ruby-keyword kw">if</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/openbsd/</span>
+367:                         <span class="ruby-comment cmt"># According to OpenBSD's pthreads man page, pthreads do not work</span>
+368:                         <span class="ruby-comment cmt"># correctly when an app is compiled with -g. It recommends using</span>
+369:                         <span class="ruby-comment cmt"># -ggdb instead.</span>
+370:                         <span class="ruby-keyword kw">return</span> <span class="ruby-value str">'-ggdb'</span>
+371:                 <span class="ruby-keyword kw">else</span>
+372:                         <span class="ruby-keyword kw">return</span> <span class="ruby-value str">'-g'</span>
+373:                 <span class="ruby-keyword kw">end</span>
+374:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -571,16 +571,16 @@ always behave correctly, for some weird reason.
   <p class="source-link">[ <a href="javascript:toggleSource('M000011_source')" id="l_M000011_source">show source</a> ]</p>
   <div id="M000011_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 181</span>
-181:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">find_command</span>(<span class="ruby-identifier">name</span>)
-182:                 <span class="ruby-constant">ENV</span>[<span class="ruby-value str">'PATH'</span>].<span class="ruby-identifier">split</span>(<span class="ruby-constant">File</span><span class="ruby-operator">::</span><span class="ruby-constant">PATH_SEPARATOR</span>).<span class="ruby-identifier">detect</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">directory</span><span class="ruby-operator">|</span>
-183:                         <span class="ruby-identifier">path</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">join</span>(<span class="ruby-identifier">directory</span>, <span class="ruby-identifier">name</span>.<span class="ruby-identifier">to_s</span>)
-184:                         <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">executable?</span>(<span class="ruby-identifier">path</span>)
-185:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">path</span>
-186:                         <span class="ruby-keyword kw">end</span>
-187:                 <span class="ruby-keyword kw">end</span>
-188:                 <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
-189:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 183</span>
+183:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">find_command</span>(<span class="ruby-identifier">name</span>)
+184:                 <span class="ruby-constant">ENV</span>[<span class="ruby-value str">'PATH'</span>].<span class="ruby-identifier">split</span>(<span class="ruby-constant">File</span><span class="ruby-operator">::</span><span class="ruby-constant">PATH_SEPARATOR</span>).<span class="ruby-identifier">detect</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">directory</span><span class="ruby-operator">|</span>
+185:                         <span class="ruby-identifier">path</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">join</span>(<span class="ruby-identifier">directory</span>, <span class="ruby-identifier">name</span>.<span class="ruby-identifier">to_s</span>)
+186:                         <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">executable?</span>(<span class="ruby-identifier">path</span>)
+187:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">path</span>
+188:                         <span class="ruby-keyword kw">end</span>
+189:                 <span class="ruby-keyword kw">end</span>
+190:                 <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
+191:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -600,22 +600,22 @@ href="PlatformInfo.html#M000016">httpd</a>&#8217;, &#8216;httpd2&#8217;,
   <p class="source-link">[ <a href="javascript:toggleSource('M000016_source')" id="l_M000016_source">show source</a> ]</p>
   <div id="M000016_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 233</span>
-233:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">httpd</span>
-234:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">env_defined?</span>(<span class="ruby-value str">'HTTPD'</span>)
-235:                         <span class="ruby-keyword kw">return</span> <span class="ruby-constant">ENV</span>[<span class="ruby-value str">'HTTPD'</span>]
-236:                 <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">apxs2</span>.<span class="ruby-identifier">nil?</span>
-237:                         [<span class="ruby-value str">&quot;apache2&quot;</span>, <span class="ruby-value str">&quot;httpd2&quot;</span>, <span class="ruby-value str">&quot;apache&quot;</span>, <span class="ruby-value str">&quot;httpd&quot;</span>].<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">name</span><span class="ruby-operator">|</span>
-238:                                 <span class="ruby-identifier">command</span> = <span class="ruby-identifier">find_command</span>(<span class="ruby-identifier">name</span>)
-239:                                 <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-identifier">command</span>.<span class="ruby-identifier">nil?</span>
-240:                                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">command</span>
-241:                                 <span class="ruby-keyword kw">end</span>
-242:                         <span class="ruby-keyword kw">end</span>
-243:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
-244:                 <span class="ruby-keyword kw">else</span>
-245:                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">find_apache2_executable</span>(<span class="ruby-node">`#{apxs2} -q TARGET`</span>.<span class="ruby-identifier">strip</span>)
-246:                 <span class="ruby-keyword kw">end</span>
-247:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 235</span>
+235:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">httpd</span>
+236:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">env_defined?</span>(<span class="ruby-value str">'HTTPD'</span>)
+237:                         <span class="ruby-keyword kw">return</span> <span class="ruby-constant">ENV</span>[<span class="ruby-value str">'HTTPD'</span>]
+238:                 <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">apxs2</span>.<span class="ruby-identifier">nil?</span>
+239:                         [<span class="ruby-value str">&quot;apache2&quot;</span>, <span class="ruby-value str">&quot;httpd2&quot;</span>, <span class="ruby-value str">&quot;apache&quot;</span>, <span class="ruby-value str">&quot;httpd&quot;</span>].<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">name</span><span class="ruby-operator">|</span>
+240:                                 <span class="ruby-identifier">command</span> = <span class="ruby-identifier">find_command</span>(<span class="ruby-identifier">name</span>)
+241:                                 <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-identifier">command</span>.<span class="ruby-identifier">nil?</span>
+242:                                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">command</span>
+243:                                 <span class="ruby-keyword kw">end</span>
+244:                         <span class="ruby-keyword kw">end</span>
+245:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
+246:                 <span class="ruby-keyword kw">else</span>
+247:                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">find_apache2_executable</span>(<span class="ruby-node">`#{apxs2} -q TARGET`</span>.<span class="ruby-identifier">strip</span>)
+248:                 <span class="ruby-keyword kw">end</span>
+249:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -634,14 +634,14 @@ most Unices).
   <p class="source-link">[ <a href="javascript:toggleSource('M000031_source')" id="l_M000031_source">show source</a> ]</p>
   <div id="M000031_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 461</span>
-461:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">library_extension</span>
-462:                 <span class="ruby-keyword kw">if</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/darwin/</span>
-463:                         <span class="ruby-keyword kw">return</span> <span class="ruby-value str">&quot;bundle&quot;</span>
-464:                 <span class="ruby-keyword kw">else</span>
-465:                         <span class="ruby-keyword kw">return</span> <span class="ruby-value str">&quot;so&quot;</span>
-466:                 <span class="ruby-keyword kw">end</span>
-467:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 467</span>
+467:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">library_extension</span>
+468:                 <span class="ruby-keyword kw">if</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/darwin/</span>
+469:                         <span class="ruby-keyword kw">return</span> <span class="ruby-value str">&quot;bundle&quot;</span>
+470:                 <span class="ruby-keyword kw">else</span>
+471:                         <span class="ruby-keyword kw">return</span> <span class="ruby-value str">&quot;so&quot;</span>
+472:                 <span class="ruby-keyword kw">end</span>
+473:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -660,36 +660,36 @@ system is not Linux.
   <p class="source-link">[ <a href="javascript:toggleSource('M000032_source')" id="l_M000032_source">show source</a> ]</p>
   <div id="M000032_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 470</span>
-470:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">linux_distro</span>
-471:                 <span class="ruby-keyword kw">if</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">!~</span> <span class="ruby-regexp re">/linux/</span>
-472:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
-473:                 <span class="ruby-keyword kw">end</span>
-474:                 <span class="ruby-identifier">lsb_release</span> = <span class="ruby-identifier">read_file</span>(<span class="ruby-value str">&quot;/etc/lsb-release&quot;</span>)
-475:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">lsb_release</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/Ubuntu/</span>
-476:                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">:ubuntu</span>
-477:                 <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-value str">&quot;/etc/debian_version&quot;</span>)
-478:                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">:debian</span>
-479:                 <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-value str">&quot;/etc/redhat-release&quot;</span>)
-480:                         <span class="ruby-identifier">redhat_release</span> = <span class="ruby-identifier">read_file</span>(<span class="ruby-value str">&quot;/etc/redhat-release&quot;</span>)
-481:                         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">redhat_release</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/CentOS/</span>
-482:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">:centos</span>
-483:                         <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">redhat_release</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/Fedora/</span>  <span class="ruby-comment cmt"># is this correct?</span>
-484:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">:fedora</span>
-485:                         <span class="ruby-keyword kw">else</span>
-486:                                 <span class="ruby-comment cmt"># On official RHEL distros, the content is in the form of</span>
-487:                                 <span class="ruby-comment cmt"># &quot;Red Hat Enterprise Linux Server release 5.1 (Tikanga)&quot;</span>
-488:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">:rhel</span>
-489:                         <span class="ruby-keyword kw">end</span>
-490:                 <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-value str">&quot;/etc/suse-release&quot;</span>)
-491:                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">:suse</span>
-492:                 <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-value str">&quot;/etc/gentoo-release&quot;</span>)
-493:                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">:gentoo</span>
-494:                 <span class="ruby-keyword kw">else</span>
-495:                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">:unknown</span>
-496:                 <span class="ruby-keyword kw">end</span>
-497:                 <span class="ruby-comment cmt"># TODO: Slackware, Mandrake/Mandriva</span>
-498:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 476</span>
+476:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">linux_distro</span>
+477:                 <span class="ruby-keyword kw">if</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">!~</span> <span class="ruby-regexp re">/linux/</span>
+478:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
+479:                 <span class="ruby-keyword kw">end</span>
+480:                 <span class="ruby-identifier">lsb_release</span> = <span class="ruby-identifier">read_file</span>(<span class="ruby-value str">&quot;/etc/lsb-release&quot;</span>)
+481:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">lsb_release</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/Ubuntu/</span>
+482:                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">:ubuntu</span>
+483:                 <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-value str">&quot;/etc/debian_version&quot;</span>)
+484:                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">:debian</span>
+485:                 <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-value str">&quot;/etc/redhat-release&quot;</span>)
+486:                         <span class="ruby-identifier">redhat_release</span> = <span class="ruby-identifier">read_file</span>(<span class="ruby-value str">&quot;/etc/redhat-release&quot;</span>)
+487:                         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">redhat_release</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/CentOS/</span>
+488:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">:centos</span>
+489:                         <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">redhat_release</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/Fedora/</span>  <span class="ruby-comment cmt"># is this correct?</span>
+490:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">:fedora</span>
+491:                         <span class="ruby-keyword kw">else</span>
+492:                                 <span class="ruby-comment cmt"># On official RHEL distros, the content is in the form of</span>
+493:                                 <span class="ruby-comment cmt"># &quot;Red Hat Enterprise Linux Server release 5.1 (Tikanga)&quot;</span>
+494:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">:rhel</span>
+495:                         <span class="ruby-keyword kw">end</span>
+496:                 <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-value str">&quot;/etc/suse-release&quot;</span>)
+497:                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">:suse</span>
+498:                 <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-value str">&quot;/etc/gentoo-release&quot;</span>)
+499:                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">:gentoo</span>
+500:                 <span class="ruby-keyword kw">else</span>
+501:                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">:unknown</span>
+502:                 <span class="ruby-keyword kw">end</span>
+503:                 <span class="ruby-comment cmt"># TODO: Slackware, Mandrake/Mandriva</span>
+504:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -709,20 +709,24 @@ the compiler.
   <p class="source-link">[ <a href="javascript:toggleSource('M000021_source')" id="l_M000021_source">show source</a> ]</p>
   <div id="M000021_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 331</span>
-331:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">portability_cflags</span>
-332:                 <span class="ruby-comment cmt"># _GLIBCPP__PTHREADS is for fixing Boost compilation on OpenBSD.</span>
-333:                 <span class="ruby-identifier">flags</span> = [<span class="ruby-value str">&quot;-D_REENTRANT -D_GLIBCPP__PTHREADS -I/usr/local/include&quot;</span>]
-334:                 <span class="ruby-keyword kw">if</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/solaris/</span>
-335:                         <span class="ruby-identifier">flags</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">'-D_XOPEN_SOURCE=500 -D_XPG4_2 -D__EXTENSIONS__ -D__SOLARIS__'</span>
-336:                         <span class="ruby-identifier">flags</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">'-DBOOST_HAS_STDINT_H'</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/solaris2.9/</span>
-337:                         <span class="ruby-identifier">flags</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">'-D__SOLARIS9__ -DBOOST__STDC_CONSTANT_MACROS_DEFINED'</span> <span class="ruby-keyword kw">if</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/solaris2.9/</span>
-338:                         <span class="ruby-identifier">flags</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">'-mcpu=ultrasparc'</span> <span class="ruby-keyword kw">if</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/sparc/</span>
-339:                 <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/openbsd/</span>
-340:                         <span class="ruby-identifier">flags</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">'-DBOOST_HAS_STDINT_H'</span>
-341:                 <span class="ruby-keyword kw">end</span>
-342:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">flags</span>.<span class="ruby-identifier">compact</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">&quot; &quot;</span>).<span class="ruby-identifier">strip</span>
-343:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 333</span>
+333:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">portability_cflags</span>
+334:                 <span class="ruby-comment cmt"># _GLIBCPP__PTHREADS is for fixing Boost compilation on OpenBSD.</span>
+335:                 <span class="ruby-identifier">flags</span> = [<span class="ruby-value str">&quot;-D_REENTRANT -I/usr/local/include&quot;</span>]
+336:                 <span class="ruby-keyword kw">if</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/solaris/</span>
+337:                         <span class="ruby-identifier">flags</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">'-D_XOPEN_SOURCE=500 -D_XPG4_2 -D__EXTENSIONS__ -D__SOLARIS__'</span>
+338:                         <span class="ruby-identifier">flags</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">'-DBOOST_HAS_STDINT_H'</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/solaris2.9/</span>
+339:                         <span class="ruby-identifier">flags</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">'-D__SOLARIS9__ -DBOOST__STDC_CONSTANT_MACROS_DEFINED'</span> <span class="ruby-keyword kw">if</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/solaris2.9/</span>
+340:                         <span class="ruby-identifier">flags</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">'-mcpu=ultrasparc'</span> <span class="ruby-keyword kw">if</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/sparc/</span>
+341:                 <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/openbsd/</span>
+342:                         <span class="ruby-identifier">flags</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">'-DBOOST_HAS_STDINT_H -D_GLIBCPP__PTHREADS'</span>
+343:                 <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/aix/</span>
+344:                         <span class="ruby-identifier">flags</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">'-DOXT_DISABLE_BACKTRACES'</span>
+345:                 <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/sparc-linux/</span>
+346:                         <span class="ruby-identifier">flags</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">'-DBOOST_SP_USE_PTHREADS'</span>
+347:                 <span class="ruby-keyword kw">end</span>
+348:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">flags</span>.<span class="ruby-identifier">compact</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">&quot; &quot;</span>).<span class="ruby-identifier">strip</span>
+349:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -742,14 +746,14 @@ the linker.
   <p class="source-link">[ <a href="javascript:toggleSource('M000022_source')" id="l_M000022_source">show source</a> ]</p>
   <div id="M000022_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 349</span>
-349:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">portability_ldflags</span>
-350:                 <span class="ruby-keyword kw">if</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/solaris/</span>
-351:                         <span class="ruby-keyword kw">return</span> <span class="ruby-value str">'-lxnet -lrt -lsocket -lnsl -lpthread'</span>
-352:                 <span class="ruby-keyword kw">else</span>
-353:                         <span class="ruby-keyword kw">return</span> <span class="ruby-value str">'-lpthread'</span>
-354:                 <span class="ruby-keyword kw">end</span>
-355:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 355</span>
+355:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">portability_ldflags</span>
+356:                 <span class="ruby-keyword kw">if</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/solaris/</span>
+357:                         <span class="ruby-keyword kw">return</span> <span class="ruby-value str">'-lxnet -lrt -lsocket -lnsl -lpthread'</span>
+358:                 <span class="ruby-keyword kw">else</span>
+359:                         <span class="ruby-keyword kw">return</span> <span class="ruby-value str">'-lpthread'</span>
+360:                 <span class="ruby-keyword kw">end</span>
+361:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -768,10 +772,10 @@ current Ruby interpreter. Returns nil if it doesn&#8216;t exist.
   <p class="source-link">[ <a href="javascript:toggleSource('M000012_source')" id="l_M000012_source">show source</a> ]</p>
   <div id="M000012_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 198</span>
-198:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">rake</span>
-199:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">locate_ruby_executable</span>(<span class="ruby-value str">'rake'</span>)
-200:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 200</span>
+200:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">rake</span>
+201:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">locate_ruby_executable</span>(<span class="ruby-value str">'rake'</span>)
+202:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -790,10 +794,10 @@ current Ruby interpreter. Returns nil if it doesn&#8216;t exist.
   <p class="source-link">[ <a href="javascript:toggleSource('M000013_source')" id="l_M000013_source">show source</a> ]</p>
   <div id="M000013_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 206</span>
-206:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">rspec</span>
-207:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">locate_ruby_executable</span>(<span class="ruby-value str">'spec'</span>)
-208:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/platform_info.rb, line 208</span>
+208:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">rspec</span>
+209:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">locate_ruby_executable</span>(<span class="ruby-value str">'spec'</span>)
+210:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>