passenger 4.0.2 → 4.0.3

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJRiUovAAoJECrHRaUKISqM9g0H/jqfZM4QCAVVtppUhGTjv1xi
-jBtKy1/47H9KpU7xwsFtEViyfV6oyKdnTCUonJ8o7wZdlTu+g8mB2jE5zPVU7Lor
-M4BwvpfBPjser/E/MYAuXOdMHAA3DlSQko3ogVkENdzLsNk7zxnmt821zwSM9xr0
-6LUG2mZqFA6RWChzPqAh49+w+BezAPj5XA+eUTlbITxoSWGLpJbbcmTTDu9ud7sU
-FeplAmxKsVUc+C2zLAeUck1VIdYjbrppQ/DIAt62BTNPbku2hzGh/qK6QMTBSfI9
-1yKYWGWe/DQ9BHzH7T7Rhh2GvbHaoLpaQLyxZUce1rr+pKZ71AznubBrZAjPQJQ=
-=WyCF
+iQEcBAABAgAGBQJRn9OwAAoJECrHRaUKISqM2xYIAKE41ZDQV2ulFOBNCbIZidxB
+XXl0iOyX47E1YxjA2YZEA5qZO0XRYY6Sm/1fzCZtODnP2gMMGf4sES/Afvdjh4G3
+gWL6wf7j9rU/dUTdWh4q9DZxsUXtIGRLXjA9KFWKwO2Qb2BXe8Jmc444+DHvQvSh
+wEiNOUfumIRalaMkXhBKSsLV6UaOTMBy3IinuRWq+8KVCt94jP4baErEzVJb37+I
+s//uBkH2iKcMV3ccAgS7J3VeQ9Ye6+Lo7z7/T5lM17aQ2huKZ/XEUfRSyiEIkafb
+6aIfEkv9ADznI21qp9I60/lGoATuLcpXKC6zpqcB+rX5T9Dui+gF0yw0jIbGn8w=
+=OGrJ
 -----END PGP SIGNATURE-----

data/NEWS

@@ -1,3 +1,30 @@
+Release 4.0.3
+-------------
+
+ * Better protection is now provided against application processes that
+   are stuck and refuse to shut down cleanly. Since version 4.0.0,
+   Phusion Passenger already forcefully shuts down all processes during
+   web server shutdown. In addition to this, 4.0.3 now also forcefully
+   shuts down processes that take more than 1 minute to shut down, even
+   outside the context of web server shutdowns. This feature does not,
+   however, protect against requests that take too long. Use
+   PassengerMaxRequestTime (Apache) or passenger_max_request_time (Nginx)
+   for that.
+ * Fixed a crash in the HelperAgent which results in frequent process
+   restarts in some traffic patterns. Fixes issue #862.
+ * Fixed a problem that prevents processes from being spawned correctly
+   if the user's bashrc changes working directory. Fixes issue #851.
+ * passenger-status now also displays CPU usage.
+ * The installer now checks for checksums when automatically downloading
+   PCRE and Nginx. Contributed by Joshua Lund.
+ * An error is now printed when trying to daemonize Phusion Passenger
+   Standalone on Ruby implementations that don't support forking.
+   Contributed by Benjamin Fleischer.
+ * Although Phusion Passenger already supported JRuby, *installing*
+   Phusion Passenger with JRuby was not possible. This has been fixed.
+ * Various other minor bug fixes.
+
+
 Release 4.0.2
 -------------
 

data/bin/passenger-config

@@ -36,6 +36,7 @@ def help
 	puts
 	puts "Options:"
 	puts "  --root                     Show Phusion Passenger's root directory."
+	puts "  --includedir               Show the Nginx runtime library headers directory."
 	puts "  --nginx-libs               Show Nginx runtime library flags."
 	puts "  --compiled                 Check whether runtime libraries are compiled."
 	puts "  --ruby-command             Print the correct command for invoking the Ruby interpreter."
@@ -46,14 +47,16 @@ def common_library
 	require 'phusion_passenger/common_library'
 	return COMMON_LIBRARY.
 		only(*NGINX_LIBS_SELECTOR).
-		set_output_dir("#{PhusionPassenger.source_root}/libout/common/libpassenger_common")
+		set_output_dir("#{PhusionPassenger.lib_dir}/common/libpassenger_common")
 end
 
 case ARGV[0]
 when "--root"
 	puts PhusionPassenger.source_root
+when "--includedir"
+	puts PhusionPassenger.include_dir
 when "--nginx-libs"
-	text = "#{common_library.link_objects_as_string} #{PhusionPassenger.source_root}/libout/common/libboost_oxt.a"
+	text = "#{common_library.link_objects_as_string} #{PhusionPassenger.lib_dir}/common/libboost_oxt.a"
 	if PhusionPassenger::PlatformInfo.has_math_library?
 		text << " -lm"
 	end
@@ -64,7 +67,7 @@ when "--compiled"
 			exit 1
 		end
 	end
-	if File.exist?("#{PhusionPassenger.source_root}/libout/common/libboost_oxt.a")
+	if File.exist?("#{PhusionPassenger.lib_dir}/common/libboost_oxt.a")
 		exit 0
 	else
 		exit 1

data/bin/passenger-install-apache2-module

@@ -55,14 +55,14 @@ class Installer < PhusionPassenger::AbstractInstaller
 			'libcurl-dev',
 			'openssl-dev',
 			'zlib-dev',
-			'ruby-dev',
+			PlatformInfo.passenger_needs_ruby_dev_header? ? 'ruby-dev' : nil,
 			'ruby-openssl',
 			'rubygems',
 			'rake',
 			'rack',
 			'apache2',
 			'apache2-dev'
-		]
+		].compact
 		# 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

data/bin/passenger-install-nginx-module

@@ -27,6 +27,7 @@ $LOAD_PATH.unshift("#{source_root}/lib")
 require 'phusion_passenger'
 PhusionPassenger.locate_directories
 
+require 'digest'
 require 'optparse'
 require 'fileutils'
 require 'phusion_passenger/platform_info/ruby'
@@ -47,7 +48,7 @@ class Installer < PhusionPassenger::AbstractInstaller
 			'gcc',
 			'g++',
 			'download-tool',
-			'ruby-dev',
+			PlatformInfo.passenger_needs_ruby_dev_header? ? 'ruby-dev' : nil,
 			'ruby-openssl',
 			'rubygems',
 			'rake',
@@ -55,7 +56,7 @@ class Installer < PhusionPassenger::AbstractInstaller
 			'libcurl-dev',
 			'openssl-dev',
 			'zlib-dev'
-		]
+		].compact
 		return [specs, ids]
 	end
 	
@@ -187,6 +188,14 @@ private
 		
 		if download(url, tarball)
 			Dir.chdir(@working_dir) do
+				puts "<banner>Verifying PCRE checksum...</banner>"
+				if Digest::SHA256.file(tarball) != PCRE_SHA256_CHECKSUM
+					new_screen
+					render_template "nginx/pcre_checksum_could_not_be_verified"
+					wait
+					return nil
+				end
+
 				puts "<banner>Extracting PCRE source tarball...</banner>"
 				if sh("tar", "xzvf", tarball)
 					return "#{@working_dir}/#{dirname}"
@@ -217,6 +226,11 @@ private
 		
 		if download(url, tarball)
 			Dir.chdir(@working_dir) do
+				puts "<banner>Verifying Nginx checksum...</banner>"
+				if Digest::SHA256.file(tarball) != NGINX_SHA256_CHECKSUM
+					return nil
+				end
+
 				puts "<banner>Extracting Nginx source tarball...</banner>"
 				if sh("tar", "xzvf", tarball)
 					return "#{@working_dir}/#{dirname}"

data/build/agents.rb

@@ -24,6 +24,10 @@
 watchdog_libs = COMMON_LIBRARY.only(:base, 'AgentsBase.o', 'Utils/Base64.o')
 dependencies = [
 	'ext/common/agents/Watchdog/Main.cpp',
+	'ext/common/agents/Watchdog/AgentWatcher.cpp',
+	'ext/common/agents/Watchdog/HelperAgentWatcher.cpp',
+	'ext/common/agents/Watchdog/LoggingAgentWatcher.cpp',
+	'ext/common/agents/Watchdog/ServerInstanceDirToucher.cpp',
 	'ext/common/ServerInstanceDir.h',
 	'ext/common/ResourceLocator.h',
 	'ext/common/Utils/VariantMap.h',

data/build/apache2.rb

@@ -47,7 +47,7 @@ APACHE2_MODULE_INPUT_FILES = {
 		ext/apache2/Configuration.hpp
 		ext/apache2/Bucket.h
 		ext/apache2/DirectoryMapper.h
-		ext/common/AgentsStarter.hpp
+		ext/common/AgentsStarter.h
 		ext/common/Exceptions.h
 		ext/common/Logging.h
 		ext/common/RandomGenerator.h

data/build/cplusplus_support.rb

@@ -73,7 +73,7 @@ def create_c_executable(target, sources, linkflags = "#{EXTRA_PRE_CFLAGS} #{EXTR
 end
 
 def create_shared_library(target, sources, flags = "#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_LDFLAGS} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}")
-	if RUBY_PLATFORM =~ /darwin/
+	if PlatformInfo.os_name == "macosx"
 		shlib_flag = "-flat_namespace -bundle -undefined dynamic_lookup"
 	else
 		shlib_flag = "-shared"

data/build/cxx_tests.rb

@@ -123,6 +123,9 @@ TEST_CXX_OBJECTS = {
 	'test/cxx/EventedClientTest.o' => %w(
 		test/cxx/EventedClientTest.cpp
 		ext/common/EventedClient.h),
+	'test/cxx/EventedBufferedInput.o' => %w(
+		test/cxx/EventedBufferedInputTest.cpp
+		ext/common/EventedBufferedInput.h),
 	'test/cxx/MessageServerTest.o' => %w(
 		test/cxx/MessageServerTest.cpp
 		ext/common/Logging.h

data/build/packaging.rb

@@ -181,23 +181,30 @@ task :fakeroot => [:apache2, :nginx] + Packaging::ASCII_DOCS do
 	# We don't use CONFIG['archdir'] and the like because we want
 	# the files to be installed to /usr, and the Ruby interpreter
 	# on the packaging machine might be in /usr/local.
-	fake_libdir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}"
+	fake_rubylibdir = "#{fakeroot}/usr/lib/ruby/vendor_ruby"
+	fake_libdir = "#{fakeroot}/usr/lib/phusion-passenger"
 	fake_native_support_dir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
-	fake_agents_dir = "#{fakeroot}#{NATIVELY_PACKAGED_AGENTS_DIR}"
-	fake_helper_scripts_dir = "#{fakeroot}#{NATIVELY_PACKAGED_HELPER_SCRIPTS_DIR}"
+	fake_agents_dir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
+	fake_helper_scripts_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
 	fake_resources_dir = "#{fakeroot}/usr/share/phusion-passenger"
-	fake_docdir = "#{fakeroot}#{NATIVELY_PACKAGED_DOC_DIR}"
+	fake_include_dir = "#{fakeroot}/usr/share/phusion-passenger/include"
+	fake_docdir = "#{fakeroot}/usr/share/doc/#{GLOBAL_NAMESPACE_DIRNAME}"
 	fake_bindir = "#{fakeroot}/usr/bin"
 	fake_sbindir = "#{fakeroot}/usr/sbin"
-	fake_apache2_module = "#{fakeroot}#{NATIVELY_PACKAGED_APACHE2_MODULE}"
-	fake_apache2_module_dir = File.dirname(fake_apache2_module)
+	fake_apache2_module_dir = "#{fakeroot}/usr/lib/apache2/modules"
+	fake_apache2_module = "#{fake_apache2_module_dir}/mod_passenger.so"
+	fake_ruby_extension_source_dir = "#{fakeroot}/usr/share/phusion-passenger/ruby_extension_source"
 	
 	sh "rm -rf #{fakeroot}"
 	sh "mkdir -p #{fakeroot}"
 	
+	sh "mkdir -p #{fake_rubylibdir}"
+	sh "cp #{PhusionPassenger.ruby_libdir}/phusion_passenger.rb #{fake_rubylibdir}/"
+	sh "cp -R #{PhusionPassenger.ruby_libdir}/phusion_passenger #{fake_rubylibdir}/"
+
 	sh "mkdir -p #{fake_libdir}"
-	sh "cp #{PhusionPassenger.ruby_libdir}/phusion_passenger.rb #{fake_libdir}/"
-	sh "cp -R #{PhusionPassenger.ruby_libdir}/phusion_passenger #{fake_libdir}/"
+	sh "cp -R #{PhusionPassenger.lib_dir}/common #{fake_libdir}/"
+	sh "rm -rf #{fake_libdir}/common/libboost_oxt"
 	
 	sh "mkdir -p #{fake_native_support_dir}"
 	native_support_archdir = PlatformInfo.ruby_extension_binary_compatibility_id
@@ -208,12 +215,30 @@ task :fakeroot => [:apache2, :nginx] + Packaging::ASCII_DOCS do
 	sh "cp -R #{PhusionPassenger.agents_dir}/* #{fake_agents_dir}/"
 	sh "rm -rf #{fake_agents_dir}/*.dSYM"
 	sh "rm -rf #{fake_agents_dir}/*/*.dSYM"
+	sh "rm -rf #{fake_agents_dir}/*.o"
 	
 	sh "mkdir -p #{fake_helper_scripts_dir}"
 	sh "cp -R #{PhusionPassenger.helper_scripts_dir}/* #{fake_helper_scripts_dir}/"
 	
 	sh "mkdir -p #{fake_resources_dir}"
 	sh "cp -R resources/* #{fake_resources_dir}/"
+
+	sh "mkdir -p #{fake_include_dir}"
+	# Infer headers that the Nginx module needs
+	headers = []
+	Dir["ext/nginx/*.[ch]"].each do |filename|
+		File.read(filename).split("\n").grep(%r{#include "common/(.+)"}) do |match|
+			headers << ["ext/common/#{$1}", $1]
+		end
+	end
+	headers.each do |header|
+		target = "#{fake_include_dir}/#{header[1]}"
+		dir = File.dirname(target)
+		if !File.directory?(dir)
+			sh "mkdir -p #{dir}"
+		end
+		sh "cp #{header[0]} #{target}"
+	end
 	
 	sh "mkdir -p #{fake_docdir}"
 	Packaging::ASCII_DOCS.each do |docfile|
@@ -234,6 +259,24 @@ task :fakeroot => [:apache2, :nginx] + Packaging::ASCII_DOCS do
 	sh "mkdir -p #{fake_apache2_module_dir}"
 	sh "cp #{APACHE2_MODULE} #{fake_apache2_module_dir}/"
 
+	sh "mkdir -p #{fake_ruby_extension_source_dir}"
+	sh "cp -R #{PhusionPassenger.ruby_extension_source_dir}/* #{fake_ruby_extension_source_dir}"
+
+	puts "Creating #{fake_rubylibdir}/phusion_passenger/locations.ini"
+	File.open("#{fake_rubylibdir}/phusion_passenger/locations.ini", "w") do |f|
+		f.puts "natively_packaged=true"
+		f.puts "bin=/usr/bin"
+		f.puts "agents=/usr/lib/phusion-passenger/agents"
+		f.puts "libdir=/usr/lib/phusion-passenger"
+		f.puts "helper_scripts=/usr/share/phusion-passenger/helper-scripts"
+		f.puts "resources=/usr/share/phusion-passenger"
+		f.puts "includedir=/usr/share/phusion-passenger/include"
+		f.puts "doc=/usr/share/doc/phusion-passenger"
+		f.puts "rubylibdir=/usr/lib/ruby/vendor_ruby"
+		f.puts "apache2_module=/usr/lib/apache2/modules/mod_passenger.so"
+		f.puts "ruby_extension_source=/usr/share/phusion-passenger/ruby_extension_source"
+	end
+
 	sh "find #{fakeroot} -name .DS_Store -print0 | xargs -0 rm -f"
 end
 

data/build/ruby_extension.rb

@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-if RUBY_PLATFORM =~ /java/
+if !PlatformInfo.passenger_needs_ruby_dev_header?
 	NATIVE_SUPPORT_TARGET = nil
 
 	task :native_support do

data/doc/Packaging.txt.md

@@ -84,13 +84,15 @@ The location configuration file is an ini file that looks as follows:
     [locations]
     natively_packaged=true
     bin=/usr/bin
-    agents=/usr/lib/phusion-passenger
+    agents=/usr/lib/phusion-passenger/agents
+    libdir=/usr/lib/phusion-passenger
     helper_scripts=/usr/share/phusion-passenger/helper-scripts
     resources=/usr/share/phusion-passenger
-    doc=/usr/share/doc
-    rubylibdir=/usr/lib/ruby/1.9.0
+    includedir=/usr/share/phusion-passenger/include
+    doc=/usr/share/doc/phusion-passenger
+    rubylibdir=/usr/lib/ruby/vendor_ruby
     apache2_module=/usr/lib/apache2/modules/mod_passenger.so
-    ruby_extension_source=/usr/share/phusion_passenger/ruby_native_support_source
+    ruby_extension_source=/usr/share/phusion-passenger/ruby_extension_source
 
 All keys except fo `natively_packaged` specify the locations of assets and asset
 directories. The "Asset types" section provides a description of all asset types.
@@ -192,6 +194,20 @@ a list of all possible assets and asset directories.
 
    Value when originally packaged: `<SOURCE_ROOT>/doc`.
 
+ * `includedir`
+
+   A directory that contains the Phusion Passenger header files that are
+   necessary for compiling Nginx.
+
+   Value when originally packaged: `<SOURCE_ROOT>/ext`
+
+ * `libdir`
+
+   A directory that contains the Phusion Passenger library files, e.g.
+   libboost_oxt.a and various .o files.
+
+   Value when originally packaged: `<SOURCE_ROOT>/libout`
+
  * `rubylibdir`
 
    A directory that contains the Phusion Passenger Ruby library files. Note that
@@ -249,6 +265,3 @@ You can generate a fakeroot with the command `rake fakeroot`. This will
 generate an FHS-compliant directory tree in `pkg/fakeroot`, which you can
 directly package or with minor modifications. The fakeroot even contains
 a location configuration file.
-
-If the default fakeroot structure is not sufficient, please consider
-sending a patch.

data/doc/Users guide Apache.html

@@ -3673,7 +3673,7 @@ In <em>.htaccess</em>, if <span class="monospaced">AllowOverride Options</span>
 <div class="paragraph"><p>The maximum number of <a href="#application_process">application processes</a> that may
 simultaneously exist. A larger number results in higher memory usage,
 but improves the ability to handle concurrent HTTP requests.</p></div>
-<div class="paragraph"><p>The optimal value depends on your system’s hardware and your workload. You can learn more at the Phusion article <a href="http://blog.phusion.nl/2013/03/12/tuning-phusion-passengers-concurrency-settings/">Tuning Phusion Passenger’s conurrency settings</a>.</p></div>
+<div class="paragraph"><p>The optimal value depends on your system’s hardware and your workload. You can learn more at the Phusion article <a href="http://blog.phusion.nl/2013/03/12/tuning-phusion-passengers-concurrency-settings/">Tuning Phusion Passenger’s concurrency settings</a>.</p></div>
 <div class="paragraph"><p>If you find that your server is running out of memory then you should lower this value.</p></div>
 <div class="paragraph"><p>This option may only occur once, in the global server configuration.
 The default value is <em>6</em>.</p></div>

data/doc/Users guide Apache.txt

@@ -994,7 +994,7 @@ The maximum number of <<application_process,application processes>> that may
 simultaneously exist. A larger number results in higher memory usage,
 but improves the ability to handle concurrent HTTP requests.
 
-The optimal value depends on your system's hardware and your workload. You can learn more at the Phusion article link:http://blog.phusion.nl/2013/03/12/tuning-phusion-passengers-concurrency-settings/[Tuning Phusion Passenger's conurrency settings].
+The optimal value depends on your system's hardware and your workload. You can learn more at the Phusion article link:http://blog.phusion.nl/2013/03/12/tuning-phusion-passengers-concurrency-settings/[Tuning Phusion Passenger's concurrency settings].
 
 If you find that your server is running out of memory then you should lower this value.
 

data/doc/Users guide Nginx.html

@@ -1431,9 +1431,10 @@ chmod o+x /home/phusion</pre>
 </div>
 </div>
 <span class="anchor_helper" id="run_passenger_installer"></span><h4 class="float" data-anchor="run_passenger_installer">Step 5: run the Phusion Passenger installer</h4>
-<div class="paragraph"><p>Nginx is a different from other web servers in that it does not support loadable modules. The only way to extend Nginx is to recompile it entirely from source. That’s what we will do in this step. The good news is that Phusion Passenger provides a tool to make this easy for you.</p></div>
+<div class="paragraph"><p>Nginx is a different from other web servers in that it does not support loadable modules. The only way to extend Nginx is to recompile it entirely from source. Since Phusion Passenger consists of some external executables plus an Nginx module, you must recompile Nginx when first installing Phusion Passenger, but also when upgrading Nginx itself or when upgrading the Phusion Passenger version.</p></div>
+<div class="paragraph"><p>Recompiling Nginx and the Phusion Passenger executables is what we will do in this step. The good news is that Phusion Passenger provides a tool to make this easy for you.</p></div>
 <div class="paragraph"><p>If you’ve already installed Nginx before, but without Phusion Passenger support, then you <strong>should</strong> uninstall it first. You don’t have to, because you can also install another Nginx with Phusion Passenger support, in parallel to the existing Nginx. We merely recommend uninstalling the existing in order to avoid user confusion, but the choice is yours.</p></div>
-<div class="paragraph"><p>If you had previously installed Nginx with Phusion Passenger support, and you are upgrading, then you don’t have to uninstall your existing Nginx first. Instead we’ll overwrite it this step.</p></div>
+<div class="paragraph"><p>If you had previously installed Nginx with Phusion Passenger support, and you are upgrading, then you don’t have to uninstall your existing Nginx first. Instead we’ll overwrite it this step. But it is important that you recompile Nginx with the configure parameters that you used last time.</p></div>
 <div class="paragraph"><p>Here’s how you can uninstall the original Nginx:</p></div>
 <div class="ulist"><ul>
 <li>
@@ -1453,7 +1454,7 @@ If you installed the existing Nginx through YUM, run <span class="monospaced">yu
 <pre>passenger-install-nginx-module</pre>
 </div>
 </div>
-<div class="paragraph"><p>At some point it will ask you which prefix to install Nginx to. If you’re upgrading, then specify the same prefix that you used last time.</p></div>
+<div class="paragraph"><p>At some point it will ask you which prefix to install Nginx to. If you’re upgrading, then specify the same prefix that you used last time, as well as the same configuration parameters that you used last time.</p></div>
 <span class="anchor_helper" id="verify_passenger_running"></span><h4 class="float" data-anchor="verify_passenger_running">Step 6: Verifying that Phusion Passenger is running</h4>
 <div class="paragraph"><p>Restart your web server and run:</p></div>
 <div class="listingblock">
@@ -3621,7 +3622,7 @@ In an <em>if</em> configuration scope.
 <div class="paragraph"><p>The maximum number of <a href="#application_process">application processes</a> that may
 simultanously exist. A larger number results in higher memory usage,
 but improves the ability to handle concurrent HTTP requests.</p></div>
-<div class="paragraph"><p>The optimal value depends on your system’s hardware and your workload. You can learn more at the Phusion article <a href="http://blog.phusion.nl/2013/03/12/tuning-phusion-passengers-concurrency-settings/">Tuning Phusion Passenger’s conurrency settings</a>.</p></div>
+<div class="paragraph"><p>The optimal value depends on your system’s hardware and your workload. You can learn more at the Phusion article <a href="http://blog.phusion.nl/2013/03/12/tuning-phusion-passengers-concurrency-settings/">Tuning Phusion Passenger’s concurrency settings</a>.</p></div>
 <div class="paragraph"><p>If you find that your server is running out of memory then you should lower this value.</p></div>
 <div class="paragraph"><p>This option may only occur once, in the <em>http</em> configuration block.
 The default value is <em>6</em>.</p></div>

data/doc/Users guide Nginx.txt

@@ -981,7 +981,7 @@ The maximum number of <<application_process,application processes>> that may
 simultanously exist. A larger number results in higher memory usage,
 but improves the ability to handle concurrent HTTP requests.
 
-The optimal value depends on your system's hardware and your workload. You can learn more at the Phusion article link:http://blog.phusion.nl/2013/03/12/tuning-phusion-passengers-concurrency-settings/[Tuning Phusion Passenger's conurrency settings].
+The optimal value depends on your system's hardware and your workload. You can learn more at the Phusion article link:http://blog.phusion.nl/2013/03/12/tuning-phusion-passengers-concurrency-settings/[Tuning Phusion Passenger's concurrency settings].
 
 If you find that your server is running out of memory then you should lower this value.
 

data/doc/users_guide_snippets/installation.txt

@@ -145,11 +145,13 @@ configuration file. However, it doesn't copy any files to outside the Phusion Pa
 `passenger-install-apache2-module` is actually just a user-friendly frontend around the command `rake apache2`, which performs the actual compilation of Phusion Passenger.
 endif::[]
 ifdef::nginx[]
-Nginx is a different from other web servers in that it does not support loadable modules. The only way to extend Nginx is to recompile it entirely from source. That's what we will do in this step. The good news is that Phusion Passenger provides a tool to make this easy for you.
+Nginx is a different from other web servers in that it does not support loadable modules. The only way to extend Nginx is to recompile it entirely from source. Since Phusion Passenger consists of some external executables plus an Nginx module, you must recompile Nginx when first installing Phusion Passenger, but also when upgrading Nginx itself or when upgrading the Phusion Passenger version.
+
+Recompiling Nginx and the Phusion Passenger executables is what we will do in this step. The good news is that Phusion Passenger provides a tool to make this easy for you.
 
 If you've already installed Nginx before, but without Phusion Passenger support, then you *should* uninstall it first. You don't have to, because you can also install another Nginx with Phusion Passenger support, in parallel to the existing Nginx. We merely recommend uninstalling the existing in order to avoid user confusion, but the choice is yours.
 
-If you had previously installed Nginx with Phusion Passenger support, and you are upgrading, then you don't have to uninstall your existing Nginx first. Instead we'll overwrite it this step.
+If you had previously installed Nginx with Phusion Passenger support, and you are upgrading, then you don't have to uninstall your existing Nginx first. Instead we'll overwrite it this step. But it is important that you recompile Nginx with the configure parameters that you used last time.
 
 Here's how you can uninstall the original Nginx:
 
@@ -162,7 +164,7 @@ To proceed with installing or upgrading Phusion Passenger, run the Phusion Passe
 passenger-install-nginx-module
 ----------------------------------
 
-At some point it will ask you which prefix to install Nginx to. If you're upgrading, then specify the same prefix that you used last time.
+At some point it will ask you which prefix to install Nginx to. If you're upgrading, then specify the same prefix that you used last time, as well as the same configuration parameters that you used last time.
 endif::[]
 
 [[verify_passenger_running]]

data/ext/apache2/Configuration.cpp

@@ -283,6 +283,12 @@ DEFINE_SERVER_STR_CONFIG_SETTER(cmd_union_station_proxy_address, unionStationPro
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_analytics_log_user, analyticsLogUser)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_analytics_log_group, analyticsLogGroup)
 
+static const char *
+cmd_passenger_ctl(cmd_parms *cmd, void *dummy, const char *name, const char *value) {
+	serverConfig.ctl.set(name, value);
+	return NULL;
+}
+
 static const char *
 cmd_passenger_pre_start(cmd_parms *cmd, void *pcfg, const char *arg) {
 	serverConfig.prestartURLs.insert(arg);
@@ -458,6 +464,7 @@ cmd_passenger_use_global_queue(cmd_parms *cmd, void *pcfg, int arg) {
 
 
 typedef const char * (*Take1Func)();
+typedef const char * (*Take2Func)();
 typedef const char * (*FlagFunc)();
 
 const command_rec passenger_commands[] = {
@@ -467,6 +474,11 @@ const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"The Passenger root folder."),
+	AP_INIT_TAKE2("PassengerCtl",
+		(Take2Func) cmd_passenger_ctl,
+		NULL,
+		RSRC_CONF,
+		"Set advanced options."),
 	AP_INIT_TAKE1("PassengerDefaultRuby",
 		(Take1Func) cmd_passenger_default_ruby,
 		NULL,