- Listen to read or write events after the SSL handshake.

  Sticky events on windows would stick on read when write was needed.

diff --git a/doc/Changelog b/doc/Changelog
index 82fd320e78d20a401abbd8861965f626bf3d8758..94daab83b3619720bb549d3e01582f41a120394c 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+3 August 2021: George
+       - Listen to read or write events after the SSL handshake.
+         Sticky events on windows would stick on read when write was needed.
+
 26 July 2021: George
        - Merge #513: Stream reuse, attempt to fix #411, #439, #469. This
          introduces a couple of fixes for the stream reuse functionality

diff --git a/util/netevent.c b/util/netevent.c
index 01e44c9b6f301163189bb267fdfe7e400a3f922d..9c99c677b506cdc3089d73ca87a2046c039f6c56 100644 (file)
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -1214,7 +1214,7 @@ ssl_handshake(struct comm_point* c)
        int r;
        if(c->ssl_shake_state == comm_ssl_shake_hs_read) {
                /* read condition satisfied back to writing */
-               comm_point_listen_for_rw(c, 1, 1);
+               comm_point_listen_for_rw(c, 0, 1);
                c->ssl_shake_state = comm_ssl_shake_none;
                return 1;
        }
@@ -1333,7 +1333,7 @@ ssl_handshake(struct comm_point* c)
                if(c->ssl_shake_state != comm_ssl_shake_read)
                        comm_point_listen_for_rw(c, 1, 0);
        } else {
-               comm_point_listen_for_rw(c, 1, 1);
+               comm_point_listen_for_rw(c, 0, 1);
        }
        c->ssl_shake_state = comm_ssl_shake_none;
        return 1;