summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@nginx.com>2015-12-09 16:26:59 +0300
committerRuslan Ermilov <ru@nginx.com>2015-12-09 16:26:59 +0300
commit5e7535df7279a4b13b33913ebbe4fba8b83933f9 (patch)
treea700250b9f21e4f73bb1348b88f7a94d4c27208f
parentfac1f23e5df8b46b62a0fb7aa2ba12e7eefd8057 (diff)
downloadnginx-5e7535df7279a4b13b33913ebbe4fba8b83933f9.tar.gz
nginx-5e7535df7279a4b13b33913ebbe4fba8b83933f9.tar.bz2
Fixed fastcgi_pass with UNIX socket and variables (ticket #855).
This was broken in a93345ee8f52 (1.9.8).
-rw-r--r--src/http/ngx_http_upstream.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 78f6e3498..6c6ee8000 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -642,7 +642,9 @@ ngx_http_upstream_init_request(ngx_http_request_t *r)
if (u->resolved->sockaddr) {
- if (u->resolved->port == 0) {
+ if (u->resolved->port == 0
+ && u->resolved->sockaddr->sa_family != AF_UNIX)
+ {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"no port in upstream \"%V\"", host);
ngx_http_upstream_finalize_request(r, u,