passenger 3.9.2.beta → 4.0.0.rc4

data/.travis.yml

@@ -3,8 +3,11 @@ language: ruby
 env:
   - TEST_FULL_COMPILE=1
   - TEST_CXX=1
+  - TEST_CXX=1 SUDO=1
   - TEST_RUBY=1 TEST_RUBY_VERSION=1.8.7
   - TEST_RUBY=1 TEST_RUBY_VERSION=1.9.3
+  - TEST_NGINX=1
+  - TEST_APACHE2=1
 
 before_install:
   - sudo apt-get install apache2-mpm-worker apache2-threaded-dev

data/NEWS

@@ -1,19 +1,81 @@
-Release 3.9.2
--------------
-
- * JRuby and Rubinius support.
+Release 4.0.0 release candidate 4
+---------------------------------
+
+ * Fixed compilation on systems where /tmp is mounted noexec.
+ * Fixed some memory corruption bugs.
+ * Improved debugging messages.
+ * Phusion Passenger Standalone now sets underscores_in_headers.
+   Fixes issue #708.
+ * Fixed some process spawning compatibility problems, as
+   reported in issue #842.
+ * The Python WSGI loader now correctly shuts down client sockets
+   even when there are child processes that keep the socket open.
+ * A new configuration option PassengerPython (Apache) and
+   passenger_python (Nginx) has been added so that users can
+   customize the Python interpreter on a per-application basis.
+   Fixes issue #852.
+ * The Apache module now supports file uploads larger than 2 GB
+   when on 32-bit systems. Fixes issue #838.
+ * The Nginx version now supports the `passenger_temp_dir` option.
+ * Environment variables set in the Nginx configuration file
+   (through the `env` config option) are now correctly passed to
+   all application processes. Fixes issue #371.
+ * Fixed support for RVM mixed mode installations. Fixes issue #828.
+ * Phusion Passenger now outputs the Date HTTP header in case the
+   application didn't already do that (and was violating the HTTP spec).
+   Fixes issue #485.
+ * Phusion Passenger now checks whether /dev/urandom isn't broken.
+   Fixes issue #516.
+
+
+Release 3.9.5 (4.0.0 release candidate 3)
+-----------------------------------------
+
+ * Fixed Rake autodetection.
+
+
+Release 3.9.4 (4.0.0 release candidate 2)
+-----------------------------------------
+
+ * More bug fixes.
+ * More documentation updates.
+ * Better crash diagnostics.
+
+
+Release 3.9.3 (4.0.0 release candidate 1)
+-----------------------------------------
+
+ * The Nginx version now supports the `passenger_app_root` configuration option.
+ * The Enterprise memory limiting feature has been extended to work with non-Ruby applications as well.
+ * Application processes that have been killed are now automatically detected within 5 seconds. Previously Phusion Passenger needed to send a request to the process before detecting that it's gone. This change means that when you kill a process by sending it a signal, Phusion Passenger will automatically respawn it within 5 seconds (provided that the process limit settings allow respawning).
+ * Phusion Passenger Standalone's HTTP client body limit has been raised from 50 MB to 1 GB.
+ * Python 3 support has been added.
+ * The build system has been made compatible with JRuby and Ruby 2.0.
+ * The installers now print a lot more information about detected system settings so that the user can see  whether something has been wrongly detected.
+ * Some performance optimizations. These involve further extending the zero-copy architecture, and the use of hash table maps instead of binary tree maps.
+ * Many potential crasher and freezer bugs have been fixed.
+ * Error diagnostics have been further improved.
+ * Many documentation improvements.
+
+
+Release 3.9.2 (4.0.0 beta 2)
+----------------------------
+
+ * New feature: JRuby and Rubinius support.
+ * New feature: Out of Band Work.
  * Sending SIGBART to a Ruby process will now trigger the same behavior
    as SIGQUIT - that is, it will print a backtrace. This is necessary
    for proper JRuby support because JRuby cannot catch SIGQUIT.
  * Rolling restarts and depoyment error resistance are now also available
    in Phusion Passenger Standalone in the Enterprise version.
- * New feature: out of band work.
+ * System call failure simulation framework.
  * Improved crash reporting.
+ * Many documentation improvements.
  * Many bug fixes.
 
 
-Release 3.9.1
--------------
+Release 3.9.1 (4.0.0 beta 1)
+----------------------------
 
 This is the first beta of Phusion Passenger 4. The changes are numerous.
 
@@ -34,6 +96,14 @@ This is the first beta of Phusion Passenger 4. The changes are numerous.
  * Better relocatability without wasting space.
 
 
+Release 3.0.20
+--------------
+
+ * Rebootstrapped the libev configure to fix compilation problems on Solaris 11.
+ * Fixed support for RVM mixed mode installations. Fixes issue #828.
+ * Fixed encoding problems in Phusion Passenger Standalone.
+
+
 Release 3.0.19
 --------------
 

data/README.md

@@ -22,18 +22,10 @@ For troubleshooting, configuration and tips, please read the corresponding Users
 
 These files are included in the source tarball, and may also be viewed online on [our website](https://www.phusionpassenger.com/support).
 
-## Installing via a gem
+## Installing as a gem
 
-You may also generate a .gem file, and then install that. First, make sure that you have the following software installed:
-
- * All usual Phusion Passenger dependencies.
- * [Mizuho](https://github.com/FooBarWidget/mizuho).
-
-Next, run:
-
-    rake package
-
-The gem will be available under the `pkg` folder.
+    gem build passenger.gemspec
+    gem install passenger-x.x.x.gem
 
 ## Further reading
 

data/bin/passenger-install-apache2-module

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  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.
 #
@@ -36,29 +36,33 @@ ENV["PATH"] += ":/usr/sbin:/sbin:/usr/local/sbin"
 require 'optparse'
 require 'phusion_passenger/platform_info/ruby'
 require 'phusion_passenger/platform_info/apache'
-require 'phusion_passenger/dependencies'
 require 'phusion_passenger/abstract_installer'
 
 class Installer < PhusionPassenger::AbstractInstaller
 	include PhusionPassenger
 	
 	def dependencies
-		result = [
-			Dependencies::GCC,
-			Dependencies::Curl_Dev,
-			Dependencies::OpenSSL_Dev,
-			Dependencies::Zlib_Dev,
-			Dependencies::Ruby_DevHeaders,
-			Dependencies::Ruby_OpenSSL,
-			Dependencies::RubyGems,
-			Dependencies::Rake,
-			Dependencies::Rack,
-			Dependencies::Apache2,
-			Dependencies::Apache2_DevHeaders
+		specs = [
+			'depcheck_specs/compiler_toolchain',
+			'depcheck_specs/ruby',
+			'depcheck_specs/gems',
+			'depcheck_specs/libs',
+			'depcheck_specs/apache2'
+		]
+		ids = [
+			'gcc',
+			'g++',
+			'libcurl-dev',
+			'openssl-dev',
+			'zlib-dev',
+			'ruby-dev',
+			'ruby-openssl',
+			'rubygems',
+			'rake',
+			'rack',
+			'apache2',
+			'apache2-dev'
 		]
-		if Dependencies.fastthread_required?
-			result << Dependencies::FastThread
-		end
 		# Some broken servers don't have apr-config or apu-config installed.
 		# Nevertheless, it is possible to compile Apache modules if Apache
 		# was configured with --included-apr. So here we check whether
@@ -67,10 +71,10 @@ class Installer < PhusionPassenger::AbstractInstaller
 		# module can be compiled without their presence.
 		if (PlatformInfo.apr_config && PlatformInfo.apu_config) ||
 		   PlatformInfo.apr_config_needed_for_building_apache_modules?
-			result << Dependencies::APR_DevHeaders
-			result << Dependencies::APU_DevHeaders
+			ids << 'apr-dev'
+			ids << 'apu-dev'
 		end
-		return result
+		return [specs, ids]
 	end
 	
 	def users_guide

data/bin/passenger-install-nginx-module

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  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.
 #
@@ -30,30 +30,33 @@ PhusionPassenger.locate_directories
 require 'optparse'
 require 'fileutils'
 require 'phusion_passenger/platform_info/ruby'
-require 'phusion_passenger/dependencies'
 require 'phusion_passenger/abstract_installer'
 
 class Installer < PhusionPassenger::AbstractInstaller
 	include PhusionPassenger
 	
 	def dependencies
-		result = [
-			Dependencies::GCC,
-			Dependencies::Make,
-			Dependencies::DownloadTool,
-			Dependencies::Ruby_DevHeaders,
-			Dependencies::Ruby_OpenSSL,
-			Dependencies::RubyGems,
-			Dependencies::Rake,
-			Dependencies::Rack,
-			Dependencies::Curl_Dev,
-			Dependencies::OpenSSL_Dev,
-			Dependencies::Zlib_Dev
+		specs = [
+			'depcheck_specs/compiler_toolchain',
+			'depcheck_specs/ruby',
+			'depcheck_specs/gems',
+			'depcheck_specs/libs',
+			'depcheck_specs/utilities'
 		]
-		if Dependencies.fastthread_required?
-			result << Dependencies::FastThread
-		end
-		return result
+		ids = [
+			'gcc',
+			'g++',
+			'download-tool',
+			'ruby-dev',
+			'ruby-openssl',
+			'rubygems',
+			'rake',
+			'rack',
+			'libcurl-dev',
+			'openssl-dev',
+			'zlib-dev'
+		]
+		return [specs, ids]
 	end
 	
 	def users_guide
@@ -470,11 +473,10 @@ parser = OptionParser.new do |opts|
 	end
 	opts.on("--extra-configure-flags=STRING", String, "Pass these extra flags to Nginx's\n" <<
 	        "#{' ' * 37}'configure' script, instead of asking for\n" <<
-	        "#{' ' * 37}it interactively. Only applicable if\n" <<
-	        "#{' ' * 37}--nginx-source-dir is given. Specify\n" <<
-	        "#{' ' * 37}'none' if you do not want to pass\n" <<
-	        "#{' ' * 37}additional flags but do not want this\n" <<
-	        "#{' ' * 37}installer to ask interactively either.") do |flags|
+	        "#{' ' * 37}it interactively. Specify 'none' if you\n" <<
+	        "#{' ' * 37}do not want to pass additional flags but do\n" <<
+	        "#{' ' * 37}not want this installer to ask\n" <<
+	        "#{' ' * 37}interactively either.") do |flags|
 		options[:extra_configure_flags] = flags
 	end
 end

data/build/agents.rb

@@ -34,12 +34,14 @@ file AGENT_OUTPUT_DIR + 'PassengerWatchdog' => dependencies do
 	sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
 	compile_cxx("ext/common/agents/Watchdog/Main.cpp",
 		"-o #{AGENT_OUTPUT_DIR}PassengerWatchdog.o " <<
+		"#{EXTRA_PRE_CXXFLAGS} " <<
 		"-Iext -Iext/common " <<
 		"#{PlatformInfo.portability_cflags} #{AGENT_CFLAGS} #{EXTRA_CXXFLAGS}")
 	create_executable(AGENT_OUTPUT_DIR + 'PassengerWatchdog',
 		"#{AGENT_OUTPUT_DIR}PassengerWatchdog.o " <<
 		"#{watchdog_libs.link_objects_as_string} " <<
 		"#{LIBBOOST_OXT} " <<
+		"#{EXTRA_PRE_LDFLAGS} " <<
 		"#{PlatformInfo.portability_ldflags} " <<
 		"#{AGENT_LDFLAGS} " <<
 		"#{EXTRA_LDFLAGS}")
@@ -71,6 +73,10 @@ dependencies = [
 	'ext/common/ApplicationPool2/Session.h',
 	'ext/common/ApplicationPool2/Options.h',
 	'ext/common/ApplicationPool2/PipeWatcher.h',
+	'ext/common/ApplicationPool2/Spawner.h',
+	'ext/common/ApplicationPool2/SpawnerFactory.h',
+	'ext/common/ApplicationPool2/SmartSpawner.h',
+	'ext/common/ApplicationPool2/DirectSpawner.h',
 	LIBBOOST_OXT,
 	helper_agent_libs.link_objects,
 	LIBEV_TARGET,
@@ -80,6 +86,7 @@ file AGENT_OUTPUT_DIR + 'PassengerHelperAgent' => dependencies do
 	sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
 	compile_cxx("ext/common/agents/HelperAgent/Main.cpp",
 		"-o #{AGENT_OUTPUT_DIR}PassengerHelperAgent.o " <<
+		"#{EXTRA_PRE_CXXFLAGS} " <<
 		"-Iext -Iext/common " <<
 		"#{AGENT_CFLAGS} #{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} " <<
 		"#{PlatformInfo.portability_cflags} " <<
@@ -88,6 +95,7 @@ file AGENT_OUTPUT_DIR + 'PassengerHelperAgent' => dependencies do
 		"#{AGENT_OUTPUT_DIR}PassengerHelperAgent.o",
 		"#{helper_agent_libs.link_objects_as_string} " <<
 		"#{LIBBOOST_OXT} " <<
+		"#{EXTRA_PRE_LDFLAGS} " <<
 		"#{LIBEV_LIBS} " <<
 		"#{LIBEIO_LIBS} " <<
 		"#{PlatformInfo.portability_ldflags} " <<
@@ -117,6 +125,7 @@ file AGENT_OUTPUT_DIR + 'PassengerLoggingAgent' => dependencies do
 	sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
 	compile_cxx("ext/common/agents/LoggingAgent/Main.cpp",
 		"-o #{AGENT_OUTPUT_DIR}PassengerLoggingAgent.o " <<
+		"#{EXTRA_PRE_CXXFLAGS} " <<
 		"-Iext -Iext/common " <<
 		"#{AGENT_CFLAGS} #{LIBEV_CFLAGS} " <<
 		"#{PlatformInfo.curl_flags} " <<
@@ -126,6 +135,7 @@ file AGENT_OUTPUT_DIR + 'PassengerLoggingAgent' => dependencies do
 		"#{AGENT_OUTPUT_DIR}PassengerLoggingAgent.o",
 		"#{logging_agent_libs.link_objects_as_string} " <<
 		"#{LIBBOOST_OXT} " <<
+		"#{EXTRA_PRE_LDFLAGS} " <<
 		"#{LIBEV_LIBS} " <<
 		"#{PlatformInfo.curl_libs} " <<
 		"#{PlatformInfo.zlib_libs} " <<
@@ -144,6 +154,7 @@ file AGENT_OUTPUT_DIR + 'SpawnPreparer' => dependencies do
 	sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
 	create_executable(AGENT_OUTPUT_DIR + 'SpawnPreparer',
 		'ext/common/agents/SpawnPreparer.cpp',
+		"#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_LDFLAGS} " <<
 		"-Iext -Iext/common " <<
 		"#{AGENT_CFLAGS} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} " <<
 		"#{spawn_preparer_libs.link_objects_as_string} " <<

data/build/apache2.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.
 #
@@ -59,14 +59,17 @@ APACHE2_MODULE_INPUT_FILES = {
 APACHE2_MODULE_OBJECTS = APACHE2_MODULE_INPUT_FILES.keys
 APACHE2_MOD_PASSENGER_O = APACHE2_OUTPUT_DIR + "mod_passenger.o"
 
-APACHE2_MODULE_CXXFLAGS = "-Iext -Iext/common #{PlatformInfo.apache2_module_cflags} " <<
+APACHE2_MODULE_CXXFLAGS =
+	"#{EXTRA_PRE_CXXFLAGS} " <<
+	"-Iext -Iext/common #{PlatformInfo.apache2_module_cflags} " <<
 	"#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
 
 APACHE2_MODULE_BOOST_OXT_LIBRARY = define_libboost_oxt_task("apache2",
 	APACHE2_OUTPUT_DIR + "module_libboost_oxt",
 	PlatformInfo.apache2_module_cflags)
 APACHE2_MODULE_COMMON_LIBRARIES  = COMMON_LIBRARY.
-	only(:base, 'Utils/Base64.o', 'Utils/MD5.o').
+	only(:base, 'ApplicationPool2/AppTypes.o', 'Utils/Base64.o',
+		'Utils/MD5.o', 'Utils/LargeFiles.o').
 	set_namespace("apache2").
 	set_output_dir(APACHE2_OUTPUT_DIR + "module_libpassenger_common").
 	define_tasks(PlatformInfo.apache2_module_cflags).
@@ -80,8 +83,8 @@ task :apache2 => [
 	AGENT_OUTPUT_DIR + 'PassengerWatchdog',
 	AGENT_OUTPUT_DIR + 'PassengerLoggingAgent',
 	AGENT_OUTPUT_DIR + 'SpawnPreparer',
-	:native_support
-]
+	NATIVE_SUPPORT_TARGET
+].compact
 
 
 # Define rules for the individual Apache 2 module source files.
@@ -107,6 +110,7 @@ file APACHE2_MODULE => dependencies do
 	
 	sources = (APACHE2_MODULE_OBJECTS + [APACHE2_MOD_PASSENGER_O]).join(' ')
 	linkflags =
+		"#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_LDFLAGS} " <<
 		"#{PlatformInfo.apache2_module_cflags} " <<
 		"#{PlatformInfo.portability_cflags} " <<
 		"#{EXTRA_CXXFLAGS} " <<

data/build/basics.rb

@@ -34,12 +34,11 @@ require 'phusion_passenger/platform_info/apache'
 require 'phusion_passenger/platform_info/curl'
 require 'phusion_passenger/platform_info/zlib'
 require 'phusion_passenger/platform_info/compiler'
+require 'phusion_passenger/platform_info/cxx_portability'
 
 include PhusionPassenger
 include PhusionPassenger::PlatformInfo
 
-require 'build/packagetask'
-require 'build/gempackagetask'
 require 'build/rake_extensions'
 require 'build/cplusplus_support'
 
@@ -65,6 +64,33 @@ end
 
 #################################################
 
+if string_option('OUTPUT_DIR')
+	OUTPUT_DIR = string_option('OUTPUT_DIR') + "/"
+else
+	OUTPUT_DIR = ""
+end
+
+verbose true if !boolean_option('REALLY_QUIET')
+if boolean_option('STDERR_TO_STDOUT')
+	# Just redirecting the file descriptor isn't enough because
+	# data written to STDERR might arrive in an unexpected order
+	# compared to STDOUT.
+	STDERR.reopen(STDOUT)
+	Object.send(:remove_const, :STDERR)
+	STDERR = STDOUT
+	$stderr = $stdout
+end
+
+if boolean_option('CACHING', true) && !boolean_option('RELEASE')
+	if OUTPUT_DIR.empty?
+		PlatformInfo.cache_dir = File.expand_path("cache", File.dirname(__FILE__))
+	else
+		PlatformInfo.cache_dir = OUTPUT_DIR + "cache"
+	end
+end
+
+#################################################
+
 OPTIMIZE = boolean_option("OPTIMIZE")
 CC       = string_option("CC", "gcc")
 CXX      = string_option("CXX", "g++")
@@ -97,24 +123,25 @@ AGENT_LDFLAGS << " -Wl,-dead_strip" if RUBY_PLATFORM =~ /darwin/
 AGENT_LDFLAGS.strip!
 
 # Extra compiler flags that should always be passed to the C/C++ compiler.
-# Should be included last in the command string, even after PlatformInfo.portability_cflags.
+# These should be included first in the command string, before anything else.
+EXTRA_PRE_CFLAGS = string_option('EXTRA_PRE_CFLAGS', '').gsub("\n", " ")
+EXTRA_PRE_CXXFLAGS = string_option('EXTRA_PRE_CXXFLAGS', '').gsub("\n", " ")
+# These should be included last in the command string, even after PlatformInfo.portability_cflags.
 EXTRA_CXXFLAGS = "-Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-long-long"
 EXTRA_CXXFLAGS << " -Wno-missing-field-initializers" if PlatformInfo.compiler_supports_wno_missing_field_initializers_flag?
 EXTRA_CXXFLAGS << " -mno-tls-direct-seg-refs" if PlatformInfo.requires_no_tls_direct_seg_refs? && PlatformInfo.compiler_supports_no_tls_direct_seg_refs_option?
 # Work around Clang warnings in ev++.h.
 EXTRA_CXXFLAGS << " -Wno-ambiguous-member-template" if PlatformInfo.cxx_is_clang?
 EXTRA_CXXFLAGS << " #{OPTIMIZATION_FLAGS}" if !OPTIMIZATION_FLAGS.empty?
+EXTRA_CXXFLAGS << " " << string_option('EXTRA_CXXFLAGS').gsub("\n", " ") if string_option('EXTRA_CXXFLAGS')
 
 # Extra linker flags that should always be passed to the linker.
-# Should be included last in the command string, even after PlatformInfo.portability_ldflags.
-EXTRA_LDFLAGS  = ""
+# These should be included first in the command string, before anything else.
+EXTRA_PRE_LDFLAGS  = string_option('EXTRA_PRE_LDFLAGS', '').gsub("\n", " ")
+# These should be included last in the command string, even after PlatformInfo.portability_ldflags.
+EXTRA_LDFLAGS  = string_option('EXTRA_LDFLAGS', '').gsub("\n", " ")
 
 
-if string_option('OUTPUT_DIR')
-	OUTPUT_DIR = string_option('OUTPUT_DIR') + "/"
-else
-	OUTPUT_DIR = ""
-end
 AGENT_OUTPUT_DIR          = string_option('AGENT_OUTPUT_DIR', OUTPUT_DIR + "agents") + "/"
 COMMON_OUTPUT_DIR         = string_option('COMMON_OUTPUT_DIR', OUTPUT_DIR + "libout/common") + "/"
 APACHE2_OUTPUT_DIR        = string_option('APACHE2_OUTPUT_DIR', OUTPUT_DIR + "libout/apache2") + "/"
@@ -129,23 +156,3 @@ RUBY_EXTENSION_OUTPUT_DIR = string_option('RUBY_EXTENSION_OUTPUT_DIR',
 USE_VENDORED_LIBEV = boolean_option("USE_VENDORED_LIBEV", true)
 # Whether to use the vendored libeio or the system one.
 USE_VENDORED_LIBEIO = boolean_option("USE_VENDORED_LIBEIO", true)
-
-
-verbose true if !boolean_option('REALLY_QUIET')
-if boolean_option('STDERR_TO_STDOUT')
-	# Just redirecting the file descriptor isn't enough because
-	# data written to STDERR might arrive in an unexpected order
-	# compared to STDOUT.
-	STDERR.reopen(STDOUT)
-	Object.send(:remove_const, :STDERR)
-	STDERR = STDOUT
-	$stderr = $stdout
-end
-
-if boolean_option('CACHING', true) && !boolean_option('RELEASE')
-	if OUTPUT_DIR.empty?
-		PlatformInfo.cache_dir = File.expand_path("cache", File.dirname(__FILE__))
-	else
-		PlatformInfo.cache_dir = OUTPUT_DIR + "cache"
-	end
-end