Mercurial > hg > nginx
comparison src/stream/ngx_stream_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 | 7da4791e0264 d1cf09451ae8 |
children | 113e2438dbd4 |
comparison
equal
deleted
inserted
replaced
9084:efd91f6afa8d | 9085:0af598651e33 |
---|---|
705 | 705 |
706 ngx_conf_merge_value(conf->prefer_server_ciphers, | 706 ngx_conf_merge_value(conf->prefer_server_ciphers, |
707 prev->prefer_server_ciphers, 0); | 707 prev->prefer_server_ciphers, 0); |
708 | 708 |
709 ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols, | 709 ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols, |
710 (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1 | 710 (NGX_CONF_BITMASK_SET |
711 |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2)); | 711 |NGX_SSL_TLSv1|NGX_SSL_TLSv1_1 |
712 |NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3)); | |
712 | 713 |
713 ngx_conf_merge_uint_value(conf->verify, prev->verify, 0); | 714 ngx_conf_merge_uint_value(conf->verify, prev->verify, 0); |
714 ngx_conf_merge_uint_value(conf->verify_depth, prev->verify_depth, 1); | 715 ngx_conf_merge_uint_value(conf->verify_depth, prev->verify_depth, 1); |
715 | 716 |
716 ngx_conf_merge_ptr_value(conf->certificates, prev->certificates, NULL); | 717 ngx_conf_merge_ptr_value(conf->certificates, prev->certificates, NULL); |