passenger 4.0.14 → 4.0.16

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSEm1+AAoJECrHRaUKISqMwjAIAJrI1rdd3Cxrencb3E/rKc2R
-Fdb0rEgFsPDGSa/D51kAhma2jzxjkGzQUS9k6DCrs9Qfmb5G9PkLaPjh1dIMT0zA
-PhLuhZu4wjxrcwlrZsKxljOq1R+t9IYdjYNKgzwHbF51dM2yTrHmAAuCI4ZS44WD
-2RnLomVLPmIsRVm7wxmtlMl1gUrVs2U1r259tF2+z4XS+VVOqM9bhgpFcY2Mj7Bg
-f0PFi+aXYpSjl1QwI7eyYdA/TLvOSbSRO9FuLvG3jnN4JI0/vzndS1+gRn5ToykI
-7q4PfQPVhA/R6b05HcRfrXX+l9WNWFh1duuTAmfvi5jydoIpgY/ROmIAeitPkak=
-=2H4W
+iQEcBAABAgAGBQJSKZrGAAoJECrHRaUKISqMSw4IALeI7526hdG7s9eK1Mg1Lq2R
+AP5fKUs2NPcSs34YVNlUyWrnkYL+ekYdW1m9JvRFnQBfTi9IC4ZlTR8fl0DRujE5
+9EZotMJVqna3t/oKTHcG1ZhP9YbMH/InTs6VMtZJoXBBnlVqRsXyXusOoS95HZj8
+uVzu5lMQ2r5uy1GrWaVURjilhn+qVMRgGP8e00HBEAjCBu12WMazctIhL6uQdlPi
+vmClzAjp5MAJFFQyzqtClteobIzqRBekzgrpw6MRjiCgiCqxBRMlFsDTdOuWAnEj
+CabdEhIalAfeNHgpPDdFNO3qKYdMZKMMr4UNIST/GyttFZQynTCWpsKu/Pul6hk=
+=7YRG
 -----END PGP SIGNATURE-----

data/NEWS

@@ -1,3 +1,72 @@
+Release 4.0.16
+--------------
+
+ * Allow Phusion Passenger to work properly on systems where the user's GID
+   does not have a proper entry in /etc/group, such as Heroku.
+
+
+Release 4.0.15
+--------------
+
+ * Out-of-band work has been much improved. The number of processes which
+   may perform out-of-band work concurrently has been limited to 1.
+   Furthermore, processes which are performing out-of-band work are now
+   included in the max pool size constraint calculation. However, this
+   means that in order to use out-of-band work, you need to have at least
+   2 application processes running. Out-of-band work will never be triggered
+   if you just have 1 process. Partially fixes issue #892.
+ * Phusion Passenger now displays an error message to clients if too many
+   requests are queued up. By default, "too many" is 100. You may customize
+   this with `PassengerMaxRequestQueueSize` (Apache) or
+   `passenger_max_request_queue_size` (Nginx).
+ * A new configuration option, `PassengerStartTimeout` (Apache) and
+   `passenger_start_timeout` (Nginx), has been added. This option allows you
+   to specify a timeout for application startup. The startup timeout has exited
+   since version 4.0.0, but before version 4.0.15 it was hardcoded at a value
+   of 90 seconds. Now it is customizable. Fixes issue #936.
+ * [Enterprise] The `PassengerMaxRequestTime`/`passenger_max_request_time`
+   feature is now available for Python and Node.js as well, and is no longer
+   limited to just Ruby. Fixes issue #938.
+ * [Nginx] Introduced a configuration option `passenger_intercept_errors`,
+   which decides if Nginx will intercept responses with HTTP status codes of
+   400 and higher. Its effect is similar to `proxy_intercept_errors`.
+ * [Standalone] Memory usage optimization: when `passenger start` is run with
+   `--daemonize`, the frontend exits after starting the Nginx core. This saves
+   ~20 MB of memory per `passenger start` instance.
+ * [Standalone] Phusion Passenger Standalone is now also packaged in the
+   Debian packages.
+ * [Standalone] Fix a problem with the `passenger stop` command on Ruby 1.8.7.
+   The 'thread' library was not properly required, causing a crash.
+ * [Standalone] There is now builtin support for SSL.
+ * Fix a crash when multiple `passenger_pass_header` directives are set.
+   Fixes issue #934.
+ * Permissions on the server instance directory are now explicitly set
+   with chmod, so that permissions are correct on systems with a non-default
+   umask. Fixes issue #928.
+ * Fix permission problems when running `passenger start` with `--user`.
+ * `passenger-config --detect-apache2` now correctly detects the eror log
+   filename on Amazon Linux. Fixes issue #933.
+ * An environment variable `PASSENGER_THREAD_LOCAL_STORAGE` has been added
+   to the build system for forcefully disabling the use of thread-local
+   storage within the Phusion Passenger codebase. This flag useful on systems
+   that have broken support for thread-local storage, despite passing our build
+   system's check for proper thread-local storage support. At the time of
+   writing, one user has reported that Ubuntu 12.04 32-bit has broken
+   thread-local storage report although neither the reporter nor us were able
+   to reproduce the problem on any other systems running Ubuntu 12.04 32-bit.
+   Note that this flag has no effect on non-Phusion Passenger code. Fixes
+   issue #937.
+ * It is now possible to preprocess events before they are sent to Union
+   Station. This is useful for removing confidential data as demonstrated in
+   this example `config/initializers/passenger.rb` file:
+
+       if defined?(PhusionPassenger)
+           event_preprocessor = lambda do |e|
+               e.payload[:sql].gsub!("secret","PASSWORD") if e.payload[:sql]
+           end
+           PhusionPassenger.install_framework_extensions!(:event_preprocessor => event_preprocessor)
+       end
+
 Release 4.0.14
 --------------
 

data/bin/passenger-install-apache2-module

@@ -147,7 +147,12 @@ private
 		if Process.uid == 0
 			render_template 'apache2/no_write_permission_to_passenger_root'
 		else
-			render_template 'apache2/run_installer_as_root'
+			render_template 'installer_common/run_installer_as_root',
+				:dir  => PhusionPassenger.source_root,
+				:sudo => PhusionPassenger::PlatformInfo.ruby_sudo_command,
+				:sudo_e => "#{PhusionPassenger::PlatformInfo.ruby_sudo_command} -E",
+				:ruby => PhusionPassenger::PlatformInfo.ruby_command,
+				:installer => "#{PhusionPassenger.bin_dir}/passenger-install-apache2-module #{ORIG_ARGV.join(' ')}"
 		end
 		return false
 	ensure
@@ -205,6 +210,7 @@ private
 	end
 end
 
+ORIG_ARGV = ARGV.dup
 options = {}
 parser = OptionParser.new do |opts|
 	opts.banner = "Usage: passenger-install-apache2-module [options]"

data/bin/passenger-install-nginx-module

@@ -71,6 +71,7 @@ class Installer < PhusionPassenger::AbstractInstaller
 		ENV['PATH'] = PhusionPassenger.bin_dir + ":" + ENV['PATH']
 		
 		show_welcome_screen
+		check_nginx_module_sources_available || exit(1)
 		check_dependencies || exit(1)
 		if needs_compiling_support_files?
 			check_whether_we_can_write_to(PhusionPassenger.source_root) || exit(1)
@@ -136,6 +137,16 @@ private
 		wait
 	end
 
+	def check_nginx_module_sources_available
+		if PhusionPassenger.natively_packaged? && !File.exist?(PhusionPassenger.nginx_module_source_dir)
+			new_screen
+			render_template 'nginx/nginx_module_sources_not_available'
+			return false
+		else
+			return true
+		end
+	end
+
 	def needs_compiling_support_files?
 		return PhusionPassenger.originally_packaged?
 	end
@@ -342,7 +353,12 @@ private
 		if Process.uid == 0
 			render_template 'nginx/cannot_write_to_dir', :dir => dir
 		else
-			render_template 'nginx/run_installer_as_root', :dir => dir
+			render_template 'installer_common/run_installer_as_root',
+				:dir  => dir,
+				:sudo => PhusionPassenger::PlatformInfo.ruby_sudo_command,
+				:sudo_e => "#{PhusionPassenger::PlatformInfo.ruby_sudo_command} -E",
+				:ruby => PhusionPassenger::PlatformInfo.ruby_command,
+				:installer => "#{PhusionPassenger.bin_dir}/passenger-install-nginx-module #{ORIG_ARGV.join(' ')}"
 		end
 		return false
 	ensure
@@ -457,6 +473,7 @@ private
 	end
 end
 
+ORIG_ARGV = ARGV.dup
 options = {}
 parser = OptionParser.new do |opts|
 	opts.banner = "Usage: passenger-install-nginx-module [options]"

data/build/apache2.rb

@@ -73,6 +73,14 @@ APACHE2_MODULE_COMMON_LIBRARIES  = COMMON_LIBRARY.
 	define_tasks(PlatformInfo.apache2_module_cflags).
 	link_objects
 
+auto_generated_sources = [
+	'ext/apache2/ConfigurationCommands.cpp',
+	'ext/apache2/ConfigurationFields.hpp',
+	'ext/apache2/CreateDirConfig.cpp',
+	'ext/apache2/MergeDirConfig.cpp',
+	'ext/apache2/ConfigurationSetters.cpp'
+]
+
 
 desc "Build Apache 2 module"
 task :apache2 => [
@@ -87,7 +95,7 @@ task :apache2 => [
 
 # Define rules for the individual Apache 2 module source files.
 APACHE2_MODULE_INPUT_FILES.each_pair do |target, sources|
-	extra_deps = ['ext/common/Constants.h']
+	extra_deps = ['ext/common/Constants.h'] + auto_generated_sources
 	file(target => sources + extra_deps) do
 		object_basename = File.basename(target)
 		object_filename = APACHE2_OUTPUT_DIR + object_basename
@@ -97,6 +105,7 @@ end
 
 
 dependencies = [
+	auto_generated_sources,
 	APACHE2_MODULE_COMMON_LIBRARIES,
 	APACHE2_MODULE_BOOST_OXT_LIBRARY,
 	APACHE2_MOD_PASSENGER_O,
@@ -135,3 +144,18 @@ task 'apache2:clean' => 'common:clean' do
 	files << APACHE2_MODULE
 	sh("rm", "-rf", *files)
 end
+
+def create_apache2_auto_generated_source_task(source)
+	dependencies = [
+		"#{source}.erb",
+		'lib/phusion_passenger/apache2/config_options.rb'
+	]
+	file(source => dependencies) do
+		template = TemplateRenderer.new("#{source}.erb")
+		template.render_to(source)
+	end
+end
+
+auto_generated_sources.each do |source|
+	create_apache2_auto_generated_source_task(source)
+end

data/build/basics.rb

@@ -21,7 +21,10 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'rubygems'
+begin
+	require 'rubygems'
+rescue LoadError
+end
 require 'pathname'
 require 'fileutils'
 require 'phusion_passenger'
@@ -48,7 +51,7 @@ require 'build/cplusplus_support'
 class TemplateRenderer
 	def initialize(filename)
 		require 'erb' if !defined?(ERB)
-		@erb = ERB.new(File.read(filename))
+		@erb = ERB.new(File.read(filename), nil, "-")
 		@erb.filename = filename
 	end
 
@@ -63,7 +66,7 @@ class TemplateRenderer
 		# have write access to the source root (for example, when Passenger
 		# Standalone is compiling its runtime), so we only write to the file
 		# when necessary.
-		if File.writable?(filename) || File.read(filename) != text
+		if !File.exist?(filename) || File.writable?(filename) || File.read(filename) != text
 			File.open(filename, 'w') do |f|
 				f.write(text)
 			end
@@ -125,7 +128,6 @@ end
 
 PACKAGE_NAME    = PhusionPassenger::PACKAGE_NAME
 PACKAGE_VERSION = PhusionPassenger::VERSION_STRING
-PACKAGE_SIGNING_KEY = string_option('PACKAGE_SIGNING_KEY', '0x0A212A8C')
 MAINTAINER_NAME  = "Phusion"
 MAINTAINER_EMAIL = "info@phusion.nl"
 
@@ -173,6 +175,7 @@ EXTRA_CXXFLAGS << " -mno-tls-direct-seg-refs" if PlatformInfo.requires_no_tls_di
 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_CXXFLAGS << " -DPASSENGER_DISABLE_THREAD_LOCAL_STORAGE" if !boolean_option('PASSENGER_THREAD_LOCAL_STORAGE', true)
 
 # Extra linker flags that should always be passed to the linker.
 # These should be included first in the command string, before anything else.

data/build/debian.rb

@@ -22,24 +22,32 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+require 'phusion_passenger/constants'
 require 'build/preprocessor'
 
-ALL_DISTRIBUTIONS  = ["raring", "quantal", "precise", "lucid"]
+# If you change the default distribution list, don't forget to update the configuration
+# file in passenger_apt_automation too: https://github.com/phusion/passenger_apt_automation
+ALL_DISTRIBUTIONS  = string_option("DEBIAN_DISTROS", "raring precise lucid").split(/[ ,]/)
 DEBIAN_NAME        = "ruby-passenger"
 DEBIAN_EPOCH       = 1
+DEBIAN_ARCHS       = string_option("DEBIAN_ARCHS", "i386 amd64").split(/[ ,]/)
 DEBIAN_ORIG_TARBALL_FILES = lambda { PhusionPassenger::Packaging.debian_orig_tarball_files }
 
-def create_debian_package_dir(distribution)
+def create_debian_package_dir(distribution, output_dir = PKG_DIR)
 	require 'time'
 
 	variables = {
 		:distribution => distribution
 	}
 
-	root = "#{PKG_DIR}/#{distribution}"
+	root = "#{output_dir}/#{distribution}"
+	orig_tarball = File.expand_path("#{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz")
+
 	sh "rm -rf #{root}"
 	sh "mkdir -p #{root}"
-	recursive_copy_files(DEBIAN_ORIG_TARBALL_FILES.call, root)
+	sh "cd #{root} && tar xzf #{orig_tarball}"
+	sh "bash -c 'shopt -s dotglob && mv #{root}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}/* #{root}'"
+	sh "rmdir #{root}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}"
 	recursive_copy_files(Dir["debian.template/**/*"], root,
 		true, variables)
 	sh "mv #{root}/debian.template #{root}/debian"
@@ -62,9 +70,19 @@ task 'debian:orig_tarball' => Packaging::PREGENERATED_FILES do
 			"It will not be regenerated. If you are sure that the orig tarball is outdated, please delete it " +
 			"and rerun this task."
 	else
+		require 'phusion_passenger/constants'
+		sh "mkdir -p #{PKG_DIR}"
+		nginx_version = PhusionPassenger::PREFERRED_NGINX_VERSION
+		local_nginx_tarball = File.expand_path("#{PKG_DIR}/nginx-#{nginx_version}.tar.gz")
+		if File.exist?(local_nginx_tarball)
+			puts "#{local_nginx_tarball} already exists"
+		else
+			sh "curl -L -o #{local_nginx_tarball} http://nginx.org/download/nginx-#{nginx_version}.tar.gz"
+		end
 		sh "rm -rf #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}"
 		sh "mkdir -p #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}"
 		recursive_copy_files(DEBIAN_ORIG_TARBALL_FILES.call, "#{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}")
+		sh "cd #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION} && tar xzf #{local_nginx_tarball}"
 		sh "cd #{PKG_DIR} && tar -c #{DEBIAN_NAME}_#{PACKAGE_VERSION} | gzip --best > #{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz"
 	end
 end
@@ -74,13 +92,10 @@ task 'debian:dev' do
 	sh "rm -f #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz"
 	Rake::Task["debian:clean"].invoke
 	Rake::Task["debian:orig_tarball"].invoke
-	case distro = string_option('DISTRO', 'current')
-	when 'current'
+	if string_option('DISTRO').nil?
 		distributions = [File.read("/etc/lsb-release").scan(/^DISTRIB_CODENAME=(.+)/).first.first]
-	when 'all'
-		distributions = ALL_DISTRIBUTIONS
 	else
-		distributions = distro.split(',')
+		distributions = ALL_DISTRIBUTIONS
 	end
 	distributions.each do |distribution|
 		create_debian_package_dir(distribution)
@@ -113,29 +128,61 @@ task 'debian:dev:reinstall' do
 	end
 end
 
-desc "Build Debian source packages to be uploaded to repositories"
-task 'debian:production' => 'debian:orig_tarball' do
+desc "Build official Debian source packages"
+task 'debian:source_packages' => 'debian:orig_tarball' do
 	if boolean_option('USE_CCACHE', false)
 		# The resulting Debian rules file must not set USE_CCACHE.
-		abort "USE_CCACHE must be returned off when running the debian:production task."
+		abort "USE_CCACHE must be returned off when running the debian:source_packages task."
 	end
-	if filename = string_option('GPG_PASSPHRASE_FILE')
-		filename = File.expand_path(filename)
-		if !File.exist?(filename)
-			abort "GPG passphrase file #{filename} does not exist!"
-		end
-		if File.stat(filename).mode != 0100600
-			abort "The GPG passphrase file #{filename} must be chmodded 0600!"
-		end
-		gpg_options = "-p'gpg --passphrase-file #{filename} --no-use-agent'"
+
+	pkg_dir = "#{PKG_DIR}/official"
+	if File.exist?(pkg_dir)
+		abort "#{pkg_dir} must not already exist when running the debian:source_packages task."
 	end
+	sh "mkdir #{pkg_dir}"
+	sh "cd #{pkg_dir} && ln -s ../#{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz ."
 
 	ALL_DISTRIBUTIONS.each do |distribution|
-		create_debian_package_dir(distribution)
-		sh "cd #{PKG_DIR}/#{distribution} && dpkg-checkbuilddeps"
+		create_debian_package_dir(distribution, pkg_dir)
 	end
 	ALL_DISTRIBUTIONS.each do |distribution|
-		sh "cd #{PKG_DIR}/#{distribution} && debuild -S -sa #{gpg_options} -k#{PACKAGE_SIGNING_KEY}"
+		sh "cd #{pkg_dir}/#{distribution} && debuild -S -us -uc"
+	end
+end
+
+def pbuilder_base_name(distribution, arch)
+	if arch == "amd64"
+		return distribution
+	else
+		return "#{distribution}-#{arch}"
+	end
+end
+
+desc "Build official Debian binary packages"
+task 'debian:binary_packages' do
+	pkg_dir = "#{PKG_DIR}/official"
+	if !File.exist?(pkg_dir)
+		abort "Please run rake debian:source_packages first."
+	end
+
+	all_distributions = [string_option('DISTRO') || ALL_DISTRIBUTIONS].flatten
+	pbuilder_dir = File.expand_path("~/pbuilder")
+
+	all_distributions.each do |distribution|
+		DEBIAN_ARCHS.each do |arch|
+			pbase_name = pbuilder_base_name(distribution, arch) + "-base.tgz"
+			if !File.exist?("#{pbuilder_dir}/#{pbase_name}")
+				abort "Missing pbuilder environment for #{distribution}-#{arch}. " +
+					"Please run this first: pbuilder-dist #{distribution} #{arch} create"
+			end
+		end
+	end
+
+	all_distributions.each do |distribution|
+		base_name = "#{DEBIAN_NAME}_#{PACKAGE_VERSION}-1~#{distribution}1"
+		DEBIAN_ARCHS.each do |arch|
+			sh "cd #{pkg_dir} && pbuilder-dist #{distribution} #{arch} build #{base_name}.dsc"
+		end
 	end
 end
 
@@ -143,7 +190,7 @@ desc "Clean Debian packaging products, except for orig tarball"
 task 'debian:clean' do
 	files = Dir["#{PKG_DIR}/*.{changes,build,deb,dsc,upload}"]
 	sh "rm -f #{files.join(' ')}"
-	sh "rm -rf #{PKG_DIR}/dev"
+	sh "rm -rf #{PKG_DIR}/official"
 	ALL_DISTRIBUTIONS.each do |distribution|
 		sh "rm -rf #{PKG_DIR}/#{distribution}"
 	end

data/build/nginx.rb

@@ -21,6 +21,14 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+auto_generated_sources = [
+	'ext/nginx/ConfigurationCommands.c',
+	'ext/nginx/CreateLocationConfig.c',
+	'ext/nginx/MergeLocationConfig.c',
+	'ext/nginx/CacheLocationConfig.c',
+	'ext/nginx/ConfigurationFields.h'
+]
+
 desc "Build Nginx support files"
 task :nginx => [
 	:nginx_without_native_support,
@@ -28,6 +36,7 @@ task :nginx => [
 ].compact
 
 task :nginx_without_native_support => [
+	auto_generated_sources,
 	AGENT_OUTPUT_DIR + 'PassengerHelperAgent',
 	AGENT_OUTPUT_DIR + 'PassengerWatchdog',
 	AGENT_OUTPUT_DIR + 'PassengerLoggingAgent',
@@ -40,3 +49,18 @@ desc "Clean all compiled Nginx files"
 task 'nginx:clean' => 'common:clean' do
 	# Nothing to clean at this time.
 end
+
+def create_nginx_auto_generated_source_task(source)
+	dependencies = [
+		"#{source}.erb",
+		'lib/phusion_passenger/nginx/config_options.rb'
+	]
+	file(source => dependencies) do
+		template = TemplateRenderer.new("#{source}.erb")
+		template.render_to(source)
+	end
+end
+
+auto_generated_sources.each do |source|
+	create_nginx_auto_generated_source_task(source)
+end