passenger 4.0.21 → 4.0.23

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2ZhMjE5NTJiOGE0ZDIyZWM1NTBjMGNhZGViNDBlNGY0ZjM5NjlhOQ==
+    ZGM1OGIyZTU2ZWU3Nzk3NzQ1MDE0NDhiMWNkMDE0ZGEyNGE3NTRiNg==
   data.tar.gz: !binary |-
-    YjZlMWNhZmYyYjU2OWYxMDJhNTFkYTA1ZGExNzIzOTQwMDViNjgxYQ==
+    NTNhZjE4ZGYzYTFiZjlmMDY4ZDI5ZjE0YzYxMjBiMzI3ZWU3MjlmMg==
 SHA512:
   metadata.gz: !binary |-
-    ZjBkYmY3YTM4YTM5ODJkMTk3OTk3NDQzNWUzNzhhZWQ1YmIyZTUxYWQ2YTNj
-    ZjM1NWJlNmY1ZTE3MGVmZjdmMjUzZjc3MGJmZDM2MTUwNTJhMDY3NDE1M2Y1
-    ZmFiM2JmOTUxZjJmODQwNTA4OGQ0YjZjOGQ5MDJiZDQ4ZGU1NWM=
+    MzhhZjIxMTk3NGM2NGQ2ODQ3YjQ2ZjUyZWIyYTYzNTRlOTUzZmI0ZmZhMjFi
+    YWU4MWM3MjBiZTJhZmU0MDVmZmRlMjk4ZTE1YTdmNTNjMmMxY2M2YTQ3ODU3
+    YmRlNmY1YWVmZjBlZDM3Y2Y1MmFhZGI1OTdiYzM3NWY2NGE4MTk=
   data.tar.gz: !binary |-
-    MzY3ODg5NDk5YWFkMDk1YzgwODUzZjJkNDg2NWM4MTNhN2NjOGIyNGE1YjU3
-    ZDE2Y2M5MzdiNGFlODI1ZmJkZTc1YTRhMTBlYjgwYTg0N2M4NGIwOTdmMDAx
-    MDg0MTBiNzYwMWU4MDhmYmVmNGEwM2E5NmEzOWU0ZWYxZGIxMjc=
+    Zjg0MzEyYWI0MmZmM2NkZmQ3YTQwODUzYjMwNzNkNTNiZDgzOWJlYzRmMGUx
+    NDkzMDc3Y2Q2MGQwZDg1OWJiNjkwZWZhNjI4MDA2NWVjYmMwYTZiMTNlOWZm
+    MWQ4Y2FkZTI3YjNkMjYzNTU4ZWZjMTg0Yzg2M2YwNmM3YTBlOWE=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSZ4W4AAoJECrHRaUKISqMThEH/ROJ//SeW8+MOTnL0+Xw74nZ
-pRPCbTmu0ba/3v70aHDYFsqAwEZ+BYo1aBAl2GY37177OxHOdA1St7vYgKOtQRZ+
-aSLDDfk0Yfz560U8uF/ngx0ngkXEieRC5VflR/iZYlXPz3ZefRr4b8Azr73jaqg1
-LFOjjutN7zbYouwH6XEP1yxLYBForJ9/gmI6HDayjfExsVlNa0fOh+jbdXS/IZ2P
-pUlgF9FXBhJUnwhwV74nV/K3fZnLbYu5SQNhWRQK+FTr7wofBoZqY/rC/15XxiMg
-JndDcCKiw7QAAh9v2iJteKbIktnTsFLI2GvXXidfj6uZl6EwgkolkGpnGllU0fM=
-=CXOE
+iQEcBAABAgAGBQJSc3lAAAoJECrHRaUKISqM+OsH/R3TcXty3r868CLzNEfuzuwR
+KqIdzXfVVufVyQDx8us9fKHCWMJEGQ7Ae3IhONjfWz2AFOn9kPxj+WMfsucYKPg8
+d6cCFDDE54O6tIRDV0R+MztEOCk+Y2QpjyDBMGUycgnwTIm875zjrlp4hgUMjla+
+Wp1OVjfK/wrmJs31GgfxCUTKDusn+WDXcZK7M573MpFbUTlk0um76ZIfdDVFSipm
+t6+8qlfqDdNKzHA+bT4zBEWvvQvjXkmY5fsFtqWb/ATELDi77WwS8gG6JnsgiZUF
+hrM6VGWNH2cJLL5WJwEEqPzOWrJfiBBHvP0YOuR9ogP9ecogUHfAwgN3wRNkBmI=
+=hpad
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSZ4W4AAoJECrHRaUKISqMSmkH/2i54l0LeCiPf3VCaAtXD27R
-cuOCDGm+qUJNBYib4hf2A/YNnJhCmgQ/NTuqthWTHCf9MKMeG6xiXAhafLghYDjR
-nfVxTAM+ZvHxvPm/y1/fOgKoNAJu/ExKayaFnhtlusR6CeoWdLvRImYAObQ0ui9W
-jydlntjZWkDU0dtuMICgkgEUxge/ss81msLBfvEqWILx8GJ7xIDR/89qagbfi1AB
-HwQfigfgSHwxLIhjGhd3K5sLkZyD5gN01iLj99lO33wBcJRPCpJquvrrl+egybGN
-OQNTDkmW7sKHRQPcX78uvlR5VlnfRSuP9RCL0aa25EdZkOlVxkuc6cR3OtgWXEs=
-=JQt6
+iQEcBAABAgAGBQJSc3k/AAoJECrHRaUKISqM9I4IAI8VFAa5vgqAzoQjbV36YBCS
+inElj7A0NH/bEOqcFNmu2B3kn4GVUn72/zldo/gbhCJWEVpwNYIwBGUjsc8gQjwY
+6bXWtf8gjuHbu/z9ZSTacJBf9faLD0tRiYre9qBd4cWdh/tC85vC57nnHMcVwsE4
+HGd1BBmVDD0dB3J+bOBclLFuQ1OCqXFa3uNtxZThqtNfwcohp4eslmBsGPvFRhsK
+Di8lKSr/ATa/vXvbCsm2+v4ybREBWRZQyYChdo4FhPp6NxJT2f/CaOWEKwWphr9g
+onhfcsC316G3ywJb4D+2yF6n3ZZIcQWPwLMqRsq6K704o/NRKC4xEAnYGI95nMI=
+=//tM
 -----END PGP SIGNATURE-----

data/NEWS

@@ -1,7 +1,22 @@
+Release 4.0.23
+--------------
+
+ * Fixed compilation problems on GCC 4.8.2 (e.g. Arch Linux 2013-10-27).
+ * Fixed a compatibility problem with Solaris /usr/ccs/bin/make: issue #999.
+ * Support for the Meteor Javascript framework has been open sourced.
+
+
+Release 4.0.22
+--------------
+
+ * [Enterprised] Fixed compilation problems on OS X Mavericks.
+
+
 Release 4.0.21
 --------------
 
  * [Nginx] Upgraded the preferred Nginx version to 1.4.3.
+ * Node.js support has been open sourced.
  * Prelimenary OS X Mavericks support.
  * Work around an Apache packaging bug in CentOS 5.
  * Various user friendliness improvements in the documentation and the

data/Rakefile

@@ -50,8 +50,10 @@ task :default do
 end
 
 desc "Remove compiled files"
-task :clean do
-	sh "rm -rf buildout"
+task :clean => 'clean:cache'
+task 'common:clean' => 'clean:cache'
+task 'clean:cache' do
+	sh "rm -rf #{OUTPUT_DIR}cache"
 end
 
 desc "Remove all generated files"

data/bin/passenger-install-apache2-module

@@ -37,6 +37,7 @@ ENV["PATH"] += ":/usr/sbin:/sbin:/usr/local/sbin"
 
 require 'optparse'
 require 'stringio'
+require 'phusion_passenger/constants'
 require 'phusion_passenger/platform_info/ruby'
 require 'phusion_passenger/platform_info/apache'
 require 'phusion_passenger/platform_info/apache_detector'
@@ -132,6 +133,15 @@ private
 			detector.detect_all
 			detector.report
 			@apache2 = detector.result_for(PlatformInfo.apxs2)
+			if @apache2.nil?
+				# Yes this can happen (see https://groups.google.com/forum/#!topic/phusion-passenger/JcUJOBzILB4)
+				# but I have no idea how and why. I need people who can help me reproduce this.
+				# Until then, let's output an error.
+				raise "An internal error occurred. No information detected for #{PlatformInfo.apxs2} " +
+					"(@apache2 is nil). Please contact this program's authors for support, and please " +
+					"attach the full output of this installer, as well as the full output of the command " +
+					"'passenger-config --detect-apache2'."
+			end
 			if detector.results.size > 1
 				other_installs = detector.results - [@apache2]
 				render_template 'apache2/multiple_apache_installations_detected',

data/build/debian.rb

@@ -83,7 +83,8 @@ task 'debian:orig_tarball' => Packaging::PREGENERATED_FILES do
 		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"
+		sh "cd #{PKG_DIR} && find #{DEBIAN_NAME}_#{PACKAGE_VERSION} -print0 | xargs -0 touch -d '2013-10-27 00:00:00 UTC'"
+		sh "cd #{PKG_DIR} && tar -c #{DEBIAN_NAME}_#{PACKAGE_VERSION} | gzip --no-name --best > #{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz"
 	end
 end
 
@@ -160,10 +161,15 @@ end
 
 def create_debian_binary_package_task(distribution, arch)
 	task "debian:binary_package:#{distribution}_#{arch}" => 'debian:binary_packages:check' do
+		require 'shellwords'
 		base_name = "#{DEBIAN_NAME}_#{PACKAGE_VERSION}-1~#{distribution}1"
-		sh "cd #{PKG_DIR}/official && " +
+		logfile = "#{PKG_DIR}/official/passenger_#{distribution}_#{arch}.log"
+		command = "cd #{PKG_DIR}/official && " +
 			"pbuilder-dist #{distribution} #{arch} build #{base_name}.dsc " +
-			"2>&1 | tee #{PKG_DIR}/official/passenger_#{distribution}_#{arch}.log"
+			"2>&1 | awk '{ print strftime(\"%Y-%m-%d %H:%M:%S -- \"), $0; fflush(); }'" +
+			" | tee #{logfile}"
+		sh "bash -c #{Shellwords.escape(command)}"
+		sh "echo Done >> #{logfile}"
 	end
 end
 

data/build/test_basics.rb

@@ -51,7 +51,8 @@ task 'test:install_deps' do
 
 	if boolean_option('BASE_DEPS', default)
 		sh "#{gem_install} rails -v 2.3.15"
-		sh "#{gem_install} bundler rspec mime-types daemon_controller json rack"
+		sh "#{gem_install} mime-types -v 1.25"
+		sh "#{gem_install} bundler rspec daemon_controller json rack"
 	end
 	if boolean_option('DOCTOOLS', default)
 		sh "#{gem_install} mizuho bluecloth"

data/debian.template/rules.template

@@ -9,6 +9,13 @@
 	export USE_CCACHE=1
 #endif
 
+# Speed up ccache (reduce I/O) by lightly compressing things.
+# Always set these variables because pbuilder uses ccache transparently.
+CCACHE_COMPRESS=1
+export CCACHE_COMPRESS
+CCACHE_COMPRESS_LEVEL=3
+export CCACHE_COMPRESS_LEVEL
+
 %:
 	dh $@
 

data/doc/Users guide Apache.idmap.txt

@@ -122,123 +122,129 @@
 
 6.2. PassengerDefaultRuby <filename>	=>	passengerdefaultruby-and-passengerruby-7zblp8
 
-6.3. PassengerRuby <filename>	=>	passengerruby-filename--1r3fv73
+6.3. Deployment options	=>	deployment-options-1unzrll
 
-6.4. PassengerPython <filename>	=>	passengerpython-filename--1ssesv3
+6.3.1. PassengerEnabled <on|off>	=>	passengerenabled-on-off--74rzth
 
-6.5. PassengerAppRoot <path/to/root>	=>	passengerapproot-path-to-root--uf24yd
+6.3.2. PassengerRuby <filename>	=>	passengerruby-filename--1r3fv73
 
-6.6. PassengerSpawnMethod <string>	=>	passengerspawnmethod-string--sodg2y
+6.3.3. PassengerPython <filename>	=>	passengerpython-filename--1ssesv3
 
-6.7. passengerLoadShellEnvvars <on|off>	=>	passengerloadshellenvvars-on-off--1290yz1
+6.3.4. PassengerAppRoot <path/to/root>	=>	passengerapproot-path-to-root--uf24yd
 
-6.8. PassengerEnabled <on|off>	=>	passengerenabled-on-off--74rzth
+6.3.5. PassengerRestartDir <directory>	=>	passengerrestartdir-directory--1fmhmv0
 
-6.9. PassengerTempDir <directory>	=>	passengertempdir-directory--68h2ng
+6.3.6. PassengerRollingRestarts <on|off>	=>	passengerrollingrestarts
 
-6.10. PassengerUploadBufferDir <directory>	=>	passengeruploadbufferdir-directory--kdr8at
+6.3.7. PassengerResistDeploymentErrors <on|off>	=>	passengerresistdeploymenterrors
 
-6.11. PassengerRestartDir <directory>	=>	passengerrestartdir-directory--1fmhmv0
+6.4. Process spawning options	=>	process-spawning-options-v2vscm
 
-6.12. PassengerRollingRestarts <on|off>	=>	passengerrollingrestarts
+6.4.1. PassengerSpawnMethod <string>	=>	passengerspawnmethod-string--sodg2y
 
-6.13. PassengerResistDeploymentErrors <on|off>	=>	passengerresistdeploymenterrors
+6.4.2. PassengerLoadShellEnvvars <on|off>	=>	passengerloadshellenvvars-on-off--1290yz1
 
-6.14. Security options	=>	security-options-1pb75ho
+6.5. Security options	=>	security-options-1pb75ho
 
-6.14.1. PassengerUserSwitching <on|off>	=>	passengeruserswitching
+6.5.1. PassengerUserSwitching <on|off>	=>	passengeruserswitching
 
-6.14.2. PassengerUser <username>	=>	passengeruser
+6.5.2. PassengerUser <username>	=>	passengeruser
 
-6.14.3. PassengerGroup <group name>	=>	passengergroup
+6.5.3. PassengerGroup <group name>	=>	passengergroup
 
-6.14.4. PassengerDefaultUser <username>	=>	passengerdefaultuser
+6.5.4. PassengerDefaultUser <username>	=>	passengerdefaultuser
 
-6.14.5. PassengerDefaultGroup <group name>	=>	passengerdefaultgroup
+6.5.5. PassengerDefaultGroup <group name>	=>	passengerdefaultgroup
 
-6.14.6. PassengerFriendlyErrorPages <on|off>	=>	passengerfriendlyerrorpages
+6.5.6. PassengerFriendlyErrorPages <on|off>	=>	passengerfriendlyerrorpages
 
-6.15. Resource control and optimization options	=>	resource-control-and-optimization-options-zu2f7u
+6.6. Resource control and optimization options	=>	resource-control-and-optimization-options-zu2f7u
 
-6.15.1. PassengerMaxPoolSize <integer>	=>	passengermaxpoolsize-integer--am64q8
+6.6.1. PassengerMaxPoolSize <integer>	=>	passengermaxpoolsize-integer--am64q8
 
-6.15.2. PassengerMinInstances <integer>	=>	passengermininstances-integer--wegq6b
+6.6.2. PassengerMinInstances <integer>	=>	passengermininstances-integer--wegq6b
 
-6.15.3. PassengerMaxInstances <integer>	=>	passengermaxinstances
+6.6.3. PassengerMaxInstances <integer>	=>	passengermaxinstances
 
-6.15.4. PassengerMaxInstancesPerApp <integer>	=>	passengermaxinstancesperapp
+6.6.4. PassengerMaxInstancesPerApp <integer>	=>	passengermaxinstancesperapp
 
-6.15.5. PassengerPoolIdleTime <integer>	=>	passengerpoolidletime-integer--a3gunq
+6.6.5. PassengerPoolIdleTime <integer>	=>	passengerpoolidletime-integer--a3gunq
 
-6.15.6. PassengerMaxPreloaderIdleTime <integer>	=>	railsappspawneridletime-integer--1awgog1
+6.6.6. PassengerMaxPreloaderIdleTime <integer>	=>	railsappspawneridletime-integer--1awgog1
 
-6.15.7. PassengerStartTimeout <seconds>	=>	passengerstarttimeout-seconds--ihnfku
+6.6.7. PassengerStartTimeout <seconds>	=>	passengerstarttimeout-seconds--ihnfku
 
-6.15.8. PassengerConcurrencyModel <process|thread>	=>	passengerconcurrencymodel-process-thread--1eipofj
+6.6.8. PassengerConcurrencyModel <process|thread>	=>	passengerconcurrencymodel-process-thread--1eipofj
 
-6.15.9. PassengerThreadCount <number>	=>	passengerthreadcount-number--10jl64a
+6.6.9. PassengerThreadCount <number>	=>	passengerthreadcount-number--10jl64a
 
-6.15.10. PassengerMaxRequests <integer>	=>	passengermaxrequests-integer--17qkw9n
+6.6.10. PassengerMaxRequests <integer>	=>	passengermaxrequests-integer--17qkw9n
 
-6.15.11. PassengerMaxRequestTime <seconds>	=>	passengermaxrequesttime-seconds--127v1i2
+6.6.11. PassengerMaxRequestTime <seconds>	=>	passengermaxrequesttime-seconds--127v1i2
 
-6.15.12. PassengerMemoryLimit <integer>	=>	passengermemorylimit-integer--18irza1
+6.6.12. PassengerMemoryLimit <integer>	=>	passengermemorylimit-integer--18irza1
 
-6.15.13. PassengerStatThrottleRate <integer>	=>	passengerstatthrottlerate-integer--1dcfda3
+6.6.13. PassengerStatThrottleRate <integer>	=>	passengerstatthrottlerate-integer--1dcfda3
 
-6.15.14. PassengerPreStart <url>	=>	passengerprestart-url--1utb57k
+6.6.14. PassengerPreStart <url>	=>	passengerprestart-url--1utb57k
 
-6.15.15. PassengerHighPerformance <on|off>	=>	passengerhighperformance-on-off--nvfa86
+6.6.15. PassengerHighPerformance <on|off>	=>	passengerhighperformance-on-off--nvfa86
 
-6.16. Connection handling options	=>	connection-handling-options-1k3zd1a
+6.7. Connection handling options	=>	connection-handling-options-1k3zd1a
 
-6.16.1. PassengerBufferResponse <on|off>	=>	passengerbufferresponse-on-off--1y7ilka
+6.7.1. PassengerBufferResponse <on|off>	=>	passengerbufferresponse-on-off--1y7ilka
 
-6.16.2. passenger_max_request_queue_size <number>	=>	passenger-max-request-queue-size-number--1f1uocd
+6.7.2. PassengerMaxRequestQueueSize <number>	=>	passenger-max-request-queue-size-number--1f1uocd
 
-6.17. Compatibility options	=>	compatibility-options-8jve5a
+6.8. Compatibility options	=>	compatibility-options-8jve5a
 
-6.17.1. PassengerResolveSymlinksInDocumentRoot <on|off>	=>	passengerresolvesymlinksindocumentroot-on-off--1r0qcp8
+6.8.1. PassengerResolveSymlinksInDocumentRoot <on|off>	=>	passengerresolvesymlinksindocumentroot-on-off--1r0qcp8
 
-6.17.2. PassengerAllowEncodedSlashes <on|off>	=>	passengerallowencodedslashes-on-off--1y3s1ww
+6.8.2. PassengerAllowEncodedSlashes <on|off>	=>	passengerallowencodedslashes-on-off--1y3s1ww
 
-6.18. Logging and debugging options	=>	logging-and-debugging-options-el2cuc
+6.9. Logging and debugging options	=>	logging-and-debugging-options-el2cuc
 
-6.18.1. PassengerLogLevel <integer>	=>	passengerloglevel-integer--s3kbil
+6.9.1. PassengerLogLevel <integer>	=>	passengerloglevel-integer--s3kbil
 
-6.18.2. PassengerDebugLogFile <filename>	=>	passengerdebuglogfile-filename--1wjm2j1
+6.9.2. PassengerDebugLogFile <filename>	=>	passengerdebuglogfile-filename--1wjm2j1
 
-6.18.3. PassengerDebugger <on|off>	=>	passengerdebugger-on-off--19you7e
+6.9.3. PassengerDebugger <on|off>	=>	passengerdebugger-on-off--19you7e
 
-6.19. Classic Ruby on Rails (⇐ 2.x)-specific options	=>	ruby-on-rails-specific-options-1t10wfu
+6.10. Rack and Rails >= 3 specific options	=>	rack-specific-options-wk9qzt
 
-6.19.1. RailsBaseURI <uri>	=>	railsbaseuri-uri--1txrw3k
+6.10.1. RackBaseURI <uri>	=>	rackbaseuri-uri--1to24pj
 
-6.19.2. RailsEnv <string>	=>	railsenv-string--1b0xxvu
+6.10.2. RackEnv <string>	=>	rackenv-string--vve9py
 
-6.20. Rack and Rails >= 3 specific options	=>	rack-specific-options-wk9qzt
+6.11. Classic Ruby on Rails (⇐ 2.x)-specific options	=>	ruby-on-rails-specific-options-1t10wfu
 
-6.20.1. RackBaseURI <uri>	=>	rackbaseuri-uri--1to24pj
+6.11.1. RailsBaseURI <uri>	=>	railsbaseuri-uri--1txrw3k
 
-6.20.2. RackEnv <string>	=>	rackenv-string--vve9py
+6.11.2. RailsEnv <string>	=>	railsenv-string--1b0xxvu
 
-6.21. Deprecated or removed options	=>	deprecated-options-pm9m57
+6.12. Advanced options	=>	advanced-options-1ab1jkq
 
-6.21.1. RailsRuby	=>	railsruby-ht09ei
+6.12.1. PassengerTempDir <directory>	=>	passengertempdir-directory--68h2ng
 
-6.21.2. RailsUserSwitching	=>	railsuserswitching-1npx8y4
+6.12.2. PassengerUploadBufferDir <directory>	=>	passengeruploadbufferdir-directory--kdr8at
 
-6.21.3. RailsDefaultUser	=>	railsdefaultuser-19j7n3m
+6.13. Deprecated or removed options	=>	deprecated-options-pm9m57
 
-6.21.4. RailsAllowModRewrite	=>	railsallowmodrewrite-1vkziro
+6.13.1. RailsRuby	=>	railsruby-ht09ei
 
-6.21.5. RailsSpawnMethod	=>	railsspawnmethod-1aljgpa
+6.13.2. RailsUserSwitching	=>	railsuserswitching-1npx8y4
 
-6.21.6. RailsAutoDetect, RackAutoDetect and WsgiAutoDetect	=>	railsautodetect-rackautodetect-and-wsgiautodetect-1qgakzs
+6.13.3. RailsDefaultUser	=>	railsdefaultuser-19j7n3m
 
-6.21.7. RailsAppSpawnerIdleTime	=>	railsappspawneridletime-heh41r
+6.13.4. RailsAllowModRewrite	=>	railsallowmodrewrite-1vkziro
 
-6.21.8. RailsFrameworkSpawnerIdleTime	=>	railsframeworkspawneridletime-adcf9k
+6.13.5. RailsSpawnMethod	=>	railsspawnmethod-1aljgpa
+
+6.13.6. RailsAutoDetect, RackAutoDetect and WsgiAutoDetect	=>	railsautodetect-rackautodetect-and-wsgiautodetect-1qgakzs
+
+6.13.7. RailsAppSpawnerIdleTime	=>	railsappspawneridletime-heh41r
+
+6.13.8. RailsFrameworkSpawnerIdleTime	=>	railsframeworkspawneridletime-adcf9k
 
 7. Troubleshooting	=>	troubleshooting-2ihihi
 

data/doc/Users guide Apache.txt

@@ -497,8 +497,43 @@ This option specifies the default Ruby interpreter to use for web apps as well a
 
 This option may occur in the global server configuration. The default value is 'ruby', meaning that the Ruby interpreter will be looked up according to the `PATH` environment variable.
 
+=== Deployment options
+
+[[PassengerEnabled]]
+==== PassengerEnabled <on|off>
+You can set this option to 'off' to completely disable Phusion Passenger for
+a certain location. This is useful if, for example, you want to integrate a PHP
+application into the same virtual host as a Rails application.
+
+Suppose that you have a Rails application in '/apps/foo'. Suppose that you've
+dropped Wordpress -- a blogging application written in PHP -- in
+'/apps/foo/public/wordpress'. You can then configure Phusion Passenger as
+follows:
+
+------------------------------------
+<VirtualHost *:80>
+    ServerName www.foo.com
+    DocumentRoot /apps/foo/public
+    <Directory /apps/foo/public/wordpress>
+        PassengerEnabled off
+        AllowOverride all      # <-- Makes Wordpress's .htaccess file work.
+    </Directory>
+</VirtualHost>
+------------------------------------
+
+This way, Phusion Passenger will not interfere with Wordpress.
+
+'PassengerEnabled' 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 'on'.
+
 [[PassengerRuby]]
-=== PassengerRuby <filename> ===
+==== PassengerRuby <filename>
 The `PassengerDefaultRuby` and `PassengerRuby` directives specify the Ruby interpreter to use. Similarly, the `PassengerPython` directive is for specifying the Python interpreter.
 
 The relationship between `PassengerDefaultRuby` and `PassengerRuby` is as follows:
@@ -554,14 +589,14 @@ PassengerPython /usr/bin/python2.6
 
 include::users_guide_snippets/rvm_helper_tool.txt[]
 
-=== PassengerPython <filename> ===
+==== PassengerPython <filename>
 :version: 4.0.0
 include::users_guide_snippets/since_version.txt[]
 
 This option allows one to specify the Python interpreter to use. See <<PassengerRuby,PassengerRuby>> for more information. The default value is 'python', meaning that the Python interpreter will be looked up according to the `PATH` environment variable.
 
 [[PassengerAppRoot]]
-=== PassengerAppRoot <path/to/root> ===
+==== PassengerAppRoot <path/to/root>
 By default, Phusion Passenger assumes that the application's root directory
 is the parent directory of the 'public' directory. This option allows one to
 specify the application's root independently from the DocumentRoot, which
@@ -587,144 +622,7 @@ Example:
 </VirtualHost>
 -----------------------------
 
-[[PassengerSpawnMethod]]
-=== PassengerSpawnMethod <string> ===
-[TIP]
-."What spawn method should I use?"
-=========================================================
-This subsection attempts to describe spawn methods, but it's okay if you don't (want to)
-understand it, as it's mostly a technical detail. You can basically follow this rule of thumb:
-
-************************************************
-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' spawn
-method bring many benefits.
-=========================================================
-
-include::users_guide_snippets/passenger_spawn_method.txt[]
-
-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'.
-
-[[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
-a certain location. This is useful if, for example, you want to integrate a PHP
-application into the same virtual host as a Rails application.
-
-Suppose that you have a Rails application in '/apps/foo'. Suppose that you've
-dropped Wordpress -- a blogging application written in PHP -- in
-'/apps/foo/public/wordpress'. You can then configure Phusion Passenger as
-follows:
-
-------------------------------------
-<VirtualHost *:80>
-    ServerName www.foo.com
-    DocumentRoot /apps/foo/public
-    <Directory /apps/foo/public/wordpress>
-        PassengerEnabled off
-        AllowOverride all      # <-- Makes Wordpress's .htaccess file work.
-    </Directory>
-</VirtualHost>
-------------------------------------
-
-This way, Phusion Passenger will not interfere with Wordpress.
-
-'PassengerEnabled' 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 'on'.
-
-[[PassengerTempDir]]
-=== PassengerTempDir <directory> ===
-Specifies the directory that Phusion Passenger should use for storing temporary
-files. This includes things such as Unix socket files, buffered file uploads
-(see also <<PassengerUploadBufferDir,PassengerUploadBufferDir>>), etc.
-
-This option may be specified once, in the global server configuration. The
-default temp directory that Phusion Passenger uses is '/tmp'.
-
-This option is especially useful if Apache is not allowed to write to /tmp
-(which is the case on some systems with strict SELinux policies) or if the
-partition that /tmp lives on doesn't have enough disk space.
-
-.Command line tools
-Some Phusion Passenger command line administration tools, such as
-`passenger-status`, must know what Phusion Passenger's temp directory is
-in order to function properly. You can pass the directory through the
-`PASSENGER_TMPDIR` environment variable, or the `TMPDIR` environment variable
-(the former will be used if both are specified).
-
-For example, if you set 'PassengerTempDir' to '/my_temp_dir', then invoke
-`passenger-status` after you've set the `PASSENGER_TMPDIR` or `TMPDIR`
-environment variable, like this:
-
-----------------------------------------------------------
-export PASSENGER_TMPDIR=/my_temp-dir
-sudo -E passenger-status
-# The -E option tells 'sudo' to preserve environment variables.
-----------------------------------------------------------
-
-[[PassengerUploadBufferDir]]
-=== PassengerUploadBufferDir <directory> ===
-Phusion Passenger buffers large file uploads to disk in order prevent slow file
-uploads from blocking web applications. By default, a subdirectory in the
-system's temporary files directory (or a subdirectory in the directory specified
-in <<PassengerTempDir,PassengerTempDir>>, if set) is automatically created for
-storing these buffered file uploads.
-
-This configuration directive allows you to specify a different directory for storing
-buffered file uploads. If you've specified such a directory (as opposed to using
-Phusion Passenger's default) then you *must* ensure that this directory exists.
-
-This configuration directive is also useful if you're using apache2-mpm-itk.
-The buffered file upload directory that Phusion Passenger creates by default has
-very strict permissions: it can only be accessed by the Apache worker processes.
-However, Phusion Passenger assumes that all Apache worker processes are running
-as the same user. apache2-mpm-itk breaks this assumption by running multiple
-Apache worker processes as different users. So if you're using apace2-mpm-itk,
-you should set this option to a directory that is writable by all Apache worker
-processes, such as '/tmp'.
-
-You may specify 'PassengerUploadBufferDir' in the following places:
-
- * In the global server configuration.
- * In a virtual host configuration block.
- * In a `<Directory>` or `<Location>` block.
- * In '.htaccess', if `AllowOverrides Options` is enabled.
-
-In each place, it may be specified at most once.
-
-=== PassengerRestartDir <directory> ===
+==== PassengerRestartDir <directory>
 As described in the deployment chapters of this document, Phusion Passenger
 checks the file 'tmp/restart.txt' in the applications'
 <<application_root,root directory>> for restarting applications. Sometimes it
@@ -783,7 +681,7 @@ You can prevent this from happening by pointing PassengerRestartDir to a
 directory that's readable by Apache, but only writable by administrators.
 
 [[PassengerRollingRestarts]]
-=== PassengerRollingRestarts <on|off> ===
+==== PassengerRollingRestarts <on|off>
 :version: 3.0.0
 include::users_guide_snippets/enterprise_only.txt[]
 
@@ -823,7 +721,7 @@ This option may occur in the following places:
 
 In each place, it may be specified at most once. The default value is 'off'.
 
-=== PassengerResistDeploymentErrors <on|off> ===
+==== PassengerResistDeploymentErrors <on|off>
 :version: 3.0.0
 include::users_guide_snippets/enterprise_only.txt[]
 
@@ -850,6 +748,52 @@ This option may occur in the following places:
 
 In each place, it may be specified at most once. The default value is 'off'.
 
+=== Process spawning options
+
+[[PassengerSpawnMethod]]
+==== PassengerSpawnMethod <string>
+[TIP]
+."What spawn method should I use?"
+=========================================================
+This subsection attempts to describe spawn methods, but it's okay if you don't (want to)
+understand it, as it's mostly a technical detail. You can basically follow this rule of thumb:
+
+************************************************
+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' spawn
+method bring many benefits.
+=========================================================
+
+include::users_guide_snippets/passenger_spawn_method.txt[]
+
+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'.
+
+[[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'.
+
 === Security options ===
 
 [[PassengerUserSwitching]]
@@ -1685,7 +1629,7 @@ if responses can be huge. Because entire responses are buffered in memory when t
 =====================================================
 
 [[PassengerMaxRequestQueueSize]]
-==== passenger_max_request_queue_size <number> ====
+==== PassengerMaxRequestQueueSize <number> ====
 :version: 4.0.15
 include::users_guide_snippets/since_version.txt[]
 
@@ -1828,6 +1772,37 @@ This option may occur in the following places:
 
 In each place, it may be specified at most once. The default value is 'off'.
 
+=== Rack and Rails >= 3 specific options ===
+
+[[RackBaseURI]]
+==== RackBaseURI <uri> ====
+Used to specify that the given URI is a Rack application. See
+<<deploying_rack_to_sub_uri,Deploying Rack to a sub URI>> for an example.
+
+It is allowed to specify this option multiple times. Do this to deploy multiple
+Rack applications in different sub-URIs under the same virtual host.
+
+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.
+
+[[rack_env]]
+==== RackEnv <string> ====
+The given value will be accessible in Rack applications in the `RACK_ENV`
+environment variable. This allows one to define the environment in which
+Rack applications are run, very similar to `RAILS_ENV`.
+
+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 'production'.
 
 === Classic Ruby on Rails (<= 2.x)-specific options ===
 
@@ -1862,37 +1837,67 @@ This option may occur in the following places:
 
 In each place, it may be specified at most once. The default value is 'production'.
 
-=== Rack and Rails >= 3 specific options ===
+=== Advanced options
 
-[[RackBaseURI]]
-==== RackBaseURI <uri> ====
-Used to specify that the given URI is a Rack application. See
-<<deploying_rack_to_sub_uri,Deploying Rack to a sub URI>> for an example.
+[[PassengerTempDir]]
+==== PassengerTempDir <directory>
+Specifies the directory that Phusion Passenger should use for storing temporary
+files. This includes things such as Unix socket files, buffered file uploads
+(see also <<PassengerUploadBufferDir,PassengerUploadBufferDir>>), etc.
 
-It is allowed to specify this option multiple times. Do this to deploy multiple
-Rack applications in different sub-URIs under the same virtual host.
+This option may be specified once, in the global server configuration. The
+default temp directory that Phusion Passenger uses is '/tmp'.
 
-This option may occur in the following places:
+This option is especially useful if Apache is not allowed to write to /tmp
+(which is the case on some systems with strict SELinux policies) or if the
+partition that /tmp lives on doesn't have enough disk space.
 
- * In the global server configuration.
- * In a virtual host configuration block.
- * In a `<Directory>` or `<Location>` block.
- * In '.htaccess', if `AllowOverride Options` is on.
+.Command line tools
+Some Phusion Passenger command line administration tools, such as
+`passenger-status`, must know what Phusion Passenger's temp directory is
+in order to function properly. You can pass the directory through the
+`PASSENGER_TMPDIR` environment variable, or the `TMPDIR` environment variable
+(the former will be used if both are specified).
 
-[[rack_env]]
-==== RackEnv <string> ====
-The given value will be accessible in Rack applications in the `RACK_ENV`
-environment variable. This allows one to define the environment in which
-Rack applications are run, very similar to `RAILS_ENV`.
+For example, if you set 'PassengerTempDir' to '/my_temp_dir', then invoke
+`passenger-status` after you've set the `PASSENGER_TMPDIR` or `TMPDIR`
+environment variable, like this:
 
-This option may occur in the following places:
+----------------------------------------------------------
+export PASSENGER_TMPDIR=/my_temp-dir
+sudo -E passenger-status
+# The -E option tells 'sudo' to preserve environment variables.
+----------------------------------------------------------
+
+[[PassengerUploadBufferDir]]
+==== PassengerUploadBufferDir <directory>
+Phusion Passenger buffers large file uploads to disk in order prevent slow file
+uploads from blocking web applications. By default, a subdirectory in the
+system's temporary files directory (or a subdirectory in the directory specified
+in <<PassengerTempDir,PassengerTempDir>>, if set) is automatically created for
+storing these buffered file uploads.
+
+This configuration directive allows you to specify a different directory for storing
+buffered file uploads. If you've specified such a directory (as opposed to using
+Phusion Passenger's default) then you *must* ensure that this directory exists.
+
+This configuration directive is also useful if you're using apache2-mpm-itk.
+The buffered file upload directory that Phusion Passenger creates by default has
+very strict permissions: it can only be accessed by the Apache worker processes.
+However, Phusion Passenger assumes that all Apache worker processes are running
+as the same user. apache2-mpm-itk breaks this assumption by running multiple
+Apache worker processes as different users. So if you're using apace2-mpm-itk,
+you should set this option to a directory that is writable by all Apache worker
+processes, such as '/tmp'.
+
+You may specify 'PassengerUploadBufferDir' 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 '.htaccess', if `AllowOverrides Options` is enabled.
 
-In each place, it may be specified at most once. The default value is 'production'.
+In each place, it may be specified at most once.
 
 === Deprecated or removed options ===