Matthew Holt
5 years ago
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
1 changed files with
9 additions and
11 deletions
-
caddyconfig/httpcaddyfile/directives.go
|
@ -298,18 +298,16 @@ func sortRoutes(routes []ConfigValue) { |
|
|
jPM = pathMatcher |
|
|
jPM = pathMatcher |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// if there is only one path in the matcher, sort by
|
|
|
// sort by longer path (more specific) first; missing
|
|
|
// longer path (more specific) first; if one of the
|
|
|
// path matchers are treated as zero-length paths
|
|
|
// routes doesn't have a matcher, then it's treated
|
|
|
var iPathLen, jPathLen int |
|
|
// like a zero-length path matcher
|
|
|
if iPM != nil { |
|
|
switch { |
|
|
iPathLen = len(iPM[0]) |
|
|
case iPM == nil && jPM != nil: |
|
|
} |
|
|
return false |
|
|
if jPM != nil { |
|
|
case iPM != nil && jPM == nil: |
|
|
jPathLen = len(jPM[0]) |
|
|
return true |
|
|
|
|
|
case iPM != nil && jPM != nil: |
|
|
|
|
|
return len(iPM[0]) > len(jPM[0]) |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
return iPathLen > jPathLen |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
return dirPositions[iDir] < dirPositions[jDir] |
|
|
return dirPositions[iDir] < dirPositions[jDir] |
|
|