From f27ececfaef052cf8d28505711b30a161cce8574 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 31 Oct 2009 13:04:11 +0000
Subject: merges r24742 from trunk into ruby_1_9_1. -- *
 lib/webrick/httpservlet/abstract.rb (do_OPTIONS): method names   are symbols
 now.  [ruby-core:24580]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25586 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/webrick/httpservlet/abstract.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/webrick/httpservlet/abstract.rb b/lib/webrick/httpservlet/abstract.rb
index 2a0a4049f..f8bf14a33 100644
--- a/lib/webrick/httpservlet/abstract.rb
+++ b/lib/webrick/httpservlet/abstract.rb
@@ -48,8 +48,7 @@ module WEBrick
       end
 
       def do_OPTIONS(req, res)
-        m = self.methods.grep(/^do_[A-Z]+$/)
-        m.collect!{|i| i.sub(/do_/, "") }
+        m = self.methods.grep(/\Ado_([A-Z]+)\z/) {$1}
         m.sort!
         res["allow"] = m.join(",")
       end
-- 
cgit