passenger 4.0.14 → 4.0.16

data/build/packaging.rb

@@ -63,10 +63,12 @@ end
 desc "Build, sign & upload gem & tarball"
 task 'package:release' => ['package:set_official', 'package:gem', 'package:tarball', 'package:sign'] do
 	require 'phusion_passenger'
+	require 'phusion_passenger/platform_info'
 	require 'yaml'
 	require 'uri'
 	require 'net/http'
 	require 'net/https'
+	require 'digest/sha1'
 	basename   = "#{PhusionPassenger::PACKAGE_NAME}-#{PhusionPassenger::VERSION_STRING}"
 	version    = PhusionPassenger::VERSION_STRING
 	is_enterprise  = basename =~ /enterprise/
@@ -88,6 +90,11 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 			"admin_password: ..."
 	end
 
+	if !PhusionPassenger::PlatformInfo.find_command("hub")
+		STDERR.puts "-------------------"
+		abort "*** ERROR: Please 'brew install hub' first"
+	end
+
 	tag = "#{tag_prefix}-#{version}"
 	sh "git tag -s #{tag} -u 0A212A8C -m 'Release #{version}'"
 
@@ -96,8 +103,9 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 		sh "git push origin #{tag_prefix}-#{version}"
 		
 		if is_open_source
-			sh "s3cmd -P put pkg/passenger-#{version}.{gem,tar.gz,gem.asc,tar.gz.asc} s3://phusion-passenger/releases/"
-			sh "gem push pkg/passenger-#{version}.gem"
+			sh "s3cmd -P put #{PKG_DIR}/passenger-#{version}.{gem,tar.gz,gem.asc,tar.gz.asc} s3://phusion-passenger/releases/"
+			sh "gem push #{PKG_DIR}/passenger-#{version}.gem"
+
 			puts "Updating version number on website..."
 			if is_beta
 				uri = URI.parse("https://www.phusionpassenger.com/latest_beta_version")
@@ -116,6 +124,30 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 					"Status: #{response.code}\n\n" +
 					response.body
 			end
+
+			puts "Submitting Homebrew pull request..."
+			sha1 = File.open("#{PKG_DIR}/passenger-#{version}.tar.gz", "rb") do |f|
+				Digest::SHA1.hexdigest(f.read)
+			end
+			sh "rm -rf /tmp/homebrew"
+			sh "git clone https://github.com/mxcl/homebrew.git /tmp/homebrew"
+			formula = File.read("/tmp/homebrew/Library/Formula/passenger.rb")
+			formula.gsub!(/passenger-.+?\.tar\.gz/, "passenger-#{version}.tar.gz") ||
+				abort("Unable to substitute Homebrew formula tarball filename")
+			formula.gsub!(/sha1 .*/, "sha1 '#{sha1}'") ||
+				abort("Unable to substitute Homebrew formula SHA-1")
+			File.open("/tmp/homebrew/Library/Formula/passenger.rb", "w") do |f|
+				f.write(formula)
+			end
+			sh "cd /tmp/homebrew && hub pull-request 'Update passenger to version #{version}' -h release-#{version}"
+
+			puts "Initiating building of Debian packages"
+			command = "cd /srv/passenger_apt_automation && " +
+				"chpst -L /tmp/passenger_apt_automation.lock " +
+				"./new_release https://github.com/phusion/passenger.git passenger.repo passenger.apt release-#{version}"
+			sh "ssh psg_apt_automation@juvia-helper.phusion.nl at now <<<'#{command}'"
+
+			puts "Building OS X binaries..."
 			sh "cd ../passenger_autobuilder && " +
 				"git pull && " +
 				"./autobuild-osx https://github.com/phusion/passenger.git passenger psg_autobuilder_chroot@juvia-helper.phusion.nl --tag=#{tag}"
@@ -124,8 +156,18 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 		else
 			dir = "/u/apps/passenger_website/shared"
 			subdir = string_option('NAME', version)
-			sh "scp pkg/#{basename}.{gem,tar.gz,gem.asc,tar.gz.asc} app@shell.phusion.nl:#{dir}/"
+			sh "scp #{PKG_DIR}/#{basename}.{gem,tar.gz,gem.asc,tar.gz.asc} app@shell.phusion.nl:#{dir}/"
 			sh "ssh app@shell.phusion.nl 'mkdir -p \"#{dir}/assets/#{subdir}\" && mv #{dir}/#{basename}.{gem,tar.gz,gem.asc,tar.gz.asc} \"#{dir}/assets/#{subdir}/\"'"
+			sh "curl -F file=@#{PKG_DIR}/#{basename}.gem --user admin:#{website_config['admin_password']} " +
+				"https://www.phusionpassenger.com/enterprise_gems/upload"
+
+			puts "Initiating building of Debian packages"
+			git_url = `git config remote.origin.url`.strip
+			command = "cd /srv/passenger_apt_automation && " +
+				"chpst -L /tmp/passenger_apt_automation.lock " +
+				"./new_release #{git_url} passenger-enterprise.repo passenger-enterprise.apt enterprise-#{version}"
+			sh "ssh psg_apt_automation@juvia-helper.phusion.nl at now <<<'#{command}'"
+
 			sh "cd ../passenger_autobuilder && " +
 				"git pull && " +
 				"./autobuild-osx TODO passenger-enterprise psg_autobuilder_chroot@juvia-helper.phusion.nl --tag=#{tag}"

data/debian.template/{control → control.template}

@@ -4,24 +4,33 @@ Priority: optional
 Maintainer: John Leach <john@brightbox.co.uk>
 Uploaders: Phusion <info@phusion.nl>, Hongli Lai <hongli@phusion.nl>
 Build-Depends: debhelper (>= 7.0.50~), rake,
- ruby1.8, ruby1.8-dev, rubygems, ruby1.9.1, ruby1.9.1-dev,
+ ruby1.8, ruby1.8-dev, rubygems1.8,
+ ruby1.9.1, ruby1.9.1-dev,
  apache2-mpm-worker | apache2-mpm, apache2-threaded-dev,
- libapr1-dev, libcurl4-openssl-dev, libev-dev (>= 1:4.0.0)
+#if is_distribution?('<= lucid')
+	 rubygems1.9,
+#endif
+#if is_distribution?('>= precise')
+     libev-dev (>= 1:4.0.0),
+#endif
+ libapr1-dev, libcurl4-openssl-dev
 Standards-Version: 3.9.3
 Homepage: https://www.phusionpassenger.com/
-Vcs-Git: git://github.com/johnl/deb-passenger.git
-Vcs-Browser: https://github.com/johnl/deb-passenger
+Vcs-Git: git://github.com/phusion/passenger.git
+Vcs-Browser: https://github.com/phusion/passenger
 XS-Ruby-Versions: all
 
 Package: ruby-passenger
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, rubygems (>= 1.2), ruby-rack
-Recommends: ruby-passenger-doc (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
+ rubygems (>= 1.2), ruby-rack, ruby-daemon-controller
+Recommends: ruby-passenger-doc (= ${binary:Version}), ruby-passenger-dev (= ${binary:Version}),
+ crash-watch
 Suggests: python
 Breaks: libapache2-mod-passenger (<< 1:3.9.1), passenger-common,
  passenger-common1.8, passenger-common1.9.1
-Replaces: libapache2-mod-passenger (<< 1:3.9.1),
- passenger-common, passenger-common1.8, passenger-common1.9.1
+Replaces: libapache2-mod-passenger (<< 1:3.9.1), passenger-common,
+ passenger-common1.8, passenger-common1.9.1
 Description: Rails and Rack support for Apache2 and Nginx
  Phusion Passenger — a.k.a. mod_rails or mod_rack — makes
  deployment of Ruby web applications, such as those built on the

data/debian.template/ruby-passenger.install.template

@@ -1,4 +1,5 @@
 usr/lib/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/agents/
+nginx-<%= PhusionPassenger::PREFERRED_NGINX_VERSION %>/objs/nginx usr/lib/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/
 usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/helper-scripts/
 usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/templates/
 usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/standalone_default_root/

data/debian.template/rules.template

@@ -1,7 +1,9 @@
 #!/usr/bin/make -f
 # export DH_VERBOSE=1
 
-export USE_VENDORED_LIBEV=false
+#if is_distribution?('>= precise')
+    export USE_VENDORED_LIBEV=false
+#endif
 
 #if ['1', 'true', 'on', 'yes'].include?(ENV['USE_CCACHE'])
 	export USE_CCACHE=1
@@ -18,19 +20,23 @@ override_dh_auto_build:
 	mv pkg/fakeroot pkg/fakeroot1.8
 	/usr/bin/ruby1.9.1 /usr/bin/rake fakeroot
 	mv pkg/fakeroot pkg/fakeroot1.9.1
+	cd nginx-<%= PhusionPassenger::PREFERRED_NGINX_VERSION %> && \
+		./configure --prefix=/tmp \
+		<%= PhusionPassenger::STANDALONE_NGINX_CONFIGURE_OPTIONS %> \
+		--add-module=`pwd`/../ext/nginx && \
+		make
 
 override_dh_auto_install:
 	mkdir debian/tmp/
 	# Merge Ruby 1.8 and 1.9 files into a single directory.
 	cp -a pkg/fakeroot1.8/* debian/tmp/
 	cp -a pkg/fakeroot1.9.1/* debian/tmp/
-	# Do not package Passenger Standalone.
-	rm -rf debian/tmp/usr/bin/passenger
 	touch debian/tmp/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/release.txt
 
 override_dh_auto_clean:
 	/usr/bin/rake clean CLEAN_DOCS=false
 	rm -rf pkg/fakeroot1.8
 	rm -rf pkg/fakeroot1.9.1
+	cd nginx-<%= PhusionPassenger::PREFERRED_NGINX_VERSION %> && if test -f Makefile; then make clean; fi
 	# Hack to prevent HTML files from being renegerated
 	touch doc/*.html

data/dev/run_travis.sh

@@ -24,6 +24,16 @@ function run()
 function apt_get_update() {
 	if [[ "$apt_get_updated" = "" ]]; then
 		apt_get_updated=1
+		if [[ "$TEST_DEBIAN_PACKAGING" = 1 ]]; then
+			if ! [[ -e /usr/bin/add-apt-repository ]]; then
+				run sudo apt-get update
+				run sudo apt-get install -y --no-install-recommends python-software-properties
+				if ! [[ -e /usr/bin/add-apt-repository ]]; then
+					run sudo apt-get install -y --no-install-recommends software-properties-common
+				fi
+			fi
+			run sudo add-apt-repository -y ppa:phusion.nl/misc
+		fi
 		run sudo apt-get update
 	fi
 }
@@ -49,6 +59,10 @@ run lsb_release -a
 sudo tee /etc/dpkg/dpkg.cfg.d/02apt-speedup >/dev/null <<<"force-unsafe-io"
 cp test/config.json.travis test/config.json
 
+# Relax permissions on home directory so that the application root
+# permission checks pass.
+chmod g+x,o+x $HOME
+
 if [[ "$TEST_RUBY_VERSION" != "" ]]; then
 	echo "$ rvm use $TEST_RUBY_VERSION"
 	if [[ -f ~/.rvm/scripts/rvm ]]; then

data/doc/Users guide Apache.idmap.txt

@@ -30,41 +30,43 @@
 
 2.5. Installing or upgrading on Red Hat, Fedora, CentOS or ScientificLinux	=>	installing-or-upgrading-on-red-hat-fedora-centos-or-scientificlinux-1y5ie8b
 
-2.6. Upgrading from open source to Enterprise	=>	upgrading-from-open-source-to-enterprise-b17h8g
+2.6. Installing or upgrading on Mac OS X with Homebrew	=>	installing-or-upgrading-on-mac-os-x-with-homebrew-1pia1cx
 
-2.7. Cryptographic verification of installation files	=>	cryptographic-verification-of-installation-files-ed3r9v
+2.7. Upgrading from open source to Enterprise	=>	upgrading-from-open-source-to-enterprise-b17h8g
 
-2.7.1. Synopsis	=>	synopsis-uwnz2o
+2.8. Cryptographic verification of installation files	=>	cryptographic-verification-of-installation-files-ed3r9v
 
-2.7.2. Importing the Phusion Software Signing key	=>	importing-the-phusion-software-signing-key-1x0rhv
+2.8.1. Synopsis	=>	synopsis-uwnz2o
 
-2.7.3. Verifying the Phusion Software Signing key	=>	verifying-the-phusion-software-signing-key-10430lg
+2.8.2. Importing the Phusion Software Signing key	=>	importing-the-phusion-software-signing-key-1x0rhv
 
-2.7.4. Verifying the gem and tarball	=>	verifying-the-gem-and-tarball-1nf0uov
+2.8.3. Verifying the Phusion Software Signing key	=>	verifying-the-phusion-software-signing-key-10430lg
 
-2.7.5. Verifying Git signatures	=>	verifying-git-signatures-oaafwd
+2.8.4. Verifying the gem and tarball	=>	verifying-the-gem-and-tarball-1nf0uov
 
-2.7.6. Verifying DEB and RPM packages	=>	verifying-deb-and-rpm-packages-vgtv04
+2.8.5. Verifying Git signatures	=>	verifying-git-signatures-oaafwd
 
-2.7.7. Revocation	=>	revocation-4o01n2
+2.8.6. Verifying DEB and RPM packages	=>	verifying-deb-and-rpm-packages-vgtv04
 
-2.8. Non-interactive, automatic, headless installs or upgrades	=>	non-interactive-automatic-headless-installs-or-upgrades-1arnxii
+2.8.7. Revocation	=>	revocation-4o01n2
 
-2.9. Customizing the compilation process	=>	customizing-the-compilation-process-1sds3od
+2.9. Non-interactive, automatic, headless installs or upgrades	=>	non-interactive-automatic-headless-installs-or-upgrades-1arnxii
 
-2.9.1. Setting the compiler	=>	setting-the-compiler-1symq7h
+2.10. Customizing the compilation process	=>	customizing-the-compilation-process-1sds3od
 
-2.9.2. Adding additional compiler or linker flags	=>	adding-additional-compiler-or-linker-flags-wzu0ey
+2.10.1. Setting the compiler	=>	setting-the-compiler-1symq7h
 
-2.9.3. Forcing location of command line tools and dependencies	=>	forcing-location-of-certain-command-line-tools-1hym30u
+2.10.2. Adding additional compiler or linker flags	=>	adding-additional-compiler-or-linker-flags-wzu0ey
 
-2.10. Working with the Apache configuration file	=>	locating-the-apache-configuration-file-1fterqv
+2.10.3. Forcing location of command line tools and dependencies	=>	forcing-location-of-certain-command-line-tools-1hym30u
 
-2.11. Disabling without uninstalling	=>	unloading-disabling-phusion-passenger-from-apache-without-uninstalling-it-s1axnx
+2.11. Working with the Apache configuration file	=>	locating-the-apache-configuration-file-1fterqv
 
-2.12. Uninstalling	=>	uninstalling-phusion-passenger-1qb4ssq
+2.12. Disabling without uninstalling	=>	unloading-disabling-phusion-passenger-from-apache-without-uninstalling-it-s1axnx
 
-2.13. Moving to a different directory	=>	moving-to-a-different-directory-1n0gkwh
+2.13. Uninstalling	=>	uninstalling-phusion-passenger-1qb4ssq
+
+2.14. Moving to a different directory	=>	moving-to-a-different-directory-1n0gkwh
 
 3. Deploying a Ruby on Rails 1.x or 2.x (but NOT Rails >= 3.x) application	=>	deploying-a-ruby-on-rails-1-x-or-2-x-but-not-rails-3-x-application-9r92hi
 
@@ -132,55 +134,61 @@
 
 6.10. PassengerRestartDir <directory>	=>	passengerrestartdir-directory--1fmhmv0
 
-6.11. PassengerBufferResponse <on|off>	=>	passengerbufferresponse-on-off--1y7ilka
+6.11. PassengerRollingRestarts <on|off>	=>	passengerrollingrestarts
+
+6.12. PassengerResistDeploymentErrors <on|off>	=>	passengerresistdeploymenterrors
+
+6.13. Security options	=>	security-options-1pb75ho
+
+6.13.1. PassengerUserSwitching <on|off>	=>	passengeruserswitching
 
-6.12. PassengerRollingRestarts <on|off>	=>	passengerrollingrestarts
+6.13.2. PassengerUser <username>	=>	passengeruser
 
-6.13. PassengerResistDeploymentErrors <on|off>	=>	passengerresistdeploymenterrors
+6.13.3. PassengerGroup <group name>	=>	passengergroup
 
-6.14. Security options	=>	security-options-1pb75ho
+6.13.4. PassengerDefaultUser <username>	=>	passengerdefaultuser
 
-6.14.1. PassengerUserSwitching <on|off>	=>	passengeruserswitching
+6.13.5. PassengerDefaultGroup <group name>	=>	passengerdefaultgroup
 
-6.14.2. PassengerUser <username>	=>	passengeruser
+6.13.6. PassengerFriendlyErrorPages <on|off>	=>	passengerfriendlyerrorpages
 
-6.14.3. PassengerGroup <group name>	=>	passengergroup
+6.14. Resource control and optimization options	=>	resource-control-and-optimization-options-zu2f7u
 
-6.14.4. PassengerDefaultUser <username>	=>	passengerdefaultuser
+6.14.1. PassengerMaxPoolSize <integer>	=>	passengermaxpoolsize-integer--am64q8
 
-6.14.5. PassengerDefaultGroup <group name>	=>	passengerdefaultgroup
+6.14.2. PassengerMinInstances <integer>	=>	passengermininstances-integer--wegq6b
 
-6.14.6. PassengerFriendlyErrorPages <on|off>	=>	passengerfriendlyerrorpages
+6.14.3. PassengerMaxInstances <integer>	=>	passengermaxinstances
 
-6.15. Resource control and optimization options	=>	resource-control-and-optimization-options-zu2f7u
+6.14.4. PassengerMaxInstancesPerApp <integer>	=>	passengermaxinstancesperapp
 
-6.15.1. PassengerMaxPoolSize <integer>	=>	passengermaxpoolsize-integer--am64q8
+6.14.5. PassengerPoolIdleTime <integer>	=>	passengerpoolidletime-integer--a3gunq
 
-6.15.2. PassengerMinInstances <integer>	=>	passengermininstances-integer--wegq6b
+6.14.6. PassengerMaxPreloaderIdleTime <integer>	=>	railsappspawneridletime-integer--1awgog1
 
-6.15.3. PassengerMaxInstances <integer>	=>	passengermaxinstances
+6.14.7. PassengerStartTimeout <seconds>	=>	passengerstarttimeout-seconds--ihnfku
 
-6.15.4. PassengerMaxInstancesPerApp <integer>	=>	passengermaxinstancesperapp
+6.14.8. PassengerConcurrencyModel <process|thread>	=>	passengerconcurrencymodel-process-thread--1eipofj
 
-6.15.5. PassengerPoolIdleTime <integer>	=>	passengerpoolidletime-integer--a3gunq
+6.14.9. PassengerThreadCount <number>	=>	passengerthreadcount-number--10jl64a
 
-6.15.6. PassengerMaxPreloaderIdleTime <integer>	=>	railsappspawneridletime-integer--1awgog1
+6.14.10. PassengerMaxRequests <integer>	=>	passengermaxrequests-integer--17qkw9n
 
-6.15.7. PassengerConcurrencyModel <process|thread>	=>	passengerconcurrencymodel-process-thread--1eipofj
+6.14.11. PassengerMaxRequestTime <seconds>	=>	passengermaxrequesttime-seconds--127v1i2
 
-6.15.8. PassengerThreadCount <number>	=>	passengerthreadcount-number--10jl64a
+6.14.12. PassengerMemoryLimit <integer>	=>	passengermemorylimit-integer--18irza1
 
-6.15.9. PassengerMaxRequests <integer>	=>	passengermaxrequests-integer--17qkw9n
+6.14.13. PassengerStatThrottleRate <integer>	=>	passengerstatthrottlerate-integer--1dcfda3
 
-6.15.10. PassengerMaxRequestTime <seconds>	=>	passengermaxrequesttime-seconds--127v1i2
+6.14.14. PassengerPreStart <url>	=>	passengerprestart-url--1utb57k
 
-6.15.11. PassengerMemoryLimit <integer>	=>	passengermemorylimit-integer--18irza1
+6.14.15. PassengerHighPerformance <on|off>	=>	passengerhighperformance-on-off--nvfa86
 
-6.15.12. PassengerStatThrottleRate <integer>	=>	passengerstatthrottlerate-integer--1dcfda3
+6.15. Connection handling options	=>	connection-handling-options-1k3zd1a
 
-6.15.13. PassengerPreStart <url>	=>	passengerprestart-url--1utb57k
+6.15.1. PassengerBufferResponse <on|off>	=>	passengerbufferresponse-on-off--1y7ilka
 
-6.15.14. PassengerHighPerformance <on|off>	=>	passengerhighperformance-on-off--nvfa86
+6.15.2. passenger_max_request_queue_size <number>	=>	passenger-max-request-queue-size-number--1f1uocd
 
 6.16. Compatibility options	=>	compatibility-options-8jve5a
 
@@ -308,7 +316,7 @@
 
 9.7. How to fix broken images/CSS/JavaScript URIs in sub-URI deployments	=>	how-to-fix-broken-images-css-javascript-uris-in-sub-uri-deployments-a63b6r
 
-9.8. Out-of-Band Garbage Work and Out-of-Band Garbage Collection	=>	out-of-band-garbage-work-and-out-of-band-garbage-collection-kav2p8
+9.8. Out-of-Band Work and Out-of-Band Garbage Collection	=>	out-of-band-work-and-out-of-band-garbage-collection-kav2p8
 
 9.9. Flying Passenger	=>	flying-passenger-q916f7
 
@@ -320,7 +328,9 @@
 
 9.9.4. Managing the Flying Passenger daemon	=>	managing-the-flying-passenger-daemon-1bng2bu
 
-9.9.5. Caveats and limitations	=>	caveats-and-limitations-lz3rbb
+9.9.5. Using Flying Passenger with MRI 1.8 or JRuby	=>	using-flying-passenger-with-mri-1-8-or-jruby-f5tbvs
+
+9.9.6. Caveats and limitations	=>	caveats-and-limitations-lz3rbb
 
 9.10. X-Sendfile support	=>	x-sendfile-support-1cgyykw
 
@@ -328,11 +338,17 @@
 
 10. Under the hood	=>	under-the-hood-21ue5t
 
-10.1. Static assets serving	=>	static-assets-serving-wo2d9v
+10.1. Page caching support	=>	page-caching-support-kwq9b9
+
+10.2. Phusion Passenger and its relationship with Ruby	=>	phusion-passenger-and-its-relationship-with-ruby-1eq08ff
+
+10.2.1. How Ruby is used	=>	how-ruby-is-used-14r83nr
+
+10.2.2. When the system has multiple Ruby interpreters	=>	when-the-system-has-multiple-ruby-interpreters-10tm1fq
 
-10.2. Page caching support	=>	page-caching-support-kwq9b9
+10.3. Static assets serving	=>	static-assets-serving-wo2d9v
 
-10.3. How Phusion Passenger detects whether a virtual host is a web application	=>	how-phusion-passenger-detects-whether-a-virtual-host-is-a-web-application-179mp8m
+10.4. How Phusion Passenger detects whether a virtual host is a web application	=>	how-phusion-passenger-detects-whether-a-virtual-host-is-a-web-application-179mp8m
 
 11. Appendix A: About this document	=>	appendix-a-about-this-document-103toqs
 

data/doc/Users guide Apache.txt

@@ -506,7 +506,9 @@ The relationship between `PassengerDefaultRuby` and `PassengerRuby` is as follow
  * `PassengerRuby` may occur everywhere: in the global server configuration, in `<VirtualHost>`, in `<Directory>`, in `<Location>`, and in '.htaccess' if `AllowOverride Options` is on.
  * You don't *have* to specify `PassengerRuby`. In this case `PassengerDefaultRuby` is used as the Ruby interpreter. But if you do specify `PassengerRuby` then it will override `PassengerDefaultRuby` in that context. This allows you to use `PassengerRuby` to specify a different Ruby interpreter on a per-application basis.
 
-Phusion Passenger not only uses Ruby to run web apps, but also for running certain helper tools that are written in Ruby, e.g. the internal helper script used by <<PassengerPreStart,PassengerPreStart>>. These tools are always run using `PassengerDefaultRuby`, never by `PassengerRuby`. `PassengerRuby` is only used for running web apps.
+Phusion Passenger not only uses Ruby to run web apps, but also for running certain helper tools that are written in Ruby, e.g. the internal helper script used by <<PassengerPreStart,PassengerPreStart>>. These tools are always run using `PassengerDefaultRuby`, never by `PassengerRuby`. `PassengerRuby` is only used for running web apps. You can learn more about the internal helper scripts in <<relationship_with_ruby,Phusion Passenger and its relationship with Ruby>>.
+
+It is okay if `PassengerDefaultRuby` refers to a different Ruby interpreter than the one you originally installed Phusion Passenger with. This too is explained in <<relationship_with_ruby,Phusion Passenger and its relationship with Ruby>>.
 
 The reason why `PassengerDefaultRuby` exists at all is because limitations in the Apache API prevents us from implementing the same behavior using only the `PassengerRuby` directive.
 
@@ -593,12 +595,12 @@ This subsection attempts to describe spawn methods, but it's okay if you don't (
 understand it, as it's mostly a technical detail. You can basically follow this rule of thumb:
 
 ************************************************
-If your application works on Mongrel, but not on Phusion Passenger, then set
-`PassengerSpawnMethod` to 'conservative'. Otherwise, leave it at 'smart-lv2' (the default).
+If your application works on Mongrel or Thin, but not on Phusion Passenger, then set
+`PassengerSpawnMethod` to 'direct'. Otherwise, leave it at 'smart' (the default).
 ************************************************
 
-However, we do recommend you to try to understand it. The 'smart' and 'smart-lv2' spawn
-methods bring many benefits.
+However, we do recommend you to try to understand it. The 'smart' spawn
+method bring many benefits.
 =========================================================
 
 include::users_guide_snippets/passenger_spawn_method.txt[]
@@ -608,7 +610,7 @@ This option may occur in the following places:
  * In the global server configuration.
  * In a virtual host configuration block.
 
-In each place, it may be specified at most once. The default value is 'smart-lv2'.
+In each place, it may be specified at most once. The default value is 'smart'.
 
 [[PassengerEnabled]]
 === PassengerEnabled <on|off> ===
@@ -761,84 +763,6 @@ allow the attacker to cause a Denial-of-Service.
 You can prevent this from happening by pointing PassengerRestartDir to a
 directory that's readable by Apache, but only writable by administrators.
 
-[[PassengerBufferResponse]]
-=== PassengerBufferResponse <on|off> ===
-When turned on, application-generated responses are buffered by Apache. Buffering will
-happen in memory.
-
-Before we proceed with explaining this configuration option, we want to state the following to avoid confusion. If you use Phusion Passenger for Apache, there are in fact two response buffering systems active:
-
-1. The Apache response buffering system. `PassengerBufferResponse` turns this on or off.
-2. The Phusion Passenger response buffering system, a.k.a. 'real-time disk-backed response buffering'. This buffering system is always on, regardless of the value of `PassengerBufferResponse`.
-
-Response buffering is useful because it protects against slow HTTP clients that do not read responses immediately or quickly enough. Buffering prevents such slow clients from blocking web applications that have limited concurrency. Because Phusion Passenger's response buffering is always turned on, you are always protected. Therefore, `PassengerBufferResponse` is off by default, and you never should have to turn it on.
-
-If for whatever reason you want to turn Apache-level response buffering on, you can do so with this option.
-
-Apache's response buffering works differently from Phusion Passenger's. Apache's buffering system buffers the entire response before attempting to send it to the client, while Phusion Passenger's attempts to send the data to the client immediately. Therefore, if you turn on `PassengerBufferResponse`, you may interfere with applications that want to stream responses to the client.
-Apache's version also buffers to memory only, making it problematic for large responses. Phusion Passenger's version buffers to disk when the response exceeds a certain threshold.
-
-How does response buffering - whether it's done by Apache or by Phusion Passenger - exactly protect against slow clients?
-Consider an HTTP client that's on a dial-up modem link, and your
-application process generates a 2 MB response. If the response is buffered
-then your application process will be blocked until the entire 2 MB has been
-sent out to the HTTP client. This disallows your application process to do any useful
-work in the mean time. By buffering responses, Phusion Passenger or Apache will read
-the application response as quickly as possible and will take care of forwarding the data
-to slow clients.
-
-So keep in mind that enabling `passenger_buffering_response` will make streaming responses
-impossible. Consider for example this piece of Rails code:
-
---------------------------------
-render :text => lambda { |response, output|
-    10.times do |i|
-        output.write("entry #{i}\n")
-        output.flush
-        sleep 1
-    end
-}
---------------------------------
-
-...or this piece of Rack code:
-
---------------------------------
-class Response
-    def each
-        10.times do |i|
-            yield("entry #{i}\n")
-            sleep 1
-        end
-    end
-end
-
-app = lambda do |env|
-    [200, { "Content-Type" => "text/plain" }, Response.new]
-end
---------------------------------
-
-When `PassengerBufferResponse` is turned on, Apache will wait until
-the application is done sending the entire response before forwarding it
-to the client. The client will not receive anything for 10 seconds,
-after which it receives the entire response at once.
-When `PassengerBufferResponse` is turned off, it works as expected: the client
-receives an "entry X" message every second for 10 seconds.
-
-This option may occur in the following places:
-
- * In the global server configuration.
- * In a virtual host configuration block.
- * In a `<Directory>` or `<Location>` block.
- * In '.htaccess'.
-
-In each place, it may be specified at most once. The default value is 'off'.
-
-[NOTE]
-=====================================================
-The <<PassengerBufferResponse,PassengerBufferResponse>> directive should be turned off
-if responses can be huge. Because entire responses are buffered in memory when turned on.
-=====================================================
-
 [[PassengerRollingRestarts]]
 === PassengerRollingRestarts <on|off> ===
 :version: 3.0.0
@@ -992,6 +916,7 @@ In each place, it may be specified at most once. The default value is 'on'.
 
 === Resource control and optimization options ===
 
+[[PassengerMaxPoolSize]]
 ==== PassengerMaxPoolSize <integer> ====
 The maximum number of <<application_process,application processes>> that may
 simultaneously exist. A larger number results in higher memory usage,
@@ -1055,6 +980,7 @@ The PassengerMinInstances option may occur in the following places:
 
 In each place, it may be specified at most once. The default value is '1'.
 
+[[PassengerMaxInstances]]
 ==== PassengerMaxInstances <integer> ====
 :version: 3.0.0
 include::users_guide_snippets/enterprise_only.txt[]
@@ -1184,6 +1110,21 @@ This option may occur in the following places:
 
 In each place, it may be specified at most once. The default value is '300' (5 minutes).
 
+==== PassengerStartTimeout <seconds> ====
+:version: 4.0.15
+include::users_guide_snippets/since_version.txt[]
+
+Specifies a timeout for the startup of application processes. If an application process fails to start within the timeout period then it will be forcefully killed with SIGKILL, and the error will be logged.
+
+This option may occur in the following places:
+
+ * In the global server configuration.
+ * In a virtual host configuration block.
+ * In a `<Directory>` or `<Location>` block.
+ * In '.htaccess', if `AllowOverride Limits` is on.
+
+In each place, it may be specified at most once. The default value is '90'.
+
 [[PassengerConcurrencyModel]]
 ==== PassengerConcurrencyModel <process|thread> ====
 :version: 4.0.0
@@ -1299,12 +1240,6 @@ fix the problem in your application rather than relying on these directives as a
 measure to avoid freezing applications.
 =====================================================
 
-[NOTE]
-=====================================================
-This option is currently only available for Ruby apps. It is not yet available
-for Python and Node.js.
-=====================================================
-
 [[PassengerMemoryLimit]]
 ==== PassengerMemoryLimit <integer> ====
 :version: 3.0.0
@@ -1650,6 +1585,105 @@ http://www.foo.com/chatroom/ajax_update_poll only.
 /////////////////////////////////////////
 
 
+=== Connection handling options ===
+
+[[PassengerBufferResponse]]
+==== PassengerBufferResponse <on|off> ====
+When turned on, application-generated responses are buffered by Apache. Buffering will
+happen in memory.
+
+Before we proceed with explaining this configuration option, we want to state the following to avoid confusion. If you use Phusion Passenger for Apache, there are in fact two response buffering systems active:
+
+1. The Apache response buffering system. `PassengerBufferResponse` turns this on or off.
+2. The Phusion Passenger response buffering system, a.k.a. 'real-time disk-backed response buffering'. This buffering system is always on, regardless of the value of `PassengerBufferResponse`.
+
+Response buffering is useful because it protects against slow HTTP clients that do not read responses immediately or quickly enough. Buffering prevents such slow clients from blocking web applications that have limited concurrency. Because Phusion Passenger's response buffering is always turned on, you are always protected. Therefore, `PassengerBufferResponse` is off by default, and you never should have to turn it on.
+
+If for whatever reason you want to turn Apache-level response buffering on, you can do so with this option.
+
+Apache's response buffering works differently from Phusion Passenger's. Apache's buffering system buffers the entire response before attempting to send it to the client, while Phusion Passenger's attempts to send the data to the client immediately. Therefore, if you turn on `PassengerBufferResponse`, you may interfere with applications that want to stream responses to the client.
+Apache's version also buffers to memory only, making it problematic for large responses. Phusion Passenger's version buffers to disk when the response exceeds a certain threshold.
+
+How does response buffering - whether it's done by Apache or by Phusion Passenger - exactly protect against slow clients?
+Consider an HTTP client that's on a dial-up modem link, and your
+application process generates a 2 MB response. If the response is buffered
+then your application process will be blocked until the entire 2 MB has been
+sent out to the HTTP client. This disallows your application process to do any useful
+work in the mean time. By buffering responses, Phusion Passenger or Apache will read
+the application response as quickly as possible and will take care of forwarding the data
+to slow clients.
+
+So keep in mind that enabling `passenger_buffering_response` will make streaming responses
+impossible. Consider for example this piece of Rails code:
+
+--------------------------------
+render :text => lambda { |response, output|
+    10.times do |i|
+        output.write("entry #{i}\n")
+        output.flush
+        sleep 1
+    end
+}
+--------------------------------
+
+...or this piece of Rack code:
+
+--------------------------------
+class Response
+    def each
+        10.times do |i|
+            yield("entry #{i}\n")
+            sleep 1
+        end
+    end
+end
+
+app = lambda do |env|
+    [200, { "Content-Type" => "text/plain" }, Response.new]
+end
+--------------------------------
+
+When `PassengerBufferResponse` is turned on, Apache will wait until
+the application is done sending the entire response before forwarding it
+to the client. The client will not receive anything for 10 seconds,
+after which it receives the entire response at once.
+When `PassengerBufferResponse` is turned off, it works as expected: the client
+receives an "entry X" message every second for 10 seconds.
+
+This option may occur in the following places:
+
+ * In the global server configuration.
+ * In a virtual host configuration block.
+ * In a `<Directory>` or `<Location>` block.
+ * In '.htaccess'.
+
+In each place, it may be specified at most once. The default value is 'off'.
+
+[NOTE]
+=====================================================
+The <<PassengerBufferResponse,PassengerBufferResponse>> directive should be turned off
+if responses can be huge. Because entire responses are buffered in memory when turned on.
+=====================================================
+
+[[PassengerMaxRequestQueueSize]]
+==== passenger_max_request_queue_size <number> ====
+:version: 4.0.15
+include::users_guide_snippets/since_version.txt[]
+
+When all application processes are already handling their maximum number of concurrent requests, Phusion Passenger will queue all incoming requests. This option specifies the maximum size for that queue. If the queue is already at this specified limit, then Phusion Passenger will immediately send a "503 Service Unavailable" error to any incoming requests.
+
+A value of 0 means that the queue is unbounded.
+
+This option may occur in the following places:
+
+ * In the global server configuration.
+ * In a virtual host configuration block.
+ * In a `<Directory>` or `<Location>` block.
+ * In '.htaccess'.
+
+In each place, it may be specified at most once. The default value is '100'.
+
+
 === Compatibility options ===
 
 [[PassengerResolveSymlinksInDocumentRoot]]
@@ -2260,6 +2294,9 @@ Phusion Passenger hides a lot of complexity for the end user (i.e. the web serve
 system administrator), but sometimes it is desirable to know what is going on.
 This section describes a few things that Phusion Passenger does under the hood.
 
+include::users_guide_snippets/under_the_hood/page_caching_support.txt[]
+include::users_guide_snippets/under_the_hood/relationship_with_ruby.txt[]
+
 === Static assets serving ===
 Phusion Passenger accelerates serving of static files. This means that, if an URI
 maps to a file that exists, then Phusion Passenger will let Apache serve that file
@@ -2280,9 +2317,6 @@ RewriteRule ^(.*)$ balancer://mongrel%{REQUEST_URI} [P,QSA,L]
 These kind of mod_rewrite rules are no longer required, and you can safely remove
 them.
 
-=== Page caching support ===
-include::users_guide_snippets/under_the_hood/page_caching_support.txt[]
-
 [[application_detection]]
 === How Phusion Passenger detects whether a virtual host is a web application ===
 After you've read the deployment instructions you might wonder how Phusion Passenger