comparison src/http/ngx_http_upstream.c @ 6326:705c356ce664

Fixed fastcgi_pass with UNIX socket and variables (ticket #855). This was broken in a93345ee8f52 (1.9.8).
author Ruslan Ermilov <ru@nginx.com>
date Wed, 09 Dec 2015 16:26:59 +0300
parents f44de0d12143
children 78b4e10b4367
comparison
equal deleted inserted replaced
6325:00079605a9b8 6326:705c356ce664
640 640
641 host = &u->resolved->host; 641 host = &u->resolved->host;
642 642
643 if (u->resolved->sockaddr) { 643 if (u->resolved->sockaddr) {
644 644
645 if (u->resolved->port == 0) { 645 if (u->resolved->port == 0
646 && u->resolved->sockaddr->sa_family != AF_UNIX)
647 {
646 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, 648 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
647 "no port in upstream \"%V\"", host); 649 "no port in upstream \"%V\"", host);
648 ngx_http_upstream_finalize_request(r, u, 650 ngx_http_upstream_finalize_request(r, u,
649 NGX_HTTP_INTERNAL_SERVER_ERROR); 651 NGX_HTTP_INTERNAL_SERVER_ERROR);
650 return; 652 return;