passenger 5.0.0.beta3 → 5.0.0.rc1

data/helper-scripts/prespawn

@@ -30,124 +30,124 @@ require 'socket'
 require 'timeout'
 
 class PrespawnLocation
-	class InvalidURLError < RuntimeError
-		def initialize(url)
-			@url = url
-		end
-
-		def to_s
-			message
-		end
-
-		def message
-			"'#{@url}' is not a valid URL."
-		end
-	end
-
-	def self.parse(url)
-		uri = uri_for(url)
-
-		location = if uri.host == 'unix'
-			UNIXPrespawnLocation.new(uri)
-		else
-			case uri.scheme
-				when 'http'
-					TCPPrespawnLocation.new(uri)
-				when 'https'
-					SSLPrespawnLocation.new(uri)
-			end
-		end
-
-		unless location
-			raise InvalidURLError, url
-		end
-
-		location
-	end
-
-	def self.uri_for(url)
-		URI.parse(url)
-	rescue URI::InvalidURIError
-		raise InvalidURLError, url
-	end
-
-	def initialize(uri)
-		@uri = uri
-	end
-
-	def request_path
-		@uri.path.empty? ? '/' : @uri.path
-	end
-
-	def request_host
-		@uri.host
-	end
-
-	def socket
-		@socket ||= connect
-	end
-
-	def head_request
-		socket.write("HEAD #{request_path} HTTP/1.1\r\n")
-		socket.write("Host: #{request_host}\r\n")
-		socket.write("Connection: close\r\n")
-		socket.write("\r\n")
-
-		begin
-			Timeout.timeout(10) do
-				socket.read
-			end
-		rescue Timeout::Error
-		end
-	end
+  class InvalidURLError < RuntimeError
+    def initialize(url)
+      @url = url
+    end
+
+    def to_s
+      message
+    end
+
+    def message
+      "'#{@url}' is not a valid URL."
+    end
+  end
+
+  def self.parse(url)
+    uri = uri_for(url)
+
+    location = if uri.host == 'unix'
+      UNIXPrespawnLocation.new(uri)
+    else
+      case uri.scheme
+        when 'http'
+          TCPPrespawnLocation.new(uri)
+        when 'https'
+          SSLPrespawnLocation.new(uri)
+      end
+    end
+
+    unless location
+      raise InvalidURLError, url
+    end
+
+    location
+  end
+
+  def self.uri_for(url)
+    URI.parse(url)
+  rescue URI::InvalidURIError
+    raise InvalidURLError, url
+  end
+
+  def initialize(uri)
+    @uri = uri
+  end
+
+  def request_path
+    @uri.path.empty? ? '/' : @uri.path
+  end
+
+  def request_host
+    @uri.host
+  end
+
+  def socket
+    @socket ||= connect
+  end
+
+  def head_request
+    socket.write("HEAD #{request_path} HTTP/1.1\r\n")
+    socket.write("Host: #{request_host}\r\n")
+    socket.write("Connection: close\r\n")
+    socket.write("\r\n")
+
+    begin
+      Timeout.timeout(10) do
+        socket.read
+      end
+    rescue Timeout::Error
+    end
+  end
 end
 
 class TCPPrespawnLocation < PrespawnLocation
-	def request_port
-		@uri.port
-	end
-
-	def connect
-		TCPSocket.new('127.0.0.1', request_port)
-	rescue Errno::ECONNREFUSED
-		TCPSocket.new('::1', request_port)
-	end
+  def request_port
+    @uri.port
+  end
+
+  def connect
+    TCPSocket.new('127.0.0.1', request_port)
+  rescue Errno::ECONNREFUSED
+    TCPSocket.new('::1', request_port)
+  end
 end
 
 class SSLPrespawnLocation < TCPPrespawnLocation
-	def connect
-		require 'openssl'
-		socket = OpenSSL::SSL::SSLSocket.new(super)
-		socket.sync_close = true
-		socket.connect
-		socket
-	end
+  def connect
+    require 'openssl'
+    socket = OpenSSL::SSL::SSLSocket.new(super)
+    socket.sync_close = true
+    socket.connect
+    socket
+  end
 end
 
 class UNIXPrespawnLocation < PrespawnLocation
-	def request_path
-		super.split(':', 2).last
-	end
+  def request_path
+    super.split(':', 2).last
+  end
 
-	def request_host
-		'_'
-	end
+  def request_host
+    '_'
+  end
 
-	def socket_path
-		@uri.path.split(':', 2).first
-	end
+  def socket_path
+    @uri.path.split(':', 2).first
+  end
 
-	def connect
-		UNIXSocket.new(socket_path)
-	end
+  def connect
+    UNIXSocket.new(socket_path)
+  end
 end
 
 url = ARGV[0]
 begin
-	prespawn_location = PrespawnLocation.parse(url)
+  prespawn_location = PrespawnLocation.parse(url)
 rescue PrespawnLocation::InvalidURLError => e
-	STDERR.puts "*** ERROR: #{e}"
-	exit 1
+  STDERR.puts "*** ERROR: #{e}"
+  exit 1
 end
 
 prespawn_location.head_request

data/helper-scripts/rack-loader.rb

@@ -24,114 +24,114 @@
 #  THE SOFTWARE.
 
 module PhusionPassenger
-module App
-	def self.options
-		return @@options
-	end
+  module App
+    def self.options
+      return @@options
+    end
 
-	def self.app
-		return @@app
-	end
+    def self.app
+      return @@app
+    end
 
-	def self.format_exception(e)
-		result = "#{e} (#{e.class})"
-		if !e.backtrace.empty?
-			if e.respond_to?(:html?) && e.html?
-				require 'erb' if !defined?(ERB)
-				result << "\n<pre>  " << ERB::Util.h(e.backtrace.join("\n  ")) << "</pre>"
-			else
-				result << "\n  " << e.backtrace.join("\n  ")
-			end
-		end
-		return result
-	end
+    def self.format_exception(e)
+      result = "#{e} (#{e.class})"
+      if !e.backtrace.empty?
+        if e.respond_to?(:html?) && e.html?
+          require 'erb' if !defined?(ERB)
+          result << "\n<pre>  " << ERB::Util.h(e.backtrace.join("\n  ")) << "</pre>"
+        else
+          result << "\n  " << e.backtrace.join("\n  ")
+        end
+      end
+      return result
+    end
 
-	def self.exit_code_for_exception(e)
-		if e.is_a?(SystemExit)
-			return e.status
-		else
-			return 1
-		end
-	end
+    def self.exit_code_for_exception(e)
+      if e.is_a?(SystemExit)
+        return e.status
+      else
+        return 1
+      end
+    end
 
-	def self.handshake_and_read_startup_request
-		STDOUT.sync = true
-		STDERR.sync = true
-		puts "!> I have control 1.0"
-		abort "Invalid initialization header" if STDIN.readline != "You have control 1.0\n"
+    def self.handshake_and_read_startup_request
+      STDOUT.sync = true
+      STDERR.sync = true
+      puts "!> I have control 1.0"
+      abort "Invalid initialization header" if STDIN.readline != "You have control 1.0\n"
 
-		@@options = {}
-		while (line = STDIN.readline) != "\n"
-			name, value = line.strip.split(/: */, 2)
-			@@options[name] = value
-		end
-	end
+      @@options = {}
+      while (line = STDIN.readline) != "\n"
+        name, value = line.strip.split(/: */, 2)
+        @@options[name] = value
+      end
+    end
 
-	def self.init_passenger
-		require "#{options["ruby_libdir"]}/phusion_passenger"
-		PhusionPassenger.locate_directories(options["passenger_root"])
-		PhusionPassenger.require_passenger_lib 'native_support'
-		PhusionPassenger.require_passenger_lib 'ruby_core_enhancements'
-		PhusionPassenger.require_passenger_lib 'ruby_core_io_enhancements'
-		PhusionPassenger.require_passenger_lib 'loader_shared_helpers'
-		PhusionPassenger.require_passenger_lib 'request_handler'
-		PhusionPassenger.require_passenger_lib 'rack/thread_handler_extension'
-		@@options = LoaderSharedHelpers.init(@@options)
-		if defined?(NativeSupport)
-			NativeSupport.disable_stdio_buffering
-		end
-		RequestHandler::ThreadHandler.send(:include, Rack::ThreadHandlerExtension)
-	rescue Exception => e
-		LoaderSharedHelpers.about_to_abort(e) if defined?(LoaderSharedHelpers)
-		puts "!> Error"
-		puts "!> html: true" if e.respond_to?(:html?) && e.html?
-		puts "!> "
-		puts format_exception(e)
-		exit exit_code_for_exception(e)
-	end
+    def self.init_passenger
+      require "#{options["ruby_libdir"]}/phusion_passenger"
+      PhusionPassenger.locate_directories(options["passenger_root"])
+      PhusionPassenger.require_passenger_lib 'native_support'
+      PhusionPassenger.require_passenger_lib 'ruby_core_enhancements'
+      PhusionPassenger.require_passenger_lib 'ruby_core_io_enhancements'
+      PhusionPassenger.require_passenger_lib 'loader_shared_helpers'
+      PhusionPassenger.require_passenger_lib 'request_handler'
+      PhusionPassenger.require_passenger_lib 'rack/thread_handler_extension'
+      @@options = LoaderSharedHelpers.init(@@options)
+      if defined?(NativeSupport)
+        NativeSupport.disable_stdio_buffering
+      end
+      RequestHandler::ThreadHandler.send(:include, Rack::ThreadHandlerExtension)
+    rescue Exception => e
+      LoaderSharedHelpers.about_to_abort(options, e) if defined?(LoaderSharedHelpers)
+      puts "!> Error"
+      puts "!> html: true" if e.respond_to?(:html?) && e.html?
+      puts "!> "
+      puts format_exception(e)
+      exit exit_code_for_exception(e)
+    end
 
-	def self.load_app
-		LoaderSharedHelpers.before_loading_app_code_step1('config.ru', options)
-		LoaderSharedHelpers.run_load_path_setup_code(options)
-		LoaderSharedHelpers.before_loading_app_code_step2(options)
+    def self.load_app
+      LoaderSharedHelpers.before_loading_app_code_step1('config.ru', options)
+      LoaderSharedHelpers.run_load_path_setup_code(options)
+      LoaderSharedHelpers.before_loading_app_code_step2(options)
 
-		begin
-			require 'rubygems'
-		rescue LoadError
-		end
-		require 'rack'
-		rackup_file = options["startup_file"] || "config.ru"
-		rackup_code = ::File.open(rackup_file, 'rb') do |f|
-			f.read
-		end
-		@@app = eval("Rack::Builder.new {( #{rackup_code}\n )}.to_app",
-			TOPLEVEL_BINDING, rackup_file)
+      begin
+        require 'rubygems'
+      rescue LoadError
+      end
+      require 'rack'
+      rackup_file = options["startup_file"] || "config.ru"
+      rackup_code = ::File.open(rackup_file, 'rb') do |f|
+        f.read
+      end
+      @@app = eval("Rack::Builder.new {( #{rackup_code}\n )}.to_app",
+        TOPLEVEL_BINDING, rackup_file)
 
-		LoaderSharedHelpers.after_loading_app_code(options)
-	rescue Exception => e
-		LoaderSharedHelpers.about_to_abort(e)
-		puts "!> Error"
-		puts "!> html: true" if e.respond_to?(:html?) && e.html?
-		puts "!> "
-		puts format_exception(e)
-		exit exit_code_for_exception(e)
-	end
+      LoaderSharedHelpers.after_loading_app_code(options)
+    rescue Exception => e
+      LoaderSharedHelpers.about_to_abort(options, e)
+      puts "!> Error"
+      puts "!> html: true" if e.respond_to?(:html?) && e.html?
+      puts "!> "
+      puts format_exception(e)
+      exit exit_code_for_exception(e)
+    end
 
 
-	################## Main code ##################
+    ################## Main code ##################
 
 
-	handshake_and_read_startup_request
-	init_passenger
-	load_app
-	LoaderSharedHelpers.before_handling_requests(false, options)
-	handler = RequestHandler.new(STDIN, options.merge("app" => app))
-	LoaderSharedHelpers.advertise_readiness
-	LoaderSharedHelpers.advertise_sockets(STDOUT, handler)
-	puts "!> "
-	handler.main_loop
-	handler.cleanup
-	LoaderSharedHelpers.after_handling_requests
+    handshake_and_read_startup_request
+    init_passenger
+    load_app
+    LoaderSharedHelpers.before_handling_requests(false, options)
+    handler = RequestHandler.new(STDIN, options.merge("app" => app))
+    LoaderSharedHelpers.advertise_readiness
+    LoaderSharedHelpers.advertise_sockets(STDOUT, handler)
+    puts "!> "
+    handler.main_loop
+    handler.cleanup
+    LoaderSharedHelpers.after_handling_requests
 
-end # module App
+  end # module App
 end # module PhusionPassenger

data/helper-scripts/rack-preloader.rb

@@ -26,141 +26,141 @@
 GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly=)
 
 module PhusionPassenger
-module App
-	def self.options
-		return @@options
-	end
-
-	def self.app
-		return @@app
-	end
-
-	def self.format_exception(e)
-		result = "#{e} (#{e.class})"
-		if !e.backtrace.empty?
-			if e.respond_to?(:html?) && e.html?
-				require 'erb' if !defined?(ERB)
-				result << "\n<pre>  " << ERB::Util.h(e.backtrace.join("\n  ")) << "</pre>"
-			else
-				result << "\n  " << e.backtrace.join("\n  ")
-			end
-		end
-		return result
-	end
-
-	def self.exit_code_for_exception(e)
-		if e.is_a?(SystemExit)
-			return e.status
-		else
-			return 1
-		end
-	end
-
-	def self.handshake_and_read_startup_request
-		STDOUT.sync = true
-		STDERR.sync = true
-		puts "!> I have control 1.0"
-		abort "Invalid initialization header" if STDIN.readline != "You have control 1.0\n"
-
-		@@options = {}
-		while (line = STDIN.readline) != "\n"
-			name, value = line.strip.split(/: */, 2)
-			@@options[name] = value
-		end
-	end
-
-	def self.init_passenger
-		require "#{options["ruby_libdir"]}/phusion_passenger"
-		PhusionPassenger.locate_directories(options["passenger_root"])
-		PhusionPassenger.require_passenger_lib 'native_support'
-		PhusionPassenger.require_passenger_lib 'ruby_core_enhancements'
-		PhusionPassenger.require_passenger_lib 'ruby_core_io_enhancements'
-		PhusionPassenger.require_passenger_lib 'preloader_shared_helpers'
-		PhusionPassenger.require_passenger_lib 'loader_shared_helpers'
-		PhusionPassenger.require_passenger_lib 'request_handler'
-		PhusionPassenger.require_passenger_lib 'rack/thread_handler_extension'
-		@@options = LoaderSharedHelpers.init(@@options)
-		@@options = PreloaderSharedHelpers.init(@@options)
-		if defined?(NativeSupport)
-			NativeSupport.disable_stdio_buffering
-		end
-		RequestHandler::ThreadHandler.send(:include, Rack::ThreadHandlerExtension)
-	rescue Exception => e
-		LoaderSharedHelpers.about_to_abort(e) if defined?(LoaderSharedHelpers)
-		puts "!> Error"
-		puts "!> html: true" if e.respond_to?(:html?) && e.html?
-		puts "!> "
-		puts format_exception(e)
-		exit exit_code_for_exception(e)
-	end
-
-	def self.preload_app
-		LoaderSharedHelpers.before_loading_app_code_step1('config.ru', options)
-		LoaderSharedHelpers.run_load_path_setup_code(options)
-		LoaderSharedHelpers.before_loading_app_code_step2(options)
-
-		begin
-			require 'rubygems'
-		rescue LoadError
-		end
-		require 'rack'
-		rackup_file = options["startup_file"] || "config.ru"
-		rackup_code = ::File.open(rackup_file, 'rb') do |f|
-			f.read
-		end
-		@@app = eval("Rack::Builder.new {( #{rackup_code}\n )}.to_app",
-			TOPLEVEL_BINDING, rackup_file)
-
-		LoaderSharedHelpers.after_loading_app_code(options)
-	rescue Exception => e
-		LoaderSharedHelpers.about_to_abort(e)
-		puts "!> Error"
-		puts "!> html: true" if e.respond_to?(:html?) && e.html?
-		puts "!> "
-		puts format_exception(e)
-		exit exit_code_for_exception(e)
-	end
-
-	def self.negotiate_spawn_command
-		puts "!> I have control 1.0"
-		abort "Invalid initialization header" if STDIN.readline != "You have control 1.0\n"
-
-		begin
-			while (line = STDIN.readline) != "\n"
-				name, value = line.strip.split(/: */, 2)
-				options[name] = value
-			end
-			@@options = LoaderSharedHelpers.sanitize_spawn_options(@@options)
-
-			LoaderSharedHelpers.before_handling_requests(true, options)
-			handler = RequestHandler.new(STDIN, options.merge("app" => app))
-		rescue Exception => e
-			LoaderSharedHelpers.about_to_abort(e)
-			puts "!> Error"
-			puts "!> "
-			puts format_exception(e)
-			exit exit_code_for_exception(e)
-		end
-
-		LoaderSharedHelpers.advertise_readiness
-		LoaderSharedHelpers.advertise_sockets(STDOUT, handler)
-		puts "!> "
-		return handler
-	end
-
-
-	################## Main code ##################
-
-
-	handshake_and_read_startup_request
-	init_passenger
-	preload_app
-	if PreloaderSharedHelpers.run_main_loop(options) == :forked
-		handler = negotiate_spawn_command
-		handler.main_loop
-		handler.cleanup
-		LoaderSharedHelpers.after_handling_requests
-	end
-
-end # module App
+  module App
+    def self.options
+      return @@options
+    end
+
+    def self.app
+      return @@app
+    end
+
+    def self.format_exception(e)
+      result = "#{e} (#{e.class})"
+      if !e.backtrace.empty?
+        if e.respond_to?(:html?) && e.html?
+          require 'erb' if !defined?(ERB)
+          result << "\n<pre>  " << ERB::Util.h(e.backtrace.join("\n  ")) << "</pre>"
+        else
+          result << "\n  " << e.backtrace.join("\n  ")
+        end
+      end
+      return result
+    end
+
+    def self.exit_code_for_exception(e)
+      if e.is_a?(SystemExit)
+        return e.status
+      else
+        return 1
+      end
+    end
+
+    def self.handshake_and_read_startup_request
+      STDOUT.sync = true
+      STDERR.sync = true
+      puts "!> I have control 1.0"
+      abort "Invalid initialization header" if STDIN.readline != "You have control 1.0\n"
+
+      @@options = {}
+      while (line = STDIN.readline) != "\n"
+        name, value = line.strip.split(/: */, 2)
+        @@options[name] = value
+      end
+    end
+
+    def self.init_passenger
+      require "#{options["ruby_libdir"]}/phusion_passenger"
+      PhusionPassenger.locate_directories(options["passenger_root"])
+      PhusionPassenger.require_passenger_lib 'native_support'
+      PhusionPassenger.require_passenger_lib 'ruby_core_enhancements'
+      PhusionPassenger.require_passenger_lib 'ruby_core_io_enhancements'
+      PhusionPassenger.require_passenger_lib 'preloader_shared_helpers'
+      PhusionPassenger.require_passenger_lib 'loader_shared_helpers'
+      PhusionPassenger.require_passenger_lib 'request_handler'
+      PhusionPassenger.require_passenger_lib 'rack/thread_handler_extension'
+      @@options = LoaderSharedHelpers.init(@@options)
+      @@options = PreloaderSharedHelpers.init(@@options)
+      if defined?(NativeSupport)
+        NativeSupport.disable_stdio_buffering
+      end
+      RequestHandler::ThreadHandler.send(:include, Rack::ThreadHandlerExtension)
+    rescue Exception => e
+      LoaderSharedHelpers.about_to_abort(options, e) if defined?(LoaderSharedHelpers)
+      puts "!> Error"
+      puts "!> html: true" if e.respond_to?(:html?) && e.html?
+      puts "!> "
+      puts format_exception(e)
+      exit exit_code_for_exception(e)
+    end
+
+    def self.preload_app
+      LoaderSharedHelpers.before_loading_app_code_step1('config.ru', options)
+      LoaderSharedHelpers.run_load_path_setup_code(options)
+      LoaderSharedHelpers.before_loading_app_code_step2(options)
+
+      begin
+        require 'rubygems'
+      rescue LoadError
+      end
+      require 'rack'
+      rackup_file = options["startup_file"] || "config.ru"
+      rackup_code = ::File.open(rackup_file, 'rb') do |f|
+        f.read
+      end
+      @@app = eval("Rack::Builder.new {( #{rackup_code}\n )}.to_app",
+        TOPLEVEL_BINDING, rackup_file)
+
+      LoaderSharedHelpers.after_loading_app_code(options)
+    rescue Exception => e
+      LoaderSharedHelpers.about_to_abort(options, e)
+      puts "!> Error"
+      puts "!> html: true" if e.respond_to?(:html?) && e.html?
+      puts "!> "
+      puts format_exception(e)
+      exit exit_code_for_exception(e)
+    end
+
+    def self.negotiate_spawn_command
+      puts "!> I have control 1.0"
+      abort "Invalid initialization header" if STDIN.readline != "You have control 1.0\n"
+
+      begin
+        while (line = STDIN.readline) != "\n"
+          name, value = line.strip.split(/: */, 2)
+          options[name] = value
+        end
+        @@options = LoaderSharedHelpers.sanitize_spawn_options(@@options)
+
+        LoaderSharedHelpers.before_handling_requests(true, options)
+        handler = RequestHandler.new(STDIN, options.merge("app" => app))
+      rescue Exception => e
+        LoaderSharedHelpers.about_to_abort(options, e)
+        puts "!> Error"
+        puts "!> "
+        puts format_exception(e)
+        exit exit_code_for_exception(e)
+      end
+
+      LoaderSharedHelpers.advertise_readiness
+      LoaderSharedHelpers.advertise_sockets(STDOUT, handler)
+      puts "!> "
+      return handler
+    end
+
+
+    ################## Main code ##################
+
+
+    handshake_and_read_startup_request
+    init_passenger
+    preload_app
+    if PreloaderSharedHelpers.run_main_loop(options) == :forked
+      handler = negotiate_spawn_command
+      handler.main_loop
+      handler.cleanup
+      LoaderSharedHelpers.after_handling_requests
+    end
+
+  end # module App
 end # module PhusionPassenger