passenger 4.0.48 → 4.0.49

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2Q0N2U0NTcyNWY5ZWYwMDA3NzRmMGZjNzUwNGUzNTNhZGNiYzFmOA==
+    NzZiZGQzODhkNDZjNTUwZjM2M2VlMzI2OTQ3ZGI1NDA5ZmY3NjM1Ng==
   data.tar.gz: !binary |-
-    N2NlN2NmMTRjYWU4NDAyN2Q2YWUxODJiNzJmOTA5M2Y5NWQ4YjUxMg==
+    NmMxNDdmNzY2MWNjYzllMDBmYzMyODUxZTIzZDA3MzY0ZjU3OTE1MQ==
 SHA512:
   metadata.gz: !binary |-
-    OTE2NzU1ODdmMDUyZWY0ZWUxNmMzYTZhMGY1ZTM2YTk1YzY3NjQyMGQzNzJh
-    ZTY0OWU4MzBlZGY1Y2RhZGM3NzViMTM3MzQzOWQxYjYzNDQ0ZTMyNWExYWYy
-    MzZhMGEwNzVlNjRjZjI2YzQ1ZTMyNGUyOTk4Mjc5MWNmMzI1YzQ=
+    NTBiZTUxOGE1MTRlMDUxZDljZDBhN2JjYTg3ZGFhODU3ZjM1ODZkMTUwMTcy
+    ZDQwYzFiOTIyM2JiYzcwNjI2NGYwZThhM2NhYjQzNWY3YjEyYTg0MjljMjVm
+    OWFlZGMzNmM2YjM5ODI2ODRiNzgzMmJmNGQ4ODY1ZmJmMmU3MGM=
   data.tar.gz: !binary |-
-    ZjYyY2JmMWQ5NmViMTk3ZGVlNGY1NTMxMmZjMmU4OGQxMzk5ODc4NmYyMGE1
-    YTM5NDUxMjg2MmZkZWE4NjJjYzFiYmUxYWQzZWVlODNjNGQ2NDViOTM2OTMz
-    YWMzZjYxMzkzZTRkOGNlYTExYzgzNjQ1ZGZlZWUxZTkwYTU2NTE=
+    NzRkYjE0OTg2M2VhYjIxMWQyMmFlODJlMjRlOGU5ODgyOWM5YjliM2NkODJj
+    N2FjNWYwNjUyOGFlOGI2MTVmZGZkYjU1NTYxNzU5MjE2YzRjOGFkN2ZkM2M5
+    YTI4OTZhYTUwODgyY2UwODliMDY1YmZhZDU2ODQ3NDJiODU2MDk=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJT0PH3AAoJECrHRaUKISqMFzYIAIzqK4Mt2VJ3+b5i9T+VXYdB
-3Rwh00XDqiOtDUoyDQCLFcB5WlyvcVSphhmk6QqPe5SQN17Ryuw8t0caWls/c+ZI
-FjoTE9MNCG4MvRdwchquMiwmqqtq3RcWVLCBx/RHVOXwxGDEibTDqcVsW3nAgtvI
-wP82mpi9pxmknv2Qer9d8SdNOhXTBKxhU8PJgEQAVeGskiB9Qs3IehGxulP/ZjJc
-DUPhOVQpixapzU+ZmrQDY1UXn6yMV+z/sX/4icHgftm3O3t1cKg4cz0H3HPAkKK7
-EOxsoyySfTXfcAI15NvLh26HdmVBD17wCBSgtUrS1BhexzfJHucdiKa7WUrikZg=
-=KkS3
+iQEcBAABAgAGBQJT91guAAoJECrHRaUKISqMi8AIAKcJEymk64GyK27CR7KRYByH
+OTsizdQ5gTq2pETdjwDjAGn7T1lp1tWObakMbbOw4Fm0MU1kEMFFZg0GK0XTe2N+
+iF7T4tGP83pgUKNP3uuM4QPgfouVrRUGFNGJOsBiqIFKFTLdiBZkLDYQpOTU3+Q1
+ZIKKHbzzXoxKYdlpz+AP6OCurqrIIYGlaPmnEqafg1zP99K76HTGmQmL/j3e940q
+Sp8wPgBXpRDfv9f5oe9yRl46sCI61B+IFgubNG9ECrnTf/I1Qpe4jx7Xv65Ne6sJ
+EtHbZ5IwJyNnlIqzs7gX5lIIDlRUuA6pThkzD2zlf6em5mdDe4Yge8nn47/lMfI=
+=vGWc
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJT0PH2AAoJECrHRaUKISqMUYwH/0C1g6jcd/g4ux//vTqjoRFX
-ShBZS3BXAeI0o2c4dq06mE8LM5FiIQmWa6mzRLooFgfUBzunC5TACyEQ65LaCi3r
-2QP07avW0JdSoCMypCld5EbTXacqfYRYtyVjnQRb9vbssFbHPVSnilL4m7N6Yit7
-2i/oDzaAaf8ka1fdfERXASwhyLuffn3IuVQz5L/zCd8HkcPyJpqmcd/oQ7jrdJng
-EfoRsivoernTPBrhJqJB566DtkVPLEzd2TrBoO1UspENBpZzfAZChYdgJQscOavT
-RPfX6B61kvahbpYfGU6A/bI8i7rOjKdGWIavaZex6ij32c+QQ+U2s3TdQBmtyIc=
-=A4Gz
+iQEcBAABAgAGBQJT91guAAoJECrHRaUKISqMhbwIAKnAe12hzjsoxbOFMTXuX7GE
+EGEgQeVsTOkrWTJT7cPg+dcyyUCcNf9GggVARjCRpFOaUcTvwxi+kk53GcicOUex
+FKheeJe2cX7iwrS/yScE4sECFVYfz/tE0J78yhDlRGWPUYHg/0aRkPMIEIyxEoNl
+4RuLoy12RMRRFoVa57sfZXzvui7HpGOKFkqvpo7mcKATkw8I+9bl5rAY4cSp0CBf
+RNfO3BvSRNUcV0dueiomegep+c4ANiks/w4kJ/I9rpjs5hi5Y/1jevnBZqpTjD3O
+Zhp2plPWifd2gAlasT7gzUdjg2MTnz10ejXpcgree80BcR7jAaCjwp0pQQjwxNI=
+=sAyH
 -----END PGP SIGNATURE-----

data/.editorconfig

@@ -6,14 +6,48 @@ root = true
 end_of_line = lf
 charset = utf-8
 
-[{*.cpp,*.c,*.h,*.hpp,*.rb,*.js}]
+[doc/*.txt]
+indent_style=tab
+indent_size=4
+
+[doc/*/*.txt]
+indent_style=tab
+indent_size=4
+
+[*.cpp]
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.c]
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.h]
 indent_style = tab
 indent_size = 4
 trim_trailing_whitespace = true
+insert_final_newline = true
 
-[{*.cpp,*.c,*.h,*.hpp}]
+[*.hpp]
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true
 insert_final_newline = true
 
+[*.rb]
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.js]
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true
+
 [ext/nginx/{*.c,*.h}]
 indent_style = space
 indent_size = 4

data/.travis.yml

@@ -9,7 +9,7 @@ env:
   - TEST_APACHE2=1
   - TEST_SOURCE_PACKAGING=1 TEST_DEBIAN_PACKAGING=1
 
-script: ./dev/run_travis.sh
+script: ./dev/ci/run_travis.sh
 
 notifications:
   slack: phusionnl:PH5p7JYXyv2XLDpICHh8Nj6F

data/CHANGELOG

@@ -1,3 +1,19 @@
+Release 4.0.49
+--------------
+
+ * Upgraded the preferred Nginx version to 1.6.1.
+ * Fixed a crash that may be triggered by the `passenger_max_requests` feature.
+ * Introduced the `spawn_failed` hook, which is called when an application
+   process fails to spawn. You could use this hook to setup an error
+   notification system. Closes GH-1252.
+ * Fonts, RSS and XML are now gzip-compressed by default in Phusion Passenger
+   Standalone. Thanks to Jacob Elder. Closes GH-1254.
+ * Fixed some user and group information lookup issues. Closes GH-1253.
+ * Fixed some request handling crashes. Closes GH-1250.
+ * Fixed some compilation problems on Gentoo. Closes GH-1261.
+ * Fixed some compilation problems on Solaris. Closes GH-1260.
+
+
 Release 4.0.48
 --------------
 

data/Rakefile

@@ -38,7 +38,6 @@ else
 	require 'build/integration_tests'
 	require 'build/misc'
 	require 'build/debian'
-	require 'build/rpm'
 end
 
 #### Default tasks

data/build/apache2.rb

@@ -63,7 +63,7 @@ APACHE2_MODULE_CFLAGS =
 	"#{EXTRA_CFLAGS}"
 APACHE2_MODULE_CXXFLAGS =
 	"#{EXTRA_PRE_CXXFLAGS} " <<
-	"-Iext -Iext/common #{PlatformInfo.apache2_module_cflags} " <<
+	"-Iext -Iext/common #{PlatformInfo.apache2_module_cxxflags} " <<
 	"#{EXTRA_CXXFLAGS}"
 
 APACHE2_MODULE_BOOST_OXT_LIBRARY = define_libboost_oxt_task("apache2",
@@ -126,16 +126,16 @@ file APACHE2_MODULE => dependencies do
 	PlatformInfo.apxs2.nil?      and raise "Could not find 'apxs' or 'apxs2'."
 	PlatformInfo.apache2ctl.nil? and raise "Could not find 'apachectl' or 'apache2ctl'."
 	PlatformInfo.httpd.nil?      and raise "Could not find the Apache web server binary."
-	
+
 	sources = (APACHE2_MODULE_OBJECTS + [APACHE2_MOD_PASSENGER_O]).join(' ')
 	linkflags =
 		"#{EXTRA_PRE_CXX_LDFLAGS} " <<
 		"#{APACHE2_MODULE_COMMON_LIBRARIES.join(' ')} " <<
 		"#{APACHE2_MODULE_BOOST_OXT_LIBRARY} " <<
-		"#{PlatformInfo.apache2_module_ldflags} " <<
+		"#{PlatformInfo.apache2_module_cxx_ldflags} " <<
 		"#{PlatformInfo.portability_cxx_ldflags} " <<
 		"#{EXTRA_CXX_LDFLAGS} "
-	
+
 	create_shared_library(APACHE2_MODULE, sources, linkflags)
 end
 

data/build/common_library.rb

@@ -35,18 +35,18 @@ PhusionPassenger.require_passenger_lib 'common_library'
 def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
 	output_file = "#{output_dir}.a"
 	flags = "-Iext #{extra_compiler_flags} #{EXTRA_CXXFLAGS}"
-	
+
 	if false && boolean_option('RELEASE')
 		# Disable RELEASE support. Passenger Standalone wants to link to the
 		# common library but does not know whether it was compiled with RELEASE
 		# or not. See http://code.google.com/p/phusion-passenger/issues/detail?id=808
 		sources = Dir['ext/boost/libs/**/*.cpp'] + Dir['ext/oxt/*.cpp']
 		sources.sort!
-		
+
 		aggregate_source = "#{output_dir}/aggregate.cpp"
 		aggregate_object = "#{output_dir}/aggregate.o"
 		object_files     = [aggregate_object]
-		
+
 		file(aggregate_object => sources) do
 			sh "mkdir -p #{output_dir}" if !File.directory?(output_dir)
 			aggregate_content = %Q{
@@ -71,13 +71,13 @@ def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
 			boost_output_dir  = "#{output_dir}/boost"
 			object_file = "#{boost_output_dir}/#{object_name}"
 			boost_object_files << object_file
-		
+
 			file object_file => source_file do
 				sh "mkdir -p #{boost_output_dir}" if !File.directory?(boost_output_dir)
 				compile_cxx(source_file, "#{flags} -o #{object_file}")
 			end
 		end
-		
+
 		# Define compilation targets for .cpp files in ext/oxt.
 		oxt_object_files = []
 		oxt_dependency_files = Dir["ext/oxt/*.hpp"] + Dir["ext/oxt/detail/*.hpp"]
@@ -89,22 +89,22 @@ def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
 
 			file object_file => [source_file, *oxt_dependency_files] do
 				sh "mkdir -p #{oxt_output_dir}" if !File.directory?(oxt_output_dir)
-				compile_cxx(source_file, "#{flags} -o #{object_file}")
+				compile_cxx(source_file, "-O2 #{flags} -o #{object_file}".strip)
 			end
 		end
-		
+
 		object_files = boost_object_files + oxt_object_files
 	end
-	
+
 	file(output_file => object_files) do
 		sh "mkdir -p #{output_dir}"
 		create_static_library(output_file, object_files.join(' '))
 	end
-	
+
 	task "#{namespace}:clean" do
 		sh "rm -rf #{output_file} #{output_dir}"
 	end
-	
+
 	return output_file
 end
 
@@ -116,9 +116,9 @@ if USE_VENDORED_LIBEV
 	LIBEV_CFLAGS = "-Iext/libev"
 	LIBEV_LIBS = LIBEV_OUTPUT_DIR + ".libs/libev.a"
 	LIBEV_TARGET = LIBEV_LIBS
-	
+
 	task :libev => LIBEV_TARGET
-	
+
 	dependencies = [
 		"ext/libev/configure",
 		"ext/libev/config.h.in",
@@ -136,7 +136,7 @@ if USE_VENDORED_LIBEV
 			# do, so we force our compiler choice.
 			"CC='#{cc}' CXX='#{cxx}' CFLAGS='#{cflags}' orig_CFLAGS=1"
 	end
-	
+
 	libev_sources = Dir["ext/libev/{*.c,*.h}"]
 	file LIBEV_OUTPUT_DIR + ".libs/libev.a" => [LIBEV_OUTPUT_DIR + "Makefile"] + libev_sources do
 		sh "rm -f #{LIBEV_OUTPUT_DIR}/libev.la"
@@ -148,7 +148,7 @@ if USE_VENDORED_LIBEV
 			sh "cd #{LIBEV_OUTPUT_DIR} && make maintainer-clean"
 		end
 	end
-	
+
 	task :clean => 'libev:clean'
 else
 	LIBEV_CFLAGS = string_option('LIBEV_CFLAGS', '-I/usr/include/libev')
@@ -168,9 +168,9 @@ if USE_VENDORED_LIBEIO
 	LIBEIO_CFLAGS = "-Iext/libeio"
 	LIBEIO_LIBS = LIBEIO_OUTPUT_DIR + ".libs/libeio.a"
 	LIBEIO_TARGET = LIBEIO_LIBS
-	
+
 	task :libeio => LIBEIO_TARGET
-	
+
 	dependencies = [
 		"ext/libeio/configure",
 		"ext/libeio/config.h.in",
@@ -189,13 +189,13 @@ if USE_VENDORED_LIBEIO
 			# do, so we force our compiler choice.
 			"CC='#{cc}' CXX='#{cxx}' CFLAGS='#{cflags}'"
 	end
-	
+
 	libeio_sources = Dir["ext/libeio/{*.c,*.h}"]
 	file LIBEIO_OUTPUT_DIR + ".libs/libeio.a" => [LIBEIO_OUTPUT_DIR + "Makefile"] + libeio_sources do
 		sh "rm -f #{LIBEIO_OUTPUT_DIR}/libeio.la"
 		sh "cd #{LIBEIO_OUTPUT_DIR} && make libeio.la"
 	end
-	
+
 	task :clean do
 		if File.exist?(LIBEIO_OUTPUT_DIR + "Makefile")
 			sh "cd #{LIBEIO_OUTPUT_DIR} && make maintainer-clean"

data/build/cplusplus_support.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -87,7 +87,7 @@ def create_shared_library(target, sources, flags = "#{EXTRA_PRE_CXXFLAGS} #{EXTR
 	else
 		shlib_flag = "-shared"
 	end
-	if PhusionPassenger::PlatformInfo.cc_is_sun_studio?
+	if PhusionPassenger::PlatformInfo.cxx_is_sun_studio?
 		fPIC = "-KPIC"
 	else
 		fPIC = "-fPIC"

data/build/documentation.rb

@@ -47,7 +47,7 @@ Packaging::ASCII_DOCS.each do |target|
 		end
 		sh(command)
 	end
-	
+
 	task :clean do
 		if boolean_option('CLEAN_DOCS', true)
 			sh "rm -f '#{target}'"

data/build/integration_tests.rb

@@ -23,11 +23,19 @@
 
 ### Integration tests ###
 
+def integration_test_dependencies(runtime_target_name)
+	if string_option('PASSENGER_LOCATION_CONFIGURATION_FILE')
+		return []
+	else
+		return [runtime_target_name, NATIVE_SUPPORT_TARGET].compact
+	end
+end
+
 desc "Run all integration tests"
 task 'test:integration' => ['test:integration:apache2', 'test:integration:nginx'] do
 end
 
-dependencies = [:_apache2, NATIVE_SUPPORT_TARGET].compact
+dependencies = integration_test_dependencies(:_apache2)
 desc "Run Apache 2 integration tests"
 task 'test:integration:apache2' => dependencies do
 	if PlatformInfo.rspec.nil?
@@ -45,7 +53,7 @@ task 'test:integration:apache2' => dependencies do
 	end
 end
 
-dependencies = [:_nginx, NATIVE_SUPPORT_TARGET].compact
+dependencies = integration_test_dependencies(:_nginx)
 desc "Run Nginx integration tests"
 task 'test:integration:nginx' => dependencies do
 	if PlatformInfo.rspec.nil?
@@ -67,7 +75,7 @@ task 'test:integration:nginx' => dependencies do
 	end
 end
 
-dependencies = [:_nginx, NATIVE_SUPPORT_TARGET].compact
+dependencies = integration_test_dependencies(:_nginx)
 desc "Run Passenger Standalone integration tests"
 task 'test:integration:standalone' => dependencies do
 	if PlatformInfo.rspec.nil?
@@ -124,7 +132,7 @@ task 'test:integration:native_packaging' do
 	sh "cd test && exec #{command}"
 end
 
-dependencies = [:_apache2, NATIVE_SUPPORT_TARGET].compact
+dependencies = integration_test_dependencies(:_apache2)
 desc "Run the 'apache2' integration test infinitely, and abort if/when it fails"
 task 'test:restart' => dependencies do
 	require 'shellwords'

data/build/misc.rb

@@ -60,18 +60,18 @@ def extract_latest_news_contents_and_items
 	#    * More text.
 	#    * A header.
 	#      With yet more text.
-	#   
+	#
 	#   Release y.y.y
 	#   -------------
 	#   .....
 	contents = File.read("CHANGELOG")
-	
+
 	# We're only interested in the latest release, so extract the text for that.
 	contents =~ /\A(Release.*?)^(Release|Older releases)/m
 	contents = $1
 	contents.sub!(/\A.*?\n-+\n+/m, '')
 	contents.sub!(/\n+\Z/, '')
-	
+
 	# Now split the text into individual items.
 	items = contents.split(/^ \* /)
 	items.shift while items.first == ""
@@ -83,7 +83,7 @@ desc "Convert the Changelog items for the latest release to HTML"
 task :changelog_as_html do
 	require 'cgi'
 	contents, items = extract_latest_news_contents_and_items
-	
+
 	puts "<ul>"
 	items.each do |item|
 		def format_paragraph(text)
@@ -92,13 +92,13 @@ task :changelog_as_html do
 			while text.index('  ')
 				text.gsub!('  ', ' ')
 			end
-			
+
 			# Auto-link to issue tracker.
 			text.gsub!(/(bug #|issue #|GH-)(\d+)/i) do
 				url = "https://github.com/phusion/passenger/issues/#{$2}"
 				%Q(<{a href="#{url}"}>#{$1}#{$2}<{/a}>)
 			end
-			
+
 			text.strip!
 			text = CGI.escapeHTML(text)
 			text.gsub!(%r(&lt;\{(.*?)\}&gt;(.*?)&lt;\{/(.*?)\}&gt;)) do
@@ -183,9 +183,14 @@ task :compile_app => dependencies do
 		end
 		source = '_source.cpp'
 	end
+	object = source.sub(/\.cpp$/, '.o')
 	exe = source.sub(/\.cpp$/, '')
 	begin
-		create_executable(exe, source,
+		compile_cxx(source,
+			"-DSTANDALONE -o #{object} " <<
+			"-Iext -Iext/common #{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} " <<
+			"#{EXTRA_CXXFLAGS}")
+		create_executable(exe, object,
 			"-DSTANDALONE " <<
 			"-Iext -Iext/common #{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} " <<
 			"#{EXTRA_CXXFLAGS} " <<

data/build/packaging.rb

@@ -121,7 +121,7 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 	basename   = "#{PhusionPassenger::PACKAGE_NAME}-#{PhusionPassenger::VERSION_STRING}"
 	version    = PhusionPassenger::VERSION_STRING
 	is_beta        = !!version.split('.')[3]
-	
+
 	if !`git status --porcelain | grep -Ev '^\\?\\? '`.empty?
 		STDERR.puts "-------------------"
 		abort "*** ERROR: There are uncommitted files. See 'git status'"
@@ -155,7 +155,7 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 	puts "Proceed with pushing tag to remote Git repo and uploading the gem and signatures? [y/n]"
 	if STDIN.readline == "y\n"
 		sh "git push origin #{git_tag}"
-		
+
 		if is_open_source?
 			sh "s3cmd -P put #{PKG_DIR}/passenger-#{version}.{gem,tar.gz,gem.asc,tar.gz.asc} s3://phusion-passenger/releases/"
 			sh "gem push #{PKG_DIR}/passenger-#{version}.gem"
@@ -293,7 +293,7 @@ task 'package:sign' do
 		password = h.ask("Password for software-signing@phusion.nl GPG key: ") { |q| q.echo = false }
 		passphrase_opt = "--passphrase-file .gpg-password"
 	end
-	
+
 	begin
 		if password
 			File.open(".gpg-password", "w", 0600) do |f|
@@ -428,7 +428,7 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 	psg_apache2_module_path       = ENV['APACHE2_MODULE_PATH'] || "#{fs_libdir}/apache2/modules/mod_passenger.so"
 	psg_ruby_extension_source_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
 	psg_nginx_module_source_dir   = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module"
-	
+
 	fakeroot = "pkg/fakeroot"
 	fake_rubylibdir = "#{fakeroot}#{psg_rubylibdir}"
 	fake_nodelibdir = "#{fakeroot}#{psg_nodelibdir}"
@@ -446,10 +446,10 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 	fake_nginx_module_source_dir   = "#{fakeroot}#{psg_nginx_module_source_dir}"
 
 	native_packaging_method = ENV['NATIVE_PACKAGING_METHOD'] || "deb"
-	
+
 	sh "rm -rf #{fakeroot}"
 	sh "mkdir -p #{fakeroot}"
-	
+
 	# Ruby sources
 	sh "mkdir -p #{fake_rubylibdir}"
 	sh "cp #{PhusionPassenger.ruby_libdir}/phusion_passenger.rb #{fake_rubylibdir}/"
@@ -463,24 +463,24 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 	sh "mkdir -p #{fake_libdir}"
 	sh "cp -R #{PhusionPassenger.lib_dir}/common #{fake_libdir}/"
 	sh "rm -rf #{fake_libdir}/common/libboost_oxt"
-	
+
 	# Ruby extension binaries
 	sh "mkdir -p #{fake_native_support_dir}"
 	native_support_archdir = PlatformInfo.ruby_extension_binary_compatibility_id
 	sh "mkdir -p #{fake_native_support_dir}"
 	sh "cp -R buildout/ruby/#{native_support_archdir}/*.#{LIBEXT} #{fake_native_support_dir}/"
-	
+
 	# Agents
 	sh "mkdir -p #{fake_agents_dir}"
 	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"
-	
+
 	# Helper scripts
 	sh "mkdir -p #{fake_helper_scripts_dir}"
 	sh "cp -R #{PhusionPassenger.helper_scripts_dir}/* #{fake_helper_scripts_dir}/"
-	
+
 	# Resources
 	sh "mkdir -p #{fake_resources_dir}"
 	sh "cp -R resources/* #{fake_resources_dir}/"
@@ -508,12 +508,12 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 	# Nginx module sources
 	sh "mkdir -p #{fake_nginx_module_source_dir}"
 	sh "cp ext/nginx/* #{fake_nginx_module_source_dir}/"
-	
+
 	# Documentation
 	sh "mkdir -p #{fake_docdir}"
 	sh "cp doc/*.html #{fake_docdir}/"
 	sh "cp -R doc/images #{fake_docdir}/"
-	
+
 	# User binaries
 	sh "mkdir -p #{fake_bindir}"
 	Packaging::USER_EXECUTABLES.each do |exe|
@@ -522,7 +522,7 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 			change_shebang("#{fake_bindir}/#{exe}", "#{fs_bindir}/ruby")
 		end
 	end
-	
+
 	# Superuser binaries
 	sh "mkdir -p #{fake_sbindir}"
 	Packaging::SUPER_USER_EXECUTABLES.each do |exe|
@@ -531,7 +531,7 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 			change_shebang("#{fake_sbindir}/#{exe}", "#{fs_bindir}/ruby")
 		end
 	end
-	
+
 	# Apache 2 module
 	sh "mkdir -p #{File.dirname(fake_apache2_module_path)}"
 	sh "cp #{APACHE2_MODULE} #{fake_apache2_module_path}"