[eventloop] check watches on registration and connection completion.

diff --git a/libs/stdext/eventloop.ml b/libs/stdext/eventloop.ml
index b4337fe86a25dfb7087ab98ec7fa8603c1600bb2..b514fa9e3a5bf33a7e28023d52fd95239f8930ee 100644 (file)
--- a/libs/stdext/eventloop.ml
+++ b/libs/stdext/eventloop.ml
@@ -155,6 +155,8 @@ let register_conn t fd ?(enable_send=false) ?(enable_recv=true) callbacks =
        Unix.set_nonblock fd;
        if conn_state.recv_enabled then
                Unixext.Fdset.set t.readers fd;
+       if conn_state.send_enabled then
+               Unixext.Fdset.set t.writers fd;
        fd
 
 let remove_conn t handle =
@@ -256,6 +258,8 @@ let dispatch_read t fd cs =
                        cs.status <- Connected;
                        if not cs.recv_enabled then
                                Unixext.Fdset.clear t.readers fd;
+                       if not cs.send_enabled then
+                               Unixext.Fdset.clear t.writers fd;
                        cs.callbacks.connect_callback t fd
                | Some err ->
                        cs.callbacks.error_callback t fd (err, "connect", "")
@@ -283,10 +287,10 @@ let dispatch_write t fd cs =
                (match Unix.getsockopt_error fd with
                | None ->
                        cs.status <- Connected;
-                       if cs.recv_enabled then
-                               Unixext.Fdset.set t.readers fd
-                       else
+                       if not cs.recv_enabled then
                                Unixext.Fdset.clear t.readers fd;
+                       if not cs.send_enabled then
+                               Unixext.Fdset.clear t.writers fd;
                        cs.callbacks.connect_callback t fd
                | Some err ->
                        cs.callbacks.error_callback t fd (err, "connect", "")