0
@@ -1,10 +1,11 @@
0
 == 0.8.1 Rebel Porpoise release
0
+ * [bug] Use Swiftiply backend when -y option is specified, fixes #63 and #64
0
  * Allow passing port as a string in Server.new
0
  * Define deferred?(env) in your Rack application to set if a request is handled in a
0
    thread (return true) or not (return false).
0
 
0
 == 0.8.0 Dodgy Dentist release
0
- *  Fix server crash when header too large.
0
+ * [bug] Fix server crash when header too large.
0
  * Add --require (-r) option to require a library, before executing your script.
0
  * Rename --rackup short option to -R, warn and load as rackup when file ends with .ru.
0
  * List supported adapters in command usage.
0
@@ -12,7 +13,7 @@
0
  * Allow disabling signal handling in Server with :signals => false
0
  * Make Server.new arguments more flexible, can now specify any of host, port, app or hash options.
0
  * Add --backend option to specified which backend to use, closes #55
0
- *  Serve static file only on GET and HEAD requests in Rails adapter, fixes #58
0
+ * [bug] Serve static file only on GET and HEAD requests in Rails adapter, fixes #58
0
  * Add threaded option to run server in threaded mode, calling the application in a
0
    thread allowing for concurrency in the Rack adapter, closes #46
0
  * Guess which adapter to use from directory (chdir option)

0
@@ -35,15 +35,12 @@
0
       end
0
     
0
       def start
0
-        # Select proper backend
0
-        server = case
0
-        when @options.has_key?(:backend)
0
-          Server.new(@options[:address], @options[:port], :backend => eval(@options[:backend], TOPLEVEL_BINDING))
0
-        when @options.has_key?(:socket)
0
-          Server.new(@options[:socket])
0
-        else
0
-          Server.new(@options[:address], @options[:port])
0
-        end
0
+        # Constantize backend class
0
+        @options[:backend] = eval(@options[:backend], TOPLEVEL_BINDING) if @options[:backend]
0
+        
0
+        server = Server.new(@options[:socket] || @options[:address], # Server detects kind of socket
0
+                            @options[:port],                         # Port ignored on UNIX socket
0
+                            @options)
0
         
0
         # Set options
0
         server.pid_file                       = @options[:pid]

0
@@ -16,7 +16,7 @@
0
     @server = OpenStruct.new
0
     @adapter = OpenStruct.new
0
     
0
-    Server.should_receive(:new).with('0.0.0.0', 3000).and_return(@server)
0
+    Server.should_receive(:new).with('0.0.0.0', 3000, @controller.options).and_return(@server)
0
     @server.should_receive(:config)
0
     Rack::Adapter::Rails.stub!(:new).and_return(@adapter)
0
   end