Mercurial > hg > nginx

comparison src/mail/ngx_mail_ssl_module.c @ 4159:718f2154b813 stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merging r3933, r4154: 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 Fri, 30 Sep 2011 13:36:33 +0000
parents f87edc142316
children fd40c9ef750d
comparison
equal deleted inserted replaced
4158:b78768308e30 4159:718f2154b813
462 &ngx_mail_ssl_module); 462 &ngx_mail_ssl_module);
463 if (scf->shm_zone == NULL) { 463 if (scf->shm_zone == NULL) {
464 return NGX_CONF_ERROR; 464 return NGX_CONF_ERROR;
465 } 465 }
466 466
467 scf->shm_zone->init = ngx_ssl_session_cache_init;
468
467 continue; 469 continue;
468 } 470 }
469 471
470 goto invalid; 472 goto invalid;
471 } 473 }