From 926fd9a939e82e22302a95769fac0dacd294f134 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 19 Jan 2010 11:00:33 +0000 Subject: [PATCH] * lib/resolv.rb (Resolv::Config.default_config_hash): return an empty hash when resolv.conf is not available. [ruby-core:27620] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- lib/resolv.rb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 290f71d7b4..a5da8aa2eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -Tue Jan 19 19:58:26 2010 Nobuyoshi Nakada +Tue Jan 19 20:00:30 2010 Nobuyoshi Nakada + + * 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