summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-30 07:03:47 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-30 07:03:47 +0000
commita0325ea70402a11c3d04cafd43753344bb2648c7 (patch)
treeb85a77d5dedee3d9fcfb5db33a47e3b9ff41bab1
parent5cc1e95be3f552b907b3f5cfc2d1d79907087273 (diff)
resolv.rb: dots differences
* lib/resolv.rb (Resolv::DNS::Name): names with different dots should be different. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/resolv.rb3
-rw-r--r--test/resolv/test_dns.rb6
3 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d676d38..4452bb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 30 16:03:45 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/resolv.rb (Resolv::DNS::Name): names with different dots
+ should be different.
+
Tue Dec 30 13:16:56 2014 Martin Duerst <bernhard+git@lsmod.de>
* lib/uri/common.rb: Initialize HTML5ASCIIINCOMPAT to empty Array
diff --git a/lib/resolv.rb b/lib/resolv.rb
index c19aeac..f6971bf 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 @labels.join('.') == other.to_a.join('.') &&
+ @absolute == other.absolute?
end
alias eql? == # :nodoc:
diff --git a/test/resolv/test_dns.rb b/test/resolv/test_dns.rb
index 8334622..00e5142 100644
--- a/test/resolv/test_dns.rb
+++ b/test/resolv/test_dns.rb
@@ -177,4 +177,10 @@ class TestResolvDNS < Test::Unit::TestCase
end
end
end
+
+ def test_case_insensitive_name
+ name1 = Resolv::DNS::Name.create("example.org")
+ name2 = Resolv::DNS::Name.create("ex.ampl.eo.rg")
+ assert_not_equal(name1, name2, "different dots")
+ end
end