akr	2010-11-27 18:03:26 +0900 (Sat, 27 Nov 2010)

  New Revision: 29950

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29950

  Log:
    * resolv.rb (Resolv::DNS): use the same DNS server when retry using TCP.
      reported by Julian Mehnle.  [ruby-core:32970]

  Modified files:
    trunk/ChangeLog
    trunk/lib/resolv.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29949)
+++ ChangeLog	(revision 29950)
@@ -1,3 +1,8 @@
+Sat Nov 27 17:57:08 2010  Tanaka Akira  <akr@f...>
+
+	* resolv.rb (Resolv::DNS): use the same DNS server when retry using
+	  TCP.  reported by Julian Mehnle.  [ruby-core:32970]
+
 Sat Nov 27 15:45:27 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_dump.c (rb_vm_bugreport): see CrashReport log on Mac OS X.
Index: lib/resolv.rb
===================================================================
--- lib/resolv.rb	(revision 29949)
+++ lib/resolv.rb	(revision 29950)
@@ -509,7 +509,7 @@
             if reply.tc == 1 and not Requester::TCP === requester
               requester.close
               # Retry via TCP:
-              requester = make_tcp_requester
+              requester = make_tcp_requester(nameserver, port)
               senders = {}
               # This will use TCP for all remaining candidates (assuming the
               # current candidate does not already respond successfully via
@@ -540,9 +540,8 @@
       end
     end
 
-    def make_tcp_requester # :nodoc:
-      nameserver_port = @config.nameserver_port
-      return Requester::TCP.new(*nameserver_port[0])
+    def make_tcp_requester(host, port) # :nodoc:
+      return Requester::TCP.new(host, port)
     end
 
     def extract_resources(msg, name, typeclass) # :nodoc:

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/