Stowage/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-10-19 07:43:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

http: Fix subroutes, ensure that next handlers can still be called

Browse source
This commit is contained in:
Matthew Holt 2020-01-12 13:39:32 -07:00
parent fe5a531c58
commit 64f0173948
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/caddyhttp/routes.go
View file

@ -147,12 +147,12 @@ func (routes RouteList) Provision(ctx caddy.Context) error {
// Compile prepares a middleware chain from the route list.
// This should only be done once: after all the routes have
// been provisioned, and before serving requests.
func (routes RouteList) Compile() Handler {
func (routes RouteList) Compile(next Handler) Handler {
var mid []Middleware
for _, route := range routes {
mid = append(mid, wrapRoute(route))
}
stack := emptyHandler
stack := next
for i := len(mid) - 1; i >= 0; i-- {
stack = mid[i](stack)
}
@ -167,6 +167,7 @@ func (routes RouteList) Compile() Handler {
func wrapRoute(route Route) Middleware {
return func(next Handler) Handler {
return HandlerFunc(func(rw http.ResponseWriter, req *http.Request) error {
// TODO: Update this comment, it seems we've moved the copy into the handler?
// copy the next handler (it's an interface, so it's just
// a very lightweight copy of a pointer); this is important
// because this is a closure to the func below, which