summaryrefslogtreecommitdiff
path: root/src/http/ngx_http.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2010-09-28 07:00:05 +0000
committerJonathan Kolb <jon@b0g.us>2010-09-28 07:00:05 +0000
commitd2ddc4ba6cf543fa5853ebb2e5f0ee7be6fd2ba5 (patch)
treecf7770c01b158ca4c758fed11d6f6ae993a7037b /src/http/ngx_http.c
parentfca1ff29097d8ec1cbb25a15c4e267c015c06fb8 (diff)
downloadnginx-d2ddc4ba6cf543fa5853ebb2e5f0ee7be6fd2ba5.tar.gz
Changes with nginx 0.8.52 28 Sep 2010v0.8.52
*) Bugfix: nginx used SSL mode for a listen socket if any listen option was set; the bug had appeared in 0.8.51.
Diffstat (limited to 'src/http/ngx_http.c')
-rw-r--r--src/http/ngx_http.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index 58fc7afe5..4ecd50ce8 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -1274,7 +1274,7 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
default_server = addr[i].opt.default_server;
#if (NGX_HTTP_SSL)
- ssl = lsopt->ssl || addr[i].opt.set;
+ ssl = lsopt->ssl || addr[i].opt.ssl;
#endif
if (lsopt->set) {