Prepare for beta 9 tag

This commit is contained in:
Matthew Holt 2019-11-04 13:43:39 -07:00
parent 263ffbfaec
commit f5c6a8553c
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
2 changed files with 7 additions and 3 deletions

View file

@ -64,8 +64,12 @@ func RegisterHandlerDirective(dir string, setupFunc UnmarshalHandlerFunc) {
return nil, err
}
if ok {
tokens := h.Dispenser.Delete() // strip matcher token
h.Dispenser = caddyfile.NewDispenser(tokens)
// strip matcher token; we don't need to
// use the return value here because a
// new dispenser should have been made
// solely for this directive's tokens,
// with no other uses of same slice
h.Dispenser.Delete()
}
h.Dispenser.Reset() // pretend this lookahead never happened

View file

@ -116,7 +116,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
log = logger.Error
}
log("request",
log("received request",
zap.String("common_log", repl.ReplaceAll(CommonLogFormat, "-")),
zap.Duration("latency", latency),
zap.Int("size", wrec.Size()),