0
@@ -12,6 +12,7 @@ module Merb
0
     autoload :Runner,              "merb-core/rack/adapter/runner"    
0
     autoload :SwiftipliedMongrel,  "merb-core/rack/adapter/swiftiplied_mongrel"
0
     autoload :Thin,                "merb-core/rack/adapter/thin"
0
+    autoload :ThinTurbo,           "merb-core/rack/adapter/thin_turbo"
0
     autoload :WEBrick,             "merb-core/rack/adapter/webrick"
0
     autoload :PathPrefix,          "merb-core/rack/middleware/path_prefix"
0
     autoload :Static,              "merb-core/rack/middleware/static"

0
@@ -36,6 +36,7 @@ module Merb
0
     Adapter.register %w{runner},         :Runner
0
     Adapter.register %w{smongrel swift}, :SwiftipliedMongrel
0
     Adapter.register %w{thin},           :Thin
0
+    Adapter.register %w{thin-turbo},     :ThinTurbo
0
     Adapter.register %w{webrick},        :WEBrick
0
     
0
   end # Rack

0
@@ -7,10 +7,10 @@ module Merb
0
       # start an Ebb server on given host and port.
0
       
0
       # ==== Parameters
0
-      # opts<Hash>:: Options for Thin (see below).
0
+      # opts<Hash>:: Options for Ebb (see below).
0
       #
0
       # ==== Options (opts)
0
-      # :host<String>:: The hostname that Thin should serve.
0
+      # :host<String>:: The hostname that Ebb should serve.
0
       # :port<Fixnum>:: The port Ebb should bind to.
0
       # :app:: The application
0
       def self.start(opts={})

0
@@ -1,12 +1,12 @@
0
 require "thin"
0
 
0
 module Merb
0
-  
0
+
0
   module Rack
0
 
0
     class Thin
0
       # start a Thin server on given host and port.
0
-      
0
+
0
       # ==== Parameters
0
       # opts<Hash>:: Options for Thin (see below).
0
       #
0
@@ -22,13 +22,13 @@ module Merb
0
           socket = opts[:socket] || "0"
0
           socket_file = opts[:socket_file] || "#{Merb.root}/log/merb.#{socket}.sock"
0
           Merb.logger.warn!("Using Thin adapter with socket file #{socket_file}.")
0
-          server = ::Thin::Server.start(socket_file, opts[:app])
0
+          server = ::Thin::Server.start(socket_file, opts[:app], opts)
0
         else
0
           Merb.logger.warn!("Using Thin adapter on host #{opts[:host]} and port #{opts[:port]}.")
0
           if opts[:host].include?('/')
0
             opts[:host] = "#{opts[:host]}-#{opts[:port]}"
0
           end
0
-          server = ::Thin::Server.start(opts[:host], opts[:port].to_i, opts[:app])
0
+          server = ::Thin::Server.start(opts[:host], opts[:port].to_i, opts[:app], opts)
0
         end
0
         Merb::Server.change_privilege
0
         ::Thin::Logging.silent = true