From 7d29cc31f830c7b44a975c4785a45a792b085f52 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Mon, 27 Jul 2020 12:01:53 +0700 Subject: [PATCH] remove the H3_EARLY_RESPONSE error --- http3/error_codes.go | 3 --- http3/server.go | 2 +- http3/server_test.go | 6 +++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/http3/error_codes.go b/http3/error_codes.go index 2e8f4f81..5b017fde 100644 --- a/http3/error_codes.go +++ b/http3/error_codes.go @@ -23,7 +23,6 @@ const ( errorRequestRejected errorCode = 0x10b errorRequestCanceled errorCode = 0x10c errorRequestIncomplete errorCode = 0x10d - errorEarlyResponse errorCode = 0x10e errorConnectError errorCode = 0x10f errorVersionFallback errorCode = 0x110 ) @@ -58,8 +57,6 @@ func (e errorCode) String() string { return "H3_REQUEST_CANCELLED" case errorRequestIncomplete: return "H3_INCOMPLETE_REQUEST" - case errorEarlyResponse: - return "H3_EARLY_RESPONSE" case errorConnectError: return "H3_CONNECT_ERROR" case errorVersionFallback: diff --git a/http3/server.go b/http3/server.go index 814bd52b..be441798 100644 --- a/http3/server.go +++ b/http3/server.go @@ -298,7 +298,7 @@ func (s *Server) handleRequest(sess quic.Session, str quic.Stream, decoder *qpac } // If the EOF was read by the handler, CancelRead() is a no-op. - str.CancelRead(quic.ErrorCode(errorEarlyResponse)) + str.CancelRead(quic.ErrorCode(errorNoError)) return requestError{} } diff --git a/http3/server_test.go b/http3/server_test.go index 6bd15a8f..daee9d67 100644 --- a/http3/server_test.go +++ b/http3/server_test.go @@ -200,7 +200,7 @@ var _ = Describe("Server", func() { str.EXPECT().Write(gomock.Any()).DoAndReturn(func(p []byte) (int, error) { return responseBuf.Write(p) }).AnyTimes() - str.EXPECT().CancelRead(quic.ErrorCode(errorEarlyResponse)) + str.EXPECT().CancelRead(quic.ErrorCode(errorNoError)) str.EXPECT().Close().Do(func() { close(done) }) s.handleConn(sess) @@ -305,7 +305,7 @@ var _ = Describe("Server", func() { str.EXPECT().Write(gomock.Any()).DoAndReturn(func(p []byte) (int, error) { return len(p), nil }).AnyTimes() - str.EXPECT().CancelRead(quic.ErrorCode(errorEarlyResponse)) + str.EXPECT().CancelRead(quic.ErrorCode(errorNoError)) serr := s.handleRequest(sess, str, qpackDecoder, nil) Expect(serr.err).ToNot(HaveOccurred()) @@ -328,7 +328,7 @@ var _ = Describe("Server", func() { str.EXPECT().Write(gomock.Any()).DoAndReturn(func(p []byte) (int, error) { return len(p), nil }).AnyTimes() - str.EXPECT().CancelRead(quic.ErrorCode(errorEarlyResponse)) + str.EXPECT().CancelRead(quic.ErrorCode(errorNoError)) serr := s.handleRequest(sess, str, qpackDecoder, nil) Expect(serr.err).ToNot(HaveOccurred())