Mercurial > hg > nginx
diff src/http/ngx_http.c @ 3764:d1983670b586
allow duplicate listen ssl options
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Mon, 27 Sep 2010 11:48:12 +0000 |
| parents | d094e237abf4 |
| children | 098cd8119861 |
line wrap: on
line diff
--- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -1221,6 +1221,9 @@ ngx_http_add_addresses(ngx_conf_t *cf, n #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 @@ ngx_http_add_addresses(ngx_conf_t *cf, n /* 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 @@ ngx_http_add_addresses(ngx_conf_t *cf, n } addr[i].opt.default_server = default_server; +#if (NGX_HTTP_SSL) + addr[i].opt.ssl = ssl; +#endif return NGX_OK; }