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

http3: don't write response headers if the handler panicked (#3950)

Browse source
This commit is contained in:
WeidiDeng 2023-07-13 00:32:33 +08:00 • committed by GitHub
parent fcf8d4b3ff
commit f97c9bf88c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
http3/server.go
View file

@ -594,7 +594,6 @@ func (s *Server) handleRequest(conn quic.Connection, str quic.Stream, decoder *q
ctx = context.WithValue(ctx, http.LocalAddrContextKey, conn.LocalAddr())
req = req.WithContext(ctx)
r := newResponseWriter(str, conn, s.logger)
defer r.Flush()
handler := s.Handler
if handler == nil {
handler = http.DefaultServeMux
@ -622,10 +621,10 @@ func (s *Server) handleRequest(conn quic.Connection, str quic.Stream, decoder *q
return requestError{err: errHijacked}
}
if panicked {
r.WriteHeader(http.StatusInternalServerError)
} else {
// only write response when there is no panic
if !panicked {
r.WriteHeader(http.StatusOK)
r.Flush()
}
// If the EOF was read by the handler, CancelRead() is a no-op.
str.CancelRead(quic.StreamErrorCode(ErrCodeNoError))

6
http3/server_test.go
View file

@ -193,8 +193,7 @@ var _ = Describe("Server", func() {
serr := s.handleRequest(conn, str, qpackDecoder, nil)
Expect(serr.err).ToNot(HaveOccurred())
hfs := decodeHeader(responseBuf)
Expect(hfs).To(HaveKeyWithValue(":status", []string{"500"}))
Expect(responseBuf.Bytes()).To(HaveLen(0))
})
It("handles a panicking handler", func() {
@ -210,8 +209,7 @@ var _ = Describe("Server", func() {
serr := s.handleRequest(conn, str, qpackDecoder, nil)
Expect(serr.err).ToNot(HaveOccurred())
hfs := decodeHeader(responseBuf)
Expect(hfs).To(HaveKeyWithValue(":status", []string{"500"}))
Expect(responseBuf.Bytes()).To(HaveLen(0))
})
Context("hijacking bidirectional streams", func() {