Special-case EmptyBody in request encoder
#6752
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
hamnis
reviewed
Oct 17, 2022
| @@ -139,7 +139,12 @@ private[ember] object Encoder { | |||
| } | |||
| } | |||
|
|
|||
| if (!chunked && !appliedContentLength && !NoPayloadMethods.contains(req.method)) { | |||
| if ( | |||
| !appliedContentLength && req.body == EmptyBody && !NoPayloadMethods.contains(req.method) | |||
There was a problem hiding this comment.
should one maybe use reference equality eq directly instead of equals(==) ?
There was a problem hiding this comment.
Good point, I'll make this change in #6753. We need to fix it in at least one other place.
danicheg
approved these changes
Oct 22, 2022
| @@ -139,7 +139,12 @@ private[ember] object Encoder { | |||
| } | |||
| } | |||
|
|
|||
| if (!chunked && !appliedContentLength && !NoPayloadMethods.contains(req.method)) { | |||
| if ( | |||
| !appliedContentLength && req.body == EmptyBody && !NoPayloadMethods.contains(req.method) | |||
There was a problem hiding this comment.
It'd be good to define defs for those boolean expressions for better readability.
There was a problem hiding this comment.
I agree about readability but I feel superstitious about performance. Probably it will be inlined by JIT 🤔
There was a problem hiding this comment.
It will be nice when in scala 3 we write inline and sleep easy.
I don't think blaze has this problem, based on the experiments in #4935. |
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.
This PR replays #6444 for the ember request encoder. Specifically, when the body is known (by reference equality) to be the
EmptyBodyi.e. an emptyStream, then aContent-Length: 0header is added and chunked transfer encoding is disabled. This relates to #4935, and possibly even fixes it.