mongrel 0.3.13.4 → 1.0

data/lib/mongrel/rails.rb

@@ -6,12 +6,7 @@
 
 require 'mongrel'
 require 'cgi'
-require 'sync'
 
-class Sync
-  # modified to open the waiting list for reporting purposes
-  attr_accessor :sync_waiting
-end
 
 module Mongrel
   module Rails
@@ -32,9 +27,8 @@ module Mongrel
     # * Finally, construct a Mongrel::CGIWrapper and run Dispatcher.dispatch to have Rails go.
     #
     # This means that if you are using page caching it will actually work with Mongrel
-    # and you should see a decent speed boost (but not as fast as if you use lighttpd).
-    #
-    # An additional feature you can use is 
+    # and you should see a decent speed boost (but not as fast as if you use a static
+    # server like Apache or Litespeed).
     class RailsHandler < Mongrel::HttpHandler
       attr_reader :files
       attr_reader :guard
@@ -42,16 +36,15 @@ module Mongrel
 
       def initialize(dir, mime_map = {})
         @files = Mongrel::DirHandler.new(dir,false)
-        @guard = Sync.new
+        @guard = Mutex.new
         @tick = Time.now
 
-        # register the requested mime types
+        # Register the requested MIME types
         mime_map.each {|k,v| Mongrel::DirHandler::add_mime_type(k,v) }
       end
 
       # Attempts to resolve the request as follows:
       #
-      #
       # * If the requested exact PATH_INFO exists as a file then serve it.
       # * If it exists at PATH_INFO+".html" exists then serve that.
       # * Finally, construct a Mongrel::CGIWrapper and run Dispatcher.dispatch to have Rails go.
@@ -61,27 +54,29 @@ module Mongrel
         end
 
         path_info = request.params[Mongrel::Const::PATH_INFO]
-        page_cached = path_info + ".html"
+        page_cached = path_info + ActionController::Base.page_cache_extension
         get_or_head = @@file_only_methods.include? request.params[Mongrel::Const::REQUEST_METHOD]
 
         if get_or_head and @files.can_serve(path_info)
           # File exists as-is so serve it up
           @files.process(request,response)
         elsif get_or_head and @files.can_serve(page_cached)
-          # possible cached page, serve it up
+          # Possible cached page, serve it up
           request.params[Mongrel::Const::PATH_INFO] = page_cached
           @files.process(request,response)
         else
           begin
             cgi = Mongrel::CGIWrapper.new(request, response)
             cgi.handler = self
-            # we don't want the output to be really final until we're out of the lock
+            # We don't want the output to be really final until we're out of the lock
             cgi.default_really_final = false
 
-            log_threads_waiting_for(request.params["PATH_INFO"]) if $mongrel_debug_client
+            log_threads_waiting_for(@active_request_path || request.params["PATH_INFO"]) if $mongrel_debug_client
 
-            @guard.synchronize(:EX) {
+            @guard.synchronize {
+              @active_request_path = request.params["PATH_INFO"] 
               Dispatcher.dispatch(cgi, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, response.body)
+              @active_request_path = nil
             }
 
             # This finalizes the output using the proper HttpResponse way
@@ -97,7 +92,6 @@ module Mongrel
 
       def log_threads_waiting_for(event)
         if Time.now - @tick > 10
-          STDERR.puts "#{Time.now}: #{@guard.sync_waiting.length} threads sync_waiting for #{event}, #{self.listener.workers.list.length} still active in mongrel."
           @tick = Time.now
         end
       end
@@ -106,7 +100,7 @@ module Mongrel
       # sometimes you get exceptions.  In that case just do a real restart.
       def reload!
         begin
-          @guard.synchronize(:EX) {
+          @guard.synchronize {
             $".replace $orig_dollar_quote
             GC.start
             Dispatcher.reset_application!
@@ -121,7 +115,7 @@ module Mongrel
     class RailsConfigurator < Mongrel::Configurator
 
       # Creates a single rails handler and returns it so you
-      # can add it to a uri. You can actually attach it to 
+      # can add it to a URI. You can actually attach it to 
       # as many URIs as you want, but this returns the 
       # same RailsHandler for each call.
       #
@@ -139,10 +133,10 @@ module Mongrel
       # one installed per Ruby interpreter (talk to them 
       # about thread safety).  Because of this the first
       # time you call this function it does all the config
-      # needed to get your rails working.  After that
+      # needed to get your Rails working.  After that
       # it returns the one handler you've configured.
-      # This lets you attach Rails to any URI (and multiple)
-      # you want, but still protects you from threads destroying
+      # This lets you attach Rails to any URI(s) you want,
+      # but it still protects you from threads destroying
       # your handler.
       def rails(options={})
 
@@ -167,18 +161,17 @@ module Mongrel
         @rails_handler = RailsHandler.new(ops[:docroot], ops[:mime])
       end
 
-
-      # Reloads rails.  This isn't too reliable really, but
-      # should work for most minimal reload purposes.  Only reliable
-      # way it so stop then start the process.
+      # Reloads Rails.  This isn't too reliable really, but it
+      # should work for most minimal reload purposes.  The only reliable
+      # way to reload properly is to stop and then start the process.
       def reload!
         if not @rails_handler
           raise "Rails was not configured.  Read the docs for RailsConfigurator."
         end
 
-        log "Reloading rails..."
+        log "Reloading Rails..."
         @rails_handler.reload!
-        log "Done reloading rails."
+        log "Done reloading Rails."
 
       end
 

data/lib/mutex_fix.rb

@@ -0,0 +1,34 @@
+require 'thread'
+
+# monkey patch Mutex so it does not leak memory.
+class Mutex
+
+  def lock
+    while (Thread.critical = true; @locked)
+      @waiting.unshift Thread.current
+      Thread.stop
+    end
+    @locked = true
+    Thread.critical = false
+    self
+  end
+  
+  def unlock
+    return unless @locked
+    Thread.critical = true
+    @locked = false
+    begin
+      t = @waiting.pop
+      t.wakeup if t
+    rescue ThreadError
+      retry
+    end
+    Thread.critical = false
+    begin
+      t.run if t
+    rescue ThreadError
+    end
+    self
+  end
+  
+end

data/test/test_handlers.rb

@@ -45,7 +45,7 @@ class HandlersTest < Test::Unit::TestCase
         uri "/", :handler => SimpleHandler.new
         uri "/", :handler => stats
         uri "/404", :handler => Mongrel::Error404Handler.new("Not found")
-        uri "/dumb", :handler => Mongrel::DeflateFilter.new(:always_deflate => true)
+        uri "/dumb", :handler => Mongrel::DeflateFilter.new
         uri "/dumb", :handler => DumbHandler.new, :in_front => true
         uri "/files", :handler => Mongrel::DirHandler.new("doc")
         uri "/files_nodir", :handler => Mongrel::DirHandler.new("doc",listing_allowed=false, index_html="none")
@@ -73,12 +73,24 @@ class HandlersTest < Test::Unit::TestCase
     check_status res, String
   end
 
-  def test_deflate_access
-    req = Net::HTTP::Get.new("http://localhost:9998/dumb")
+  def test_deflate
+    Net::HTTP.start("localhost", 9998) do |h|
+      # test that no accept-encoding returns a non-deflated response
+      req = h.get("/dumb")
+      assert(
+        !req.header['Content-Encoding'] ||
+        !req.header['Content-Encoding'].include?('deflate'))
+      assert_equal "test", req.body
+
+      req = h.get("/dumb", {"Accept-Encoding" => "deflate"})
+      # -MAX_WBITS stops zlib from looking for a zlib header
+      inflater = Zlib::Inflate.new(-Zlib::MAX_WBITS)
+      assert req.header['Content-Encoding'].include?('deflate')
+      assert_equal "test", inflater.inflate(req.body)
+    end
   end
 
   # TODO: find out why this fails on win32 but nowhere else
-  #
   #def test_posting_fails_dirhandler
   #  req = Net::HTTP::Post.new("http://localhost:9998/files/rdoc/")
   #  req.set_form_data({'from'=>'2005-01-01', 'to'=>'2005-03-31'}, ';')

data/test/test_http11.rb

@@ -35,6 +35,14 @@ class HttpParserTest < Test::Unit::TestCase
     assert_equal should_be_good.length, nread
     assert parser.finished?
     assert !parser.error?
+
+    nasty_pound_header = "GET / HTTP/1.1\r\nX-SSL-Bullshit:   -----BEGIN CERTIFICATE-----\r\n\tMIIFbTCCBFWgAwIBAgICH4cwDQYJKoZIhvcNAQEFBQAwcDELMAkGA1UEBhMCVUsx\r\n\tETAPBgNVBAoTCGVTY2llbmNlMRIwEAYDVQQLEwlBdXRob3JpdHkxCzAJBgNVBAMT\r\n\tAkNBMS0wKwYJKoZIhvcNAQkBFh5jYS1vcGVyYXRvckBncmlkLXN1cHBvcnQuYWMu\r\n\tdWswHhcNMDYwNzI3MTQxMzI4WhcNMDcwNzI3MTQxMzI4WjBbMQswCQYDVQQGEwJV\r\n\tSzERMA8GA1UEChMIZVNjaWVuY2UxEzARBgNVBAsTCk1hbmNoZXN0ZXIxCzAJBgNV\r\n\tBAcTmrsogriqMWLAk1DMRcwFQYDVQQDEw5taWNoYWVsIHBhcmQYJKoZIhvcNAQEB\r\n\tBQADggEPADCCAQoCggEBANPEQBgl1IaKdSS1TbhF3hEXSl72G9J+WC/1R64fAcEF\r\n\tW51rEyFYiIeZGx/BVzwXbeBoNUK41OK65sxGuflMo5gLflbwJtHBRIEKAfVVp3YR\r\n\tgW7cMA/s/XKgL1GEC7rQw8lIZT8RApukCGqOVHSi/F1SiFlPDxuDfmdiNzL31+sL\r\n\t0iwHDdNkGjy5pyBSB8Y79dsSJtCW/iaLB0/n8Sj7HgvvZJ7x0fr+RQjYOUUfrePP\r\n\tu2MSpFyf+9BbC/aXgaZuiCvSR+8Snv3xApQY+fULK/xY8h8Ua51iXoQ5jrgu2SqR\r\n\twgA7BUi3G8LFzMBl8FRCDYGUDy7M6QaHXx1ZWIPWNKsCAwEAAaOCAiQwggIgMAwG\r\n\tA1UdEwEB/wQCMAAwEQYJYIZIAYb4QgEBBAQDAgWgMA4GA1UdDwEB/wQEAwID6DAs\r\n\tBglghkgBhvhCAQ0EHxYdVUsgZS1TY2llbmNlIFVzZXIgQ2VydGlmaWNhdGUwHQYD\r\n\tVR0OBBYEFDTt/sf9PeMaZDHkUIldrDYMNTBZMIGaBgNVHSMEgZIwgY+AFAI4qxGj\r\n\tloCLDdMVKwiljjDastqooXSkcjBwMQswCQYDVQQGEwJVSzERMA8GA1UEChMIZVNj\r\n\taWVuY2UxEjAQBgNVBAsTCUF1dGhvcml0eTELMAkGA1UEAxMCQ0ExLTArBgkqhkiG\r\n\t9w0BCQEWHmNhLW9wZXJhdG9yQGdyaWQtc3VwcG9ydC5hYy51a4IBADApBgNVHRIE\r\n\tIjAggR5jYS1vcGVyYXRvckBncmlkLXN1cHBvcnQuYWMudWswGQYDVR0gBBIwEDAO\r\n\tBgwrBgEEAdkvAQEBAQYwPQYJYIZIAYb4QgEEBDAWLmh0dHA6Ly9jYS5ncmlkLXN1\r\n\tcHBvcnQuYWMudmT4sopwqlBWsvcHViL2NybC9jYWNybC5jcmwwPQYJYIZIAYb4QgEDBDAWLmh0\r\n\tdHA6Ly9jYS5ncmlkLXN1cHBvcnQuYWMudWsvcHViL2NybC9jYWNybC5jcmwwPwYD\r\n\tVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NhLmdyaWQt5hYy51ay9wdWIv\r\n\tY3JsL2NhY3JsLmNybDANBgkqhkiG9w0BAQUFAAOCAQEAS/U4iiooBENGW/Hwmmd3\r\n\tXCy6Zrt08YjKCzGNjorT98g8uGsqYjSxv/hmi0qlnlHs+k/3Iobc3LjS5AMYr5L8\r\n\tUO7OSkgFFlLHQyC9JzPfmLCAugvzEbyv4Olnsr8hbxF1MbKZoQxUZtMVu29wjfXk\r\n\thTeApBv7eaKCWpSp7MCbvgzm74izKhu3vlDk9w6qVrxePfGgpKPqfHiOoGhFnbTK\r\n\twTC6o2xq5y0qZ03JonF7OJspEd3I5zKY3E+ov7/ZhW6DqT8UFvsAdjvQbXyhV8Eu\r\n\tYhixw1aKEPzNjNowuIseVogKOLXxWI5vAi5HgXdS0/ES5gDGsABo4fqovUKlgop3\r\n\tRA==\r\n\t-----END CERTIFICATE-----\r\n\r\n"
+    parser = HttpParser.new
+    req = {}
+    #nread = parser.execute(req, nasty_pound_header, 0)
+    #assert_equal nasty_pound_header.length, nread
+    #assert parser.finished?
+    #assert !parser.error?
   end
   
   def test_parse_error

data/test/test_request_progress.rb

@@ -17,6 +17,12 @@ class UploadBeginHandler < Mongrel::HttpHandler
     @request_notify = true
   end
 
+  def reset
+    @request_began = 
+      @request_progressed = 
+        @request_processed = false
+  end
+
   def request_begins(params)
     @request_began = true
   end
@@ -34,9 +40,7 @@ class UploadBeginHandler < Mongrel::HttpHandler
 
 end
 
-
 class RequestProgressTest < Test::Unit::TestCase
-
   def setup
     @server = Mongrel::HttpServer.new("127.0.0.1", 9998)
     @handler = UploadBeginHandler.new
@@ -55,4 +59,43 @@ class RequestProgressTest < Test::Unit::TestCase
     assert @handler.request_processed
   end
 
+  def call_and_assert_handlers_in_turn(handlers)
+    # reset all handlers
+    handlers.each { |h| h.reset }
+
+    # make the call
+    Net::HTTP.get("localhost", "/upload", 9998)
+
+    # assert that each one was fired
+    handlers.each { |h|
+      assert h.request_began && h.request_progressed && h.request_processed,
+        "Callbacks NOT fired for #{h}"
+    }
+  end
+
+  def test_more_than_one_begin_end_progress
+    handlers = [@handler]
+
+    second = UploadBeginHandler.new
+    @server.register("/upload", second)
+    handlers << second
+    call_and_assert_handlers_in_turn(handlers)
+
+    # check three handlers
+    third = UploadBeginHandler.new
+    @server.register("/upload", third)
+    handlers << third
+    call_and_assert_handlers_in_turn(handlers)
+
+    # remove handlers to make sure they've all gone away
+    @server.unregister("/upload")
+    handlers.each { |h| h.reset }
+    Net::HTTP.get("localhost", "/upload", 9998)
+    handlers.each { |h|
+      assert !h.request_began && !h.request_progressed && !h.request_processed
+    }
+
+    # re-register upload to the state before this test
+    @server.register("/upload", @handler)
+  end
 end

data/test/test_response.rb

@@ -37,6 +37,37 @@ class ResponseTest < Test::Unit::TestCase
     assert io.length > 0, "output didn't have data"
   end
 
+  def test_response_duplicate_header_squash
+    io = StringIO.new
+    resp = HttpResponse.new(io)
+    resp.start do |head,out|
+      head["Content-Length"] = 30
+      head["Content-Length"] = 0
+    end
+
+    resp.finished
+
+    assert_equal io.length, 95, "too much output"
+  end
+
+
+  def test_response_some_duplicates_allowed
+    allowed_duplicates = ["Set-Cookie", "Set-Cookie2", "Warning", "WWW-Authenticate"]
+    io = StringIO.new
+    resp = HttpResponse.new(io)
+    resp.start do |head,out|
+      allowed_duplicates.each do |dup|
+        10.times do |i|
+          head[dup] = i
+        end
+      end
+    end
+
+    resp.finished
+
+    assert_equal io.length, 734, "wrong amount of output"
+  end
+
   def test_response_404
     io = StringIO.new
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: mongrel
 version: !ruby/object:Gem::Version 
-  version: 0.3.13.4
-date: 2006-09-18 00:00:00 -07:00
-summary: A small fast HTTP library and server that runs Rails, Camping, and Nitro apps.
+  version: "1.0"
+date: 2007-01-19 00:00:00 -08:00
+summary: A small fast HTTP library and server that runs Rails, Camping, Nitro and Iowa apps.
 require_paths: 
 - lib
 email: 
 homepage: 
 rubyforge_project: 
-description: A small fast HTTP library and server that runs Rails, Camping, and Nitro apps.
+description: A small fast HTTP library and server that runs Rails, Camping, Nitro and Iowa apps.
 autorequire: 
 default_executable: 
 bindir: bin
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Zed A. Shaw
 files: 
@@ -32,9 +33,7 @@ files:
 - LICENSE
 - README
 - Rakefile
-- bin/mongrel_rails_svc
 - bin/mongrel_rails
-- bin/mongrel_rails_service
 - doc/rdoc/files
 - doc/rdoc/index.html
 - doc/rdoc/rdoc-style.css
@@ -51,6 +50,7 @@ files:
 - doc/rdoc/files/ext/http11
 - doc/rdoc/files/ext/http11/http11_c.html
 - doc/rdoc/files/lib/mongrel_rb.html
+- doc/rdoc/files/lib/mutex_fix_rb.html
 - doc/rdoc/files/lib/mongrel
 - doc/rdoc/files/lib/mongrel/tcphack_rb.html
 - doc/rdoc/files/lib/mongrel/handlers_rb.html
@@ -63,6 +63,7 @@ files:
 - doc/rdoc/files/lib/mongrel/debug_rb.html
 - doc/rdoc/files/lib/mongrel/configurator_rb.html
 - doc/rdoc/classes/IO.src
+- doc/rdoc/classes/Mutex.src
 - doc/rdoc/classes/RequestLog.html
 - doc/rdoc/classes/Kernel.src
 - doc/rdoc/classes/Kernel.html
@@ -74,11 +75,13 @@ files:
 - doc/rdoc/classes/TCPServer.html
 - doc/rdoc/classes/MongrelDbg.src
 - doc/rdoc/classes/MongrelDbg.html
-- doc/rdoc/classes/Sync.html
-- doc/rdoc/classes/IO.src/M000001.html
-- doc/rdoc/classes/IO.src/M000002.html
-- doc/rdoc/classes/Kernel.src/M000010.html
-- doc/rdoc/classes/Kernel.src/M000011.html
+- doc/rdoc/classes/Mutex.html
+- doc/rdoc/classes/IO.src/M000003.html
+- doc/rdoc/classes/IO.src/M000004.html
+- doc/rdoc/classes/Mutex.src/M000001.html
+- doc/rdoc/classes/Mutex.src/M000002.html
+- doc/rdoc/classes/Kernel.src/M000012.html
+- doc/rdoc/classes/Kernel.src/M000013.html
 - doc/rdoc/classes/RequestLog/Threads.html
 - doc/rdoc/classes/RequestLog/Objects.html
 - doc/rdoc/classes/RequestLog/Params.html
@@ -89,12 +92,12 @@ files:
 - doc/rdoc/classes/RequestLog/Threads.src
 - doc/rdoc/classes/RequestLog/Access.html
 - doc/rdoc/classes/RequestLog/Files.src
-- doc/rdoc/classes/RequestLog/Objects.src/M000147.html
-- doc/rdoc/classes/RequestLog/Access.src/M000144.html
-- doc/rdoc/classes/RequestLog/Params.src/M000148.html
-- doc/rdoc/classes/RequestLog/Threads.src/M000146.html
-- doc/rdoc/classes/RequestLog/Files.src/M000145.html
-- doc/rdoc/classes/TCPServer.src/M000003.html
+- doc/rdoc/classes/RequestLog/Objects.src/M000150.html
+- doc/rdoc/classes/RequestLog/Access.src/M000147.html
+- doc/rdoc/classes/RequestLog/Params.src/M000151.html
+- doc/rdoc/classes/RequestLog/Threads.src/M000149.html
+- doc/rdoc/classes/RequestLog/Files.src/M000148.html
+- doc/rdoc/classes/TCPServer.src/M000005.html
 - doc/rdoc/classes/Mongrel/HttpServer.src
 - doc/rdoc/classes/Mongrel/Rails.html
 - doc/rdoc/classes/Mongrel/Rails
@@ -141,8 +144,6 @@ files:
 - doc/rdoc/classes/Mongrel/DirHandler.src
 - doc/rdoc/classes/Mongrel/DeflateFilter.src
 - doc/rdoc/classes/Mongrel/HeaderOut.html
-- doc/rdoc/classes/Mongrel/HttpServer.src/M000055.html
-- doc/rdoc/classes/Mongrel/HttpServer.src/M000056.html
 - doc/rdoc/classes/Mongrel/HttpServer.src/M000057.html
 - doc/rdoc/classes/Mongrel/HttpServer.src/M000058.html
 - doc/rdoc/classes/Mongrel/HttpServer.src/M000059.html
@@ -150,30 +151,30 @@ files:
 - doc/rdoc/classes/Mongrel/HttpServer.src/M000061.html
 - doc/rdoc/classes/Mongrel/HttpServer.src/M000062.html
 - doc/rdoc/classes/Mongrel/HttpServer.src/M000063.html
+- doc/rdoc/classes/Mongrel/HttpServer.src/M000064.html
+- doc/rdoc/classes/Mongrel/HttpServer.src/M000065.html
 - doc/rdoc/classes/Mongrel/Rails/RailsConfigurator.src
 - doc/rdoc/classes/Mongrel/Rails/RailsHandler.src
 - doc/rdoc/classes/Mongrel/Rails/RailsConfigurator.html
 - doc/rdoc/classes/Mongrel/Rails/RailsHandler.html
-- doc/rdoc/classes/Mongrel/Rails/RailsConfigurator.src/M000032.html
-- doc/rdoc/classes/Mongrel/Rails/RailsConfigurator.src/M000033.html
 - doc/rdoc/classes/Mongrel/Rails/RailsConfigurator.src/M000034.html
-- doc/rdoc/classes/Mongrel/Rails/RailsHandler.src/M000035.html
-- doc/rdoc/classes/Mongrel/Rails/RailsHandler.src/M000036.html
+- doc/rdoc/classes/Mongrel/Rails/RailsConfigurator.src/M000035.html
+- doc/rdoc/classes/Mongrel/Rails/RailsConfigurator.src/M000036.html
 - doc/rdoc/classes/Mongrel/Rails/RailsHandler.src/M000037.html
 - doc/rdoc/classes/Mongrel/Rails/RailsHandler.src/M000038.html
+- doc/rdoc/classes/Mongrel/Rails/RailsHandler.src/M000039.html
+- doc/rdoc/classes/Mongrel/Rails/RailsHandler.src/M000040.html
 - doc/rdoc/classes/Mongrel/Camping/CampingHandler.src
 - doc/rdoc/classes/Mongrel/Camping/CampingHandler.html
-- doc/rdoc/classes/Mongrel/Camping/CampingHandler.src/M000040.html
-- doc/rdoc/classes/Mongrel/Camping/CampingHandler.src/M000041.html
-- doc/rdoc/classes/Mongrel/HttpHandlerPlugin.src/M000012.html
-- doc/rdoc/classes/Mongrel/HttpHandlerPlugin.src/M000013.html
+- doc/rdoc/classes/Mongrel/Camping/CampingHandler.src/M000042.html
+- doc/rdoc/classes/Mongrel/Camping/CampingHandler.src/M000043.html
 - doc/rdoc/classes/Mongrel/HttpHandlerPlugin.src/M000014.html
 - doc/rdoc/classes/Mongrel/HttpHandlerPlugin.src/M000015.html
-- doc/rdoc/classes/Mongrel/StatisticsFilter.src/M000125.html
-- doc/rdoc/classes/Mongrel/StatisticsFilter.src/M000126.html
-- doc/rdoc/classes/Mongrel/StatisticsFilter.src/M000127.html
-- doc/rdoc/classes/Mongrel/Configurator.src/M000091.html
-- doc/rdoc/classes/Mongrel/Configurator.src/M000092.html
+- doc/rdoc/classes/Mongrel/HttpHandlerPlugin.src/M000016.html
+- doc/rdoc/classes/Mongrel/HttpHandlerPlugin.src/M000017.html
+- doc/rdoc/classes/Mongrel/StatisticsFilter.src/M000128.html
+- doc/rdoc/classes/Mongrel/StatisticsFilter.src/M000129.html
+- doc/rdoc/classes/Mongrel/StatisticsFilter.src/M000130.html
 - doc/rdoc/classes/Mongrel/Configurator.src/M000093.html
 - doc/rdoc/classes/Mongrel/Configurator.src/M000094.html
 - doc/rdoc/classes/Mongrel/Configurator.src/M000095.html
@@ -193,21 +194,22 @@ files:
 - doc/rdoc/classes/Mongrel/Configurator.src/M000109.html
 - doc/rdoc/classes/Mongrel/Configurator.src/M000110.html
 - doc/rdoc/classes/Mongrel/Configurator.src/M000111.html
+- doc/rdoc/classes/Mongrel/Configurator.src/M000112.html
+- doc/rdoc/classes/Mongrel/Configurator.src/M000113.html
+- doc/rdoc/classes/Mongrel/Configurator.src/M000114.html
 - doc/rdoc/classes/Mongrel/HttpRequest.src/M000135.html
-- doc/rdoc/classes/Mongrel/HttpRequest.src/M000130.html
-- doc/rdoc/classes/Mongrel/HttpRequest.src/M000131.html
-- doc/rdoc/classes/Mongrel/HttpRequest.src/M000132.html
+- doc/rdoc/classes/Mongrel/HttpRequest.src/M000136.html
+- doc/rdoc/classes/Mongrel/HttpRequest.src/M000137.html
+- doc/rdoc/classes/Mongrel/HttpRequest.src/M000138.html
 - doc/rdoc/classes/Mongrel/HttpRequest.src/M000133.html
 - doc/rdoc/classes/Mongrel/HttpRequest.src/M000134.html
 - doc/rdoc/classes/Mongrel/Command/Registry.html
 - doc/rdoc/classes/Mongrel/Command/Registry.src
 - doc/rdoc/classes/Mongrel/Command/Base.html
 - doc/rdoc/classes/Mongrel/Command/Base.src
-- doc/rdoc/classes/Mongrel/Command/Registry.src/M000029.html
-- doc/rdoc/classes/Mongrel/Command/Registry.src/M000030.html
 - doc/rdoc/classes/Mongrel/Command/Registry.src/M000031.html
-- doc/rdoc/classes/Mongrel/Command/Base.src/M000016.html
-- doc/rdoc/classes/Mongrel/Command/Base.src/M000017.html
+- doc/rdoc/classes/Mongrel/Command/Registry.src/M000032.html
+- doc/rdoc/classes/Mongrel/Command/Registry.src/M000033.html
 - doc/rdoc/classes/Mongrel/Command/Base.src/M000018.html
 - doc/rdoc/classes/Mongrel/Command/Base.src/M000019.html
 - doc/rdoc/classes/Mongrel/Command/Base.src/M000020.html
@@ -219,23 +221,25 @@ files:
 - doc/rdoc/classes/Mongrel/Command/Base.src/M000026.html
 - doc/rdoc/classes/Mongrel/Command/Base.src/M000027.html
 - doc/rdoc/classes/Mongrel/Command/Base.src/M000028.html
-- doc/rdoc/classes/Mongrel/Error404Handler.src/M000123.html
-- doc/rdoc/classes/Mongrel/Error404Handler.src/M000124.html
-- doc/rdoc/classes/Mongrel/Stats.src/M000136.html
-- doc/rdoc/classes/Mongrel/Stats.src/M000137.html
-- doc/rdoc/classes/Mongrel/Stats.src/M000138.html
+- doc/rdoc/classes/Mongrel/Command/Base.src/M000029.html
+- doc/rdoc/classes/Mongrel/Command/Base.src/M000030.html
+- doc/rdoc/classes/Mongrel/Error404Handler.src/M000126.html
+- doc/rdoc/classes/Mongrel/Error404Handler.src/M000127.html
 - doc/rdoc/classes/Mongrel/Stats.src/M000139.html
 - doc/rdoc/classes/Mongrel/Stats.src/M000140.html
 - doc/rdoc/classes/Mongrel/Stats.src/M000141.html
 - doc/rdoc/classes/Mongrel/Stats.src/M000142.html
 - doc/rdoc/classes/Mongrel/Stats.src/M000143.html
-- doc/rdoc/classes/Mongrel/Camping.src/M000039.html
-- doc/rdoc/classes/Mongrel/StatusHandler.src/M000066.html
-- doc/rdoc/classes/Mongrel/StatusHandler.src/M000067.html
+- doc/rdoc/classes/Mongrel/Stats.src/M000144.html
+- doc/rdoc/classes/Mongrel/Stats.src/M000145.html
+- doc/rdoc/classes/Mongrel/Stats.src/M000146.html
+- doc/rdoc/classes/Mongrel/Camping.src/M000041.html
 - doc/rdoc/classes/Mongrel/StatusHandler.src/M000068.html
 - doc/rdoc/classes/Mongrel/StatusHandler.src/M000069.html
-- doc/rdoc/classes/Mongrel/HeaderOut.src/M000064.html
-- doc/rdoc/classes/Mongrel/HeaderOut.src/M000065.html
+- doc/rdoc/classes/Mongrel/StatusHandler.src/M000070.html
+- doc/rdoc/classes/Mongrel/StatusHandler.src/M000071.html
+- doc/rdoc/classes/Mongrel/HeaderOut.src/M000066.html
+- doc/rdoc/classes/Mongrel/HeaderOut.src/M000067.html
 - doc/rdoc/classes/Mongrel/HttpResponse.src/M000076.html
 - doc/rdoc/classes/Mongrel/HttpResponse.src/M000077.html
 - doc/rdoc/classes/Mongrel/HttpResponse.src/M000078.html
@@ -245,48 +249,48 @@ files:
 - doc/rdoc/classes/Mongrel/HttpResponse.src/M000082.html
 - doc/rdoc/classes/Mongrel/HttpResponse.src/M000083.html
 - doc/rdoc/classes/Mongrel/HttpResponse.src/M000084.html
-- doc/rdoc/classes/Mongrel/HttpResponse.src/M000073.html
-- doc/rdoc/classes/Mongrel/HttpResponse.src/M000074.html
+- doc/rdoc/classes/Mongrel/HttpResponse.src/M000085.html
+- doc/rdoc/classes/Mongrel/HttpResponse.src/M000086.html
 - doc/rdoc/classes/Mongrel/HttpResponse.src/M000075.html
-- doc/rdoc/classes/Mongrel/HttpParser.src/M000042.html
-- doc/rdoc/classes/Mongrel/HttpParser.src/M000043.html
 - doc/rdoc/classes/Mongrel/HttpParser.src/M000044.html
 - doc/rdoc/classes/Mongrel/HttpParser.src/M000045.html
 - doc/rdoc/classes/Mongrel/HttpParser.src/M000046.html
 - doc/rdoc/classes/Mongrel/HttpParser.src/M000047.html
 - doc/rdoc/classes/Mongrel/HttpParser.src/M000048.html
-- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000112.html
-- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000113.html
-- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000114.html
+- doc/rdoc/classes/Mongrel/HttpParser.src/M000049.html
+- doc/rdoc/classes/Mongrel/HttpParser.src/M000050.html
 - doc/rdoc/classes/Mongrel/CGIWrapper.src/M000115.html
 - doc/rdoc/classes/Mongrel/CGIWrapper.src/M000116.html
 - doc/rdoc/classes/Mongrel/CGIWrapper.src/M000117.html
 - doc/rdoc/classes/Mongrel/CGIWrapper.src/M000118.html
 - doc/rdoc/classes/Mongrel/CGIWrapper.src/M000119.html
 - doc/rdoc/classes/Mongrel/CGIWrapper.src/M000120.html
-- doc/rdoc/classes/Mongrel/RedirectHandler.src/M000128.html
-- doc/rdoc/classes/Mongrel/RedirectHandler.src/M000129.html
-- doc/rdoc/classes/Mongrel/HttpHandler.src/M000070.html
-- doc/rdoc/classes/Mongrel/HttpHandler.src/M000071.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000121.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000122.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000123.html
+- doc/rdoc/classes/Mongrel/RedirectHandler.src/M000131.html
+- doc/rdoc/classes/Mongrel/RedirectHandler.src/M000132.html
 - doc/rdoc/classes/Mongrel/HttpHandler.src/M000072.html
-- doc/rdoc/classes/Mongrel/URIClassifier.src/M000085.html
-- doc/rdoc/classes/Mongrel/URIClassifier.src/M000086.html
+- doc/rdoc/classes/Mongrel/HttpHandler.src/M000073.html
+- doc/rdoc/classes/Mongrel/HttpHandler.src/M000074.html
 - doc/rdoc/classes/Mongrel/URIClassifier.src/M000087.html
 - doc/rdoc/classes/Mongrel/URIClassifier.src/M000088.html
 - doc/rdoc/classes/Mongrel/URIClassifier.src/M000089.html
 - doc/rdoc/classes/Mongrel/URIClassifier.src/M000090.html
-- doc/rdoc/classes/Mongrel/DirHandler.src/M000049.html
-- doc/rdoc/classes/Mongrel/DirHandler.src/M000050.html
+- doc/rdoc/classes/Mongrel/URIClassifier.src/M000091.html
+- doc/rdoc/classes/Mongrel/URIClassifier.src/M000092.html
 - doc/rdoc/classes/Mongrel/DirHandler.src/M000051.html
 - doc/rdoc/classes/Mongrel/DirHandler.src/M000052.html
 - doc/rdoc/classes/Mongrel/DirHandler.src/M000053.html
 - doc/rdoc/classes/Mongrel/DirHandler.src/M000054.html
-- doc/rdoc/classes/Mongrel/DeflateFilter.src/M000121.html
-- doc/rdoc/classes/Mongrel/DeflateFilter.src/M000122.html
+- doc/rdoc/classes/Mongrel/DirHandler.src/M000055.html
+- doc/rdoc/classes/Mongrel/DirHandler.src/M000056.html
+- doc/rdoc/classes/Mongrel/DeflateFilter.src/M000124.html
+- doc/rdoc/classes/Mongrel/DeflateFilter.src/M000125.html
 - doc/rdoc/classes/MongrelDbg.src/M000008.html
 - doc/rdoc/classes/MongrelDbg.src/M000009.html
-- doc/rdoc/classes/MongrelDbg.src/M000005.html
-- doc/rdoc/classes/MongrelDbg.src/M000006.html
+- doc/rdoc/classes/MongrelDbg.src/M000010.html
+- doc/rdoc/classes/MongrelDbg.src/M000011.html
 - doc/rdoc/classes/MongrelDbg.src/M000007.html
 - test/mongrel.conf
 - test/test_http11.rb
@@ -327,6 +331,7 @@ files:
 - tools/trickletest.rb
 - tools/rakehelp.rb
 - lib/mongrel.rb
+- lib/mutex_fix.rb
 - lib/mongrel/handlers.rb
 - lib/mongrel/camping.rb
 - lib/mongrel/tcphack.rb
@@ -339,6 +344,7 @@ files:
 - lib/mongrel/configurator.rb
 - ext/http11/MANIFEST
 - setup.rb
+- lib/mongrel/mime_types.yml
 test_files: 
 - test/test_http11.rb
 - test/test_configurator.rb
@@ -370,7 +376,16 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.2
+        version: 1.0.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: fastthread
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: gem_plugin
@@ -379,5 +394,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.1
+        version: 0.2.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: cgi_multipart_eof_fix
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
     version: