@@ -1307,7 +1307,7 @@ func TestCreateServers(t *testing.T) {
13071307 },
13081308 {
13091309 Path : "/_ngf-internal-rule8-route0" ,
1310- Rewrites : []string {"^ $request_uri" , "^/rewrite-with-headers(.*)$ /prefix-replacement$1 break" },
1310+ Rewrites : []string {"^ $request_uri" , "^/rewrite-with-headers([^?]*)? /prefix-replacement$1?$args? break" },
13111311 ProxyPass : "http://test_foo_80" ,
13121312 ProxySetHeaders : rewriteProxySetHeaders ,
13131313 Type : http .InternalLocationType ,
@@ -2427,7 +2427,7 @@ func TestCreateRewritesValForRewriteFilter(t *testing.T) {
24272427 },
24282428 expected : & rewriteConfig {
24292429 InternalRewrite : "^ $request_uri" ,
2430- MainRewrite : "^/original(.*)$ /prefix-path$1 break" ,
2430+ MainRewrite : "^/original([^?]*)? /prefix-path$1?$args? break" ,
24312431 },
24322432 msg : "prefix path no trailing slashes" ,
24332433 },
@@ -2441,7 +2441,7 @@ func TestCreateRewritesValForRewriteFilter(t *testing.T) {
24412441 },
24422442 expected : & rewriteConfig {
24432443 InternalRewrite : "^ $request_uri" ,
2444- MainRewrite : "^/original(?:/(. *))?$ /$1 break" ,
2444+ MainRewrite : "^/original(?:/([^?] *))? /$1?$args? break" ,
24452445 },
24462446 msg : "prefix path empty string" ,
24472447 },
@@ -2455,7 +2455,7 @@ func TestCreateRewritesValForRewriteFilter(t *testing.T) {
24552455 },
24562456 expected : & rewriteConfig {
24572457 InternalRewrite : "^ $request_uri" ,
2458- MainRewrite : "^/original(?:/(. *))?$ /$1 break" ,
2458+ MainRewrite : "^/original(?:/([^?] *))? /$1?$args? break" ,
24592459 },
24602460 msg : "prefix path /" ,
24612461 },
@@ -2469,7 +2469,7 @@ func TestCreateRewritesValForRewriteFilter(t *testing.T) {
24692469 },
24702470 expected : & rewriteConfig {
24712471 InternalRewrite : "^ $request_uri" ,
2472- MainRewrite : "^/original(?:/(. *))?$ /trailing/$1 break" ,
2472+ MainRewrite : "^/original(?:/([^?] *))? /trailing/$1?$args? break" ,
24732473 },
24742474 msg : "prefix path replacement with trailing /" ,
24752475 },
@@ -2483,7 +2483,7 @@ func TestCreateRewritesValForRewriteFilter(t *testing.T) {
24832483 },
24842484 expected : & rewriteConfig {
24852485 InternalRewrite : "^ $request_uri" ,
2486- MainRewrite : "^/original/(.*)$ /prefix-path/$1 break" ,
2486+ MainRewrite : "^/original/([^?]*)? /prefix-path/$1?$args? break" ,
24872487 },
24882488 msg : "prefix path original with trailing /" ,
24892489 },
@@ -2497,7 +2497,7 @@ func TestCreateRewritesValForRewriteFilter(t *testing.T) {
24972497 },
24982498 expected : & rewriteConfig {
24992499 InternalRewrite : "^ $request_uri" ,
2500- MainRewrite : "^/original/(.*)$ /trailing/$1 break" ,
2500+ MainRewrite : "^/original/([^?]*)? /trailing/$1?$args? break" ,
25012501 },
25022502 msg : "prefix path both with trailing slashes" ,
25032503 },
0 commit comments