1640. [bug] win32: isc_socket_cancel(ISC_SOCKCANCEL_ACCEPT) was

                        incorrectly closing the socket.  [RT #11291]

diff --git a/CHANGES b/CHANGES
index b29cc971a5f8475c1792135b4107a004606d6797..9cdf77afcd575d420b9865263bfda508aa7af518 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1640.  [bug]           win32: isc_socket_cancel(ISC_SOCKCANCEL_ACCEPT) was
+                       incorrectly closing the socket.  [RT #11291]
+
 1639.  [func]          Initial dlv system test.
 
 1638.  [bug]           "ixfr-from-differences" could generate a REQUIRE

diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index e94cecd818754f7c77697dfb8cc7deeb9c027d38..f37e7b5d412940e0e2d46f080402249203051e34 100644 (file)
--- 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.31 2004/05/03 23:54:38 marka Exp $ */
+/* $Id: socket.c,v 1.32 2004/05/17 03:15:59 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) {