From: Mark Andrews <marka@isc.org>
Date: Mon, 17 May 2004 03:02:23 +0000 (+0000)
Subject: 1638.   [bug]           win32: isc_socket_cancel(ISC_SOCKCANCEL_ACCEPT) was
X-Git-Tag: v9.2.4rc4~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b1cf81ee0e588405cf303261a2857ab9b8810e4;p=thirdparty%2Fbind9.git

1638.   [bug]           win32: isc_socket_cancel(ISC_SOCKCANCEL_ACCEPT) was
                        incorrectly closing the socket.  [RT #11291]
---

diff --git a/CHANGES b/CHANGES
index 40314bbfb53..a3d4ac93e90 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1638.	[bug]		win32: isc_socket_cancel(ISC_SOCKCANCEL_ACCEPT) was
+			incorrectly closing the socket.  [RT #11291]
+
 1633.	[bug]		named should return NOTIMP to update requests to a
 			slaves without a allow-update-forwarding acl specified.
 			[RT #11331]
diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 4f6513b5de9..773f6274db7 100644
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.5.2.20 2004/05/04 00:14:47 marka Exp $ */
+/* $Id: socket.c,v 1.5.2.21 2004/05/17 03:02:23 marka Exp $ */
 
 /* This code has been rewritten to take advantage of Windows Sockets
  * I/O Completion Ports and Events. I/O Completion Ports is ONLY
@@ -3656,7 +3656,6 @@ isc_socket_cancel(isc_socket_t *sock, isc_task_t *task, unsigned int how) {
 		isc_socket_newconnev_t *next;
 		isc_task_t	       *current_task;
 
-		socket_event_delete(sock);
 		dev = ISC_LIST_HEAD(sock->accept_list);
 
 		while (dev != NULL) {