Mercurial > hg > nginx
comparison src/http/modules/ngx_http_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 | d5462eab1440 |
comparison
equal
deleted
inserted
replaced
4152:65c1c241d70e | 4153:7de74ed694c8 |
---|---|
614 &ngx_http_ssl_module); | 614 &ngx_http_ssl_module); |
615 if (sscf->shm_zone == NULL) { | 615 if (sscf->shm_zone == NULL) { |
616 return NGX_CONF_ERROR; | 616 return NGX_CONF_ERROR; |
617 } | 617 } |
618 | 618 |
619 sscf->shm_zone->init = ngx_ssl_session_cache_init; | |
620 | |
619 continue; | 621 continue; |
620 } | 622 } |
621 | 623 |
622 goto invalid; | 624 goto invalid; |
623 } | 625 } |
624 | 626 |
625 if (sscf->shm_zone && sscf->builtin_session_cache == NGX_CONF_UNSET) { | 627 if (sscf->shm_zone && sscf->builtin_session_cache == NGX_CONF_UNSET) { |
626 sscf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE; | 628 sscf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE; |
627 } | 629 } |
628 | 630 |
629 sscf->shm_zone->init = ngx_ssl_session_cache_init; | |
630 | |
631 return NGX_CONF_OK; | 631 return NGX_CONF_OK; |
632 | 632 |
633 invalid: | 633 invalid: |
634 | 634 |
635 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | 635 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |