passenger 5.0.0.beta3 → 5.0.0.rc1

data/lib/phusion_passenger/config/compile_nginx_engine_command.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014 Phusion
+#  Copyright (c) 2014-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -28,85 +28,100 @@ PhusionPassenger.require_passenger_lib 'config/nginx_engine_compiler'
 PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
 
 module PhusionPassenger
-module Config
+  module Config
 
-class CompileNginxEngineCommand < Command
-	include InstallationUtils
+    class CompileNginxEngineCommand < Command
+      include InstallationUtils
 
-	def run
-		@options = { :colorize => :auto, :force_tip => true }
-		parse_options
-		initialize_objects
-		sanity_check
-		if !NginxEngineCompiler.new(@options).run
-			abort
-		end
-	end
+      def run
+        @options = {
+          :colorize => :auto,
+          :force_tip => true,
+          :connect_timeout => 30,
+          :idle_timeout => 30
+        }
+        parse_options
+        initialize_objects
+        sanity_check
+        if !NginxEngineCompiler.new(@options).run
+          abort
+        end
+      end
 
-private
-	def self.create_option_parser(options)
-		OptionParser.new do |opts|
-			nl = "\n" + ' ' * 37
-			opts.banner = "Usage: passenger-config compile-nginx-engine [OPTIONS]\n"
-			opts.separator ""
-			opts.separator "  Compile an Nginx engine, for use in #{PROGRAM_NAME} Standalone."
-			opts.separator ""
+    private
+      def self.create_option_parser(options)
+        OptionParser.new do |opts|
+          nl = "\n" + ' ' * 37
+          opts.banner = "Usage: passenger-config compile-nginx-engine [OPTIONS]\n"
+          opts.separator ""
+          opts.separator "  Compile an Nginx engine, for use in #{PROGRAM_NAME} Standalone."
+          opts.separator ""
 
-			opts.separator "Options:"
-			opts.on("--working-dir PATH", String, "Store temporary files in the given#{nl}" +
-				"directory, instead of creating one") do |val|
-				options[:working_dir] = val
-			end
-			opts.on("--nginx-version VERSION", String, "Nginx version to compile. " +
-				"Default: #{PREFERRED_NGINX_VERSION}") do |val|
-				options[:nginx_version] = val
-			end
-			opts.on("--nginx-tarball PATH", String, "Use the given Nginx tarball instead of#{nl}" +
-				"downloading it. You MUST also specify the#{nl}" +
-				"Nginx version with --nginx-version") do |val|
-				options[:nginx_tarball] = val
-			end
-			opts.on("-f", "--force", "Skip sanity checks") do
-				options[:force] = true
-			end
-			opts.on("--no-force-tip", "Do not print any tips regarding the --force parameter") do
-				options[:force_tip] = false
-			end
-			opts.on("-h", "--help", "Show this help") do
-				options[:help] = true
-			end
-		end
-	end
+          opts.separator "Options:"
+          opts.on("--working-dir PATH", String, "Store temporary files in the given#{nl}" +
+            "directory, instead of creating one") do |val|
+            options[:working_dir] = val
+          end
+          opts.on("--nginx-version VERSION", String, "Nginx version to compile. " +
+            "Default: #{PREFERRED_NGINX_VERSION}") do |val|
+            options[:nginx_version] = val
+          end
+          opts.on("--nginx-tarball PATH", String, "Use the given Nginx tarball instead of#{nl}" +
+            "downloading it. You MUST also specify the#{nl}" +
+            "Nginx version with --nginx-version") do |val|
+            options[:nginx_tarball] = val
+          end
+          opts.on("-f", "--force", "Skip sanity checks") do
+            options[:force] = true
+          end
+          opts.on("--no-force-tip", "Do not print any tips regarding the --force#{nl}" +
+            "parameter") do
+            options[:force_tip] = false
+          end
+          opts.on("--connect-timeout SECONDS", Integer,
+            "The maximum amount of time to spend on DNS#{nl}" +
+            "lookup and establishing the TCP connection.#{nl}" +
+            "Default: 30") do |val|
+            options[:connect_timeout] = val
+          end
+          opts.on("--idle-timeout SECONDS", Integer, "The maximum idle read time. Default: 30") do |val|
+            options[:idle_timeout] = val
+          end
+          opts.on("-h", "--help", "Show this help") do
+            options[:help] = true
+          end
+        end
+      end
 
-	def help
-		puts @parser
-	end
+      def help
+        puts @parser
+      end
 
-	def initialize_objects
-		@colors = Utils::AnsiColors.new(@options[:colorize])
-		if !@options[:nginx_version]
-			if @options[:nginx_tarball]
-				abort "#{@colors.red}Error: if you specify --nginx-tarball, " +
-					"you must also specify --nginx-version.#{@colors.reset}"
-			else
-				@options[:nginx_version] = PREFERRED_NGINX_VERSION
-			end
-		end
-	end
+      def initialize_objects
+        @colors = Utils::AnsiColors.new(@options[:colorize])
+        if !@options[:nginx_version]
+          if @options[:nginx_tarball]
+            abort "#{@colors.red}Error: if you specify --nginx-tarball, " +
+              "you must also specify --nginx-version.#{@colors.reset}"
+          else
+            @options[:nginx_version] = PREFERRED_NGINX_VERSION
+          end
+        end
+      end
 
-	def sanity_check
-		return if @options[:force]
+      def sanity_check
+        return if @options[:force]
 
-		if PhusionPassenger.find_support_binary("nginx-#{@options[:nginx_version]}")
-			puts "#{@colors.green}The Nginx engine (version #{@options[:nginx_version]}) " +
-				"is already installed.#{@colors.reset}"
-			if @options[:force_tip]
-				puts "If you want to recompile it, re-run this program with the --force parameter."
-			end
-			exit
-		end
-	end
-end
+        if PhusionPassenger.find_support_binary("nginx-#{@options[:nginx_version]}")
+          puts "#{@colors.green}The Nginx engine (version #{@options[:nginx_version]}) " +
+            "is already installed.#{@colors.reset}"
+          if @options[:force_tip]
+            puts "If you want to recompile it, re-run this program with the --force parameter."
+          end
+          exit
+        end
+      end
+    end
 
-end # module Config
+  end # module Config
 end # module PhusionPassenger

data/lib/phusion_passenger/config/detach_process_command.rb

@@ -31,84 +31,84 @@ PhusionPassenger.require_passenger_lib 'config/utils'
 PhusionPassenger.require_passenger_lib 'utils/json'
 
 module PhusionPassenger
-module Config
+  module Config
 
-class DetachProcessCommand < Command
-	include PhusionPassenger::Config::Utils
+    class DetachProcessCommand < Command
+      include PhusionPassenger::Config::Utils
 
-	def run
-		parse_options
-		select_passenger_instance
-		perform_detach
-	end
+      def run
+        parse_options
+        select_passenger_instance
+        perform_detach
+      end
 
-private
-	def self.create_option_parser(options)
-		OptionParser.new do |opts|
-			nl = "\n" + ' ' * 37
-			opts.banner = "Usage: passenger-config detach-process [OPTIONS] <PID>\n"
-			opts.separator ""
-			opts.separator "  Remove an application process from the #{PROGRAM_NAME} process pool, and"
-			opts.separator "  shut it down. Has a similar effect to killing the application process"
-			opts.separator "  directly with `kill <PID>`. But `kill` aborts any active requests, while"
-			opts.separator "  this command shuts down the process after active requests are finished."
-			opts.separator ""
-			opts.separator "  If you want to force abort a process and its active requests, just use `kill`."
-			opts.separator ""
+    private
+      def self.create_option_parser(options)
+        OptionParser.new do |opts|
+          nl = "\n" + ' ' * 37
+          opts.banner = "Usage: passenger-config detach-process [OPTIONS] <PID>\n"
+          opts.separator ""
+          opts.separator "  Remove an application process from the #{PROGRAM_NAME} process pool, and"
+          opts.separator "  shut it down. Has a similar effect to killing the application process"
+          opts.separator "  directly with `kill <PID>`. But `kill` aborts any active requests, while"
+          opts.separator "  this command shuts down the process after active requests are finished."
+          opts.separator ""
+          opts.separator "  If you want to force abort a process and its active requests, just use `kill`."
+          opts.separator ""
 
-			opts.separator "Options:"
-			opts.on("--instance NAME", String, "The #{PROGRAM_NAME} instance to select") do |value|
-				options[:instance] = value
-			end
-			opts.on("--ignore-nonexistant-pid", "Exit successfully even if the specified#{nl}" +
-				"PID is not in the process pool.") do
-				options[:ignore_nonexistant_pid] = true
-			end
-			opts.on("-h", "--help", "Show this help") do
-				options[:help] = true
-			end
-		end
-	end
+          opts.separator "Options:"
+          opts.on("--instance NAME", String, "The #{PROGRAM_NAME} instance to select") do |value|
+            options[:instance] = value
+          end
+          opts.on("--ignore-nonexistant-pid", "Exit successfully even if the specified#{nl}" +
+            "PID is not in the process pool.") do
+            options[:ignore_nonexistant_pid] = true
+          end
+          opts.on("-h", "--help", "Show this help") do
+            options[:help] = true
+          end
+        end
+      end
 
-	def help
-		puts @parser
-	end
+      def help
+        puts @parser
+      end
 
-	def parse_options
-		super
-		if @argv.empty?
-			abort "Please pass a PID. " +
-				"See --help for more information."
-		elsif @argv.size == 1
-			@pid = @argv[0].to_i
-		elsif @argv.size > 1
-			help
-			abort
-		end
-	end
+      def parse_options
+        super
+        if @argv.empty?
+          abort "Please pass a PID. " +
+            "See --help for more information."
+        elsif @argv.size == 1
+          @pid = @argv[0].to_i
+        elsif @argv.size > 1
+          help
+          abort
+        end
+      end
 
-	def perform_detach
-		request = Net::HTTP::Post.new("/pool/detach_process.json")
-		request.basic_auth("admin", obtain_full_admin_password(@instance))
-		request.content_type = "application/json"
-		request.body = PhusionPassenger::Utils::JSON.generate(:pid => @pid)
-		response = @instance.http_request("agents.s/server_admin", request)
-		if response.code.to_i / 100 == 2
-			body = PhusionPassenger::Utils::JSON.parse(response.body)
-			if body['detached']
-				puts "Process #{@pid} detached."
-			elsif @options[:ignore_nonexistant_pid]
-				puts "Could not detach process #{@pid}."
-			else
-				abort "Could not detach process #{@pid}."
-			end
-		else
-			STDERR.puts "*** An error occured while communicating with the #{PROGRAM_NAME} server:"
-			STDERR.puts response.body
-			abort
-		end
-	end
-end
+      def perform_detach
+        request = Net::HTTP::Post.new("/pool/detach_process.json")
+        request.basic_auth("admin", obtain_full_admin_password(@instance))
+        request.content_type = "application/json"
+        request.body = PhusionPassenger::Utils::JSON.generate(:pid => @pid)
+        response = @instance.http_request("agents.s/server_admin", request)
+        if response.code.to_i / 100 == 2
+          body = PhusionPassenger::Utils::JSON.parse(response.body)
+          if body['detached']
+            puts "Process #{@pid} detached."
+          elsif @options[:ignore_nonexistant_pid]
+            puts "Could not detach process #{@pid}."
+          else
+            abort "Could not detach process #{@pid}."
+          end
+        else
+          STDERR.puts "*** An error occured while communicating with the #{PROGRAM_NAME} server:"
+          STDERR.puts response.body
+          abort
+        end
+      end
+    end
 
-end # module Config
+  end # module Config
 end # module PhusionPassenger

data/lib/phusion_passenger/config/download_agent_command.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014 Phusion
+#  Copyright (c) 2014-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -34,252 +34,271 @@ PhusionPassenger.require_passenger_lib 'utils/shellwords'
 PhusionPassenger.require_passenger_lib 'utils/tmpio'
 
 module PhusionPassenger
-module Config
+  module Config
 
-class DownloadAgentCommand < Command
-	include InstallationUtils
+    class DownloadAgentCommand < Command
+      include InstallationUtils
 
-	BINARY_NOT_USABLE_EXIT_CODE = 3
+      BINARY_NOT_USABLE_EXIT_CODE = 3
 
-	def run
-		@options = {
-			:log_level => Logger::INFO,
-			:colors => :auto,
-			:error_colors => true,
-			:show_download_progress => STDOUT.tty?,
-			:compilation_tip => true,
-			:force_tip => true,
-			:use_cache => true
-		}
-		parse_options
-		initialize_objects
-		sanity_check
-		download_and_extract
-	end
+      def run
+        @options = {
+          :log_level => Logger::INFO,
+          :colors => :auto,
+          :error_colors => true,
+          :show_download_progress => STDOUT.tty?,
+          :compilation_tip => true,
+          :force_tip => true,
+          :use_cache => true,
+          :connect_timeout => 30,
+          :idle_timeout => 30
+        }
+        parse_options
+        initialize_objects
+        sanity_check
+        download_and_extract
+      end
 
-private
-	def self.create_option_parser(options)
-		OptionParser.new do |opts|
-			nl = "\n" + ' ' * 37
-			opts.banner = "Usage: passenger-config download-agent [OPTIONS]\n"
-			opts.separator ""
-			opts.separator "  Download a precompiled #{PROGRAM_NAME} agent binary from the"
-			opts.separator "  #{PROGRAM_NAME} website. The agent binary is required for #{PROGRAM_NAME}"
-			opts.separator "  to function properly. Precompiled binaries are only available for Linux and"
-			opts.separator "  OS X."
-			opts.separator ""
+    private
+      def self.create_option_parser(options)
+        OptionParser.new do |opts|
+          nl = "\n" + ' ' * 37
+          opts.banner = "Usage: passenger-config download-agent [OPTIONS]\n"
+          opts.separator ""
+          opts.separator "  Download a precompiled #{PROGRAM_NAME} agent binary from the"
+          opts.separator "  #{PROGRAM_NAME} website. The agent binary is required for #{PROGRAM_NAME}"
+          opts.separator "  to function properly. Precompiled binaries are only available for Linux and"
+          opts.separator "  OS X."
+          opts.separator ""
 
-			opts.separator "Options:"
-			opts.on("--url-root URL", String, "Download the binary from a custom URL") do |value|
-				options[:url_root] = value
-			end
-			opts.on("--log-prefix PREFIX", String, "Prefix all logs with the given string") do |value|
-				options[:log_prefix] = value
-			end
-			opts.on("--log-level LEVEL", String, "Set log level (fatal,error,warn,info,#{nl}" +
-				"debug). Default: info") do |value|
-				case value
-				when "fatal"
-					options[:log_level] = Logger::FATAL
-				when "error"
-					options[:log_level] = Logger::ERROR
-				when "warn"
-					options[:log_level] = Logger::WARN
-				when "info"
-					options[:log_level] = Logger::INFO
-				when "debug"
-					options[:log_level] = Logger::DEBUG
-				else
-					abort "Invalid log level #{value.inspect}"
-				end
-			end
-			opts.on("-f", "--force", "Skip sanity checks") do
-				options[:force] = true
-			end
-			opts.on("--no-colors", "Never output colors") do
-				options[:colors] = false
-			end
-			opts.on("--no-error-colors", "Do not colorized error messages") do
-				options[:error_colors] = false
-			end
-			opts.on("--no-download-progress", "Never show download progress") do
-				options[:show_download_progress] = false
-			end
-			opts.on("--no-compilation-tip", "Do not present compilation as an#{nl}" +
-				"alternative way to install the agent") do
-				options[:compilation_tip] = false
-			end
-			opts.on("--no-force-tip", "Do not print any tips regarding the --force parameter") do
-				options[:force_tip] = false
-			end
-			opts.on("--skip-cache", "Do not copy the agent binary from cache") do
-				options[:use_cache] = false
-			end
-			opts.on("--suppress-binary-unusable-message",
-				"Do not print anything if the downloaded#{nl}" +
-				"binary turns out to be unusable") do
-				options[:suppress_binary_unusable_message] = true
-			end
-			opts.on("--dry-run", "Do everything except actually installing#{nl}" +
-				"the binary") do
-				options[:dry_run] = true
-			end
-			opts.on("-h", "--help", "Show this help") do
-				options[:help] = true
-			end
-		end
-	end
+          opts.separator "Options:"
+          opts.on("--url-root URL", String, "Download the binary from a custom URL") do |value|
+            options[:url_root] = value
+          end
+          opts.on("--log-prefix PREFIX", String, "Prefix all logs with the given string") do |value|
+            options[:log_prefix] = value
+          end
+          opts.on("--log-level LEVEL", String, "Set log level (fatal,error,warn,info,#{nl}" +
+            "debug). Default: info") do |value|
+            case value
+            when "fatal"
+              options[:log_level] = Logger::FATAL
+            when "error"
+              options[:log_level] = Logger::ERROR
+            when "warn"
+              options[:log_level] = Logger::WARN
+            when "info"
+              options[:log_level] = Logger::INFO
+            when "debug"
+              options[:log_level] = Logger::DEBUG
+            else
+              abort "Invalid log level #{value.inspect}"
+            end
+          end
+          opts.on("-f", "--force", "Skip sanity checks") do
+            options[:force] = true
+          end
+          opts.on("--no-colors", "Never output colors") do
+            options[:colors] = false
+          end
+          opts.on("--no-error-colors", "Do not colorized error messages") do
+            options[:error_colors] = false
+          end
+          opts.on("--no-download-progress", "Never show download progress") do
+            options[:show_download_progress] = false
+          end
+          opts.on("--no-compilation-tip", "Do not present compilation as an#{nl}" +
+            "alternative way to install the agent") do
+            options[:compilation_tip] = false
+          end
+          opts.on("--no-force-tip", "Do not print any tips regarding the#{nl}" +
+            "--force parameter") do
+            options[:force_tip] = false
+          end
+          opts.on("--skip-cache", "Do not copy the agent binary from cache") do
+            options[:use_cache] = false
+          end
+          opts.on("--suppress-binary-unusable-message",
+            "Do not print anything if the downloaded#{nl}" +
+            "binary turns out to be unusable") do
+            options[:suppress_binary_unusable_message] = true
+          end
+          opts.on("--dry-run", "Do everything except actually installing#{nl}" +
+            "the binary") do
+            options[:dry_run] = true
+          end
+          opts.on("--connect-timeout SECONDS", Integer,
+            "The maximum amount of time to spend on DNS#{nl}" +
+            "lookup and establishing the TCP connection.#{nl}" +
+            "Default: 30") do |val|
+            options[:connect_timeout] = val
+          end
+          opts.on("--idle-timeout SECONDS", Integer, "The maximum idle read time. Default: 30") do |val|
+            options[:idle_timeout] = val
+          end
+          opts.on("-h", "--help", "Show this help") do
+            options[:help] = true
+          end
+        end
+      end
 
-	def help
-		puts @parser
-	end
+      def help
+        puts @parser
+      end
 
-	def initialize_objects
-		if @options[:url_root]
-			@sites = [{ :url => @options[:url_root] }]
-		else
-			@sites = PhusionPassenger.binaries_sites
-		end
-		@colors = Utils::AnsiColors.new(@options[:colors])
-		@logger = Logger.new(STDOUT)
-		@logger.level = @options[:log_level]
-		@logger.formatter = proc do |severity, datetime, progname, msg|
-			if @options[:error_colors] && (severity == "FATAL" || severity == "ERROR")
-				color = @colors.red
-			else
-				color = nil
-			end
-			result = ""
-			msg.split("\n", -1).map do |line|
-				result << "#{color}#{@options[:log_prefix]}#{line}#{@colors.reset}\n"
-			end
-			result
-		end
-	end
+      def initialize_objects
+        if @options[:url_root]
+          @sites = [{ :url => @options[:url_root] }]
+        else
+          @sites = PhusionPassenger.binaries_sites
+        end
+        @colors = Utils::AnsiColors.new(@options[:colors])
+        @logger = Logger.new(STDOUT)
+        @logger.level = @options[:log_level]
+        @logger.formatter = proc do |severity, datetime, progname, msg|
+          if @options[:error_colors] && (severity == "FATAL" || severity == "ERROR")
+            color = @colors.red
+          else
+            color = nil
+          end
+          result = ""
+          msg.split("\n", -1).map do |line|
+            result << "#{color}#{@options[:log_prefix]}#{line}#{@colors.reset}\n"
+          end
+          result
+        end
+      end
 
-	def sanity_check
-		return if @options[:force]
+      def sanity_check
+        return if @options[:force]
 
-		if PhusionPassenger.find_support_binary(AGENT_EXE)
-			@logger.warn "#{@colors.green}The #{PROGRAM_NAME} agent is already installed."
-			if @options[:force_tip]
-				@logger.warn "If you want to redownload it, re-run this program with the --force parameter."
-			end
-			exit
-		end
+        if PhusionPassenger.find_support_binary(AGENT_EXE)
+          @logger.warn "#{@colors.green}The #{PROGRAM_NAME} agent is already installed."
+          if @options[:force_tip]
+            @logger.warn "If you want to redownload it, re-run this program with the --force parameter."
+          end
+          exit
+        end
 
-		if !PhusionPassenger.installed_from_release_package?
-			@logger.fatal("#{PROGRAM_NAME} was not installed from an official release " +
-				"package, so you cannot download our precompiled agent binary." +
-				compile_tip_message)
-			if @options[:force_tip]
-				@logger.warn "If you want to download it anyway, re-run this program with the --force parameter."
-			end
-			abort
-		end
+        if !PhusionPassenger.installed_from_release_package?
+          @logger.fatal("#{PROGRAM_NAME} was not installed from an official release " +
+            "package, so you cannot download our precompiled agent binary." +
+            compile_tip_message)
+          if @options[:force_tip]
+            @logger.warn "If you want to download it anyway, re-run this program with the --force parameter."
+          end
+          abort
+        end
 
-		check_for_download_tool!
-	end
+        check_for_download_tool!
+      end
 
-	def download_and_extract
-		destdir = find_or_create_writable_support_binaries_dir!
-		exit if @options[:dry_run]
+      def download_and_extract
+        destdir = find_or_create_writable_support_binaries_dir!
+        exit if @options[:dry_run]
 
-		PhusionPassenger::Utils.mktmpdir("passenger-install.", PlatformInfo.tmpexedir) do |tmpdir|
-			basename = "agent-#{PlatformInfo.cxx_binary_compatibility_id}.tar.gz"
-			tarball  = "#{tmpdir}/#{basename}"
-			if !download_support_file(basename, tarball)
-				@logger.error "#{@colors.reset}------------------------------------------"
-				@logger.fatal("Sorry, no precompiled agent binary is available for " +
-					"your platform." + compile_tip_message)
-				abort
-			end
+        PhusionPassenger::Utils.mktmpdir("passenger-install.", PlatformInfo.tmpexedir) do |tmpdir|
+          basename = "agent-#{PlatformInfo.cxx_binary_compatibility_id}.tar.gz"
+          tarball  = "#{tmpdir}/#{basename}"
+          if !download_support_file(basename, tarball)
+            @logger.error "#{@colors.reset}------------------------------------------"
+            @logger.fatal("Sorry, no precompiled agent binary is available for " +
+              "your platform." + compile_tip_message)
+            abort
+          end
 
-			@logger.info "Extracting precompiled agent binary to #{destdir}..."
-			e_tmpdir = Shellwords.escape(tmpdir)
-			e_tarball = Shellwords.escape(tarball)
-			if !system("cd #{e_tmpdir} && tar xzf #{e_tarball}")
-				@logger.fatal "The downloaded archive file could not be extracted."
-				abort
-			end
-			if !File.exist?("#{tmpdir}/#{AGENT_EXE}")
-				@logger.fatal "The downloaded archive file does not seem to " +
-					"contain an agent binary. This is probably a problem in " +
-					"the #{PROGRAM_NAME} website. Please report this problem to " +
-					"the #{PROGRAM_NAME} authors."
-				abort
-			end
+          @logger.info "Extracting precompiled agent binary to #{destdir}..."
+          e_tmpdir = Shellwords.escape(tmpdir)
+          e_tarball = Shellwords.escape(tarball)
+          if !system("cd #{e_tmpdir} && tar xzf #{e_tarball}")
+            @logger.fatal "The downloaded archive file could not be extracted."
+            abort
+          end
+          if !File.exist?("#{tmpdir}/#{AGENT_EXE}")
+            @logger.fatal "The downloaded archive file does not seem to " +
+              "contain an agent binary. This is probably a problem in " +
+              "the #{PROGRAM_NAME} website. Please report this problem to " +
+              "the #{PROGRAM_NAME} authors."
+            abort
+          end
 
-			@logger.info "Checking whether the downloaded binary is usable..."
-			if test_binary("#{tmpdir}/#{AGENT_EXE}")
-				@logger.info "The downloaded binary is usable."
-			else
-				if !@options[:suppress_binary_unusable_message]
-					@logger.fatal "Sorry, the precompiled agent binary can not be run " +
-						"your system.#{compile_tip_message}"
-				end
-				exit(BINARY_NOT_USABLE_EXIT_CODE)
-			end
+          @logger.info "Checking whether the downloaded binary is usable..."
+          if test_binary("#{tmpdir}/#{AGENT_EXE}")
+            @logger.info "The downloaded binary is usable."
+          else
+            if !@options[:suppress_binary_unusable_message]
+              @logger.fatal "Sorry, the precompiled agent binary can not be run " +
+                "your system.#{compile_tip_message}"
+            end
+            exit(BINARY_NOT_USABLE_EXIT_CODE)
+          end
 
-			FileUtils.mv("#{tmpdir}/#{AGENT_EXE}", "#{destdir}/#{AGENT_EXE}")
-			@logger.info "#{@colors.green}Agent binary successfully download and installed."
-		end
-	end
+          FileUtils.mv("#{tmpdir}/#{AGENT_EXE}", "#{destdir}/#{AGENT_EXE}")
+          @logger.info "#{@colors.green}Agent binary successfully download and installed."
+        end
+      end
 
-	def download_support_file(name, output)
-		@sites.each_with_index do |site, i|
-			if real_download_support_file(site, name, output)
-				if i > 0
-					@logger.warn "#{@colors.green}Download OK!"
-				else
-					@logger.info "#{@colors.green}Download OK!"
-				end
-				return true
-			elsif i != @sites.size - 1
-				@logger.warn "Trying next mirror..."
-			end
-		end
-		return false
-	end
+      def download_support_file(name, output)
+        @sites.each_with_index do |site, i|
+          if real_download_support_file(site, name, output)
+            if i > 0
+              @logger.warn "#{@colors.green}Download OK!"
+            else
+              @logger.info "#{@colors.green}Download OK!"
+            end
+            return true
+          elsif i != @sites.size - 1
+            @logger.warn "Trying next mirror..."
+          end
+        end
+        return false
+      end
 
-	def real_download_support_file(site, name, output)
-		url = "#{site[:url]}/#{VERSION_STRING}/#{name}"
-		return PhusionPassenger::Utils::Download.download(url, output,
-			:cacert => site[:cacert],
-			:logger => @logger,
-			:use_cache => @options[:use_cache],
-			:show_progress   => @options[:show_download_progress],
-			:connect_timeout => 30,
-			:idle_timeout    => 30)
-	end
+      def real_download_support_file(site, name, output)
+        url = "#{site[:url]}/#{VERSION_STRING}/#{name}"
+        options = {
+          :cacert => site[:cacert],
+          :logger => @logger,
+          :use_cache => @options[:use_cache]
+        }
+        # connect_timeout and idle_timeout may be nil or 0, which means
+        # that the default Utils::Download timeouts should be used.
+        if @options[:connect_timeout] && @options[:connect_timeout] != 0
+          options[:connect_timeout] = @options[:connect_timeout]
+        end
+        if @options[:idle_timeout] && @options[:idle_timeout] != 0
+          options[:idle_timeout] = @options[:idle_timeout]
+        end
+        return PhusionPassenger::Utils::Download.download(url, output, options)
+      end
 
-	def test_binary(filename)
-		output = `env LD_BIND_NOW=1 DYLD_BIND_AT_LAUNCH=1 #{Shellwords.escape(filename)} test-binary`
-		return $? && $?.exitstatus == 0 && output == "PASS\n"
-	end
+      def test_binary(filename)
+        output = `env LD_BIND_NOW=1 DYLD_BIND_AT_LAUNCH=1 #{Shellwords.escape(filename)} test-binary`
+        return $? && $?.exitstatus == 0 && output == "PASS\n"
+      end
 
-	def compile_tip_message
-		return "" if !@options[:compilation_tip]
-		if PhusionPassenger.build_system_dir
-			result = " Please compile the agent from source instead, by running:\n\n"
-			result << "  passenger-config compile-agent"
-		else
-			result = " Furthermore, this #{PROGRAM_NAME} installation does not "
-			result << "come with any source code, so the agent binary cannot "
-			result << "be compiled either. Please contact the person or "
-			result << "organization who packaged #{PROGRAM_NAME} for help on this "
-			result << "problem."
-		end
-		return result
-	end
+      def compile_tip_message
+        return "" if !@options[:compilation_tip]
+        if PhusionPassenger.build_system_dir
+          result = " Please compile the agent from source instead, by running:\n\n"
+          result << "  passenger-config compile-agent"
+        else
+          result = " Furthermore, this #{PROGRAM_NAME} installation does not "
+          result << "come with any source code, so the agent binary cannot "
+          result << "be compiled either. Please contact the person or "
+          result << "organization who packaged #{PROGRAM_NAME} for help on this "
+          result << "problem."
+        end
+        return result
+      end
 
-	# Override InstallationUtils
-	def print_installation_error_header
-		@logger.warn "------------------------------------------"
-		@logger.fatal "Cannot store agent binary"
-		@logger.fatal ""
-	end
-end
+      # Override InstallationUtils
+      def print_installation_error_header
+        @logger.warn "------------------------------------------"
+        @logger.fatal "Cannot store agent binary"
+        @logger.fatal ""
+      end
+    end
 
-end # module Config
+  end # module Config
 end # module PhusionPassenger