diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 12:08:23 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 12:08:23 +0000 |
| commit | 1a019c0e1253803a411fbc3c9894f2c605ded1ca (patch) | |
| tree | cd660afae177b15d1fcf261d723c336a6cf89961 /lib | |
| parent | ee2dcc40d10db50e375e5e281bd6adf56e37b297 (diff) | |
merge revision(s) 15869:
* 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_6@17226 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/resolv.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/resolv.rb b/lib/resolv.rb index 898686fd3e..1792fd8178 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -759,6 +759,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 |