passenger 4.0.60 → 5.0.0.beta1

data/build/apache2.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.
 #
@@ -50,7 +50,6 @@ APACHE2_MODULE_INPUT_FILES = {
 		ext/common/Exceptions.h
 		ext/common/Logging.h
 		ext/common/RandomGenerator.h
-		ext/common/ServerInstanceDir.h
 		ext/common/Utils.h
 		ext/common/Utils/Timer.h)
 }
@@ -70,8 +69,8 @@ APACHE2_MODULE_BOOST_OXT_LIBRARY = define_libboost_oxt_task("apache2",
 	APACHE2_OUTPUT_DIR + "module_libboost_oxt",
 	PlatformInfo.apache2_module_cflags)
 APACHE2_MODULE_COMMON_LIBRARIES  = COMMON_LIBRARY.
-	only(:base, 'ApplicationPool2/AppTypes.o', 'Utils/Base64.o',
-		'Utils/MD5.o', 'Utils/LargeFiles.o').
+	only(:base, 'ApplicationPool2/AppTypes.o',
+		'Utils/MD5.o', 'Utils/modp_b64.o').
 	set_namespace("apache2").
 	set_output_dir(APACHE2_OUTPUT_DIR + "module_libpassenger_common").
 	define_tasks(PlatformInfo.apache2_module_cflags).
@@ -90,11 +89,7 @@ auto_generated_sources = [
 desc "Build Apache 2 module"
 task :apache2 => [
 	APACHE2_MODULE,
-	AGENT_OUTPUT_DIR + 'PassengerHelperAgent',
-	AGENT_OUTPUT_DIR + 'PassengerWatchdog',
-	AGENT_OUTPUT_DIR + 'PassengerLoggingAgent',
-	AGENT_OUTPUT_DIR + 'SpawnPreparer',
-	AGENT_OUTPUT_DIR + 'TempDirToucher',
+	AGENT_OUTPUT_DIR + AGENT_EXE,
 	NATIVE_SUPPORT_TARGET
 ].compact
 

data/build/basics.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.
 #
@@ -29,6 +29,7 @@ require 'pathname'
 require 'fileutils'
 require 'phusion_passenger'
 PhusionPassenger.locate_directories
+PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'packaging'
 PhusionPassenger.require_passenger_lib 'platform_info'
 PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
@@ -138,17 +139,18 @@ PACKAGE_VERSION = PhusionPassenger::VERSION_STRING
 MAINTAINER_NAME  = "Phusion"
 MAINTAINER_EMAIL = "info@phusion.nl"
 
-OPTIMIZE = boolean_option("OPTIMIZE")
 CC       = maybe_wrap_in_ccache(PhusionPassenger::PlatformInfo.cc)
 CXX      = maybe_wrap_in_ccache(PhusionPassenger::PlatformInfo.cxx)
 LIBEXT   = PlatformInfo.library_extension
 USE_DMALLOC = boolean_option('USE_DMALLOC')
 USE_EFENCE  = boolean_option('USE_EFENCE')
 USE_ASAN    = boolean_option('USE_ASAN')
+OPTIMIZE    = boolean_option('OPTIMIZE')
 
 # Agent-specific compiler flags.
 AGENT_CFLAGS  = ""
 AGENT_CFLAGS << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
+AGENT_CFLAGS << " -O" if OPTIMIZE
 AGENT_CFLAGS.strip!
 
 # Agent-specific linker flags.
@@ -189,7 +191,7 @@ EXTRA_CXX_LDFLAGS = compiler_flag_option('EXTRA_LDFLAGS') + " " +
 	compiler_flag_option('EXTRA_CXX_LDFLAGS')
 
 
-AGENT_OUTPUT_DIR          = string_option('AGENT_OUTPUT_DIR', OUTPUT_DIR + "agents") + "/"
+AGENT_OUTPUT_DIR          = string_option('AGENT_OUTPUT_DIR', OUTPUT_DIR + "support-binaries") + "/"
 COMMON_OUTPUT_DIR         = string_option('COMMON_OUTPUT_DIR', OUTPUT_DIR + "common") + "/"
 APACHE2_OUTPUT_DIR        = string_option('APACHE2_OUTPUT_DIR', OUTPUT_DIR + "apache2") + "/"
 LIBEV_OUTPUT_DIR          = string_option('LIBEV_OUTPUT_DIR', OUTPUT_DIR + "libev") + "/"

data/build/common_library.rb

@@ -238,4 +238,5 @@ libboost_oxt_cflags = ""
 libboost_oxt_cflags << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
 libboost_oxt_cflags.strip!
 LIBBOOST_OXT = define_libboost_oxt_task("common", COMMON_OUTPUT_DIR + "libboost_oxt", libboost_oxt_cflags)
+COMMON_LIBRARY.enable_optimizations! if OPTIMIZE
 COMMON_LIBRARY.define_tasks(libboost_oxt_cflags)

data/build/cxx_tests.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.
 #
@@ -85,6 +85,50 @@ TEST_CXX_OBJECTS = {
 		ext/common/ApplicationPool2/SmartSpawner.h
 		ext/common/ApplicationPool2/DirectSpawner.h
 		ext/common/ApplicationPool2/DummySpawner.h),
+	'test/cxx/MemoryKit/MbufTest.o' => %w(
+		test/cxx/MemoryKit/MbufTest.cpp
+		ext/common/MemoryKit/mbuf.h),
+	'test/cxx/ServerKit/ChannelTest.o' => %w(
+		test/cxx/ServerKit/ChannelTest.cpp
+		ext/common/ServerKit/Channel.h
+		ext/common/ServerKit/Context.h),
+	'test/cxx/ServerKit/FileBufferedChannelTest.o' => %w(
+		test/cxx/ServerKit/FileBufferedChannelTest.cpp
+		ext/common/ServerKit/FileBufferedChannel.h
+		ext/common/ServerKit/Context.h),
+	'test/cxx/ServerKit/HeaderTableTest.o' => %w(
+		test/cxx/ServerKit/HeaderTableTest.cpp
+		ext/common/ServerKit/HeaderTable.h
+		ext/common/DataStructures/LString.h),
+	'test/cxx/ServerKit/ServerTest.o' => %w(
+		test/cxx/ServerKit/ServerTest.cpp
+		ext/common/ServerKit/Server.h
+		ext/common/ServerKit/Client.h
+		ext/common/ServerKit/Channel.h
+		ext/common/ServerKit/FdSourceChannel.h
+		ext/common/ServerKit/FileBufferedChannel.h
+		ext/common/ServerKit/FileBufferedFdSinkChannel.h
+		ext/common/ServerKit/Context.h),
+	'test/cxx/ServerKit/HttpServerTest.o' => %w(
+		test/cxx/ServerKit/HttpServerTest.cpp
+		ext/common/ServerKit/Server.h
+		ext/common/ServerKit/Client.h
+		ext/common/ServerKit/Channel.h
+		ext/common/ServerKit/FdSourceChannel.h
+		ext/common/ServerKit/FileBufferedChannel.h
+		ext/common/ServerKit/FileBufferedFdSinkChannel.h
+		ext/common/ServerKit/Context.h
+		ext/common/ServerKit/HttpServer.h
+		ext/common/ServerKit/HttpClient.h
+		ext/common/ServerKit/HttpRequest.h
+		ext/common/ServerKit/HttpHeaderParser.h
+		ext/common/ServerKit/HttpChunkedBodyParser.h),
+	'test/cxx/DataStructures/LStringTest.o' => %w(
+		test/cxx/DataStructures/LStringTest.cpp
+		ext/common/DataStructures/LString.h),
+	'test/cxx/DataStructures/StringKeyTableTest.o' => %w(
+		test/cxx/DataStructures/StringKeyTableTest.cpp
+		ext/common/DataStructures/StringKeyTable.h),
 	'test/cxx/MessageReadersWritersTest.o' => %w(
 		test/cxx/MessageReadersWritersTest.cpp
 		ext/common/MessageReadersWriters.h
@@ -94,21 +138,9 @@ TEST_CXX_OBJECTS = {
 	'test/cxx/StaticStringTest.o' => %w(
 		test/cxx/StaticStringTest.cpp
 		ext/common/StaticString.h),
-	'test/cxx/Base64Test.o' => %w(
-		test/cxx/Base64Test.cpp
-		ext/common/Utils/Base64.h
-		ext/common/Utils/Base64.cpp),
-	'test/cxx/ScgiRequestParserTest.o' => %w(
-		test/cxx/ScgiRequestParserTest.cpp
-		ext/common/agents/HelperAgent/ScgiRequestParser.h
-		ext/common/StaticString.h),
 	'test/cxx/DechunkerTest.o' => %w(
 		test/cxx/DechunkerTest.cpp
 		ext/common/Utils/Dechunker.h),
-	'test/cxx/HttpHeaderBuffererTest.o' => %w(
-		test/cxx/HttpHeaderBuffererTest.cpp
-		ext/common/Utils/HttpHeaderBufferer.h
-		ext/common/Utils/StreamBoyerMooreHorspool.h),
 	'test/cxx/UnionStationTest.o' => %w(
 		test/cxx/UnionStationTest.cpp
 		ext/common/agents/LoggingAgent/LoggingServer.h
@@ -136,33 +168,26 @@ TEST_CXX_OBJECTS = {
 		ext/common/Account.h
 		ext/common/AccountsDatabase.h
 		ext/common/MessageServer.h),
-	'test/cxx/ServerInstanceDir.o' => %w(
-		test/cxx/ServerInstanceDirTest.cpp
-		ext/common/ServerInstanceDir.h
-		ext/common/Utils.h),
-	'test/cxx/RequestHandlerTest.o' => %w(
-		test/cxx/RequestHandlerTest.cpp
-		ext/common/agents/HelperAgent/RequestHandler.h
-		ext/common/agents/HelperAgent/FileBackedPipe.h
-		ext/common/agents/HelperAgent/ScgiRequestParser.h
-		ext/common/agents/HelperAgent/AgentOptions.h
-		ext/common/UnionStation/Connection.h
-		ext/common/UnionStation/Core.h
-		ext/common/UnionStation/Transaction.h
-		ext/common/UnionStation/ScopeLog.h
-		ext/common/ApplicationPool2/Pool.h
-		ext/common/ApplicationPool2/SuperGroup.h
-		ext/common/ApplicationPool2/Group.h
-		ext/common/ApplicationPool2/Process.h
-		ext/common/ApplicationPool2/Options.h
-		ext/common/ApplicationPool2/Spawner.h
-		ext/common/ApplicationPool2/SpawnerFactory.h
-		ext/common/ApplicationPool2/SmartSpawner.h
-		ext/common/ApplicationPool2/DirectSpawner.h
-		ext/common/ApplicationPool2/DummySpawner.h),
-	'test/cxx/FileBackedPipeTest.o' => %w(
-		test/cxx/FileBackedPipeTest.cpp
-		ext/common/agents/HelperAgent/FileBackedPipe.h),
+	# 'test/cxx/RequestHandlerTest.o' => %w(
+	# 	test/cxx/RequestHandlerTest.cpp
+	# 	ext/common/agents/HelperAgent/RequestHandler.h
+	# 	ext/common/agents/HelperAgent/FileBackedPipe.h
+	# 	ext/common/agents/HelperAgent/ScgiRequestParser.h
+	# 	ext/common/agents/HelperAgent/AgentOptions.h
+	# 	ext/common/UnionStation/Connection.h
+	# 	ext/common/UnionStation/Core.h
+	# 	ext/common/UnionStation/Transaction.h
+	# 	ext/common/UnionStation/ScopeLog.h
+	# 	ext/common/ApplicationPool2/Pool.h
+	# 	ext/common/ApplicationPool2/SuperGroup.h
+	# 	ext/common/ApplicationPool2/Group.h
+	# 	ext/common/ApplicationPool2/Process.h
+	# 	ext/common/ApplicationPool2/Options.h
+	# 	ext/common/ApplicationPool2/Spawner.h
+	# 	ext/common/ApplicationPool2/SpawnerFactory.h
+	# 	ext/common/ApplicationPool2/SmartSpawner.h
+	# 	ext/common/ApplicationPool2/DirectSpawner.h
+	# 	ext/common/ApplicationPool2/DummySpawner.h),
 	'test/cxx/FileChangeCheckerTest.o' => %w(
 		test/cxx/FileChangeCheckerTest.cpp
 		ext/common/Utils/FileChangeChecker.h
@@ -217,13 +242,11 @@ dependencies = [
 	'test/cxx/CxxTestMain',
 	'test/support/allocate_memory',
 	NATIVE_SUPPORT_TARGET,
-	AGENT_OUTPUT_DIR + 'SpawnPreparer',
-	AGENT_OUTPUT_DIR + 'TempDirToucher',
-	AGENT_OUTPUT_DIR + 'EnvPrinter'
+	AGENT_OUTPUT_DIR + AGENT_EXE
 ].compact
 desc "Run unit tests for the Apache 2 and Nginx C++ components"
 task 'test:cxx' => dependencies do
-	args = ENV['GROUPS'].to_s.split(",").map{ |name| "-g #{name}" }
+	args = ENV['GROUPS'].to_s.split(";").map{ |name| "-g #{name}" }
 	command = "./cxx/CxxTestMain #{args.join(' ')}".strip
 	if boolean_option('GDB')
 		command = "gdb --args #{command}"
@@ -254,8 +277,7 @@ dependencies = [
 	LIBEIO_TARGET,
 	TEST_BOOST_OXT_LIBRARY,
 	TEST_COMMON_LIBRARY.link_objects,
-	'ext/common/Constants.h',
-	'ext/common/MultiLibeio.cpp'
+	'ext/common/Constants.h'
 ].flatten.compact
 file 'test/cxx/CxxTestMain' => dependencies.flatten do
 	objects = TEST_CXX_OBJECTS.keys.join(' ')
@@ -268,8 +290,8 @@ deps = [
 	'ext/oxt/thread.hpp',
 	'ext/oxt/tracable_exception.hpp',
 	'ext/common/Constants.h',
-	'ext/common/ServerInstanceDir.h',
 	'ext/common/Exceptions.h',
+	'ext/common/InstanceDirectory.h',
 	'ext/common/Utils.h',
 	'ext/common/Utils/SystemTime.h'
 ]

data/build/debian.rb

@@ -102,7 +102,8 @@ task 'debian:dev' do
 		sh "cd #{PKG_DIR}/#{distribution} && dpkg-checkbuilddeps"
 	end
 	distributions.each do |distribution|
-		sh "cd #{PKG_DIR}/#{distribution} && debuild -F -us -uc"
+		sh "cd #{PKG_DIR}/#{distribution} && env DEBUILD_DPKG_BUILDPACKAGE_OPTS=-F " +
+			"debuild -e CCACHE_* -us -uc"
 	end
 end
 
@@ -146,7 +147,8 @@ task 'debian:source_packages' => 'debian:orig_tarball' do
 		create_debian_package_dir(distribution, pkg_dir)
 	end
 	ALL_DISTRIBUTIONS.each do |distribution|
-		sh "cd #{pkg_dir}/#{distribution} && debuild -S -us -uc"
+		sh "cd #{pkg_dir}/#{distribution} && env DEBUILD_DPKG_BUILDPACKAGE_OPTS=-S " +
+			"debuild -us -uc"
 	end
 end
 

data/build/documentation.rb

@@ -92,6 +92,7 @@ end
 
 create_markdown_compilation_task('doc/Packaging.html')
 create_markdown_compilation_task('doc/CloudLicensingConfiguration.html')
+create_markdown_compilation_task('doc/ServerOptimizationGuide.html')
 
 desc "Upload documentation to the Phusion web server"
 task 'doc:rsync' => :doc do

data/build/integration_tests.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.
 #
@@ -38,64 +38,49 @@ end
 dependencies = integration_test_dependencies(:_apache2)
 desc "Run Apache 2 integration tests"
 task 'test:integration:apache2' => dependencies do
-	if PlatformInfo.rspec.nil?
-		abort "RSpec is not installed for Ruby interpreter '#{PlatformInfo.ruby_command}'. Please install it."
-	else
-		command = "#{PlatformInfo.rspec} -c -f s integration_tests/apache2_tests.rb"
-		if boolean_option('SUDO')
-			command = "#{PlatformInfo.ruby_sudo_command} -E #{command}"
-		end
-		if grep = string_option('E')
-			require 'shellwords'
-			command << " -e #{Shellwords.escape(grep)}"
-		end
-		sh "cd test && exec #{command}"
+	command = "bundle exec rspec -c -f s --tty integration_tests/apache2_tests.rb"
+	if boolean_option('SUDO')
+		command = "#{PlatformInfo.ruby_sudo_command} -E #{command}"
 	end
+	if grep = string_option('E')
+		require 'shellwords'
+		command << " -e #{Shellwords.escape(grep)}"
+	end
+	sh "cd test && exec #{command}"
 end
 
 dependencies = integration_test_dependencies(:_nginx)
 desc "Run Nginx integration tests"
 task 'test:integration:nginx' => dependencies do
-	if PlatformInfo.rspec.nil?
-		abort "RSpec is not installed for Ruby interpreter '#{PlatformInfo.ruby_command}'. Please install it."
-	else
-		command = "#{PlatformInfo.rspec} -c -f s integration_tests/nginx_tests.rb"
-		if boolean_option('SUDO')
-			command = "#{PlatformInfo.ruby_sudo_command} -E #{command}"
-		end
-		if grep = string_option('E')
-			require 'shellwords'
-			command << " -e #{Shellwords.escape(grep)}"
-		end
-		repeat = true
-		while repeat
-			sh "cd test && exec #{command}"
-			repeat = boolean_option('REPEAT')
-		end
+	command = "bundle exec rspec -c -f s --tty integration_tests/nginx_tests.rb"
+	if boolean_option('SUDO')
+		command = "#{PlatformInfo.ruby_sudo_command} -E #{command}"
+	end
+	if grep = string_option('E')
+		require 'shellwords'
+		command << " -e #{Shellwords.escape(grep)}"
+	end
+	repeat = true
+	while repeat
+		sh "cd test && exec #{command}"
+		repeat = boolean_option('REPEAT')
 	end
 end
 
 dependencies = integration_test_dependencies(:_nginx)
 desc "Run Passenger Standalone integration tests"
 task 'test:integration:standalone' => dependencies do
-	if PlatformInfo.rspec.nil?
-		abort "RSpec is not installed for Ruby interpreter '#{PlatformInfo.ruby_command}'. Please install it."
-	else
-		command = "#{PlatformInfo.rspec} -c -f s integration_tests/standalone_tests.rb"
-		if grep = string_option('E')
-			require 'shellwords'
-			command << " -e #{Shellwords.escape(grep)}"
-		end
-		sh "cd test && exec #{command}"
+	command = "bundle exec rspec -c -f s --tty integration_tests/standalone_tests.rb"
+	if grep = string_option('E')
+		require 'shellwords'
+		command << " -e #{Shellwords.escape(grep)}"
 	end
+	sh "cd test && exec #{command}"
 end
 
 desc "Run native packaging tests"
 task 'test:integration:native_packaging' do
-	if PlatformInfo.rspec.nil?
-		abort "RSpec is not installed for Ruby interpreter '#{PlatformInfo.ruby_command}'. Please install it."
-	end
-	command = "rspec -c -f s integration_tests/native_packaging_spec.rb"
+	command = "bundle exec rspec -c -f s --tty integration_tests/native_packaging_spec.rb"
 	if boolean_option('SUDO')
 		command = "#{PlatformInfo.ruby_sudo_command} -E #{command}"
 	end
@@ -141,7 +126,7 @@ task 'test:restart' => dependencies do
 	i = 1
 	while true do
 		puts "#{color_code_start}Test run #{i} (press Ctrl-C multiple times to abort)#{color_code_end}"
-		command = "rspec -c -f s integration_tests/apache2_tests.rb"
+		command = "bundle exec rspec -c -f s --tty integration_tests/apache2_tests.rb"
 		if grep = string_option('E')
 			command << " -e #{Shellwords.escape(grep)}"
 		end

data/build/misc.rb

@@ -147,24 +147,6 @@ task :contributors do
 	puts "Updated CONTRIBUTORS"
 end
 
-# Compile the WebHelper binary, used by Homebrew packaging.
-task :webhelper => :nginx do
-	require 'tmpdir'
-	require 'logger'
-	PhusionPassenger.require_passenger_lib 'utils/download'
-	Dir.mktmpdir do |path|
-		Utils::Download.download("http://nginx.org/download/nginx-#{PREFERRED_NGINX_VERSION}.tar.gz",
-			"#{path}/nginx.tar.gz")
-		sh "cd '#{path}' && tar xzf nginx.tar.gz"
-		sh "cd '#{path}/nginx-#{PREFERRED_NGINX_VERSION}' && " +
-			"./configure --prefix=/tmp " +
-			"#{STANDALONE_NGINX_CONFIGURE_OPTIONS} " +
-			"--add-module='#{Dir.pwd}/ext/nginx' && " +
-			"make"
-		sh "cp '#{path}/nginx-#{PREFERRED_NGINX_VERSION}/objs/nginx' '#{OUTPUT_DIR}PassengerWebHelper'"
-	end
-end
-
 dependencies = [
 	COMMON_LIBRARY.link_objects,
 	LIBBOOST_OXT,

data/build/nginx.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.
 #
@@ -40,11 +40,7 @@ task :_nginx => :nginx
 
 task :nginx_without_native_support => [
 	auto_generated_sources,
-	AGENT_OUTPUT_DIR + 'PassengerHelperAgent',
-	AGENT_OUTPUT_DIR + 'PassengerWatchdog',
-	AGENT_OUTPUT_DIR + 'PassengerLoggingAgent',
-	AGENT_OUTPUT_DIR + 'SpawnPreparer',
-	AGENT_OUTPUT_DIR + 'TempDirToucher',
+	AGENT_OUTPUT_DIR + AGENT_EXE,
 	COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).link_objects
 ].flatten
 

data/build/packaging.rb

@@ -182,13 +182,15 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 			puts "Initiating building of binaries"
 			Rake::Task['package:initiate_binaries_building'].invoke
 
-			puts "Initiating building of Debian packages"
-			Rake::Task['package:initiate_debian_building'].invoke
+			if !is_beta
+				puts "Initiating building of Debian packages"
+				Rake::Task['package:initiate_debian_building'].invoke
+			end
 
 			puts "Building OS X binaries..."
 			Rake::Task['package:build_osx_binaries'].invoke
 
-			if boolean_option('HOMEBREW_UPDATE', true)
+			if !is_beta && boolean_option('HOMEBREW_UPDATE', true)
 				if boolean_option('HOMEBREW_DRY_RUN', false)
 					puts "HOMEBREW_DRY_RUN set, not submitting pull request. Please find the repo in /tmp/homebrew."
 				else
@@ -221,8 +223,10 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 			puts "Initiating building of binaries"
 			Rake::Task['package:initiate_binaries_building'].invoke
 
-			puts "Initiating building of Debian packages"
-			Rake::Task['package:initiate_debian_building'].invoke
+			if !is_beta
+				puts "Initiating building of Debian packages"
+				Rake::Task['package:initiate_debian_building'].invoke
+			end
 
 			puts "Building OS X binaries..."
 			Rake::Task['package:build_osx_binaries'].invoke
@@ -384,11 +388,12 @@ task 'package:initiate_binaries_building' do
 	end
 
 	uri = URI.parse("https://oss-jenkins.phusion.nl/buildByToken/buildWithParameters?" +
-		"job=Passenger%20#{type}%20binaries%20(release)&token=#{jenkins_token}&tag=#{git_tag}")
+		"job=Passenger%20#{type}%20binaries%20(release)&tag=#{git_tag}")
 	http = Net::HTTP.new(uri.host, uri.port)
 	http.use_ssl = true
 	http.verify_mode = OpenSSL::SSL::VERIFY_PEER
 	request = Net::HTTP::Post.new(uri.request_uri)
+	request.set_form_data("token" => jenkins_token)
 	response = http.request(request)
 	if response.code != 200 && response.body != "Scheduled.\n"
 		abort "*** ERROR: Cannot initiate building of binaries:\n" +
@@ -431,11 +436,12 @@ task 'package:initiate_debian_building' do
 	end
 
 	uri = URI.parse("https://oss-jenkins.phusion.nl/buildByToken/buildWithParameters?" +
-		"job=Passenger%20#{type}%20Debian%20packages%20(release)&token=#{jenkins_token}&ref=#{git_tag}")
+		"job=Passenger%20#{type}%20Debian%20packages%20(release)&ref=#{git_tag}")
 	http = Net::HTTP.new(uri.host, uri.port)
 	http.use_ssl = true
 	http.verify_mode = OpenSSL::SSL::VERIFY_PEER
 	request = Net::HTTP::Post.new(uri.request_uri)
+	request.set_form_data("token" => jenkins_token)
 	response = http.request(request)
 	if response.code != 200 && response.body != "Scheduled.\n"
 		abort "*** ERROR: Cannot initiate building of Debian packages:\n" +
@@ -496,7 +502,7 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 	psg_nodelibdir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/node"
 	psg_libdir     = "#{fs_libdir}/#{GLOBAL_NAMESPACE_DIRNAME}"
 	psg_native_support_dir = ENV["RUBYARCHDIR"] || "#{fs_libdir}/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
-	psg_agents_dir = "#{fs_libdir}/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
+	psg_support_binaries_dir = "#{fs_libdir}/#{GLOBAL_NAMESPACE_DIRNAME}/support-binaries"
 	psg_helper_scripts_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
 	psg_resources_dir      = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}"
 	psg_include_dir        = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/include"
@@ -512,7 +518,7 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 	fake_nodelibdir = "#{fakeroot}#{psg_nodelibdir}"
 	fake_libdir     = "#{fakeroot}#{psg_libdir}"
 	fake_native_support_dir = "#{fakeroot}#{psg_native_support_dir}"
-	fake_agents_dir = "#{fakeroot}#{psg_agents_dir}"
+	fake_support_binaries_dir = "#{fakeroot}#{psg_support_binaries_dir}"
 	fake_helper_scripts_dir = "#{fakeroot}#{psg_helper_scripts_dir}"
 	fake_resources_dir = "#{fakeroot}#{psg_resources_dir}"
 	fake_include_dir   = "#{fakeroot}#{psg_include_dir}"
@@ -523,7 +529,7 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 	fake_ruby_extension_source_dir = "#{fakeroot}#{psg_ruby_extension_source_dir}"
 	fake_nginx_module_source_dir   = "#{fakeroot}#{psg_nginx_module_source_dir}"
 
-	native_packaging_method = ENV['NATIVE_PACKAGING_METHOD'] || "deb"
+	packaging_method = ENV['NATIVE_PACKAGING_METHOD'] || ENV['PACKAGING_METHOD'] || "deb"
 
 	sh "rm -rf #{fakeroot}"
 	sh "mkdir -p #{fakeroot}"
@@ -548,12 +554,12 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 	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"
+	# Support binaries
+	sh "mkdir -p #{fake_support_binaries_dir}"
+	sh "cp -R #{PhusionPassenger.support_binaries_dir}/* #{fake_support_binaries_dir}/"
+	sh "rm -rf #{fake_support_binaries_dir}/*.dSYM"
+	sh "rm -rf #{fake_support_binaries_dir}/*/*.dSYM"
+	sh "rm -rf #{fake_support_binaries_dir}/*.o"
 
 	# Helper scripts
 	sh "mkdir -p #{fake_helper_scripts_dir}"
@@ -566,14 +572,20 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 	# Headers necessary for building the Nginx module
 	sh "mkdir -p #{fake_include_dir}"
 	# Infer headers that the Nginx module needs
-	headers = [
-		["ext/common/Exceptions.h", "common/Exceptions.h"]
-	]
+	headers = []
 	Dir["ext/nginx/*.[ch]"].each do |filename|
 		File.read(filename).split("\n").grep(%r{#include "common/(.+)"}) do |match|
 			headers << ["ext/common/#{$1}", "common/#{$1}"]
 		end
 	end
+	# Manually add headers that could not be inferred through
+	# the above code
+	headers.concat([
+		["ext/common/Exceptions.h", "common/Exceptions.h"],
+		["ext/common/Utils/modp_b64.h", "common/Utils/modp_b64.h"],
+		["ext/common/Utils/modp_b64_data.h", "common/Utils/modp_b64_data.h"],
+		["ext/boost/detail/endian.hpp", "boost/detail/endian.hpp"]
+	])
 	headers.each do |header|
 		target = "#{fake_include_dir}/#{header[1]}"
 		dir = File.dirname(target)
@@ -621,10 +633,9 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 	puts "Creating #{fake_rubylibdir}/phusion_passenger/locations.ini"
 	File.open("#{fake_rubylibdir}/phusion_passenger/locations.ini", "w") do |f|
 		f.puts "[locations]"
-		f.puts "natively_packaged=true"
-		f.puts "native_packaging_method=#{native_packaging_method}"
+		f.puts "packaging_method=#{packaging_method}"
 		f.puts "bin_dir=#{psg_bindir}"
-		f.puts "agents_dir=#{psg_agents_dir}"
+		f.puts "support_binaries_dir=#{psg_support_binaries_dir}"
 		f.puts "lib_dir=#{psg_libdir}"
 		f.puts "helper_scripts_dir=#{psg_helper_scripts_dir}"
 		f.puts "resources_dir=#{psg_resources_dir}"