diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 12:09:08 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 12:09:08 +0000 |
commit | 1a5d5856f5bf00d26124e3fd0f87d61d059bb668 (patch) | |
tree | 8c6c38244c598ae2e801990a2bc9cbec265f05e3 | |
parent | bcccff509d38fb162abda41df232e8f4f15821e9 (diff) |
merge revision(s) 54257: [Backport #12215]
* lib/uri/http.rb (URI::HTTP#initialize): [DOC] fix example,
missing mandatory arguments. [ruby-core:74540] [Bug #12215]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54395 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/uri/http.rb | 6 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Tue Mar 29 21:09:02 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] + Tue Mar 29 21:07:30 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 9877b1ee59..fb23a5d4c9 100644 --- a/lib/uri/http.rb +++ b/lib/uri/http.rb @@ -62,6 +62,7 @@ module URI return super(tmp) end +=begin # # == Description # @@ -74,8 +75,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 @@ -83,6 +84,7 @@ module URI def initialize(*arg) super(*arg) end +=end # # == Description @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.9" #define RUBY_RELEASE_DATE "2016-03-29" -#define RUBY_PATCHLEVEL 487 +#define RUBY_PATCHLEVEL 488 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 |