akr	2008-04-10 14:13:15 +0900 (Thu, 10 Apr 2008)

  New Revision: 15946

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/resolv.rb

  Log:
    * lib/resolv.rb (Resolv::DNS#each_address): backport from 1.9 for
      CNAME.  [ruby-dev:34200]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15946&r2=15945&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/resolv.rb?r1=15946&r2=15945&diff_format=u

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 15945)
+++ ruby_1_8/ChangeLog	(revision 15946)
@@ -1,3 +1,8 @@
+Thu Apr 10 14:00:44 2008  Tanaka Akira  <akr@f...>
+
+	* lib/resolv.rb (Resolv::DNS#each_address): backport from 1.9 for
+	  CNAME.  [ruby-dev:34200]
+
 Thu Apr 10 01:42:25 2008  NAKAMURA Usaku  <usa@r...>
 
 	* enum.c (iterate_method): add prototype to avoid warning on VC++.
Index: ruby_1_8/lib/resolv.rb
===================================================================
--- ruby_1_8/lib/resolv.rb	(revision 15945)
+++ ruby_1_8/lib/resolv.rb	(revision 15946)
@@ -387,16 +387,8 @@
     # be a Resolv::IPv4 or Resolv::IPv6
 
     def each_address(name)
-      buf = []
-      each_resource(name, Resource::IN::ANY) do |resource|
-	case resource.address
-	when Resolv::IPv4
-	  yield resource.address
-	when Resolv::IPv6
-	  buf << resource.address
-	end
-      end
-      buf.each {|resource| yield resource.address}
+      each_resource(name, Resource::IN::A) {|resource| yield resource.address}
+      each_resource(name, Resource::IN::AAAA) {|resource| yield resource.address}
     end
 
     ##

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