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

Move, not copy, Logger and Handler functors (#1576)

Browse Source 
* Explicitly #include <utility> for use of std::move

* Move not copy Logger arg from Client to ClientImpl

* Move not copy, set_error_handler Handler to lambda

* Remove null statement in non-empty if/else block

I guess it was a relic from a time before the other statement was added.

---------

Co-authored-by: Daniel Boles <daniel.boles@voltalis.com>
This commit is contained in:
db-src 2023-06-02 07:40:00 +01:00 committed by GitHub
parent 27c0e1186c
commit 698a1e51ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
httplib.h
View File

@ -223,6 +223,7 @@ using socket_t = int;
#include <string> #include <string>
#include <sys/stat.h> #include <sys/stat.h>
#include <thread> #include <thread>
#include <utility>
#ifdef CPPHTTPLIB_OPENSSL_SUPPORT #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
#ifdef _WIN32 #ifdef _WIN32
@ -5242,7 +5243,7 @@ inline Server &Server::set_error_handler(HandlerWithResponse handler) {
} }
inline Server &Server::set_error_handler(Handler handler) { inline Server &Server::set_error_handler(Handler handler) {
error_handler_ = [handler](const Request &req, Response &res) { error_handler_ = [handler = std::move(handler)](const Request &req, Response &res) {
handler(req, res); handler(req, res);
return HandlerResponse::Handled; return HandlerResponse::Handled;
}; };
@ -5272,7 +5273,6 @@ inline Server &Server::set_logger(Logger logger) {
inline Server & inline Server &
Server::set_expect_100_continue_handler(Expect100ContinueHandler handler) { Server::set_expect_100_continue_handler(Expect100ContinueHandler handler) {
expect_100_continue_handler_ = std::move(handler); expect_100_continue_handler_ = std::move(handler);
return *this; return *this;
} }
@ -6801,7 +6801,6 @@ inline std::unique_ptr<Response> ClientImpl::send_with_content_provider(
req.set_header("Transfer-Encoding", "chunked"); req.set_header("Transfer-Encoding", "chunked");
} else { } else {
req.body.assign(body, content_length); req.body.assign(body, content_length);
;
} }
} }
@ -8750,7 +8749,9 @@ inline void Client::enable_server_certificate_verification(bool enabled) {
} }
#endif #endif
inline void Client::set_logger(Logger logger) { cli_->set_logger(logger); } inline void Client::set_logger(Logger logger) {
cli_->set_logger(std::move(logger));
}
#ifdef CPPHTTPLIB_OPENSSL_SUPPORT #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
inline void Client::set_ca_cert_path(const std::string &ca_cert_file_path, inline void Client::set_ca_cert_path(const std::string &ca_cert_file_path,