commit 554768dabbe9a9b5cc26c51c66fb20e92f4203af
author Maxim Dounin <mdounin@mdounin.ru> Tue Sep 27 12:06:07 2011 +0000
committer Maxim Dounin <mdounin@mdounin.ru> Tue Sep 27 12:06:07 2011 +0000
tree 0995a682c01487aca7bf691b3f864e1f5a0e9710
parent 886c6295eeaa850d479bdf4590751cfbfb32814d

Fix for "ssl_session_cache builtin" (broken since 1.1.1, r3993).

src/http/modules/ngx_http_ssl_module.c

diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
index 143f04d..192fc3e 100644
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -616,6 +616,8 @@
                 return NGX_CONF_ERROR;
             }
 
+            sscf->shm_zone->init = ngx_ssl_session_cache_init;
+
             continue;
         }
 
@@ -626,8 +628,6 @@
         sscf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE;
     }
 
-    sscf->shm_zone->init = ngx_ssl_session_cache_init;
-
     return NGX_CONF_OK;
 
 invalid:

src/mail/ngx_mail_ssl_module.c

diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c
index d06f7d2..4f4c9a2 100644
--- a/src/mail/ngx_mail_ssl_module.c
+++ b/src/mail/ngx_mail_ssl_module.c
@@ -464,6 +464,8 @@
                 return NGX_CONF_ERROR;
             }
 
+            scf->shm_zone->init = ngx_ssl_session_cache_init;
+
             continue;
         }
 
@@ -474,8 +476,6 @@
         scf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE;
     }
 
-    scf->shm_zone->init = ngx_ssl_session_cache_init;
-
     return NGX_CONF_OK;
 
 invalid: