From: Maxim Dounin <mdounin@mdounin.ru>
Date: Mon, 7 Apr 2014 14:55:57 +0000 (+0400)
Subject: Win32: fixed shared ssl_session_cache (ticket #528).
X-Git-Tag: release-1.5.13~6
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=55bef3047488310e0c8474afa5158190d8040576;p=nginx.git

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.
---

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;