passenger 4.0.41 → 4.0.42

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGE3MWJhOWJjY2ZmMjk0OWMyMzU4YzIxYTY0YTA1NTJhYzIwMjQ0Mg==
+    ZTk2YzkwYzQ3MzQwMjFmMTYwMWNlY2NmYmZkYzE2NjU2OWU0OGJhMQ==
   data.tar.gz: !binary |-
-    YmI0NjhmZjdjYmIxZGMxODg5Njg2MWI5NWI2ZTkxZGZmOWVjMGVlNw==
+    MzJiMDU1ZmM0NDU3YjYwNzlkMDBiNjhmNjA3Y2ZhNDIzNTVjYjRmMQ==
 SHA512:
   metadata.gz: !binary |-
-    Mjk4Mjg4ZTdmY2ViYjFkNzZiMTVhYWFiNzgyYjc2NTFlY2UyYTUwZjI3ZTQx
-    ODg2NDJmMTM0OGMzNTE4NmNmZGNhNTI2MDRhNDgxZjk3NTU5MzU2OTk4NWU4
-    ODIwYWFiN2U4MTEwNWE4YTRiMjQ2Yjc0ZDgzN2NhNDM0OTk1Nzk=
+    MDdlZmY0M2Y3MGJmZTI2OWE1ZWIxNWY3NDIxMjlkNDQxNWQ0NWY3ZWQ5ODRm
+    Yjg1ODJlYzcxMDA4ZThlNzM0MjM2OTM0MzI2ZTdjYjlmN2NhOTkyY2MxMTY1
+    YjQ0NmRlZDQ0OWI3ODgwMTU2MjM5N2FjNjEwNGE3ODU4ZDRlMTc=
   data.tar.gz: !binary |-
-    MTA0Mjk0NGEzMWU1ODFiODY5OThiY2NiZDY1ZmQ5YzZlZGQyYzdmNzEzMDE1
-    ZjI5OTljM2Y3ZWJmM2I3YjY0N2JmYWYwNzlmNTFkNDhlOWMzY2QwODM3Yzhi
-    NDY3MmY5M2E3N2UzZDhlNTA2NThiYmNhZjA4YWUyYzNmMjcxYjA=
+    ZjAzMzFlN2E2YTE3YTNkOTQ0MTJlNTBlNDgwZmNmOTE4MjE3NDIwM2U2YThl
+    YWY4NzMzNDE4Y2MyZmM5NmVjMDE5NGMwNzU0YjI5N2YyYWNlOTkyY2M3MWZi
+    ZGM1YWY3ZDI3ZGY4YmZiODA5MWU5YWZlMmU4MGRiNDg5ZjY4MGM=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJTRE10AAoJECrHRaUKISqMchsH/3AQD5vGNFS0LjKqLab5L0TA
-glHGrm6V1UC0fG5bxUOgKlG4zop8zrADr1kH9H0Z8uFzA5nrxhkaC7AnJgqOyuaq
-LxAYiwcJxJ1eM6IyjsAW6Tj3KcZyRWSrlwAIzW1UoZnWgpWeajp0iBwzGfaj65y8
-OC3yF5sx486x13BgTdM5c1I5cWpbneoY7lDu+sybCvppgVRBs2Z/A+GVYNRlp7zD
-2hNrluue4tHDvL/EgQaQaF1Bm0sTe3UvMq+ujSc7q0LwyheL04uHUlere92qt6vt
-PfZeJQgHV9GwDRW3ZQG0d08OFKErdEF+5S9qNwNS+tPp3i/KifhyEBd/RsYZWz4=
-=Sw+V
+iQEcBAABAgAGBQJTagHhAAoJECrHRaUKISqM3JgH/iO5ytwG5HOsJtQIysPKlA1i
+D2rnfAPBxs40pvf1ga8qLFvpcUyxtZayP6JU5xNNM/5Z31fJt9gQGsLoA6K6SuLq
+qvEq7C25Hiub2PWIhz1Ejl+uMQAFBO8bZiAWutkKTSyg3FbBxz8QqUyExvl6KjWm
+Izw60V1sgyBZfKxm2gKC6GC3yCBJXPfyWSFOV+1QgZOHDLMH+ehELCAXzYmKj/Lg
+sA+l+4W1gcDv6aDuf1mKMRytU6F6fe1KXeShiGVvE80R4sXz3YnKNU+RADbTcSLA
+f6eBkPTOjiuXGgYzQQFhcrVy3c4OnxSqBt4pf99pMqCbbExmX4pjKUsyGpMftDY=
+=Qmot
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJTRE10AAoJECrHRaUKISqMPNAIAKlQNxJ08NkoCNRZ75YXKxYn
-Umo97ZF/jg19B+LBjR7QpsrBAzTVewcz7pQPPrh+61tr97hx0KMGQ6LtXhR1Smnc
-8gOn6cw4sgschV00tVpRoUJNsVtLS0FLXmMilycUQSmrYUYWWNBw/JiH5aCkByGQ
-aTF538bF04R95qaHlGVdSbgNXB/jA8+v73Wdec2221DvXEXRRdttScE5vOImCUCf
-dQ4ibO+zXvPR3xw/Pxm5jyJgy6jOjFYMniIpbdpu8tMBknY10pnXuW/dGXFM59pC
-4wd9W5Pr2TyHADAZyLeKLbXfl3OlQh+uMS+UiDmWbcePHOK2jQzM7EWK13mCKkk=
-=Gwi5
+iQEcBAABAgAGBQJTagHhAAoJECrHRaUKISqM4/gH/jWZegkrdqOsXBTGp5zXL5iY
+Gx2+AkGOsbYEZ1CIeNn7VlUDqNTAHX4vcSulnP6Tefhs3bJHf6okgv6Bx2NGPtU6
+8H9ju7z/+ZfJDkD2nymwZpApRppUGJKy47VFDjVQX2soHNA1VFdcqnv9bjcWEWSO
+DXFLoUYVNVp/9y3Q9uKmP0Uz5Mr/lqzm2VfkUjZjAJVcpSUkGysWC0+8UwAMfuVd
+SBlEZ0G9RoJ5e6vMhsdBv0L7jFSt9yGRTCCi5gqgLtoRzUSw7GVUZj36e28KYLzg
+H900Ze8sqOczw4VFN8Fw6UXYV778YPpcx+r5Lf0BCLgTs5Tw/K0S9Emk0IiYOBM=
+=7RXc
 -----END PGP SIGNATURE-----

data/.travis.yml

@@ -5,8 +5,8 @@ env:
   - TEST_CXX=1 SUDO=1
   - TEST_RUBY=1 TEST_RUBY_VERSION=1.8.7 TEST_CLASSIC_RAILS=0 TEST_RUBYGEMS_VERSION=1.8.25
   - TEST_RUBY=1 TEST_RUBY_VERSION=1.9.3 TEST_CLASSIC_RAILS=0
-  - TEST_NGINX=1 TEST_STANDALONE=1 TEST_RUBYGEMS_VERSION=1.8.25
-  - TEST_APACHE2=1 TEST_RUBYGEMS_VERSION=1.8.25
-  - TEST_SOURCE_PACKAGING=1 TEST_DEBIAN_PACKAGING=1 TEST_RUBYGEMS_VERSION=1.8.25
+  - TEST_NGINX=1 TEST_STANDALONE=1
+  - TEST_APACHE2=1
+  - TEST_SOURCE_PACKAGING=1 TEST_DEBIAN_PACKAGING=1
 
 script: ./dev/run_travis.sh

data/CHANGELOG

@@ -1,3 +1,29 @@
+Release 4.0.42
+--------------
+
+ * [Nginx] Upgraded the preferred Nginx version to 1.6.0.
+ * [Nginx] Fixed compatibility with Nginx 1.7.0.
+ * [Standalone] The MIME type for .woff files has been changed to application/font-woff.
+   Fixes issue #1071.
+ * There are now APT packages for Ubuntu 14.04. At the same time, packages for
+   Ubuntu 13.10 have been abandoned.
+ * Introduced a new command, `passenger-config build-native-support`, for ensuring
+   that the native_support library for the current Ruby interpreter is built. This
+   is useful in system provisioning scripts.
+ * For security reasons, friendly error pages (those black/purple pages that shows
+   the error message, backtrace and environment variable dump when an application
+   fails to start) are now disabled by default when the application environment is
+   set to 'staging' or 'production'. Fixes issue #1063.
+ * Fixed some compilation warnings on Ubuntu 14.04.
+ * Fixed some compatibility problems with Rake 10.2.0 and later.
+   See [Rake issue 274](https://github.com/jimweirich/rake/issues/274).
+ * Improved error handling in [Union Station](https://www.unionstationapp.com) support.
+ * Data is now sent to Union Station on a more frequent basis, in order to make new
+   data show up more quickly.
+ * Information about the code revision is now sent to Union Station, which will be
+   used in the upcoming deployment tracking feature in Union Station 2.
+
+
 Release 4.0.41
 --------------
 

data/build/agents.rb

@@ -108,7 +108,7 @@ file AGENT_OUTPUT_DIR + 'PassengerHelperAgent' => dependencies do
 end
 
 logging_agent_libs = COMMON_LIBRARY.only(:base, :logging_agent, 'AgentsBase.o',
-	'Utils/Base64.o', 'Utils/MD5.o')
+	'Utils/Base64.o', 'Utils/MD5.o', 'Utils/jsoncpp.o')
 dependencies = [
 	'ext/common/agents/LoggingAgent/Main.cpp',
 	'ext/common/agents/LoggingAgent/AdminController.h',

data/build/apache2.rb

@@ -98,6 +98,9 @@ task :apache2 => [
 	NATIVE_SUPPORT_TARGET
 ].compact
 
+# Workaround for https://github.com/jimweirich/rake/issues/274
+task :_apache2 => :apache2
+
 
 # Define rules for the individual Apache 2 module source files.
 APACHE2_MODULE_INPUT_FILES.each_pair do |target, sources|

data/build/debian.rb

@@ -76,7 +76,7 @@ task 'debian:orig_tarball' => Packaging::PREGENERATED_FILES do
 		if File.exist?(local_nginx_tarball)
 			puts "#{local_nginx_tarball} already exists"
 		else
-			sh "curl -L -o #{local_nginx_tarball} http://nginx.org/download/nginx-#{nginx_version}.tar.gz"
+			sh "curl -L --fail -o #{local_nginx_tarball} http://nginx.org/download/nginx-#{nginx_version}.tar.gz"
 		end
 		sh "rm -rf #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}"
 		sh "mkdir -p #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}"

data/build/integration_tests.rb

@@ -27,7 +27,7 @@ desc "Run all integration tests"
 task 'test:integration' => ['test:integration:apache2', 'test:integration:nginx'] do
 end
 
-dependencies = [:apache2, NATIVE_SUPPORT_TARGET].compact
+dependencies = [:_apache2, NATIVE_SUPPORT_TARGET].compact
 desc "Run Apache 2 integration tests"
 task 'test:integration:apache2' => dependencies do
 	if PlatformInfo.rspec.nil?
@@ -45,7 +45,7 @@ task 'test:integration:apache2' => dependencies do
 	end
 end
 
-dependencies = [:nginx, NATIVE_SUPPORT_TARGET].compact
+dependencies = [:_nginx, NATIVE_SUPPORT_TARGET].compact
 desc "Run Nginx integration tests"
 task 'test:integration:nginx' => dependencies do
 	if PlatformInfo.rspec.nil?
@@ -67,7 +67,7 @@ task 'test:integration:nginx' => dependencies do
 	end
 end
 
-dependencies = [:nginx, NATIVE_SUPPORT_TARGET].compact
+dependencies = [:_nginx, NATIVE_SUPPORT_TARGET].compact
 desc "Run Passenger Standalone integration tests"
 task 'test:integration:standalone' => dependencies do
 	if PlatformInfo.rspec.nil?
@@ -124,7 +124,7 @@ task 'test:integration:native_packaging' do
 	sh "cd test && exec #{command}"
 end
 
-dependencies = [:apache2, NATIVE_SUPPORT_TARGET].compact
+dependencies = [:_apache2, NATIVE_SUPPORT_TARGET].compact
 desc "Run the 'apache2' integration test infinitely, and abort if/when it fails"
 task 'test:restart' => dependencies do
 	require 'shellwords'

data/build/nginx.rb

@@ -35,6 +35,9 @@ task :nginx => [
 	NATIVE_SUPPORT_TARGET
 ].compact
 
+# Workaround for https://github.com/jimweirich/rake/issues/274
+task :_nginx => :nginx
+
 task :nginx_without_native_support => [
 	auto_generated_sources,
 	AGENT_OUTPUT_DIR + 'PassengerHelperAgent',

data/build/packaging.rb

@@ -323,7 +323,7 @@ task 'package:update_homebrew' do
 	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}'") ||
+	formula.gsub!(/^  sha1 .*/, "  sha1 '#{sha1}'") ||
 		abort("Unable to substitute Homebrew formula SHA-1")
 	necessary_dirs = ORIG_TARBALL_FILES.call.map{ |filename| filename.split("/").first }.uniq
 	necessary_dirs -= Packaging::HOMEBREW_EXCLUDE
@@ -351,14 +351,12 @@ task 'package:initiate_debian_building' do
 	version = VERSION_STRING
 	if is_open_source?
 		command = "cd /srv/passenger_apt_automation && " +
-			"chpst -l /tmp/passenger_apt_automation.lock " +
 			"/tools/silence-unless-failed " +
-			"./new_release https://github.com/phusion/passenger.git passenger.repo passenger.apt #{git_tag}"
+			"./new_release https://github.com/phusion/passenger.git passenger #{git_tag}"
 	else
 		command = "cd /srv/passenger_apt_automation && " +
-			"chpst -l /tmp/passenger_apt_automation.lock " +
 			"/tools/silence-unless-failed " +
-			"./new_release #{enterprise_git_url} passenger-enterprise.repo passenger-enterprise.apt #{git_tag}"
+			"./new_release #{enterprise_git_url} passenger-enterprise #{git_tag}"
 	end
 
 	sh "ssh psg_apt_automation@juvia-helper.phusion.nl at now <<<'#{command}'"

data/build/preprocessor.rb

@@ -186,7 +186,8 @@ private
 	}
 	DEBIAN_DISTRIBUTIONS = {
 		"squeeze"  => "20110206",
-		"wheezy"   => "20130504"
+		"wheezy"   => "20130504",
+		"jessie"   => "20140000"
 	}
 	REDHAT_ENTERPRISE_DISTRIBUTIONS = {
 		"el6"      => "el6.0"

data/build/ruby_extension.rb

@@ -35,21 +35,21 @@ else
 	output_dir  = RUBY_EXTENSION_OUTPUT_DIR
 	output_name = "passenger_native_support.#{LIBEXT}"
 	source_dir  = "ext/ruby"
-	NATIVE_SUPPORT_TARGET = "#{output_dir}/#{output_name}"
+	NATIVE_SUPPORT_TARGET = File.join(output_dir, output_name)
 
-	task :native_support => "#{output_dir}/#{output_name}"
+	task :native_support => NATIVE_SUPPORT_TARGET
 	task :clean => 'native_support:clean'
 
 	dependencies = [
-		"#{output_dir}/Makefile",
+		File.join(output_dir, "Makefile"),
 		"#{source_dir}/passenger_native_support.c"
 	]
-	file("#{output_dir}/#{output_name}" => dependencies) do
+	file(NATIVE_SUPPORT_TARGET => dependencies) do
 		sh "mkdir -p '#{output_dir}'" if !File.exist?(output_dir)
 		sh "cd '#{output_dir}' && make"
 	end
 
-	file "#{output_dir}/Makefile" => "#{source_dir}/extconf.rb" do
+	file(File.join(output_dir, "Makefile") => "#{source_dir}/extconf.rb") do
 		sh "mkdir -p '#{output_dir}'" if !File.exist?(output_dir)
 		extconf_rb = File.expand_path("#{source_dir}/extconf.rb")
 		sh "cd '#{output_dir}' && #{PlatformInfo.ruby_command} '#{extconf_rb}'"

data/build/test_basics.rb

@@ -77,6 +77,7 @@ task 'test:install_deps' do
                 end
 	end
 	if boolean_option('NODE_MODULES', default)
-		sh "npm install mocha should sinon express"
+		sh "npm install mocha should sinon"
+		sh "npm install express@3.4.8"
 	end
 end

data/debian.template/control.template

@@ -4,10 +4,15 @@ 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, rubygems1.8,
+#if is_distribution?("<= saucy") || is_distribution?("<= wheezy")
+     ruby1.8, ruby1.8-dev, rubygems1.8,
+#endif
  ruby1.9.1, ruby1.9.1-dev,
 #if is_distribution?('<= lucid')
      rubygems1.9,
+#endif
+#if is_distribution?(">= trusty") || is_distribution?(">= jessie")
+     ruby2.0, ruby2.0-dev,
 #endif
  apache2-mpm-worker | apache2-mpm, apache2-threaded-dev,
 #if is_distribution?('>= precise') || is_distribution?('>= wheezy')
@@ -23,8 +28,8 @@ XS-Ruby-Versions: all
 Package: passenger
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- ruby2.0 | ruby1.9.1 | ruby1.8 | ruby-interpreter,
- rubygems2.0 | rubygems1.9.1 | rubygems1.9 | rubygems (>= 1.2),
+ ruby2.2 | ruby2.1 | ruby2.0 | ruby1.9.1 | ruby1.8 | ruby-interpreter,
+ rubygems1.9.1 | rubygems1.9 | rubygems (>= 1.2),
 #if is_distribution?('<= lucid') || is_distribution?('<= squeeze')
      librack-ruby,
 #else
@@ -47,7 +52,7 @@ Description: Rails and Rack support for Apache2 and Nginx
 Package: passenger-dev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- ruby2.0 | ruby1.9.1 | ruby1.8 | ruby-interpreter,
+ ruby2.2 | ruby2.1 | ruby2.0 | ruby1.9.1 | ruby1.8 | ruby-interpreter,
  passenger (= ${binary:Version})
 Suggests: python
 Replaces: ruby-passenger-dev

data/debian.template/rules.template

@@ -23,10 +23,16 @@ override_dh_auto_configure:
 	# Do nothing
 
 override_dh_auto_build:
-	/usr/bin/ruby1.8 /usr/bin/rake fakeroot
-	mv pkg/fakeroot pkg/fakeroot1.8
+#if is_distribution?("<= saucy") || is_distribution?("<= wheezy")
+    	/usr/bin/ruby1.8 /usr/bin/rake fakeroot
+    	mv pkg/fakeroot pkg/fakeroot1.8
+#endif
 	/usr/bin/ruby1.9.1 /usr/bin/rake fakeroot
 	mv pkg/fakeroot pkg/fakeroot1.9.1
+#if is_distribution?(">= trusty") || is_distribution?(">= jessie")
+    	/usr/bin/ruby2.0 /usr/bin/rake fakeroot
+    	mv pkg/fakeroot pkg/fakeroot2.0
+#endif
 	cd nginx-<%= PhusionPassenger::PREFERRED_NGINX_VERSION %> && \
 		./configure --prefix=/tmp \
 		<%= PhusionPassenger::STANDALONE_NGINX_CONFIGURE_OPTIONS %> \
@@ -36,9 +42,14 @@ override_dh_auto_build:
 
 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/
+	# Merge Ruby 1.8, 1.9 and 2.0 files into a single directory.
+#if is_distribution?("<= saucy") || is_distribution?("<= wheezy")
+    	cp -a pkg/fakeroot1.8/* debian/tmp/
+#endif
 	cp -a pkg/fakeroot1.9.1/* debian/tmp/
+#if is_distribution?(">= trusty") || is_distribution?(">= jessie")
+    	cp -a pkg/fakeroot2.0/* debian/tmp/
+#endif
 	./dev/install_scripts_bootstrap_code.rb --ruby /usr/lib/ruby/vendor_ruby debian/tmp/usr/bin/* debian/tmp/usr/sbin/*
 	./dev/install_scripts_bootstrap_code.rb --nginx-module-config /usr/bin debian/tmp/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/ngx_http_passenger_module/config
 	touch debian/tmp/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/release.txt
@@ -47,6 +58,7 @@ override_dh_auto_clean:
 	/usr/bin/rake clean CLEAN_DOCS=false
 	rm -rf pkg/fakeroot1.8
 	rm -rf pkg/fakeroot1.9.1
+	rm -rf pkg/fakeroot2.0
 	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

@@ -22,6 +22,30 @@ function run()
 	"$@"
 }
 
+function retry_run()
+{
+	local reset='\x1B[0m'
+	local red='\x1B[31m'
+	local yellow='\x1B[33m'
+
+	local max_tries="$1"
+	local number=2
+	shift
+
+	echo "$ $@"
+	while true; do
+		if "$@"; then
+			return 0
+		elif [[ $number -le $max_tries ]]; then
+			echo -e "${yellow}The command \"$@\" failed. Retrying, $number of $max_tries:${reset}"
+			(( number++ ))
+		else
+			echo -e "${red}The command \"$@\" failed after $max_tries attempts. Giving up.${reset}"
+			return 1
+		fi
+	done
+}
+
 function apt_get_update() {
 	if [[ "$apt_get_updated" = "" ]]; then
 		apt_get_updated=1
@@ -43,7 +67,7 @@ function install_test_deps_with_doctools()
 {
 	if [[ "$install_test_deps_with_doctools" = "" ]]; then
 		install_test_deps_with_doctools=1
-		run rake test:install_deps BASE_DEPS=yes DOCTOOLS=yes
+		retry_run 3 rake test:install_deps BASE_DEPS=yes DOCTOOLS=yes
 	fi
 }
 
@@ -51,7 +75,7 @@ function install_base_test_deps()
 {
 	if [[ "$install_base_test_deps" = "" ]]; then
 		install_base_test_deps=1
-		rake test:install_deps BASE_DEPS=yes
+		retry_run 3 rake test:install_deps BASE_DEPS=yes
 	fi
 }
 
@@ -59,10 +83,10 @@ function install_node_and_modules()
 {
 	if [[ "$install_node_and_modules" = "" ]]; then
 		install_node_and_modules=1
-		curl -O http://nodejs.org/dist/v0.10.20/node-v0.10.20-linux-x64.tar.gz
-		tar xzvf node-v0.10.20-linux-x64.tar.gz
+		run curl --fail -O http://nodejs.org/dist/v0.10.20/node-v0.10.20-linux-x64.tar.gz
+		run tar xzf node-v0.10.20-linux-x64.tar.gz
 		export PATH=`pwd`/node-v0.10.20-linux-x64/bin:$PATH
-		run rake test:install_deps NODE_MODULES=yes
+		retry_run 3 rake test:install_deps NODE_MODULES=yes
 	fi
 }
 
@@ -89,18 +113,18 @@ if [[ "$TEST_RUBY_VERSION" != "" ]]; then
 fi
 
 if [[ "$TEST_RUBYGEMS_VERSION" != "" ]]; then
-	run rvm install rubygems $TEST_RUBYGEMS_VERSION
+	retry_run 3 rvm install rubygems $TEST_RUBYGEMS_VERSION
 	run gem --version
 fi
 
 if [[ "$TEST_CXX" = 1 ]]; then
-	run rake test:install_deps BASE_DEPS=yes
+	install_base_test_deps
 	run rake test:cxx
 	run rake test:oxt
 fi
 
 if [[ "$TEST_RUBY" = 1 ]]; then
-	run rake test:install_deps BASE_DEPS=yes RAILS_BUNDLES=yes
+	retry_run 3 rake test:install_deps BASE_DEPS=yes RAILS_BUNDLES=yes
 	run rake test:ruby
 fi
 

data/doc/Users guide Apache.txt

@@ -58,6 +58,8 @@ For example:
     <Directory /webapps/mycook/public>
         Allow from all
         Options -MultiViews
+        # Uncomment this if you're on Apache >= 2.4:
+        #Require all granted
     </Directory>
 </VirtualHost>
 -------------------------------------------
@@ -82,6 +84,9 @@ Suppose that you already have a virtual host:
     DocumentRoot /websites/phusion
     <Directory /websites/phusion>
         Allow from all
+        Options -MultiViews
+        # Uncomment this if you're on Apache >= 2.4:
+        #Require all granted
     </Directory>
 </VirtualHost>
 -------------------------------------------
@@ -96,7 +101,7 @@ To do this, you need to perform the following:
  3. Inside the Location block, set `PassengerBaseURI /{SUBURI}`.
  4. Inside the Location block, set `PassengerAppRoot {PATH TO YOUR APPLICATION ROOT}`.
  5. Create a `<Directory {PATH TO YOUR APPLICATION'S PUBLIC DIRECTORY}>` block.
- 6. Inside the Directory block, set `Allow from all`.
+ 6. Inside the Directory block, set `Allow from all`, and (if you're on Apache >= 2.4) `Require all granted`.
  7. Inside the Directory block, disable MultiViews.
 
 Here is an example:
@@ -107,6 +112,9 @@ Here is an example:
     DocumentRoot /websites/phusion
     <Directory /websites/phusion>
         Allow from all
+        Options -MultiViews
+        # Uncomment this if you're on Apache >= 2.4:
+        #Require all granted
     </Directory>
     
     # These have been added:
@@ -118,6 +126,8 @@ Here is an example:
     <Directory /websites/rails/public>
         Allow from all
         Options -MultiViews
+        # Uncomment this if you're on Apache >= 2.4:
+        #Require all granted
     </Directory>
 </VirtualHost>
 -------------------------------------------
@@ -233,6 +243,8 @@ the Apache configuration file:
     <Directory /webapps/rack_example/public>
         Allow from all
         Options -MultiViews
+        # Uncomment this if you're on Apache >= 2.4:
+        #Require all granted
     </Directory>
 </VirtualHost>
 -------------------------------------------
@@ -258,6 +270,8 @@ For example:
     <Directory /webapps/rackapp/public>
         Allow from all
         Options -MultiViews
+        # Uncomment this if you're on Apache >= 2.4:
+        #Require all granted
     </Directory>
 </VirtualHost>
 -------------------------------------------
@@ -282,6 +296,9 @@ Suppose that you already have a virtual host:
     DocumentRoot /websites/phusion
     <Directory /websites/phusion>
         Allow from all
+        Options -MultiViews
+        # Uncomment this if you're on Apache >= 2.4:
+        #Require all granted
     </Directory>
 </VirtualHost>
 -------------------------------------------
@@ -296,7 +313,7 @@ To do this, you need to perform the following:
  3. Inside the Location block, set `PassengerBaseURI /{SUBURI}`.
  4. Inside the Location block, set `PassengerAppRoot {PATH TO YOUR APPLICATION ROOT}`.
  5. Create a `<Directory {PATH TO YOUR APPLICATION'S PUBLIC DIRECTORY}>` block.
- 6. Inside the Directory block, set `Allow from all`.
+ 6. Inside the Directory block, set `Allow from all`, and (if you're on Apache >= 2.4) `Require all granted`.
  7. Inside the Directory block, disable MultiViews.
 
 Here is an example:
@@ -307,6 +324,9 @@ Here is an example:
     DocumentRoot /websites/phusion
     <Directory /websites/phusion>
         Allow from all
+        Options -MultiViews
+        # Uncomment this if you're on Apache >= 2.4:
+        #Require all granted
     </Directory>
     
     # These have been added:
@@ -318,6 +338,8 @@ Here is an example:
     <Directory /websites/rack/public>
         Allow from all
         Options -MultiViews
+        # Uncomment this if you're on Apache >= 2.4:
+        #Require all granted
     </Directory>
 </VirtualHost>
 -------------------------------------------
@@ -397,6 +419,8 @@ the Apache configuration file:
     <Directory /webapps/wsgi_example/public>
         Allow from all
         Options -MultiViews
+        # Uncomment this if you're on Apache >= 2.4:
+        #Require all granted
     </Directory>
 </VirtualHost>
 -------------------------------------------
@@ -422,6 +446,8 @@ For example:
     <Directory /webapps/wsgiapp/public>
         Allow from all
         Options -MultiViews
+        # Uncomment this if you're on Apache >= 2.4:
+        #Require all granted
     </Directory>
 </VirtualHost>
 -------------------------------------------
@@ -446,6 +472,9 @@ Suppose that you already have a virtual host:
     DocumentRoot /websites/phusion
     <Directory /websites/phusion>
         Allow from all
+        Options -MultiViews
+        # Uncomment this if you're on Apache >= 2.4:
+        #Require all granted
     </Directory>
 </VirtualHost>
 -------------------------------------------
@@ -460,7 +489,7 @@ To do this, you need to perform the following:
  3. Inside the Location block, set `PassengerBaseURI /{SUBURI}`.
  4. Inside the Location block, set `PassengerAppRoot {PATH TO YOUR APPLICATION ROOT}`.
  5. Create a `<Directory {PATH TO YOUR APPLICATION'S PUBLIC DIRECTORY}>` block.
- 6. Inside the Directory block, set `Allow from all`.
+ 6. Inside the Directory block, set `Allow from all`, and (if you're on Apache >= 2.4) `Require all granted`.
  7. Inside the Directory block, disable MultiViews.
 
 Here is an example:
@@ -471,6 +500,9 @@ Here is an example:
     DocumentRoot /websites/phusion
     <Directory /websites/phusion>
         Allow from all
+        Options -MultiViews
+        # Uncomment this if you're on Apache >= 2.4:
+        #Require all granted
     </Directory>
     
     # These have been added:
@@ -482,6 +514,8 @@ Here is an example:
     <Directory /websites/python/public>
         Allow from all
         Options -MultiViews
+        # Uncomment this if you're on Apache >= 2.4:
+        #Require all granted
     </Directory>
 </VirtualHost>
 -------------------------------------------
@@ -631,6 +665,8 @@ PassengerNodejs /usr/bin/node;
     <Directory /websites/blog/public>
         Allow from all
         Options -MultiViews
+        # Uncomment this if you're on Apache >= 2.4:
+        #Require all granted
     </Directory>
 </VirtualHost>
 
@@ -979,11 +1015,13 @@ The default value is the primary group of the user specifified by
 ==== PassengerFriendlyErrorPages <on|off> ====
 Phusion Passenger can display friendly error pages whenever an application fails
 to start. This friendly error page presents the startup error message, some
-suggestions for solving the problem, and a backtrace. This feature is very useful
-during application development and useful for less experienced system administrators,
-but the page might reveal potentially sensitive information, depending on the
-application. Experienced system administrators who are using Phusion Passenger
-on serious production servers should consider turning this feature off.
+suggestions for solving the problem, a backtrace and a dump of the environment variables.
+This feature is very useful during application development and useful for less experienced
+system administrators, but the page might reveal potentially sensitive information,
+depending on the application. For this reason, friendly error pages are turned off by default when
+<<PassengerAppEnv,PassengerAppEnv (and its aliases such as RailsEnv and RackEnv)>>
+is set to 'staging' or 'production', but enabled by default otherwise. You can use
+this option to explicitly enable or disable this feature.
 
 This option may occur in the following places:
 
@@ -992,7 +1030,7 @@ This option may occur in the following places:
  * 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'.
+In each place, it may be specified at most once. The default value depends on <<PassengerAppEnv,PassengerAppEnv (and its aliases such as RailsEnv and RackEnv)>>, as documented above.
 
 
 === Resource control and optimization options ===
@@ -1477,6 +1515,8 @@ Suppose that you have a web application deployed in a sub-URI '/store', like thi
     <Directory /websites/store/public>
         Allow from all
         Options -MultiViews
+        # Uncomment this if you're on Apache >= 2.4:
+        #Require all granted
     </Directory>
 </VirtualHost>
 ---------------------------
@@ -1497,6 +1537,8 @@ like this:
     <Directory /websites/store/public>
         Allow from all
         Options -MultiViews
+        # Uncomment this if you're on Apache >= 2.4:
+        #Require all granted
     </Directory>
 </VirtualHost>
 
@@ -1515,7 +1557,7 @@ PassengerPreStart http://myblog.com/    # <----- WRONG! Missing "/store" part.
 Application processes started with PassengerPreStart are
 also subject to the idle timeout rules as specified by
 <<PassengerPoolIdleTime,PassengerPoolIdleTime>>! That means that by default,
-the pre-started application processes for foo.com are bar.com are shut down
+the pre-started application processes for foo.com and bar.com are shut down
 after a few minutes of inactivity. If you don't want that to happen, then
 you should combine PassengerPreStart with
 <<PassengerMinInstances,PassengerMinInstances>>, like this:
@@ -2099,6 +2141,9 @@ assets correctly:
    AllowOverride None
    Order allow,deny
    Allow from all
+   Options -MultiViews
+   # Uncomment this if you're on Apache >= 2.4:
+   #Require all granted
 </Directory>
 -----------------------------------------
 +