diff options
| author | Zaq? Wiedmann <zaquestion@gmail.com> | 2020-01-18 19:37:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-18 19:37:50 -0800 |
| commit | 07ef4b0c7db356bfc1d334187c0920f85aa416f3 (patch) | |
| tree | 781d4c84528b8db9d77a091c3624cbdb708fb20a /modules | |
| parent | 2bfaf8e89678fc1117984658f31f43fe90266763 (diff) | |
| parent | 35174a8ba85b6fd7dd3d28733028729d901dff33 (diff) | |
Merge pull request #2980 from moorereason/bugfix-ciphersuite-logging
v2: http: Fix ciphersuite logging
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/caddyhttp/marshalers.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/caddyhttp/marshalers.go b/modules/caddyhttp/marshalers.go index a672132..e35a73e 100644 --- a/modules/caddyhttp/marshalers.go +++ b/modules/caddyhttp/marshalers.go @@ -73,7 +73,7 @@ type LoggableTLSConnState tls.ConnectionState func (t LoggableTLSConnState) MarshalLogObject(enc zapcore.ObjectEncoder) error { enc.AddBool("resumed", t.DidResume) enc.AddUint16("version", t.Version) - enc.AddUint16("resumed", t.CipherSuite) + enc.AddUint16("ciphersuite", t.CipherSuite) enc.AddString("proto", t.NegotiatedProtocol) enc.AddBool("proto_mutual", t.NegotiatedProtocolIsMutual) enc.AddString("server_name", t.ServerName) |