yugui	2009-10-31 22:04:11 +0900 (Sat, 31 Oct 2009)

  New Revision: 25586

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

  Log:
    merges r24742 from trunk into ruby_1_9_1.
    --
    * lib/webrick/httpservlet/abstract.rb (do_OPTIONS): method names
      are symbols now.  [ruby-core:24580]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/webrick/httpservlet/abstract.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 25585)
+++ ruby_1_9_1/ChangeLog	(revision 25586)
@@ -1,3 +1,8 @@
+Fri Sep  4 04:46:08 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/webrick/httpservlet/abstract.rb (do_OPTIONS): method names
+	  are symbols now.  [ruby-core:24580]
+
 Sun Mar 15 09:17:26 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* common.mk (.y.c): use SRC_FILE which contains slashes instead of
Index: ruby_1_9_1/lib/webrick/httpservlet/abstract.rb
===================================================================
--- ruby_1_9_1/lib/webrick/httpservlet/abstract.rb	(revision 25585)
+++ ruby_1_9_1/lib/webrick/httpservlet/abstract.rb	(revision 25586)
@@ -48,8 +48,7 @@
       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
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 25585)
+++ ruby_1_9_1/version.h	(revision 25586)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 311
+#define RUBY_PATCHLEVEL 312
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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