Encode spaces in proxied URIs

Author: pintsized

lib/resty/http.lua

@@ -15,6 +15,7 @@ local tbl_concat = table.concat
 local tbl_insert = table.insert
 local ngx_encode_args = ngx.encode_args
 local ngx_re_match = ngx.re.match
+local ngx_re_gsub = ngx.re.gsub
 local ngx_log = ngx.log
 local ngx_DEBUG = ngx.DEBUG
 local ngx_ERR = ngx.ERR
@@ -773,7 +774,7 @@ end
 function _M.proxy_request(self, chunksize)
     return self:request{
         method = ngx_req_get_method(),
-        path = ngx_var.uri .. ngx_var.is_args .. (ngx_var.query_string or ""),
+        path = ngx_re_gsub(ngx_var.uri, "\\s", "%20", "jo") .. ngx_var.is_args .. (ngx_var.query_string or ""),
         body = self:get_client_body_reader(chunksize),
         headers = ngx_req_get_headers(),
     }

t/11-proxy.t

@@ -89,7 +89,7 @@ X-Test: foo
 [warn]
 
 
-=== TEST 3: Proxy multiple headers 
+=== TEST 3: Proxy multiple headers
 --- http_config eval: $::HttpConfig
 --- config
     location = /a_prx {
@@ -118,3 +118,35 @@ OK
 --- no_error_log
 [error]
 [warn]
+
+
+=== TEST 4: Proxy still works with spaces in URI
+--- http_config eval: $::HttpConfig
+--- config
+    location = "/a_ b_prx" {
+        rewrite ^(.*)_prx$ $1 break;
+        content_by_lua '
+            local http = require "resty.http"
+            local httpc = http.new()
+            httpc:connect("127.0.0.1", ngx.var.server_port)
+            httpc:proxy_response(httpc:proxy_request())
+            httpc:set_keepalive()
+        ';
+    }
+    location = "/a_ b" {
+        content_by_lua '
+            ngx.status = 200
+            ngx.header["X-Test"] = "foo"
+            ngx.say("OK")
+        ';
+    }
+--- request
+GET /a_%20b_prx
+--- response_body
+OK
+--- response_headers
+X-Test: foo
+--- error_code: 200
+--- no_error_log
+[error]
+[warn]