passenger 2.2.1 → 2.2.2

data/ext/common/Version.h

@@ -0,0 +1,31 @@
+/*
+ *  Phusion Passenger - http://www.modrails.com/
+ *  Copyright (c) 2009 Phusion
+ *
+ *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+#ifndef _PASSENGER_VERSION_H_
+#define _PASSENGER_VERSION_H_
+
+/* Don't forget to update lib/phusion_passenger/constants.rb too. */
+#define PASSENGER_VERSION "2.2.2"
+
+#endif /* _PASSENGER_VERSION_H */

data/ext/nginx/ContentHandler.c

@@ -30,6 +30,7 @@
 #include "ContentHandler.h"
 #include "StaticContentHandler.h"
 #include "Configuration.h"
+#include "../common/Version.h"
 
 
 #define NGX_HTTP_SCGI_PARSE_NO_HEADER  20
@@ -242,6 +243,9 @@ create_request(ngx_http_request_t *r)
     passenger_main_conf_t         *main_conf;
     passenger_context_t           *context;
     ngx_http_script_len_code_pt    lcode;
+    #if (NGX_HTTP_SSL)
+        ngx_http_ssl_srv_conf_t   *ssl_conf;
+    #endif
     
     slcf = ngx_http_get_module_loc_conf(r, ngx_http_passenger_module);
     main_conf = &passenger_main_conf;
@@ -284,12 +288,14 @@ create_request(ngx_http_request_t *r)
     /* +1 for trailing null */
     len = sizeof("CONTENT_LENGTH") + ngx_strlen(buf) + 1;
     
-    /* DOCUMENT_ROOT, PATH_INFO and base URI */
+    /* DOCUMENT_ROOT, SCRIPT_NAME and base URI */
     len += sizeof("DOCUMENT_ROOT") + context->public_dir.len + 1;
-    len += sizeof("PATH_INFO") + context->public_dir.len + 1;
     if (context->base_uri.len > 0) {
+        len += sizeof("SCRIPT_NAME") + context->base_uri.len + 1;
         len += sizeof("RAILS_RELATIVE_URL_ROOT") +
                context->base_uri.len + 1;
+    } else {
+        len += sizeof("SCRIPT_NAME") + sizeof("");
     }
     
     /* Various other HTTP headers. */
@@ -298,6 +304,12 @@ create_request(ngx_http_request_t *r)
         len += sizeof("CONTENT_TYPE") + r->headers_in.content_type->value.len + 1;
     }
     
+    #if (NGX_HTTP_SSL)
+        ssl_conf = ngx_http_get_module_srv_conf(r, ngx_http_ssl_module);
+        if (ssl_conf->enable) {
+            len += sizeof("HTTPS") + sizeof("on");
+        }
+    #endif
     
     /* Lengths of Passenger application pool options. */
     if (slcf->use_global_queue) {
@@ -370,6 +382,33 @@ create_request(ngx_http_request_t *r)
         }
     }
 
+    /* Trailing dummy header.
+     *
+	 * If the last header value is an empty string, then the buffer
+	 * will end with "\0\0". For example, if 'SSL_CLIENT_CERT'
+	 * is the last header and it has an empty value, then the SCGI header
+	 * will end with:
+	 *
+	 *   "SSL_CLIENT_CERT\0\0"
+	 *
+	 * The data in the buffer will be processed by the AbstractRequestHandler 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.
+	 */
+    len += sizeof("_") + sizeof("_");
+
 
     /**************************************************
      * Build the request header data.
@@ -406,20 +445,23 @@ create_request(ngx_http_request_t *r)
     b->last = ngx_snprintf(b->last, 10, "%ui", content_length);
     *b->last++ = (u_char) 0;
     
-    /* Build DOCUMENT_ROOT and base URI. */
+    /* Build DOCUMENT_ROOT, SCRIPT_NAME and base URI. */
     b->last = ngx_copy(b->last, "DOCUMENT_ROOT", sizeof("DOCUMENT_ROOT"));
     b->last = ngx_copy(b->last, context->public_dir.data,
                        context->public_dir.len + 1);
     
-    b->last = ngx_copy(b->last, "PATH_INFO", sizeof("PATH_INFO"));
-    b->last = ngx_copy(b->last, context->public_dir.data,
-                       context->public_dir.len + 1);
-    
     if (context->base_uri.len > 0) {
+        b->last = ngx_copy(b->last, "SCRIPT_NAME", sizeof("SCRIPT_NAME"));
+        b->last = ngx_copy(b->last, context->base_uri.data,
+                           context->base_uri.len + 1);
+        
         b->last = ngx_copy(b->last, "RAILS_RELATIVE_URL_ROOT",
                            sizeof("RAILS_RELATIVE_URL_ROOT"));
         b->last = ngx_copy(b->last, context->base_uri.data,
                            context->base_uri.len + 1);
+    } else {
+        b->last = ngx_copy(b->last, "SCRIPT_NAME", sizeof("SCRIPT_NAME"));
+        b->last = ngx_copy(b->last, "", sizeof(""));
     }
     
     /* Various other HTTP headers. */
@@ -430,6 +472,14 @@ create_request(ngx_http_request_t *r)
                            r->headers_in.content_type->value.len + 1);
     }
     
+    #if (NGX_HTTP_SSL)
+        ssl_conf = ngx_http_get_module_srv_conf(r, ngx_http_ssl_module);
+        if (ssl_conf->enable) {
+            b->last = ngx_copy(b->last, "HTTPS", sizeof("HTTPS"));
+            b->last = ngx_copy(b->last, "on", sizeof("on"));
+        }
+    #endif
+    
 
     /* Build Passenger application pool option headers. */
     b->last = ngx_copy(b->last, "PASSENGER_USE_GLOBAL_QUEUE",
@@ -534,6 +584,9 @@ create_request(ngx_http_request_t *r)
             *b->last++ = (u_char) 0;
          }
     }
+    
+    /* Trailing dummy header. See earlier comment for explanation. */
+    b->last = ngx_copy(b->last, "_\0_", sizeof("_\0_"));
 
 
     *b->last++ = (u_char) ',';
@@ -956,7 +1009,7 @@ process_header(ngx_http_request_t *r)
 
                 h->key.len = sizeof("Server") - 1;
                 h->key.data = (u_char *) "Server";
-                h->value.data = (u_char *) (NGINX_VER " + Phusion Passenger (mod_rails/mod_rack)");
+                h->value.data = (u_char *) (NGINX_VER " + Phusion Passenger " PASSENGER_VERSION " (mod_rails/mod_rack)");
                 h->value.len = ngx_strlen(h->value.data);
                 h->lowcase_key = (u_char *) "server";
             }

data/ext/nginx/HelperServer.cpp

@@ -830,10 +830,13 @@ main(int argc, char *argv[]) {
 		string defaultUser = argv[10];
 		uid_t workerUid    = (uid_t) atoll(argv[11]);
 		gid_t workerGid    = (gid_t) atoll(argv[12]);
+		string passengerTempDir = argv[13];
 		
 		setLogLevel(logLevel);
 		P_DEBUG("Passenger helper server started on PID " << getpid());
 		
+		setPassengerTempDir(passengerTempDir);
+		
 		password = receivePassword(adminPipe);
 		P_TRACE(2, "Password received.");
 		

data/ext/nginx/HttpStatusExtractor.h

@@ -24,6 +24,8 @@
  */
 
 #include <string>
+#include <cstdio>
+#include <cstdlib>
 
 namespace Passenger {
 
@@ -46,6 +48,10 @@ using namespace std;
  * - Call getBuffer() to retrieve all fed data so far. This data can be sent to
  *   the HTTP client.
  *
+ * This class will also ensure that the status line contains a status text, e.g.
+ * if the HTTP data's status value is only "200" then "OK" will be automatically
+ * appended.
+ *
  * @note
  * When the API documentation for this class refers to "\r\n", we actually
  * mean "\x0D\x0A" (the HTTP line termination string). "\r\n" is only written
@@ -82,6 +88,7 @@ private:
 		if (start_pos != string::npos) {
 			// Status line has been found. Extract it.
 			statusLine = buffer.substr(start_pos, newline_pos - start_pos);
+			addStatusTextIfNecessary();
 			return true;
 		} else {
 			// Status line is not found. Do not change default
@@ -90,6 +97,184 @@ private:
 		}
 	}
 	
+	void addStatusTextIfNecessary() {
+		if (statusLine.find(' ') == string::npos) {
+			// The status line doesn't contain a status text, so add it.
+			int statusCode = atoi(statusLine.c_str());
+			switch (statusCode) {
+			case 100:
+				statusLine = "100 Continue\x0D\x0A";
+				break;
+			case 101:
+				statusLine = "101 Switching Protocols\x0D\x0A";
+				break;
+			case 102:
+				statusLine = "102 Processing\x0D\x0A";
+				break;
+			case 200:
+				statusLine = "200 OK\x0D\x0A";
+				break;
+			case 201:
+				statusLine = "201 Created\x0D\x0A";
+				break;
+			case 202:
+				statusLine = "202 Accepted\x0D\x0A";
+				break;
+			case 203:
+				statusLine = "203 Non-Authoritative Information\x0D\x0A";
+				break;
+			case 204:
+				statusLine = "204 No Content\x0D\x0A";
+				break;
+			case 205:
+				statusLine = "205 Reset Content\x0D\x0A";
+				break;
+			case 206:
+				statusLine = "206 Partial Content\x0D\x0A";
+				break;
+			case 207:
+				statusLine = "207 Multi-Status\x0D\x0A";
+				break;
+			case 300:
+				statusLine = "300 Multiple Choices\x0D\x0A";
+				break;
+			case 301:
+				statusLine = "301 Moved Permanently\x0D\x0A";
+				break;
+			case 302:
+				statusLine = "302 Found\x0D\x0A";
+				break;
+			case 303:
+				statusLine = "303 See Other\x0D\x0A";
+				break;
+			case 304:
+				statusLine = "304 Not Modified\x0D\x0A";
+				break;
+			case 305:
+				statusLine = "305 Use Proxy\x0D\x0A";
+				break;
+			case 306:
+				statusLine = "306 Switch Proxy\x0D\x0A";
+				break;
+			case 307:
+				statusLine = "307 Temporary Redirect\x0D\x0A";
+				break;
+			case 400:
+				statusLine = "400 Bad Request\x0D\x0A";
+				break;
+			case 401:
+				statusLine = "401 Unauthorized\x0D\x0A";
+				break;
+			case 402:
+				statusLine = "402 Payment Required\x0D\x0A";
+				break;
+			case 403:
+				statusLine = "403 Forbidden\x0D\x0A";
+				break;
+			case 404:
+				statusLine = "404 Not Found\x0D\x0A";
+				break;
+			case 405:
+				statusLine = "405 Method Not Allowed\x0D\x0A";
+				break;
+			case 406:
+				statusLine = "406 Not Acceptable\x0D\x0A";
+				break;
+			case 407:
+				statusLine = "407 Proxy Authentication Required\x0D\x0A";
+				break;
+			case 408:
+				statusLine = "408 Request Timeout\x0D\x0A";
+				break;
+			case 409:
+				statusLine = "409 Conflict\x0D\x0A";
+				break;
+			case 410:
+				statusLine = "410 Gone\x0D\x0A";
+				break;
+			case 411:
+				statusLine = "411 Length Required\x0D\x0A";
+				break;
+			case 412:
+				statusLine = "412 Precondition Failed\x0D\x0A";
+				break;
+			case 413:
+				statusLine = "413 Request Entity Too Large\x0D\x0A";
+				break;
+			case 414:
+				statusLine = "414 Request-URI Too Long\x0D\x0A";
+				break;
+			case 415:
+				statusLine = "415 Unsupported Media Type\x0D\x0A";
+				break;
+			case 416:
+				statusLine = "416 Requested Range Not Satisfiable\x0D\x0A";
+				break;
+			case 417:
+				statusLine = "417 Expectation Failed\x0D\x0A";
+				break;
+			case 418:
+				statusLine = "418 Not A Funny April Fools Joke\x0D\x0A";
+				break;
+			case 422:
+				statusLine = "422 Unprocessable Entity\x0D\x0A";
+				break;
+			case 423:
+				statusLine = "423 Locked\x0D\x0A";
+				break;
+			case 424:
+				statusLine = "424 Unordered Collection\x0D\x0A";
+				break;
+			case 426:
+				statusLine = "426 Upgrade Required\x0D\x0A";
+				break;
+			case 449:
+				statusLine = "449 Retry With\x0D\x0A";
+				break;
+			case 450:
+				statusLine = "450 Blocked\x0D\x0A";
+				break;
+			case 500:
+				statusLine = "500 Internal Server Error\x0D\x0A";
+				break;
+			case 501:
+				statusLine = "501 Not Implemented\x0D\x0A";
+				break;
+			case 502:
+				statusLine = "502 Bad Gateway\x0D\x0A";
+				break;
+			case 503:
+				statusLine = "503 Service Unavailable\x0D\x0A";
+				break;
+			case 504:
+				statusLine = "504 Gateway Timeout\x0D\x0A";
+				break;
+			case 505:
+				statusLine = "505 HTTP Version Not Supported\x0D\x0A";
+				break;
+			case 506:
+				statusLine = "506 Variant Also Negotiates\x0D\x0A";
+				break;
+			case 507:
+				statusLine = "507 Insufficient Storage\x0D\x0A";
+				break;
+			case 509:
+				statusLine = "509 Bandwidth Limit Exceeded\x0D\x0A";
+				break;
+			case 510:
+				statusLine = "510 Not Extended\x0D\x0A";
+				break;
+			default:
+				char temp[32];
+				snprintf(temp, sizeof(temp),
+					"%d Unknown Status Code\x0D\x0A",
+					statusCode);
+				temp[sizeof(temp) - 1] = '\0';
+				statusLine = temp;
+			}
+		}
+	}
+	
 public:
 	HttpStatusExtractor() {
 		searchStart = 0;

data/ext/nginx/StaticContentHandler.c

@@ -47,7 +47,6 @@ passenger_static_content_handler(ngx_http_request_t *r, ngx_str_t *filename)
         return NGX_DECLINED;
     }
 
-    /* TODO: Win32 */
     if (r->zero_in_uri) {
         return NGX_DECLINED;
     }
@@ -59,7 +58,12 @@ passenger_static_content_handler(ngx_http_request_t *r, ngx_str_t *filename)
 
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
-    of.test_dir = 0;
+    #if NGX_VERSION_NUM < 7000
+        of.test_dir = 0;
+    #else
+        ngx_memzero(&of, sizeof(ngx_open_file_info_t));
+        of.directio = clcf->directio;
+    #endif
     of.valid = clcf->open_file_cache_valid;
     of.min_uses = clcf->open_file_cache_min_uses;
     of.errors = clcf->open_file_cache_errors;
@@ -102,6 +106,10 @@ passenger_static_content_handler(ngx_http_request_t *r, ngx_str_t *filename)
         return rc;
     }
 
+    #if NGX_VERSION_NUM >= 7000
+        r->root_tested = !r->error_page;
+    #endif
+	
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0, "http static fd: %d", of.fd);
 
     if (of.is_dir) {
@@ -123,7 +131,11 @@ passenger_static_content_handler(ngx_http_request_t *r, ngx_str_t *filename)
                 len += r->args.len + 1;
             }
 
-            location = ngx_palloc(r->pool, len);
+            #if NGX_VERSION_NUM < 7000
+                location = ngx_palloc(r->pool, len);
+            #else
+            	location = ngx_pnalloc(r->pool, len);
+            #endif
             if (location == NULL) {
                 return NGX_HTTP_INTERNAL_SERVER_ERROR;
             }
@@ -214,6 +226,9 @@ passenger_static_content_handler(ngx_http_request_t *r, ngx_str_t *filename)
     b->file->fd = of.fd;
     b->file->name = *filename;
     b->file->log = log;
+    #if NGX_VERSION_NUM >= 7000
+        b->file->directio = of.is_directio;
+    #endif
 
     out.buf = b;
     out.next = NULL;