Mercurial > hg > nginx
comparison src/core/ngx_cycle.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 | e3cb8e27e413 |
| children | 59b99f217c6d |
comparison
equal
deleted
inserted
replaced
| 4158:b78768308e30 | 4159:718f2154b813 |
|---|---|
| 416 "zero size shared memory zone \"%V\"", | 416 "zero size shared memory zone \"%V\"", |
| 417 &shm_zone[i].shm.name); | 417 &shm_zone[i].shm.name); |
| 418 goto failed; | 418 goto failed; |
| 419 } | 419 } |
| 420 | 420 |
| 421 if (shm_zone[i].init == NULL) { | |
| 422 /* unused shared zone */ | |
| 423 continue; | |
| 424 } | |
| 425 | |
| 426 shm_zone[i].shm.log = cycle->log; | 421 shm_zone[i].shm.log = cycle->log; |
| 427 | 422 |
| 428 opart = &old_cycle->shared_memory.part; | 423 opart = &old_cycle->shared_memory.part; |
| 429 oshm_zone = opart->elts; | 424 oshm_zone = opart->elts; |
| 430 | 425 |