github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-23 01:40:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor cleanup, resolve a couple lint warnings

Browse Source
This commit is contained in:
Matthew Holt 2022-08-29 12:31:53 -06:00
parent e1801fdb19
commit 8cb3cf540c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
caddytest/integration/stream_test.go
View File

@ -123,8 +123,8 @@ func TestH2ToH2CStream(t *testing.T) {
// Disable any compression method from server. // Disable any compression method from server.
req.Header.Set("Accept-Encoding", "identity") req.Header.Set("Accept-Encoding", "identity")
resp := tester.AssertResponseCode(req, 200) resp := tester.AssertResponseCode(req, http.StatusOK)
if 200 != resp.StatusCode { if resp.StatusCode != http.StatusOK {
return return
} }
go func() { go func() {
@ -143,7 +143,6 @@ func TestH2ToH2CStream(t *testing.T) {
if !strings.Contains(body, expectedBody) { if !strings.Contains(body, expectedBody) {
t.Errorf("requesting \"%s\" expected response body \"%s\" but got \"%s\"", req.RequestURI, expectedBody, body) t.Errorf("requesting \"%s\" expected response body \"%s\" but got \"%s\"", req.RequestURI, expectedBody, body)
} }
return
} }
func testH2ToH2CStreamServeH2C(t *testing.T) *http.Server { func testH2ToH2CStreamServeH2C(t *testing.T) *http.Server {
@ -335,8 +334,8 @@ func TestH2ToH1ChunkedResponse(t *testing.T) {
fmt.Fprint(w, expectedBody) fmt.Fprint(w, expectedBody)
w.Close() w.Close()
}() }()
resp := tester.AssertResponseCode(req, 200) resp := tester.AssertResponseCode(req, http.StatusOK)
if 200 != resp.StatusCode { if resp.StatusCode != http.StatusOK {
return return
} }
@ -351,7 +350,6 @@ func TestH2ToH1ChunkedResponse(t *testing.T) {
if body != expectedBody { if body != expectedBody {
t.Errorf("requesting \"%s\" expected response body \"%s\" but got \"%s\"", req.RequestURI, expectedBody, body) t.Errorf("requesting \"%s\" expected response body \"%s\" but got \"%s\"", req.RequestURI, expectedBody, body)
} }
return
} }
func testH2ToH1ChunkedResponseServeH1(t *testing.T) *http.Server { func testH2ToH1ChunkedResponseServeH1(t *testing.T) *http.Server {

4
modules/caddyhttp/reverseproxy/reverseproxy.go
View File

@ -46,7 +46,9 @@ import (
var supports1xx bool var supports1xx bool
func init() { func init() {
supports1xx = !regexp.MustCompile(`^go1\.1(?:7|8)\.`).Match([]byte(runtime.Version())) // Caddy requires at least Go 1.18, but Early Hints requires Go 1.19; thus we can simply check for 1.18 in version string
// TODO: remove this once our minimum Go version is 1.19
supports1xx = !strings.Contains(runtime.Version(), "go1.18")
caddy.RegisterModule(Handler{}) caddy.RegisterModule(Handler{})
} }