Fix for the previous commit

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
headius · Jan 10, 2010 · 0b0aafc · 0b0aafc
1 parent eb87f15
commit 0b0aafc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/lib/webrick/httpstatus.rb b/lib/webrick/httpstatus.rb
@@ -13,8 +13,9 @@ module WEBrick
   module HTTPStatus
 
     class Status      < StandardError
-      def initialize(message, *rest)
-        super(AccessLog.escape(message), *rest)
+      def initialize(*args)
+        args[0] = AccessLog.escape(args[0]) unless args.empty?
+        super(*args)
       end
       class << self
         attr_reader :code, :reason_phrase

diff --git a/test/webrick/test_cgi.rb b/test/webrick/test_cgi.rb
@@ -113,7 +113,7 @@ def test_bad_uri
       assert_match(%r{\AHTTP/\d.\d 400 Bad Request}, res)
       s = log.call.each_line.grep(/ERROR bad URI/)[0]
       assert_match(DumpPat, s)
-      assert_not_match(CtrlPat, s)
+      refute_match(CtrlPat, s)
     }
   end
 
@@ -127,7 +127,7 @@ def test_bad_header
       assert_match(%r{\AHTTP/\d.\d 400 Bad Request}, res)
       s = log.call.each_line.grep(/ERROR bad header/)[0]
       assert_match(DumpPat, s)
-      assert_not_match(CtrlPat, s)
+      refute_match(CtrlPat, s)
     }
   end
 end
diff --git a/version.h b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 377
+#define RUBY_PATCHLEVEL 378
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1