Mercurial > hg > nginx
comparison src/http/modules/ngx_http_ssl_module.c @ 3992:a1dd9dc754ab
A new fix for the case when ssl_session_cache defined, but ssl is not
enabled in any server. The previous r1033 does not help when unused zone
becomes used after reconfiguration, so it is backed out.
The initial thought was to make SSL modules independed from SSL implementation
and to keep OpenSSL code dependance as much as in separate files.
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Thu, 04 Aug 2011 11:12:30 +0000 |
| parents | 0832a6997227 |
| children | 7de74ed694c8 |
comparison
equal
deleted
inserted
replaced
| 3991:509db6c0c5dc | 3992:a1dd9dc754ab |
|---|---|
| 624 | 624 |
| 625 if (sscf->shm_zone && sscf->builtin_session_cache == NGX_CONF_UNSET) { | 625 if (sscf->shm_zone && sscf->builtin_session_cache == NGX_CONF_UNSET) { |
| 626 sscf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE; | 626 sscf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE; |
| 627 } | 627 } |
| 628 | 628 |
| 629 sscf->shm_zone->init = ngx_ssl_session_cache_init; | |
| 630 | |
| 629 return NGX_CONF_OK; | 631 return NGX_CONF_OK; |
| 630 | 632 |
| 631 invalid: | 633 invalid: |
| 632 | 634 |
| 633 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | 635 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |