lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-04-19 00:24:02 +03:00
Code

Fix #1498 (#1501)

Browse Source 
* Fix #1498

* Fixed build error
This commit is contained in:
yhirose 2023-02-22 13:19:36 -05:00 committed by GitHub
parent ae3a6dd2a9
commit 75053bf855
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
httplib.h
View File

@ -311,6 +311,34 @@ struct ci {
} }
}; };
// This is based on
// "http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4189".
template <typename EF> struct scope_exit {
explicit scope_exit(EF &&f)
: exit_function(std::move(f)), execute_on_destruction{true} {}
scope_exit(scope_exit &&rhs)
: exit_function(std::move(rhs.exit_function)),
execute_on_destruction{rhs.execute_on_destruction} {
rhs.release();
}
~scope_exit() {
if (execute_on_destruction) { this->exit_function(); }
}
void release() { this->execute_on_destruction = false; }
private:
scope_exit(const scope_exit &) = delete;
void operator=(const scope_exit &) = delete;
scope_exit &operator=(scope_exit &&) = delete;
EF exit_function;
bool execute_on_destruction;
};
} // namespace detail } // namespace detail
using Headers = std::multimap<std::string, std::string, detail::ci>; using Headers = std::multimap<std::string, std::string, detail::ci>;
@ -4785,13 +4813,14 @@ inline MultipartFormData Request::get_file_value(const std::string &key) const {
return MultipartFormData(); return MultipartFormData();
} }
inline std::vector<MultipartFormData> Request::get_file_values(const std::string &key) const { inline std::vector<MultipartFormData>
std::vector<MultipartFormData> values; Request::get_file_values(const std::string &key) const {
auto rng = files.equal_range(key); std::vector<MultipartFormData> values;
for (auto it = rng.first; it != rng.second; it++) { auto rng = files.equal_range(key);
values.push_back(it->second); for (auto it = rng.first; it != rng.second; it++) {
} values.push_back(it->second);
return values; }
return values;
} }
// Response implementation // Response implementation
@ -6307,13 +6336,11 @@ inline bool ClientImpl::send(Request &req, Response &res, Error &error) {
} }
} }
auto ret = false;
auto close_connection = !keep_alive_; auto close_connection = !keep_alive_;
auto ret = process_socket(socket_, [&](Stream &strm) {
return handle_request(strm, req, res, close_connection, error);
});
// Briefly lock mutex in order to mark that a request is no longer ongoing auto se = detail::scope_exit<std::function<void (void)>>([&]() {
{ // Briefly lock mutex in order to mark that a request is no longer ongoing
std::lock_guard<std::mutex> guard(socket_mutex_); std::lock_guard<std::mutex> guard(socket_mutex_);
socket_requests_in_flight_ -= 1; socket_requests_in_flight_ -= 1;
if (socket_requests_in_flight_ <= 0) { if (socket_requests_in_flight_ <= 0) {
@ -6327,7 +6354,11 @@ inline bool ClientImpl::send(Request &req, Response &res, Error &error) {
shutdown_socket(socket_); shutdown_socket(socket_);
close_socket(socket_); close_socket(socket_);
} }
} });
ret = process_socket(socket_, [&](Stream &strm) {
return handle_request(strm, req, res, close_connection, error);
});
if (!ret) { if (!ret) {
if (error == Error::Success) { error = Error::Unknown; } if (error == Error::Success) { error = Error::Unknown; }