yuzu/cpp-httplib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-httplib synced 2024-11-21 14:29:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #1878 (#1893)
Some checks failed
test / ubuntu (push) Has been cancelled
Details
test / macos (push) Has been cancelled
Details
test / windows (push) Has been cancelled
Details

Browse source 
* Fix #1878
This commit is contained in:
yhirose 2024-08-08 22:07:46 -04:00 committed by GitHub
parent aa04feebb4
commit 390f2c41f6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
httplib.h
View file

@ -3278,7 +3278,8 @@ socket_t create_socket(const std::string &host, const std::string &ip, int port,
if (socket_options) { socket_options(sock); } if (socket_options) { socket_options(sock); }
if (!bind_or_connect(sock, hints)) { bool dummy;
if (!bind_or_connect(sock, hints, dummy)) {
close_socket(sock); close_socket(sock);
sock = INVALID_SOCKET; sock = INVALID_SOCKET;
} }
@ -3363,12 +3364,15 @@ socket_t create_socket(const std::string &host, const std::string &ip, int port,
} }
// bind or connect // bind or connect
if (bind_or_connect(sock, *rp)) { auto quit = false;
if (bind_or_connect(sock, *rp, quit)) {
freeaddrinfo(result); freeaddrinfo(result);
return sock; return sock;
} }
close_socket(sock); close_socket(sock);
if (quit) { break; }
} }
freeaddrinfo(result); freeaddrinfo(result);
@ -3469,7 +3473,7 @@ inline socket_t create_client_socket(
time_t write_timeout_usec, const std::string &intf, Error &error) { time_t write_timeout_usec, const std::string &intf, Error &error) {
auto sock = create_socket( auto sock = create_socket(
host, ip, port, address_family, 0, tcp_nodelay, std::move(socket_options), host, ip, port, address_family, 0, tcp_nodelay, std::move(socket_options),
[&](socket_t sock2, struct addrinfo &ai) -> bool { [&](socket_t sock2, struct addrinfo &ai, bool &quit) -> bool {
if (!intf.empty()) { if (!intf.empty()) {
#ifdef USE_IF2IP #ifdef USE_IF2IP
auto ip_from_if = if2ip(address_family, intf); auto ip_from_if = if2ip(address_family, intf);
@ -3493,7 +3497,10 @@ inline socket_t create_client_socket(
} }
error = wait_until_socket_is_ready(sock2, connection_timeout_sec, error = wait_until_socket_is_ready(sock2, connection_timeout_sec,
connection_timeout_usec); connection_timeout_usec);
if (error != Error::Success) { return false; } if (error != Error::Success) {
if (error == Error::ConnectionTimeout) { quit = true; }
return false;
}
} }
set_nonblocking(sock2, false); set_nonblocking(sock2, false);
@ -6470,7 +6477,7 @@ Server::create_server_socket(const std::string &host, int port,
return detail::create_socket( return detail::create_socket(
host, std::string(), port, address_family_, socket_flags, tcp_nodelay_, host, std::string(), port, address_family_, socket_flags, tcp_nodelay_,
std::move(socket_options), std::move(socket_options),
[](socket_t sock, struct addrinfo &ai) -> bool { [](socket_t sock, struct addrinfo &ai, bool & /*quit*/) -> bool {
if (::bind(sock, ai.ai_addr, static_cast<socklen_t>(ai.ai_addrlen))) { if (::bind(sock, ai.ai_addr, static_cast<socklen_t>(ai.ai_addrlen))) {
return false; return false;
} }