From e747a9bb12bc644aebce369061a2dc0de567d8d9 Mon Sep 17 00:00:00 2001
From: Matthew Holt <mholt@users.noreply.github.com>
Date: Fri, 23 Sep 2022 16:47:59 -0600
Subject: [PATCH] Fix tests
---
.../integration/caddyfile_adapt/php_fastcgi_expanded_form.txt | 4 ++--
.../caddyfile_adapt/php_fastcgi_handle_response.txt | 2 +-
caddytest/integration/caddyfile_adapt/php_fastcgi_matcher.txt | 2 +-
.../integration/caddyfile_adapt/php_fastcgi_subdirectives.txt | 2 +-
.../caddyfile_adapt/php_fastcgi_try_files_override.txt | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/caddytest/integration/caddyfile_adapt/php_fastcgi_expanded_form.txt b/caddytest/integration/caddyfile_adapt/php_fastcgi_expanded_form.txt
index bb7c7f7b9..2fa2b7979 100644
--- a/caddytest/integration/caddyfile_adapt/php_fastcgi_expanded_form.txt
+++ b/caddytest/integration/caddyfile_adapt/php_fastcgi_expanded_form.txt
@@ -8,7 +8,7 @@ route {
}
not path */
}
- redir @canonicalPath {path}/ 308
+ redir @canonicalPath {http.request.orig_uri.path}/ 308
# If the requested file does not exist, try index files
@indexFiles {
@@ -50,7 +50,7 @@ route {
"handler": "static_response",
"headers": {
"Location": [
- "{http.request.uri.path}/"
+ "{http.request.orig_uri.path}/"
]
},
"status_code": 308
diff --git a/caddytest/integration/caddyfile_adapt/php_fastcgi_handle_response.txt b/caddytest/integration/caddyfile_adapt/php_fastcgi_handle_response.txt
index dbb08719f..70a0780d1 100644
--- a/caddytest/integration/caddyfile_adapt/php_fastcgi_handle_response.txt
+++ b/caddytest/integration/caddyfile_adapt/php_fastcgi_handle_response.txt
@@ -42,7 +42,7 @@
"handler": "static_response",
"headers": {
"Location": [
- "{http.request.uri.path}/"
+ "{http.request.orig_uri.path}/"
]
},
"status_code": 308
diff --git a/caddytest/integration/caddyfile_adapt/php_fastcgi_matcher.txt b/caddytest/integration/caddyfile_adapt/php_fastcgi_matcher.txt
index 488c52528..d90b2cb4e 100644
--- a/caddytest/integration/caddyfile_adapt/php_fastcgi_matcher.txt
+++ b/caddytest/integration/caddyfile_adapt/php_fastcgi_matcher.txt
@@ -30,7 +30,7 @@ php_fastcgi @api localhost:9000
"handler": "static_response",
"headers": {
"Location": [
- "{http.request.uri.path}/"
+ "{http.request.orig_uri.path}/"
]
},
"status_code": 308
diff --git a/caddytest/integration/caddyfile_adapt/php_fastcgi_subdirectives.txt b/caddytest/integration/caddyfile_adapt/php_fastcgi_subdirectives.txt
index 90d1633b4..a04d66fe4 100644
--- a/caddytest/integration/caddyfile_adapt/php_fastcgi_subdirectives.txt
+++ b/caddytest/integration/caddyfile_adapt/php_fastcgi_subdirectives.txt
@@ -43,7 +43,7 @@ php_fastcgi localhost:9000 {
"handler": "static_response",
"headers": {
"Location": [
- "{http.request.uri.path}/"
+ "{http.request.orig_uri.path}/"
]
},
"status_code": 308
diff --git a/caddytest/integration/caddyfile_adapt/php_fastcgi_try_files_override.txt b/caddytest/integration/caddyfile_adapt/php_fastcgi_try_files_override.txt
index 434278627..a3381f675 100644
--- a/caddytest/integration/caddyfile_adapt/php_fastcgi_try_files_override.txt
+++ b/caddytest/integration/caddyfile_adapt/php_fastcgi_try_files_override.txt
@@ -46,7 +46,7 @@ php_fastcgi localhost:9000 {
"handler": "static_response",
"headers": {
"Location": [
- "{http.request.uri.path}/"
+ "{http.request.orig_uri.path}/"
]
},
"status_code": 308