From ec7f1f5dc23b331e09340e0431b17eb5307aeddb Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 2 Jan 2015 00:10:04 +0000
Subject: * lib/resolv.rb (Resolv::DNS::Label::Str#==): Check class equality.  
 (Resolv::DNS::Name#initialize): Normalize labels as   Resolv::DNS::Label::Str
 objects.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49095 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/resolv.rb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/resolv.rb b/lib/resolv.rb
index 3b7ab2a394..a801cf6ff4 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -1185,7 +1185,7 @@ class Resolv
         end
 
         def ==(other)
-          return @downcase == other.downcase
+          return self.class == other.class && @downcase == other.downcase
         end
 
         def eql?(other)
@@ -1221,6 +1221,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
-- 
cgit v1.2.3