2940. [port] Remove connection aborted error message on

                        Windows. [RT #21549]

diff --git a/CHANGES b/CHANGES
index cbdfc23c2b28cd0e0526438b5948e5ca8204f2fa..2377abcc1c1224ed34854fdc722f0cb30507fa0e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,9 @@
 2941.  [bug]           sdb and sdlz (dlz's zone database) failed to support
                        DNAME at the zone apex.  [RT #21610]
 
+2940.  [port]          Remove connection aborted error message on
+                       Windows. [RT #21549]
+
 2939.  [func]          Check that named successfully skips NSEC3 records
                        that fail to match the NSEC3PARAM record currently
                        in use. [RT# 21868]

diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 14e2e6ffe47136bb6848b98e001b8408dac47762..08c1d8d3575ac9b6833c7c527098794b3287a21f 100644 (file)
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.81 2009/11/10 18:31:47 each Exp $ */
+/* $Id: socket.c,v 1.81.22.1 2010/08/16 22:55:17 marka Exp $ */
 
 /* This code uses functions which are only available on Server 2003 and
  * higher, and Windows XP and higher.
@@ -2439,7 +2439,8 @@ SocketIoThread(LPVOID ThreadContext) {
                                send_recvdone_abort(sock, isc_result);
                                if ((isc_result == ISC_R_UNEXPECTED) ||
                                    ((isc_result == ISC_R_CONNECTIONRESET) &&
-                                    (errstatus != ERROR_OPERATION_ABORTED)) ||
+                                    (errstatus != ERROR_OPERATION_ABORTED) &&
+                                    (errstatus != ERROR_CONNECTION_ABORTED)) ||
                                    (isc_result == ISC_R_HOSTUNREACH)) {
                                        UNEXPECTED_ERROR(__FILE__, __LINE__,
                                                "SOCKET_RECV: Windows error code: %d, returning ISC error %d",