about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorevanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9>2007-09-24 16:37:26 +0000
committerevanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9>2007-09-24 16:37:26 +0000
commit467fcb5d8bbdc2ed250d6d4f3aa4cc7bc0e28c59 (patch)
tree3f3781eb4e96befab261f9cb887e7a1d210b2f35
parentfd9a2271ffac8073c3f02986b906d782f6b249b7 (diff)
downloadunicorn-467fcb5d8bbdc2ed250d6d4f3aa4cc7bc0e28c59.tar.gz
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@625 19e92222-5c0b-0410-8929-a290d50e31e9
-rw-r--r--lib/mongrel/handlers.rb2
-rw-r--r--test/test_handlers.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/mongrel/handlers.rb b/lib/mongrel/handlers.rb
index 60472a8..761bd4e 100644
--- a/lib/mongrel/handlers.rb
+++ b/lib/mongrel/handlers.rb
@@ -431,7 +431,7 @@ module Mongrel
 
     def initialize(pattern, replacement = nil, &block)
       unless replacement or block
-        @replacement = pattern
+        @pattern, @replacement = nil, pattern
       else
         @pattern, @replacement, @block = pattern, replacement, block
       end
diff --git a/test/test_handlers.rb b/test/test_handlers.rb
index d5f440d..fd8437d 100644
--- a/test/test_handlers.rb
+++ b/test/test_handlers.rb
@@ -78,14 +78,14 @@ class HandlersTest < Test::Unit::TestCase
       # 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'))
+        !req['Content-Encoding'] ||
+        !req['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 req['Content-Encoding'].include?('deflate')
       assert_equal "test", inflater.inflate(req.body)
     end
   end