On Mon, Feb 20, 2023 at 04:54:42PM +0400, Sergey Kandaurov wrote:
> # HG changeset patch
> # User Sergey Kandaurov <pluk...@nginx.com>
> # Date 1676897567 -14400
> # Mon Feb 20 16:52:47 2023 +0400
> # Branch quic
> # Node ID ed403c1fe1f060ee362155bb00c43aaab356e30f
> # Parent 12b756caaf167d2239fd3bd7a75b270ca89ca26b
> QUIC: using ngx_ssl_handshake_log().
>
> diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
> --- a/src/event/ngx_event_openssl.c
> +++ b/src/event/ngx_event_openssl.c
> @@ -33,9 +33,6 @@ static int ngx_ssl_new_client_session(ng
> #ifdef SSL_READ_EARLY_DATA_SUCCESS
> static ngx_int_t ngx_ssl_try_early_data(ngx_connection_t *c);
> #endif
> -#if (NGX_DEBUG)
> -static void ngx_ssl_handshake_log(ngx_connection_t *c);
> -#endif
> static void ngx_ssl_handshake_handler(ngx_event_t *ev);
> #ifdef SSL_READ_EARLY_DATA_SUCCESS
> static ssize_t ngx_ssl_recv_early(ngx_connection_t *c, u_char *buf,
> @@ -2052,7 +2049,7 @@ ngx_ssl_try_early_data(ngx_connection_t
>
> #if (NGX_DEBUG)
>
> -static void
> +void
> ngx_ssl_handshake_log(ngx_connection_t *c)
> {
> char buf[129], *s, *d;
> diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
> --- a/src/event/ngx_event_openssl.h
> +++ b/src/event/ngx_event_openssl.h
> @@ -310,6 +310,9 @@ ngx_int_t ngx_ssl_get_client_v_remain(ng
>
>
> ngx_int_t ngx_ssl_handshake(ngx_connection_t *c);
> +#if (NGX_DEBUG)
> +void ngx_ssl_handshake_log(ngx_connection_t *c);
> +#endif
> ssize_t ngx_ssl_recv(ngx_connection_t *c, u_char *buf, size_t size);
> ssize_t ngx_ssl_write(ngx_connection_t *c, u_char *data, size_t size);
> ssize_t ngx_ssl_recv_chain(ngx_connection_t *c, ngx_chain_t *cl, off_t
> limit);
> diff --git a/src/event/quic/ngx_event_quic_ssl.c
> b/src/event/quic/ngx_event_quic_ssl.c
> --- a/src/event/quic/ngx_event_quic_ssl.c
> +++ b/src/event/quic/ngx_event_quic_ssl.c
> @@ -440,11 +440,9 @@ ngx_quic_crypto_input(ngx_connection_t *
> return NGX_OK;
> }
>
> - ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
> - "quic ssl cipher:%s", SSL_get_cipher(ssl_conn));
> -
> - ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
> - "quic handshake completed successfully");
> +#if (NGX_DEBUG)
> + ngx_ssl_handshake_log(c);
> +#endif
>
> c->ssl->handshaked = 1;
>
> _______________________________________________
> nginx-devel mailing list
> nginx-devel@nginx.org
> https://mailman.nginx.org/mailman/listinfo/nginx-devel
Looks ok
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
https://mailman.nginx.org/mailman/listinfo/nginx-devel
