Merge pull request #273 from rykov/master

Added ResponseWriter.Unwrap() for ResponseController
urfave · Mar 18, 2023 · b935227 · b935227
2 parents dc8359a + 59d32aa
commit b935227
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/response_writer.go b/response_writer.go
@@ -84,6 +84,11 @@ func (rw *responseWriter) ReadFrom(r io.Reader) (n int64, err error) {
 	return
 }
 
+// Satisfy http.ResponseController support (Go 1.20+)
+func (rw *responseWriter) Unwrap() http.ResponseWriter {
+	return rw.ResponseWriter
+}
+
 func (rw *responseWriter) Status() int {
 	if rw.Written() {
 		return rw.status

diff --git a/response_writer_test.go b/response_writer_test.go
@@ -169,6 +169,17 @@ func TestResponseWriterBefore(t *testing.T) {
 	expect(t, result, "barfoo")
 }
 
+func TestResponseWriterUnwrap(t *testing.T) {
+	rec := httptest.NewRecorder()
+	rw := NewResponseWriter(rec)
+	switch v := rw.(type) {
+	case interface{ Unwrap() http.ResponseWriter }:
+		expect(t, v.Unwrap(), rec)
+	default:
+		t.Error("Does not implement Unwrap()")
+	}
+}
+
 func TestResponseWriterHijack(t *testing.T) {
 	hijackable := newHijackableResponse()
 	rw := NewResponseWriter(hijackable)