github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-02-07 21:51:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prepare for beta 9 tag

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
caddyconfig/httpcaddyfile/directives.go
View File

@ -64,8 +64,12 @@ func RegisterHandlerDirective(dir string, setupFunc UnmarshalHandlerFunc) {
return nil, err return nil, err
} }
if ok { if ok {
tokens := h.Dispenser.Delete() // strip matcher token // strip matcher token; we don't need to
h.Dispenser = caddyfile.NewDispenser(tokens) // 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 h.Dispenser.Reset() // pretend this lookahead never happened

2
modules/caddyhttp/server.go
View File

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