From 41dc280491a7054876e826dac0eff66836d53ae8 Mon Sep 17 00:00:00 2001
From: Blake Mizerany <blake.mizerany@gmail.com>
Date: Thu, 27 Feb 2025 14:00:37 -0800
Subject: [PATCH] server/internal/registry: implement CloseNotify and Flush
(for now) (#9402)
This fixes panics introduced in 2412adf42b8380748ac79476e273f5b337c3b977
when Gin ungracefully assumes that the http.ResponseWriter implements
http.CloseNotifier and http.Flusher, which our new statusCodeRecorder
does not. This is a temporary fix until we can pour the rest of the Gin
out.
---
server/internal/registry/server.go | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/server/internal/registry/server.go b/server/internal/registry/server.go
index 8d6dc1aa0..8eb6daf89 100644
--- a/server/internal/registry/server.go
+++ b/server/internal/registry/server.go
@@ -72,6 +72,26 @@ func (r *statusCodeRecorder) WriteHeader(status int) {
r.ResponseWriter.WriteHeader(status)
}
+var (
+ _ http.ResponseWriter = (*statusCodeRecorder)(nil)
+ _ http.CloseNotifier = (*statusCodeRecorder)(nil)
+ _ http.Flusher = (*statusCodeRecorder)(nil)
+)
+
+// CloseNotify implements the http.CloseNotifier interface, for Gin. Remove with Gin.
+//
+// It panics if the underlying ResponseWriter is not a CloseNotifier.
+func (r *statusCodeRecorder) CloseNotify() <-chan bool {
+ return r.ResponseWriter.(http.CloseNotifier).CloseNotify()
+}
+
+// Flush implements the http.Flusher interface, for Gin. Remove with Gin.
+//
+// It panics if the underlying ResponseWriter is not a Flusher.
+func (r *statusCodeRecorder) Flush() {
+ r.ResponseWriter.(http.Flusher).Flush()
+}
+
func (r *statusCodeRecorder) status() int {
return cmp.Or(r._status, 200)
}