aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/uri/http.rb6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 19915e009d..3edf4a55d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 25 11:08:37 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/uri/http.rb (URI::HTTP#initialize): [DOC] fix example,
+ missing mandatory arguments. [ruby-core:74540] [Bug #12215]
+
Fri Mar 25 01:50:58 2016 NARUSE, Yui <naruse@ruby-lang.org>
* thread_pthread.c (reserve_stack): fix reserving position where
diff --git a/lib/uri/http.rb b/lib/uri/http.rb
index d43e9a28e0..81ae846fd9 100644
--- a/lib/uri/http.rb
+++ b/lib/uri/http.rb
@@ -63,6 +63,7 @@ module URI
return super(tmp)
end
+=begin
#
# == Description
#
@@ -75,8 +76,8 @@ module URI
#
# Example:
#
- # uri = URI::HTTP.new('http', nil, "www.example.com", nil, "/path",
- # "query", 'fragment')
+ # uri = URI::HTTP.new("http", nil, "www.example.com", nil, nil,
+ # "/path", nil, "query", "fragment")
#
#
# See also URI::Generic.new
@@ -84,6 +85,7 @@ module URI
def initialize(*arg)
super(*arg)
end
+=end
#
# == Description