IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

allow duplicate listen ssl options

Browse Source
This commit is contained in:
Igor Sysoev 2010-09-27 11:48:12 +00:00
parent 49ac2b2b45
commit f79878e5d9
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/http/ngx_http.c
View File

@ -1221,6 +1221,9 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
#if (NGX_HAVE_UNIX_DOMAIN) #if (NGX_HAVE_UNIX_DOMAIN)
struct sockaddr_un *saun; struct sockaddr_un *saun;
#endif #endif
#if (NGX_HTTP_SSL)
ngx_uint_t ssl;
#endif
/* /*
* we can not compare whole sockaddr struct's as kernel * we can not compare whole sockaddr struct's as kernel
@ -1270,6 +1273,10 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
/* preserve default_server bit during listen options overwriting */ /* preserve default_server bit during listen options overwriting */
default_server = addr[i].opt.default_server; default_server = addr[i].opt.default_server;
#if (NGX_HTTP_SSL)
ssl = lsopt->ssl || addr[i].opt.set;
#endif
if (lsopt->set) { if (lsopt->set) {
if (addr[i].opt.set) { if (addr[i].opt.set) {
@ -1296,6 +1303,9 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
} }
addr[i].opt.default_server = default_server; addr[i].opt.default_server = default_server;
#if (NGX_HTTP_SSL)
addr[i].opt.ssl = ssl;
#endif
return NGX_OK; return NGX_OK;
} }

1
src/http/ngx_http_core_module.c
View File

@ -3569,7 +3569,6 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
if (ngx_strcmp(value[n].data, "ssl") == 0) { if (ngx_strcmp(value[n].data, "ssl") == 0) {
#if (NGX_HTTP_SSL) #if (NGX_HTTP_SSL)
lsopt.set = 1;
lsopt.ssl = 1; lsopt.ssl = 1;
continue; continue;
#else #else