[nginx] Win32: fixed shared ssl_session_cache (ticket #528).

Maxim Dounin mdounin at mdounin.ru
Mon Apr 7 15:18:27 UTC 2014


details:   http://hg.nginx.org/nginx/rev/4c6ceca4f5f7
branches:  
changeset: 5640:4c6ceca4f5f7
user:      Maxim Dounin <mdounin at mdounin.ru>
date:      Mon Apr 07 18:55:57 2014 +0400
description:
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:

 src/event/ngx_event_openssl.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (20 lines):

diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
--- 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_
         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;



More information about the nginx-devel mailing list