diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-10-24 11:41:15 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-10-24 11:41:15 +0000 |
| commit | 0a4daf8a252fd08872df5b3610fdfe080c816dfa (patch) | |
| tree | 5a4d9226c45d7fa65157269a94b2d584f84cca5a | |
| parent | a025cf172fd44de02f0dc54ea1863de7d74e644c (diff) | |
| download | ruby-0a4daf8a252fd08872df5b3610fdfe080c816dfa.tar.gz ruby-0a4daf8a252fd08872df5b3610fdfe080c816dfa.tar.xz ruby-0a4daf8a252fd08872df5b3610fdfe080c816dfa.zip | |
* ext/Win32API/lib/win32/resolv.rb (get_info): support multiple DNS.
fixed: [ruby-list:40058], [ruby-dev:27479]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -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: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> * 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 5a99d04d5..6534d2076 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 |