From: Sergey Kandaurov Date: Fri, 13 Nov 2020 15:11:27 +0000 (+0000) Subject: Core: reduced diff to the default branch. X-Git-Tag: release-1.25.0~4^2~472 X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/static/gitweb.js?a=commitdiff_plain;h=375b47efb3558c7871c61f682547c2f3a5fc9992;p=nginx.git Core: reduced diff to the default branch. It became feasible to reduce after feec2cc762f6 that removes ngx_quic_connection_t from ngx_connection_s. --- diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h index 3ac6205e2..edc1ccbc2 100644 --- a/src/core/ngx_connection.h +++ b/src/core/ngx_connection.h @@ -148,17 +148,17 @@ struct ngx_connection_s { socklen_t socklen; ngx_str_t addr_text; - ngx_proxy_protocol_t *proxy_protocol; + ngx_proxy_protocol_t *proxy_protocol; #if (NGX_QUIC || NGX_COMPAT) - ngx_quic_stream_t *quic; + ngx_quic_stream_t *quic; #endif #if (NGX_SSL || NGX_COMPAT) - ngx_ssl_connection_t *ssl; + ngx_ssl_connection_t *ssl; #endif - ngx_udp_connection_t *udp; + ngx_udp_connection_t *udp; struct sockaddr *local_sockaddr; socklen_t local_socklen;