summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-14 07:49:35 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-14 07:49:35 +0000
commit568a5d520b0917e8cfe62c871de1ea6dd4939e2f (patch)
tree6a57dc0b3df6da55af0ddf8cceec21626b8e4bfd /lib
parentf9d88c6059f8b3e512401790ad82574e12c8ccb1 (diff)
merge revision(s) 49071-49073,49078: [Backport #10550]
* 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): names with different dots should be different. * 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_0_0@49252 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/resolv.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/resolv.rb b/lib/resolv.rb
index a302d8a6af..73b9861078 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -1209,7 +1209,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: