diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/Win32API/lib/win32/resolv.rb | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Mon Oct 24 20:49:45 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 07:57:56 2005 Yukihiro Matsumoto <matz@ruby-lang.org> * ext/tk/lib/tk/canvas.rb (TkCanvasItemConfig::__item_val2ruby_optkeys): diff --git a/ext/Win32API/lib/win32/resolv.rb b/ext/Win32API/lib/win32/resolv.rb index 5a99d04d55..6534d20760 100644 --- a/ext/Win32API/lib/win32/resolv.rb +++ b/ext/Win32API/lib/win32/resolv.rb @@ -84,7 +84,7 @@ if info.unpack('V5')[4] == 2 # VER_PLATFORM_WIN32_NT [ 'NameServer', 'DhcpNameServer' ].each do |key| ns = regif.read_s(key) unless ns.empty? - nameserver.concat(ns.split(/\s+/)) + nameserver.concat(ns.split(/[,\s]\s*/)) break end end @@ -141,7 +141,7 @@ else slist = reg.read_s("SearchList") search << domain unless domain.empty? search.concat(slist.split(/,\s*/)) - nameserver.concat(ns.split(/,\s*/)) + nameserver.concat(ns.split(/[,\s]\s*/)) end end rescue Registry::Error |