diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-12 05:27:20 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-12 05:27:20 +0000 |
commit | 9b3f70d1ed391a1527264b144100db084e36e823 (patch) | |
tree | 251d2b027a9af9b28fdc2fc6c066e879fb0d36b5 | |
parent | 58f77932a45873d691d9dab1f042da45822bd991 (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_3@54550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/uri/http.rb | 6 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Tue Apr 12 14:27:04 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] + Thu Apr 7 01:07:02 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * sprintf.c (rb_str_format): fix buffer overflow, length must be 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 @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.3.0" -#define RUBY_RELEASE_DATE "2016-04-07" -#define RUBY_PATCHLEVEL 75 +#define RUBY_RELEASE_DATE "2016-04-12" +#define RUBY_PATCHLEVEL 76 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 7 +#define RUBY_RELEASE_DAY 12 #include "ruby/version.h" |