summaryrefslogtreecommitdiff
path: root/modules/caddyhttp/caddyhttp.go
diff options
context:
space:
mode:
authorMatthew Holt <mholt@users.noreply.github.com>2020-01-12 13:39:32 -0700
committerMatthew Holt <mholt@users.noreply.github.com>2020-01-12 13:39:32 -0700
commit64f0173948e9b87a8f898d451ef35daefedf2c50 (patch)
tree635019e8ff37ec2f87320b2795842ae5813e93eb /modules/caddyhttp/caddyhttp.go
parentfe5a531c58f9714bf379962c51d086a14661cfdb (diff)
http: Fix subroutes, ensure that next handlers can still be called
Diffstat (limited to 'modules/caddyhttp/caddyhttp.go')
-rw-r--r--modules/caddyhttp/caddyhttp.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/caddyhttp/caddyhttp.go b/modules/caddyhttp/caddyhttp.go
index 389a2d2..73c4863 100644
--- a/modules/caddyhttp/caddyhttp.go
+++ b/modules/caddyhttp/caddyhttp.go
@@ -172,7 +172,7 @@ func (app *App) Provision(ctx caddy.Context) error {
}
// pre-compile the handler chain, and be sure to wrap it in our
// route handler so that important security checks are done, etc.
- primaryRoute = srv.Routes.Compile()
+ primaryRoute = srv.Routes.Compile(emptyHandler)
}
srv.primaryHandlerChain = srv.wrapPrimaryRoute(primaryRoute)
@@ -181,7 +181,7 @@ func (app *App) Provision(ctx caddy.Context) error {
if err != nil {
return fmt.Errorf("server %s: setting up server error handling routes: %v", srvName, err)
}
- srv.errorHandlerChain = srv.Errors.Routes.Compile()
+ srv.errorHandlerChain = srv.Errors.Routes.Compile(emptyHandler)
}
}
@@ -546,7 +546,7 @@ func (app *App) automaticHTTPS() error {
tlsApp: tlsApp, // required to solve HTTP challenge
logger: app.logger.Named("log"),
errorLogger: app.logger.Named("log.error"),
- primaryHandlerChain: redirRoutes.Compile(),
+ primaryHandlerChain: redirRoutes.Compile(emptyHandler),
}
}
}