diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-27 17:21:43 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-27 17:21:43 +0000 |
| commit | 02dcfb7873ba818f1e51de2e30708ae6dba90024 (patch) | |
| tree | 2155ab88953d0a46e299a0b886b5a25565e6ca84 /lib | |
| parent | 13112e53367035c28600baf4ac416cadb5e60759 (diff) | |
merge revision(s) r49071,r49072,r49073,r49078: [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_1@49775 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -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 1d2c3f7899..55aa9638ba 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -1240,7 +1240,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: |