diff options
| author | Francis Lavoie <lavofr@gmail.com> | 2023-08-02 16:03:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-02 20:03:26 +0000 |
| commit | cd486c25d168caf58f4b6fe5d3252df9432901ec (patch) | |
| tree | 1c444017467ff3339e5321429eb2c82d37fbf414 /caddytest | |
| parent | e198c605bd68f4b3630e5fa1ae9f7ca5cac1a7d9 (diff) | |
caddyhttp: Make use of `http.ResponseController` (#5654)
* caddyhttp: Make use of http.ResponseController
Also syncs the reverseproxy implementation with stdlib's which now uses ResponseController as well https://github.com/golang/go/commit/2449bbb5e614954ce9e99c8a481ea2ee73d72d61
* Enable full-duplex for HTTP/1.1
* Appease linter
* Add warning for builds with Go 1.20, so it's less surprising to users
* Improved godoc for EnableFullDuplex, copied text from stdlib
* Only wrap in encode if not already wrapped
Diffstat (limited to 'caddytest')
| -rw-r--r-- | caddytest/integration/caddyfile_adapt/global_server_options_single.txt | 2 | ||||
| -rw-r--r-- | caddytest/integration/stream_test.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/caddytest/integration/caddyfile_adapt/global_server_options_single.txt b/caddytest/integration/caddyfile_adapt/global_server_options_single.txt index 300b4ac..2f3306f 100644 --- a/caddytest/integration/caddyfile_adapt/global_server_options_single.txt +++ b/caddytest/integration/caddyfile_adapt/global_server_options_single.txt @@ -11,6 +11,7 @@ idle 30s } max_header_size 100MB + enable_full_duplex log_credentials protocols h1 h2 h2c h3 strict_sni_host @@ -45,6 +46,7 @@ foo.com { "write_timeout": 30000000000, "idle_timeout": 30000000000, "max_header_bytes": 100000000, + "enable_full_duplex": true, "routes": [ { "match": [ diff --git a/caddytest/integration/stream_test.go b/caddytest/integration/stream_test.go index 09d4f64..6bc612d 100644 --- a/caddytest/integration/stream_test.go +++ b/caddytest/integration/stream_test.go @@ -176,9 +176,7 @@ func testH2ToH2CStreamServeH2C(t *testing.T) *http.Server { w.Header().Set("Cache-Control", "no-store") w.WriteHeader(200) - if f, ok := w.(http.Flusher); ok { - f.Flush() - } + http.NewResponseController(w).Flush() buf := make([]byte, 4*1024) |