diff options
| author |   robert <robert@openbsd.org> | 2011-11-12 11:09:00 +0000 |
|---|---|---|
| committer | robert <robert@openbsd.org> | 2011-11-12 11:09:00 +0000 |
| commit | e5f444907f27ebace3451e2b67ee6f223ce9957e (patch) | |
| tree | f76a10b73d18d4116de1ca34902bec6f6b1bd328 /usr.sbin/nginx/src/http/modules/ngx_http_ssl_module.c | |
| parent | update currency exchange rates; (diff) | |
| download | wireguard-openbsd-e5f444907f27ebace3451e2b67ee6f223ce9957e.tar.xz wireguard-openbsd-e5f444907f27ebace3451e2b67ee6f223ce9957e.zip | |
update to 1.0.9
Diffstat (limited to 'usr.sbin/nginx/src/http/modules/ngx_http_ssl_module.c')
| -rw-r--r-- | usr.sbin/nginx/src/http/modules/ngx_http_ssl_module.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/usr.sbin/nginx/src/http/modules/ngx_http_ssl_module.c b/usr.sbin/nginx/src/http/modules/ngx_http_ssl_module.c index 192fc3e35e1..f1f6a4ae4c8 100644 --- a/usr.sbin/nginx/src/http/modules/ngx_http_ssl_module.c +++ b/usr.sbin/nginx/src/http/modules/ngx_http_ssl_module.c @@ -346,7 +346,16 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) ngx_pool_cleanup_t *cln; - ngx_conf_merge_value(conf->enable, prev->enable, 0); + if (conf->enable == NGX_CONF_UNSET) { + if (prev->enable == NGX_CONF_UNSET) { + conf->enable = 0; + + } else { + conf->enable = prev->enable; + conf->file = prev->file; + conf->line = prev->line; + } + } ngx_conf_merge_value(conf->session_timeout, prev->session_timeout, 300); |