diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-08-04 11:12:30 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2011-08-04 11:12:30 +0000 |
| commit | dfd81a23b2771fa8a9be37a2a911562826005124 (patch) | |
| tree | 3ccb7322a77c468b34b4373db153bb95a70d3771 /src/core/ngx_cycle.c | |
| parent | c42be75569adf56defbe61ac46b14a70c684cd5e (diff) | |
| download | nginx-dfd81a23b2771fa8a9be37a2a911562826005124.tar.gz nginx-dfd81a23b2771fa8a9be37a2a911562826005124.zip | |
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.
Diffstat (limited to 'src/core/ngx_cycle.c')
| -rw-r--r-- | src/core/ngx_cycle.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index 79867079d..968056c42 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -418,11 +418,6 @@ ngx_init_cycle(ngx_cycle_t *old_cycle) goto failed; } - if (shm_zone[i].init == NULL) { - /* unused shared zone */ - continue; - } - shm_zone[i].shm.log = cycle->log; opart = &old_cycle->shared_memory.part; |