aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-31 12:51:13 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-31 12:51:13 +0000
commit7011534ea865cd5fd19050388cc77495cabfba09 (patch)
treececc3ade710c8bae28fa9d88862469815d2bc14f
parent3642fa19920a3ad567ead8b1211fdac9a4e963d1 (diff)
downloadruby-7011534ea865cd5fd19050388cc77495cabfba09.tar.gz
* lib/resolv.rb (Resolv::DNS::Requester#request): rescue ECONNRESET
for Windows. reported by U.Nakamura. [ruby-dev:41477] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28109 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/resolv.rb3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fb5024bbe0..1c8ceebcbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon May 31 21:49:42 2010 Tanaka Akira <akr@fsij.org>
+
+ * lib/resolv.rb (Resolv::DNS::Requester#request): rescue ECONNRESET
+ for Windows. reported by U.Nakamura. [ruby-dev:41477]
+
Mon May 31 19:25:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* regparse.c (onig_syntax_warn): do not use external strings as
diff --git a/lib/resolv.rb b/lib/resolv.rb
index f238439116..590a26bcf5 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -640,7 +640,8 @@ class Resolv
end
begin
reply, from = recv_reply(select_result[0])
- rescue Errno::ECONNREFUSED
+ rescue Errno::ECONNREFUSED, # GNU/Linux, FreeBSD
+ Errno::ECONNRESET # Windows
# No name server running on the server?
# Don't wait anymore.
raise ResolvTimeout