diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 11:29:46 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 11:29:46 +0000 |
| commit | e5f3a01e31e23b1a437f658ad494a71e5111130b (patch) | |
| tree | 9ce1d34622a14e88901f3aab5ddabe04951feecf /lib | |
| parent | 306831553d32b7fc083e3edc2336d9853c7a9968 (diff) | |
merge revision(s) 15823:
* lib/resolv.rb (Resolv::Hosts): should not use win32/resolv on cygwin.
[ruby-dev:29945], [ruby-dev:34095]
* lib/win32/registry.rb (Win32::Registry.expand_environ): try upcased
name too for cygwin. [ruby-dev:29945]
* lib/win32/resolv.rb (Win32::Resolv.get_hosts_path): use expand_path.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17212 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/resolv.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/resolv.rb b/lib/resolv.rb index 49e40bdf07..898686fd3e 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -278,7 +278,7 @@ class Resolv end class Hosts - if /mswin32|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM + if /mswin32|mingw|bccwin/ =~ RUBY_PLATFORM require 'win32/resolv' DefaultFileName = Win32::Resolv.get_hosts_path else |