Mercurial > hg > nginx-vendor-current
comparison src/http/modules/ngx_http_ssl_module.c @ 646:615b5ea36fc0 NGINX_1_1_7
nginx 1.1.7
*) Feature: support of several resolvers in the "resolver" directive.
Thanks to Kirill A. Korinskiy.
*) Bugfix: a segmentation fault occurred on start or while
reconfiguration if the "ssl" directive was used at http level and
there was no "ssl_certificate" defined.
*) Bugfix: reduced memory consumption while proxying of big files if
they were buffered to disk.
*) Bugfix: a segmentation fault might occur in a worker process if
"proxy_http_version 1.1" directive was used.
*) Bugfix: in the "expires @time" directive.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Mon, 31 Oct 2011 00:00:00 +0400 |
| parents | d3cf6c6b0043 |
| children | f200748c0ac8 |
comparison
equal
deleted
inserted
replaced
| 645:e461dead01e9 | 646:615b5ea36fc0 |
|---|---|
| 344 ngx_http_ssl_srv_conf_t *prev = parent; | 344 ngx_http_ssl_srv_conf_t *prev = parent; |
| 345 ngx_http_ssl_srv_conf_t *conf = child; | 345 ngx_http_ssl_srv_conf_t *conf = child; |
| 346 | 346 |
| 347 ngx_pool_cleanup_t *cln; | 347 ngx_pool_cleanup_t *cln; |
| 348 | 348 |
| 349 ngx_conf_merge_value(conf->enable, prev->enable, 0); | 349 if (conf->enable == NGX_CONF_UNSET) { |
| 350 if (prev->enable == NGX_CONF_UNSET) { | |
| 351 conf->enable = 0; | |
| 352 | |
| 353 } else { | |
| 354 conf->enable = prev->enable; | |
| 355 conf->file = prev->file; | |
| 356 conf->line = prev->line; | |
| 357 } | |
| 358 } | |
| 350 | 359 |
| 351 ngx_conf_merge_value(conf->session_timeout, | 360 ngx_conf_merge_value(conf->session_timeout, |
| 352 prev->session_timeout, 300); | 361 prev->session_timeout, 300); |
| 353 | 362 |
| 354 ngx_conf_merge_value(conf->prefer_server_ciphers, | 363 ngx_conf_merge_value(conf->prefer_server_ciphers, |