mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 20:57:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

http3: change status codes to const (#3683)

Browse source 
Signed-off-by: Avi Rosenberg <avrumi96@gmail.com>
This commit is contained in:
Avi Rosenberg 2023-01-28 00:40:59 +02:00 • committed by GitHub
parent 3f9d8feab2
commit 7b2c69451e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
http3/client.go
View file

@ -411,7 +411,7 @@ func (c *client) doRequest(req *http.Request, str quic.Stream, opt RoundTripOpt,
// Rules for when to set Content-Length are defined in https://tools.ietf.org/html/rfc7230#section-3.3.2. // Rules for when to set Content-Length are defined in https://tools.ietf.org/html/rfc7230#section-3.3.2.
_, hasTransferEncoding := res.Header["Transfer-Encoding"] _, hasTransferEncoding := res.Header["Transfer-Encoding"]
isInformational := res.StatusCode >= 100 && res.StatusCode < 200 isInformational := res.StatusCode >= 100 && res.StatusCode < 200
isNoContent := res.StatusCode == 204 isNoContent := res.StatusCode == http.StatusNoContent
isSuccessfulConnect := req.Method == http.MethodConnect && res.StatusCode >= 200 && res.StatusCode < 300 isSuccessfulConnect := req.Method == http.MethodConnect && res.StatusCode >= 200 && res.StatusCode < 300
if !hasTransferEncoding && !isInformational && !isNoContent && !isSuccessfulConnect { if !hasTransferEncoding && !isInformational && !isNoContent && !isSuccessfulConnect {
res.ContentLength = -1 res.ContentLength = -1

6
http3/response_writer.go
View file

@ -81,7 +81,7 @@ func (w *responseWriter) WriteHeader(status int) {
func (w *responseWriter) Write(p []byte) (int, error) { func (w *responseWriter) Write(p []byte) (int, error) {
if !w.headerWritten { if !w.headerWritten {
w.WriteHeader(200) w.WriteHeader(http.StatusOK)
} }
if !bodyAllowedForStatus(w.status) { if !bodyAllowedForStatus(w.status) {
return 0, http.ErrBodyNotAllowed return 0, http.ErrBodyNotAllowed
@ -112,9 +112,9 @@ func bodyAllowedForStatus(status int) bool {
switch { switch {
case status >= 100 && status <= 199: case status >= 100 && status <= 199:
return false return false
case status == 204: case status == http.StatusNoContent:
return false return false
case status == 304: case status == http.StatusNotModified:
return false return false
} }
return true return true

4
http3/response_writer_test.go
View file

@ -110,8 +110,8 @@ var _ = Describe("Response Writer", func() {
}) })
It("does not WriteHeader() twice", func() { It("does not WriteHeader() twice", func() {
rw.WriteHeader(200) rw.WriteHeader(http.StatusOK)
rw.WriteHeader(500) rw.WriteHeader(http.StatusInternalServerError)
fields := decodeHeader(strBuf) fields := decodeHeader(strBuf)
Expect(fields).To(HaveLen(1)) Expect(fields).To(HaveLen(1))
Expect(fields).To(HaveKeyWithValue(":status", []string{"200"})) Expect(fields).To(HaveKeyWithValue(":status", []string{"200"}))

4
http3/server.go
View file

@ -617,9 +617,9 @@ func (s *Server) handleRequest(conn quic.Connection, str quic.Stream, decoder *q
} }
if panicked { if panicked {
r.WriteHeader(500) r.WriteHeader(http.StatusInternalServerError)
} else { } else {
r.WriteHeader(200) r.WriteHeader(http.StatusOK)
} }
// If the EOF was read by the handler, CancelRead() is a no-op. // If the EOF was read by the handler, CancelRead() is a no-op.
str.CancelRead(quic.StreamErrorCode(errorNoError)) str.CancelRead(quic.StreamErrorCode(errorNoError))