passenger 2.2.2 → 2.2.3

data/ext/common/Version.h

@@ -26,6 +26,6 @@
 #define _PASSENGER_VERSION_H_
 
 /* Don't forget to update lib/phusion_passenger/constants.rb too. */
-#define PASSENGER_VERSION "2.2.2"
+#define PASSENGER_VERSION "2.2.3"
 
 #endif /* _PASSENGER_VERSION_H */

data/ext/nginx/Configuration.c

@@ -83,10 +83,6 @@ passenger_init_main_conf(ngx_conf_t *cf, void *conf_pointer)
     conf = &passenger_main_conf;
     *conf = *((passenger_main_conf_t *) conf_pointer);
     
-    if (conf->root_dir.len == 0) {
-        return "-- The 'passenger_root' directive must be set";
-    }
-    
     if (conf->ruby.len == 0) {
         conf->ruby.data = (u_char *) "ruby";
         conf->ruby.len  = sizeof("ruby") - 1;

data/ext/nginx/ContentHandler.c

@@ -63,10 +63,10 @@ get_file_type(const u_char *filename, unsigned int throttle_rate) {
     struct stat buf;
     int ret;
     
-    ret = cached_multi_file_stat_perform(passenger_stat_cache,
-                                         (const char *) filename,
-                                         &buf,
-                                         throttle_rate);
+    ret = cached_file_stat_perform(passenger_stat_cache,
+                                   (const char *) filename,
+                                   &buf,
+                                   throttle_rate);
     if (ret == 0) {
         if (S_ISREG(buf.st_mode)) {
             return FT_FILE;
@@ -105,7 +105,7 @@ detect_application_type(const ngx_str_t *public_dir) {
     
     ngx_memzero(filename, sizeof(filename));
     ngx_snprintf(filename, sizeof(filename), "%s/%s",
-                 public_dir->data, "../config/passenger_wsgi.py");
+                 public_dir->data, "../passenger_wsgi.py");
     if (file_exists(filename, 1)) {
         return AP_WSGI;
     }
@@ -1077,7 +1077,9 @@ passenger_content_handler(ngx_http_request_t *r)
     ngx_str_t              page_cache_file;
     passenger_context_t   *context;
 
-    if (r->subrequest_in_memory) {
+    if (passenger_main_conf.root_dir.len == 0) {
+        return NGX_DECLINED;
+    } else if (r->subrequest_in_memory) {
         ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
                       "ngx_http_passenger_module does not support "
                       "subrequest in memory");

data/ext/nginx/HelperServer.cpp

@@ -122,6 +122,8 @@ public:
 	}
 };
 
+struct ClientDisconnectedException { };
+
 /**
  * A representation of a Client from the Server's point of view. This class
  * contains the methods used to communicate from a server to a connected
@@ -311,7 +313,12 @@ private:
 	 * 
 	 * @param session The Ruby on Rails session to read the response from.
 	 * @param clientFd The client file descriptor to write the response to.
-	 * @throws SystemException Response could not be read from backend (Rails) process.
+	 * @throws SystemException Something went wrong while reading the response
+	 *                         from the backend process or while writing to the
+	 *                         response back to the web server.
+	 * @throws ClientDisconnectedException The HTTP client closed the connection
+	 *                                     before we were able to send back the
+	 *                                     full response.
 	 */
 	void forwardResponse(Application::SessionPtr &session, FileDescriptor &clientFd) {
 		TRACE_POINT();
@@ -339,13 +346,21 @@ private:
 				 * of the response data.
 				 */
 				UPDATE_TRACE_POINT();
-				string statusLine("HTTP/1.1 ");
-				statusLine.append(ex.getStatusLine());
-				UPDATE_TRACE_POINT();
-				output.writeRaw(statusLine.c_str(), statusLine.size());
-				UPDATE_TRACE_POINT();
-				output.writeRaw(ex.getBuffer().c_str(), ex.getBuffer().size());
-				break;
+				try {
+					string statusLine("HTTP/1.1 ");
+					statusLine.append(ex.getStatusLine());
+					UPDATE_TRACE_POINT();
+					output.writeRaw(statusLine.c_str(), statusLine.size());
+					UPDATE_TRACE_POINT();
+					output.writeRaw(ex.getBuffer().c_str(), ex.getBuffer().size());
+					break;
+				} catch (const SystemException &e) {
+					if (e.code() == EPIPE) {
+						throw ClientDisconnectedException();
+					} else {
+						throw;
+					}
+				}
 			}
 		}
 		
@@ -359,7 +374,15 @@ private:
 				throw SystemException("Cannot read response from backend process", errno);
 			} else {
 				UPDATE_TRACE_POINT();
-				output.writeRaw(buf, size);
+				try {
+					output.writeRaw(buf, size);
+				} catch (const SystemException &e) {
+					if (e.code() == EPIPE) {
+						throw ClientDisconnectedException();
+					} else {
+						throw;
+					}
+				}
 			}
 		}
 	}
@@ -399,10 +422,8 @@ private:
 	 * Handles an SCGI request from a client whose identity is derived by the given <tt>clientFd</tt>.
 	 *
 	 * @param clientFd The file descriptor identifying the client to handle the request from.
-	 * @return True if an error occurred while trying to handle the request of the client. False if
-	 *   the request was succesfully processed.
 	 */
-	bool handleRequest(FileDescriptor &clientFd) {
+	void handleRequest(FileDescriptor &clientFd) {
 		TRACE_POINT();
 		ScgiRequestParser parser;
 		string partialRequestBody;
@@ -410,18 +431,19 @@ private:
 		
 		if (!readAndCheckPassword(clientFd)) {
 			P_ERROR("Client did not send a correct password.");
-			return true;
+			return;
 		}
 		if (!readAndParseRequestHeaders(clientFd, parser, partialRequestBody)) {
-			return true;
+			return;
 		}
 		
 		try {
 			PoolOptions options;
-			if (parser.getHeader("RAILS_RELATIVE_URL_ROOT").empty()) {
+			if (parser.getHeader("SCRIPT_NAME").empty()) {
 				options.appRoot = extractDirName(parser.getHeader("DOCUMENT_ROOT"));
 			} else {
 				options.appRoot = extractDirName(resolveSymlink(parser.getHeader("DOCUMENT_ROOT")));
+				options.baseURI = parser.getHeader("SCRIPT_NAME");
 			}
 			options.useGlobalQueue = parser.getHeader("PASSENGER_USE_GLOBAL_QUEUE") == "true";
 			options.environment    = parser.getHeader("PASSENGER_ENVIRONMENT");
@@ -450,23 +472,23 @@ private:
 				forwardResponse(session, clientFd);
 			} catch (const SpawnException &e) {
 				handleSpawnException(clientFd, e);
+			} catch (const ClientDisconnectedException &) {
+				P_WARN("Couldn't forward the HTTP response back to the HTTP client: "
+					"It seems the user clicked on the 'Stop' button in his "
+					"browser.");
 			}
-			return false;
 		} catch (const boost::thread_interrupted &) {
 			throw;
 		} catch (const tracable_exception &e) {
 			P_ERROR("Uncaught exception in PassengerServer client thread:\n"
 				<< "   exception: " << e.what() << "\n"
 				<< "   backtrace:\n" << e.backtrace());
-			return true;
 		} catch (const exception &e) {
 			P_ERROR("Uncaught exception in PassengerServer client thread:\n"
 				<< "   exception: " << e.what() << "\n"
 				<< "   backtrace: not available");
-			return true;
 		} catch (...) {
 			P_ERROR("Uncaught unknown exception in PassengerServer client thread.");
-			return true;
 		}
 	}
 	
@@ -555,8 +577,6 @@ typedef shared_ptr<Client> ClientPtr;
  */
 class Server {
 private:
-	static const unsigned int BACKLOG_SIZE = 50;
-
 	string password;
 	int adminPipe;
 	int serverSocket;
@@ -573,45 +593,15 @@ private:
 	 * attempt to bind on. Once it is bound, it will start listening for incoming client
 	 * activity.
 	 *
-	 * @throws SystemException Could not create unconnected Unix socket or bind on Unix socket.
+	 * @throws SystemException Something went wrong while trying to create and bind to the Unix socket.
+	 * @throws RuntimeException Something went wrong.
 	 */
 	void startListening() {
 		this_thread::disable_syscall_interruption dsi;
 		string socketName = getPassengerTempDir() + "/master/helper_server.sock";
-		struct sockaddr_un addr;
-		int ret;
-		
-		serverSocket = syscalls::socket(PF_UNIX, SOCK_STREAM, 0);
-		if (serverSocket == -1) {
-			throw SystemException("Cannot create an unconnected Unix socket", errno);
-		}
-		
-		addr.sun_family = AF_UNIX;
-		strncpy(addr.sun_path, socketName.c_str(), sizeof(addr.sun_path));
-		addr.sun_path[sizeof(addr.sun_path) - 1] = '\0';
-		
-		ret = syscalls::bind(serverSocket, (const struct sockaddr *) &addr, sizeof(addr));
-		if (ret == -1) {
-			int e = errno;
-			syscalls::close(serverSocket);
-			
-			string message("Cannot bind on Unix socket '");
-			message.append(socketName);
-			message.append("'");
-			throw SystemException(message, e);
-		}
-		
-		ret = syscalls::listen(serverSocket, BACKLOG_SIZE);
-		if (ret == -1) {
-			int e = errno;
-			syscalls::close(serverSocket);
-			
-			string message("Cannot bind on Unix socket '");
-			message.append(socketName);
-			message.append("'");
-			throw SystemException(message, e);
-		}
+		serverSocket = createUnixServer(socketName.c_str());
 		
+		int ret;
 		do {
 			ret = chmod(socketName.c_str(), S_ISVTX |
 				S_IRUSR | S_IWUSR | S_IXUSR |

data/ext/nginx/HttpStatusExtractor.h

@@ -159,6 +159,10 @@ private:
 			case 307:
 				statusLine = "307 Temporary Redirect\x0D\x0A";
 				break;
+			case 308:
+				// Google Gears: http://code.google.com/p/gears/wiki/ResumableHttpRequestsProposal
+				statusLine = "308 Resume Incomplete\x0D\x0A";
+				break;
 			case 400:
 				statusLine = "400 Bad Request\x0D\x0A";
 				break;

data/ext/nginx/StaticContentHandler.c

@@ -26,6 +26,25 @@
 
 #include "StaticContentHandler.h"
 
+static void
+set_request_extension(ngx_http_request_t *r, ngx_str_t *filename) {
+    u_char *tmp;
+    
+    /* Scan filename from the right until we've found a slash or a dot. */
+    tmp = filename->data + filename->len - 1;
+    while (tmp >= filename->data && *tmp != '/' && *tmp != '.') {
+        tmp--;
+    }
+    if (tmp >= filename->data && *tmp == '.') {
+        /* We found a dot, and until now we haven't seen any slashes.
+         * So we know that this is the filename's extension.
+        */
+        tmp++;
+        r->exten.data = tmp;
+        r->exten.len  = filename->len - (tmp - filename->data);
+    }
+}
+
 ngx_int_t
 passenger_static_content_handler(ngx_http_request_t *r, ngx_str_t *filename)
 {
@@ -58,10 +77,10 @@ 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);
 
-    #if NGX_VERSION_NUM < 7000
+    ngx_memzero(&of, sizeof(ngx_open_file_info_t));
+    #if NGINX_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;
@@ -106,7 +125,7 @@ passenger_static_content_handler(ngx_http_request_t *r, ngx_str_t *filename)
         return rc;
     }
 
-    #if NGX_VERSION_NUM >= 7000
+    #if NGINX_VERSION_NUM >= 7000
         r->root_tested = !r->error_page;
     #endif
 	
@@ -131,7 +150,7 @@ passenger_static_content_handler(ngx_http_request_t *r, ngx_str_t *filename)
                 len += r->args.len + 1;
             }
 
-            #if NGX_VERSION_NUM < 7000
+            #if NGINX_VERSION_NUM < 7000
                 location = ngx_palloc(r->pool, len);
             #else
             	location = ngx_pnalloc(r->pool, len);
@@ -188,6 +207,7 @@ passenger_static_content_handler(ngx_http_request_t *r, ngx_str_t *filename)
     r->headers_out.content_length_n = of.size;
     r->headers_out.last_modified_time = of.mtime;
 
+    set_request_extension(r, filename);
     if (ngx_http_set_content_type(r) != NGX_OK) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
@@ -226,7 +246,7 @@ 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
+    #if NGINX_VERSION_NUM >= 7000
         b->file->directio = of.is_directio;
     #endif
 

data/ext/nginx/config

@@ -26,6 +26,9 @@ CORE_LIBS="$CORE_LIBS  \
     ${ngx_addon_dir}/libpassenger_common.a \
     ${ngx_addon_dir}/libboost_oxt.a \
     -lstdc++ -lpthread"
+if test x`uname` = xOpenBSD; then
+    CORE_LIBS="$CORE_LIBS -lm"
+fi
 
 nginx_version=`grep 'NGINX_VERSION ' src/core/nginx.h | awk '{ print $3 }' | sed 's/"//g'`
 

data/ext/nginx/ngx_http_passenger_module.c

@@ -54,11 +54,18 @@ static ngx_str_t  ngx_http_scgi_script_name = ngx_string("scgi_script_name");
 static pid_t      helper_server_pid = 0;
 static int        helper_server_admin_pipe;
 static u_char     helper_server_password_data[HELPER_SERVER_PASSWORD_SIZE];
+/** perl_module destroys the original environment variables for some reason,
+ * so when we get a SIGHUP (for restarting Nginx) $TMPDIR might not have the
+ * same value as it had during Nginx startup. We need the original $TMPDIR
+ * value for calculating the Passenger temp dir location, so here we cache
+ * the original value instead of getenv()'ing it every time.
+ */
+const char       *system_temp_dir = NULL;
 const char        passenger_temp_dir[NGX_MAX_PATH];
 ngx_str_t         passenger_schema_string;
 ngx_str_t         passenger_helper_server_password;
 const char        passenger_helper_server_socket[NGX_MAX_PATH];
-CachedMultiFileStat *passenger_stat_cache;
+CachedFileStat   *passenger_stat_cache;
 
 static void shutdown_helper_server(ngx_cycle_t *cycle);
 
@@ -122,10 +129,17 @@ start_helper_server(ngx_cycle_t *cycle)
     long                   i;
     ssize_t                ret;
     char                   buf;
-    FILE                  *f;
+    ngx_str_t             *log_filename;
+    FILE                  *f, *log_file;
+    
+    shutdown_helper_server(cycle);
     
-    if (helper_server_pid != 0) {
-        shutdown_helper_server(cycle);
+    if (main_conf->root_dir.len == 0) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
+                      "Phusion Passenger is disabled because the "
+                      "'passenger_root' option is not set. Please set "
+                      "this option if you want to enable Phusion Passenger.");
+        return NGX_OK;
     }
     
     ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
@@ -219,10 +233,35 @@ start_helper_server(ngx_cycle_t *cycle)
         close(admin_pipe[1]);
         close(feedback_pipe[0]);
         
-        /* Nginx redirects stderr to the error log file. Make sure that
-         * stdout is redirected to the error log file as well.
+        /* At this point, stdout and stderr may still point to the console.
+         * Make sure that they're both redirected to the log file.
          */
-        dup2(2, 1);
+        log_file = NULL;
+        #if NGINX_VERSION_NUM < 7000
+            log_filename = &cycle->new_log->file->name;
+        #else
+            log_filename = &cycle->new_log.file->name;
+        #endif
+        if (log_filename->len > 0) {
+            log_file = fopen((const char *) log_filename->data, "a");
+            if (log_file == NULL) {
+                ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                              "could not open the error log file for writing");
+            }
+        }
+        if (log_file == NULL) {
+            /* If the log file cannot be opened then we redirect stdout
+             * and stderr to /dev/null, because if the user disconnects
+             * from the console on which Nginx is started, then on Linux
+             * any writes to stdout or stderr will result in an EIO error.
+             */
+            log_file = fopen("/dev/null", "w");
+        }
+        if (log_file != NULL) {
+            dup2(fileno(log_file), 1);
+            dup2(fileno(log_file), 2);
+            fclose(log_file);
+        }
         
         /* Close all file descriptors except stdin, stdout, stderr and
          * the reader part of the pipe we just created. 
@@ -241,6 +280,8 @@ start_helper_server(ngx_cycle_t *cycle)
             close(i);
         }
         
+        setenv("SERVER_SOFTWARE", NGINX_VER, 1);
+        
         execlp((const char *) helper_server_filename,
                "PassengerNginxHelperServer",
                main_conf->root_dir.data,
@@ -256,7 +297,7 @@ start_helper_server(ngx_cycle_t *cycle)
                worker_uid_string,
                worker_gid_string,
                passenger_temp_dir,
-               NULL);
+               (char *) 0);
         e = errno;
         fprintf(stderr, "*** Could not start the Passenger helper server (%s): "
                 "exec() failed: %s (%d)\n",
@@ -357,6 +398,10 @@ save_master_process_pid(ngx_cycle_t *cycle) {
     u_char *last;
     FILE *f;
     
+    if (passenger_main_conf.root_dir.len == 0) {
+        return NGX_OK;
+    }
+    
     last = ngx_snprintf(filename, sizeof(filename) - 1,
         "%s/control_process.pid", passenger_temp_dir);
     *last = (u_char) '\0';
@@ -380,6 +425,10 @@ shutdown_helper_server(ngx_cycle_t *cycle)
     int    helper_server_exited, ret;
     u_char command[NGX_MAX_PATH + 10];
     
+    if (helper_server_pid == 0) {
+        return;
+    }
+    
     /* 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.
      */
@@ -442,7 +491,6 @@ shutdown_helper_server(ngx_cycle_t *cycle)
                           passenger_temp_dir);
         }
     }
-    
     helper_server_pid = 0;
 }
 
@@ -509,15 +557,15 @@ static ngx_int_t
 pre_config_init(ngx_conf_t *cf)
 {
     ngx_int_t   ret;
-    const char *system_temp_dir;
     u_char      command[NGX_MAX_PATH + 30];
+    u_char     *last;
     
     ngx_memzero(&passenger_main_conf, sizeof(passenger_main_conf_t));
     
     passenger_schema_string.data = (u_char *) "passenger://";
     passenger_schema_string.len  = sizeof("passenger://") - 1;
     
-    passenger_stat_cache = cached_multi_file_stat_new(1024);
+    passenger_stat_cache = cached_file_stat_new(1024);
     
     ret = add_variables(cf);
     if (ret != NGX_OK) {
@@ -526,9 +574,13 @@ pre_config_init(ngx_conf_t *cf)
     
     /* Setup Passenger temp folder. */
     
-    system_temp_dir = getenv("TMPDIR");
-    if (!system_temp_dir || !*system_temp_dir) {
-        system_temp_dir = "/tmp";
+    if (system_temp_dir == NULL) {
+        const char *tmp = getenv("TMPDIR");
+        if (tmp == NULL || *tmp == '\0') {
+            system_temp_dir = "/tmp";
+        } else {
+            system_temp_dir = strdup(tmp);
+        }
     }
     
     ngx_memzero(&passenger_temp_dir, sizeof(passenger_temp_dir));
@@ -554,13 +606,16 @@ pre_config_init(ngx_conf_t *cf)
     
     /* Build helper server socket filename string. */
     
-    if (ngx_snprintf((u_char *) passenger_helper_server_socket, NGX_MAX_PATH,
-                     "unix:%s/master/helper_server.sock",
-                     passenger_temp_dir) == NULL) {
+    last = ngx_snprintf((u_char *) passenger_helper_server_socket, NGX_MAX_PATH,
+                        "unix:%s/master/helper_server.sock",
+                        passenger_temp_dir);
+    if (last == NULL) {
         ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno,
                       "could not create Passenger helper server "
                       "socket filename string");
         return NGX_ERROR;
+    } else {
+        *last = (u_char) '\0';
     }
     
     return NGX_OK;