From 49d2947666fb32d4a4963f77a754dec2557e0e12 Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 31 Oct 2009 13:04:11 +0000 Subject: [PATCH] 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25586 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/webrick/httpservlet/abstract.rb | 3 +-- version.h | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f977f2a68..cf1bdb564a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Sep 4 04:46:08 2009 Nobuyoshi Nakada + + * lib/webrick/httpservlet/abstract.rb (do_OPTIONS): method names + are symbols now. [ruby-core:24580] + Sun Mar 15 09:17:26 2009 Nobuyoshi Nakada * common.mk (.y.c): use SRC_FILE which contains slashes instead of diff --git a/lib/webrick/httpservlet/abstract.rb b/lib/webrick/httpservlet/abstract.rb index 2a0a4049f2..f8bf14a330 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 diff --git a/version.h b/version.h index 3541b5d70a..f3cad1beea 100644 --- a/version.h +++ b/version.h @@ -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