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
This commit is contained in:
nagachika 2015-05-19 17:05:35 +00:00
parent 73a48a1482
commit 39b89ceeb4
4 changed files with 23 additions and 2 deletions

View file

@ -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