Skip to content

use TryWriteAll for close session capsules #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marten-seemann wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use TryWriteAll for close session capsules #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.25.0

require (
github.com/dunglas/httpsfv v1.1.0
github.com/quic-go/quic-go v0.61.0
github.com/quic-go/quic-go v0.61.1-0.20260726092802-47961f39aaeb
github.com/stretchr/testify v1.11.1
golang.org/x/sync v0.22.0
)
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ github.com/quic-go/go-ossfuzz-seeds v0.1.0 h1:APacT+iIaNF6fd8AGEiN3bT/Jtkd2jz4v4
github.com/quic-go/go-ossfuzz-seeds v0.1.0/go.mod h1:3IOHRbJIc+L6YKMwfDtJAM9Vj9k0YY4muhuyUYk5tbk=
github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8=
github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII=
github.com/quic-go/quic-go v0.61.0 h1:ui88A53s8MSVYLC56en0KQ17HARk+9986Dn0SBfKNvA=
github.com/quic-go/quic-go v0.61.0/go.mod h1:9So2anK4Tp22URSQq00k+Vo2PNkle96ycDPDHL4s9vs=
github.com/quic-go/quic-go v0.61.1-0.20260726092802-47961f39aaeb h1:oFcGBAOkCZrthOq2QLnC4lW2I1NMcB9ghZANDaIa4vU=
github.com/quic-go/quic-go v0.61.1-0.20260726092802-47961f39aaeb/go.mod h1:9So2anK4Tp22URSQq00k+Vo2PNkle96ycDPDHL4s9vs=
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
Expand Down
7 changes: 2 additions & 5 deletions session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ type http3Stream interface {
CancelRead(quic.StreamErrorCode)
CancelWrite(quic.StreamErrorCode)
SetWriteDeadline(time.Time) error
TryWriteAll([]byte) error
}

var (
Expand Down Expand Up @@ -387,11 +388,7 @@ func (s *Session) CloseWithError(code SessionErrorCode, msg string) error {
}

func closeSessionStream(str http3Stream, closeCapsule closeSessionCapsule) error {
// Optimistically send the WT_CLOSE_SESSION Capsule:
// If we're flow-control limited, we don't want to wait for the receiver to issue new flow control credits.
// There's no idiomatic way to do a non-blocking write in Go, so we set a short deadline.
str.SetWriteDeadline(time.Now().Add(closeSessionTimeout))
if _, err := str.Write(closeCapsule.Append(nil)); err != nil {
if err := str.TryWriteAll(closeCapsule.Append(nil)); err != nil {
str.CancelWrite(WTSessionGoneErrorCode)
}

Expand Down
1 change: 1 addition & 0 deletions session_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ func (s mockHTTP3Stream) SendDatagram([]byte) error { retu
func (s mockHTTP3Stream) CancelRead(quic.StreamErrorCode) {}
func (s mockHTTP3Stream) CancelWrite(quic.StreamErrorCode) {}
func (s mockHTTP3Stream) SetWriteDeadline(time.Time) error { return nil }
func (s mockHTTP3Stream) TryWriteAll([]byte) error { return nil }

type quicHTTP3Stream struct{ *quic.Stream }

Expand Down
Loading