diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/resolv.rb | 10 | ||||
| -rw-r--r-- | test/resolv/test_dns.rb | 7 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 23 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Wed May 20 01:58:12 2015 Tanaka Akira <akr@fsij.org> + + * lib/resolv.rb (Resolv::DNS::Label::Str#==): Check class equality. + (Resolv::DNS::Name#initialize): Normalize labels as + Resolv::DNS::Label::Str objects. + Wed May 20 01:47:23 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * iseq.c (rb_iseq_compile_with_option): check source type, must be diff --git a/lib/resolv.rb b/lib/resolv.rb index 7855c6eeb8..dee6afd1f5 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -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 diff --git a/test/resolv/test_dns.rb b/test/resolv/test_dns.rb index 8e54dd7904..d7e5c3683a 100644 --- a/test/resolv/test_dns.rb +++ b/test/resolv/test_dns.rb @@ -190,4 +190,11 @@ class TestResolvDNS < Test::Unit::TestCase upper = Resolv::DNS::Name.create("Ruby-Lang.org") assert_equal(lower, upper, bug10550) end + + def test_ipv6_name + addr = Resolv::IPv6.new("\0"*16) + labels = addr.to_name.to_a + expected = (['0'] * 32 + ['ip6', 'arpa']).map {|label| Resolv::DNS::Label::Str.new(label) } + assert_equal(expected, labels) + end end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.3" #define RUBY_RELEASE_DATE "2015-05-20" -#define RUBY_PATCHLEVEL 103 +#define RUBY_PATCHLEVEL 104 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 5 |