diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-08-23 03:44:32 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-08-23 03:44:32 +0000 |
| commit | 3ee84033f1016cce164026059465ada7601e6524 (patch) | |
| tree | d200213e5a5f7d26d0ab5b0084af8a05789d2cf4 | |
| parent | 345df36cda770549a9c5d064da2c9324c621f6fc (diff) | |
* lib/resolv.rb (Config.default_config_hash): when multiple domains
are set, Win32::Resolv.get_resolv_info returns Array.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/resolv.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Aug 23 12:40:56 2004 NAKAMURA Usaku <usa@ruby-lang.org> + + * lib/resolv.rb (Config.default_config_hash): when multiple domains + are set, Win32::Resolv.get_resolv_info returns Array. + Sun Aug 22 01:15:31 2004 GOTOU Yuuzou <gotoyuzo@notwork.org> * lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect): diff --git a/lib/resolv.rb b/lib/resolv.rb index d3f441bfc7..069cf5c8f1 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -751,7 +751,7 @@ class Resolv search, nameserver = Win32::Resolv.get_resolv_info config_hash = {} config_hash[:nameserver] = nameserver if nameserver - config_hash[:search] = [search] if search + config_hash[:search] = [search].flatten if search end end config_hash |