From: Igor Sysoev <igor@sysoev.ru>
Date: Sun, 15 Nov 2009 11:36:12 +0000 (+0000)
Subject: allow "proxy_pass  http://$backend" without URI part
X-Git-Tag: release-0.8.25~9
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=6c71b88924cc93f38e38d4dc56c5afe6bbf11524;p=nginx.git

allow "proxy_pass  http://$backend" without URI part
---

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;