Mercurial > hg > nginx
comparison src/mail/ngx_mail_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 |
|---|---|
| 472 | 472 |
| 473 if (scf->shm_zone && scf->builtin_session_cache == NGX_CONF_UNSET) { | 473 if (scf->shm_zone && scf->builtin_session_cache == NGX_CONF_UNSET) { |
| 474 scf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE; | 474 scf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE; |
| 475 } | 475 } |
| 476 | 476 |
| 477 scf->shm_zone->init = ngx_ssl_session_cache_init; | |
| 478 | |
| 477 return NGX_CONF_OK; | 479 return NGX_CONF_OK; |
| 478 | 480 |
| 479 invalid: | 481 invalid: |
| 480 | 482 |
| 481 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | 483 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |