passenger 4.0.60 → 5.0.0.beta1

data/lib/phusion_passenger/common_library.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2012 Phusion
+#  Copyright (c) 2012-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -100,6 +100,10 @@ class CommonLibraryBuilder
 		return link_objects.join(' ')
 	end
 
+	def enable_optimizations!
+		@default_optimization_level = "-O"
+	end
+
 	def define_tasks(extra_compiler_flags = nil)
 		flags =  "-Iext -Iext/common #{LIBEV_CFLAGS} #{extra_compiler_flags} "
 		cflags = (flags + EXTRA_CFLAGS).strip
@@ -126,11 +130,26 @@ private
 			object_file = "#{@output_dir}/#{object_name}"
 
 			file(object_file => dependencies_for(options)) do
+				case options[:optimize]
+				when :light
+					optimize = "-O1"
+				when true, :heavy
+					optimize = "-O2"
+				when :very_heavy
+					optimize = "-O3"
+				when nil
+					optimize = @default_optimization_level
+				else
+					raise "Unknown optimization level #{options[:optimize]}"
+				end
+				if options[:strict_aliasing] == false
+					optimize = "#{optimize} -fno-strict-aliasing"
+				end
 				ensure_directory_exists(File.dirname(object_file))
 				if source_file =~ /\.c$/
-					compile_c(source_file, "#{cflags} -o #{object_file}")
+					compile_c(source_file, "#{optimize} #{cflags} -o #{object_file}".strip)
 				else
-					compile_cxx(source_file, "#{cxxflags} -o #{object_file}")
+					compile_cxx(source_file, "#{optimize} #{cxxflags} -o #{object_file}".strip)
 				end
 			end
 		end
@@ -171,7 +190,7 @@ private
 			# packaging the runtime ('passenger package-runtime') so we
 			# never generate static libraries.
 			library = "#{@output_dir}/#{category}.a"
-			
+
 			file(library => object_filenames) do
 				create_static_library(library, object_filenames.join(' '))
 			end
@@ -316,6 +335,7 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
 	define_component 'Logging.o',
 		:source   => 'Logging.cpp',
 		:category => :base,
+		:optimize => :light,
 		:deps     => %w(
 			Logging.cpp
 			Logging.h
@@ -335,11 +355,22 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
 	define_component 'Utils/StrIntUtils.o',
 		:source   => 'Utils/StrIntUtils.cpp',
 		:category => :base,
+		:optimize => :very_heavy,
+		:deps     => %w(
+			Utils/StrIntUtils.h
+		)
+	define_component 'Utils/StrIntUtilsNoStrictAliasing.o',
+		:source   => 'Utils/StrIntUtilsNoStrictAliasing.cpp',
+		:category => :base,
+		# Compiling with -O3 causes segfaults on RHEL 6
+		:optimize => :heavy,
+		:strict_aliasing => false,
 		:deps     => %w(
 			Utils/StrIntUtils.h
 		)
 	define_component 'Utils/IOUtils.o',
 		:source   => 'Utils/IOUtils.cpp',
+		:optimize => :light,
 		:category => :base,
 		:deps     => %w(
 			Utils/IOUtils.h
@@ -349,16 +380,17 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
 		:category => :base,
 		:deps     => %w(
 			Utils.h
-			Utils/Base64.h
 			Utils/StrIntUtils.h
 			ResourceLocator.h
 		)
 
-	define_component 'Utils/Base64.o',
-		:source   => 'Utils/Base64.cpp',
+	define_component 'Utils/modp_b64.o',
+		:source   => 'Utils/modp_b64.cpp',
 		:category => :other,
+		:optimize => true,
 		:deps     => %w(
-			Utils/Base64.h
+			Utils/modp_b64.h
+			Utils/modp_b64_data.h
 		)
 	define_component 'Utils/CachedFileStat.o',
 		:source   => 'Utils/CachedFileStat.cpp',
@@ -409,7 +441,6 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
 			AgentsStarter.h
 			ResourceLocator.h
 			MessageClient.h
-			ServerInstanceDir.h
 			Utils/IniFile.h
 			Utils/VariantMap.h
 		)
@@ -426,22 +457,56 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
 		:deps     => %w(
 			agents/LoggingAgent/FilterSupport.h
 		)
+	define_component 'MemoryKit/mbuf.o',
+		:source   => 'MemoryKit/mbuf.cpp',
+		:category => :other,
+		:optimize => true,
+		:deps     => %w(
+			MemoryKit/palloc.h
+		)
+	define_component 'MemoryKit/palloc.o',
+		:source   => 'MemoryKit/palloc.cpp',
+		:category => :other,
+		:optimize => true,
+		:deps     => %w(
+			MemoryKit/palloc.h
+		)
+	define_component 'MemoryKit/palloc.o',
+		:source   => 'MemoryKit/palloc.cpp',
+		:category => :other,
+		:optimize => true,
+		:deps     => %w(
+			MemoryKit/palloc.h
+		)
+	define_component 'ServerKit/http_parser.o',
+		:source   => 'ServerKit/http_parser.cpp',
+		:category => :other,
+		:optimize => :very_heavy,
+		:deps     => %w(
+			ServerKit/http_parser.h
+		)
+	define_component 'ServerKit/Implementation.o',
+		:source   => 'ServerKit/Implementation.cpp',
+		:category => :other,
+		:optimize => true
 	define_component 'Utils/MD5.o',
 		:source   => 'Utils/MD5.cpp',
 		:category => :other,
+		:optimize => true,
 		:deps     => %w(
 			Utils/MD5.h
 		)
-	define_component 'Utils/fib.o',
-		:source   => 'Utils/fib.c',
+	define_component 'Utils/Hasher.o',
+		:source   => 'Utils/Hasher.cpp',
 		:category => :other,
+		:optimize => :very_heavy,
 		:deps     => %w(
-			Utils/fib.h
-			Utils/fibpriv.h
+			Utils/Hasher.h
 		)
 	define_component 'Utils/jsoncpp.o',
 		:source   => 'Utils/jsoncpp.cpp',
 		:category => :other,
+		:optimize => true,
 		:deps     => %w(
 			Utils/json.h
 			Utils/json-forwards.h
@@ -456,4 +521,4 @@ end
 
 # Objects that must be linked into the Nginx binary.
 NGINX_LIBS_SELECTOR = [:base, 'AgentsStarter.o', 'ApplicationPool2/AppTypes.o',
-	'Utils/CachedFileStat.o', 'Utils/Base64.o', 'agents/LoggingAgent/FilterSupport.o']
+	'Utils/CachedFileStat.o', 'agents/LoggingAgent/FilterSupport.o']

data/lib/phusion_passenger/config/about_command.rb

@@ -30,7 +30,8 @@ module Config
 class AboutCommand < Command
 	def self.help
 		puts "Usage: passenger-config about <SUBCOMMAND>"
-		puts "Show information about #{PROGRAM_NAME}."
+		puts
+		puts "  Show information about #{PROGRAM_NAME}."
 		puts
 		puts "Available subcommands:"
 		puts "  root                     Show #{PROGRAM_NAME}'s root."
@@ -40,7 +41,7 @@ class AboutCommand < Command
 		puts "  nginx-libs               Show Nginx runtime library flags."
 		puts "  resourcesdir             Show #{PROGRAM_NAME}'s resources directory."
 		puts "  compiled                 Check whether runtime libraries are compiled."
-		puts "  natively-packaged        Check whether Phusion Passenger is natively"
+		puts "  custom-packaged          Check whether Phusion Passenger is custom"
 		puts "                           packaged."
 		puts "  installed-from-release-package  Check whether this installation came from"
 		puts "                                  an official release package."
@@ -65,7 +66,7 @@ class AboutCommand < Command
 
 		case subcommand
 		when "--root"
-			puts PhusionPassenger.source_root
+			puts PhusionPassenger.install_spec
 		when "--ruby-libdir"
 			puts PhusionPassenger.ruby_libdir
 		when "--includedir"
@@ -87,8 +88,8 @@ class AboutCommand < Command
 			else
 				exit 1
 			end
-		when "--natively-packaged"
-			if PhusionPassenger.natively_packaged?
+		when "--custom-packaged"
+			if PhusionPassenger.custom_packaged?
 				exit 0
 			else
 				exit 1
@@ -100,20 +101,20 @@ class AboutCommand < Command
 				exit 1
 			end
 		when "--make-locations-ini"
-			if @argv[1] =~ /^--for-native-packaging-method=(.*)/
-				native_packaging_method = $1
+			if @argv[1] =~ /^--for-(native-)?packaging-method=(.*)/
+				packaging_method = $2
 			else
-				native_packaging_method = nil
+				packaging_method = nil
 			end
-			
+
 			puts "[locations]"
-			if native_packaging_method
-				puts "natively_packaged=true"
-				puts "native_packaging_method=#{native_packaging_method}"
+			if packaging_method
+				puts "packaging_method=#{packaging_method}"
 			else
-				puts "natively_packaged=#{PhusionPassenger.natively_packaged?}"
-				if PhusionPassenger.natively_packaged?
-					puts "native_packaging_method=#{PhusionPassenger.native_packaging_method}"
+				if PhusionPassenger.custom_packaged?
+					puts "packaging_method=#{PhusionPassenger.packaging_method}"
+				else
+					puts "packaging_method=unknown"
 				end
 			end
 			PhusionPassenger::REQUIRED_LOCATIONS_INI_FIELDS.each do |field|
@@ -121,14 +122,7 @@ class AboutCommand < Command
 			end
 			PhusionPassenger::OPTIONAL_LOCATIONS_INI_FIELDS.each do |field|
 				value = PhusionPassenger.send(field)
-				should_print = value &&
-					(!ORIGINALLY_PACKAGED_LOCATIONS_INI_FIELDS.include?(field) || (
-						PhusionPassenger.originally_packaged? &&
-						!native_packaging_method
-					))
-				if should_print
-					puts "#{field}=#{value}"
-				end
+				puts "#{field}=#{value}" if value
 			end
 		when "--detect-apache2"
 			PhusionPassenger.require_passenger_lib 'platform_info/apache_detector'

data/lib/phusion_passenger/config/admin_command_command.rb

@@ -0,0 +1,175 @@
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2014 Phusion
+#
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+require 'optparse'
+require 'net/http'
+require 'socket'
+PhusionPassenger.require_passenger_lib 'constants'
+PhusionPassenger.require_passenger_lib 'admin_tools/instance_registry'
+PhusionPassenger.require_passenger_lib 'config/command'
+PhusionPassenger.require_passenger_lib 'config/utils'
+PhusionPassenger.require_passenger_lib 'utils/json'
+
+module PhusionPassenger
+module Config
+
+class AdminCommandCommand < Command
+	include PhusionPassenger::Config::Utils
+
+	def self.create_default_options
+		return { :socket => "server_admin" }
+	end
+
+	def run
+		parse_options
+		initialize_objects
+		select_passenger_instance
+		invoke
+	end
+
+private
+	def self.create_option_parser(options)
+		OptionParser.new do |opts|
+			nl = "\n" + ' ' * 37
+			opts.banner = "Usage: passenger-config invoke-command <METHOD> <PATH> [OPTIONS]\n"
+			opts.separator ""
+			opts.separator "  Invoke an internal #{PROGRAM_NAME} admin command. #{PROGRAM_NAME} listens"
+			opts.separator "  on a local HTTP server for admin commands. Other `passenger-config` commands"
+			opts.separator "  are just shortcuts for sending specific HTTP requests to the"
+			opts.separator "  #{PROGRAM_NAME} admin HTTP server. `passenger-config invoke-command` allows"
+			opts.separator "  you to send requests directly."
+			opts.separator ""
+			opts.separator "  METHOD is an HTTP verb, like 'GET', 'POST', 'PUT' or 'DELETE'."
+			opts.separator "  PATH is the admin URI. You can pass POST data with '-d'."
+			opts.separator ""
+			opts.separator "  Example: passenger-config admin-command GET /server.json"
+			opts.separator "  Sends the 'GET /server.json' command to the HTTP server agent."
+			opts.separator ""
+			opts.separator "  Example: passenger-config admin-command PUT /config.json \\"
+			opts.separator "           -d '{\"log_level\", 7}'"
+			opts.separator "  Sends the 'PUT /config.json' command to the HTTP server agent, with the"
+			opts.separator "  given PUT data."
+			opts.separator ""
+			opts.separator "  Example: passenger-config admin-command POST /shutdown.json -a watchdog"
+			opts.separator "  Sends the 'POST /shutdown.json' command to the watchdog, with no POST data."
+			opts.separator ""
+
+			opts.separator "Options:"
+			opts.on("-d", "--data DATA", String, "Specify HTTP request body data") do |value|
+				options[:data] = value
+			end
+			opts.on("-i", "--stdin", "Read HTTP request body data from stdin") do
+				options[:data_source] = :stdin
+			end
+			opts.on("-f", "--data-file", String, "Read HTTP request body data from the given#{nl}" +
+				"file") do |value|
+				options[:data_source] = value
+			end
+			opts.on("-a", "--agent", String, "The name of the socket to send the command#{nl}" +
+				"to. This specifies which agent the request#{nl}" +
+				"is sent to. Choices: watchdog,#{nl}" +
+				"server_admin, logging_admin.#{nl}" +
+				"Default: server_admin") do |val|
+				options[:socket] = val
+			end
+			opts.on("--show-headers", "Show HTTP response headers") do
+				options[:show_headers] = true
+			end
+			opts.on("--ignore-response-code", "Exit successfully even if a non-2xx response was returned") do
+				options[:ignore_response_code] = true
+			end
+			opts.on("--instance NAME", String, "The #{PROGRAM_NAME} instance to select") do |value|
+				options[:instance] = value
+			end
+			opts.on("-h", "--help", "Show this help") do
+				options[:help] = true
+			end
+		end
+	end
+
+	def initialize_objects
+		if @argv.size != 2
+			abort "You've passed to few arguments. See --help for more information."
+		end
+
+		@method = @argv[0]
+		@path   = @argv[1]
+
+		case @method.upcase
+		when "GET"
+			@request = Net::HTTP::Get.new(@path)
+		when "POST"
+			@request = Net::HTTP::Post.new(@path)
+		when "PUT"
+			@request = Net::HTTP::Put.new(@path)
+		when "DELETE"
+			@request = Net::HTTP::Delete.new(@path)
+		else
+			abort "Unknown method #{@method.inspect}. Please specify either GET, POST, PUT or DELETE."
+		end
+		if @path !~ /\A\//
+			abort "The path must start with a slash (/). See --help for more information."
+		end
+
+		if @options[:data] && @options[:data_source]
+			abort "You cannot specify both --data and --stdin/--data-file. Please choose either one."
+		end
+		if @options[:data_source] == :stdin
+			STDIN.binmode
+			@options[:data] = STDIN.read
+		elsif @options[:data_source]
+			File.open(@options[:data_source], "rb") do |f|
+				@options[:data] = f.read
+			end
+		end
+	end
+
+	def invoke
+		password = obtain_full_admin_password(@instance)
+		@request.basic_auth("admin", password)
+		@request["connection"] = "close"
+		if @options[:data]
+			@request.content_type = "application/json"
+			@request.body = @options[:data]
+		end
+		response = @instance.http_request("agents.s/#{@options[:socket]}", @request)
+		if @options[:show_headers]
+			print_headers(response)
+		end
+		puts response.body
+		if !@options[:ignore_response_code] && response.code.to_i / 100 != 2
+			abort
+		end
+	end
+
+	def print_headers(response)
+		puts "HTTP/1.1 #{response.message} #{response.code}"
+		response.each_header do |name, val|
+			puts "#{name}: #{val}"
+		end
+		puts
+	end
+end
+
+end # module Config
+end # module PhusionPassenger

data/lib/phusion_passenger/config/agent_compiler.rb

@@ -0,0 +1,170 @@
+#  encoding: utf-8
+#
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2010-2014 Phusion
+#
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+require 'fileutils'
+require 'logger'
+PhusionPassenger.require_passenger_lib 'constants'
+PhusionPassenger.require_passenger_lib 'abstract_installer'
+PhusionPassenger.require_passenger_lib 'config/installation_utils'
+PhusionPassenger.require_passenger_lib 'platform_info'
+PhusionPassenger.require_passenger_lib 'utils/shellwords'
+PhusionPassenger.require_passenger_lib 'utils/progress_bar'
+PhusionPassenger.require_passenger_lib 'utils/tmpio'
+
+module PhusionPassenger
+module Config
+
+class AgentCompiler < AbstractInstaller
+protected
+	def dependencies
+		specs = [
+			'depcheck_specs/compiler_toolchain',
+			'depcheck_specs/ruby',
+			'depcheck_specs/gems',
+			'depcheck_specs/libs',
+			'depcheck_specs/utilities'
+		]
+		ids = [
+			'cc',
+			'c++',
+			'rake',
+			'libcurl-dev',
+			'openssl-dev',
+			'zlib-dev'
+		].compact
+		return [specs, ids]
+	end
+
+	def users_guide_path
+		return PhusionPassenger.standalone_doc_path
+	end
+
+	def users_guide_url
+		return STANDALONE_DOC_URL
+	end
+
+	def run_steps
+		check_source_code_available!
+		if !@force
+			check_whether_os_is_broken
+			check_whether_system_has_enough_ram
+			InstallationUtils.check_for_download_tool!
+		end
+		check_dependencies(false) || abort
+		puts
+
+		@destdir = InstallationUtils.find_or_create_writable_support_binaries_dir!
+		confirm_enable_optimizations
+		compile_agent
+	end
+
+	def before_install
+		super
+		if !@working_dir
+			@working_dir = PhusionPassenger::Utils.mktmpdir("passenger-install.", PlatformInfo.tmpexedir)
+			@owns_working_dir = true
+		end
+	end
+
+	def after_install
+		super
+		FileUtils.remove_entry_secure(@working_dir) if @owns_working_dir
+	end
+
+private
+	def check_source_code_available!
+		if PhusionPassenger.build_system_dir.nil?
+			puts "<red>Cannot compile agent binary</red>"
+			puts
+			puts "This #{PROGRAM_NAME} installation does not " +
+				"come with any source code, so the agent binary cannot " +
+				"be compiled. So instead, please try to download a " +
+				"precompiled agent binary from the #{PROGRAM_NAME} website, " +
+				"by running:\n\n" +
+				"  <b>passenger-config download-agent</b>"
+			abort
+		end
+	end
+
+	def confirm_enable_optimizations
+		if @auto
+			if @optimize
+				puts "Compiling with optimizations."
+			else
+				puts "Not compiling with optimizations."
+			end
+		else
+			if @optimize
+				puts "Compiling with optimizations."
+			else
+				new_screen
+				render_template 'config/agent_compiler/confirm_enable_optimizations',
+					:total_ram => total_ram_gb
+				puts
+				@optimize = prompt_confirmation('Compile with optimizations?')
+				puts
+			end
+		end
+	end
+
+	def compile_agent
+		puts "<banner>Compiling #{PROGRAM_NAME} agent...</banner>"
+		progress_bar = ProgressBar.new
+		e_working_dir = Shellwords.escape(@working_dir)
+		args = "#{e_working_dir}/support-binaries/#{AGENT_EXE}" +
+			" CACHING=false" +
+			" OUTPUT_DIR=#{e_working_dir} "
+			" OPTIMIZE=#{!!@optimize}"
+		begin
+			progress_bar.set(0)
+			Dir.chdir(PhusionPassenger.build_system_dir) do
+				InstallationUtils.run_rake_task!(args) do |progress, total|
+					progress_bar.set(0.05 + (progress / total.to_f) * 0.95)
+				end
+			end
+			progress_bar.set(1)
+		ensure
+			progress_bar.finish
+		end
+
+		FileUtils.cp("#{@working_dir}/support-binaries/#{AGENT_EXE}",
+			"#{@destdir}/#{AGENT_EXE}")
+		puts "<green>Compilation finished!</green>"
+	end
+
+	def total_ram_gb
+		begin
+			meminfo = File.read("/proc/meminfo")
+			if meminfo =~ /^MemTotal: *(\d+) kB$/
+				return sprintf("%.1f", $1.to_i / 1024 / 1024)
+			end
+		rescue Errno::ENOENT, Errno::EACCES
+			# Don't do anything on systems without memory information.
+			return nil
+		end
+	end
+end
+
+end # module Standalone
+end # module PhusionPassenger