diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-16 09:28:08 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-16 09:28:08 +0000 |
| commit | 94c6f3d3ca393a9e4ee7ce4382a48ce9f7431889 (patch) | |
| tree | cb9c08540e0f53a2cc7b1a51f64774cb7dde4e29 /lib/resolv.rb | |
| parent | ed5aa4217cf41b2122a01c79a970cd74593fabbc (diff) | |
merge revision(s) 49071,49072,49073,49078: [Backport #10550]
* lib/resolv.rb (Resolv::DNS::Name): names with different dots
should be different.
* lib/resolv.rb (Resolv::DNS::Name#==): DNS is case-insensitive, so the
comparison should be case-insensitive as well.
[ruby-core:66498] [Bug #10550]
* lib/resolv.rb (Resolv::DNS::Name#==): Compare an array of Label:Str
objects. Label#Str#== is case-insensitive.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/resolv.rb')
| -rw-r--r-- | lib/resolv.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/resolv.rb b/lib/resolv.rb index c19aeacd05..3f3ed41a47 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -1236,7 +1236,8 @@ class Resolv def ==(other) # :nodoc: return false unless Name === other - return @labels.join == other.to_a.join && @absolute == other.absolute? + return false unless @absolute == other.absolute? + return @labels == other.to_a end alias eql? == # :nodoc: |