@@ -1,10 +1,11 @@ == 0.8.1 Rebel Porpoise release + * [bug] Use Swiftiply backend when -y option is specified, fixes #63 and #64 * Allow passing port as a string in Server.new * Define deferred?(env) in your Rack application to set if a request is handled in a thread (return true) or not (return false). == 0.8.0 Dodgy Dentist release - * Fix server crash when header too large. + * [bug] Fix server crash when header too large. * Add --require (-r) option to require a library, before executing your script. * Rename --rackup short option to -R, warn and load as rackup when file ends with .ru. * List supported adapters in command usage. @@ -12,7 +13,7 @@ * Allow disabling signal handling in Server with :signals => false * Make Server.new arguments more flexible, can now specify any of host, port, app or hash options. * Add --backend option to specified which backend to use, closes #55 - * Serve static file only on GET and HEAD requests in Rails adapter, fixes #58 + * [bug] Serve static file only on GET and HEAD requests in Rails adapter, fixes #58 * Add threaded option to run server in threaded mode, calling the application in a thread allowing for concurrency in the Rack adapter, closes #46 * Guess which adapter to use from directory (chdir option) CHANGELOG @@ -35,15 +35,12 @@ module Thin end def start - # Select proper backend - server = case - when @options.has_key?(:backend) - Server.new(@options[:address], @options[:port], :backend => eval(@options[:backend], TOPLEVEL_BINDING)) - when @options.has_key?(:socket) - Server.new(@options[:socket]) - else - Server.new(@options[:address], @options[:port]) - end + # Constantize backend class + @options[:backend] = eval(@options[:backend], TOPLEVEL_BINDING) if @options[:backend] + + server = Server.new(@options[:socket] || @options[:address], # Server detects kind of socket + @options[:port], # Port ignored on UNIX socket + @options) # Set options server.pid_file = @options[:pid] lib/thin/controllers/controller.rb @@ -16,7 +16,7 @@ describe Controller, 'start' do @server = OpenStruct.new @adapter = OpenStruct.new - Server.should_receive(:new).with('0.0.0.0', 3000).and_return(@server) + Server.should_receive(:new).with('0.0.0.0', 3000, @controller.options).and_return(@server) @server.should_receive(:config) Rack::Adapter::Rails.stub!(:new).and_return(@adapter) end spec/controllers/controller_spec.rb 06439cf6a5ad3034ab7da732449e59e473b3a7c6 macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin/commit/79f2a3257732004d06131172359688202b0362aa 79f2a3257732004d06131172359688202b0362aa 2008-04-18T19:17:24-07:00 2008-04-18T19:17:24-07:00 Use Swiftiply backend when -y option is specified [#63 state:resolved] [#64 state:resolved] 677a077729670a84b19212c150019b1de5ff29f0 macournoyer macournoyer@gmail.com