Repository navigation
Conversation
hijackLocked marks the connection hijacked and clears its deadlines before the Peek that collects the background read's byte into the bufio.Reader. If that Peek fails, Hijack returns an error and no connection, but the connection stays marked hijacked: conn.serve then returns without closing it, its ConnState hook never sees StateHijacked or StateClosed, and the net.Conn is only released when the garbage collector finalizes its descriptor. Mark the connection hijacked, and hand over its deadlines and writer, only once the byte has been collected, so that a failed hijack leaves the connection with the server as if Hijack had not been called, and the server closes it as usual. The Peek cannot fail with the readers the server sets up today, so this fixes the error path rather than a case anyone has hit. Fixes golang#82385
Contributor
|
This PR (HEAD: 5118df8) has been imported to Gerrit for code review. Please visit Gerrit at https://go-review.googlesource.com/c/go/+/851108. Important tips:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
hijackLocked marks the connection hijacked and clears its deadlines
before the Peek that collects the background read's byte into the
bufio.Reader. If that Peek fails, Hijack returns an error and no
connection, but the connection stays marked hijacked: conn.serve then
returns without closing it, its ConnState hook never sees
StateHijacked or StateClosed, and the net.Conn is only released when
the garbage collector finalizes its descriptor.
Mark the connection hijacked, and hand over its deadlines and
writer, only once the byte has been collected, so that a failed
hijack leaves the connection with the server as if Hijack had not
been called, and the server closes it as usual. The Peek cannot fail
with the readers the server sets up today, so this fixes the error
path rather than a case anyone has hit.
Fixes #82385