From 7011534ea865cd5fd19050388cc77495cabfba09 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 31 May 2010 12:51:13 +0000
Subject: [PATCH] * 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
---
 ChangeLog     | 5 +++++
 lib/resolv.rb | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

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