passenger 3.0.12 → 3.0.13

data/ext/boost/config/stdlib/libstdcpp3.hpp

@@ -31,7 +31,8 @@
 
 #ifdef __GLIBCXX__ // gcc 3.4 and greater:
 #  if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
-        || defined(_GLIBCXX__PTHREADS)
+        || defined(_GLIBCXX__PTHREADS) \
+        || defined(_GLIBCXX_HAS_GTHREADS)
       //
       // If the std lib has thread support turned on, then turn it on in Boost
       // as well.  We do this because some gcc-3.4 std lib headers define _REENTANT

data/ext/boost/exception/detail/error_info_impl.hpp

@@ -30,7 +30,7 @@ boost
 
             protected:
 
-            ~error_info_base() throw()
+            virtual ~error_info_base() throw()
                 {
                 }
             };

data/ext/common/AgentBase.cpp

@@ -188,8 +188,12 @@ appendSignalReason(char *buf, siginfo_t *info) {
 		switch (info->si_signo) {
 		case SIGSEGV:
 			switch (info->si_code) {
-			SI_CODE_HANDLER(SEGV_MAPERR);
-			SI_CODE_HANDLER(SEGV_ACCERR);
+			#ifdef SEGV_MAPERR
+				SI_CODE_HANDLER(SEGV_MAPERR);
+			#endif
+			#ifdef SEGV_ACCERR
+				SI_CODE_HANDLER(SEGV_ACCERR);
+			#endif
 			default:
 				handled = false;
 				break;
@@ -197,9 +201,15 @@ appendSignalReason(char *buf, siginfo_t *info) {
 			break;
 		case SIGBUS:
 			switch (info->si_code) {
-			SI_CODE_HANDLER(BUS_ADRALN);
-			SI_CODE_HANDLER(BUS_ADRERR);
-			SI_CODE_HANDLER(BUS_OBJERR);
+			#ifdef BUS_ADRALN
+				SI_CODE_HANDLER(BUS_ADRALN);
+			#endif
+			#ifdef BUS_ADRERR
+				SI_CODE_HANDLER(BUS_ADRERR);
+			#endif
+			#ifdef BUS_OBJERR
+				SI_CODE_HANDLER(BUS_OBJERR);
+			#endif
 			default:
 				handled = false;
 				break;

data/ext/common/Constants.h

@@ -26,7 +26,7 @@
 #define _PASSENGER_CONSTANTS_H_
 
 /* Don't forget to update lib/phusion_passenger.rb too. */
-#define PASSENGER_VERSION "3.0.12"
+#define PASSENGER_VERSION "3.0.13"
 
 #define FEEDBACK_FD 3
 

data/ext/common/EventedMessageServer.h

@@ -29,7 +29,7 @@
 #include <ev++.h>
 #include <cstdarg>
 #include <cstdlib>
-#ifdef HAS_ALLOCA_H_
+#ifdef HAS_ALLOCA_H
 	#include <alloca.h>
 #endif
 #include "EventedServer.h"

data/ext/common/StaticString.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - http://www.modrails.com/
- *  Copyright (c) 2010 Phusion
+ *  Copyright (c) 2010, 2011, 2012 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -25,6 +25,7 @@
 #ifndef _PASSENGER_STATIC_STRING_H_
 #define _PASSENGER_STATIC_STRING_H_
 
+#include <sys/types.h>
 #include <string>
 #include <cstring>
 #include <cstddef>

data/ext/common/Watchdog.cpp

@@ -740,7 +740,7 @@ private:
 				_exit(1);
 			} else if (pid == -1) {
 				// Error
-				P_WARN("Could touch the server instance directory because "
+				P_WARN("Could not touch the server instance directory because "
 					"fork() failed. Retrying in 2 minutes...");
 				this_thread::restore_interruption si(di);
 				this_thread::restore_syscall_interruption rsi(dsi);
@@ -975,7 +975,7 @@ cleanupAgentsInBackground(vector<AgentWatcher *> &watchers) {
 	} else if (pid == -1) {
 		// Error
 		e = errno;
-		throw SystemException("fork() failed", errno);
+		throw SystemException("fork() failed", e);
 		
 	} else {
 		// Parent

data/ext/libev/config.h

@@ -0,0 +1,122 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the `clock_gettime' function. */
+/* #undef HAVE_CLOCK_GETTIME */
+
+/* "use syscall interface for clock_gettime" */
+/* #undef HAVE_CLOCK_SYSCALL */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the `epoll_ctl' function. */
+/* #undef HAVE_EPOLL_CTL */
+
+/* Define to 1 if you have the `eventfd' function. */
+/* #undef HAVE_EVENTFD */
+
+/* Define to 1 if you have the `inotify_init' function. */
+/* #undef HAVE_INOTIFY_INIT */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `kqueue' function. */
+#define HAVE_KQUEUE 1
+
+/* Define to 1 if you have the `m' library (-lm). */
+#define HAVE_LIBM 1
+
+/* Define to 1 if you have the `rt' library (-lrt). */
+/* #undef HAVE_LIBRT */
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `nanosleep' function. */
+/* #undef HAVE_NANOSLEEP */
+
+/* Define to 1 if you have the `poll' function. */
+#define HAVE_POLL 1
+
+/* Define to 1 if you have the <poll.h> header file. */
+#define HAVE_POLL_H 1
+
+/* Define to 1 if you have the `port_create' function. */
+/* #undef HAVE_PORT_CREATE */
+
+/* Define to 1 if you have the <port.h> header file. */
+/* #undef HAVE_PORT_H */
+
+/* Define to 1 if you have the `select' function. */
+#define HAVE_SELECT 1
+
+/* Define to 1 if you have the `signalfd' function. */
+/* #undef HAVE_SIGNALFD */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/epoll.h> header file. */
+/* #undef HAVE_SYS_EPOLL_H */
+
+/* Define to 1 if you have the <sys/eventfd.h> header file. */
+/* #undef HAVE_SYS_EVENTFD_H */
+
+/* Define to 1 if you have the <sys/event.h> header file. */
+#define HAVE_SYS_EVENT_H 1
+
+/* Define to 1 if you have the <sys/inotify.h> header file. */
+/* #undef HAVE_SYS_INOTIFY_H */
+
+/* Define to 1 if you have the <sys/queue.h> header file. */
+#define HAVE_SYS_QUEUE_H 1
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#define HAVE_SYS_SELECT_H 1
+
+/* Define to 1 if you have the <sys/signalfd.h> header file. */
+/* #undef HAVE_SYS_SIGNALFD_H */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Name of package */
+#define PACKAGE "libev"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "3.9"

data/ext/nginx/Configuration.c

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) Igor Sysoev
  * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
- * Copyright (C) 2010 Phusion
+ * Copyright (C) 2010, 2011, 2012 Phusion
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -335,6 +335,14 @@ passenger_create_loc_conf(ngx_conf_t *cf)
     conf->upstream_config.pass_request_headers = NGX_CONF_UNSET;
     conf->upstream_config.pass_request_body = NGX_CONF_UNSET;
 
+#if (NGX_HTTP_CACHE)
+    conf->upstream_config.cache = NGX_CONF_UNSET_PTR;
+    conf->upstream_config.cache_min_uses = NGX_CONF_UNSET_UINT;
+    conf->upstream_config.cache_bypass = NGX_CONF_UNSET_PTR;
+    conf->upstream_config.no_cache = NGX_CONF_UNSET_PTR;
+    conf->upstream_config.cache_valid = NGX_CONF_UNSET_PTR;
+#endif
+
     conf->upstream_config.intercept_errors = NGX_CONF_UNSET;
 
     conf->upstream_config.cyclic_temp_file = 0;
@@ -511,8 +519,8 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
     if (conf->upstream_config.busy_buffers_size < size) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-             "\"passenger_busy_buffers_size\" must be equal or bigger than "
-             "maximum of the value of \"passenger_buffer_size\" and "
+             "\"passenger_busy_buffers_size\" must be equal to or greater "
+             "than the maximum of the value of \"passenger_buffer_size\" and "
              "one of the \"passenger_buffers\"");
 
         return NGX_CONF_ERROR;
@@ -542,8 +550,8 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
     if (conf->upstream_config.temp_file_write_size < size) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-             "\"passenger_temp_file_write_size\" must be equal or bigger than "
-             "maximum of the value of \"passenger_buffer_size\" and "
+             "\"passenger_temp_file_write_size\" must be equal to or greater than "
+             "the maximum of the value of \"passenger_buffer_size\" and "
              "one of the \"passenger_buffers\"");
 
         return NGX_CONF_ERROR;
@@ -566,8 +574,8 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
              "\"passenger_max_temp_file_size\" must be equal to zero to disable "
-             "the temporary files usage or must be equal or bigger than "
-             "maximum of the value of \"passenger_buffer_size\" and "
+             "temporary files usage or must be equal to or greater than "
+             "the maximum of the value of \"passenger_buffer_size\" and "
              "one of the \"passenger_buffers\"");
 
         return NGX_CONF_ERROR;
@@ -639,6 +647,14 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
         conf->cache_key = prev->cache_key;
     }
 
+    #if NGINX_VERSION_NUM >= 1002000
+    ngx_conf_merge_value(conf->upstream_config.cache_lock,
+                         prev->upstream_config.cache_lock, 0);
+
+    ngx_conf_merge_msec_value(conf->upstream_config.cache_lock_timeout,
+                              prev->upstream_config.cache_lock_timeout, 5000);
+    #endif
+
 #endif
 
     ngx_conf_merge_value(conf->upstream_config.pass_request_headers,
@@ -1273,7 +1289,7 @@ const ngx_command_t passenger_commands[] = {
       NULL },
 
     { ngx_string("passenger_pass_header"),
-      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
       ngx_conf_set_str_array_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
       offsetof(passenger_loc_conf_t, upstream_config.pass_headers),

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 Phusion
+ * Copyright (C) 2010, 2011, 2012 Phusion
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -387,8 +387,8 @@ create_request(ngx_http_request_t *r)
         app_type_string_len = sizeof("wsgi");
         break;
     default:
-        app_type_string = (const u_char *) "rails";
-        app_type_string_len = sizeof("rails");
+        app_type_string = (const u_char *) "rack";
+        app_type_string_len = sizeof("rack");
         break;
     }
     
@@ -931,7 +931,7 @@ process_status_line(ngx_http_request_t *r)
     context = ngx_http_get_module_ctx(r, ngx_http_passenger_module);
 
     if (context == NULL) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        return NGX_ERROR;
     }
 
     rc = parse_status_line(r, context);
@@ -952,7 +952,6 @@ process_status_line(ngx_http_request_t *r)
         }
 #endif
 
-        r->http_version = NGX_HTTP_VERSION_9;
         u->headers_in.status_n = NGX_HTTP_OK;
         u->state->status = NGX_HTTP_OK;
 
@@ -966,7 +965,7 @@ process_status_line(ngx_http_request_t *r)
     u->headers_in.status_line.data = ngx_palloc(r->pool,
                                                 u->headers_in.status_line.len);
     if (u->headers_in.status_line.data == NULL) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        return NGX_ERROR;
     }
 
     ngx_memcpy(u->headers_in.status_line.data, context->status_start,

data/lib/phusion_passenger.rb

@@ -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.12'
+	VERSION_STRING = '3.0.13'
 	
-	PREFERRED_NGINX_VERSION = '1.0.15'
+	PREFERRED_NGINX_VERSION = '1.2.1'
 	PREFERRED_PCRE_VERSION  = '8.30'
 	STANDALONE_INTERFACE_VERSION  = 1
 	

data/lib/phusion_passenger/abstract_request_handler.rb

@@ -331,14 +331,17 @@ class AbstractRequestHandler
 	# May only be called while the main loop is running. May be called
 	# from any thread.
 	def soft_shutdown
-		@select_timeout = @soft_termination_linger_time
-		@graceful_termination_pipe[1].close rescue nil
-		if @detach_key && @pool_account_username && @pool_account_password
-			client = MessageClient.new(@pool_account_username, @pool_account_password)
-			begin
-				client.detach(@detach_key)
-			ensure
-				client.close
+		unless @soft_terminated
+			@soft_terminated = true
+			@select_timeout = @soft_termination_linger_time
+			@graceful_termination_pipe[1].close rescue nil
+			if @detach_key && @pool_account_username && @pool_account_password
+				client = MessageClient.new(@pool_account_username, @pool_account_password)
+				begin
+					client.detach(@detach_key)
+				ensure
+					client.close
+				end
 			end
 		end
 	end

data/lib/phusion_passenger/dependencies.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010, 2011, 2012 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -29,7 +29,6 @@ require 'phusion_passenger/platform_info/apache'
 require 'phusion_passenger/platform_info/ruby'
 require 'phusion_passenger/platform_info/linux'
 require 'phusion_passenger/platform_info/curl'
-require 'phusion_passenger/platform_info/documentation_tools'
 
 module PhusionPassenger
 
@@ -110,9 +109,9 @@ module Dependencies # :nodoc: all
 		return (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby") && RUBY_VERSION < "1.8.7"
 	end
 	
-	# Returns whether asciidoc is required in order to be able to package all files
+	# Returns whether Mizuho is required in order to be able to package all files
 	# in the packaging list.
-	def self.asciidoc_required?
+	def self.mizuho_required?
 		return Packaging::ASCII_DOCS.any? do |fn|
 			!File.exist?("#{SOURCE_ROOT}/#{fn}")
 		end
@@ -579,7 +578,7 @@ module Dependencies # :nodoc: all
 	end
 	
 	Daemon_Controller = Dependency.new do |dep|
-		dep.name = "daemon_controller >= 0.2.5"
+		dep.name = "daemon_controller >= 1.0.0"
 		dep.install_instructions = "Please install RubyGems first, then run " <<
 			"<b>#{PlatformInfo.gem_command || "gem"} install daemon_controller</b>"
 		dep.define_checker do |result|
@@ -591,7 +590,7 @@ module Dependencies # :nodoc: all
 				require 'daemon_controller'
 				begin
 					require 'daemon_controller/version'
-					too_old = DaemonController::VERSION_STRING < '0.2.5'
+					too_old = DaemonController::VERSION_STRING < '1.0.0'
 				rescue LoadError
 					too_old = true
 				end
@@ -610,23 +609,18 @@ module Dependencies # :nodoc: all
 		end
 	end
 	
-	AsciiDoc = Dependency.new do |dep|
-		dep.name = "Asciidoc"
+	Mizuho = Dependency.new do |dep|
+		dep.name = "Mizuho"
 		dep.define_checker do |result|
-			if PlatformInfo.asciidoc.nil?
+			mizuho = PlatformInfo.find_command('mizuho')
+			if mizuho.nil?
 				result.not_found
 			else
-				result.found(PlatformInfo.asciidoc)
+				result.found(mizuho)
 			end
 		end
-		if RUBY_PLATFORM =~ /darwin/
-			# Installing asciidoc with source-highlight is too much of a pain on OS X,
-			# so recommend Mizuho instead.
-			dep.website = "http://github.com/FooBarWidget/mizuho"
-			dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo.gem_command || "gem"} install mizuho</b>"
-		else
-			dep.website = "http://www.methods.co.nz/asciidoc/"
-		end
+		dep.website = "http://github.com/FooBarWidget/mizuho"
+		dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo.gem_command || "gem"} install mizuho</b>"
 	end
 end