Mercurial > hg > nginx
changeset 3764:d1983670b586
allow duplicate listen ssl options
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 27 Sep 2010 11:48:12 +0000 |
parents | beca53d6ab3c |
children | 21dacebd12f6 |
files | src/http/ngx_http.c src/http/ngx_http_core_module.c |
diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http.c Mon Sep 27 11:23:45 2010 +0000 +++ b/src/http/ngx_http.c Mon Sep 27 11:48:12 2010 +0000 @@ -1221,6 +1221,9 @@ #if (NGX_HAVE_UNIX_DOMAIN) struct sockaddr_un *saun; #endif +#if (NGX_HTTP_SSL) + ngx_uint_t ssl; +#endif /* * we can not compare whole sockaddr struct's as kernel @@ -1270,6 +1273,10 @@ /* preserve default_server bit during listen options overwriting */ default_server = addr[i].opt.default_server; +#if (NGX_HTTP_SSL) + ssl = lsopt->ssl || addr[i].opt.set; +#endif + if (lsopt->set) { if (addr[i].opt.set) { @@ -1296,6 +1303,9 @@ } addr[i].opt.default_server = default_server; +#if (NGX_HTTP_SSL) + addr[i].opt.ssl = ssl; +#endif return NGX_OK; }