diff options
| author | Vladimir Homutov <vl@nginx.com> | 2020-10-01 10:04:35 +0300 |
|---|---|---|
| committer | Vladimir Homutov <vl@nginx.com> | 2020-10-01 10:04:35 +0300 |
| commit | 0f843cfb74dd4dab7bff4d9a0f7e73b8b8cb61f0 (patch) | |
| tree | 83f084a7d73a8dc5fc7183d7946fb548f405aeb5 /src/http/modules | |
| parent | f797a8a5b5a2012b0cae9745f05386b628365cb7 (diff) | |
| download | nginx-0f843cfb74dd4dab7bff4d9a0f7e73b8b8cb61f0.tar.gz nginx-0f843cfb74dd4dab7bff4d9a0f7e73b8b8cb61f0.tar.bz2 | |
QUIC: moved ssl configuration pointer to quic configuration.
The ssl configuration is obtained at config time and saved for future use.
Diffstat (limited to 'src/http/modules')
| -rw-r--r-- | src/http/modules/ngx_http_quic_module.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/http/modules/ngx_http_quic_module.c b/src/http/modules/ngx_http_quic_module.c index ec70c7286..34898984a 100644 --- a/src/http/modules/ngx_http_quic_module.c +++ b/src/http/modules/ngx_http_quic_module.c @@ -262,6 +262,8 @@ ngx_http_quic_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) ngx_quic_conf_t *prev = parent; ngx_quic_conf_t *conf = child; + ngx_http_ssl_srv_conf_t *sscf; + ngx_conf_merge_msec_value(conf->tp.max_idle_timeout, prev->tp.max_idle_timeout, 60000); @@ -315,6 +317,9 @@ ngx_http_quic_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_str_value(conf->sr_token_key, prev->sr_token_key, ""); + sscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_ssl_module); + conf->ssl = &sscf->ssl; + return NGX_CONF_OK; } |