diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-08-26 14:24:14 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2008-08-26 14:24:14 +0000 |
| commit | c9491d113c47b36fec61c37b9c66905f097d92cb (patch) | |
| tree | 620685717cf70aa86bbc72387c3eb598bcc7cb6c /src/http | |
| parent | 9c388c0a7fc86beeb584744b5bd5884884111732 (diff) | |
| download | nginx-c9491d113c47b36fec61c37b9c66905f097d92cb.tar.gz nginx-c9491d113c47b36fec61c37b9c66905f097d92cb.tar.bz2 | |
*) refactor ngx_parse_inet_url()
*) refactor ngx_parse_unix_domain_url()
*) delete unused ngx_url_t fields
Diffstat (limited to 'src/http')
| -rw-r--r-- | src/http/modules/ngx_http_proxy_module.c | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_core_module.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c index cf5605474..b69272d5f 100644 --- a/src/http/modules/ngx_http_proxy_module.c +++ b/src/http/modules/ngx_http_proxy_module.c @@ -2546,7 +2546,7 @@ static ngx_int_t ngx_http_proxy_set_vars(ngx_pool_t *pool, ngx_url_t *u, ngx_http_proxy_vars_t *v) { - if (!u->unix_socket) { + if (u->family != AF_UNIX) { if (u->no_port || u->port == u->default_port) { v->host_header = u->host; diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 754a788d1..43d0ca949 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -2962,7 +2962,7 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) ngx_memzero(ls, sizeof(ngx_http_listen_t)); - ls->family = AF_INET; + ls->family = u.family; ls->addr = u.addr.in_addr; ls->port = u.port; ls->file_name = cf->conf_file->file.name.data; |