passenger 4.0.20 → 4.0.21

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWI3NGM4NmQ1MmJmNjRiYWNmZDFkNDFjZWZkZjg4YWEyMzllOTk1OA==
+    M2ZhMjE5NTJiOGE0ZDIyZWM1NTBjMGNhZGViNDBlNGY0ZjM5NjlhOQ==
   data.tar.gz: !binary |-
-    NDhlZmE4OTZiYjE1ZGM4ZjY5MGQ4NmJmNDNlY2Q2MjZkMTA3NTRjYw==
+    YjZlMWNhZmYyYjU2OWYxMDJhNTFkYTA1ZGExNzIzOTQwMDViNjgxYQ==
 SHA512:
   metadata.gz: !binary |-
-    OGI1ZjJjZTU2YjRhYjk3ODZmNWM1NWEzNzQ2YWMyOGU2MjFmMjEwODhjNjNj
-    ZGU4MTI1ZWI0YTA0Yjk2MTdmYWFkODA2Yzc0NzQxODc2NjJhZjQ5OTEyMTIx
-    NjY0Njg3MDI2N2E2MmI1NjgwZDdiMjQxYTU4M2ViZTJjZTFkZDk=
+    ZjBkYmY3YTM4YTM5ODJkMTk3OTk3NDQzNWUzNzhhZWQ1YmIyZTUxYWQ2YTNj
+    ZjM1NWJlNmY1ZTE3MGVmZjdmMjUzZjc3MGJmZDM2MTUwNTJhMDY3NDE1M2Y1
+    ZmFiM2JmOTUxZjJmODQwNTA4OGQ0YjZjOGQ5MDJiZDQ4ZGU1NWM=
   data.tar.gz: !binary |-
-    ZDlhMjFiYjE5OTY1MTMyM2VmNjIzYmM5MjE1NzRiMTFlMzRiODZiMzE4Mzgz
-    NTkzMTY2NjRmMjM3ZDc0ZGIzZWYwNTNlZjUwNmIyMWQwOTA5NzI0YzI3OTRi
-    ODY1ZDE5MGMyMGM4YzM4YzIwOWE4MGM5NmIwYjcyMmNjYWY3YWI=
+    MzY3ODg5NDk5YWFkMDk1YzgwODUzZjJkNDg2NWM4MTNhN2NjOGIyNGE1YjU3
+    ZDE2Y2M5MzdiNGFlODI1ZmJkZTc1YTRhMTBlYjgwYTg0N2M4NGIwOTdmMDAx
+    MDg0MTBiNzYwMWU4MDhmYmVmNGEwM2E5NmEzOWU0ZWYxZGIxMjc=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 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
+iQEcBAABAgAGBQJSZ4W4AAoJECrHRaUKISqMThEH/ROJ//SeW8+MOTnL0+Xw74nZ
+pRPCbTmu0ba/3v70aHDYFsqAwEZ+BYo1aBAl2GY37177OxHOdA1St7vYgKOtQRZ+
+aSLDDfk0Yfz560U8uF/ngx0ngkXEieRC5VflR/iZYlXPz3ZefRr4b8Azr73jaqg1
+LFOjjutN7zbYouwH6XEP1yxLYBForJ9/gmI6HDayjfExsVlNa0fOh+jbdXS/IZ2P
+pUlgF9FXBhJUnwhwV74nV/K3fZnLbYu5SQNhWRQK+FTr7wofBoZqY/rC/15XxiMg
+JndDcCKiw7QAAh9v2iJteKbIktnTsFLI2GvXXidfj6uZl6EwgkolkGpnGllU0fM=
+=CXOE
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSVR2DAAoJECrHRaUKISqMiO0H/AiYTBtbpvN5Q/WIYRo99pu5
-+VyZpUvISKG7+Mdqb8hEL+O/TvGYQsiCliOhF2UWAjTUdm+fXOXcs5KXWJV3wJZU
-+mzKZ9Xy0a6HLVyLQV3v+bMe5hNBDFx5YI4js0Vlhx9SGV3NQwxIgQ3sfqmmbdtw
-ieKmrLakgDuOHFxPmAibEL5Lv4R+rRlhldsoDoVmp8zuLJcxobaNkNkS1nXqvhha
-NeQjYetL4BisdneEwt1BeZusNHAON5Blt88SgQfbSkPB6Zz7PXxiuCRWfdxkJ9/d
-K9w5TTHXf+TL+OfnRZ9Aaz8vdcRdihNNaPWURgDwhGl2Q9k1BKmIPfxxfZsnBtY=
-=LZ+T
+iQEcBAABAgAGBQJSZ4W4AAoJECrHRaUKISqMSmkH/2i54l0LeCiPf3VCaAtXD27R
+cuOCDGm+qUJNBYib4hf2A/YNnJhCmgQ/NTuqthWTHCf9MKMeG6xiXAhafLghYDjR
+nfVxTAM+ZvHxvPm/y1/fOgKoNAJu/ExKayaFnhtlusR6CeoWdLvRImYAObQ0ui9W
+jydlntjZWkDU0dtuMICgkgEUxge/ss81msLBfvEqWILx8GJ7xIDR/89qagbfi1AB
+HwQfigfgSHwxLIhjGhd3K5sLkZyD5gN01iLj99lO33wBcJRPCpJquvrrl+egybGN
+OQNTDkmW7sKHRQPcX78uvlR5VlnfRSuP9RCL0aa25EdZkOlVxkuc6cR3OtgWXEs=
+=JQt6
 -----END PGP SIGNATURE-----

data/.gitignore

@@ -64,3 +64,4 @@ test/stub/zsfa/mycook
 test/stub/zsfa/foo
 test/support/allocate_memory
 pkg
+node_modules

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 
 env:
-  - TEST_CXX=1
+  - TEST_CXX=1 TEST_NODE=1
   - TEST_CXX=1 SUDO=1
   - TEST_RUBY=1 TEST_RUBY_VERSION=1.8.7 TEST_CLASSIC_RAILS=0
   - TEST_RUBY=1 TEST_RUBY_VERSION=1.9.3 TEST_CLASSIC_RAILS=0

data/NEWS

@@ -1,3 +1,18 @@
+Release 4.0.21
+--------------
+
+ * [Nginx] Upgraded the preferred Nginx version to 1.4.3.
+ * Prelimenary OS X Mavericks support.
+ * Work around an Apache packaging bug in CentOS 5.
+ * Various user friendliness improvements in the documentation and the
+   installers.
+ * Fixed a bug in the always_restart.txt support. Phusion Passenger was
+   looking for it in the wrong directory.
+ * Many Solaris and Sun Studio compatibility fixes. Special thanks to
+   "mark" for his extensive assistance.
+ * [Standalone] The --temp-dir command line option has been introduced.
+
+
 Release 4.0.20
 --------------
 

data/README.md

@@ -12,10 +12,12 @@ You can install either Phusion Passenger for Apache or for Nginx. Basically, ins
 
     ./bin/passenger-install-nginx-module
 
-That's it. :) However on some systems installation may require some more steps. You may have to run `sudo` or `rvmsudo`, and you may have to relax permissions on some directories, etc. Detailed fool-proof installation instructions can be found in the documentation:
+-OR-
+
+    # From your application directory
+    ~/path-to-passenger/bin/passenger start
 
- * [Apache version](http://www.modrails.com/documentation/Users%20guide%20Apache.html#tarball_generic_install)
- * [Nginx version](http://www.modrails.com/documentation/Users%20guide%20Nginx.html#tarball_generic_install)
+That's it. :) However on some systems installation may require some more steps. You may have to run `sudo` or `rvmsudo`, and you may have to relax permissions on some directories, etc. Detailed fool-proof installation instructions can be found in [the documentation](http://www.modrails.com/documentation/Users%20guide.html).
 
 For troubleshooting, configuration and tips, please also refer to the above documentation. For further support, please refer to [the Phusion Passenger support page](https://www.phusionpassenger.com/support).
 

data/Rakefile

@@ -34,6 +34,7 @@ else
 	require 'build/oxt_tests'
 	require 'build/cxx_tests'
 	require 'build/ruby_tests'
+	require 'build/node_tests'
 	require 'build/integration_tests'
 	require 'build/misc'
 	require 'build/debian'

data/bin/passenger-config

@@ -67,11 +67,7 @@ when "--includedir"
 when "--nginx-addon-dir"
 	puts PhusionPassenger.nginx_module_source_dir
 when "--nginx-libs"
-	text = "#{common_library.link_objects_as_string} #{PhusionPassenger.lib_dir}/common/libboost_oxt.a"
-	if PhusionPassenger::PlatformInfo.has_math_library?
-		text << " -lm"
-	end
-	puts text
+	puts "#{common_library.link_objects_as_string} #{PhusionPassenger.lib_dir}/common/libboost_oxt.a"
 when "--compiled"
 	common_library.link_objects.each do |filename|
 		if !File.exist?(filename)

data/bin/passenger-install-apache2-module

@@ -36,8 +36,10 @@ PhusionPassenger.locate_directories
 ENV["PATH"] += ":/usr/sbin:/sbin:/usr/local/sbin"
 
 require 'optparse'
+require 'stringio'
 require 'phusion_passenger/platform_info/ruby'
 require 'phusion_passenger/platform_info/apache'
+require 'phusion_passenger/platform_info/apache_detector'
 require 'phusion_passenger/abstract_installer'
 
 class Installer < PhusionPassenger::AbstractInstaller
@@ -79,8 +81,12 @@ class Installer < PhusionPassenger::AbstractInstaller
 		return [specs, ids]
 	end
 	
-	def users_guide
-		return "#{PhusionPassenger.doc_dir}/Users guide Apache.html"
+	def users_guide_path
+		return PhusionPassenger.apache2_doc_path
+	end
+
+	def users_guide_url
+		return APACHE2_DOC_URL
 	end
 	
 	def run_steps
@@ -93,7 +99,10 @@ class Installer < PhusionPassenger::AbstractInstaller
 		
 		Dir.chdir(PASSENGER_ROOT)
 		show_welcome_screen
+		check_gem_install_permission_problems || exit(1)
+		check_directory_accessible_by_web_server
 		check_dependencies || exit(1)
+		check_whether_there_are_multiple_apache_installs || exit
 		check_whether_apache_uses_compatible_mpm
 		check_whether_os_is_broken
 		check_whether_system_has_enough_ram
@@ -112,6 +121,43 @@ private
 		render_template 'apache2/welcome', :version => VERSION_STRING
 		wait
 	end
+
+	def check_whether_there_are_multiple_apache_installs
+		new_screen
+		puts '<banner>Sanity checking Apache installation...</banner>'
+
+		output = StringIO.new
+		detector = PlatformInfo::ApacheDetector.new(output)
+		begin
+			detector.detect_all
+			detector.report
+			@apache2 = detector.result_for(PlatformInfo.apxs2)
+			if detector.results.size > 1
+				other_installs = detector.results - [@apache2]
+				render_template 'apache2/multiple_apache_installations_detected',
+					:current => @apache2,
+					:other_installs => other_installs
+				puts
+				if interactive?
+					result = prompt_confirmation "Are you sure you want to install " +
+						"against Apache #{@apache2.version} (#{@apache2.apxs2})?"
+					if !result
+						puts
+						line
+						render_template 'apache2/installing_against_a_different_apache',
+							:other_installs => other_installs
+					end
+					return result
+				else
+					puts '<yellow>Continuing installation because --auto is given.</yellow>'
+				end
+			else
+				return true
+			end
+		ensure
+			detector.finish
+		end
+	end
 	
 	def check_whether_apache_uses_compatible_mpm
 		# 'httpd -V' output is in the form of:
@@ -199,7 +245,8 @@ private
 		puts
 		line
 		render_template 'apache2/deployment_example',
-			:users_guide => users_guide,
+			:users_guide_path => users_guide_path,
+			:users_guide_url => users_guide_url,
 			:phusion_website => PHUSION_WEBSITE,
 			:passenger_website => PASSENGER_WEBSITE
 	end
@@ -207,8 +254,9 @@ private
 	def show_possible_solutions_for_compilation_and_installation_problems
 		new_screen
 		render_template 'apache2/possible_solutions_for_compilation_and_installation_problems',
-			:users_guide => users_guide,
-			:passenger_website => PASSENGER_WEBSITE
+			:users_guide_path => users_guide_path,
+			:users_guide_url => users_guide_url,
+			:support_url => SUPPORT_URL
 	end
 end
 

data/bin/passenger-install-nginx-module

@@ -63,8 +63,12 @@ class Installer < PhusionPassenger::AbstractInstaller
 		return [specs, ids]
 	end
 	
-	def users_guide
-		return "#{PhusionPassenger.doc_dir}/Users guide Nginx.html"
+	def users_guide_path
+		return PhusionPassenger.nginx_doc_path
+	end
+
+	def users_guide_url
+		return NGINX_DOC_URL
 	end
 	
 	def run_steps
@@ -73,6 +77,8 @@ class Installer < PhusionPassenger::AbstractInstaller
 		ENV['PATH'] = PhusionPassenger.bin_dir + ":" + ENV['PATH']
 		
 		show_welcome_screen
+		check_gem_install_permission_problems || exit(1)
+		check_directory_accessible_by_web_server
 		check_nginx_module_sources_available || exit(1)
 		check_dependencies || exit(1)
 		if needs_compiling_support_files?
@@ -107,7 +113,10 @@ class Installer < PhusionPassenger::AbstractInstaller
 		check_whether_we_can_write_to(nginx_prefix) || exit(1)
 		nginx_config_already_exists_before_installing = nginx_config_exists?(nginx_prefix)
 		if needs_compiling_support_files?
-			compile_passenger_support_files || exit(1)
+			if !compile_passenger_support_files
+				show_possible_solutions_for_compilation_and_installation_problems
+				exit(1)
+			end
 		end
 		if install_nginx(nginx_source_dir, nginx_prefix, extra_nginx_configure_flags)
 			if nginx_config_already_exists_before_installing || !locate_nginx_config_file(nginx_prefix)
@@ -382,6 +391,8 @@ private
 			end
 		end
 		return true
+	rescue Interrupt
+		raise Aborted
 	end
 	
 	def show_passenger_config_snippets(prefix)
@@ -397,7 +408,8 @@ private
 		line
 		puts
 		render_template 'nginx/deployment_example',
-			:users_guide => users_guide,
+			:users_guide_path => users_guide_path,
+			:users_guide_url => users_guide_url,
 			:phusion_website => PHUSION_WEBSITE,
 			:passenger_website => PASSENGER_WEBSITE
 	end
@@ -406,8 +418,9 @@ private
 		line
 		puts
 		render_template 'nginx/possible_solutions_for_compilation_and_installation_problems',
-			:users_guide => users_guide,
-			:passenger_website => PASSENGER_WEBSITE
+			:users_guide_path => users_guide_path,
+			:users_guide_url => users_guide_url,
+			:support_url => SUPPORT_URL
 	end
 	
 	def locate_nginx_config_file(prefix)

data/bin/passenger-memory-stats

@@ -30,6 +30,7 @@ require 'phusion_passenger'
 PhusionPassenger.locate_directories
 
 require 'phusion_passenger/platform_info'
+require 'phusion_passenger/platform_info/ruby'
 require 'phusion_passenger/admin_tools/memory_stats'
 
 include PhusionPassenger
@@ -133,9 +134,8 @@ class App
 		if @stats.platform_provides_private_dirty_rss_information? &&
 		   Process.euid != 0 &&
 		   @stats.root_privileges_required_for_private_dirty_rss?
-			puts
-			puts "*** WARNING: Please run this tool as root. Otherwise the " <<
-				"private dirty RSS of processes cannot be determined."
+			puts "*** WARNING: Please run this tool with #{BOLD}#{PlatformInfo.ruby_sudo_command}#{RESET}. Otherwise the " <<
+				"private dirty RSS (a reliable metric for real memory usage) of processes cannot be determined."
 		end
 	end
 	

data/build/agents.rb

@@ -41,7 +41,7 @@ file AGENT_OUTPUT_DIR + 'PassengerWatchdog' => dependencies do
 		"-o #{AGENT_OUTPUT_DIR}PassengerWatchdog.o " <<
 		"#{EXTRA_PRE_CXXFLAGS} " <<
 		"-Iext -Iext/common " <<
-		"#{PlatformInfo.portability_cflags} #{AGENT_CFLAGS} #{EXTRA_CXXFLAGS}")
+		"#{AGENT_CFLAGS} #{EXTRA_CXXFLAGS}")
 	create_executable(AGENT_OUTPUT_DIR + 'PassengerWatchdog',
 		"#{AGENT_OUTPUT_DIR}PassengerWatchdog.o " <<
 		"#{watchdog_libs.link_objects_as_string} " <<
@@ -49,7 +49,8 @@ file AGENT_OUTPUT_DIR + 'PassengerWatchdog' => dependencies do
 		"#{EXTRA_PRE_LDFLAGS} " <<
 		"#{PlatformInfo.portability_ldflags} " <<
 		"#{AGENT_LDFLAGS} " <<
-		"#{EXTRA_LDFLAGS}")
+		"#{EXTRA_LDFLAGS} " <<
+		"#{EXTRA_CXX_LDFLAGS}")
 end
 
 helper_agent_libs = COMMON_LIBRARY.
@@ -94,7 +95,6 @@ file AGENT_OUTPUT_DIR + 'PassengerHelperAgent' => dependencies do
 		"#{EXTRA_PRE_CXXFLAGS} " <<
 		"-Iext -Iext/common " <<
 		"#{AGENT_CFLAGS} #{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} " <<
-		"#{PlatformInfo.portability_cflags} " <<
 		"#{EXTRA_CXXFLAGS}")
 	create_executable("#{AGENT_OUTPUT_DIR}PassengerHelperAgent",
 		"#{AGENT_OUTPUT_DIR}PassengerHelperAgent.o",
@@ -105,7 +105,8 @@ file AGENT_OUTPUT_DIR + 'PassengerHelperAgent' => dependencies do
 		"#{LIBEIO_LIBS} " <<
 		"#{PlatformInfo.portability_ldflags} " <<
 		"#{AGENT_LDFLAGS} " <<
-		"#{EXTRA_LDFLAGS}")
+		"#{EXTRA_LDFLAGS} " <<
+		"#{EXTRA_CXX_LDFLAGS}")
 end
 
 logging_agent_libs = COMMON_LIBRARY.only(:base, :logging_agent, 'AgentsBase.o',
@@ -137,7 +138,7 @@ file AGENT_OUTPUT_DIR + 'PassengerLoggingAgent' => dependencies do
 		"#{AGENT_CFLAGS} #{LIBEV_CFLAGS} " <<
 		"#{PlatformInfo.curl_flags} " <<
 		"#{PlatformInfo.zlib_flags} " <<
-		"#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}")
+		"#{EXTRA_CXXFLAGS}")
 	create_executable("#{AGENT_OUTPUT_DIR}PassengerLoggingAgent",
 		"#{AGENT_OUTPUT_DIR}PassengerLoggingAgent.o",
 		"#{logging_agent_libs.link_objects_as_string} " <<
@@ -148,7 +149,8 @@ file AGENT_OUTPUT_DIR + 'PassengerLoggingAgent' => dependencies do
 		"#{PlatformInfo.zlib_libs} " <<
 		"#{PlatformInfo.portability_ldflags} " <<
 		"#{AGENT_LDFLAGS} " <<
-		"#{EXTRA_LDFLAGS}")
+		"#{EXTRA_LDFLAGS} " <<
+		"#{EXTRA_CXX_LDFLAGS}")
 end
 
 spawn_preparer_libs = COMMON_LIBRARY.only('Utils/Base64.o')
@@ -163,11 +165,12 @@ file AGENT_OUTPUT_DIR + 'SpawnPreparer' => dependencies do
 		'ext/common/agents/SpawnPreparer.cpp',
 		"#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_LDFLAGS} " <<
 		"-Iext -Iext/common " <<
-		"#{AGENT_CFLAGS} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} " <<
+		"#{AGENT_CFLAGS} #{EXTRA_CXXFLAGS} " <<
 		"#{spawn_preparer_libs.link_objects_as_string} " <<
 		"#{LIBBOOST_OXT} " <<
 		"#{PlatformInfo.portability_ldflags} " <<
-		"#{EXTRA_LDFLAGS}")
+		"#{EXTRA_LDFLAGS} " <<
+		"#{EXTRA_CXX_LDFLAGS}")
 end
 
 file AGENT_OUTPUT_DIR + 'EnvPrinter' => 'ext/common/agents/EnvPrinter.c' do

data/build/apache2.rb

@@ -57,10 +57,14 @@ APACHE2_MODULE_INPUT_FILES = {
 APACHE2_MODULE_OBJECTS = APACHE2_MODULE_INPUT_FILES.keys
 APACHE2_MOD_PASSENGER_O = APACHE2_OUTPUT_DIR + "mod_passenger.o"
 
+APACHE2_MODULE_CFLAGS =
+	"#{EXTRA_PRE_CFLAGS} " <<
+	"-Iext -Iext/common #{PlatformInfo.apache2_module_cflags} " <<
+	"#{EXTRA_CFLAGS}"
 APACHE2_MODULE_CXXFLAGS =
 	"#{EXTRA_PRE_CXXFLAGS} " <<
 	"-Iext -Iext/common #{PlatformInfo.apache2_module_cflags} " <<
-	"#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
+	"#{EXTRA_CXXFLAGS}"
 
 APACHE2_MODULE_BOOST_OXT_LIBRARY = define_libboost_oxt_task("apache2",
 	APACHE2_OUTPUT_DIR + "module_libboost_oxt",
@@ -78,7 +82,8 @@ auto_generated_sources = [
 	'ext/apache2/ConfigurationFields.hpp',
 	'ext/apache2/CreateDirConfig.cpp',
 	'ext/apache2/MergeDirConfig.cpp',
-	'ext/apache2/ConfigurationSetters.cpp'
+	'ext/apache2/ConfigurationSetters.cpp',
+	'ext/apache2/SetHeaders.cpp'
 ]
 
 
@@ -121,20 +126,19 @@ file APACHE2_MODULE => dependencies do
 	linkflags =
 		"#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_LDFLAGS} " <<
 		"#{PlatformInfo.apache2_module_cflags} " <<
-		"#{PlatformInfo.portability_cflags} " <<
 		"#{EXTRA_CXXFLAGS} " <<
 		"#{APACHE2_MODULE_COMMON_LIBRARIES.join(' ')} " <<
 		"#{APACHE2_MODULE_BOOST_OXT_LIBRARY} " <<
 		"#{PlatformInfo.apache2_module_ldflags} " <<
 		"#{PlatformInfo.portability_ldflags} " <<
-		"#{EXTRA_LDFLAGS} "
+		"#{EXTRA_LDFLAGS} #{EXTRA_CXX_LDFLAGS} "
 	
 	create_shared_library(APACHE2_MODULE, sources, linkflags)
 end
 
 file APACHE2_MOD_PASSENGER_O => ['ext/apache2/mod_passenger.c'] do
 	compile_c('ext/apache2/mod_passenger.c',
-		"#{APACHE2_MODULE_CXXFLAGS} -o #{APACHE2_MOD_PASSENGER_O}")
+		"#{APACHE2_MODULE_CFLAGS} -o #{APACHE2_MOD_PASSENGER_O}")
 end
 
 task :clean => 'apache2:clean'

data/build/basics.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010, 2011, 2012 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -138,50 +138,44 @@ LIBEXT   = PlatformInfo.library_extension
 USE_DMALLOC = boolean_option('USE_DMALLOC')
 USE_EFENCE  = boolean_option('USE_EFENCE')
 USE_ASAN    = boolean_option('USE_ASAN')
-OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS -fcommon".strip
-OPTIMIZATION_FLAGS << " -O" if OPTIMIZE
-OPTIMIZATION_FLAGS << " -feliminate-unused-debug-symbols -feliminate-unused-debug-types" if PlatformInfo.compiler_supports_feliminate_unused_debug?
-OPTIMIZATION_FLAGS << " -fvisibility=hidden -DVISIBILITY_ATTRIBUTE_SUPPORTED" if PlatformInfo.compiler_supports_visibility_flag?
-OPTIMIZATION_FLAGS << " -Wno-attributes" if PlatformInfo.compiler_supports_visibility_flag? &&
-	PlatformInfo.compiler_visibility_flag_generates_warnings? &&
-	PlatformInfo.compiler_supports_wno_attributes_flag?
-OPTIMIZATION_FLAGS << " -fno-omit-frame-pointers" if USE_ASAN
 
 # Agent-specific compiler flags.
 AGENT_CFLAGS  = ""
-AGENT_CFLAGS << " -faddress-sanitizer" if USE_ASAN
+AGENT_CFLAGS << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
 AGENT_CFLAGS.strip!
 
 # Agent-specific linker flags.
 AGENT_LDFLAGS = ""
 AGENT_LDFLAGS << " #{PlatformInfo.dmalloc_ldflags}" if USE_DMALLOC
 AGENT_LDFLAGS << " #{PlatformInfo.electric_fence_ldflags}" if USE_EFENCE
-AGENT_LDFLAGS << " -faddress-sanitizer" if USE_ASAN
+AGENT_LDFLAGS << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
 # Extra linker flags for backtrace_symbols() to generate useful output (see AgentsBase.cpp).
 AGENT_LDFLAGS << " #{PlatformInfo.export_dynamic_flags}"
 # Enable dead symbol elimination on OS X.
-AGENT_LDFLAGS << " -Wl,-dead_strip" if RUBY_PLATFORM =~ /darwin/
+AGENT_LDFLAGS << " -Wl,-dead_strip" if PlatformInfo.os_name == "macosx"
 AGENT_LDFLAGS.strip!
 
 # Extra compiler flags that should always be passed to the C/C++ compiler.
 # These should be included first in the command string, before anything else.
 EXTRA_PRE_CFLAGS = string_option('EXTRA_PRE_CFLAGS', '').gsub("\n", " ")
 EXTRA_PRE_CXXFLAGS = string_option('EXTRA_PRE_CXXFLAGS', '').gsub("\n", " ")
-# These should be included last in the command string, even after PlatformInfo.portability_cflags.
-EXTRA_CXXFLAGS = "-Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-long-long"
-EXTRA_CXXFLAGS << " -Wno-missing-field-initializers" if PlatformInfo.compiler_supports_wno_missing_field_initializers_flag?
-EXTRA_CXXFLAGS << " -mno-tls-direct-seg-refs" if PlatformInfo.requires_no_tls_direct_seg_refs? && PlatformInfo.compiler_supports_no_tls_direct_seg_refs_option?
-# Work around Clang warnings in ev++.h.
-EXTRA_CXXFLAGS << " -Wno-ambiguous-member-template" if PlatformInfo.cxx_is_clang?
-EXTRA_CXXFLAGS << " #{OPTIMIZATION_FLAGS}" if !OPTIMIZATION_FLAGS.empty?
+# These should be included last in the command string.
+EXTRA_CFLAGS = PlatformInfo.default_extra_cflags.dup
+EXTRA_CFLAGS << " " << string_option('EXTRA_CFLAGS').gsub("\n", " ") if string_option('EXTRA_CFLAGS')
+EXTRA_CXXFLAGS = PlatformInfo.default_extra_cxxflags.dup
 EXTRA_CXXFLAGS << " " << string_option('EXTRA_CXXFLAGS').gsub("\n", " ") if string_option('EXTRA_CXXFLAGS')
-EXTRA_CXXFLAGS << " -DPASSENGER_DISABLE_THREAD_LOCAL_STORAGE" if !boolean_option('PASSENGER_THREAD_LOCAL_STORAGE', true)
+[EXTRA_CFLAGS, EXTRA_CXXFLAGS].each do |flags|
+	flags << " -fno-omit-frame-pointers" if USE_ASAN
+	flags << " -DPASSENGER_DISABLE_THREAD_LOCAL_STORAGE" if !boolean_option('PASSENGER_THREAD_LOCAL_STORAGE', true)
+end
 
 # Extra linker flags that should always be passed to the linker.
 # These should be included first in the command string, before anything else.
 EXTRA_PRE_LDFLAGS  = string_option('EXTRA_PRE_LDFLAGS', '').gsub("\n", " ")
 # These should be included last in the command string, even after PlatformInfo.portability_ldflags.
-EXTRA_LDFLAGS  = string_option('EXTRA_LDFLAGS', '').gsub("\n", " ")
+EXTRA_LDFLAGS     = string_option('EXTRA_LDFLAGS', '').gsub("\n", " ")
+EXTRA_C_LDFLAGS   = string_option('EXTRA_C_LDFLAGS', '').gsub("\n", " ")
+EXTRA_CXX_LDFLAGS = string_option('EXTRA_CXX_LDFLAGS', '').gsub("\n", " ")
 
 
 AGENT_OUTPUT_DIR          = string_option('AGENT_OUTPUT_DIR', OUTPUT_DIR + "agents") + "/"