Mirrors/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-02-13 03:26:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

httpcaddyfile: Sort catch-all site blocks properly (fix #4003)

Browse source
This commit is contained in:
Matthew Holt 2021-02-01 11:45:28 -07:00
parent e2940c8c03
commit 55e49ff5c8
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
caddyconfig/httpcaddyfile/httptype.go
View file

@ -430,9 +430,12 @@ func (st *ServerType) serversFromPairings(
jLongestPath = addr.Path jLongestPath = addr.Path
} }
} }
if specificity(jLongestHost) == 0 {
// catch-all blocks (blocks with no hostname) should always go // catch-all blocks (blocks with no hostname) should always go
// last, even after blocks with wildcard hosts // last, even after blocks with wildcard hosts
if specificity(iLongestHost) == 0 {
return false
}
if specificity(jLongestHost) == 0 {
return true return true
} }
if iWildcardHost != jWildcardHost { if iWildcardHost != jWildcardHost {