mirrors/cpp-httplib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-httplib.git synced 2025-05-10 09:43:51 +00:00
Code Issues Projects Releases Wiki Activity

Change sink.write() to return boolean

Browse Source
This commit is contained in:
yhirose 2021-04-19 17:21:17 -04:00 committed by yhirose
parent 21c529229c
commit 73e0729f63
2 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
httplib.h
View File

@ -308,7 +308,7 @@ public:
DataSink(DataSink &&) = delete; DataSink(DataSink &&) = delete;
DataSink &operator=(DataSink &&) = delete; DataSink &operator=(DataSink &&) = delete;
std::function<void(const char *data, size_t data_len)> write; std::function<bool(const char *data, size_t data_len)> write;
std::function<void()> done; std::function<void()> done;
std::function<bool()> is_writable; std::function<bool()> is_writable;
std::ostream os; std::ostream os;
@ -2261,8 +2261,7 @@ inline socket_t create_client_socket(
{ {
timeval tv; timeval tv;
tv.tv_sec = static_cast<long>(write_timeout_sec); tv.tv_sec = static_cast<long>(write_timeout_sec);
tv.tv_usec = tv.tv_usec = static_cast<decltype(tv.tv_usec)>(write_timeout_usec);
static_cast<decltype(tv.tv_usec)>(write_timeout_usec);
setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (char *)&tv, sizeof(tv)); setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (char *)&tv, sizeof(tv));
} }
@ -3022,7 +3021,7 @@ inline bool write_content(Stream &strm, const ContentProvider &content_provider,
auto ok = true; auto ok = true;
DataSink data_sink; DataSink data_sink;
data_sink.write = [&](const char *d, size_t l) { data_sink.write = [&](const char *d, size_t l) -> bool {
if (ok) { if (ok) {
if (write_data(strm, d, l)) { if (write_data(strm, d, l)) {
offset += l; offset += l;
@ -3030,6 +3029,7 @@ inline bool write_content(Stream &strm, const ContentProvider &content_provider,
ok = false; ok = false;
} }
} }
return ok;
}; };
data_sink.is_writable = [&](void) { return ok && strm.is_writable(); }; data_sink.is_writable = [&](void) { return ok && strm.is_writable(); };
@ -3068,11 +3068,12 @@ write_content_without_length(Stream &strm,
auto ok = true; auto ok = true;
DataSink data_sink; DataSink data_sink;
data_sink.write = [&](const char *d, size_t l) { data_sink.write = [&](const char *d, size_t l) -> bool {
if (ok) { if (ok) {
offset += l; offset += l;
if (!write_data(strm, d, l)) { ok = false; } if (!write_data(strm, d, l)) { ok = false; }
} }
return ok;
}; };
data_sink.done = [&](void) { data_available = false; }; data_sink.done = [&](void) { data_available = false; };
@ -3095,30 +3096,30 @@ write_content_chunked(Stream &strm, const ContentProvider &content_provider,
auto ok = true; auto ok = true;
DataSink data_sink; DataSink data_sink;
data_sink.write = [&](const char *d, size_t l) { data_sink.write = [&](const char *d, size_t l) -> bool {
if (!ok) { return; } if (ok) {
data_available = l > 0;
offset += l;
data_available = l > 0; std::string payload;
offset += l; if (compressor.compress(d, l, false,
[&](const char *data, size_t data_len) {
std::string payload; payload.append(data, data_len);
if (!compressor.compress(d, l, false, return true;
[&](const char *data, size_t data_len) { })) {
payload.append(data, data_len); if (!payload.empty()) {
return true; // Emit chunked response header and footer for each chunk
})) { auto chunk =
ok = false; from_i_to_hex(payload.size()) + "\r\n" + payload + "\r\n";
return; if (!write_data(strm, chunk.data(), chunk.size())) {
} ok = false;
}
if (!payload.empty()) { }
// Emit chunked response header and footer for each chunk } else {
auto chunk = from_i_to_hex(payload.size()) + "\r\n" + payload + "\r\n";
if (!write_data(strm, chunk.data(), chunk.size())) {
ok = false; ok = false;
return;
} }
} }
return ok;
}; };
data_sink.done = [&](void) { data_sink.done = [&](void) {
@ -5747,7 +5748,7 @@ inline std::unique_ptr<Response> ClientImpl::send_with_content_provider(
size_t offset = 0; size_t offset = 0;
DataSink data_sink; DataSink data_sink;
data_sink.write = [&](const char *data, size_t data_len) { data_sink.write = [&](const char *data, size_t data_len) -> bool {
if (ok) { if (ok) {
auto last = offset + data_len == content_length; auto last = offset + data_len == content_length;
@ -5763,6 +5764,7 @@ inline std::unique_ptr<Response> ClientImpl::send_with_content_provider(
ok = false; ok = false;
} }
} }
return ok;
}; };
data_sink.is_writable = [&](void) { return ok && true; }; data_sink.is_writable = [&](void) { return ok && true; };

9
test/test.cc
View File

@ -1366,7 +1366,8 @@ protected:
const auto &d = *data; const auto &d = *data;
auto out_len = auto out_len =
std::min(static_cast<size_t>(length), DATA_CHUNK_SIZE); std::min(static_cast<size_t>(length), DATA_CHUNK_SIZE);
sink.write(&d[static_cast<size_t>(offset)], out_len); auto ret = sink.write(&d[static_cast<size_t>(offset)], out_len);
EXPECT_TRUE(ret);
return true; return true;
}, },
[data] { delete data; }); [data] { delete data; });
@ -2521,7 +2522,8 @@ TEST_F(ServerTest, SlowPost) {
auto res = cli_.Post( auto res = cli_.Post(
"/slowpost", 64 * 1024 * 1024, "/slowpost", 64 * 1024 * 1024,
[&](size_t /*offset*/, size_t /*length*/, DataSink &sink) { [&](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
sink.write(buffer, sizeof(buffer)); auto ret = sink.write(buffer, sizeof(buffer));
EXPECT_TRUE(ret);
return true; return true;
}, },
"text/plain"); "text/plain");
@ -3349,7 +3351,8 @@ TEST(ServerStopTest, StopServerWithChunkedTransmission) {
DataSink &sink) { DataSink &sink) {
char buffer[27]; char buffer[27];
auto size = static_cast<size_t>(sprintf(buffer, "data:%ld\n\n", offset)); auto size = static_cast<size_t>(sprintf(buffer, "data:%ld\n\n", offset));
sink.write(buffer, size); auto ret = sink.write(buffer, size);
EXPECT_TRUE(ret);
std::this_thread::sleep_for(std::chrono::seconds(1)); std::this_thread::sleep_for(std::chrono::seconds(1));
return true; return true;
}); });