diff options
author | Matthew Holt <mholt@users.noreply.github.com> | 2019-07-11 17:07:52 -0600 |
---|---|---|
committer | Matthew Holt <mholt@users.noreply.github.com> | 2019-07-11 17:07:52 -0600 |
commit | 4698352b20872557e624c54c1b4a1e0074f0baca (patch) | |
tree | ac1c77bccd7a1d23cb8e1fd361ed334a3890a80c /modules/caddyhttp/server.go | |
parent | 9343403358bd34b787a209b41c5b820781f78890 (diff) | |
parent | eb8625f7744ba5e72b51549adc086e45313267cb (diff) |
Merge branch 'v2-handlers' into v2
# Conflicts:
# modules/caddyhttp/caddyhttp.go
# modules/caddyhttp/fileserver/staticfiles.go
# modules/caddyhttp/routes.go
# modules/caddyhttp/server.go
# modules/caddyhttp/staticresp.go
# modules/caddyhttp/staticresp_test.go
Diffstat (limited to 'modules/caddyhttp/server.go')
-rw-r--r-- | modules/caddyhttp/server.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/caddyhttp/server.go b/modules/caddyhttp/server.go index 8bc3a5a..a24bbac 100644 --- a/modules/caddyhttp/server.go +++ b/modules/caddyhttp/server.go @@ -65,7 +65,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { addHTTPVarsToReplacer(repl, r, w) // build and execute the main handler chain - stack := s.Routes.BuildCompositeRoute(w, r) + stack := s.Routes.BuildCompositeRoute(r) stack = s.wrapPrimaryRoute(stack) err := s.executeCompositeRoute(w, r, stack) if err != nil { @@ -85,7 +85,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { } if s.Errors != nil && len(s.Errors.Routes) > 0 { - errStack := s.Errors.Routes.BuildCompositeRoute(w, r) + errStack := s.Errors.Routes.BuildCompositeRoute(r) err := s.executeCompositeRoute(w, r, errStack) if err != nil { // TODO: what should we do if the error handler has an error? |