From: Maxim Dounin <mdounin@mdounin.ru>
Date: Tue, 27 Sep 2011 12:06:07 +0000 (+0000)
Subject: Fix for "ssl_session_cache builtin" (broken since 1.1.1, r3993).
X-Git-Tag: release-1.1.5~8
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=554768dabbe9a9b5cc26c51c66fb20e92f4203af;p=nginx.git

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

diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
index 143f04d57..192fc3e35 100644
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -616,6 +616,8 @@ ngx_http_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 return NGX_CONF_ERROR;
             }
 
+            sscf->shm_zone->init = ngx_ssl_session_cache_init;
+
             continue;
         }
 
@@ -626,8 +628,6 @@ ngx_http_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         sscf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE;
     }
 
-    sscf->shm_zone->init = ngx_ssl_session_cache_init;
-
     return NGX_CONF_OK;
 
 invalid:
diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c
index d06f7d2a9..4f4c9a20d 100644
--- a/src/mail/ngx_mail_ssl_module.c
+++ b/src/mail/ngx_mail_ssl_module.c
@@ -464,6 +464,8 @@ ngx_mail_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 return NGX_CONF_ERROR;
             }
 
+            scf->shm_zone->init = ngx_ssl_session_cache_init;
+
             continue;
         }
 
@@ -474,8 +476,6 @@ ngx_mail_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         scf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE;
     }
 
-    scf->shm_zone->init = ngx_ssl_session_cache_init;
-
     return NGX_CONF_OK;
 
 invalid: