diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-02 08:07:47 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-02 08:07:47 +0000 |
| commit | f4c3951e7139a9c6cbd8df91fd970c485bdc6498 (patch) | |
| tree | a0e6c3788c84328a276c7274c6c66322549c204d /lib/resolv.rb | |
| parent | 9d2c121e6a6644addf2bc2c0984b0f8e32693f7f (diff) | |
merges r21933 from trunk into ruby_1_9_1. win64 support.
* lib/xmlrpc/server.rb (Server#serve): gets rid of hardcoded
platform names.
* lib/resolv.rb (Resolv::Hosts::DefaultFileName),
(Resolv::DNS::Config.default_config_hash): tries win32/resolv on
mswin64 too.
* lib/rubygems/specification.rb (Gem::Specification#ruby_code):
aded mswin64.
* lib/drb/extservm.rb (DRb::ExtServManager#invoke_service_command):
spawn is better to start a process in background.
* ext/extmk.rb: uses FNM_SYSCASE.
* instruby.rb: installs win32.h on mswin64 platform.
[ruby-core:21722]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21960 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/resolv.rb')
| -rw-r--r-- | lib/resolv.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/resolv.rb b/lib/resolv.rb index fc3c78215b..b201fcfabf 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -165,7 +165,7 @@ class Resolv # DNS::Hosts is a hostname resolver that uses the system hosts file. class Hosts - if /mswin32|mingw|bccwin/ =~ RUBY_PLATFORM + if /mswin|mingw|bccwin/ =~ RUBY_PLATFORM require 'win32/resolv' DefaultFileName = Win32::Resolv.get_hosts_path else @@ -817,7 +817,7 @@ class Resolv if File.exist? filename config_hash = Config.parse_resolv_conf(filename) else - if /mswin32|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM + if /mswin|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM require 'win32/resolv' search, nameserver = Win32::Resolv.get_resolv_info config_hash = {} |