passenger 3.0.0 → 3.0.1

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

@@ -827,8 +827,14 @@ passenger_enabled(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
          && clcf->name.data[clcf->name.len - 1] == '/') {
             clcf->auto_redirect = 1;
         }
-    } else {
+    } else if (ngx_strcasecmp(value[1].data, (u_char *) "off") == 0) {
         passenger_conf->enabled = 0;
+    } else {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+            "\"passenger_enabled\" must be either set to \"on\" "
+            "or \"off\"");
+
+        return NGX_CONF_ERROR;
     }
 
     return NGX_CONF_OK;

data/ext/nginx/HelperAgent.cpp

@@ -318,7 +318,6 @@ private:
 		HttpStatusExtractor ex;
 		int stream = session->getStream();
 		int eof = false;
-		MessageChannel output(clientFd);
 		char buf[1024 * 32];
 		ssize_t size;
 		
@@ -343,9 +342,9 @@ private:
 					string statusLine("HTTP/1.1 ");
 					statusLine.append(ex.getStatusLine());
 					UPDATE_TRACE_POINT();
-					output.writeRaw(statusLine.c_str(), statusLine.size());
+					writeExact(clientFd, statusLine);
 					UPDATE_TRACE_POINT();
-					output.writeRaw(ex.getBuffer().c_str(), ex.getBuffer().size());
+					writeExact(clientFd, ex.getBuffer());
 					break;
 				} catch (const SystemException &e) {
 					if (e.code() == EPIPE) {
@@ -368,7 +367,7 @@ private:
 			} else {
 				UPDATE_TRACE_POINT();
 				try {
-					output.writeRaw(buf, size);
+					writeExact(clientFd, buf, size);
 				} catch (const SystemException &e) {
 					if (e.code() == EPIPE) {
 						throw ClientDisconnectedException();
@@ -392,31 +391,30 @@ private:
 	 * @param friendly Whether to show a friendly error page.
 	 */
 	void handleSpawnException(FileDescriptor &fd, const SpawnException &e, bool friendly) {
-		MessageChannel channel(fd);
-		channel.writeRaw("HTTP/1.1 500 Internal Server Error\x0D\x0A");
-		channel.writeRaw("Status: 500 Internal Server Error\x0D\x0A");
-		channel.writeRaw("Connection: close\x0D\x0A");
-		channel.writeRaw("Content-Type: text/html; charset=utf-8\x0D\x0A");
+		writeExact(fd, "HTTP/1.1 500 Internal Server Error\x0D\x0A");
+		writeExact(fd, "Status: 500 Internal Server Error\x0D\x0A");
+		writeExact(fd, "Connection: close\x0D\x0A");
+		writeExact(fd, "Content-Type: text/html; charset=utf-8\x0D\x0A");
 		
 		if (friendly) {
 			if (e.hasErrorPage()) {
-				channel.writeRaw("Content-Length: " +
+				writeExact(fd, "Content-Length: " +
 					toString(e.getErrorPage().size()) +
 					"\x0D\x0A");
-				channel.writeRaw("\x0D\x0A");
-				channel.writeRaw(e.getErrorPage());
+				writeExact(fd, "\x0D\x0A");
+				writeExact(fd, e.getErrorPage());
 			} else {
-				channel.writeRaw("Content-Length: " +
+				writeExact(fd, "Content-Length: " +
 					toString(strlen(e.what())) + "\x0D\x0A");
-				channel.writeRaw("\x0D\x0A");
-				channel.writeRaw(e.what());
+				writeExact(fd, "\x0D\x0A");
+				writeExact(fd, e.what());
 			}
 		} else {
 			const char body[] = "<h1>Internal Server Error (500)</h1>";
-			channel.writeRaw("Content-Length: " +
+			writeExact(fd, "Content-Length: " +
 				toString(strlen(body)) + "\x0D\x0A");
-			channel.writeRaw("\x0D\x0A");
-			channel.writeRaw(body);
+			writeExact(fd, "\x0D\x0A");
+			writeExact(fd, body);
 		}
 	}
 	

data/ext/nginx/config

@@ -1,12 +1,14 @@
 if ! test -f "$ngx_addon_dir/../common/libpassenger_common.a" || \
    ! test -f "$ngx_addon_dir/../common/libboost_oxt.a"; then
     echo "*** The Phusion Passenger support files are not yet compiled. Compiling them for you... ***"
-    echo "*** Running 'rake nginx' in $ngx_addon_dir... ***"
-    if ! (cd $ngx_addon_dir; rake nginx); then
+    echo "*** Running 'rake nginx RELEASE=yes' in $ngx_addon_dir... ***"
+    if ! cd $ngx_addon_dir; then
         exit 1
-    else
-        echo "*** Phusion Passenger support files have been successfully compiled. ***"
     fi
+    if ! rake nginx RELEASE=yes; then
+        exit 1
+    fi
+    echo "*** Phusion Passenger support files have been successfully compiled. ***"
 fi
 
 ngx_feature="Math library"

data/ext/oxt/system_calls.cpp

@@ -291,6 +291,16 @@ syscalls::select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *errorfds,
 	return ret;
 }
 
+int
+syscalls::poll(struct pollfd fds[], nfds_t nfds, int timeout) {
+	int ret;
+	CHECK_INTERRUPTION(
+		ret == -1,
+		ret = ::poll(fds, nfds, timeout)
+	);
+	return ret;
+}
+
 FILE *
 syscalls::fopen(const char *path, const char *mode) {
 	FILE *ret;

data/ext/oxt/system_calls.hpp

@@ -36,6 +36,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <signal.h>
+#include <poll.h>
 #include <cstdio>
 #include <ctime>
 #include <cassert>
@@ -147,6 +148,7 @@ namespace oxt {
 		
 		int select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *errorfds,
 		           struct timeval *timeout);
+		int poll(struct pollfd fds[], nfds_t nfds, int timeout);
 		
 		FILE *fopen(const char *path, const char *mode);
 		size_t fread(void *ptr, size_t size, size_t nitems, FILE *stream);

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.0'
+	VERSION_STRING = '3.0.1'
 	
-	PREFERRED_NGINX_VERSION = '0.8.52'
+	PREFERRED_NGINX_VERSION = '0.8.53'
 	PREFERRED_PCRE_VERSION  = '8.10'
 	STANDALONE_INTERFACE_VERSION  = 1
 	
@@ -48,8 +48,7 @@ module PhusionPassenger
 	
 	NATIVELY_PACKAGED_SOURCE_ROOT        = "/usr/share/phusion-passenger/source"
 	NATIVELY_PACKAGED_DOCDIR             = "/usr/share/doc/phusion-passenger"
-	NATIVELY_PACKAGED_AGENTS_DIR         = "/usr/lib/phusion-passenger/agents"
-	NATIVELY_PACKAGED_HELPER_SCRIPTS_DIR = "/usr/share/phusion-passenger/helper-scripts"
+	NATIVELY_PACKAGED_RESOURCES_DIR      = "/usr/share/phusion-passenger"
 	NATIVELY_PACKAGED_APACHE2_MODULE     = "/usr/lib/apache2/modules/mod_passenger.so"
 	
 	# Directory containing the Phusion Passenger Ruby libraries.
@@ -79,11 +78,8 @@ module PhusionPassenger
 		# Documentation directory.
 		DOCDIR             = File.join(SOURCE_ROOT, "doc")
 		
-		# Directory containing Phusion Passenger agent executables.
-		AGENTS_DIR         = File.join(SOURCE_ROOT, "agents")
-		
-		# Directory containing Phusion Passenger helper scripts.
-		HELPER_SCRIPTS_DIR = File.join(SOURCE_ROOT, "helper-scripts")
+		# Directory containing Phusion Passenger resource files.
+		RESOURCES_DIR      = File.join(SOURCE_ROOT, "resources")
 		
 		# Location of the Apache 2 module.
 		APACHE2_MODULE     = File.join(SOURCE_ROOT, "ext", "apache2", "mod_passenger.so")
@@ -94,8 +90,7 @@ module PhusionPassenger
 	else
 		SOURCE_ROOT        = NATIVELY_PACKAGED_SOURCE_ROOT
 		DOCDIR             = NATIVELY_PACKAGED_DOCDIR
-		AGENTS_DIR         = NATIVELY_PACKAGED_AGENTS_DIR
-		HELPER_SCRIPTS_DIR = NATIVELY_PACKAGED_HELPER_SCRIPTS_DIR
+		RESOURCES_DIR      = NATIVELY_PACKAGED_RESOURCES_DIR
 		APACHE2_MODULE     = NATIVELY_PACKAGED_APACHE2_MODULE
 	end
 	

data/lib/phusion_passenger/dependencies.rb

@@ -403,6 +403,8 @@ module Dependencies # :nodoc: all
 				dep.install_command = "apt-get install libaprutil1-dev"
 			elsif tags.include?(:mandriva)
 				dep.install_command = "urpmi libapr-util-devel"
+			elsif tags.include?(:redhat)
+				dep.install_command = "yum install apr-util-devel"
 			end
 		elsif RUBY_PLATFORM =~ /darwin/
 			dep.install_instructions = "Please install Apache from MacPorts, which will " <<

data/lib/phusion_passenger/packaging.rb

@@ -37,8 +37,7 @@ module Packaging
 		'passenger',
 		'passenger-install-apache2-module',
 		'passenger-install-nginx-module',
-		'passenger-config',
-		'passenger-stress-test'
+		'passenger-config'
 	]
 	
 	SUPER_USER_EXECUTABLES = [
@@ -72,7 +71,7 @@ module Packaging
 		'debian/*',
 		'helper-scripts/*',
 		'ext/common/**/*.{cpp,c,h,hpp}',
-		'ext/apache2/*.{cpp,h,hpp,c,TXT}',
+		'ext/apache2/*.{cpp,h,hpp,c}',
 		'ext/nginx/*.{c,cpp,h}',
 		'ext/nginx/config',
 		'ext/boost/**/*',
@@ -85,9 +84,10 @@ module Packaging
 		'ext/oxt/*.cpp',
 		'ext/oxt/detail/*.hpp',
 		'ext/ruby/*.{c,rb}',
-		'misc/*',
+		'dev/*',
+		'resources/*',
 		'test/*.example',
-		'test/support/*.{cpp,h,rb}',
+		'test/support/*.{c,cpp,h,rb}',
 		'test/tut/*',
 		'test/cxx/*.{cpp,h}',
 		'test/oxt/*.{cpp,hpp}',

data/lib/phusion_passenger/platform_info.rb

@@ -155,6 +155,94 @@ public
 	def self.env_defined?(name)
 		return !ENV[name].nil? && !ENV[name].empty?
 	end
+	
+	def self.cc
+		return ENV['CC'] || "gcc"
+	end
+	
+	def self.cxx
+		return ENV['CXX'] || "g++"
+	end
+	
+	def self.try_compile(language, source, flags = nil)
+		if language == :c
+			compiler = cc
+		elsif language == :cxx
+			compiler = cxx
+		else
+			raise ArgumentError,"Unsupported language '#{language}'"
+		end
+		filename = File.join("/tmp/passenger-compile-check-#{Process.pid}.c")
+		File.open(filename, "w") do |f|
+			f.puts(source)
+		end
+		begin
+			return system("(#{compiler} #{flags} -c '#{filename}' -o '#{filename}.o') >/dev/null 2>/dev/null")
+		ensure
+			File.unlink(filename) rescue nil
+			File.unlink("#{filename}.o") rescue nil
+		end
+	end
+	private_class_method :try_compile
+	
+	def self.try_link(language, source, flags = nil)
+		if language == :c
+			compiler = cc
+		elsif language == :cxx
+			compiler = cxx
+		else
+			raise ArgumentError,"Unsupported language '#{language}'"
+		end
+		filename = File.join("/tmp/passenger-link-check-#{Process.pid}.c")
+		File.open(filename, "w") do |f|
+			f.puts(source)
+		end
+		begin
+			return system("(#{compiler} #{flags} '#{filename}' -o '#{filename}.out') >/dev/null 2>/dev/null")
+		ensure
+			File.unlink(filename) rescue nil
+			File.unlink("#{filename}.out") rescue nil
+		end
+	end
+	private_class_method :try_link
+	
+	def self.try_compile_and_run(language, source, flags = nil)
+		if language == :c
+			compiler = cc
+		elsif language == :cxx
+			compiler = cxx
+		else
+			raise ArgumentError,"Unsupported language '#{language}'"
+		end
+		filename = File.join("/tmp/passenger-compile-check-#{Process.pid}.c")
+		File.open(filename, "w") do |f|
+			f.puts(source)
+		end
+		begin
+			if system("(#{compiler} #{flags} '#{filename}' -o '#{filename}.out') >/dev/null 2>/dev/null")
+				if Process.respond_to?(:spawn)
+					pid = Process.spawn("#{filename}.out",
+						:out => ["/dev/null", "w"],
+						:err => ["/dev/null", "w"])
+					
+				else
+					pid = fork do
+						STDOUT.reopen("/dev/null", "w")
+						STDERR.reopen("/dev/null", "w")
+						exec("#{filename}.out")
+					end
+				end
+				pid = Process.waitpid(pid) rescue nil
+				return pid && $?.exitstatus == 0
+			else
+				return false
+			end
+		ensure
+			File.unlink(filename) rescue nil
+			File.unlink("#{filename}.out") rescue nil
+		end
+	end
+	private_class_method :try_compile_and_run
 end
 
 end # module PhusionPassenger

data/lib/phusion_passenger/platform_info/binary_compatibility.rb

@@ -29,20 +29,6 @@ require 'phusion_passenger/platform_info/operating_system'
 module PhusionPassenger
 
 module PlatformInfo
-	# Returns the host machine's CPU architecture. Please note that this may not be the
-	# same as the Ruby interpreter's CPU architecture because the Ruby interpreter may
-	# be running on a different architectural mode than the default one.
-	def self.cpu_architecture
-		result = `uname -p`.strip
-		# On some systems 'uname -p' returns something like
-		# 'Intel(R) Pentium(R) M processor 1400MHz'.
-		if result == "unknown" || result =~ / /
-			result = `uname -m`.strip
-		end
-		return result
-	end
-	memoize :cpu_architecture
-	
 	# Returns an array of identifiers that describe the current Ruby
 	# interpreter's extension binary compatibility. A Ruby extension
 	# compiled for a certain Ruby interpreter can also be loaded on
@@ -85,7 +71,7 @@ module PlatformInfo
 		elsif RUBY_PLATFORM == "java"
 			ruby_arch = "java"
 		else
-			ruby_arch = cpu_architecture
+			ruby_arch = cpu_architectures[0]
 		end
 		return [ruby_engine, ruby_ext_version, ruby_arch, os_name]
 	end
@@ -130,14 +116,14 @@ module PlatformInfo
 			os_version = "#{components[0]}.#{components[1]}"
 			os_runtime = os_version
 			
-			os_arch = cpu_architecture
+			os_arch = cpu_architectures[0]
 			if os_version >= "10.5" && os_arch =~ /^i.86$/
 				# On Snow Leopard, 'uname -m' returns i386 but
 				# we *know* that everything is x86_64 by default.
 				os_arch = "x86_64"
 			end
 		else
-			os_arch = cpu_architecture
+			os_arch = cpu_architectures[0]
 			
 			cpp = find_command('cpp')
 			if cpp