From 495e46a2b07944c984ae417a5c93431c79ff6228 Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 10 Apr 2008 05:13:15 +0000 Subject: * lib/resolv.rb (Resolv::DNS#each_address): backport from 1.9 for CNAME. [ruby-dev:34200] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15946 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/resolv.rb | 12 ++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a3f7e356e..94a6ffae7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Apr 10 14:00:44 2008 Tanaka Akira + + * 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 * enum.c (iterate_method): add prototype to avoid warning on VC++. diff --git a/lib/resolv.rb b/lib/resolv.rb index d4c2eb414d..08f80e071c 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -387,16 +387,8 @@ class Resolv # 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 ## -- cgit v1.2.3