merge revision(s) 49620: [Backport #10857]

	* lib/resolv.rb (Resolv::DNS::Resource#==, #hash): elements
	  returned by Kernel#instance_variables are Symbols now.
	  [ruby-core:68128] [Bug #10857]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49639 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 33 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index f2059d097d..93bf9d7a9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb 18 16:02:30 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/resolv.rb (Resolv::DNS::Resource#==, #hash): elements
+	  returned by Kernel#instance_variables are Symbols now.
+	  [ruby-core:68128] [Bug #10857]
+
 Tue Feb 17 17:37:14 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/socket/getaddrinfo.c (get_addr): reject too long hostname to
diff --git a/lib/resolv.rb b/lib/resolv.rb
index 788806b470..1f38cd1070 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -1641,10 +1641,10 @@ class Resolv
         return false unless self.class == other.class
         s_ivars = self.instance_variables
         s_ivars.sort!
-        s_ivars.delete "@ttl"
+        s_ivars.delete :@ttl
         o_ivars = other.instance_variables
         o_ivars.sort!
-        o_ivars.delete "@ttl"
+        o_ivars.delete :@ttl
         return s_ivars == o_ivars &&
           s_ivars.collect {|name| self.instance_variable_get name} ==
             o_ivars.collect {|name| other.instance_variable_get name}
@@ -1657,7 +1657,7 @@ class Resolv
       def hash # :nodoc:
         h = 0
         vars = self.instance_variables
-        vars.delete "@ttl"
+        vars.delete :@ttl
         vars.each {|name|
           h ^= self.instance_variable_get(name).hash
         }
diff --git a/test/resolv/test_resource.rb b/test/resolv/test_resource.rb
new file mode 100644
index 0000000000..7ec17e33e7
--- /dev/null
+++ b/test/resolv/test_resource.rb
@@ -0,0 +1,21 @@
+require 'test/unit'
+require 'resolv'
+
+class TestResolvResource < Test::Unit::TestCase
+  def setup
+    address = "192.168.0.1"
+    @name1 = Resolv::DNS::Resource::IN::A.new(address)
+    @name1.instance_variable_set(:@ttl, 100)
+    @name2 = Resolv::DNS::Resource::IN::A.new(address)
+  end
+
+  def test_equality
+    bug10857 = '[ruby-core:68128] [Bug #10857]'
+    assert_equal(@name1, @name2, bug10857)
+  end
+
+  def test_hash
+    bug10857 = '[ruby-core:68128] [Bug #10857]'
+    assert_equal(@name1.hash, @name2.hash, bug10857)
+  end
+end
diff --git a/version.h b/version.h
index 3302f7b2e8..492cc6ade0 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2015-02-17"
-#define RUBY_PATCHLEVEL 633
+#define RUBY_RELEASE_DATE "2015-02-18"
+#define RUBY_PATCHLEVEL 634
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 17
+#define RUBY_RELEASE_DAY 18
 
 #include "ruby/version.h"