pullup:

1174.   [bug]           Win32: add WSAECONNRESET to the expected errors
                        from connect(). [RT #2308]

diff --git a/CHANGES b/CHANGES
index 8636b201358136a9fbaab273a609e502704af2cb..b6bc8d494472fe4d8f5dc607eda04fb5244b31a8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,9 @@
                        exceptions when printing "out of memory" errors.
                        [RT #2335]
 
+1174.  [bug]           Win32: add WSAECONNRESET to the expected errors
+                       from connect(). [RT #2308]
+
 1165.  [bug]           We were rejecting notify-source{-v6} in zone clauses.
 
 1164.  [bug]           Empty masters clauses in slave / stub zones were not

diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 6757d52c59d77bb7981b5a601d7f6b6274b293f9..d9ae41900223fac80928dc372df92cb079982e1d 100644 (file)
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.5.2.1 2001/09/17 22:28:57 gson Exp $ */
+/* $Id: socket.c,v 1.5.2.2 2002/01/23 01:07:54 gson Exp $ */
 
 
 #define MAKE_EXTERNAL 1
@@ -2918,6 +2918,7 @@ isc_socket_connect(isc_socket_t *sock, isc_sockaddr_t *addr,
                        ERROR_MATCH(WSAENOBUFS, ISC_R_NORESOURCES);
                        ERROR_MATCH(EPERM, ISC_R_HOSTUNREACH);
                        ERROR_MATCH(EPIPE, ISC_R_NOTCONNECTED);
+                       ERROR_MATCH(WSAECONNRESET, ISC_R_CONNECTIONRESET);
 #undef ERROR_MATCH
                }