diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2023-03-29 11:14:25 +0400 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2023-03-29 11:14:25 +0400 |
| commit | e8fbc967470b39513248cd961ccccf7a032831ea (patch) | |
| tree | a08db4a8af3ad8bc454e1f905bed02e2544d8567 /src/http/modules/ngx_http_ssl_module.c | |
| parent | 25d8ab363b7ac63c37f21b35edc92b02bd0a74cc (diff) | |
| parent | dfe70f74a3558f05142fb552cea239add123d414 (diff) | |
| download | nginx-e8fbc967470b39513248cd961ccccf7a032831ea.tar.gz nginx-e8fbc967470b39513248cd961ccccf7a032831ea.tar.bz2 | |
Merged with the default branch.
Diffstat (limited to 'src/http/modules/ngx_http_ssl_module.c')
| -rw-r--r-- | src/http/modules/ngx_http_ssl_module.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c index d92ec403e..c0d6bae06 100644 --- a/src/http/modules/ngx_http_ssl_module.c +++ b/src/http/modules/ngx_http_ssl_module.c @@ -670,8 +670,9 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) 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); |