Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions httplib.h
Original file line number Diff line number Diff line change
Expand Up @@ -4105,16 +4105,21 @@ inline bool Client::write_request(Stream &strm, const Request &req,
if (req.content_provider) {
size_t offset = 0;
size_t end_offset = req.content_length;
ssize_t written_length = 0;

DataSink data_sink;
data_sink.write = [&](const char *d, size_t l) {
auto written_length = strm.write(d, l);
written_length = strm.write(d, l);
offset += static_cast<size_t>(written_length);
};
data_sink.is_writable = [&](void) { return strm.is_writable(); };
data_sink.is_writable = [&](void) {
return strm.is_writable() && written_length >= 0;
};
data_sink.done = [&](void) { written_length = -1; };

while (offset < end_offset) {
req.content_provider(offset, end_offset - offset, data_sink);
if (written_length < 0) { return false; }
}
}
} else {
Expand All @@ -4139,16 +4144,19 @@ inline std::shared_ptr<Response> Client::send_with_content_provider(
if (compress_) {
if (content_provider) {
size_t offset = 0;
ssize_t written_length = 0;

DataSink data_sink;
data_sink.write = [&](const char *data, size_t data_len) {
req.body.append(data, data_len);
offset += data_len;
};
data_sink.is_writable = [&](void) { return true; };
data_sink.done = [&](void) { written_length = -1; };

while (offset < content_length) {
content_provider(offset, content_length - offset, data_sink);
if (written_length < 0) { return nullptr; }
}
} else {
req.body = body;
Expand Down
11 changes: 11 additions & 0 deletions test/test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1928,6 +1928,17 @@ TEST_F(ServerTest, PutWithContentProvider) {
EXPECT_EQ("PUT", res->body);
}

TEST_F(ServerTest, PostWithContentProviderAbort) {
auto res = cli_.Post(
"/post", 42,
[](size_t /*offset*/, size_t /*length*/, httplib::DataSink &sink) {
sink.done();
},
"text/plain");

ASSERT_TRUE(res == nullptr);
}

#ifdef CPPHTTPLIB_ZLIB_SUPPORT
TEST_F(ServerTest, PutWithContentProviderWithGzip) {
cli_.set_compress(true);
Expand Down