passenger 3.0.9 → 3.0.10

data/ext/nginx/Configuration.c

@@ -307,6 +307,7 @@ passenger_create_loc_conf(ngx_conf_t *cf)
     conf->base_uris = NGX_CONF_UNSET_PTR;
     conf->union_station_filters = NGX_CONF_UNSET_PTR;
     conf->min_instances = NGX_CONF_UNSET;
+    conf->max_requests = NGX_CONF_UNSET;
     conf->framework_spawner_idle_time = NGX_CONF_UNSET;
     conf->app_spawner_idle_time = NGX_CONF_UNSET;
 
@@ -361,6 +362,8 @@ passenger_create_loc_conf(ngx_conf_t *cf)
     DEFINE_VAR_TO_PASS("SERVER_ADDR",     "$server_addr");
     DEFINE_VAR_TO_PASS("SERVER_PORT",     "$server_port");
 
+    ngx_str_set(&conf->upstream_config.module, "passenger");
+
     return conf;
 }
 
@@ -398,6 +401,7 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_str_value(conf->app_group_name, prev->app_group_name, NULL);
     ngx_conf_merge_str_value(conf->app_rights, prev->app_rights, NULL);
     ngx_conf_merge_value(conf->min_instances, prev->min_instances, (ngx_int_t) -1);
+    ngx_conf_merge_value(conf->max_requests, prev->max_requests, (ngx_int_t) -1);
     ngx_conf_merge_value(conf->framework_spawner_idle_time, prev->framework_spawner_idle_time, (ngx_int_t) -1);
     ngx_conf_merge_value(conf->app_spawner_idle_time, prev->app_spawner_idle_time, (ngx_int_t) -1);
     
@@ -584,6 +588,57 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                               prev->upstream_config.temp_path,
                               &ngx_http_proxy_temp_path);
 
+#if (NGX_HTTP_CACHE)
+
+    ngx_conf_merge_ptr_value(conf->upstream_config.cache,
+                             prev->upstream_config.cache, NULL);
+
+    if (conf->upstream_config.cache && conf->upstream_config.cache->data == NULL) {
+        ngx_shm_zone_t  *shm_zone;
+
+        shm_zone = conf->upstream_config.cache;
+
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "\"scgi_cache\" zone \"%V\" is unknown",
+                           &shm_zone->shm.name);
+
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_conf_merge_uint_value(conf->upstream_config.cache_min_uses,
+                              prev->upstream_config.cache_min_uses, 1);
+
+    ngx_conf_merge_bitmask_value(conf->upstream_config.cache_use_stale,
+                              prev->upstream_config.cache_use_stale,
+                              (NGX_CONF_BITMASK_SET
+                               | NGX_HTTP_UPSTREAM_FT_OFF));
+
+    if (conf->upstream_config.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) {
+        conf->upstream_config.cache_use_stale = NGX_CONF_BITMASK_SET
+                                                | NGX_HTTP_UPSTREAM_FT_OFF;
+    }
+
+    if (conf->upstream_config.cache_methods == 0) {
+        conf->upstream_config.cache_methods = prev->upstream_config.cache_methods;
+    }
+
+    conf->upstream_config.cache_methods |= NGX_HTTP_GET | NGX_HTTP_HEAD;
+
+    ngx_conf_merge_ptr_value(conf->upstream_config.cache_bypass,
+                             prev->upstream_config.cache_bypass, NULL);
+
+    ngx_conf_merge_ptr_value(conf->upstream_config.no_cache,
+                             prev->upstream_config.no_cache, NULL);
+
+    ngx_conf_merge_ptr_value(conf->upstream_config.cache_valid,
+                             prev->upstream_config.cache_valid, NULL);
+
+    if (conf->cache_key.value.data == NULL) {
+        conf->cache_key = prev->cache_key;
+    }
+
+#endif
+
     ngx_conf_merge_value(conf->upstream_config.pass_request_headers,
                          prev->upstream_config.pass_request_headers, 1);
     ngx_conf_merge_value(conf->upstream_config.pass_request_body,
@@ -1040,6 +1095,13 @@ const ngx_command_t passenger_commands[] = {
       offsetof(passenger_loc_conf_t, min_instances),
       NULL },
 
+    { ngx_string("passenger_max_requests"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(passenger_loc_conf_t, max_requests),
+      NULL },
+
     { ngx_string("passenger_max_instances_per_app"),
       NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
       ngx_conf_set_num_slot,

data/ext/nginx/Configuration.h

@@ -52,12 +52,17 @@ typedef struct {
     ngx_str_t    app_group_name;
     ngx_str_t    app_rights;
     ngx_int_t    min_instances;
+    ngx_int_t    max_requests;
     ngx_int_t    framework_spawner_idle_time;
     ngx_int_t    app_spawner_idle_time;
     ngx_str_t    union_station_key;
     ngx_array_t *base_uris;
     ngx_array_t *union_station_filters;
 
+#if (NGX_HTTP_CACHE)
+    ngx_http_complex_value_t cache_key;
+#endif
+
     /************************************/
 } passenger_loc_conf_t;
 

data/ext/nginx/ContentHandler.c

@@ -223,11 +223,7 @@ find_base_uri(ngx_http_request_t *r, const passenger_loc_conf_t *loc,
 static void
 set_upstream_server_address(ngx_http_upstream_t *upstream, ngx_http_upstream_conf_t *upstream_config) {
     ngx_http_upstream_server_t *servers = upstream_config->upstream->servers->elts;
-    #if NGINX_VERSION_NUM >= 8000
-        ngx_addr_t             *address = &servers[0].addrs[0];
-    #else
-        ngx_peer_addr_t        *address = &servers[0].addrs[0];
-    #endif
+    ngx_addr_t                 *address = &servers[0].addrs[0];
     const char                 *request_socket_filename;
     unsigned int                request_socket_filename_len;
     struct sockaddr_un         *sockaddr;
@@ -311,6 +307,31 @@ set_upstream_server_address(ngx_http_upstream_t *upstream, ngx_http_upstream_con
     } while (0)
 
 
+#if (NGX_HTTP_CACHE)
+
+static ngx_int_t
+create_key(ngx_http_request_t *r)
+{
+    ngx_str_t            *key;
+    passenger_loc_conf_t *slcf;
+
+    key = ngx_array_push(&r->cache->keys);
+    if (key == NULL) {
+        return NGX_ERROR;
+    }
+
+    slcf = ngx_http_get_module_loc_conf(r, ngx_http_passenger_module);
+
+    if (ngx_http_complex_value(r, &slcf->cache_key, key) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+#endif
+
+
 static ngx_int_t
 create_request(ngx_http_request_t *r)
 {
@@ -325,6 +346,7 @@ create_request(ngx_http_request_t *r)
     ngx_str_t                      escaped_uri;
     ngx_str_t                     *union_station_filters = NULL;
     u_char                         min_instances_string[12];
+    u_char                         max_requests_string[12];
     u_char                         framework_spawner_idle_time_string[12];
     u_char                         app_spawner_idle_time_string[12];
     u_char                        *end;
@@ -338,7 +360,6 @@ create_request(ngx_http_request_t *r)
     ngx_http_script_engine_t       e, le;
     ngx_http_core_srv_conf_t      *cscf;
     passenger_loc_conf_t          *slcf;
-    passenger_main_conf_t         *main_conf;
     passenger_context_t           *context;
     ngx_http_script_len_code_pt    lcode;
     #if (NGX_HTTP_SSL)
@@ -347,7 +368,6 @@ create_request(ngx_http_request_t *r)
     
     cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
     slcf = ngx_http_get_module_loc_conf(r, ngx_http_passenger_module);
-    main_conf = &passenger_main_conf;
     context = ngx_http_get_module_ctx(r, ngx_http_passenger_module);
     if (context == NULL) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
@@ -469,6 +489,14 @@ create_request(ngx_http_request_t *r)
     *end = '\0';
     len += sizeof("PASSENGER_MIN_INSTANCES") +
            ngx_strlen(min_instances_string) + 1;
+
+    end = ngx_snprintf(max_requests_string,
+                       sizeof(max_requests_string) - 1,
+                       "%d",
+                       (slcf->max_requests == (ngx_int_t) -1) ? 0 : slcf->max_requests);
+    *end = '\0';
+    len += sizeof("PASSENGER_MAX_REQUESTS") +
+           ngx_strlen(max_requests_string) + 1;
     
     end = ngx_snprintf(framework_spawner_idle_time_string,
                        sizeof(framework_spawner_idle_time_string) - 1,
@@ -725,6 +753,11 @@ create_request(ngx_http_request_t *r)
     b->last = ngx_copy(b->last, min_instances_string,
                        ngx_strlen(min_instances_string) + 1);
 
+    b->last = ngx_copy(b->last, "PASSENGER_MAX_REQUESTS",
+                       sizeof("PASSENGER_MAX_REQUESTS"));
+    b->last = ngx_copy(b->last, max_requests_string,
+                       ngx_strlen(max_requests_string) + 1);
+
     b->last = ngx_copy(b->last, "PASSENGER_FRAMEWORK_SPAWNER_IDLE_TIME",
                        sizeof("PASSENGER_FRAMEWORK_SPAWNER_IDLE_TIME"));
     b->last = ngx_copy(b->last, framework_spawner_idle_time_string,
@@ -1396,24 +1429,19 @@ passenger_content_handler(ngx_http_request_t *r)
     
     /* Setup upstream stuff and prepare sending the request to the backend. */
     
-    u = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_t));
-    if (u == NULL) {
+    if (ngx_http_upstream_create(r) != NGX_OK) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
+    u = r->upstream;
     
     u->schema = passenger_schema_string;
-
-    u->peer.log = r->connection->log;
-    u->peer.log_error = NGX_ERROR_ERR;
-#if (NGX_THREADS)
-    u->peer.lock = &r->connection->lock;
-#endif
-
     u->output.tag = (ngx_buf_tag_t) &ngx_http_passenger_module;
-
     set_upstream_server_address(u, &slcf->upstream_config);
     u->conf = &slcf->upstream_config;
 
+#if (NGX_HTTP_CACHE)
+    u->create_key       = create_key;
+#endif
     u->create_request   = create_request;
     u->reinit_request   = reinit_request;
     u->process_header   = process_status_line;
@@ -1428,8 +1456,7 @@ passenger_content_handler(ngx_http_request_t *r)
     }
 
     u->pipe->input_filter = ngx_event_pipe_copy_input_filter;
-
-    r->upstream = u;
+    u->pipe->input_ctx = r;
 
     rc = ngx_http_read_client_request_body(r, ngx_http_upstream_init);
 

data/ext/nginx/HelperAgent.cpp

@@ -60,6 +60,8 @@
 #include "Exceptions.h"
 #include "Utils.h"
 #include "Utils/Timer.h"
+#include <Utils/IOUtils.h>
+#include <Utils/MessageIO.h>
 #include <Utils/Dechunker.h>
 #include <Utils/HttpHeaderBufferer.h>
 #include <Utils/StreamBoyerMooreHorspool.h>
@@ -452,10 +454,9 @@ private:
 	 */
 	bool readAndCheckPassword(FileDescriptor &fd) {
 		TRACE_POINT();
-		MessageChannel channel(fd);
 		char buf[REQUEST_SOCKET_PASSWORD_SIZE];
 		
-		if (channel.readRaw(buf, sizeof(buf))) {
+		if (readExact(fd, buf, sizeof(buf)) == sizeof(buf)) {
 			const char *password_data;
 			
 			password_data = const_cast<const string &>(password).c_str();
@@ -818,6 +819,7 @@ private:
 				parser.getHeader("PASSENGER_APP_RIGHTS"),
 				DEFAULT_BACKEND_ACCOUNT_RIGHTS);
 			options.minProcesses   = atol(parser.getHeader("PASSENGER_MIN_INSTANCES"));
+			options.maxRequests    = atol(parser.getHeader("PASSENGER_MAX_REQUESTS"));
 			options.frameworkSpawnerTimeout = atol(parser.getHeader("PASSENGER_FRAMEWORK_SPAWNER_IDLE_TIME"));
 			options.appSpawnerTimeout       = atol(parser.getHeader("PASSENGER_APP_SPAWNER_IDLE_TIME"));
 			options.debugger       = parser.getHeader("PASSENGER_DEBUGGER") == "true";
@@ -1043,7 +1045,6 @@ private:
 	unsigned int numberOfThreads;
 	FileDescriptor requestSocket;
 	string requestSocketPassword;
-	MessageChannel feedbackChannel;
 	ServerInstanceDir serverInstanceDir;
 	ServerInstanceDir::GenerationPtr generation;
 	set<ClientPtr> clients;
@@ -1175,7 +1176,6 @@ public:
 		this->userSwitching = userSwitching;
 		this->defaultUser   = defaultUser;
 		this->defaultGroup  = defaultGroup;
-		feedbackChannel     = MessageChannel(feedbackFd);
 		numberOfThreads     = maxPoolSize * 4;
 		
 		sbmh_init(NULL, &statusFinder_occ,
@@ -1220,7 +1220,8 @@ public:
 		messageServer->addHandler(ptr(new ExitHandler(exitEvent)));
 		
 		UPDATE_TRACE_POINT();
-		feedbackChannel.write("initialized",
+		writeArrayMessage(feedbackFd,
+			"initialized",
 			getRequestSocketFilename().c_str(),
 			messageServer->getSocketFilename().c_str(),
 			NULL);

data/ext/nginx/config

@@ -13,18 +13,6 @@ if ! test -f "$ngx_addon_dir/../common/libpassenger_common.a" || \
     echo "*** Phusion Passenger support files have been successfully compiled. ***"
 fi
 
-ngx_feature="Math library"
-ngx_feature_name=
-ngx_feature_run=no
-ngx_feature_incs="#include <math.h>"
-ngx_feature_path=
-ngx_feature_libs="-lm"
-ngx_feature_test="pow(1, 2)"
-. auto/feature
-if [ $ngx_found = yes ]; then
-    CORE_LIBS="$CORE_LIBS -lm"
-fi
-
 ngx_addon_name=ngx_http_passenger_module
 HTTP_MODULES="$HTTP_MODULES ngx_http_passenger_module"
 NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
@@ -43,6 +31,18 @@ CORE_LIBS="$CORE_LIBS  \
     ${ngx_addon_dir}/../common/libboost_oxt.a \
     -lstdc++ -lpthread"
 
+ngx_feature="Math library"
+ngx_feature_name=
+ngx_feature_run=no
+ngx_feature_incs="#include <math.h>"
+ngx_feature_path=
+ngx_feature_libs="-lm"
+ngx_feature_test="pow(1, 2)"
+. auto/feature
+if [ $ngx_found = yes ]; then
+    CORE_LIBS="$CORE_LIBS -lm"
+fi
+
 nginx_version=`grep 'NGINX_VERSION ' src/core/nginx.h | awk '{ print $3 }' | sed 's/"//g'`
 
 nginx_major_version=`echo "$nginx_version" | cut -d . -f 1`

data/ext/oxt/system_calls.cpp

@@ -410,7 +410,16 @@ syscalls::nanosleep(const struct timespec *req, struct timespec *rem) {
 	do {
 		ret = ::nanosleep(&req2, &rem2);
 		e = errno;
-		req2 = rem2;
+		// nanosleep() on some systems is sometimes buggy. rem2
+		// could end up containing a tv_sec with a value near 2^32-1,
+		// probably because of integer wrapping bugs in the kernel.
+		// So we check for those.
+		if (rem2.tv_sec < req->tv_sec) {
+			req2 = rem2;
+		} else {
+			req2.tv_sec = 0;
+			req2.tv_nsec = 0;
+		}
 	} while (ret == -1 && e == EINTR && !this_thread::syscalls_interruptable());
 	if (ret == -1 && e == EINTR && this_thread::syscalls_interruptable()) {
 		throw thread_interrupted();

data/ext/ruby/extconf.rb

@@ -35,7 +35,6 @@ end
 
 have_header('alloca.h')
 have_header('ruby/io.h')
-have_func('rb_reserved_fd_p')
 
 with_cflags($CFLAGS) do
 	create_makefile('passenger_native_support')

data/ext/ruby/passenger_native_support.c

@@ -276,8 +276,8 @@ close_all_file_descriptors(VALUE self, VALUE exceptions) {
 	
 	for (i = sysconf(_SC_OPEN_MAX) - 1; i >= 0; i--) {
 		int is_exception = 0;
-		#ifdef HAVE_RB_RESERVED_FD_P
-			is_exception = rb_reserved_fd_p(i);
+		#ifdef RB_RESERVED_FD_P
+			is_exception = rb_reserved_fd_p((int) i);
 		#endif
 		for (j = 0; j < RARRAY_LEN(exceptions) && !is_exception; j++) {
 			long fd = NUM2INT(rb_ary_entry(exceptions, j));

data/helper-scripts/prespawn

@@ -102,7 +102,7 @@ class TCPPrespawnLocation < PrespawnLocation
 	end
 
 	def connect
-		TCPSocket.new(request_host, request_port)
+		TCPSocket.new('127.0.0.1', request_port)
 	end
 end
 

data/lib/phusion_passenger.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010, 2011 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -25,9 +25,9 @@ module PhusionPassenger
 	###### Version numbers ######
 	
 	# Phusion Passenger version number. Don't forget to edit ext/common/Constants.h too.
-	VERSION_STRING = '3.0.9'
+	VERSION_STRING = '3.0.10'
 	
-	PREFERRED_NGINX_VERSION = '1.0.6'
+	PREFERRED_NGINX_VERSION = '1.0.10'
 	PREFERRED_PCRE_VERSION  = '8.12'
 	STANDALONE_INTERFACE_VERSION  = 1
 	
@@ -108,7 +108,7 @@ module PhusionPassenger
 	STANDALONE_BINARIES_URL_ROOT  = "http://standalone-binaries.modrails.com"
 	
 	
-	if $LOAD_PATH.first != LIBDIR
+	if !$LOAD_PATH.include?(LIBDIR)
 		$LOAD_PATH.unshift(LIBDIR)
 		$LOAD_PATH.uniq!
 	end

data/lib/phusion_passenger/classic_rails/application_spawner.rb

@@ -172,7 +172,7 @@ protected
 	# Overrided method.
 	def initialize_server # :nodoc:
 		report_app_init_status(MessageChannel.new(@owner_socket)) do
-			$0 = "Passenger ApplicationSpawner: #{@app_root}"
+			$0 = "Passenger ApplicationSpawner: #{@options['app_group_name']}"
 			prepare_app_process('config/environment.rb', @options)
 			if defined?(RAILS_ENV)
 				Object.send(:remove_const, :RAILS_ENV)
@@ -299,7 +299,7 @@ private
 	# used).
 	def self.start_request_handler(channel, forked, options)
 		app_root = options["app_root"]
-		$0 = "Rails: #{app_root}"
+		$0 = "Rails: #{options['app_group_name']}"
 		reader, writer = IO.pipe
 		begin
 			reader.close_on_exec!

data/lib/phusion_passenger/dependencies.rb

@@ -224,7 +224,12 @@ module Dependencies # :nodoc: all
 			require 'rbconfig'
 			begin
 				require 'mkmf'
-				header_dir = Config::CONFIG['rubyhdrdir'] || Config::CONFIG['archdir']
+				if defined?(::RbConfig)
+					config = ::RbConfig::CONFIG
+				else
+					config = ::Config::CONFIG
+				end
+				header_dir = config['rubyhdrdir'] || config['archdir']
 				result.found(File.exist?("#{header_dir}/ruby.h"))
 			rescue LoadError, SystemExit
 				# On RedHat/Fedora/CentOS, if ruby-devel is not installed then