diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-19 17:05:35 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-19 17:05:35 +0000 |
commit | 39b89ceeb4a875f12ed90278d291f5ea9135f35a (patch) | |
tree | 37603806e112faf91e170ec65e2beaa69104ba5b /lib/resolv.rb | |
parent | 73a48a1482ff18c7c5f39adeb403206b8fb6e37e (diff) |
merge revision(s) 49095: [Backport #11150]
* lib/resolv.rb (Resolv::DNS::Label::Str#==): Check class equality.
(Resolv::DNS::Name#initialize): Normalize labels as
Resolv::DNS::Label::Str objects.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50544 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/resolv.rb')
-rw-r--r-- | lib/resolv.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/resolv.rb b/lib/resolv.rb index 7855c6eeb8..dee6afd1f5 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -1183,7 +1183,7 @@ class Resolv end def ==(other) - return @downcase == other.downcase + return self.class == other.class && @downcase == other.downcase end def eql?(other) @@ -1219,6 +1219,14 @@ class Resolv end def initialize(labels, absolute=true) # :nodoc: + labels = labels.map {|label| + case label + when String then Label::Str.new(label) + when Label::Str then label + else + raise ArgumentError, "unexpected label: #{label.inspect}" + end + } @labels = labels @absolute = absolute end |