mirror of
https://github.com/caddyserver/caddy.git
synced 2024-12-26 21:53:48 +03:00
Prepare for beta 9 tag
This commit is contained in:
parent
263ffbfaec
commit
f5c6a8553c
2 changed files with 7 additions and 3 deletions
|
@ -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
|
||||
|
|
|
@ -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()),
|
||||
|
|
Loading…
Reference in a new issue