Disable whichever struct event we don't want during ssl handshaking.

svn:r1417

diff --git a/bufferevent_openssl.c b/bufferevent_openssl.c
index 90d72283d08ce92927ab8b019ec862e54de32085..f099f30b24d7c13fe1b362814788cd909f065ed3 100644 (file)
--- a/bufferevent_openssl.c
+++ b/bufferevent_openssl.c
@@ -808,16 +808,16 @@ do_handshake(struct bufferevent_openssl *bev_ssl)
                print_err(err);
                switch (err) {
                case SSL_ERROR_WANT_WRITE:
-                       /* XXXX we only want to do this for the socket case.
-                         stop_reading(bev_ssl);
-                         start_writing(bev_ssl);
-                       */
+                       if (!bev_ssl->underlying) {
+                               stop_reading(bev_ssl);
+                               start_writing(bev_ssl);
+                       }
                        return 0;
                case SSL_ERROR_WANT_READ:
-                       /* XXXX we only want to do this for the socket case.
-                          stop_reading(bev_ssl);
-                          start_writing(bev_ssl);
-                       */
+                       if (!bev_ssl->underlying) {
+                               stop_writing(bev_ssl);
+                               start_reading(bev_ssl);
+                       }
                        return 0;
                default:
                        conn_closed(bev_ssl, err, r);