commit 2f1e73cb3576bf4e7b065dacca06c3196f8591ad
author Alexandre Julliard <julliard@winehq.org> Mon Jan 07 17:19:05 2008 +0100
committer Alexandre Julliard <julliard@winehq.org> Mon Jan 07 17:19:05 2008 +0100
tree c99dcc47a11e6b031f4483291a8d263b2fd3077e
parent f53bb857acd6d0d23234eec420b2c56c4891d33a

server: Wait for the expiration of all the process SIGKILL timers before exiting the server.

server/request.c

diff --git a/server/request.c b/server/request.c
index 7839de7..9a2c7b1 100644
--- a/server/request.c
+++ b/server/request.c
@@ -824,8 +824,5 @@
     if (master_timeout)  /* cancel previous timeout */
         remove_timeout_user( master_timeout );
 
-    if (timeout)
-        master_timeout = add_timeout_user( timeout, close_socket_timeout, NULL );
-    else  /* close it right away */
-        close_socket_timeout( NULL );
+    master_timeout = add_timeout_user( timeout, close_socket_timeout, NULL );
 }