summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2014-04-07 18:55:57 +0400
committerMaxim Dounin <mdounin@mdounin.ru>2014-04-07 18:55:57 +0400
commit55bef3047488310e0c8474afa5158190d8040576 (patch)
treeaf19ff154664b0db68cb43f555476bfd1bbba62f /src
parent876a3c9b97ce01b7b2576842b8bade7942017861 (diff)
downloadnginx-55bef3047488310e0c8474afa5158190d8040576.tar.gz
nginx-55bef3047488310e0c8474afa5158190d8040576.tar.bz2
Win32: fixed shared ssl_session_cache (ticket #528).
In a worker process shm_zone->data was set to NULL instead of a proper value extracted from shared memory.
Diffstat (limited to 'src')
-rw-r--r--src/event/ngx_event_openssl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index e7b58136b..d8dd3d358 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -1804,13 +1804,13 @@ ngx_ssl_session_cache_init(ngx_shm_zone_t *shm_zone, void *data)
return NGX_OK;
}
+ shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
+
if (shm_zone->shm.exists) {
- shm_zone->data = data;
+ shm_zone->data = shpool->data;
return NGX_OK;
}
- shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
-
cache = ngx_slab_alloc(shpool, sizeof(ngx_ssl_session_cache_t));
if (cache == NULL) {
return NGX_ERROR;