aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-29 14:14:38 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-29 14:14:38 +0000
commitd5a775f5271e214273b7a2888a3a755040c6b50a (patch)
tree285428ae9fe8e1b2df2134e0c2286f6575a9df5d
parent4173fb0cb542724d1e7493b361af0d22038335c9 (diff)
downloadruby-d5a775f5271e214273b7a2888a3a755040c6b50a.tar.gz
* lib/webrick/https.rb (WEBrick::HTTPRequest#parse_uri):
keep parse_uri as private. patched by okkez. [Bug #4773] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31780 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/webrick/https.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e848b7d4f..e29dea769d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 29 23:10:42 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/webrick/https.rb (WEBrick::HTTPRequest#parse_uri):
+ keep parse_uri as private. patched by okkez. [Bug #4773]
+
Sun May 29 17:53:03 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
* numeric.c: add #include "interna.h" for rb_big_uminus() prototype.
diff --git a/lib/webrick/https.rb b/lib/webrick/https.rb
index dd9d178618..abb428451f 100644
--- a/lib/webrick/https.rb
+++ b/lib/webrick/https.rb
@@ -38,6 +38,7 @@ module WEBrick
end
return orig_parse_uri(str)
end
+ private :parse_uri
alias orig_meta_vars meta_vars