lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-04-20 11:47:43 +03:00
Code

Format code

Browse Source
This commit is contained in:
yhirose 2019-08-06 18:12:05 +09:00
parent d58deddbcc
commit d7bb402ca7
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
httplib.h
View File

@ -212,16 +212,18 @@ struct Response {
void set_content_provider( void set_content_provider(
uint64_t length, uint64_t length,
std::function<void(uint64_t offset, uint64_t length, Out out)> provider, std::function<void(uint64_t offset, uint64_t length, Out out)> provider,
std::function<void()> resource_releaser = []{}); std::function<void()> resource_releaser = [] {});
void set_chunked_content_provider( void set_chunked_content_provider(
std::function<void(uint64_t offset, Out out, Done done)> provider, std::function<void(uint64_t offset, Out out, Done done)> provider,
std::function<void()> resource_releaser = []{}); std::function<void()> resource_releaser = [] {});
Response() : status(-1), content_provider_resource_length(0) {} Response() : status(-1), content_provider_resource_length(0) {}
~Response() { ~Response() {
if (content_provider_resource_releaser) { content_provider_resource_releaser(); } if (content_provider_resource_releaser) {
content_provider_resource_releaser();
}
} }
uint64_t content_provider_resource_length; uint64_t content_provider_resource_length;
@ -2192,8 +2194,8 @@ inline bool Server::write_response(Stream &strm, bool last_connection,
if (req.ranges.empty()) { if (req.ranges.empty()) {
length = res.content_provider_resource_length; length = res.content_provider_resource_length;
} else if (req.ranges.size() == 1) { } else if (req.ranges.size() == 1) {
auto offsets = auto offsets = detail::get_range_offset_and_length(
detail::get_range_offset_and_length(req, res.content_provider_resource_length, 0); req, res.content_provider_resource_length, 0);
auto offset = offsets.first; auto offset = offsets.first;
length = offsets.second; length = offsets.second;
auto content_range = detail::make_content_range_header_field( auto content_range = detail::make_content_range_header_field(
@ -2274,8 +2276,8 @@ Server::write_content_with_provider(Stream &strm, const Request &req,
return false; return false;
} }
} else if (req.ranges.size() == 1) { } else if (req.ranges.size() == 1) {
auto offsets = auto offsets = detail::get_range_offset_and_length(
detail::get_range_offset_and_length(req, res.content_provider_resource_length, 0); req, res.content_provider_resource_length, 0);
auto offset = offsets.first; auto offset = offsets.first;
auto length = offsets.second; auto length = offsets.second;
if (detail::write_content(strm, res.content_provider, offset, length) < if (detail::write_content(strm, res.content_provider, offset, length) <

3
test/test.cc
View File

@ -511,8 +511,7 @@ protected:
.Get("/streamed", .Get("/streamed",
[&](const Request & /*req*/, Response &res) { [&](const Request & /*req*/, Response &res) {
res.set_content_provider( res.set_content_provider(
6, 6, [](uint64_t offset, uint64_t /*length*/, Out out) {
[](uint64_t offset, uint64_t /*length*/, Out out) {
out(offset < 3 ? "a" : "b", 1); out(offset < 3 ? "a" : "b", 1);
}); });
}) })