Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-05-24 02:02:26 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

keep ConnCtxKey for now

Browse Source
This commit is contained in:
WeidiDeng 2025-04-17 12:14:25 +08:00
parent ca256e3acf
commit 16e184af16
No known key found for this signature in database
GPG Key ID: 25F87CE1741EC7CD
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/caddyhttp/app.go
View File

@ -439,6 +439,9 @@ func (app *App) Start() error {
Handler: srv, Handler: srv,
ErrorLog: serverLogger, ErrorLog: serverLogger,
Protocols: new(http.Protocols), Protocols: new(http.Protocols),
ConnContext: func(ctx context.Context, c net.Conn) context.Context {
return context.WithValue(ctx, ConnCtxKey, c)
},
} }
// disable HTTP/2, which we enabled by default during provisioning // disable HTTP/2, which we enabled by default during provisioning

14
modules/caddyhttp/server.go
View File

@ -263,6 +263,18 @@ type Server struct {
// ServeHTTP is the entry point for all HTTP requests. // ServeHTTP is the entry point for all HTTP requests.
func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// If there are listener wrappers that process tls connections but don't return a *tls.Conn, this field will be nil.
// TODO: Scheduled to be removed later because https://github.com/golang/go/pull/56110 has been merged.
if r.TLS == nil {
// not all requests have a conn (like virtual requests) - see #5698
if conn, ok := r.Context().Value(ConnCtxKey).(net.Conn); ok {
if csc, ok := conn.(connectionStater); ok {
r.TLS = new(tls.ConnectionState)
*r.TLS = csc.ConnectionState()
}
}
}
w.Header().Set("Server", "Caddy") w.Header().Set("Server", "Caddy")
// advertise HTTP/3, if enabled // advertise HTTP/3, if enabled
@ -1067,7 +1079,7 @@ const (
OriginalRequestCtxKey caddy.CtxKey = "original_request" OriginalRequestCtxKey caddy.CtxKey = "original_request"
// For referencing underlying net.Conn // For referencing underlying net.Conn
// DEPRECATED: Not used anymore. To refer to the underlying connection, implement a middleware plugin // This will eventually be deprecated and not used. To refer to the underlying connection, implement a middleware plugin
// that RegisterConnContext during provisioning. // that RegisterConnContext during provisioning.
ConnCtxKey caddy.CtxKey = "conn" ConnCtxKey caddy.CtxKey = "conn"