passenger 3.9.2.beta → 4.0.0.rc4

data/ext/nginx/ContentHandler.c

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) Igor Sysoev
  * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
- * Copyright (C) 2010, 2011, 2012 Phusion
+ * Copyright (C) 2010-2013 Phusion
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -86,34 +86,6 @@ file_exists(const u_char *filename, unsigned int throttle_rate) {
     return get_file_type(filename, throttle_rate) == FT_FILE;
 }
 
-static passenger_app_type_t
-detect_application_type(const ngx_str_t *public_dir) {
-    u_char filename[NGX_MAX_PATH];
-    
-    ngx_memzero(filename, sizeof(filename));
-    ngx_snprintf(filename, sizeof(filename), "%s/%s",
-                 public_dir->data, "../config.ru");
-    if (file_exists(filename, 1)) {
-        return AP_RACK;
-    }
-    
-    ngx_memzero(filename, sizeof(filename));
-    ngx_snprintf(filename, sizeof(filename), "%s/%s",
-                 public_dir->data, "../config/environment.rb");
-    if (file_exists(filename, 1)) {
-        return AP_CLASSIC_RAILS;
-    }
-        
-    ngx_memzero(filename, sizeof(filename));
-    ngx_snprintf(filename, sizeof(filename), "%s/%s",
-                 public_dir->data, "../passenger_wsgi.py");
-    if (file_exists(filename, 1)) {
-        return AP_WSGI;
-    }
-    
-    return AP_NONE;
-}
-
 /**
  * Maps the URI for the given request to a page cache file, if possible.
  *
@@ -197,11 +169,11 @@ find_base_uri(ngx_http_request_t *r, const passenger_loc_conf_t *loc,
         return 0;
     } else {
         base_uris = (ngx_str_t *) loc->base_uris->elts;
+        uri       = &r->uri;
         for (i = 0; i < loc->base_uris->nelts; i++) {
             base_uri = &base_uris[i];
-            uri      = &r->uri;
             
-            if (uri->len == 1 && uri->data[0] == '/') {
+            if (base_uri->len == 1 && base_uri->data[0] == '/') {
                 /* Ignore 'passenger_base_uri /' options. Users usually
                  * specify this out of ignorance.
                  */
@@ -213,7 +185,7 @@ find_base_uri(ngx_http_request_t *r, const passenger_loc_conf_t *loc,
              || (    uri->len >  base_uri->len
                   && ngx_strncmp(uri->data, base_uri->data, base_uri->len) == 0
                   && uri->data[base_uri->len] == (u_char) '/' )) {
-                *found_base_uri = base_uris[i];
+                *found_base_uri = *base_uri;
                 return 1;
             }
         }
@@ -373,24 +345,8 @@ create_request(ngx_http_request_t *r)
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
     
-    switch (context->app_type) {
-    case AP_CLASSIC_RAILS:
-        app_type_string = (const u_char *) "classic-rails";
-        app_type_string_len = sizeof("classic-rails");
-        break;
-    case AP_RACK:
-        app_type_string = (const u_char *) "rack";
-        app_type_string_len = sizeof("rack");
-        break;
-    case AP_WSGI:
-        app_type_string = (const u_char *) "wsgi";
-        app_type_string_len = sizeof("wsgi");
-        break;
-    default:
-        app_type_string = (const u_char *) "rack";
-        app_type_string_len = sizeof("rack");
-        break;
-    }
+    app_type_string = (const u_char *) passenger_get_app_type_name(context->app_type);
+    app_type_string_len = strlen((const char *) app_type_string) + 1; /* include null terminator */
     
     
     /*
@@ -472,10 +428,12 @@ create_request(ngx_http_request_t *r)
     ANALYZE_BOOLEAN_CONFIG_LENGTH("PASSENGER_SHOW_VERSION_IN_HEADER",
                                   slcf, show_version_in_header);
     ANALYZE_STR_CONFIG_LENGTH("PASSENGER_RUBY", slcf, ruby);
+    ANALYZE_STR_CONFIG_LENGTH("PASSENGER_PYTHON", slcf, python);
     len += sizeof("PASSENGER_ENV") + slcf->environment.len + 1;
     len += sizeof("PASSENGER_SPAWN_METHOD") + slcf->spawn_method.len + 1;
     len += sizeof("PASSENGER_APP_TYPE") + app_type_string_len;
     ANALYZE_STR_CONFIG_LENGTH("PASSENGER_APP_GROUP_NAME", slcf, app_group_name);
+    ANALYZE_STR_CONFIG_LENGTH("PASSENGER_APP_ROOT", slcf, app_root);
     ANALYZE_STR_CONFIG_LENGTH("PASSENGER_APP_RIGHTS", slcf, app_rights);
     ANALYZE_STR_CONFIG_LENGTH("PASSENGER_USER", slcf, user);
     ANALYZE_STR_CONFIG_LENGTH("PASSENGER_GROUP", slcf, group);
@@ -686,6 +644,8 @@ create_request(ngx_http_request_t *r)
     
     SERIALIZE_STR_CONFIG_DATA("PASSENGER_RUBY",
                               slcf, ruby);
+    SERIALIZE_STR_CONFIG_DATA("PASSENGER_PYTHON",
+                              slcf, python);
 
     b->last = ngx_copy(b->last, "PASSENGER_ENV",
                        sizeof("PASSENGER_ENV"));
@@ -699,6 +659,8 @@ create_request(ngx_http_request_t *r)
 
     SERIALIZE_STR_CONFIG_DATA("PASSENGER_APP_GROUP_NAME",
                               slcf, app_group_name);
+    SERIALIZE_STR_CONFIG_DATA("PASSENGER_APP_ROOT",
+                              slcf, app_root);
     SERIALIZE_STR_CONFIG_DATA("PASSENGER_APP_RIGHTS",
                               slcf, app_rights);
     SERIALIZE_STR_CONFIG_DATA("PASSENGER_USER",
@@ -1393,8 +1355,17 @@ passenger_content_handler(ngx_http_request_t *r)
         return passenger_static_content_handler(r, &page_cache_file);
     }
     
-    context->app_type = detect_application_type(&context->public_dir);
-    if (context->app_type == AP_NONE) {
+    if (slcf->app_root.data == NULL) {
+        context->app_type = passenger_app_type_detector_check_document_root(
+            passenger_app_type_detector,
+            (const char *) context->public_dir.data, context->public_dir.len,
+            context->base_uri.len != 0);
+    } else {
+        context->app_type = passenger_app_type_detector_check_app_root(
+            passenger_app_type_detector,
+            (const char *) slcf->app_root.data, slcf->app_root.len);
+    }
+    if (context->app_type == PAT_NONE) {
         return NGX_DECLINED;
     }
     

data/ext/nginx/ContentHandler.h

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) Igor Sysoev
  * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
- * Copyright (C) 2010 Phusion
+ * Copyright (C) 2010-2013 Phusion
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,15 +30,9 @@
 
 #include <ngx_core.h>
 #include <ngx_http.h>
+#include "../common/ApplicationPool2/AppTypes.h"
 
 
-typedef enum {
-    AP_CLASSIC_RAILS,
-    AP_RACK,
-    AP_WSGI,
-    AP_NONE
-} passenger_app_type_t;
-
 typedef struct {
     /** Proxy state. */
     ngx_uint_t  status;
@@ -46,14 +40,14 @@ typedef struct {
     u_char     *status_start;
     u_char     *status_end;
     
-    /** The backend application's 'public' directory. */
+    /** The application's 'public' directory. */
     ngx_str_t   public_dir;
     
     /** The application's base URI. Points to an empty string if none. */
     ngx_str_t   base_uri;
     
-    /** The backend application's type. */
-    passenger_app_type_t app_type;
+    /** The application's type. */
+    PassengerAppType app_type;
 } passenger_context_t;
 
 

data/ext/nginx/config

@@ -8,8 +8,14 @@ if test "x$PASSENGER_LIBS" = "x" && ! passenger-config --compiled; then
     if ! cd $ngx_addon_dir; then
         exit 1
     fi
-    if ! rake nginx CACHING=false; then
-        exit 1
+    if test "x$TRACE" = 1; then
+        if ! rake --trace nginx CACHING=false; then
+            exit 1
+        fi
+    else
+        if ! rake nginx CACHING=false; then
+            exit 1
+        fi
     fi
     cd "$old_dir"
     echo "*** Phusion Passenger support files have been successfully compiled. ***"
@@ -27,7 +33,8 @@ NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
     ${ngx_addon_dir}/ContentHandler.h \
     ${ngx_addon_dir}/StaticContentHandler.h \
     ${ngx_addon_dir}/ngx_http_passenger_module.h \
-    `passenger-config --root`/ext/common/Constants.h"
+    `passenger-config --root`/ext/common/Constants.h \
+    `passenger-config --root`/ext/common/ApplicationPool2/AppTypes.h"
 if test "x$PASSENGER_LIBS" = "x"; then
     CORE_LIBS="$CORE_LIBS `passenger-config --nginx-libs`"
 else

data/ext/nginx/ngx_http_passenger_module.c

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) Igor Sysoev
  * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
- * Copyright (C) 2010-2012 Phusion
+ * Copyright (C) 2010-2013 Phusion
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -53,6 +53,7 @@ static int               first_start = 1;
 ngx_str_t                passenger_schema_string;
 ngx_str_t                passenger_placeholder_upstream_address;
 PassengerCachedFileStat *passenger_stat_cache;
+PassengerAppTypeDetector *passenger_app_type_detector;
 AgentsStarter           *passenger_agents_starter = NULL;
 ngx_cycle_t             *passenger_current_cycle;
 
@@ -143,6 +144,10 @@ starting_helper_server_after_fork(void *arg) {
     ngx_cycle_t *cycle = (void *) arg;
     char        *log_filename;
     FILE        *log_file;
+    ngx_core_conf_t *ccf;
+    ngx_uint_t   i;
+    ngx_str_t   *envs;
+    const char  *env;
     
     /* At this point, stdout and stderr may still point to the console.
      * Make sure that they're both redirected to the log file.
@@ -178,6 +183,16 @@ starting_helper_server_after_fork(void *arg) {
         dup2(fileno(log_file), 2);
         fclose(log_file);
     }
+
+    /* Set environment variables in Nginx config file. */
+    ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+    envs = ccf->env.elts;
+    for (i = 0; i < ccf->env.nelts; i++) {
+        env = (const char *) envs[i].data;
+        if (strchr(env, '=') != NULL) {
+            putenv(strdup(env));
+        }
+    }
     
     /* Set SERVER_SOFTWARE so that application processes know what web
      * server they're running on during startup. */
@@ -231,12 +246,12 @@ start_helper_server(ngx_cycle_t *cycle) {
     char   *default_user = NULL;
     char   *default_group = NULL;
     char   *passenger_root = NULL;
+    char   *temp_dir = NULL;
     char   *analytics_log_user;
     char   *analytics_log_group;
     char   *union_station_gateway_address;
     char   *union_station_gateway_cert;
     char   *union_station_proxy_address;
-    char   *union_station_proxy_type;
     char   *error_message = NULL;
     
     core_conf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
@@ -247,12 +262,12 @@ start_helper_server(ngx_cycle_t *cycle) {
     default_user   = ngx_str_null_terminate(&passenger_main_conf.default_user);
     default_group  = ngx_str_null_terminate(&passenger_main_conf.default_group);
     passenger_root = ngx_str_null_terminate(&passenger_main_conf.root_dir);
+    temp_dir       = ngx_str_null_terminate(&passenger_main_conf.temp_dir);
     analytics_log_user = ngx_str_null_terminate(&passenger_main_conf.analytics_log_user);
     analytics_log_group = ngx_str_null_terminate(&passenger_main_conf.analytics_log_group);
     union_station_gateway_address = ngx_str_null_terminate(&passenger_main_conf.union_station_gateway_address);
     union_station_gateway_cert = ngx_str_null_terminate(&passenger_main_conf.union_station_gateway_cert);
     union_station_proxy_address = ngx_str_null_terminate(&passenger_main_conf.union_station_proxy_address);
-    union_station_proxy_type = ngx_str_null_terminate(&passenger_main_conf.union_station_proxy_type);
     
     prestart_uris = (ngx_str_t *) passenger_main_conf.prestart_uris->elts;
     prestart_uris_ary = calloc(sizeof(char *), passenger_main_conf.prestart_uris->nelts);
@@ -269,7 +284,7 @@ start_helper_server(ngx_cycle_t *cycle) {
     
     ret = agents_starter_start(passenger_agents_starter,
         passenger_main_conf.log_level, debug_log_file, getpid(),
-        "", passenger_main_conf.user_switching,
+        temp_dir, passenger_main_conf.user_switching,
         default_user, default_group,
         core_conf->user, core_conf->group,
         passenger_root, "ruby", passenger_main_conf.max_pool_size,
@@ -281,7 +296,6 @@ start_helper_server(ngx_cycle_t *cycle) {
         passenger_main_conf.union_station_gateway_port,
         union_station_gateway_cert,
         union_station_proxy_address,
-        union_station_proxy_type,
         (const char **) prestart_uris_ary, passenger_main_conf.prestart_uris->nelts,
         starting_helper_server_after_fork,
         cycle,
@@ -336,12 +350,12 @@ cleanup:
     free(default_user);
     free(default_group);
     free(passenger_root);
+    free(temp_dir);
     free(analytics_log_user);
     free(analytics_log_group);
     free(union_station_gateway_address);
     free(union_station_gateway_cert);
     free(union_station_proxy_address);
-    free(union_station_proxy_type);
     free(error_message);
     if (prestart_uris_ary != NULL) {
         for (i = 0; i < passenger_main_conf.prestart_uris->nelts; i++) {
@@ -387,6 +401,7 @@ pre_config_init(ngx_conf_t *cf)
     passenger_placeholder_upstream_address.data = (u_char *) "unix:/passenger_helper_server";
     passenger_placeholder_upstream_address.len  = sizeof("unix:/passenger_helper_server") - 1;
     passenger_stat_cache = cached_file_stat_new(1024);
+    passenger_app_type_detector = passenger_app_type_detector_new();
     passenger_agents_starter = agents_starter_new(AS_NGINX, &error_message);
     
     if (passenger_agents_starter == NULL) {

data/ext/nginx/ngx_http_passenger_module.h

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) Igor Sysoev
  * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
- * Copyright (C) 2010 Phusion
+ * Copyright (C) 2010-2013 Phusion
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,6 +31,7 @@
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include "../common/AgentsStarter.h"
+#include "../common/ApplicationPool2/AppTypes.h"
 #include "../common/Utils/CachedFileStat.h"
 
 /**
@@ -56,6 +57,8 @@ extern ngx_str_t                passenger_placeholder_upstream_address;
  */
 extern PassengerCachedFileStat *passenger_stat_cache;
 
+extern PassengerAppTypeDetector *passenger_app_type_detector;
+
 extern AgentsStarter           *passenger_agents_starter;
 
 extern ngx_cycle_t             *passenger_current_cycle;

data/ext/oxt/dynamic_thread_group.hpp

@@ -2,7 +2,7 @@
  * OXT - OS eXtensions for boosT
  * Provides important functionality necessary for writing robust server software.
  *
- * Copyright (c) 2010 Phusion
+ * Copyright (c) 2010-2013 Phusion
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -146,6 +146,14 @@ public:
 			throw;
 		}
 	}
+
+	void interrupt_all() {
+		boost::unique_lock<boost::mutex> l(lock);
+		list<thread_handle_ptr>::iterator it;
+		for (it = thread_handles.begin(); it != thread_handles.end(); it++) {
+			(*it)->thr->interrupt();
+		}
+	}
 	
 	/**
 	 * Interrupt and join all threads in this group.

data/ext/oxt/system_calls.cpp

@@ -2,7 +2,7 @@
  * OXT - OS eXtensions for boosT
  * Provides important functionality necessary for writing robust server software.
  *
- * Copyright (c) 2010 Phusion
+ * Copyright (c) 2010-2013 Phusion
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -122,7 +122,7 @@ shouldSimulateFailure() {
 			ctx->syscall_interruption_lock.unlock(); \
 		} \
 		int _my_errno; \
-		bool _intr_requested; \
+		bool _intr_requested = false; \
 		do { \
 			code; \
 			_my_errno = errno; \

data/ext/ruby/extconf.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -23,6 +23,7 @@
 require 'mkmf'
 $LIBS = ""
 $CFLAGS << " -g"
+$LIBS << " -lpthread"
 
 if RUBY_PLATFORM =~ /solaris/
 	have_library('xnet')

data/helper-scripts/backtrace-sanitizer.rb

@@ -50,6 +50,8 @@ end
 
 input = STDIN
 output = STDERR
+output.sync = true
+output.puts "Using backtrace sanitizer."
 argv0, pid_or_filename = ARGV
 if pid_or_filename =~ /\A\d+\Z/
 	begin

data/helper-scripts/wsgi-loader.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010, 2011, 2012 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -23,7 +23,6 @@
 #  THE SOFTWARE.
 
 import sys, os, re, imp, traceback, socket, select, struct, logging, errno
-from socket import _fileobject
 
 options = {}
 
@@ -73,6 +72,25 @@ def advertise_sockets(socket_filename):
 	print("!> socket: main;unix:%s;session;1" % socket_filename)
 	print("!> ")
 
+if sys.version_info[0] >= 3:
+	def reraise_exception(exc_info):
+		raise exc_info[0].with_traceback(exc_info[1], exc_info[2])
+
+	def bytes_to_str(b):
+		return b.decode()
+
+	def str_to_bytes(s):
+		return s.encode('latin-1')
+else:
+	def reraise_exception(exc_info):
+		exec("raise exc_info[0], exc_info[1], exc_info[2]")
+
+	def bytes_to_str(b):
+		return b
+
+	def str_to_bytes(s):
+		return s
+
 
 class RequestHandler:
 	def __init__(self, server_socket, owner_pipe, app):
@@ -98,12 +116,19 @@ class RequestHandler:
 								self.process_request(env, input_stream, client)
 					except KeyboardInterrupt:
 						done = True
-					except IOError, e:
+					except IOError:
+						e = sys.exc_info()[1]
 						if not getattr(e, 'passenger', False) or e.errno != errno.EPIPE:
 							logging.exception("WSGI application raised an I/O exception!")
-					except Exception, e:
+					except Exception:
 						logging.exception("WSGI application raised an exception!")
 				finally:
+					try:
+						# Shutdown the socket like this just in case the app
+						# spawned a child process that keeps it open.
+						client.shutdown(socket.SHUT_WR)
+					except:
+						pass
 					try:
 						client.close()
 					except:
@@ -119,7 +144,7 @@ class RequestHandler:
 			return (None, None)
 	
 	def parse_request(self, client):
-		buf = ''
+		buf = b''
 		while len(buf) < 4:
 			tmp = client.recv(4 - len(buf))
 			if len(tmp) == 0:
@@ -127,35 +152,42 @@ class RequestHandler:
 			buf += tmp
 		header_size = struct.unpack('>I', buf)[0]
 		
-		buf = ''
+		buf = b''
 		while len(buf) < header_size:
 			tmp = client.recv(header_size - len(buf))
 			if len(tmp) == 0:
 				return (None, None)
 			buf += tmp
 		
-		headers = buf.split("\0")
+		headers = buf.split(b"\0")
 		headers.pop() # Remove trailing "\0"
 		env = {}
 		i = 0
 		while i < len(headers):
-			env[headers[i]] = headers[i + 1]
+			env[bytes_to_str(headers[i])] = bytes_to_str(headers[i + 1])
 			i += 2
-		
+
 		return (env, client)
 	
+	if hasattr(socket, '_fileobject'):
+		def wrap_input_socket(self, sock):
+			return socket._fileobject(sock, 'r', 512)
+	else:
+		def wrap_input_socket(self, sock):
+			return socket.socket.makefile(sock, 'r', 512)
+
 	def process_request(self, env, input_stream, output_stream):
-		# The WSGI speculation says that the input paramter object passed needs to
+		# The WSGI speculation says that the input parameter object passed needs to
 		# implement a few file-like methods. This is the reason why we "wrap" the socket._socket
 		# into the _fileobject to solve this.
 		#
 		# Otherwise, the POST data won't be correctly retrieved by Django.
 		#
 		# See: http://www.python.org/dev/peps/pep-0333/#input-and-error-streams
-		env['wsgi.input']		 = _fileobject(input_stream, 'r', 512)
-		env['wsgi.errors']		 = sys.stderr
-		env['wsgi.version']		 = (1, 0)
-		env['wsgi.multithread']	 = False
+		env['wsgi.input']        = self.wrap_input_socket(input_stream)
+		env['wsgi.errors']       = sys.stderr
+		env['wsgi.version']      = (1, 0)
+		env['wsgi.multithread']  = False
 		env['wsgi.multiprocess'] = True
 		env['wsgi.run_once']	 = True
 		if env.get('HTTPS','off') in ('on', '1', 'true', 'yes'):
@@ -173,14 +205,15 @@ class RequestHandler:
 				elif not headers_sent:
 					# Before the first output, send the stored headers.
 					status, response_headers = headers_sent[:] = headers_set
-					output_stream.sendall('Status: %s\r\n' % status)
+					output_stream.sendall(str_to_bytes('Status: %s\r\n' % status))
 					for header in response_headers:
-						output_stream.sendall('%s: %s\r\n' % header)
-					output_stream.sendall('\r\n')
+						output_stream.sendall(str_to_bytes('%s: %s\r\n' % header))
+					output_stream.sendall(b'\r\n')
 				output_stream.sendall(data)
-			except IOError, e:
+			except IOError:
 				# Mark this exception as coming from the Phusion Passenger
 				# socket and not some other socket.
+				e = sys.exc_info()[1]
 				setattr(e, 'passenger', True)
 				raise e
 		
@@ -189,7 +222,7 @@ class RequestHandler:
 				try:
 					if headers_sent:
 						# Re-raise original exception if headers sent.
-						raise exc_info[0], exc_info[1], exc_info[2]
+						reraise_exception(exc_info)
 				finally:
 					# Avoid dangling circular ref.
 					exc_info = None
@@ -207,13 +240,13 @@ class RequestHandler:
 					write(data)
 			if not headers_sent:
 				# Send headers now if body was empty.
-				write('')
+				write(b'')
 		finally:
 			if hasattr(result, 'close'):
 				result.close()
 	
 	def process_ping(self, env, input_stream, output_stream):
-		output_stream.sendall("pong")
+		output_stream.sendall(b"pong")
 
 
 if __name__ == "__main__":