From 15c5995754a38c295adacb3929783c4c9fa15d82 Mon Sep 17 00:00:00 2001 From: WeidiDeng Date: Sun, 7 Dec 2025 20:23:51 +0800 Subject: [PATCH] change placeholder name --- modules/caddyhttp/marshalers.go | 2 +- modules/caddyhttp/replacer.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/caddyhttp/marshalers.go b/modules/caddyhttp/marshalers.go index f9da84afa..2a40b6cd7 100644 --- a/modules/caddyhttp/marshalers.go +++ b/modules/caddyhttp/marshalers.go @@ -110,7 +110,7 @@ func (t LoggableTLSConnState) MarshalLogObject(enc zapcore.ObjectEncoder) error enc.AddUint16("cipher_suite", t.CipherSuite) enc.AddString("proto", t.NegotiatedProtocol) enc.AddString("server_name", t.ServerName) - enc.AddBool("ech_accepted", t.ECHAccepted) + enc.AddBool("ech", t.ECHAccepted) if len(t.PeerCertificates) > 0 { enc.AddString("client_common_name", t.PeerCertificates[0].Subject.CommonName) enc.AddString("client_serial", t.PeerCertificates[0].SerialNumber.String()) diff --git a/modules/caddyhttp/replacer.go b/modules/caddyhttp/replacer.go index 554ddf164..2c372a9e8 100644 --- a/modules/caddyhttp/replacer.go +++ b/modules/caddyhttp/replacer.go @@ -511,7 +511,7 @@ func getReqTLSReplacement(req *http.Request, key string) (any, bool) { return true, true case "server_name": return req.TLS.ServerName, true - case "ech_accepted": + case "ech": return req.TLS.ECHAccepted, true } return nil, false