Mercurial > hg > nginx
comparison src/mail/ngx_mail_ssl_module.c @ 4153:7de74ed694c8
Fix for "ssl_session_cache builtin" (broken since 1.1.1, r3993).
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Tue, 27 Sep 2011 12:06:07 +0000 |
parents | a1dd9dc754ab |
children | a0505851e70c |
comparison
equal
deleted
inserted
replaced
4152:65c1c241d70e | 4153:7de74ed694c8 |
---|---|
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 } |
472 | 474 |
473 if (scf->shm_zone && scf->builtin_session_cache == NGX_CONF_UNSET) { | 475 if (scf->shm_zone && scf->builtin_session_cache == NGX_CONF_UNSET) { |
474 scf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE; | 476 scf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE; |
475 } | 477 } |
476 | 478 |
477 scf->shm_zone->init = ngx_ssl_session_cache_init; | |
478 | |
479 return NGX_CONF_OK; | 479 return NGX_CONF_OK; |
480 | 480 |
481 invalid: | 481 invalid: |
482 | 482 |
483 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | 483 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |