aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-11-15 11:36:12 +0000
committerIgor Sysoev <igor@sysoev.ru>2009-11-15 11:36:12 +0000
commit6c71b88924cc93f38e38d4dc56c5afe6bbf11524 (patch)
tree9c8b844ae291e12b53df1769b6aacb0dd634eb2d /src
parent700a779824c2d83ba1f8c7278f20863dce5ea3e1 (diff)
downloadnginx-6c71b88924cc93f38e38d4dc56c5afe6bbf11524.tar.gz
nginx-6c71b88924cc93f38e38d4dc56c5afe6bbf11524.zip
allow "proxy_pass http://$backend" without URI part
Diffstat (limited to 'src')
-rw-r--r--src/http/modules/ngx_http_proxy_module.c23
1 files changed, 14 insertions, 9 deletions
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index 8f169fe43..e0f17e70a 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -724,17 +724,22 @@ ngx_http_proxy_eval(ngx_http_request_t *r, ngx_http_proxy_ctx_t *ctx,
return NGX_ERROR;
}
- if (url.uri.len && url.uri.data[0] == '?') {
- p = ngx_pnalloc(r->pool, url.uri.len + 1);
- if (p == NULL) {
- return NGX_ERROR;
- }
+ if (url.uri.len) {
+ if (url.uri.data[0] == '?') {
+ p = ngx_pnalloc(r->pool, url.uri.len + 1);
+ if (p == NULL) {
+ return NGX_ERROR;
+ }
- *p++ = '/';
- ngx_memcpy(p, url.uri.data, url.uri.len);
+ *p++ = '/';
+ ngx_memcpy(p, url.uri.data, url.uri.len);
- url.uri.len++;
- url.uri.data = p - 1;
+ url.uri.len++;
+ url.uri.data = p - 1;
+ }
+
+ } else {
+ url.uri = r->unparsed_uri;
}
ctx->vars.key_start = u->schema;