archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 18:13:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merges r24742 from trunk into ruby_1_9_1.

Browse source 
--
* 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
This commit is contained in:
yugui 2009-10-31 13:04:11 +00:00
parent ea057a5b20
commit 49d2947666
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Sep 4 04:46:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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@ruby-lang.org> Sun Mar 15 09:17:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (.y.c): use SRC_FILE which contains slashes instead of * common.mk (.y.c): use SRC_FILE which contains slashes instead of

3
lib/webrick/httpservlet/abstract.rb
View file

@ -48,8 +48,7 @@ module WEBrick
end end
def do_OPTIONS(req, res) def do_OPTIONS(req, res)
m = self.methods.grep(/^do_[A-Z]+$/) m = self.methods.grep(/\Ado_([A-Z]+)\z/) {$1}
m.collect!{|i| i.sub(/do_/, "") }
m.sort! m.sort!
res["allow"] = m.join(",") res["allow"] = m.join(",")
end end

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1" #define RUBY_VERSION "1.9.1"
#define RUBY_PATCHLEVEL 311 #define RUBY_PATCHLEVEL 312
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1