passenger 3.9.2.beta → 4.0.0.rc4

data/build/common_library.rb

@@ -21,6 +21,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+require 'phusion_passenger/platform_info/cxx_portability'
+
 ########## Phusion Passenger common library ##########
 
 require 'phusion_passenger/common_library'
@@ -198,5 +200,6 @@ end
 
 libboost_oxt_cflags = ""
 libboost_oxt_cflags << " -faddress-sanitizer" if USE_ASAN
+libboost_oxt_cflags.strip!
 LIBBOOST_OXT = define_libboost_oxt_task("common", COMMON_OUTPUT_DIR + "libboost_oxt", libboost_oxt_cflags)
-COMMON_LIBRARY.define_tasks
+COMMON_LIBRARY.define_tasks(libboost_oxt_cflags)

data/build/cplusplus_support.rb

@@ -23,11 +23,11 @@
 
 # Rake functions for compiling/linking C++ stuff.
 
-def compile_c(source, flags = "#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}")
+def compile_c(source, flags = "#{EXTRA_PRE_CFLAGS} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}")
 	sh "#{CC} #{flags} -c #{source}"
 end
 
-def compile_cxx(source, flags = "#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}")
+def compile_cxx(source, flags = "#{EXTRA_PRE_CXXFLAGS} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}")
 	sh "#{CXX} #{flags} -c #{source}"
 end
 
@@ -43,15 +43,15 @@ def create_static_library(target, sources)
 	sh "ranlib #{target}"
 end
 
-def create_executable(target, sources, linkflags = "#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}")
+def create_executable(target, sources, linkflags = "#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_LDFLAGS} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}")
 	sh "#{CXX} #{sources} -o #{target} #{linkflags}"
 end
 
-def create_c_executable(target, sources, linkflags = "#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}")
+def create_c_executable(target, sources, linkflags = "#{EXTRA_PRE_CFLAGS} #{EXTRA_PRE_LDFLAGS} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}")
 	sh "#{CC} #{sources} -o #{target} #{linkflags}"
 end
 
-def create_shared_library(target, sources, flags = "#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}")
+def create_shared_library(target, sources, flags = "#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_LDFLAGS} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}")
 	if RUBY_PLATFORM =~ /darwin/
 		shlib_flag = "-flat_namespace -bundle -undefined dynamic_lookup"
 	else

data/build/cxx_tests.rb

@@ -43,7 +43,9 @@ TEST_CXX_OBJECTS = {
 		test/cxx/TestSupport.cpp
 		test/cxx/TestSupport.h
 		ext/common/SafeLibev.h
-		ext/common/BackgroundEventLoop.cpp),
+		ext/common/BackgroundEventLoop.cpp
+		ext/common/Exceptions.h
+		ext/common/Utils.h),
 	'test/cxx/ApplicationPool2/OptionsTest.o' => %w(
 		test/cxx/ApplicationPool2/OptionsTest.cpp
 		ext/common/ApplicationPool2/Options.h),
@@ -53,14 +55,16 @@ TEST_CXX_OBJECTS = {
 		ext/common/ApplicationPool2/Options.h
 		ext/common/ApplicationPool2/Process.h
 		ext/common/ApplicationPool2/Socket.h
-		ext/common/ApplicationPool2/Spawner.h),
+		ext/common/ApplicationPool2/Spawner.h
+		ext/common/ApplicationPool2/DirectSpawner.h),
 	'test/cxx/ApplicationPool2/SmartSpawnerTest.o' => %w(
 		test/cxx/ApplicationPool2/SmartSpawnerTest.cpp
 		test/cxx/ApplicationPool2/SpawnerTestCases.cpp
 		ext/common/ApplicationPool2/Options.h
 		ext/common/ApplicationPool2/Process.h
 		ext/common/ApplicationPool2/Socket.h
-		ext/common/ApplicationPool2/Spawner.h),
+		ext/common/ApplicationPool2/Spawner.h
+		ext/common/ApplicationPool2/SmartSpawner.h),
 	'test/cxx/ApplicationPool2/ProcessTest.o' => %w(
 		test/cxx/ApplicationPool2/ProcessTest.cpp
 		ext/common/ApplicationPool2/Process.h
@@ -71,7 +75,14 @@ TEST_CXX_OBJECTS = {
 		ext/common/ApplicationPool2/SuperGroup.h
 		ext/common/ApplicationPool2/Group.h
 		ext/common/ApplicationPool2/Pool.h
-		ext/common/ApplicationPool2/Spawner.h),
+		ext/common/ApplicationPool2/Process.h
+		ext/common/ApplicationPool2/Socket.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/MessageReadersWritersTest.o' => %w(
 		test/cxx/MessageReadersWritersTest.cpp
 		ext/common/MessageReadersWriters.h
@@ -133,7 +144,12 @@ TEST_CXX_OBJECTS = {
 		ext/common/ApplicationPool2/SuperGroup.h
 		ext/common/ApplicationPool2/Group.h
 		ext/common/ApplicationPool2/Process.h
-		ext/common/ApplicationPool2/Spawner.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),
@@ -171,7 +187,8 @@ TEST_CXX_OBJECTS = {
 		ext/common/Utils/VariantMap.h),
 	'test/cxx/StringMapTest.o' => %w(
 		test/cxx/StringMapTest.cpp
-		ext/common/Utils/StringMap.h),
+		ext/common/Utils/StringMap.h
+		ext/common/Utils/HashMap.h),
 	'test/cxx/ProcessMetricsCollectorTest.o' => %w(
 		test/cxx/ProcessMetricsCollectorTest.cpp
 		ext/common/Utils/ProcessMetricsCollector.h),
@@ -189,10 +206,10 @@ TEST_CXX_OBJECTS = {
 dependencies = [
 	'test/cxx/CxxTestMain',
 	'test/support/allocate_memory',
-	:native_support,
+	NATIVE_SUPPORT_TARGET,
 	AGENT_OUTPUT_DIR + 'SpawnPreparer',
 	AGENT_OUTPUT_DIR + 'EnvPrinter'
-]
+].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}" }
@@ -202,6 +219,9 @@ task 'test:cxx' => dependencies do
 	elsif boolean_option('VALGRIND')
 		command = "valgrind --dsymutil=yes --db-attach=yes --child-silent-after-fork=yes #{command}"
 	end
+	if boolean_option('SUDO')
+		command = "sudo #{command}"
+	end
 	if boolean_option('REPEAT')
 		if boolean_option('GDB')
 			abort "You cannot set both REPEAT=1 and GDB=1."

data/build/integration_tests.rb

@@ -27,8 +27,9 @@ desc "Run all integration tests"
 task 'test:integration' => ['test:integration:apache2', 'test:integration:nginx'] do
 end
 
+dependencies = [:apache2, NATIVE_SUPPORT_TARGET].compact
 desc "Run Apache 2 integration tests"
-task 'test:integration:apache2' => [:apache2, :native_support] do
+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
@@ -38,8 +39,9 @@ task 'test:integration:apache2' => [:apache2, :native_support] do
 	end
 end
 
+dependencies = [:nginx, NATIVE_SUPPORT_TARGET].compact
 desc "Run Nginx integration tests"
-task 'test:integration:nginx' => :nginx do
+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
@@ -49,8 +51,9 @@ task 'test:integration:nginx' => :nginx do
 	end
 end
 
+dependencies = [:apache2, NATIVE_SUPPORT_TARGET].compact
 desc "Run the 'restart' integration test infinitely, and abort if/when it fails"
-task 'test:restart' => [:apache2, :native_support] do
+task 'test:restart' => dependencies do
 	Dir.chdir("test") do
 		color_code_start = "\e[33m\e[44m\e[1m"
 		color_code_end = "\e[0m"

data/build/nginx.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -24,8 +24,8 @@
 desc "Build Nginx support files"
 task :nginx => [
 	:nginx_without_native_support,
-	:native_support
-]
+	NATIVE_SUPPORT_TARGET
+].compact
 
 task :nginx_without_native_support => [
 	AGENT_OUTPUT_DIR + 'PassengerHelperAgent',

data/build/packaging.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.
 #
@@ -21,6 +21,11 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+task :clobber => 'package:clean'
+
+desc "Build the gem and tarball"
+task 'package' => ['package:gem', 'package:tarball']
+
 task 'package:check' do
 	require 'phusion_passenger'
 	
@@ -30,68 +35,46 @@ task 'package:check' do
 	end
 end
 
-spec = Gem::Specification.new do |s|
-	s.platform = Gem::Platform::RUBY
-	s.homepage = "https://www.phusionpassenger.com/"
-	s.summary = "Easy and robust Ruby web application deployment"
-	s.name = "passenger"
-	s.version = VERSION_STRING
-	s.rubyforge_project = "passenger"
-	s.author = "Phusion - http://www.phusion.nl/"
-	s.email = "info@phusion.nl"
-	s.require_paths = ["lib"]
-	s.add_dependency 'rake', '>= 0.8.1'
-	s.add_dependency 'fastthread', '>= 1.0.1'
-	s.add_dependency 'daemon_controller', '>= 1.1.0'
-	s.add_dependency 'rack'
-	s.files = FileList[*Packaging::GLOB] - FileList[*Packaging::EXCLUDE_GLOB]
-	s.executables = Packaging::USER_EXECUTABLES + Packaging::SUPER_USER_EXECUTABLES
-	s.description = "Easy and robust Ruby web application deployment."
+desc "Build the gem"
+task 'package:gem' => [:doc, 'package:check'] do
+	require 'phusion_passenger'
+	sh "gem build #{PhusionPassenger::PACKAGE_NAME}.gemspec"
+	sh "mkdir -p pkg"
+	sh "mv #{PhusionPassenger::PACKAGE_NAME}-#{PhusionPassenger::VERSION_STRING}.gem pkg/"
 end
 
-Rake::GemPackageTask.new(spec) do |pkg|
-	pkg.need_tar_gz = true
-end
+desc "Build the tarball"
+task 'package:tarball' => [:doc, 'package:check'] do
+	require 'phusion_passenger'
+	require 'fileutils'
 
-task 'package:filelist' do
-	# The package:filelist task is used by Phusion Passenger Lite
-	# to obtain a list of files that it must copy to a temporary
-	# directory in order to compile Nginx and to compile Phusion
-	# Passenger. The original Phusion Passenger sources might not
-	# be writiable, e.g. when installed via a gem as root, hence
-	# the reason for copying.
-	#
-	# The Asciidoc HTML files are in the packaging list, but
-	# they're auto-generated and aren't included in the source
-	# repository, so here we ensure that they exist. This is
-	# generally only for people who are developing Phusion
-	# Passenger itself; users who installed Phusion Passenger
-	# via a gem, tarball or native package already have the
-	# HTML files.
-	#
-	# The reason why we don't just specify Packaging::ASCII_DOCS
-	# as a task dependency is because we only want to generate
-	# the HTML files if they don't already exist; we don't want
-	# to regenerate if they exist but their source .txt files
-	# are modified. When the user installs Phusion Passenger
-	# via a gem/tarball/package, all file timestamps are set
-	# to the current clock time, which could lead Rake into
-	# thinking that the source .txt files are modified. Since
-	# the user probably has no write permission to the original
-	# Phusion Passenger sources we want to avoid trying to
-	# regenerate the HTML files.
-	Packaging::ASCII_DOCS.each do |ascii_doc|
-		Rake::Task[ascii_doc].invoke if !File.exist?(ascii_doc)
+	basename = "#{PhusionPassenger::PACKAGE_NAME}-#{PhusionPassenger::VERSION_STRING}"
+	sh "rm -rf pkg/#{basename}"
+	sh "mkdir -p pkg/#{basename}"
+	files = Dir[*PhusionPassenger::Packaging::GLOB] -
+		Dir[*PhusionPassenger::Packaging::EXCLUDE_GLOB]
+	files.each_with_index do |filename, i|
+		dir = File.dirname(filename)
+		if !File.exist?("pkg/#{basename}/#{dir}")
+			FileUtils.mkdir_p("pkg/#{basename}/#{dir}")
+		end
+		if !File.directory?(filename)
+			FileUtils.install(filename, "pkg/#{basename}/#{filename}")
+		end
+		printf "\r[%5d/%5d] [%3.0f%%] Copying files...", i, files.size, i * 100.0 / files.size
+		STDOUT.flush
 	end
-	puts spec.files
+	puts
+	sh "cd pkg && tar -c #{basename} | gzip --best > #{basename}.tar.gz"
+	sh "rm -rf pkg/#{basename}"
 end
 
-Rake::Task['package'].prerequisites.unshift(:doc)
-Rake::Task['package'].prerequisites.unshift('package:check')
-Rake::Task['package:gem'].prerequisites.unshift(:doc)
-Rake::Task['package:gem'].prerequisites.unshift('package:check')
-Rake::Task['package:force'].prerequisites.unshift(:doc)
-task :clobber => :'package:clean'
+desc "Remove gem and tarball"
+task 'package:clean' do
+	require 'phusion_passenger'
+	sh "rm -f #{PhusionPassenger::PACKAGE_NAME}-#{PhusionPassenger::VERSION_STRING}.gem"
+	sh "rm -f #{PhusionPassenger::PACKAGE_NAME}-#{PhusionPassenger::VERSION_STRING}.tar.gz"
+end
 
 desc "Create a fakeroot, useful for building native packages"
 task :fakeroot => [:apache2, :nginx] + Packaging::ASCII_DOCS do
@@ -175,3 +158,58 @@ task 'package:debian' => 'package:check' do
 	
 	sh "debuild"
 end
+
+desc "Sign all packaged files"
+task 'package:sign' => 'package:check' do
+	require 'phusion_passenger'
+	begin
+		require 'highline'
+	rescue LoadError
+		abort "Please run `gem install highline` first."
+	end
+	h = HighLine.new
+	password = h.ask("Password for software-signing@phusion.nl GPG key: ") { |q| q.echo = false }
+	begin
+		File.open(".gpg-password", "w", 0600) do |f|
+			f.write(password)
+		end
+		version = PhusionPassenger::VERSION_STRING
+		["passenger-#{version}.gem",
+		 "passenger-#{version}.tar.gz",
+		 "passenger-enterprise-server-#{version}.gem",
+		 "passenger-enterprise-server-#{version}.tar.gz"].each do |name|
+			if File.exist?("pkg/#{name}")
+				sh "gpg --sign --detach-sign --passphrase-file .gpg-password --local-user software-signing@phusion.nl --armor pkg/#{name}"
+			end
+		end
+	ensure
+		File.unlink('.gpg-password') if File.exist?('.gpg-password')
+	end
+end
+
+desc "Upload packages and signatures"
+task 'package:upload' => ['package', 'package:sign'] do
+	require 'phusion_passenger'
+	version = PhusionPassenger::VERSION_STRING
+
+	signatures = []
+	["passenger-#{version}.gem.asc",
+	 "passenger-#{version}.tar.gz.asc",
+	 "passenger-enterprise-server-#{version}.gem.asc",
+	 "passenger-enterprise-server-#{version}.tar.gz.asc"].each do |name|
+		if File.exist?("pkg/#{name}")
+			signatures << "pkg/#{name}"
+		end
+	end
+	sh "scp #{signatures.join(' ')} app@shell.phusion.nl:/u/apps/signatures/phusion-passenger/"
+
+	if File.exist?("pkg/passenger-#{version}.gem")
+		#sh "gem push pkg/passenger-#{version}.gem"
+	end
+
+	if File.exist?("pkg/passenger-#{version}.tar.gz")
+		puts "--------------"
+		puts "All done. Please upload pkg/passenger-#{version}.tar.gz " +
+			"to RubyForge and update the version number in the Phusion Passenger website."
+	end
+end

data/build/ruby_extension.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -21,28 +21,41 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-output_dir  = RUBY_EXTENSION_OUTPUT_DIR
-output_name = "passenger_native_support.#{LIBEXT}"
-source_dir  = "ext/ruby"
+if RUBY_PLATFORM =~ /java/
+	NATIVE_SUPPORT_TARGET = nil
 
-task :native_support => "#{output_dir}/#{output_name}"
-task :clean => 'native_support:clean'
+	task :native_support do
+		# Do nothing.
+	end
 
-dependencies = [
-	"#{output_dir}/Makefile",
-	"#{source_dir}/passenger_native_support.c"
-]
-file("#{output_dir}/#{output_name}" => dependencies) do
-	sh "mkdir -p '#{output_dir}'" if !File.exist?(output_dir)
-	sh "cd '#{output_dir}' && make"
-end
+	task 'native_support:clean' do
+		# Do nothing.
+	end
+else
+	output_dir  = RUBY_EXTENSION_OUTPUT_DIR
+	output_name = "passenger_native_support.#{LIBEXT}"
+	source_dir  = "ext/ruby"
+	NATIVE_SUPPORT_TARGET = "#{output_dir}/#{output_name}"
 
-file "#{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}'"
-end
+	task :native_support => "#{output_dir}/#{output_name}"
+	task :clean => 'native_support:clean'
+
+	dependencies = [
+		"#{output_dir}/Makefile",
+		"#{source_dir}/passenger_native_support.c"
+	]
+	file("#{output_dir}/#{output_name}" => 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
+		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}'"
+	end
 
-task 'native_support:clean' do
-	sh "echo rm -rf #{output_dir}"
+	task 'native_support:clean' do
+		sh "echo rm -rf #{output_dir}"
+	end
 end

data/build/ruby_tests.rb

@@ -23,8 +23,9 @@
 
 ### Ruby components tests ###
 
+dependencies = [NATIVE_SUPPORT_TARGET, AGENT_OUTPUT_DIR + 'PassengerLoggingAgent'].compact
 desc "Run unit tests for the Ruby libraries"
-task 'test:ruby' => [:native_support, AGENT_OUTPUT_DIR + 'PassengerLoggingAgent'] do
+task 'test:ruby' => dependencies do
 	if PlatformInfo.rspec.nil?
 		abort "RSpec is not installed for Ruby interpreter '#{PlatformInfo.ruby_command}'. Please install it."
 	else
@@ -34,8 +35,9 @@ task 'test:ruby' => [:native_support, AGENT_OUTPUT_DIR + 'PassengerLoggingAgent'
 	end
 end
 
+dependencies = [NATIVE_SUPPORT_TARGET].compact
 desc "Run coverage tests for the Ruby libraries"
-task 'test:rcov' => :native_support do
+task 'test:rcov' => dependencies do
 	if PlatformInfo.rspec.nil?
 		abort "RSpec is not installed for Ruby interpreter '#{PlatformInfo.ruby_command}'. Please install it."
 	else