yugui	2010-01-10 20:34:40 +0900 (Sun, 10 Jan 2010)

  New Revision: 26272

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26272

  Log:
    Fix for the previous commit

  Modified files:
    branches/ruby_1_9_1/lib/webrick/httpstatus.rb
    branches/ruby_1_9_1/test/webrick/test_cgi.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/lib/webrick/httpstatus.rb
===================================================================
--- ruby_1_9_1/lib/webrick/httpstatus.rb	(revision 26271)
+++ ruby_1_9_1/lib/webrick/httpstatus.rb	(revision 26272)
@@ -13,8 +13,9 @@
   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
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 26271)
+++ ruby_1_9_1/version.h	(revision 26272)
@@ -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
Index: ruby_1_9_1/test/webrick/test_cgi.rb
===================================================================
--- ruby_1_9_1/test/webrick/test_cgi.rb	(revision 26271)
+++ ruby_1_9_1/test/webrick/test_cgi.rb	(revision 26272)
@@ -113,7 +113,7 @@
       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 @@
       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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/