From 0530c97906bfe522aff7c726ec385a15556073fd Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 23 Aug 2004 03:44:32 +0000 Subject: * lib/resolv.rb (Config.default_config_hash): when multiple domains are set, Win32::Resolv.get_resolv_info returns Array. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/resolv.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7482d948b..62473fd2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Aug 23 12:43:32 2004 NAKAMURA Usaku + + * lib/resolv.rb (Config.default_config_hash): when multiple domains + are set, Win32::Resolv.get_resolv_info returns Array. + Sun Aug 22 16:27:38 2004 GOTOU Yuuzou * ext/openssl/ossl_ssl.c (ossl_ssl_read): diff --git a/lib/resolv.rb b/lib/resolv.rb index d3f441bfc..069cf5c8f 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 -- cgit