* lib/resolv.rb (Resolv::Config.default_config_hash): requires

  win32/resolv to use Win32::Resolv.  [ruby-dev:34138]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15869 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index ef5d1567d5..57c29ec729 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Apr  1 01:55:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/resolv.rb (Resolv::Config.default_config_hash): requires
+	  win32/resolv to use Win32::Resolv.  [ruby-dev:34138]
+
 Sun Mar 30 07:00:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/tk/tcltklib.c: rb_hash_lookup has not been backported yet.
diff --git a/lib/resolv.rb b/lib/resolv.rb
index 80032255c8..d4c2eb414d 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -785,6 +785,7 @@ class Resolv
           config_hash = Config.parse_resolv_conf(filename)
         else
           if /mswin32|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM
+            require 'win32/resolv'
             search, nameserver = Win32::Resolv.get_resolv_info
             config_hash = {}
             config_hash[:nameserver] = nameserver if nameserver
diff --git a/version.h b/version.h
index 998a339921..bcef2e524b 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-03-30"
+#define RUBY_RELEASE_DATE "2008-04-01"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080330
+#define RUBY_RELEASE_CODE 20080401
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2008
-#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 30
+#define RUBY_RELEASE_MONTH 4
+#define RUBY_RELEASE_DAY 1
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];