Mercurial > hg > nginx-quic
comparison src/http/modules/ngx_http_ssl_module.c @ 4159:718f2154b813 stable-1.0
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 | 8d39230df833 |
comparison
equal
deleted
inserted
replaced
4158:b78768308e30 | 4159:718f2154b813 |
---|---|
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 } |