passenger 1.0.1 → 1.0.2

data/doc/rdoc/classes/Passenger/SpawnManager.html

@@ -184,19 +184,19 @@ href="SpawnManager.html">SpawnManager</a> is no longer needed.
   <p class="source-link">[ <a href="javascript:toggleSource('M000048_source')" id="l_M000048_source">show source</a> ]</p>
   <div id="M000048_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/passenger/spawn_manager.rb, line 160</span>
-160:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">cleanup</span>
-161:                 <span class="ruby-ivar">@lock</span>.<span class="ruby-identifier">synchronize</span> <span class="ruby-keyword kw">do</span>
-162:                         <span class="ruby-ivar">@cond</span>.<span class="ruby-identifier">signal</span>
-163:                 <span class="ruby-keyword kw">end</span>
-164:                 <span class="ruby-ivar">@cleaner_thread</span>.<span class="ruby-identifier">join</span>
-165:                 <span class="ruby-ivar">@lock</span>.<span class="ruby-identifier">synchronize</span> <span class="ruby-keyword kw">do</span>
-166:                         <span class="ruby-ivar">@spawners</span>.<span class="ruby-identifier">each_value</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">spawner</span><span class="ruby-operator">|</span>
-167:                                 <span class="ruby-identifier">spawner</span>.<span class="ruby-identifier">stop</span>
-168:                         <span class="ruby-keyword kw">end</span>
-169:                         <span class="ruby-ivar">@spawners</span>.<span class="ruby-identifier">clear</span>
-170:                 <span class="ruby-keyword kw">end</span>
-171:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/passenger/spawn_manager.rb, line 165</span>
+165:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">cleanup</span>
+166:                 <span class="ruby-ivar">@lock</span>.<span class="ruby-identifier">synchronize</span> <span class="ruby-keyword kw">do</span>
+167:                         <span class="ruby-ivar">@cond</span>.<span class="ruby-identifier">signal</span>
+168:                 <span class="ruby-keyword kw">end</span>
+169:                 <span class="ruby-ivar">@cleaner_thread</span>.<span class="ruby-identifier">join</span>
+170:                 <span class="ruby-ivar">@lock</span>.<span class="ruby-identifier">synchronize</span> <span class="ruby-keyword kw">do</span>
+171:                         <span class="ruby-ivar">@spawners</span>.<span class="ruby-identifier">each_value</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">spawner</span><span class="ruby-operator">|</span>
+172:                                 <span class="ruby-identifier">spawner</span>.<span class="ruby-identifier">stop</span>
+173:                         <span class="ruby-keyword kw">end</span>
+174:                         <span class="ruby-ivar">@spawners</span>.<span class="ruby-identifier">clear</span>
+175:                 <span class="ruby-keyword kw">end</span>
+176:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -228,32 +228,32 @@ Raises AbstractServer::SpawnError if something went wrong.
   <p class="source-link">[ <a href="javascript:toggleSource('M000047_source')" id="l_M000047_source">show source</a> ]</p>
   <div id="M000047_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/passenger/spawn_manager.rb, line 133</span>
-133:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reload</span>(<span class="ruby-identifier">app_root</span> = <span class="ruby-keyword kw">nil</span>)
-134:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">app_root</span>
-135:                         <span class="ruby-keyword kw">begin</span>
-136:                                 <span class="ruby-identifier">app_root</span> = <span class="ruby-identifier">normalize_path</span>(<span class="ruby-identifier">app_root</span>)
-137:                         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">ArgumentError</span>
-138:                         <span class="ruby-keyword kw">end</span>
-139:                 <span class="ruby-keyword kw">end</span>
-140:                 <span class="ruby-ivar">@lock</span>.<span class="ruby-identifier">synchronize</span> <span class="ruby-keyword kw">do</span>
-141:                         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">app_root</span>
-142:                                 <span class="ruby-comment cmt"># Delete associated ApplicationSpawner.</span>
-143:                                 <span class="ruby-identifier">key</span> = <span class="ruby-node">&quot;app:#{app_root}&quot;</span>
-144:                                 <span class="ruby-identifier">spawner</span> = <span class="ruby-ivar">@spawners</span>[<span class="ruby-identifier">key</span>]
-145:                                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">spawner</span>
-146:                                         <span class="ruby-identifier">spawner</span>.<span class="ruby-identifier">stop</span>
-147:                                         <span class="ruby-ivar">@spawners</span>.<span class="ruby-identifier">delete</span>(<span class="ruby-identifier">key</span>)
-148:                                 <span class="ruby-keyword kw">end</span>
-149:                         <span class="ruby-keyword kw">end</span>
-150:                         <span class="ruby-ivar">@spawners</span>.<span class="ruby-identifier">each_value</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">spawner</span><span class="ruby-operator">|</span>
-151:                                 <span class="ruby-comment cmt"># Reload FrameworkSpawners.</span>
-152:                                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">spawner</span>.<span class="ruby-identifier">respond_to?</span>(<span class="ruby-identifier">:reload</span>)
-153:                                         <span class="ruby-identifier">spawner</span>.<span class="ruby-identifier">reload</span>(<span class="ruby-identifier">app_root</span>)
-154:                                 <span class="ruby-keyword kw">end</span>
-155:                         <span class="ruby-keyword kw">end</span>
-156:                 <span class="ruby-keyword kw">end</span>
-157:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/passenger/spawn_manager.rb, line 138</span>
+138:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reload</span>(<span class="ruby-identifier">app_root</span> = <span class="ruby-keyword kw">nil</span>)
+139:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">app_root</span>
+140:                         <span class="ruby-keyword kw">begin</span>
+141:                                 <span class="ruby-identifier">app_root</span> = <span class="ruby-identifier">normalize_path</span>(<span class="ruby-identifier">app_root</span>)
+142:                         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">ArgumentError</span>
+143:                         <span class="ruby-keyword kw">end</span>
+144:                 <span class="ruby-keyword kw">end</span>
+145:                 <span class="ruby-ivar">@lock</span>.<span class="ruby-identifier">synchronize</span> <span class="ruby-keyword kw">do</span>
+146:                         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">app_root</span>
+147:                                 <span class="ruby-comment cmt"># Delete associated ApplicationSpawner.</span>
+148:                                 <span class="ruby-identifier">key</span> = <span class="ruby-node">&quot;app:#{app_root}&quot;</span>
+149:                                 <span class="ruby-identifier">spawner</span> = <span class="ruby-ivar">@spawners</span>[<span class="ruby-identifier">key</span>]
+150:                                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">spawner</span>
+151:                                         <span class="ruby-identifier">spawner</span>.<span class="ruby-identifier">stop</span>
+152:                                         <span class="ruby-ivar">@spawners</span>.<span class="ruby-identifier">delete</span>(<span class="ruby-identifier">key</span>)
+153:                                 <span class="ruby-keyword kw">end</span>
+154:                         <span class="ruby-keyword kw">end</span>
+155:                         <span class="ruby-ivar">@spawners</span>.<span class="ruby-identifier">each_value</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">spawner</span><span class="ruby-operator">|</span>
+156:                                 <span class="ruby-comment cmt"># Reload FrameworkSpawners.</span>
+157:                                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">spawner</span>.<span class="ruby-identifier">respond_to?</span>(<span class="ruby-identifier">:reload</span>)
+158:                                         <span class="ruby-identifier">spawner</span>.<span class="ruby-identifier">reload</span>(<span class="ruby-identifier">app_root</span>)
+159:                                 <span class="ruby-keyword kw">end</span>
+160:                         <span class="ruby-keyword kw">end</span>
+161:                 <span class="ruby-keyword kw">end</span>
+162:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -351,16 +351,21 @@ exception or called exit() during startup.
 106:                                 <span class="ruby-identifier">spawner</span>.<span class="ruby-identifier">start</span>
 107:                                 <span class="ruby-ivar">@spawners</span>[<span class="ruby-identifier">key</span>] = <span class="ruby-identifier">spawner</span>
 108:                         <span class="ruby-keyword kw">end</span>
-109:                 <span class="ruby-keyword kw">end</span>
-110:                 
-111:                 <span class="ruby-identifier">spawner</span>.<span class="ruby-identifier">time</span> = <span class="ruby-constant">Time</span>.<span class="ruby-identifier">now</span>
-112:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">spawner</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">FrameworkSpawner</span>)
-113:                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">spawner</span>.<span class="ruby-identifier">spawn_application</span>(<span class="ruby-identifier">app_root</span>, <span class="ruby-identifier">lower_privilege</span>,
-114:                                 <span class="ruby-identifier">lowest_user</span>)
-115:                 <span class="ruby-keyword kw">else</span>
-116:                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">spawner</span>.<span class="ruby-identifier">spawn_application</span>
-117:                 <span class="ruby-keyword kw">end</span>
-118:         <span class="ruby-keyword kw">end</span>
+109:                         <span class="ruby-identifier">spawner</span>.<span class="ruby-identifier">time</span> = <span class="ruby-constant">Time</span>.<span class="ruby-identifier">now</span>
+110:                         <span class="ruby-keyword kw">begin</span>
+111:                                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">spawner</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">FrameworkSpawner</span>)
+112:                                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">spawner</span>.<span class="ruby-identifier">spawn_application</span>(<span class="ruby-identifier">app_root</span>, <span class="ruby-identifier">lower_privilege</span>,
+113:                                                 <span class="ruby-identifier">lowest_user</span>)
+114:                                 <span class="ruby-keyword kw">else</span>
+115:                                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">spawner</span>.<span class="ruby-identifier">spawn_application</span>
+116:                                 <span class="ruby-keyword kw">end</span>
+117:                         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">AbstractServer</span><span class="ruby-operator">::</span><span class="ruby-constant">ServerError</span>
+118:                                 <span class="ruby-identifier">spawner</span>.<span class="ruby-identifier">stop</span>
+119:                                 <span class="ruby-ivar">@spawners</span>.<span class="ruby-identifier">delete</span>(<span class="ruby-identifier">key</span>)
+120:                                 <span class="ruby-identifier">raise</span>
+121:                         <span class="ruby-keyword kw">end</span>
+122:                 <span class="ruby-keyword kw">end</span>
+123:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>

data/doc/rdoc/classes/PlatformInfo.html

@@ -177,6 +177,19 @@ The absolute path to the ‘apachectl’ or
 The absolute path to the Apache binary (that is, ‘httpd’,
 ‘httpd2’, ‘apache’ or ‘apache2’).
 
+</td>
+  </tr>
+  <tr valign='top'>
+    <td class="attr-name">APR_CONFIG</td>
+    <td>=</td>
+    <td class="attr-value">find_apr_config</td>
+  </tr>
+  <tr valign='top'>
+    <td>&nbsp;</td>
+    <td colspan="2" class="attr-desc">
+The absolute path to the &#8216;apr-config&#8217; or
+&#8216;apr-1-config&#8217; executable.
+
 </td>
   </tr>
   <tr valign='top'>
@@ -192,9 +205,9 @@ The C compiler flags that are necessary to compile an Apache module.
 </td>
   </tr>
   <tr valign='top'>
-    <td class="attr-name">APR1_LIBS</td>
+    <td class="attr-name">APR_LIBS</td>
     <td>=</td>
-    <td class="attr-value">determine_apr1_info</td>
+    <td class="attr-value">determine_apr_info</td>
   </tr>
   <tr valign='top'>
     <td class="attr-name">MULTI_ARCH_FLAGS</td>
@@ -257,16 +270,16 @@ always behave correctly, for some weird reason.
   <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/passenger/platform_info.rb, line 209</span>
-209:         <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>)
-210:                 <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>
-211:                         <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>)
-212:                         <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>)
-213:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">path</span>
-214:                         <span class="ruby-keyword kw">end</span>
-215:                 <span class="ruby-keyword kw">end</span>
-216:                 <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
-217:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/passenger/platform_info.rb, line 222</span>
+222:         <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>)
+223:                 <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>
+224:                         <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>)
+225:                         <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>)
+226:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">path</span>
+227:                         <span class="ruby-keyword kw">end</span>
+228:                 <span class="ruby-keyword kw">end</span>
+229:                 <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
+230:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>

data/doc/rdoc/created.rid

@@ -1 +1 @@
-Fri, 11 Apr 2008 18:15:58 +0200
+Tue, 29 Apr 2008 15:25:26 +0200

data/doc/rdoc/files/DEVELOPERS_TXT.html

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Wed Mar 19 03:01:37 +0100 2008</td>
+            <td>Mon Apr 28 11:44:32 +0200 2008</td>
           </tr>
         </table>
       </td></tr>

data/doc/rdoc/files/ext/passenger/native_support_c.html

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Thu Apr 03 17:44:37 +0200 2008</td>
+            <td>Mon Apr 28 23:34:04 +0200 2008</td>
           </tr>
         </table>
       </td></tr>

data/doc/rdoc/files/lib/passenger/abstract_server_rb.html

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Thu Apr 03 17:46:22 +0200 2008</td>
+            <td>Tue Apr 15 10:49:37 +0200 2008</td>
           </tr>
         </table>
       </td></tr>

data/doc/rdoc/files/lib/passenger/application_spawner_rb.html

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Thu Apr 03 17:46:23 +0200 2008</td>
+            <td>Mon Apr 28 23:34:04 +0200 2008</td>
           </tr>
         </table>
       </td></tr>

data/doc/rdoc/files/lib/passenger/dependencies_rb.html

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Thu Apr 03 19:27:29 +0200 2008</td>
+            <td>Mon Apr 28 23:34:04 +0200 2008</td>
           </tr>
         </table>
       </td></tr>

data/doc/rdoc/files/lib/passenger/framework_spawner_rb.html

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Thu Apr 03 17:46:23 +0200 2008</td>
+            <td>Mon Apr 28 23:34:04 +0200 2008</td>
           </tr>
         </table>
       </td></tr>

data/doc/rdoc/files/lib/passenger/platform_info_rb.html

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Thu Apr 03 17:46:23 +0200 2008</td>
+            <td>Mon Apr 28 23:34:04 +0200 2008</td>
           </tr>
         </table>
       </td></tr>

data/doc/rdoc/files/lib/passenger/request_handler_rb.html

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Mon Apr 07 16:27:09 +0200 2008</td>
+            <td>Mon Apr 28 23:34:04 +0200 2008</td>
           </tr>
         </table>
       </td></tr>

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

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Thu Apr 03 17:46:23 +0200 2008</td>
+            <td>Mon Apr 28 23:34:04 +0200 2008</td>
           </tr>
         </table>
       </td></tr>

data/ext/apache2/Configuration.h

@@ -29,7 +29,7 @@
  */
 
 /** Module version number. */
-#define PASSENGER_VERSION "1.0.1"
+#define PASSENGER_VERSION "1.0.2"
 
 #ifdef __cplusplus
 	#include <set>

data/ext/apache2/Hooks.cpp

@@ -259,6 +259,33 @@ private:
 			buffer.append(hdrs[i].val);
 			buffer.append(1, '\0');
 		}
+		
+		/*
+		 * If the last header value is an empty string, then the buffer
+		 * will end with "\0\0". For example, if 'SSLOptions +ExportCertData'
+		 * is set, and there's no client certificate, and 'SSL_CLIENT_CERT'
+		 * is the last header, then the buffer will end with:
+		 *
+		 *   "SSL_CLIENT_CERT\0\0"
+		 *
+		 * The data in the buffer will be processed by the RequestHandler class,
+		 * which is implemented in Ruby. But it uses Hash[*data.split("\0")] to
+		 * unserialize the data. Unfortunately String#split will not transform
+		 * the trailing "\0\0" into an empty string:
+		 *
+		 *   "SSL_CLIENT_CERT\0\0".split("\0")
+		 *   # => desired result: ["SSL_CLIENT_CERT", ""]
+		 *   # => actual result:  ["SSL_CLIENT_CERT"]
+		 *
+		 * When that happens, Hash[..] will raise an ArgumentError because
+		 * data.split("\0") does not return an array with a length that is a
+		 * multiple of 2.
+		 *
+		 * So here, we add a dummy header to prevent situations like that from
+		 * happening.
+		 */
+		buffer.append("_\0_\0", 4);
+		
 		session->sendHeaders(buffer);
 		return APR_SUCCESS;
 	}
@@ -329,7 +356,7 @@ public:
 			applicationPool->setMax(config->maxPoolSize);
 			applicationPool->setMaxIdleTime(config->poolIdleTime);
 		} catch (const exception &e) {
-			fprintf(stderr, "*** Cannot initialize Passenger: %s", e.what());
+			fprintf(stderr, "*** Cannot initialize Passenger: %s\n", e.what());
 			fflush(stderr);
 			abort();
 		}
@@ -351,9 +378,12 @@ public:
 		} else if (!verifyRailsDir(railsDir)) {
 			ap_set_content_type(r, "text/html; charset=UTF-8");
 			ap_rputs("<h1>Passenger error #2</h1>\n", r);
-			ap_rputs("Passenger thinks that the Rails application's \"public\" directory is \"", r);
+			ap_rputs("Passenger thought that the Rails application's \"public\" directory is \"", r);
 			ap_rputs(ap_escape_html(r->pool, railsDir.c_str()), r);
-			ap_rputs("\", but it doesn't seem to be valid.", r);
+			ap_rputs("\". But upon further inspection, it doesn't seem to be a valid Rails ", r);
+			ap_rputs("\"public\" folder. It is possible that Apache doesn't have read ", r);
+			ap_rputs("permissions to your Rails application's folder. Please check your ", r);
+			ap_rputs("file permissions.", r);
 			return OK;
 		}
 		
@@ -423,9 +453,10 @@ public:
 	mapToStorage(request_rec *r) {
 		DirConfig *config = getDirConfig(r);
 		bool forwardToRails;
+		const char *baseURI;
 		
-		if (determineRailsBaseURI(r, config) == NULL
-		 || fileExists(r->filename)) {
+		baseURI = determineRailsBaseURI(r, config);
+		if (baseURI == NULL || fileExists(r->filename)) {
 			/*
 			 * fileExists():
 			 * If the file already exists, serve it directly.
@@ -487,6 +518,12 @@ public:
 				 * interfere.
 				 */
 				return OK;
+			} else if (strcmp(r->uri, baseURI) == 0) {
+				/* But we ignore RailsAllowModRewrite for the base URI of
+				 * the Rails application. Otherwise, Apache will show a
+				 * directory listing. This fixes issue #11.
+				 */
+				return OK;
 			} else {
 				return DECLINED;
 			}
@@ -518,24 +555,36 @@ destroy_hooks(void *arg) {
 static int
 init_module(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s) {
 	/*
+	 * The Apache initialization process has the following properties:
+	 *
 	 * 1. Apache on Unix calls the post_config hook twice, once before detach() and once
 	 *    after. On Windows it never calls detach().
 	 * 2. When Apache is compiled to use DSO modules, the modules are unloaded between the
 	 *    two post_config hook calls.
-	 * 3. On Unix, if the -X commandline option is given, detach() will not be called.
+	 * 3. On Unix, if the -X commandline option is given (the 'DEBUG' config is set),
+	 *    detach() will not be called.
+	 *
+	 * The Passenger initialization process is pretty expensive because a spawn server has
+	 * to be started, so we'll want to avoid initializing twice because of property #2.
 	 *
-	 * Because of these 3 issues (and especially #2), we only want to intialize the second
-	 * time the post_config hook is called.
+	 * The most straightforward solution is to initialize Passenger the second time
+	 * post_config is called. But unfortunately, that doesn't work if the Passenger
+	 * module is loaded after a graceful restart. There also doesn't seem to be any
+	 * good hooks that we can use to avoid double initialization.
+	 *
+	 * So as a hack, we check whether Apache has already been daemonized, by checking
+	 * whether ppid() returns 1. This doesn't work with Apache 2.0.x though: ppid()
+	 * doesn't return 1. So Apache 2.0.x users will just have to live with the double
+	 * initialization overhead.
 	 */
-	void *firstInitCall = NULL;
-	apr_pool_t *processPool = s->process->pool;
+	bool passengerShouldBeInitialized;
 	
-	apr_pool_userdata_get(&firstInitCall, "mod_passenger", processPool);
-	if (firstInitCall == NULL) {
-		apr_pool_userdata_set((const void *) 1, "mod_passenger",
-			apr_pool_cleanup_null, processPool);
-		return OK;
-	} else {
+	#if (AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER >= 2) || AP_SERVER_MAJORVERSION_NUMBER > 2
+		passengerShouldBeInitialized = getppid() == 1 || ap_exists_config_define("DEBUG");
+	#else
+		passengerShouldBeInitialized = true;
+	#endif
+	if (passengerShouldBeInitialized) {
 		try {
 			hooks = new Hooks(pconf, plog, ptemp, s);
 			apr_pool_cleanup_register(pconf, NULL,
@@ -586,6 +635,8 @@ init_module(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *
 			hooks = NULL;
 			return DECLINED;
 		}
+	} else {
+		return OK;
 	}
 }
 
@@ -628,3 +679,4 @@ passenger_register_hooks(apr_pool_t *p) {
 /**
  * @}
  */
+

data/ext/apache2/Logging.cpp

@@ -21,7 +21,7 @@
 
 namespace Passenger {
 
-int _debugLevel = 3;
+int _debugLevel = 2;
 ostream *_logStream = &cerr;
 ostream *_debugStream = &cerr;
 

data/ext/apache2/MessageChannel.h

@@ -256,31 +256,33 @@ public:
 	 * @see readFileDescriptor()
 	 */
 	void writeFileDescriptor(int fileDescriptor) {
-		struct msghdr msg;
-		struct iovec vec[1];
-		char buf[1];
 		struct {
-			struct cmsghdr hdr;
+			struct cmsghdr header;
 			int fd;
-		} cmsg;
-	
+		} control;
+
+		control.header.cmsg_len   = sizeof(control);
+		control.header.cmsg_level = SOL_SOCKET;
+		control.header.cmsg_type  = SCM_RIGHTS;
+		control.fd = fileDescriptor;
+
+		struct msghdr msg;
+		struct iovec vec;
+		char dummy[1];
+		
 		msg.msg_name = NULL;
 		msg.msg_namelen = 0;
-	
-		/* Linux and Solaris doesn't work if msg_iov is NULL. */
-		buf[0] = '\0';
-		vec[0].iov_base = buf;
-		vec[0].iov_len = 1;
-		msg.msg_iov = vec;
+		
+		/* Linux and Solaris require msg_iov to be non-NULL.. */
+		dummy[0]       = '\0';
+		vec.iov_base   = dummy;
+		vec.iov_len    = sizeof(dummy);
+		msg.msg_iov    = &vec;
 		msg.msg_iovlen = 1;
-	
-		msg.msg_control = (caddr_t)&cmsg;
-		msg.msg_controllen = CMSG_SPACE(sizeof(int));
-		msg.msg_flags = 0;
-		cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
-		cmsg.hdr.cmsg_level = SOL_SOCKET;
-		cmsg.hdr.cmsg_type = SCM_RIGHTS;
-		cmsg.fd = fileDescriptor;
+		
+		msg.msg_control    = (caddr_t) &control;
+		msg.msg_controllen = sizeof(control);
+		msg.msg_flags      = 0;
 		
 		if (sendmsg(fd, &msg, 0) == -1) {
 			throw SystemException("Cannot send file descriptor with sendmsg()", errno);
@@ -420,41 +422,44 @@ public:
 	 *            file descriptor.
 	 */
 	int readFileDescriptor() {
-		struct msghdr msg;
-		struct iovec vec[2];
-		char buf[1];
 		struct {
-			struct cmsghdr hdr;
+			struct cmsghdr header;
 			int fd;
-		} cmsg;
+		} control;
 
-		msg.msg_name = NULL;
+		control.header.cmsg_len   = sizeof(control);
+		control.header.cmsg_level = SOL_SOCKET;
+		control.header.cmsg_type  = SCM_RIGHTS;
+		control.fd = -1;
+
+		struct msghdr msg;
+		struct iovec vec;
+		char dummy[1];
+
+		msg.msg_name    = NULL;
 		msg.msg_namelen = 0;
-	
-		vec[0].iov_base = buf;
-		vec[0].iov_len = sizeof(buf);
-		msg.msg_iov = vec;
+		
+		dummy[0]       = '\0';
+		vec.iov_base   = dummy;
+		vec.iov_len    = sizeof(dummy);
+		msg.msg_iov    = &vec;
 		msg.msg_iovlen = 1;
 
-		msg.msg_control = (caddr_t)&cmsg;
-		msg.msg_controllen = CMSG_SPACE(sizeof(int));
-		msg.msg_flags = 0;
-		cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
-		cmsg.hdr.cmsg_level = SOL_SOCKET;
-		cmsg.hdr.cmsg_type = SCM_RIGHTS;
-		cmsg.fd = -1;
+		msg.msg_control    = (caddr_t) &control;
+		msg.msg_controllen = sizeof(control);
+		msg.msg_flags      = 0;
 
 		if (recvmsg(fd, &msg, 0) == -1) {
 			throw SystemException("Cannot read file descriptor with recvmsg()", errno);
 		}
-
-		if (msg.msg_controllen != CMSG_SPACE(sizeof(int))
-		 || cmsg.hdr.cmsg_len != CMSG_SPACE(0) + sizeof(int)
-		 || cmsg.hdr.cmsg_level != SOL_SOCKET
-		 || cmsg.hdr.cmsg_type != SCM_RIGHTS) {
+		
+		if (msg.msg_controllen        != sizeof(control)
+		 || control.header.cmsg_len   != sizeof(control)
+		 || control.header.cmsg_level != SOL_SOCKET
+		 || control.header.cmsg_type  != SCM_RIGHTS) {
 			throw IOException("No valid file descriptor received.");
 		}
-		return cmsg.fd;
+		return control.fd;
 	}
 };