]> git.kaiwu.me - nginx.git/commitdiff
SSL: fixed ngx_ssl_handshake() with level-triggered event methods.
authorMaxim Dounin <mdounin@mdounin.ru>
Fri, 1 Feb 2013 14:37:43 +0000 (14:37 +0000)
committerMaxim Dounin <mdounin@mdounin.ru>
Fri, 1 Feb 2013 14:37:43 +0000 (14:37 +0000)
Missing calls to ngx_handle_write_event() and ngx_handle_read_event()
resulted in a CPU hog during SSL handshake if an level-triggered event
method (e.g. select) was used.

src/event/ngx_event_openssl.c

index 1a1498cae99efc2f607177f5254db59557a31e94..b8f1cae91b2f3aace6312bc1e7d187906c395ea1 100644 (file)
@@ -808,6 +808,10 @@ ngx_ssl_handshake(ngx_connection_t *c)
             return NGX_ERROR;
         }
 
+        if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
         return NGX_AGAIN;
     }
 
@@ -816,6 +820,10 @@ ngx_ssl_handshake(ngx_connection_t *c)
         c->read->handler = ngx_ssl_handshake_handler;
         c->write->handler = ngx_ssl_handshake_handler;
 
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
         if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
             return NGX_ERROR;
         }