Skip to content

hotfix: close received after close #487

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

Closed
wants to merge 1 commit into from
+8 −4
Closed

hotfix: close received after close #487

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 close.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ func (c *Conn) waitCloseHandshake() error {
}

for {
h, err := c.readLoop(ctx)
h, err := c.readLoop(ctx, true)
if err != nil {
return err
}
Expand Down
10 changes: 7 additions & 3 deletions read.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,8 @@ func (c *Conn) readRSV1Illegal(h header) bool {
return false
}

func (c *Conn) readLoop(ctx context.Context) (header, error) {
func (c *Conn) readLoop(ctx context.Context, ignoreControl bool) (header, error) {

for {
h, err := c.readFrameHeader(ctx)
if err != nil {
Expand All @@ -199,6 +200,9 @@ func (c *Conn) readLoop(ctx context.Context) (header, error) {

switch h.opcode {
case opClose, opPing, opPong:
if ignoreControl {
return h, nil
}
err = c.handleControl(ctx, h)
if err != nil {
// Pass through CloseErrors when receiving a close frame.
Expand Down Expand Up @@ -344,7 +348,7 @@ func (c *Conn) reader(ctx context.Context) (_ MessageType, _ io.Reader, err erro
return 0, nil, errors.New("previous message not read to completion")
}

h, err := c.readLoop(ctx)
h, err := c.readLoop(ctx, false)
if err != nil {
return 0, nil, err
}
Expand Down Expand Up @@ -429,7 +433,7 @@ func (mr *msgReader) read(p []byte) (int, error) {
return 0, io.EOF
}

h, err := mr.c.readLoop(mr.ctx)
h, err := mr.c.readLoop(mr.ctx, false)
if err != nil {
return 0, err
}
Expand Down
Loading