From 39b89ceeb4a875f12ed90278d291f5ea9135f35a Mon Sep 17 00:00:00 2001 From: nagachika Date: Tue, 19 May 2015 17:05:35 +0000 Subject: 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 --- lib/resolv.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'lib') 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 -- cgit v1.2.3