passenger 4.0.19 → 4.0.20

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OWI3NGM4NmQ1MmJmNjRiYWNmZDFkNDFjZWZkZjg4YWEyMzllOTk1OA==
+  data.tar.gz: !binary |-
+    NDhlZmE4OTZiYjE1ZGM4ZjY5MGQ4NmJmNDNlY2Q2MjZkMTA3NTRjYw==
+SHA512:
+  metadata.gz: !binary |-
+    OGI1ZjJjZTU2YjRhYjk3ODZmNWM1NWEzNzQ2YWMyOGU2MjFmMjEwODhjNjNj
+    ZGU4MTI1ZWI0YTA0Yjk2MTdmYWFkODA2Yzc0NzQxODc2NjJhZjQ5OTEyMTIx
+    NjY0Njg3MDI2N2E2MmI1NjgwZDdiMjQxYTU4M2ViZTJjZTFkZDk=
+  data.tar.gz: !binary |-
+    ZDlhMjFiYjE5OTY1MTMyM2VmNjIzYmM5MjE1NzRiMTFlMzRiODZiMzE4Mzgz
+    NTkzMTY2NjRmMjM3ZDc0ZGIzZWYwNTNlZjUwNmIyMWQwOTA5NzI0YzI3OTRi
+    ODY1ZDE5MGMyMGM4YzM4YzIwOWE4MGM5NmIwYjcyMmNjYWY3YWI=

checksums.yaml.gz.asc

@@ -0,0 +1,12 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iQEcBAABAgAGBQJSVR2DAAoJECrHRaUKISqMb4gH/0KcDsUi/7/IEPR9w+AUNXbi
+xop3xQSJqggT9HDPWhhsh0thwPVdAwWC8etDd/99RMEW6KQMnSwBr9DP8TbrjG5C
+LdstIpTF11l7lcqpc4cNdbq7giE2iriyOWjQzwKEr2UpAgNzbjCVM09Wz6KqIJrV
+aFUXSybIsr3N9gnPqdPwJ6Gp/0QyPDyMVXcNZzcOVvLlZ1EwNHDIsjBG1V0t+8o0
+HLCLb5FXvVrZ5DujwXfvaEeVLz+rpu7RpXrTxqbW5rHjFMn+oYgdMxidEavDgXBD
+TOUpkexYX/fUZd2EKxJWS+otVzN9HV7qnx1YKJQOwyVLfkK6kDgqOXQgPQYz+G8=
+=lBSY
+-----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSQSkWAAoJECrHRaUKISqMWtsIAKiNtrucfxuOIVN6wptQyV0B
-E1HSZ00iHfUSh96Tx7avx/QZT4VO76Kn7iWDSuv0txACtdbCWkcvMvEc/8Py2umr
-PnvZm9FpY6yWaF9nd85flihTKHh8TVohYxhYyA+NvBc/qHvYtYwBi2Fq3SmHA7qT
-nkx2Q3uZSE3w8bMfDvTfQL/tO5pidzKxV0pu6SBfQWg8OMpryRVP2dUv4dpg8lDh
-ZsnP+aVW8rxSoOn56Wwhbkqez2/1W1MFo1HG11ms//nSvwjVXRO/XpHhNsIIvrFH
-O8DXuKpcGeB32GQ4xAdX8FrSt4+ecMpraDTtcIEyMU4qagBcgOlXgqofcFCNIUE=
-=H3GZ
+iQEcBAABAgAGBQJSVR2DAAoJECrHRaUKISqMiO0H/AiYTBtbpvN5Q/WIYRo99pu5
++VyZpUvISKG7+Mdqb8hEL+O/TvGYQsiCliOhF2UWAjTUdm+fXOXcs5KXWJV3wJZU
++mzKZ9Xy0a6HLVyLQV3v+bMe5hNBDFx5YI4js0Vlhx9SGV3NQwxIgQ3sfqmmbdtw
+ieKmrLakgDuOHFxPmAibEL5Lv4R+rRlhldsoDoVmp8zuLJcxobaNkNkS1nXqvhha
+NeQjYetL4BisdneEwt1BeZusNHAON5Blt88SgQfbSkPB6Zz7PXxiuCRWfdxkJ9/d
+K9w5TTHXf+TL+OfnRZ9Aaz8vdcRdihNNaPWURgDwhGl2Q9k1BKmIPfxxfZsnBtY=
+=LZ+T
 -----END PGP SIGNATURE-----

data/NEWS

@@ -1,3 +1,25 @@
+Release 4.0.20
+--------------
+
+ * Fixed a bug in Phusion Passenger Standalone's daemon mode. When in daemon
+   mode, the Nginx temporary directory was deleted prematurely, causing some
+   POST requests to fail. This was a regression that was introduced in 4.0.15
+   as part of an optimization.
+ * Fixed compilation problems on Solaris 10 with Sun Studio 12.3.
+ * Improved detection of RVM problems.
+ * It is now possible to log the request method to Union Station.
+ * Introduced a new option, `PassengerLoadShellEnvvars` (Apache) and
+   `passenger_load_shell_envvars` (Nginx). This allows enabling or disabling
+   the loading of bashrc before spawning the application.
+ * [Enterprise] Fixed a packaging problem which caused the flying-passenger
+   executable not to be properly included in the bin path.
+ * [Enterprise] Fixed a race condition which sometimes causes the Flying
+   Passenger socket to be deleted after a restart. Fixes issue #939.
+ * [Enterprise] The `byebug` gem is now supported for debugging on Ruby 2.0.
+   The byebug gem requires a patch before this works:
+   https://github.com/deivid-rodriguez/byebug/pull/29
+
+
 Release 4.0.19
 --------------
 

data/bin/passenger-install-apache2-module

@@ -52,8 +52,8 @@ class Installer < PhusionPassenger::AbstractInstaller
 			'depcheck_specs/apache2'
 		]
 		ids = [
-			'gcc',
-			'g++',
+			'cc',
+			'c++',
 			'libcurl-dev',
 			'openssl-dev',
 			'zlib-dev',

data/bin/passenger-install-nginx-module

@@ -48,8 +48,8 @@ class Installer < PhusionPassenger::AbstractInstaller
 			'depcheck_specs/utilities'
 		]
 		ids = [
-			'gcc',
-			'g++',
+			'cc',
+			'c++',
 			'download-tool',
 			PlatformInfo.passenger_needs_ruby_dev_header? ? 'ruby-dev' : nil,
 			'ruby-openssl',

data/build/agents.rb

@@ -176,6 +176,12 @@ file AGENT_OUTPUT_DIR + 'EnvPrinter' => 'ext/common/agents/EnvPrinter.c' do
 		'ext/common/agents/EnvPrinter.c')
 end
 
+file AGENT_OUTPUT_DIR + 'TempDirToucher' => 'ext/common/agents/TempDirToucher.c' do
+	sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
+	create_c_executable(AGENT_OUTPUT_DIR + 'TempDirToucher',
+		'ext/common/agents/TempDirToucher.c')
+end
+
 task 'common:clean' do
 	sh "rm -rf #{AGENT_OUTPUT_DIR}"
 end

data/build/apache2.rb

@@ -89,6 +89,7 @@ task :apache2 => [
 	AGENT_OUTPUT_DIR + 'PassengerWatchdog',
 	AGENT_OUTPUT_DIR + 'PassengerLoggingAgent',
 	AGENT_OUTPUT_DIR + 'SpawnPreparer',
+	AGENT_OUTPUT_DIR + 'TempDirToucher',
 	NATIVE_SUPPORT_TARGET
 ].compact
 

data/build/basics.rb

@@ -132,8 +132,8 @@ MAINTAINER_NAME  = "Phusion"
 MAINTAINER_EMAIL = "info@phusion.nl"
 
 OPTIMIZE = boolean_option("OPTIMIZE")
-CC       = maybe_wrap_in_ccache(string_option("CC", "gcc"))
-CXX      = maybe_wrap_in_ccache(string_option("CXX", "g++"))
+CC       = maybe_wrap_in_ccache(PhusionPassenger::PlatformInfo.cc)
+CXX      = maybe_wrap_in_ccache(PhusionPassenger::PlatformInfo.cxx)
 LIBEXT   = PlatformInfo.library_extension
 USE_DMALLOC = boolean_option('USE_DMALLOC')
 USE_EFENCE  = boolean_option('USE_EFENCE')

data/build/cplusplus_support.rb

@@ -87,5 +87,10 @@ def create_shared_library(target, sources, flags = "#{EXTRA_PRE_CXXFLAGS} #{EXTR
 	else
 		shlib_flag = "-shared"
 	end
-	run_compiler "#{CXX} #{shlib_flag} #{sources} -fPIC -o #{target} #{flags}"
+	if PhusionPassenger::PlatformInfo.cc_is_sun_studio?
+		fPIC = "-KPIC"
+	else
+		fPIC = "-fPIC"
+	end
+	run_compiler "#{CXX} #{shlib_flag} #{sources} #{fPIC} -o #{target} #{flags}"
 end

data/build/cxx_tests.rb

@@ -211,6 +211,7 @@ dependencies = [
 	'test/support/allocate_memory',
 	NATIVE_SUPPORT_TARGET,
 	AGENT_OUTPUT_DIR + 'SpawnPreparer',
+	AGENT_OUTPUT_DIR + 'TempDirToucher',
 	AGENT_OUTPUT_DIR + 'EnvPrinter'
 ].compact
 desc "Run unit tests for the Apache 2 and Nginx C++ components"

data/build/nginx.rb

@@ -41,6 +41,7 @@ task :nginx_without_native_support => [
 	AGENT_OUTPUT_DIR + 'PassengerWatchdog',
 	AGENT_OUTPUT_DIR + 'PassengerLoggingAgent',
 	AGENT_OUTPUT_DIR + 'SpawnPreparer',
+	AGENT_OUTPUT_DIR + 'TempDirToucher',
 	COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).link_objects
 ].flatten
 

data/build/packaging.rb

@@ -198,7 +198,7 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 			command = "cd /srv/passenger_autobuilder/app && " +
 				"/tools/silence-unless-failed chpst -l /tmp/passenger_autobuilder.lock " +
 				"./autobuild-with-pbuilder #{git_url} passenger-enterprise --tag=#{tag}"
-			ssh "psg_autobuilder_run@juvia-helper.phusion.nl at now <<<'#{command}'"
+			sh "ssh psg_autobuilder_run@juvia-helper.phusion.nl at now <<<'#{command}'"
 
 			puts "Initiating building of Debian packages"
 			command = "cd /srv/passenger_apt_automation && " +

data/dev/copy_boost_headers.rb

@@ -35,6 +35,7 @@ ESSENTIALS = [
 	"libs/system/src",
 	"boost/date_time/gregorian/formatters_limited.hpp",
 	"boost/date_time/date_formatting_limited.hpp",
+	"boost/type_traits/detail/*",
 	"boost/non_type.hpp",
 	"boost/detail/fenv.hpp",
 	"boost/foreach.hpp"

data/doc/Users guide Apache.idmap.txt

@@ -130,113 +130,115 @@
 
 6.6. PassengerSpawnMethod <string>	=>	passengerspawnmethod-string--sodg2y
 
-6.7. PassengerEnabled <on|off>	=>	passengerenabled-on-off--74rzth
+6.7. passengerLoadShellEnvvars <on|off>	=>	passengerloadshellenvvars-on-off--1290yz1
 
-6.8. PassengerTempDir <directory>	=>	passengertempdir-directory--68h2ng
+6.8. PassengerEnabled <on|off>	=>	passengerenabled-on-off--74rzth
 
-6.9. PassengerUploadBufferDir <directory>	=>	passengeruploadbufferdir-directory--kdr8at
+6.9. PassengerTempDir <directory>	=>	passengertempdir-directory--68h2ng
 
-6.10. PassengerRestartDir <directory>	=>	passengerrestartdir-directory--1fmhmv0
+6.10. PassengerUploadBufferDir <directory>	=>	passengeruploadbufferdir-directory--kdr8at
 
-6.11. PassengerRollingRestarts <on|off>	=>	passengerrollingrestarts
+6.11. PassengerRestartDir <directory>	=>	passengerrestartdir-directory--1fmhmv0
 
-6.12. PassengerResistDeploymentErrors <on|off>	=>	passengerresistdeploymenterrors
+6.12. PassengerRollingRestarts <on|off>	=>	passengerrollingrestarts
 
-6.13. Security options	=>	security-options-1pb75ho
+6.13. PassengerResistDeploymentErrors <on|off>	=>	passengerresistdeploymenterrors
 
-6.13.1. PassengerUserSwitching <on|off>	=>	passengeruserswitching
+6.14. Security options	=>	security-options-1pb75ho
 
-6.13.2. PassengerUser <username>	=>	passengeruser
+6.14.1. PassengerUserSwitching <on|off>	=>	passengeruserswitching
 
-6.13.3. PassengerGroup <group name>	=>	passengergroup
+6.14.2. PassengerUser <username>	=>	passengeruser
 
-6.13.4. PassengerDefaultUser <username>	=>	passengerdefaultuser
+6.14.3. PassengerGroup <group name>	=>	passengergroup
 
-6.13.5. PassengerDefaultGroup <group name>	=>	passengerdefaultgroup
+6.14.4. PassengerDefaultUser <username>	=>	passengerdefaultuser
 
-6.13.6. PassengerFriendlyErrorPages <on|off>	=>	passengerfriendlyerrorpages
+6.14.5. PassengerDefaultGroup <group name>	=>	passengerdefaultgroup
 
-6.14. Resource control and optimization options	=>	resource-control-and-optimization-options-zu2f7u
+6.14.6. PassengerFriendlyErrorPages <on|off>	=>	passengerfriendlyerrorpages
 
-6.14.1. PassengerMaxPoolSize <integer>	=>	passengermaxpoolsize-integer--am64q8
+6.15. Resource control and optimization options	=>	resource-control-and-optimization-options-zu2f7u
 
-6.14.2. PassengerMinInstances <integer>	=>	passengermininstances-integer--wegq6b
+6.15.1. PassengerMaxPoolSize <integer>	=>	passengermaxpoolsize-integer--am64q8
 
-6.14.3. PassengerMaxInstances <integer>	=>	passengermaxinstances
+6.15.2. PassengerMinInstances <integer>	=>	passengermininstances-integer--wegq6b
 
-6.14.4. PassengerMaxInstancesPerApp <integer>	=>	passengermaxinstancesperapp
+6.15.3. PassengerMaxInstances <integer>	=>	passengermaxinstances
 
-6.14.5. PassengerPoolIdleTime <integer>	=>	passengerpoolidletime-integer--a3gunq
+6.15.4. PassengerMaxInstancesPerApp <integer>	=>	passengermaxinstancesperapp
 
-6.14.6. PassengerMaxPreloaderIdleTime <integer>	=>	railsappspawneridletime-integer--1awgog1
+6.15.5. PassengerPoolIdleTime <integer>	=>	passengerpoolidletime-integer--a3gunq
 
-6.14.7. PassengerStartTimeout <seconds>	=>	passengerstarttimeout-seconds--ihnfku
+6.15.6. PassengerMaxPreloaderIdleTime <integer>	=>	railsappspawneridletime-integer--1awgog1
 
-6.14.8. PassengerConcurrencyModel <process|thread>	=>	passengerconcurrencymodel-process-thread--1eipofj
+6.15.7. PassengerStartTimeout <seconds>	=>	passengerstarttimeout-seconds--ihnfku
 
-6.14.9. PassengerThreadCount <number>	=>	passengerthreadcount-number--10jl64a
+6.15.8. PassengerConcurrencyModel <process|thread>	=>	passengerconcurrencymodel-process-thread--1eipofj
 
-6.14.10. PassengerMaxRequests <integer>	=>	passengermaxrequests-integer--17qkw9n
+6.15.9. PassengerThreadCount <number>	=>	passengerthreadcount-number--10jl64a
 
-6.14.11. PassengerMaxRequestTime <seconds>	=>	passengermaxrequesttime-seconds--127v1i2
+6.15.10. PassengerMaxRequests <integer>	=>	passengermaxrequests-integer--17qkw9n
 
-6.14.12. PassengerMemoryLimit <integer>	=>	passengermemorylimit-integer--18irza1
+6.15.11. PassengerMaxRequestTime <seconds>	=>	passengermaxrequesttime-seconds--127v1i2
 
-6.14.13. PassengerStatThrottleRate <integer>	=>	passengerstatthrottlerate-integer--1dcfda3
+6.15.12. PassengerMemoryLimit <integer>	=>	passengermemorylimit-integer--18irza1
 
-6.14.14. PassengerPreStart <url>	=>	passengerprestart-url--1utb57k
+6.15.13. PassengerStatThrottleRate <integer>	=>	passengerstatthrottlerate-integer--1dcfda3
 
-6.14.15. PassengerHighPerformance <on|off>	=>	passengerhighperformance-on-off--nvfa86
+6.15.14. PassengerPreStart <url>	=>	passengerprestart-url--1utb57k
 
-6.15. Connection handling options	=>	connection-handling-options-1k3zd1a
+6.15.15. PassengerHighPerformance <on|off>	=>	passengerhighperformance-on-off--nvfa86
 
-6.15.1. PassengerBufferResponse <on|off>	=>	passengerbufferresponse-on-off--1y7ilka
+6.16. Connection handling options	=>	connection-handling-options-1k3zd1a
 
-6.15.2. passenger_max_request_queue_size <number>	=>	passenger-max-request-queue-size-number--1f1uocd
+6.16.1. PassengerBufferResponse <on|off>	=>	passengerbufferresponse-on-off--1y7ilka
 
-6.16. Compatibility options	=>	compatibility-options-8jve5a
+6.16.2. passenger_max_request_queue_size <number>	=>	passenger-max-request-queue-size-number--1f1uocd
 
-6.16.1. PassengerResolveSymlinksInDocumentRoot <on|off>	=>	passengerresolvesymlinksindocumentroot-on-off--1r0qcp8
+6.17. Compatibility options	=>	compatibility-options-8jve5a
 
-6.16.2. PassengerAllowEncodedSlashes <on|off>	=>	passengerallowencodedslashes-on-off--1y3s1ww
+6.17.1. PassengerResolveSymlinksInDocumentRoot <on|off>	=>	passengerresolvesymlinksindocumentroot-on-off--1r0qcp8
 
-6.17. Logging and debugging options	=>	logging-and-debugging-options-el2cuc
+6.17.2. PassengerAllowEncodedSlashes <on|off>	=>	passengerallowencodedslashes-on-off--1y3s1ww
 
-6.17.1. PassengerLogLevel <integer>	=>	passengerloglevel-integer--s3kbil
+6.18. Logging and debugging options	=>	logging-and-debugging-options-el2cuc
 
-6.17.2. PassengerDebugLogFile <filename>	=>	passengerdebuglogfile-filename--1wjm2j1
+6.18.1. PassengerLogLevel <integer>	=>	passengerloglevel-integer--s3kbil
 
-6.17.3. PassengerDebugger <on|off>	=>	passengerdebugger-on-off--19you7e
+6.18.2. PassengerDebugLogFile <filename>	=>	passengerdebuglogfile-filename--1wjm2j1
 
-6.18. Classic Ruby on Rails (⇐ 2.x)-specific options	=>	ruby-on-rails-specific-options-1t10wfu
+6.18.3. PassengerDebugger <on|off>	=>	passengerdebugger-on-off--19you7e
 
-6.18.1. RailsBaseURI <uri>	=>	railsbaseuri-uri--1txrw3k
+6.19. Classic Ruby on Rails (⇐ 2.x)-specific options	=>	ruby-on-rails-specific-options-1t10wfu
 
-6.18.2. RailsEnv <string>	=>	railsenv-string--1b0xxvu
+6.19.1. RailsBaseURI <uri>	=>	railsbaseuri-uri--1txrw3k
 
-6.19. Rack and Rails >= 3 specific options	=>	rack-specific-options-wk9qzt
+6.19.2. RailsEnv <string>	=>	railsenv-string--1b0xxvu
 
-6.19.1. RackBaseURI <uri>	=>	rackbaseuri-uri--1to24pj
+6.20. Rack and Rails >= 3 specific options	=>	rack-specific-options-wk9qzt
 
-6.19.2. RackEnv <string>	=>	rackenv-string--vve9py
+6.20.1. RackBaseURI <uri>	=>	rackbaseuri-uri--1to24pj
 
-6.20. Deprecated or removed options	=>	deprecated-options-pm9m57
+6.20.2. RackEnv <string>	=>	rackenv-string--vve9py
 
-6.20.1. RailsRuby	=>	railsruby-ht09ei
+6.21. Deprecated or removed options	=>	deprecated-options-pm9m57
 
-6.20.2. RailsUserSwitching	=>	railsuserswitching-1npx8y4
+6.21.1. RailsRuby	=>	railsruby-ht09ei
 
-6.20.3. RailsDefaultUser	=>	railsdefaultuser-19j7n3m
+6.21.2. RailsUserSwitching	=>	railsuserswitching-1npx8y4
 
-6.20.4. RailsAllowModRewrite	=>	railsallowmodrewrite-1vkziro
+6.21.3. RailsDefaultUser	=>	railsdefaultuser-19j7n3m
 
-6.20.5. RailsSpawnMethod	=>	railsspawnmethod-1aljgpa
+6.21.4. RailsAllowModRewrite	=>	railsallowmodrewrite-1vkziro
 
-6.20.6. RailsAutoDetect, RackAutoDetect and WsgiAutoDetect	=>	railsautodetect-rackautodetect-and-wsgiautodetect-1qgakzs
+6.21.5. RailsSpawnMethod	=>	railsspawnmethod-1aljgpa
 
-6.20.7. RailsAppSpawnerIdleTime	=>	railsappspawneridletime-heh41r
+6.21.6. RailsAutoDetect, RackAutoDetect and WsgiAutoDetect	=>	railsautodetect-rackautodetect-and-wsgiautodetect-1qgakzs
 
-6.20.8. RailsFrameworkSpawnerIdleTime	=>	railsframeworkspawneridletime-adcf9k
+6.21.7. RailsAppSpawnerIdleTime	=>	railsappspawneridletime-heh41r
+
+6.21.8. RailsFrameworkSpawnerIdleTime	=>	railsframeworkspawneridletime-adcf9k
 
 7. Troubleshooting	=>	troubleshooting-2ihihi
 

data/doc/Users guide Apache.txt

@@ -612,6 +612,24 @@ This option may occur in the following places:
 
 In each place, it may be specified at most once. The default value is 'smart'.
 
+[[PassengerLoadShellEnvvars]]
+=== passengerLoadShellEnvvars <on|off> ===
+:version: 4.0.20
+include::users_guide_snippets/since_version.txt[]
+
+Enables or disables the loading of shell environment variables before spawning the application.
+
+If this option is turned on, and the user's shell is `bash`, then applications are loaded by running them with `bash -l -c`. Otherwise, they are loaded by running them directly from the `PassengerHelperAgent` process.
+
+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 Options` is on.
+
+In each place, it may be specified at most once. The default value is 'on'.
+
 [[PassengerEnabled]]
 === PassengerEnabled <on|off> ===
 You can set this option to 'off' to completely disable Phusion Passenger for
@@ -1788,13 +1806,14 @@ This option may only occur once, in the global server configuration.
 include::users_guide_snippets/enterprise_only.txt[]
 
 Turns support for application debugging on or off. In case of Ruby applications,
-turning this option on will cause them to load the `ruby-debug` gem (when on Ruby 1.8)
-or the `debugger` gem (when on Ruby 1.9). If you're using Bundler, you should add
-this to your Gemfile:
+turning this option on will cause them to load the `ruby-debug` gem (when on Ruby 1.8),
+the `debugger` gem (when on Ruby 1.9) or the `byebug` gem (when on Ruby 2.0). If you're
+using Bundler, you should add this to your Gemfile:
 
 -------------------------------------------
 gem 'ruby-debug', :platforms => :ruby_18
 gem 'debugger', :platforms => :ruby_19
+gem 'byebug', :platforms => :ruby_20
 -------------------------------------------
 
 Once debugging is turned on, you can use the command `passenger-irb --debug <PID>` to attach an rdebug console to the application process with the given PID. Attaching will succeed once the application process executes a `debugger` command.

data/doc/Users guide Nginx.idmap.txt

@@ -130,105 +130,107 @@
 
 6.5. passenger_spawn_method <string>	=>	passenger-spawn-method-string--1sc6njl
 
-6.6. passenger_rolling_restarts <on|off>	=>	passenger-rolling-restarts
+6.6. passenger_load_shell_envvars <on|off>	=>	passenger-load-shell-envvars-on-off--fw5u4l
 
-6.7. passenger_resist_deployment_errors <on|off>	=>	passenger-resist-deployment-errors-on-off--k9yf1
+6.7. passenger_rolling_restarts <on|off>	=>	passenger-rolling-restarts
 
-6.8. passenger_temp_dir <directory>	=>	passenger-temp-dir-directory--1t3opri
+6.8. passenger_resist_deployment_errors <on|off>	=>	passenger-resist-deployment-errors-on-off--k9yf1
 
-6.9. passenger_fly_with <socket filename>	=>	passenger-fly-with-socket-filename--1amd1xn
+6.9. passenger_temp_dir <directory>	=>	passenger-temp-dir-directory--1t3opri
 
-6.10. Important deployment options	=>	important-deployment-options-av567
+6.10. passenger_fly_with <socket filename>	=>	passenger-fly-with-socket-filename--1amd1xn
 
-6.10.1. passenger_enabled <on|off>	=>	passenger-enabled-on-off--1rpb2t7
+6.11. Important deployment options	=>	important-deployment-options-av567
 
-6.10.2. passenger_base_uri <uri>	=>	passenger-base-uri-uri--1xtuo50
+6.11.1. passenger_enabled <on|off>	=>	passenger-enabled-on-off--1rpb2t7
 
-6.11. Connection handling options	=>	connection-handling-options-8jgq90
+6.11.2. passenger_base_uri <uri>	=>	passenger-base-uri-uri--1xtuo50
 
-6.11.1. passenger_ignore_client_abort <on|off>	=>	passenger-ignore-client-abort
+6.12. Connection handling options	=>	connection-handling-options-8jgq90
 
-6.11.2. passenger_set_cgi_param <CGI environment name> <value>	=>	passenger-set-cgi-param-cgi-environment-name-value--rx9gc0
+6.12.1. passenger_ignore_client_abort <on|off>	=>	passenger-ignore-client-abort
 
-6.11.3. passenger_pass_header <header name>	=>	passenger-pass-header-header-name--1cg31je
+6.12.2. passenger_set_cgi_param <CGI environment name> <value>	=>	passenger-set-cgi-param-cgi-environment-name-value--rx9gc0
 
-6.11.4. passenger_buffer_response <on|off>	=>	passenger-buffer-response
+6.12.3. passenger_pass_header <header name>	=>	passenger-pass-header-header-name--1cg31je
 
-6.11.5. passenger_buffer_size	=>	passenger-buffer-size-1jfkq87
+6.12.4. passenger_buffer_response <on|off>	=>	passenger-buffer-response
 
-6.11.6. passenger_buffers	=>	passenger-busy-buffers
+6.12.5. passenger_buffer_size	=>	passenger-buffer-size-1jfkq87
 
-6.11.7. passenger_busy_buffer_size	=>	passenger-busy-buffer-size-124sj61
+6.12.6. passenger_buffers	=>	passenger-busy-buffers
 
-6.11.8. passenger_intercept_errors <on|off>	=>	passenger-intercept-errors-1uvcb9x
+6.12.7. passenger_busy_buffer_size	=>	passenger-busy-buffer-size-124sj61
 
-6.11.9. passenger_max_request_queue_size <number>	=>	passenger-max-request-queue-size-number--i0te1b
+6.12.8. passenger_intercept_errors <on|off>	=>	passenger-intercept-errors-1uvcb9x
 
-6.11.10. passenger_request_queue_overflow_status_code <code>	=>	passenger-request-queue-overflow-status-code-code--1wcwuxl
+6.12.9. passenger_max_request_queue_size <number>	=>	passenger-max-request-queue-size-number--i0te1b
 
-6.12. Security options	=>	security-options-1bv93g4
+6.12.10. passenger_request_queue_overflow_status_code <code>	=>	passenger-request-queue-overflow-status-code-code--1wcwuxl
 
-6.12.1. passenger_user_switching <on|off>	=>	passenger-user-switching-on-off--1p37u3l
+6.13. Security options	=>	security-options-1bv93g4
 
-6.12.2. passenger_user <username>	=>	passenger-user-username--b06ur7
+6.13.1. passenger_user_switching <on|off>	=>	passenger-user-switching-on-off--1p37u3l
 
-6.12.3. passenger_group <group name>	=>	passenger-user-group-name--1fco4j7
+6.13.2. passenger_user <username>	=>	passenger-user-username--b06ur7
 
-6.12.4. passenger_default_user <username>	=>	passenger-default-user-username--1h6cdmf
+6.13.3. passenger_group <group name>	=>	passenger-user-group-name--1fco4j7
 
-6.12.5. Passenger_default_group <group name>	=>	passenger-default-group-group-name--1qxn2qa
+6.13.4. passenger_default_user <username>	=>	passenger-default-user-username--1h6cdmf
 
-6.12.6. passenger_show_version_in_header <on|off>	=>	passenger-show-version-in-header-on-off--2h49av
+6.13.5. Passenger_default_group <group name>	=>	passenger-default-group-group-name--1qxn2qa
 
-6.12.7. passenger_friendly_error_pages <on|off>	=>	passenger-friendly-error-pages-on-off--1ti1a0e
+6.13.6. passenger_show_version_in_header <on|off>	=>	passenger-show-version-in-header-on-off--2h49av
 
-6.13. Resource control and optimization options	=>	resource-control-and-optimization-options-xd7evs
+6.13.7. passenger_friendly_error_pages <on|off>	=>	passenger-friendly-error-pages-on-off--1ti1a0e
 
-6.13.1. passenger_max_pool_size <integer>	=>	passenger-max-pool-size-integer--3jzefs
+6.14. Resource control and optimization options	=>	resource-control-and-optimization-options-xd7evs
 
-6.13.2. passenger_min_instances <integer>	=>	passenger-min-instances-integer--uclykt
+6.14.1. passenger_max_pool_size <integer>	=>	passenger-max-pool-size-integer--3jzefs
 
-6.13.3. passenger_max_instances <integer>	=>	passenger-max-instances
+6.14.2. passenger_min_instances <integer>	=>	passenger-min-instances-integer--uclykt
 
-6.13.4. passenger_max_instances_per_app <integer>	=>	passenger-max-instances-per-app-integer--1xhbbne
+6.14.3. passenger_max_instances <integer>	=>	passenger-max-instances
 
-6.13.5. passenger_pool_idle_time <integer>	=>	passenger-pool-idle-time-integer--xcw65o
+6.14.4. passenger_max_instances_per_app <integer>	=>	passenger-max-instances-per-app-integer--1xhbbne
 
-6.13.6. passenger_max_preloader_idle_time <integer>	=>	rails-app-spawner-idle-time-integer--1xjqe4b
+6.14.5. passenger_pool_idle_time <integer>	=>	passenger-pool-idle-time-integer--xcw65o
 
-6.13.7. passenger_start_timeout <seconds>	=>	passenger-start-timeout-seconds--8xn504
+6.14.6. passenger_max_preloader_idle_time <integer>	=>	rails-app-spawner-idle-time-integer--1xjqe4b
 
-6.13.8. passenger_concurrency_model <process|thread>	=>	passenger-concurrency-model-process-thread--brcvkk
+6.14.7. passenger_start_timeout <seconds>	=>	passenger-start-timeout-seconds--8xn504
 
-6.13.9. passenger_thread_count <number>	=>	passenger-thread-count-number--1kd6ffy
+6.14.8. passenger_concurrency_model <process|thread>	=>	passenger-concurrency-model-process-thread--brcvkk
 
-6.13.10. passenger_max_requests <integer>	=>	passenger-max-requests-integer--sgzint
+6.14.9. passenger_thread_count <number>	=>	passenger-thread-count-number--1kd6ffy
 
-6.13.11. passenger_max_request_time <seconds>	=>	passenger-max-request-time-seconds--1htog2g
+6.14.10. passenger_max_requests <integer>	=>	passenger-max-requests-integer--sgzint
 
-6.13.12. passenger_memory_limit <integer>	=>	passenger-memory-limit-integer--1ry7dwx
+6.14.11. passenger_max_request_time <seconds>	=>	passenger-max-request-time-seconds--1htog2g
 
-6.13.13. passenger_pre_start <url>	=>	passenger-pre-start-url--npldeb
+6.14.12. passenger_memory_limit <integer>	=>	passenger-memory-limit-integer--1ry7dwx
 
-6.14. Logging and debugging options	=>	logging-and-debugging-options-14e91ni
+6.14.13. passenger_pre_start <url>	=>	passenger-pre-start-url--npldeb
 
-6.14.1. passenger_log_level <integer>	=>	passenger-log-level-integer--17snhon
+6.15. Logging and debugging options	=>	logging-and-debugging-options-14e91ni
 
-6.14.2. passenger_debug_log_file <filename>	=>	passenger-debug-log-file-filename--21ubaj
+6.15.1. passenger_log_level <integer>	=>	passenger-log-level-integer--17snhon
 
-6.14.3. passenger_debugger <on|off>	=>	passenger-debugger-on-off--1wkuq85
+6.15.2. passenger_debug_log_file <filename>	=>	passenger-debug-log-file-filename--21ubaj
 
-6.15. Ruby on Rails-specific options	=>	ruby-on-rails-specific-options-12vfokt
+6.15.3. passenger_debugger <on|off>	=>	passenger-debugger-on-off--1wkuq85
 
-6.15.1. rails_env <string>	=>	rails-env-string--jlh7v9
+6.16. Ruby on Rails-specific options	=>	ruby-on-rails-specific-options-12vfokt
 
-6.16. Rack and Rails >= 3 specific options	=>	rack-specific-options-13yvdxs
+6.16.1. rails_env <string>	=>	rails-env-string--jlh7v9
 
-6.16.1. rack_env <string>	=>	rack-env-string--tqmrt0
+6.17. Rack and Rails >= 3 specific options	=>	rack-specific-options-13yvdxs
 
-6.17. Deprecated options	=>	deprecated-options-1dtzo0g
+6.17.1. rack_env <string>	=>	rack-env-string--tqmrt0
 
-6.17.1. rails_spawn_method	=>	rails-spawn-method-17vdnpt
+6.18. Deprecated options	=>	deprecated-options-1dtzo0g
+
+6.18.1. rails_spawn_method	=>	rails-spawn-method-17vdnpt
 
 7. Analysis and system maintenance	=>	analysis-and-system-maintenance-1nnlnj8