github-mirror/caddy
github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-04-25 06:14:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fastcgi: Preserve query during canonical redirect

Browse Source
This commit is contained in:
Francis Lavoie 2024-11-27 22:33:48 -05:00
parent 533a77c3fd
commit b47b2149ac
No known key found for this signature in database
GPG Key ID: 52BC55A211F19186
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
caddytest/integration/caddyfile_adapt/php_fastcgi_expanded_form.caddyfiletest
View File

@ -8,7 +8,7 @@ route {
} }
not path */ not path */
} }
redir @canonicalPath {http.request.orig_uri.path}/ 308 redir @canonicalPath {http.request.orig_uri.path}/{http.request.uri.prefixed_query} 308
# If the requested file does not exist, try index files # If the requested file does not exist, try index files
@indexFiles { @indexFiles {
@ -50,7 +50,7 @@ route {
"handler": "static_response", "handler": "static_response",
"headers": { "headers": {
"Location": [ "Location": [
"{http.request.orig_uri.path}/" "{http.request.orig_uri.path}/{http.request.uri.prefixed_query}"
] ]
}, },
"status_code": 308 "status_code": 308

2
caddytest/integration/caddyfile_adapt/php_fastcgi_handle_response.caddyfiletest
View File

@ -42,7 +42,7 @@
"handler": "static_response", "handler": "static_response",
"headers": { "headers": {
"Location": [ "Location": [
"{http.request.orig_uri.path}/" "{http.request.orig_uri.path}/{http.request.uri.prefixed_query}"
] ]
}, },
"status_code": 308 "status_code": 308

2
caddytest/integration/caddyfile_adapt/php_fastcgi_matcher.caddyfiletest
View File

@ -33,7 +33,7 @@ php_fastcgi @test localhost:9000
"handler": "static_response", "handler": "static_response",
"headers": { "headers": {
"Location": [ "Location": [
"{http.request.orig_uri.path}/" "{http.request.orig_uri.path}/{http.request.uri.prefixed_query}"
] ]
}, },
"status_code": 308 "status_code": 308

2
caddytest/integration/caddyfile_adapt/php_fastcgi_subdirectives.caddyfiletest
View File

@ -43,7 +43,7 @@ php_fastcgi localhost:9000 {
"handler": "static_response", "handler": "static_response",
"headers": { "headers": {
"Location": [ "Location": [
"{http.request.orig_uri.path}/" "{http.request.orig_uri.path}/{http.request.uri.prefixed_query}"
] ]
}, },
"status_code": 308 "status_code": 308

2
caddytest/integration/caddyfile_adapt/php_fastcgi_try_files_override.caddyfiletest
View File

@ -46,7 +46,7 @@ php_fastcgi localhost:9000 {
"handler": "static_response", "handler": "static_response",
"headers": { "headers": {
"Location": [ "Location": [
"{http.request.orig_uri.path}/" "{http.request.orig_uri.path}/{http.request.uri.prefixed_query}"
] ]
}, },
"status_code": 308 "status_code": 308

2
modules/caddyhttp/reverseproxy/fastcgi/caddyfile.go
View File

@ -343,7 +343,7 @@ func parsePHPFastCGI(h httpcaddyfile.Helper) ([]httpcaddyfile.ConfigValue, error
} }
redirHandler := caddyhttp.StaticResponse{ redirHandler := caddyhttp.StaticResponse{
StatusCode: caddyhttp.WeakString(strconv.Itoa(http.StatusPermanentRedirect)), StatusCode: caddyhttp.WeakString(strconv.Itoa(http.StatusPermanentRedirect)),
Headers: http.Header{"Location": []string{"{http.request.orig_uri.path}/"}}, Headers: http.Header{"Location": []string{"{http.request.orig_uri.path}/{http.request.uri.prefixed_query}"}},
} }
redirRoute := caddyhttp.Route{ redirRoute := caddyhttp.Route{
MatcherSetsRaw: []caddy.ModuleMap{redirMatcherSet}, MatcherSetsRaw: []caddy.ModuleMap{redirMatcherSet},