Mercurial > hg > nginx-quic

comparison src/stream/ngx_stream_proxy_module.c @ 9066:0af598651e33 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged with the default branch.
author Sergey Kandaurov <pluknet@nginx.com>
date Wed, 29 Mar 2023 11:14:25 +0400
parents 91ad1abfb285 d1cf09451ae8
children
comparison
equal deleted inserted replaced
9062:efd91f6afa8d 9066:0af598651e33
2176 2176
2177 ngx_conf_merge_value(conf->ssl_session_reuse, 2177 ngx_conf_merge_value(conf->ssl_session_reuse,
2178 prev->ssl_session_reuse, 1); 2178 prev->ssl_session_reuse, 1);
2179 2179
2180 ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols, 2180 ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
2181 (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1 2181 (NGX_CONF_BITMASK_SET
2182 |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2)); 2182 |NGX_SSL_TLSv1|NGX_SSL_TLSv1_1
2183 |NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3));
2183 2184
2184 ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers, "DEFAULT"); 2185 ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers, "DEFAULT");
2185 2186
2186 ngx_conf_merge_ptr_value(conf->ssl_name, prev->ssl_name, NULL); 2187 ngx_conf_merge_ptr_value(conf->ssl_name, prev->ssl_name, NULL);
2187 2188