nobu	2010-01-19 20:00:33 +0900 (Tue, 19 Jan 2010)

  New Revision: 26358

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26358

  Log:
    * lib/resolv.rb (Resolv::Config.default_config_hash): return an
      empty hash when resolv.conf is not available.  [ruby-core:27620]

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/resolv.rb
    trunk/ChangeLog
    trunk/lib/resolv.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 26357)
+++ ChangeLog	(revision 26358)
@@ -1,5 +1,8 @@
-Tue Jan 19 19:58:26 2010  Nobuyoshi Nakada  <nobu@r...>
+Tue Jan 19 20:00:30 2010  Nobuyoshi Nakada  <nobu@r...>
 
+	* 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.
 
Index: lib/resolv.rb
===================================================================
--- lib/resolv.rb	(revision 26357)
+++ lib/resolv.rb	(revision 26358)
@@ -850,7 +850,7 @@
             config_hash[:search] = [search].flatten if search
           end
         end
-        config_hash
+        config_hash || {}
       end
 
       def lazy_initialize
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 26357)
+++ ruby_1_8/ChangeLog	(revision 26358)
@@ -1,3 +1,8 @@
+Tue Jan 19 20:00:30 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/resolv.rb (Resolv::Config.default_config_hash): return an
+	  empty hash when resolv.conf is not available.  [ruby-core:27620]
+
 Tue Jan 19 14:29:16 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* Makefile.in (clean-ext): allow glob patterns.
Index: ruby_1_8/lib/resolv.rb
===================================================================
--- ruby_1_8/lib/resolv.rb	(revision 26357)
+++ ruby_1_8/lib/resolv.rb	(revision 26358)
@@ -831,7 +831,7 @@
             config_hash[:search] = [search].flatten if search
           end
         end
-        config_hash
+        config_hash || {}
       end
 
       def lazy_initialize

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/