mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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_2@54427 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
82752cc1ce
commit
0e0c793e2e
3 changed files with 12 additions and 5 deletions
|
|
@ -1,3 +1,8 @@
|
|||
Wed Mar 30 05:13:25 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 02:22:35 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
|
||||
|
||||
* lib/uri/mailto.rb: raising URI::InvalidComponentError instead
|
||||
|
|
|
|||
|
|
@ -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,10 +1,10 @@
|
|||
#define RUBY_VERSION "2.2.5"
|
||||
#define RUBY_RELEASE_DATE "2016-03-29"
|
||||
#define RUBY_PATCHLEVEL 285
|
||||
#define RUBY_RELEASE_DATE "2016-03-30"
|
||||
#define RUBY_PATCHLEVEL 286
|
||||
|
||||
#define RUBY_RELEASE_YEAR 2016
|
||||
#define RUBY_RELEASE_MONTH 3
|
||||
#define RUBY_RELEASE_DAY 29
|
||||
#define RUBY_RELEASE_DAY 30
|
||||
|
||||
#include "ruby/version.h"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue