Infrastructure/caddy
1
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-16 21:56:40 -05:00
Code Issues Activity

httpcaddyfile: Allow php_fastcgi to be used in route directive

Browse source 
Fixes
https://caddy.community/t/v2-help-to-set-up-a-yourls-instance/7260/22
This commit is contained in:
Matthew Holt 2020-03-23 09:28:29 -06:00
parent e211491407
commit 348cb798e2
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
caddyconfig/httpcaddyfile/builtins.go
View file

@ -408,11 +408,18 @@ func parseRoute(h Helper) (caddyhttp.MiddlewareHandler, error) {
return nil, h.Errf("parsing caddyfile tokens for '%s': %v", dir, err) return nil, h.Errf("parsing caddyfile tokens for '%s': %v", dir, err)
} }
for _, result := range results { for _, result := range results {
handler, ok := result.Value.(caddyhttp.Route) switch handler := result.Value.(type) {
if !ok { case caddyhttp.Route:
return nil, h.Errf("%s directive returned something other than an HTTP route: %#v (only handler directives can be used in routes)", dir, result.Value) sr.Routes = append(sr.Routes, handler)
case caddyhttp.Subroute:
// directives which return a literal subroute instead of a route
// means they intend to keep those handlers together without
// them being reordered; we're doing that anyway since we're in
// the route directive, so just append its handlers
sr.Routes = append(sr.Routes, handler.Routes...)
default:
return nil, h.Errf("%s directive returned something other than an HTTP route or subroute: %#v (only handler directives can be used in routes)", dir, result.Value)
} }
sr.Routes = append(sr.Routes, handler)
} }
} }
} }