]> git.kaiwu.me - nginx.git/commitdiff
Removed redundant SSL_do_handshake call before any handshake data.
authorSergey Kandaurov <pluknet@nginx.com>
Sat, 9 May 2020 14:39:47 +0000 (17:39 +0300)
committerSergey Kandaurov <pluknet@nginx.com>
Sat, 9 May 2020 14:39:47 +0000 (17:39 +0300)
src/event/ngx_event_quic.c

index 66162b4a63de047b08e23afa1dff69f24b87438d..74db8bc970ca5c3a0fb0eb121e5933b49c798dca 100644 (file)
@@ -699,7 +699,6 @@ ngx_quic_new_cid(ngx_pool_t *pool, ngx_str_t *cid)
 static ngx_int_t
 ngx_quic_init_connection(ngx_connection_t *c)
 {
-    int                     n, sslerr;
     u_char                 *p;
     ssize_t                 len;
     ngx_ssl_conn_t         *ssl_conn;
@@ -751,28 +750,6 @@ ngx_quic_init_connection(ngx_connection_t *c)
     qc->max_streams = qc->tp.initial_max_streams_bidi;
     qc->state = NGX_QUIC_ST_HANDSHAKE;
 
-    n = SSL_do_handshake(ssl_conn);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                   "quic SSL_do_handshake: %d", n);
-
-    if (n == -1) {
-        sslerr = SSL_get_error(ssl_conn, n);
-
-        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                       "quic SSL_get_error: %d", sslerr);
-
-        if (sslerr != SSL_ERROR_WANT_READ) {
-            ngx_ssl_error(NGX_LOG_ERR, c->log, 0, "SSL_do_handshake() failed");
-            return NGX_ERROR;
-        }
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                   "quic SSL_quic_read_level: %d, SSL_quic_write_level: %d",
-                   (int) SSL_quic_read_level(ssl_conn),
-                   (int) SSL_quic_write_level(ssl_conn));
-
     return NGX_OK;
 }