diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-03-28 12:24:47 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-03-28 12:24:47 +0000 |
| commit | 6275f56129da620742f578590abb3c61ede68b89 (patch) | |
| tree | 30e2091b58f98687176b0db88f3170ba476fddb2 /src/http/modules/ngx_http_proxy_module.c | |
| parent | 39600ca7fcf7a4c6337ddff64eeca322a544f391 (diff) | |
| download | nginx-6275f56129da620742f578590abb3c61ede68b89.tar.gz nginx-6275f56129da620742f578590abb3c61ede68b89.zip | |
nginx-0.3.35-RELEASE importrelease-0.3.35
*) Bugfix: the accept-filter and the TCP_DEFER_ACCEPT option were set
for first "listen" directive only; the bug had appeared in 0.3.31.
*) Bugfix: in the "proxy_pass" directive without the URI part in a
subrequest.
Diffstat (limited to 'src/http/modules/ngx_http_proxy_module.c')
| -rw-r--r-- | src/http/modules/ngx_http_proxy_module.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c index e8d310753..f8dfdc4e1 100644 --- a/src/http/modules/ngx_http_proxy_module.c +++ b/src/http/modules/ngx_http_proxy_module.c @@ -487,7 +487,8 @@ ngx_http_proxy_create_request(ngx_http_request_t *r) escape = 0; - loc_len = r->valid_location ? u->conf->location.len : 0; + loc_len = (r->valid_location && u->conf->uri.len) ? u->conf->location.len: + 0; if (u->conf->uri.len == 0 && r->valid_unparsed_uri && r == r->main) { unparsed_uri = 1; |