summaryrefslogtreecommitdiff
path: root/src/mail/ngx_mail_ssl_module.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2011-10-05 14:51:07 +0000
committerJonathan Kolb <jon@b0g.us>2011-10-05 14:51:07 +0000
commit770b35cc5787958e3b205bf3201558fa36fa30f9 (patch)
tree7f49d1a7ea3dfbadbaae45203efbc556fbc1af45 /src/mail/ngx_mail_ssl_module.c
parent73e4a20a129d2afb1c5a1e1bb0a5d6966d9f5e5e (diff)
downloadnginx-770b35cc5787958e3b205bf3201558fa36fa30f9.tar.gz
Changes with nginx 1.1.5 05 Oct 2011v1.1.5
*) Feature: the "uwsgi_buffering" and "scgi_buffering" directives. Thanks to Peter Smit. *) Bugfix: non-cacheable responses might be cached if "proxy_cache_bypass" directive was used. Thanks to John Ferlito. *) Bugfix: in HTTP/1.1 support in the ngx_http_proxy_module. *) Bugfix: cached responses with an empty body were returned incorrectly; the bug had appeared in 0.8.31. *) Bugfix: 201 responses of the ngx_http_dav_module were incorrect; the bug had appeared in 0.8.32. *) Bugfix: in the "return" directive. *) Bugfix: the "ssl_session_cache builtin" directive caused segmentation fault; the bug had appeared in 1.1.1.
Diffstat (limited to 'src/mail/ngx_mail_ssl_module.c')
-rw-r--r--src/mail/ngx_mail_ssl_module.c4
1 files changed, 2 insertions, 2 deletions
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: