diff options
author | Igor Sysoev <igor@sysoev.ru> | 2011-04-04 10:43:21 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2011-04-04 10:43:21 +0000 |
commit | fde7d51392598d0fa74dca125883d9663e7eb80a (patch) | |
tree | fbde480f7a1eddb2091efcf5543624e89c04ace6 /src/http/modules/ngx_http_scgi_module.c | |
parent | 450c981ab968c073049aea7f16dad0134701a403 (diff) | |
download | nginx-fde7d51392598d0fa74dca125883d9663e7eb80a.tar.gz nginx-fde7d51392598d0fa74dca125883d9663e7eb80a.zip |
fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass
is given by expression and refers to a defined upstream
Diffstat (limited to 'src/http/modules/ngx_http_scgi_module.c')
-rw-r--r-- | src/http/modules/ngx_http_scgi_module.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c index d831e27c2..d745551f2 100644 --- a/src/http/modules/ngx_http_scgi_module.c +++ b/src/http/modules/ngx_http_scgi_module.c @@ -458,12 +458,6 @@ ngx_http_scgi_eval(ngx_http_request_t *r, ngx_http_scgi_loc_conf_t * scf) return NGX_ERROR; } - if (url.no_port) { - ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, - "no port in upstream \"%V\"", &url.url); - return NGX_ERROR; - } - u = r->upstream; u->resolved = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_resolved_t)); @@ -480,6 +474,7 @@ ngx_http_scgi_eval(ngx_http_request_t *r, ngx_http_scgi_loc_conf_t * scf) } else { u->resolved->host = url.host; u->resolved->port = url.port; + u->resolved->no_port = url.no_port; } return NGX_OK; |