Fix Connection persistence according to RFC 9112 #917
Merged
Conversation
This file contains 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
mergify
bot
added
series/0.23
rossabaker
force-pushed
the
connection-closing-0.23
branch
from
db511f5
to
a6581f3
Compare
rossabaker
commented
Nov 2, 2024
| case None => getHttpMinor(req) == 0 | ||
| } | ||
| val mustClose: Boolean = | ||
| checkRequestCloseConnection(req.headers.get[HConnection], getHttpMinor(req), NullWriter) |
There was a problem hiding this comment.
I had a hard time teasing apart the side effect of writing the Connection: close header, but we don't even want the side effect on the client side.
Alternatives would be to:
- duplicate the connection persistence logic
- put a protected method in
Http1Stageto represent the side effect, or lack thereof - wrap this writer in an Option
- question all our lives' choices
Comment on lines
+99
to
+101
| if (minorVersion >= 1) { | ||
| rr << "Connection: close\r\n" | ||
| } |
There was a problem hiding this comment.
I tried to replace the Boolean with a sum type to include whether the close is implicit or explicit. But the result threads through fairly deeply as a Boolean.
| @@ -57,13 +57,19 @@ object ServerTestRoutes extends Http4sDsl[IO] { | |||
| // /////////////////////////////// | |||
| ( | |||
| "GET /get HTTP/1.0\r\nConnection:close\r\n\r\n", | |||
| (Status.Ok, Set(length(3), textPlain, connClose), "get"), | |||
| (Status.Ok, Set(length(3), textPlain), "get"), | |||
There was a problem hiding this comment.
All removals of connClose from this test are because it's the default in HTTP/1.0. There's no need for us to reiterate that.
| ( | ||
| "GET /get HTTP/1.1\r\nConnection: fiddle-faddle\r\n\r\n", | ||
| (Status.Ok, Set(length(3), textPlain), "get"), | ||
| ), |
There was a problem hiding this comment.
This test exposes the behavior change that motivated this PR.
|
Merging on Miles' review. |
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.
We are aggressively closing connections in the presence of
Connectionheaders composed exclusively of options other thankeep-aliveorclose. This is contrary to the RFCConnectiontokens other thancloseandkeep-aliveare no longer considered in persistence logic.Connection: closeheader to the response unless required by RFC 9112.Connection: closeheader when the request already has one.Replaces #913, which targeted the incorrect branch.