iostream/http: Fix output_stream::write(temporary_buffer) overload #2436
+56
−2
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
avikivity
reviewed
Sep 15, 2024
xemul
reviewed
Sep 16, 2024
niekbouman
force-pushed
the
niek-fix-sink
branch
from
096f627 to
46fe86f
Compare
Previously, calling the 'write(temporary_buffer<char>)' overload on an output_stream<char> obtained from http::reply::write_body would cause an abort. This commit fixes this by providing a helper function (in the data_sink_impl base class) named 'fallback_put', which classes that inherit from this base class can use to implement the 'put(net::packet)' overload. Also, this commit lets http_chunked_data_sink_impl and http_content_length_data_sink_impl make use of this helper. fallback_put(net::packet) works simply by extracting the temporary_buffers contained in the packet, and calling the 'put(temporary_buffer<char>)' overload for each temporary_buffer. Note that we create this 'fallback_put' function instead of defining the virtual member 'put(net::packet)' function in the data_sink_impl class, to avoid 'put(net::packet)' and 'put(temporary_buffer<char>)' calling each other leading to infinite recursion. This commit also adds a unit test to tests/unit/httpd_test.cc Thanks to Pavel (xemul) for his help. Fixes scylladb#1701
niekbouman
force-pushed
the
niek-fix-sink
branch
from
46fe86f to
52eb058
Compare
niekbouman
force-pushed
the
niek-fix-sink
branch
from
ec284f9 to
ad608e2
Compare
|
@xemul could you please 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.
Previously, calling the
write(temporary_buffer<char>)overload on anoutput_stream<char>obtained fromhttp::reply::write_bodywould cause an abort.This commit fixes this by providing a helper function (in the
data_sink_implbase class) namedfallback_put, which classes that inherit from this base class can use to implement theput(net::packet)overload. Also, this commit letshttp_chunked_data_sink_implandhttp_content_length_data_sink_implmake use of this helper.fallback_put(net::packet)works simply by extracting the temporary_buffers contained in the packet, and calling theput(temporary_buffer<char>)overload for eachtemporary_buffer.Note that we create this
fallback_putfunction instead of defining the virtual memberput(net::packet)function in thedata_sink_implclass, to avoidput(net::packet)andput(temporary_buffer<char>)calling each other leading to infinite recursion.This commit also adds unit tests to
tests/unit/httpd_test.ccfor testing thewriteoverload withhttp_chunked_data_sink_implandhttp_content_length_data_sink_impl.Thanks to Pavel (xemul) for his help.
Fixes #1701