passenger 2.2.0 → 2.2.1

data/NEWS

@@ -1,3 +0,0 @@
-- Passenger no longer resolves symlink anymore, so that it works properly
-  with Capistrano deployments.
-- Chuncked transfer encoding support for uploads (Apache only).

data/Rakefile

@@ -828,6 +828,7 @@ task :sloccount do
 			"lib/rake/{cplusplus,extensions}.rb",
 			"ext/apache2",
 			"ext/nginx",
+			"ext/common",
 			"ext/oxt",
 			"ext/phusion_passenger/*.c",
 			"test/**/*.{cpp,rb}",

data/bin/passenger-install-nginx-module

@@ -389,7 +389,7 @@ private
 		command = "./configure --prefix='#{prefix}' "
 		if @pcre_source_dir
 			command << "--with-pcre='#{@pcre_source_dir}' "
-		else
+		elsif !pcre_is_installed?
 			command << "--without-http_rewrite_module "
 		end
 		command << "--add-module='#{PASSENGER_ROOT}/ext/nginx' #{extra_configure_flags}"

data/doc/cxxapi/Bucket_8h-source.html

@@ -70,7 +70,7 @@
 <a name="l00049"></a>00049 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_BUCKET_H_ */</span>
 <a name="l00050"></a>00050 
 </pre></div></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Thu Apr 16 19:48:18 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/Configuration_8h-source.html

@@ -67,7 +67,7 @@
 <a name="l00046"></a>00046 <span class="comment"> */</span>
 <a name="l00047"></a>00047 <span class="comment"></span>
 <a name="l00048"></a>00048 <span class="comment">/** Module version number. */</span>
-<a name="l00049"></a><a class="code" href="group__Configuration.html#ga19398896775408d6ab7fd8ce2acd992">00049</a> <span class="preprocessor">#define PASSENGER_VERSION "2.2.0"</span>
+<a name="l00049"></a><a class="code" href="group__Configuration.html#ga19398896775408d6ab7fd8ce2acd992">00049</a> <span class="preprocessor">#define PASSENGER_VERSION "2.2.1"</span>
 <a name="l00050"></a>00050 <span class="preprocessor"></span>
 <a name="l00051"></a>00051 <span class="preprocessor">#ifdef __cplusplus</span>
 <a name="l00052"></a>00052 <span class="preprocessor"></span><span class="preprocessor">        #include &lt;set&gt;</span>
@@ -376,7 +376,7 @@
 <a name="l00355"></a>00355 
 <a name="l00356"></a>00356 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_CONFIGURATION_H_ */</span>
 </pre></div></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Thu Apr 16 19:48:18 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/DirectoryMapper_8h-source.html

@@ -316,7 +316,7 @@
 <a name="l00295"></a>00295 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_DIRECTORY_MAPPER_H_ */</span>
 <a name="l00296"></a>00296 
 </pre></div></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Thu Apr 16 19:48:18 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/Hooks_8h-source.html

@@ -65,7 +65,7 @@
 <a name="l00044"></a>00044 <span class="preprocessor"></span>
 <a name="l00045"></a>00045 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_HOOKS_H_ */</span>
 </pre></div></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Thu Apr 16 19:48:18 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/annotated.html

@@ -27,7 +27,7 @@
   <tr><td class="indexkey"><a class="el" href="classHooks.html">Hooks</a></td><td class="indexvalue">Apache hook functions, wrapped in a class </td></tr>
 </table>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Thu Apr 16 19:48:18 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/classHooks-members.html

@@ -28,7 +28,7 @@
   <tr class="memlist"><td><a class="el" href="classHooks.html#d6cca64be8a9075b4b92efdb4d9020a5">startBlockingModAutoIndex</a>(request_rec *r)</td><td><a class="el" href="classHooks.html">Hooks</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classHooks.html#e3091c57c95b2f8269f566099802f0ec">startBlockingModDir</a>(request_rec *r)</td><td><a class="el" href="classHooks.html">Hooks</a></td><td><code> [inline]</code></td></tr>
 </table></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Thu Apr 16 19:48:18 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/classHooks.html

@@ -148,7 +148,7 @@ So in <a class="el" href="classHooks.html#e3091c57c95b2f8269f566099802f0ec" titl
 <hr>The documentation for this class was generated from the following file:<ul>
 <li>Hooks.cpp</ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Thu Apr 16 19:48:18 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/classPassenger_1_1DirectoryMapper-members.html

@@ -30,7 +30,7 @@
   <tr class="memlist"><td><a class="el" href="classPassenger_1_1DirectoryMapper.html#f5091e3cef3878e160e5d3b2181d82fb">getEnvironment</a>()</td><td><a class="el" href="classPassenger_1_1DirectoryMapper.html">Passenger::DirectoryMapper</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classPassenger_1_1DirectoryMapper.html#ef969f27622fb215990a870076648aa1">getPublicDirectory</a>()</td><td><a class="el" href="classPassenger_1_1DirectoryMapper.html">Passenger::DirectoryMapper</a></td><td><code> [inline]</code></td></tr>
 </table></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Thu Apr 16 19:48:18 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/classPassenger_1_1DirectoryMapper.html

@@ -251,7 +251,7 @@ Returns an empty string if the document root of the HTTP request cannot be deter
 <hr>The documentation for this class was generated from the following file:<ul>
 <li><a class="el" href="DirectoryMapper_8h-source.html">DirectoryMapper.h</a></ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Thu Apr 16 19:48:18 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/classes.html

@@ -28,7 +28,7 @@
 </td><td><a class="el" href="classPassenger_1_1DirectoryMapper.html">DirectoryMapper</a> (Passenger)&nbsp;&nbsp;&nbsp;</td><td><a name="letter_H"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;H&nbsp;&nbsp;</div></td></tr></table>
 </td><td><a class="el" href="classHooks.html">Hooks</a>&nbsp;&nbsp;&nbsp;</td></tr></table><p><div class="qindex"><a class="qindex" href="#letter_D">D</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_H">H</a></div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Thu Apr 16 19:48:18 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/definitions_8h-source.html

@@ -25,7 +25,7 @@
 <a name="l00004"></a>00004 <span class="comment">@defgroup Support Apache-independent support classes and function</span>
 <a name="l00005"></a>00005 <span class="comment">*/</span>
 </pre></div></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Thu Apr 16 19:48:18 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/files.html

@@ -29,7 +29,7 @@
   <tr><td class="indexkey"><b>Hooks.h</b> <a href="Hooks_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
 </table>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Thu Apr 16 19:48:18 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/functions.html

@@ -53,7 +53,7 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classHooks.html#e3091c57c95b2f8269f566099802f0ec">Hooks</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Thu Apr 16 19:48:18 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/functions_func.html

@@ -53,7 +53,7 @@
 : <a class="el" href="classHooks.html#e3091c57c95b2f8269f566099802f0ec">Hooks</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Thu Apr 16 19:48:18 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/graph_legend.html

@@ -79,7 +79,7 @@ A purple dashed arrow is used if a class is contained or used by another class.
 A yellow dashed arrow denotes a relation between a template instance and the template class it was instantiated from. The arrow is labeled with the template parameters of the instance. </li>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Thu Apr 16 19:48:18 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/group__Configuration.html

@@ -31,7 +31,7 @@ Collaboration diagram for Apache module configuration:</div>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__Configuration.html#ga19398896775408d6ab7fd8ce2acd992">PASSENGER_VERSION</a>&nbsp;&nbsp;&nbsp;&quot;2.2.0&quot;</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__Configuration.html#ga19398896775408d6ab7fd8ce2acd992">PASSENGER_VERSION</a>&nbsp;&nbsp;&nbsp;&quot;2.2.1&quot;</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Module version number.  <a href="#ga19398896775408d6ab7fd8ce2acd992"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
@@ -58,7 +58,7 @@ Collaboration diagram for Apache module configuration:</div>
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define PASSENGER_VERSION&nbsp;&nbsp;&nbsp;&quot;2.2.0&quot;          </td>
+          <td class="memname">#define PASSENGER_VERSION&nbsp;&nbsp;&nbsp;&quot;2.2.1&quot;          </td>
         </tr>
       </table>
 </div>
@@ -226,7 +226,7 @@ Apache module commands array.
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Thu Apr 16 19:48:18 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/group__Core.html

@@ -41,7 +41,7 @@ Collaboration diagram for Core Apache-related classes and functions:</div>
 
 </table>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Thu Apr 16 19:48:18 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/group__Hooks.html

@@ -32,7 +32,7 @@ Collaboration diagram for Apache hooks:</div>
 <tr><td></td></tr>
 </table>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Thu Apr 16 19:48:18 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/group__Support.html

@@ -20,7 +20,7 @@
 <tr><td></td></tr>
 </table>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Thu Apr 16 19:48:18 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/main.html

@@ -19,7 +19,7 @@
 <h1>Passenger Documentation</h1>
 <p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Thu Apr 16 19:48:18 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/modules.html

@@ -25,7 +25,7 @@
 <li><a class="el" href="group__Support.html">Apache-independent support classes and function</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Thu Apr 16 19:48:18 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/rdoc/classes/PhusionPassenger.html

@@ -134,7 +134,7 @@ Class <a href="PhusionPassenger/VersionNotFound.html" class="link">PhusionPassen
   <tr valign='top'>
     <td class="attr-name">VERSION_STRING</td>
     <td>=</td>
-    <td class="attr-value">'2.2.0'</td>
+    <td class="attr-value">'2.2.1'</td>
   </tr>
   <tr valign='top'>
     <td>&nbsp;</td>

data/doc/rdoc/created.rid

@@ -1 +1 @@
-Thu, 16 Apr 2009 19:48:09 +0200
+Sat, 18 Apr 2009 20:08:16 +0200

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

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Thu Apr 16 19:42:11 +0200 2009</td>
+            <td>Sat Apr 18 20:06:06 +0200 2009</td>
           </tr>
         </table>
       </td></tr>

data/ext/apache2/Configuration.h

@@ -46,7 +46,7 @@
  */
 
 /** Module version number. */
-#define PASSENGER_VERSION "2.2.0"
+#define PASSENGER_VERSION "2.2.1"
 
 #ifdef __cplusplus
 	#include <set>

data/ext/nginx/Configuration.c

@@ -47,6 +47,12 @@ static ngx_str_t headers_to_hide[] = {
 
 passenger_main_conf_t passenger_main_conf;
 
+#if NGINX_VERSION_NUM >= 7000
+    static ngx_path_init_t  ngx_http_proxy_temp_path = {
+        ngx_string(NGX_HTTP_PROXY_TEMP_PATH), { 1, 2, 0 }
+    };
+#endif
+
 
 void *
 passenger_create_main_conf(ngx_conf_t *cf)
@@ -222,7 +228,9 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_hash_init_t               hash;
     ngx_http_script_compile_t     sc;
     ngx_http_script_copy_code_t  *copy;
-    u_char                       *temp_path;
+    #if NGINX_VERSION_NUM < 7000
+        u_char                       *temp_path;
+    #endif
 
     ngx_conf_merge_value(conf->enabled, prev->enabled, 0);
     ngx_conf_merge_value(conf->use_global_queue, prev->use_global_queue, 0);
@@ -393,14 +401,21 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                                        |NGX_HTTP_UPSTREAM_FT_OFF;
     }
 
-    temp_path = ngx_palloc(cf->pool, NGX_MAX_PATH);
-    ngx_memzero(temp_path, NGX_MAX_PATH);
-    ngx_snprintf(temp_path, NGX_MAX_PATH, "%s/webserver_private", passenger_temp_dir);
-    ngx_conf_merge_path_value(conf->upstream.temp_path,
-                              prev->upstream.temp_path,
-                              temp_path, 1, 2, 0,
-                              ngx_garbage_collector_temp_handler, cf);
-    conf->upstream.temp_path->name.len = ngx_strlen(conf->upstream.temp_path->name.data);
+    #if NGINX_VERSION_NUM < 7000
+        temp_path = ngx_palloc(cf->pool, NGX_MAX_PATH);
+        ngx_memzero(temp_path, NGX_MAX_PATH);
+        ngx_snprintf(temp_path, NGX_MAX_PATH, "%s/webserver_private", passenger_temp_dir);
+        ngx_conf_merge_path_value(conf->upstream.temp_path,
+                                  prev->upstream.temp_path,
+                                  temp_path, 1, 2, 0,
+                                  ngx_garbage_collector_temp_handler, cf);
+        conf->upstream.temp_path->name.len = ngx_strlen(conf->upstream.temp_path->name.data);
+    #else
+        ngx_conf_merge_path_value(cf,
+                                  &conf->upstream.temp_path,
+                                  prev->upstream.temp_path,
+                                  &ngx_http_proxy_temp_path);
+    #endif
 
     ngx_conf_merge_value(conf->upstream.pass_request_headers,
                               prev->upstream.pass_request_headers, 1);

data/ext/nginx/ngx_http_passenger_module.c

@@ -293,7 +293,13 @@ start_helper_server(ngx_cycle_t *cycle)
         } while (i < HELPER_SERVER_PASSWORD_SIZE);
         
         /* Wait until the HelperServer has done initializing. */
-        read(feedback_pipe[0], &buf, 1);
+        do {
+            /* We must do something with read()'s return value
+             * because otherwise on some platform it might raise a
+             * compile warning.
+             */
+            ret = read(feedback_pipe[0], &buf, 1);
+        } while (ret == -1 && errno == EINTR);
         close(feedback_pipe[0]);
         
         /* Create the file passenger_temp_dir + "/control_process.pid"
@@ -305,8 +311,16 @@ start_helper_server(ngx_cycle_t *cycle)
         *last = (u_char) '\0';
         f = fopen((const char *) filename, "w");
         if (f != NULL) {
-            fchmod(fileno(f), S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-            fchown(fileno(f), ccf->user, ccf->group);
+            /* We must do something with these return values because
+             * otherwise on some platforms it will cause a compiler
+             * warning.
+             */
+            do {
+                ret = fchmod(fileno(f), S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+            } while (ret == -1 && errno == EINTR);
+            do {
+                ret = fchown(fileno(f), ccf->user, ccf->group);
+            } while (ret == -1 && errno == EINTR);
             fclose(f);
         } else {
             ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
@@ -358,13 +372,15 @@ static void
 shutdown_helper_server(ngx_cycle_t *cycle)
 {
     time_t begin_time;
-    int    helper_server_exited;
+    int    helper_server_exited, ret;
     u_char command[NGX_MAX_PATH + 10];
     
     /* We write one byte to the admin pipe, doesn't matter what the byte is.
      * The helper server will detect this as an exit command.
      */
-    write(helper_server_admin_pipe, "x", 1);
+    do {
+        ret = write(helper_server_admin_pipe, "x", 1);
+    } while ((ret == -1 && errno == EINTR) || ret == 0);
     close(helper_server_admin_pipe);
     
     /* Wait at most HELPER_SERVER_MAX_SHUTDOWN_TIME seconds for the helper
@@ -403,7 +419,9 @@ shutdown_helper_server(ngx_cycle_t *cycle)
     ngx_memzero(command, sizeof(command));
     if (ngx_snprintf(command, sizeof(command), "chmod -R u=rwx \"%s\"",
                      passenger_temp_dir) != NULL) {
-        system((const char *) command);
+        do {
+            ret = system((const char *) command);
+        } while (ret == -1 && errno == EINTR);
     }
     
     ngx_memzero(command, sizeof(command));
@@ -524,7 +542,9 @@ pre_config_init(ngx_conf_t *cf)
      */
     ngx_memzero(command, sizeof(command));
     ngx_snprintf(command, sizeof(command), "mkdir -p \"%s\"", passenger_temp_dir);
-    system((const char *) command);
+    do {
+        ret = system((const char *) command);
+    } while (ret == -1 && errno == EINTR);
     
     /* Build helper server socket filename string. */
     

data/ext/oxt/backtrace.cpp

@@ -41,17 +41,13 @@ static initialize_backtrace_support_for_this_thread main_thread_initialization("
 /*
  * boost::thread_specific_storage is pretty expensive. So we use the __thread
  * keyword whenever possible - that's almost free.
- * GCC supports the __thread keyword on x86 since version 3.3. Not sure
- * about other architectures.
+ * GCC supports the __thread keyword on x86 since version 3.3, but versions earlier
+ * than 4.1.2 have bugs (http://gcc.gnu.org/ml/gcc-bugs/2006-09/msg02275.html).
  */
 
-#if defined(__GNUC__) && (                       \
-   __GNUC__ > 3 || (                             \
-       __GNUC__ == 3 && __GNUC_MINOR__ >= 3      \
-   )                                             \
-)
-	#define GCC_IS_3_3_OR_HIGHER
-#endif
+#define GCC_VERSION (__GNUC__ * 10000 \
+                               + __GNUC_MINOR__ * 100 \
+                               + __GNUC_PATCHLEVEL__)
 
 /*
  * FreeBSD 5 supports the __thread keyword, and everything works fine in
@@ -66,7 +62,7 @@ static initialize_backtrace_support_for_this_thread main_thread_initialization("
  *
  * MacOS X doesn't support __thread at all.
  */
-#if defined(GCC_IS_3_3_OR_HIGHER) && !defined(__FreeBSD__) && \
+#if GCC_VERSION >= 40102 && !defined(__FreeBSD__) && \
    !defined(__SOLARIS__) && !defined(__OpenBSD__) && !defined(__APPLE__)
 	static __thread spin_lock *backtrace_lock = NULL;
 	static __thread vector<trace_point *> *current_backtrace = NULL;

data/lib/phusion_passenger/constants.rb

@@ -24,7 +24,7 @@
 module PhusionPassenger
 	# Phusion Passenger version number.
 	# Don't forget to edit Configuration.h too.
-	VERSION_STRING = '2.2.0'
+	VERSION_STRING = '2.2.1'
 	
 	DEFAULT_FRAMEWORK_SPAWNER_MAX_IDLE_TIME = 30 * 60
 	DEFAULT_APP_SPAWNER_MAX_IDLE_TIME       = 10 * 60

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-16 00:00:00 +02:00
+date: 2009-04-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency