passenger 4.0.60 → 5.0.0.beta1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDViZjk3NjY1ZTI4ZTlkMjc1MDkwYTQ4OTM2MmMyYTU1MjExMDRiZA==
+    N2MwNTYyYWNkZDMzZGIxNDM5NWNhMGJlOTA5Y2RjNjE0Y2RjZjdhNw==
   data.tar.gz: !binary |-
-    ZjljYmQwOTc4YjY2OWNkNGE2NTY2NjZkMmMzNTA1MWY3NDMzOTk4Mg==
+    MzNlOTI1MWZkNDIzMTg0NWVmZjg4YWNlMWJiODU0MmRiMjMzMjFiMA==
 SHA512:
   metadata.gz: !binary |-
-    MjZmMDcyYWM4MzZmNTNkZmEwOWFjNTJhNDk1ZGZkYjI0MmU4NzUzYWE5NGM4
-    NzIyOWQyZTQwYmEyOTg1NzMwNmU4N2NjZDhiZjhhZjRiN2YwNTdiZGUzM2Ix
-    MTdmYjVhZTE3MWMxZDNjN2ExMWNiNTExYzljOGFkYmM2OGNiNjE=
+    OTQ4YjNmNzNmZTYzYWIzYTc4MTA0MTE4ODZhNDM2NzVkNGZhMTk1OTQ5NzQy
+    ZDU4Mjc4ZTlhOTI4ODc2ZWUyZjQ3MTk0NDA4NjU1MjBkMjc3OTBhYTNmYzdl
+    MzY1ZDczZDQ4ZTRjNmUzNDUwMTBkODFlMjBjNmQ1ZTEwZjIyMGQ=
   data.tar.gz: !binary |-
-    NmZiOGMwZDk0YWQ0YjNkNmE2YTZhMTgzYTAwYTlkZDhjNmZiODA4MTljODhl
-    YTQxYWY4ODc1NjdmYjYwMjhiODIzNDU4N2MyMTMzNTQ5NWNlMTE1YmMyNWFj
-    YWIxNGQ5ODJlODk5MzkzMGYzNzhkZjI3Y2FlMjg0MTg4MzZlOTU=
+    YjQ5M2NlNDEzNTIzMTNiNjllZTQzZTczYzU1NjBhOTI0MDk3M2QzMWNlYjdl
+    OTE5MGZkY2ZmZmMzNjAwN2UwYjM5NmJhYmRmZGQyNzQ1ODNkYzNkYWNjZTUy
+    NzBlMGE5MDM2ZjZkOGM2ZGM1NWYzNTI5ZjRmNDM0ODdmYzMzMDQ=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJWZV67AAoJECrHRaUKISqMI/gH/3OdeNxY0NIyWk5KHIbmc16q
-8L6kfF6bgWbWzsDGDqSqyErA0U1MzGB1zgDswu8xc+mHhtflqDdVLD+SI2j8aMYs
-YEkxZEsmmQLmao+9p0HboY9IsmNxk9Ir+95EVrxKSEa61STTCQ9r+qcLn+HqsUUB
-BzTNssnbmuTgKPOM/hkn18TGcvzvojLWBfOonVrEDcnP9wEbBp+TdCBdo/qn/GT/
-BNigh+aNMS8iUWFvhEtNtyfFcvHUJ0kpLtINinw1nCv6IL6iWoFeU4uXZv96cPOv
-vP6zD5WIMzZRZB3CXuC22K/eRICcT3s1dtjmls6u/l10sQce7u9M3JZ+3GCT07c=
-=J7o0
+iQEcBAABAgAGBQJUdIftAAoJECrHRaUKISqMuuYH/1upwgXMC5FAFeeO1+4LRGYr
+ISrBfAo406NssNSJXCZWXOS1Yquuv2r+8ZtEhmikXhueoCdKgEfkJs83jfxTBywG
+qRTCQhduyZlcmc0P2T7ZQBj2lHIqoeMajT8oiERm/xpLKn8snpujdrMDxxZTWqh5
+lFtj0srdw2/+1cKzpLi+3b21bnLUhZdWOylr52oNIEhtlYFJFl/xVK1Jim4KYtj8
+sGrN+dTCqqNIPJhMKyT7QAI4OMQ3sTV+N9w0Px2BKbpUk3VvPU5QtYeGVX5DMljW
+naCtmstWTa304LkvtkYT4XGAX/OkKoozl1swes05ePhiBYWIfhByuyHSd+HRPX8=
+=VpUk
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJWZV67AAoJECrHRaUKISqMJisIAKL8AO+kb8tjGispRS4CpAmD
-EKDqYuLSshp9MpfH1fnK4+CP2MZ9rfVekt6NyVLqVySrZ1FtfyhEe26PJnxpq2vP
-44nF6s4DniIwK5zX8+AvBa3GpkhuAWpe/Ecyp247abO+P7/tU/oBhWP3sfCODGla
-3JMwEZrnkRbmVHIqiDcxF6p1AcNyyBDeaLWg+1oAzEjs1eh5Cj9eL4fdNIDrqNQW
-RwJULUqnfrgzaLSqCemYjL3rQ5rFnCEjdY2mUtacKtjcSxde7pNPQKpR/OBDShKK
-UxIb/nQ+ykyKVcNk9VC03vcc9qPJsrUyoq3m7dkxYuqytoYK9jJ/V+2+OR94Fzs=
-=GtFi
+iQEcBAABAgAGBQJUdIftAAoJECrHRaUKISqMFw8H/R0bjqRGi/R6YMr7ZIKs6kSM
+kWBA+k0OR7AAeKNlvWGJW1YlFRgn8dGQCqQOFKbOtXZUbxYOpuNJCnJPN9UQe60A
+XrN7GRa7JLBL9DAfz1/PR5KicQvZ/XZ//zegPXFsFdRE0QSbqGKZRdNIwL9TtjwV
+OVFJ0UWeUCWme281T27q8yuGPGNRh7C5ypB9nYy3kmVuCPrfddA0n+R2WD+6CVMe
+sLm/axbTbhXdJ8Fn/riuDPWNXvgayXCB+9Ds6bdblsRGwkrGqf392upyIv0stXp5
+rRytKymkXMAlg57MRwvGBIikxyV0B0AHjhtuqQ69TYXnt4rhNTn9xbI6JK5uQ2E=
+=R+7h
 -----END PGP SIGNATURE-----

data/.editorconfig

@@ -47,6 +47,11 @@ indent_style = tab
 indent_size = 4
 trim_trailing_whitespace = true
 
+[lib/phusion_passenger/utils/json.rb]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
 [*.js]
 indent_style = tab
 indent_size = 4

data/.travis.yml

@@ -3,12 +3,13 @@ language: ruby
 env:
   - 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_RUBYGEMS_VERSION=1.8.25
-  - TEST_RUBY=1 TEST_RUBY_VERSION=1.9.3 TEST_CLASSIC_RAILS=0
+  - TEST_RUBY=1 TEST_RUBY_VERSION=1.8.7 TEST_RUBYGEMS_VERSION=1.8.25
+  - TEST_RUBY=1 TEST_RUBY_VERSION=1.9.3
   - TEST_NGINX=1 TEST_STANDALONE=1
   - TEST_APACHE2=1
   - TEST_SOURCE_PACKAGING=1 TEST_DEBIAN_PACKAGING=1
 
+install: "true"
 script: ./dev/ci/run_travis.sh
 
 notifications:

data/CHANGELOG

@@ -1,56 +1,34 @@
-Release 4.0.60
---------------
-
-Note that 4.0.60 is a source-only maintenance release. There will not be any binaries, Debian or RPM packages for this release.
-
- * Adds OS X El Capitan support.
- * Updates preferred Nginx version from 1.6.2 to 1.6.3.
- * Fixes a header collision vulnerability (CVE-2015-7519, medium severity). Please see our blog for detailed vulnerability description and advisory. Thanks to the SUSE security team for reporting this issue.
- * Fixes the password protection of internal Phusion Passenger processes.
-
-   For security reasons, Phusion Passenger limits access to internal processes, by using Unix file permissions and randomly generated passwords that only authorized internal processes know. It turns out that this password wasn't set correctly, which has now been fixed. There was no security vulnerability, because the file permissions already provide sufficient security. The password only serves as an extra layer of security just in case there is a problem with the former.
-
-   This issue is not at all related to any application-level security or application-level passwords. Any database passwords, keys, or secrets used and generated by applications have got nothing to do with the nature of this issue. This issue only relates to some randomly generated passwords that Passenger uses internally, for its internal operations.
-
-
-Release 4.0.59
---------------
-
- * [Enterprise] Fixed support for free-style Node.js apps.
-
-
-Release 4.0.58
---------------
-
- * [Enterprise] Fixed a bug in the Debian packages which caused Flying Passenger to break when used with non-system Rubies.
- * The Debian packages no longer require Ruby 1.9. Closes GH-1353.
-
-
-Release 4.0.57
---------------
-
- * Fixed a native extension compatibility problem with Ruby 2.2. Closes [ruby-core:67152](https://bugs.ruby-lang.org/issues/10656).
- * Fixed compatibility with Nginx 1.7.9. Closes GH-1335.
-
-
-Release 4.0.56
---------------
-
- * Fixed a file descriptor leak that manifests when an error page is shown. Contributed by Paul Bonaud, closes GH-1325.
- * Improved Node.js request load balancing. Closes GH-1322. Thanks to Charles Vallières for the analysis.
-
-
-Release 4.0.55
---------------
-
- * Supports Ruby 2.2. Closes GH-1314.
- * Fixed Linux OS name detection.
-
-
-Release 4.0.54
---------------
-
- * Contains a licensing-related hot fix for Enterprise customers.
+Release 5.0.0 beta 1
+--------------------
+
+Version 5.0.0 beta 1 contains major changes. It's mostly compatible with version 4, but there are a few minor breakages, which are described below. Major changes and notable breakages are:
+
+ * Performance has been much improved. This is thanks to months of optimization work. You can learn more at www.rubyraptor.org.
+ * We've published a [server optimization guide](https://www.phusionpassenger.com/documentation/ServerOptimizationGuide.html) for those who are interested in tuning Phusion Passenger.
+ * Support for Rails 1.2 - 2.2 has been removed, for performance reasons. Rails 2.3 is still supported.
+ * Phusion Passenger now supports integrated HTTP caching, which we call turbocaching. If your app sets the right HTTP headers then Phusion Passenger can tremendously accelerate your app. It is enabled by default, but you can disable it with `--disable-turbocaching` (Standalone), `PassengerTurbocaching off` (Apache), or 'passenger_turbocaching off' (Nginx).
+ * Touching restart.txt will no longer restart your app immediately. This is because, for performance reasons, the stat throttle rate now defaults to 10. You can still get back the old behavior by setting `PassengerStatThrottleRate 0` (Apache) or `passenger_stat_throttle_rate 0` (Nginx), but this is not encouraged. Instead, we encourage you to use the `passenger-config restart-app` tool to initiate restarts, which has immediate effect.
+ * Websockets are now properly disconnected on application restarts.
+ * The Phusion Passneger log levels have been completely revamped. If you were setting a log level before (e.g. through `passenger_log_level`), please read the latest documentation to learn about the new log levels.
+ * If you use out-of-band garbage collection, beware that the `X-Passenger-Request-OOB-Work` header has now been renamed to `!~Request-OOB-Work`.
+ * When using Rack's full socket hijacking, you must now output an HTTP status line.
+ * [Nginx] The `passenger_set_cgi_param` option has been removed and replaced by `passenger_set_header` and `passenger_env_var`.
+ * [Nginx] `passenger_show_version_in_header` is now only valid in the `http` context.
+ * [Apache] The `PassengerStatThrottleRate` option is now global.
+
+Minor changes:
+
+ * The minimum required Nginx version is now 1.6.0.
+ * The instance directory is now touched every hour instead of every 6 hours. This should hopefully prevent more problems with /tmp cleaner daemons.
+ * Applications are not grouped not only on the application root path, but also on the environment. For example, this allows you to run the same app in both production and staging mode, with only a single directory, without further configuration. Closes GH-664.
+ * The `passenger_temp_dir` option (Nginx) and the `PassengerTempDir` option (Apache) have been replaced by two config options. On Nginx they are `passenger_instance_registry_dir` and `passenger_data_buffer_dir`. On Apache they are `PassengerInstanceRegistryDir` and `PassengerDataBufferDir`. On Apache, `PassengerUploadBufferDir` has been replaced by `PassengerDataBufferDir`.
+ * Command line tools no longer respect the `PASSENGER_TEMP_DIR` environment variable. Use `PASSENGER_INSTANCE_REGISTRY_DIR` instead.
+ * `passenger-status --show=requests` has been deprecated in favor of `passenger-status --show=connections`.
+ * Using the SIGUSR1 signal to restart a Ruby app without dropping connections, is no longer supported. Instead, use `passenger-config detach-process`.
+ * Introduced the `passenger-config reopen-logs` command, which instructs all Phusion Passenger agent processes to reopen their log files. You should call this after having rotated the web server logs.
+ * [Standalone] The Phusion Passenger Standalone config template has changed. Users are encouraged to update it.
+ * [Standalone] `passenger-standalone.json` has been renamed to `Passengerfile.json`.
+ * [Standalone] `passenger-standalone.json`/`Passengerfile.json` no longer overrides command line options. Instead, command line options now have the highest priority.
 
 
 Release 4.0.53

data/CONTRIBUTING.md

@@ -176,10 +176,10 @@ The most important directories are:
  * `ext/common` <br>
    Source code shared by the Apache and Nginx modules.
  * `ext/common/agents` <br>
-   Source code of the Phusion agent executables, i.e. PassengerWatchdog, PassengerHelperAgent and PassengerLoggingAgent.
-   * PassengerWatchdog is is the main Phusion Passenger control process, starts PassengerHelperAgent and PassengerLoggingAgent, and restarts them when they crash. It also cleans everything up upon shut down.
-   * PassengerHelperAgent performs most of the heavy lifting. It parses requests, spawns application processes, forwards requests to the correct process and forwards application responses back to the web server.
-   * PassengerLoggingAgent processes Union Station data and sends them to the Union Station server.
+   Source code of the PassengerAgent executable. The agent can be started in multiple modes.
+   * The watchdog is is the main Phusion Passenger control process, starts the HTTP server and the logging agent, and restarts them when they crash. It also cleans everything up upon shut down.
+   * The HTTP server performs most of the heavy lifting. It parses requests, spawns application processes, forwards requests to the correct process and forwards application responses back to the web server.
+   * The logging agent processes Union Station data and sends them to the Union Station server.
  * `bin` <br>
    User executables.
  * `helper-scripts` <br>

data/CONTRIBUTORS

@@ -57,7 +57,6 @@ Nathaniel Bibler
 Neil Wilson
 Ninh Bui (Phusion)
 Pat Downey
-Paul B
 Paul Kmiec
 Pepijn Looije
 Perry Smith

data/Gemfile

@@ -0,0 +1,18 @@
+source 'https://rubygems.org/'
+
+group :base do
+	gem 'mime-types', '1.25'
+	gem 'rspec', '2.14.1'
+	gem 'daemon_controller'
+	gem 'rake'
+	gem 'drake'
+	gem 'json'
+	gem 'rack'
+end
+
+group :doc do
+	# Last version that worked on Ruby 1.8
+	gem 'nokogiri', '1.5.9'
+	gem 'mizuho'
+	gem 'bluecloth'
+end

data/Gemfile.lock

@@ -0,0 +1,41 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    bluecloth (2.2.0)
+    comp_tree (1.1.3)
+    daemon_controller (1.2.0)
+    diff-lcs (1.2.5)
+    drake (0.9.2.0.3.1)
+      comp_tree (>= 1.1.3)
+    json (1.8.1)
+    mime-types (1.25)
+    mizuho (0.9.20)
+      nokogiri (>= 1.4.0)
+      sqlite3
+    nokogiri (1.5.9)
+    rack (1.5.2)
+    rake (10.3.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    sqlite3 (1.3.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bluecloth
+  daemon_controller
+  drake
+  json
+  mime-types (= 1.25)
+  mizuho
+  nokogiri (= 1.5.9)
+  rack
+  rake
+  rspec (= 2.14.1)

data/Rakefile

@@ -18,6 +18,22 @@ source_root = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift(source_root)
 $LOAD_PATH.unshift("#{source_root}/lib")
 
+# Clean Bundler environment variables, preserve Rake environment variables.
+# Otherwise all Ruby commands will take slightly longer to start, which messes up
+# timing-sensitive tests like those in the C++ test suite.
+if defined?(Bundler)
+	clean_env = nil
+	Bundler.with_clean_env do
+		clean_env = ENV.to_hash
+	end
+	ENV.replace(clean_env)
+	ARGV.each do |arg|
+		if arg =~ /^(\w+)=(.*)$/m
+			ENV[$1] = $2
+		end
+	end
+end
+
 require "#{source_root}/config" if File.exist?("#{source_root}/config.rb")
 require 'build/basics'
 if boolean_option('ONLY_RUBY')

data/bin/passenger

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -41,4 +41,4 @@ STDOUT.sync = STDERR.sync = true
 STDOUT.binmode
 STDERR.binmode
 
-PhusionPassenger::Standalone::Main.run!(ARGV)
+PhusionPassenger::Standalone.run!(ARGV)

data/bin/passenger-install-apache2-module

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -45,7 +45,6 @@ require 'optparse'
 require 'stringio'
 PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'platform_info/ruby'
-PhusionPassenger.require_passenger_lib 'platform_info/openssl'
 PhusionPassenger.require_passenger_lib 'platform_info/apache'
 PhusionPassenger.require_passenger_lib 'platform_info/apache_detector'
 PhusionPassenger.require_passenger_lib 'abstract_installer'
@@ -109,7 +108,8 @@ class Installer < PhusionPassenger::AbstractInstaller
 	end
 	
 	def run_steps
-		if PhusionPassenger.natively_packaged? && PhusionPassenger.apache2_module_source_dir.nil?
+		if PhusionPassenger.build_system_dir.nil?
+			# Invariant: PhusionPassenger.custom_packaged?
 			if apache_module_available?
 				notify_apache_module_installed
 				show_deployment_example
@@ -119,7 +119,7 @@ class Installer < PhusionPassenger::AbstractInstaller
 			exit
 		end
 		
-		Dir.chdir(PhusionPassenger.apache2_module_source_dir)
+		Dir.chdir(PhusionPassenger.build_system_dir)
 		show_welcome_screen
 		query_interested_languages
 		check_gem_install_permission_problems || exit(1)
@@ -269,10 +269,10 @@ private
 		if Process.uid == 0
 			render_template 'installer_common/cannot_access_files_as_root',
 				:type => "directory",
-				:files => [PhusionPassenger.apache2_module_source_dir]
+				:files => [PhusionPassenger.build_system_dir]
 		else
 			render_template 'installer_common/run_installer_as_root',
-				:dir  => PhusionPassenger.apache2_module_source_dir,
+				:dir  => PhusionPassenger.build_system_dir,
 				:sudo => PhusionPassenger::PlatformInfo.ruby_sudo_command,
 				:sudo_s_e => PhusionPassenger::PlatformInfo.ruby_sudo_shell_command("-E"),
 				:ruby => PhusionPassenger::PlatformInfo.ruby_command,
@@ -343,14 +343,14 @@ private
 		line
 		puts '<banner>Compiling and installing Apache 2 module...</banner>'
 		if @compile
-			puts "cd #{PhusionPassenger.apache2_module_source_dir}"
+			puts "cd #{PhusionPassenger.build_system_dir}"
 			if ENV['TRACE']
 				rake = "#{PlatformInfo.rake_command} --trace RELEASE=yes"
 			else
 				rake = "#{PlatformInfo.rake_command} RELEASE=yes"
 			end
-			command = "#{rake} apache2:clean apache2"
-			if PhusionPassenger.native_packaging_method == "homebrew"
+			command = "env NOEXEC_DISABLE=1 #{rake} apache2:clean apache2"
+			if PhusionPassenger.packaging_method == "homebrew"
 				# Running apache2:clean deletes some object files needed
 				# by passenger-install-nginx-module, so we ensure those
 				# object files are compiled.
@@ -369,7 +369,7 @@ private
 
 	def config_snippet
 		return "<IfModule mod_passenger.c>\n" +
-			"  PassengerRoot #{PhusionPassenger.source_root}\n" +
+			"  PassengerRoot #{PhusionPassenger.install_spec}\n" +
 			"  PassengerDefaultRuby #{PlatformInfo.ruby_command}\n" +
 			"</IfModule>"
 	end
@@ -788,7 +788,7 @@ private
 	end
 
 	def install_apache_module_from_native_package
-		case PhusionPassenger.native_packaging_method
+		case PhusionPassenger.packaging_method
 		when 'deb'
 			sh! "sudo apt-get update"
 			sh! "sudo apt-get install #{DEB_APACHE_MODULE_PACKAGE}"
@@ -798,7 +798,7 @@ private
 			return true
 		else
 			puts "<red>The #{PROGRAM_NAME} Apache module package is not installed.</red>"
-			puts "Please ask your operating system vendor how to install it."
+			puts "Please ask your packager or operating system vendor how to install it."
 			return false
 		end
 	end

data/bin/passenger-install-nginx-module

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -38,11 +38,9 @@ require 'digest/sha2'
 require 'optparse'
 require 'fileutils'
 PhusionPassenger.require_passenger_lib 'platform_info/ruby'
-PhusionPassenger.require_passenger_lib 'platform_info/openssl'
 PhusionPassenger.require_passenger_lib 'abstract_installer'
 PhusionPassenger.require_passenger_lib 'utils/terminal_choice_menu'
 PhusionPassenger.require_passenger_lib 'utils/tmpio'
-PhusionPassenger.require_passenger_lib 'utils/shellwords'
 
 DOWNLOAD_OPTION = {
 	:connect_timeout => 30,
@@ -210,7 +208,8 @@ private
 	end
 
 	def check_nginx_module_sources_available
-		if PhusionPassenger.natively_packaged? && !File.exist?(PhusionPassenger.nginx_module_source_dir)
+		if PhusionPassenger.custom_packaged? &&
+		   (!PhusionPassenger.nginx_module_source_dir || !File.exist?(PhusionPassenger.nginx_module_source_dir))
 			new_screen
 			render_template 'nginx/nginx_module_sources_not_available'
 			return false
@@ -220,14 +219,14 @@ private
 	end
 
 	def needs_compiling_support_files?
-		return PhusionPassenger.originally_packaged?
+		return !PhusionPassenger.build_system_dir.nil?
 	end
 	
 	def compile_passenger_support_files
 		new_screen
 		puts "<banner>Compiling Passenger support files...</banner>"
 		Dir.chdir(PhusionPassenger.build_system_dir) do
-			return sh("#{PlatformInfo.rake_command} nginx:clean nginx RELEASE=yes")
+			return sh("env NOEXEC_DISABLE=1 #{PlatformInfo.rake_command} nginx:clean nginx RELEASE=yes")
 		end
 	end
 	
@@ -490,7 +489,7 @@ private
 		new_screen
 		render_template 'nginx/config_snippets',
 			:config_file => locate_nginx_config_file(prefix),
-			:passenger_root => PhusionPassenger.source_root,
+			:passenger_root => PhusionPassenger.install_spec,
 			:ruby => PlatformInfo.ruby_command
 		wait
 	end
@@ -528,7 +527,7 @@ private
 		contents = File.read(config_file)
 		contents.sub!(/^http \{/,
 			"http {\n" <<
-			"    passenger_root #{PhusionPassenger.source_root};\n" <<
+			"    passenger_root #{PhusionPassenger.install_spec};\n" <<
 			"    passenger_ruby #{PlatformInfo.ruby_command};\n")
 		File.open(config_file, 'w') do |f|
 			f.write(contents)
@@ -537,21 +536,17 @@ private
 		new_screen
 		render_template 'nginx/config_snippets_inserted',
 			:config_file => config_file,
-			:passenger_root => PhusionPassenger.source_root,
+			:passenger_root => PhusionPassenger.install_spec,
 			:ruby => PlatformInfo.ruby_command
 		wait
 	end
 	
 	def build_nginx_configure_command(prefix, extra_configure_flags = nil)
-		extra_cflags = "-Wno-error #{PlatformInfo.openssl_extra_cflags}".strip
-		extra_ldflags = PlatformInfo.openssl_extra_ldflags
-
 		command = "sh ./configure --prefix='#{prefix}' "
 		command << "--with-http_ssl_module "
 		command << "--with-http_gzip_static_module "
 		command << "--with-http_stub_status_module "
-		command << "--with-cc-opt=#{Shellwords.escape extra_cflags} "
-		command << "--with-ld-opt=#{Shellwords.escape extra_ldflags} "
+		command << "--with-cc-opt='-Wno-error' "
 		if @pcre_source_dir
 			command << "--with-pcre='#{@pcre_source_dir}' "
 		elsif !pcre_is_installed?