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

http3: minor simplification of panic handling logic (#4942)

Browse source
This commit is contained in:
Marten Seemann 2025-01-28 04:27:09 +01:00 • committed by GitHub
parent 8f27760e60
commit 02e276ed70
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
http3/server.go
View file

@ -684,7 +684,7 @@ func (s *Server) handleRequest(conn *connection, str quic.Stream, datagrams *dat
if logger == nil {
logger = slog.Default()
}
logger.Error("http: panic serving", "arg", p, "trace", string(buf))
logger.Error("http3: panic serving", "arg", p, "trace", string(buf))
}
}()
handler.ServeHTTP(r, req)
@ -694,18 +694,6 @@ func (s *Server) handleRequest(conn *connection, str quic.Stream, datagrams *dat
return
}
// only write response when there is no panic
if !panicked {
// response not written to the client yet, set Content-Length
if !r.headerWritten {
if _, haveCL := r.header["Content-Length"]; !haveCL {
r.header.Set("Content-Length", strconv.FormatInt(r.numWritten, 10))
}
}
r.Flush()
r.flushTrailers()
}
// abort the stream when there is a panic
if panicked {
str.CancelRead(quic.StreamErrorCode(ErrCodeInternalError))
@ -713,9 +701,17 @@ func (s *Server) handleRequest(conn *connection, str quic.Stream, datagrams *dat
return
}
// response not written to the client yet, set Content-Length
if !r.headerWritten {
if _, haveCL := r.header["Content-Length"]; !haveCL {
r.header.Set("Content-Length", strconv.FormatInt(r.numWritten, 10))
}
}
r.Flush()
r.flushTrailers()
// If the EOF was read by the handler, CancelRead() is a no-op.
str.CancelRead(quic.StreamErrorCode(ErrCodeNoError))
str.Close()
}

2
http3/server_test.go
View file

@ -314,7 +314,7 @@ var _ = Describe("Server", func() {
s.handleRequest(conn, str, nil, qpackDecoder)
Expect(responseBuf.Bytes()).To(HaveLen(0))
Expect(logBuf.String()).To(ContainSubstring("http: panic serving"))
Expect(logBuf.String()).To(ContainSubstring("http3: panic serving"))
Expect(logBuf.String()).To(ContainSubstring("foobar"))
})