Mercurial > hg > nginx

comparison src/http/modules/ngx_http_quic_module.c @ 8563:bed310672f39 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
QUIC: moved ssl configuration pointer to quic configuration. The ssl configuration is obtained at config time and saved for future use.
author Vladimir Homutov <vl@nginx.com>
date Thu, 01 Oct 2020 10:04:35 +0300
parents b31c02454539
children 45db1b5c1706
comparison
equal deleted inserted replaced
8562:b31c02454539 8563:bed310672f39
260 ngx_http_quic_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) 260 ngx_http_quic_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
261 { 261 {
262 ngx_quic_conf_t *prev = parent; 262 ngx_quic_conf_t *prev = parent;
263 ngx_quic_conf_t *conf = child; 263 ngx_quic_conf_t *conf = child;
264 264
265 ngx_http_ssl_srv_conf_t *sscf;
266
265 ngx_conf_merge_msec_value(conf->tp.max_idle_timeout, 267 ngx_conf_merge_msec_value(conf->tp.max_idle_timeout,
266 prev->tp.max_idle_timeout, 60000); 268 prev->tp.max_idle_timeout, 60000);
267 269
268 ngx_conf_merge_msec_value(conf->tp.max_ack_delay, 270 ngx_conf_merge_msec_value(conf->tp.max_ack_delay,
269 prev->tp.max_ack_delay, 271 prev->tp.max_ack_delay,
312 return NGX_CONF_ERROR; 314 return NGX_CONF_ERROR;
313 } 315 }
314 } 316 }
315 317
316 ngx_conf_merge_str_value(conf->sr_token_key, prev->sr_token_key, ""); 318 ngx_conf_merge_str_value(conf->sr_token_key, prev->sr_token_key, "");
319
320 sscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_ssl_module);
321 conf->ssl = &sscf->ssl;
317 322
318 return NGX_CONF_OK; 323 return NGX_CONF_OK;
319 } 324 }
320 325
321 326