diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/resolv.rb | 2 |
2 files changed, 5 insertions, 2 deletions
@@ -1,4 +1,7 @@ -Tue Jan 19 19:58:26 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Jan 19 20:00:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/resolv.rb (Resolv::Config.default_config_hash): return an + empty hash when resolv.conf is not available. [ruby-core:27620] * lib/resolv.rb (Resolv::DNS::Config#lazy_initialize): fixed the defaults of nameserver and port. diff --git a/lib/resolv.rb b/lib/resolv.rb index cf1a1b9a75..b9bb536c2e 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -850,7 +850,7 @@ class Resolv config_hash[:search] = [search].flatten if search end end - config_hash + config_hash || {} end def lazy_initialize |