Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-11-03 19:17:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add query_string to HTTP replacer and use it for try_files

Browse Source
This commit is contained in:
Matthew Holt 2019-08-27 14:38:24 -06:00
parent 2dc4fcc62b
commit d242f10eda
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/caddyhttp/fileserver/caddyfile.go
View File

@ -17,9 +17,9 @@ package fileserver
import ( import (
"encoding/json" "encoding/json"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/rewrite"
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile" "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
"github.com/caddyserver/caddy/v2/modules/caddyhttp" "github.com/caddyserver/caddy/v2/modules/caddyhttp"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/rewrite"
) )
func init() { func init() {
@ -99,7 +99,7 @@ func parseTryFiles(h httpcaddyfile.Helper) ([]httpcaddyfile.ConfigValue, error)
} }
handler := rewrite.Rewrite{ handler := rewrite.Rewrite{
URI: "{http.matchers.file.relative}{http.request.uri.query}", URI: "{http.matchers.file.relative}{http.request.uri.query_string}",
} }
matcherSet := map[string]json.RawMessage{ matcherSet := map[string]json.RawMessage{

6
modules/caddyhttp/replacer.go
View File

@ -89,6 +89,12 @@ func addHTTPVarsToReplacer(repl caddy.Replacer, req *http.Request, w http.Respon
return dir, true return dir, true
case "http.request.uri.query": case "http.request.uri.query":
return req.URL.RawQuery, true return req.URL.RawQuery, true
case "http.request.uri.query_string":
qs := req.URL.Query().Encode()
if qs != "" {
qs = "?" + qs
}
return qs, true
} }
// hostname labels // hostname labels