Mercurial > hg > nginx
diff src/http/modules/ngx_http_ssl_module.c @ 9085:0af598651e33 quic
Merged with the default branch.
| author | Sergey Kandaurov <pluknet@nginx.com> |
|---|---|
| date | Wed, 29 Mar 2023 11:14:25 +0400 |
| parents | 5fd628b89bb7 d1cf09451ae8 |
| children | 69bae2437d74 |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_ssl_module.c Wed Mar 15 19:57:15 2023 +0400 +++ b/src/http/modules/ngx_http_ssl_module.c Wed Mar 29 11:14:25 2023 +0400 @@ -670,8 +670,9 @@ ngx_conf_merge_value(conf->reject_handshake, prev->reject_handshake, 0); ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols, - (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1 - |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2)); + (NGX_CONF_BITMASK_SET + |NGX_SSL_TLSv1|NGX_SSL_TLSv1_1 + |NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3)); ngx_conf_merge_size_value(conf->buffer_size, prev->buffer_size, NGX_SSL_BUFSIZE);