1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* ext/Win32API/lib/win32/resolv.rb (get_info): support multiple DNS.

fixed: [ruby-list:40058], [ruby-dev:27479]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2005-10-24 11:41:15 +00:00
parent e03da456b9
commit c90f3b2d90
2 changed files with 7 additions and 2 deletions

View file

@ -1,3 +1,8 @@
Mon Oct 24 20:38:25 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/Win32API/lib/win32/resolv.rb (get_info): support multiple DNS.
fixed: [ruby-list:40058], [ruby-dev:27479]
Mon Oct 24 11:01:11 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Mon Oct 24 11:01:11 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/canvas.rb (TkCanvasItemConfig::__item_val2ruby_optkeys): * ext/tk/lib/tk/canvas.rb (TkCanvasItemConfig::__item_val2ruby_optkeys):

View file

@ -84,7 +84,7 @@ if info.unpack('V5')[4] == 2 # VER_PLATFORM_WIN32_NT
[ 'NameServer', 'DhcpNameServer' ].each do |key| [ 'NameServer', 'DhcpNameServer' ].each do |key|
ns = regif.read_s(key) ns = regif.read_s(key)
unless ns.empty? unless ns.empty?
nameserver.concat(ns.split(/\s+/)) nameserver.concat(ns.split(/[,\s]\s*/))
break break
end end
end end
@ -141,7 +141,7 @@ else
slist = reg.read_s("SearchList") slist = reg.read_s("SearchList")
search << domain unless domain.empty? search << domain unless domain.empty?
search.concat(slist.split(/,\s*/)) search.concat(slist.split(/,\s*/))
nameserver.concat(ns.split(/,\s*/)) nameserver.concat(ns.split(/[,\s]\s*/))
end end
end end
rescue Registry::Error rescue Registry::Error