Skip to content

Commit d20a625

Browse files
committed
Remove pre Go1.20 support
1 parent 27c55f2 commit d20a625

7 files changed

+6
-134
lines changed

middleware/body_dump.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,14 @@ func (w *bodyDumpResponseWriter) Write(b []byte) (int, error) {
9898
}
9999

100100
func (w *bodyDumpResponseWriter) Flush() {
101-
err := responseControllerFlush(w.ResponseWriter)
101+
err := http.NewResponseController(w.ResponseWriter).Flush()
102102
if err != nil && errors.Is(err, http.ErrNotSupported) {
103103
panic(errors.New("response writer flushing is not supported"))
104104
}
105105
}
106106

107107
func (w *bodyDumpResponseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
108-
return responseControllerHijack(w.ResponseWriter)
108+
return http.NewResponseController(w.ResponseWriter).Hijack()
109109
}
110110

111111
func (w *bodyDumpResponseWriter) Unwrap() http.ResponseWriter {

middleware/compress.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,15 +190,15 @@ func (w *gzipResponseWriter) Flush() {
190190
}
191191

192192
w.Writer.(*gzip.Writer).Flush()
193-
_ = responseControllerFlush(w.ResponseWriter)
193+
_ = http.NewResponseController(w.ResponseWriter).Flush()
194194
}
195195

196196
func (w *gzipResponseWriter) Unwrap() http.ResponseWriter {
197197
return w.ResponseWriter
198198
}
199199

200200
func (w *gzipResponseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
201-
return responseControllerHijack(w.ResponseWriter)
201+
return http.NewResponseController(w.ResponseWriter).Hijack()
202202
}
203203

204204
func (w *gzipResponseWriter) Push(target string, opts *http.PushOptions) error {

middleware/responsecontroller_1.19.go

-44
This file was deleted.

middleware/responsecontroller_1.20.go

-20
This file was deleted.

response.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func (r *Response) Write(b []byte) (n int, err error) {
8686
// buffered data to the client.
8787
// See [http.Flusher](https://golang.org/pkg/net/http/#Flusher)
8888
func (r *Response) Flush() {
89-
err := responseControllerFlush(r.Writer)
89+
err := http.NewResponseController(r.Writer).Flush()
9090
if err != nil && errors.Is(err, http.ErrNotSupported) {
9191
panic(errors.New("response writer flushing is not supported"))
9292
}
@@ -96,7 +96,7 @@ func (r *Response) Flush() {
9696
// take over the connection.
9797
// See [http.Hijacker](https://golang.org/pkg/net/http/#Hijacker)
9898
func (r *Response) Hijack() (net.Conn, *bufio.ReadWriter, error) {
99-
return responseControllerHijack(r.Writer)
99+
return http.NewResponseController(r.Writer).Hijack()
100100
}
101101

102102
// Unwrap returns the original http.ResponseWriter.

responsecontroller_1.19.go

-44
This file was deleted.

responsecontroller_1.20.go

-20
This file was deleted.

0 commit comments

Comments
 (0)