KTOR-7683 Fix for empty response with respondSource #4494
+58
−16
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
bjhham
force-pushed
the
bjhham/respond-source-empty-fix
branch
from
44a7e14
to
ac54ab9
Compare
marychatte
reviewed
Nov 20, 2024
| ) { | ||
| respond(ChannelWriterContent({ writeBuffer(source) }, contentType, status, source.remaining)) | ||
| respond(ChannelWriterContent({ writeBuffer(source) }, contentType, status, contentLength)) |
There was a problem hiding this comment.
Can it break something that we pass contentLength instead source.remaining now, when contentLength is null?
There was a problem hiding this comment.
It'll just omit the Content-Length header when it's not specified, which could make some clients angry, but it's still a valid response.
bjhham
force-pushed
the
bjhham/respond-source-empty-fix
branch
3 times, most recently
from
0c59f48
to
af37898
Compare
bjhham
force-pushed
the
bjhham/respond-source-empty-fix
branch
from
af37898
to
a92e5ac
Compare
bjhham
force-pushed
the
bjhham/respond-source-empty-fix
branch
from
b492e95
to
7f5c8e3
Compare
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.
Subsystem
Server, I/O
Motivation
KTOR-7683 call.respondSource returns empty response but passes in tests
Solution
Turns out, the problem was using the
Source.remainingextension value as the content length, which only checks the size of the buffer, which starts as 0 when wrapping anInputStreamwith theasSource()extension.The fix here is adding an optional
contentLengthparameter onrespondSource, so the responsibility is delegated to the user. I also generalized these functions to useRawSourceto reflect thekotlinx-ioAPI, and allow for non-buffered sources.