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

fix socket option setting for windows (#1154)

Browse Source 
* fix socket option setting for windows

* misc

Co-authored-by: zhangsen <zhangsen@cyberkl.com>
This commit is contained in:
c00c 2021-12-31 23:07:59 +08:00 committed by GitHub
parent 17abe221c0
commit f817032513
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
httplib.h
View File

@ -2687,16 +2687,27 @@ inline socket_t create_client_socket(
set_nonblocking(sock2, false); set_nonblocking(sock2, false);
{ {
timeval tv; #ifdef _WIN32
tv.tv_sec = static_cast<long>(read_timeout_sec); uint32_t timeout = static_cast<uint32_t>(read_timeout_sec * 1000 + read_timeout_usec / 1000);
tv.tv_usec = static_cast<decltype(tv.tv_usec)>(read_timeout_usec); setsockopt(sock2, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, sizeof(timeout));
setsockopt(sock2, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof(tv)); #else
timeval tv;
tv.tv_sec = static_cast<long>(read_timeout_sec);
tv.tv_usec = static_cast<decltype(tv.tv_usec)>(read_timeout_usec);
setsockopt(sock2, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof(tv));
#endif
} }
{ {
timeval tv;
tv.tv_sec = static_cast<long>(write_timeout_sec); #ifdef _WIN32
tv.tv_usec = static_cast<decltype(tv.tv_usec)>(write_timeout_usec); uint32_t timeout = static_cast<uint32_t>(write_timeout_sec * 1000 + write_timeout_usec / 1000);
setsockopt(sock2, SOL_SOCKET, SO_SNDTIMEO, (char *)&tv, sizeof(tv)); setsockopt(sock2, SOL_SOCKET, SO_SNDTIMEO, (char *)&timeout, sizeof(timeout));
#else
timeval tv;
tv.tv_sec = static_cast<long>(read_timeout_sec);
tv.tv_usec = static_cast<decltype(tv.tv_usec)>(read_timeout_usec);
setsockopt(sock2, SOL_SOCKET, SO_SNDTIMEO, (char *)&tv, sizeof(tv));
#endif
} }
error = Error::Success; error = Error::Success;
@ -5243,18 +5254,29 @@ inline bool Server::listen_internal() {
break; break;
} }
{ {
timeval tv; #ifdef _WIN32
tv.tv_sec = static_cast<long>(read_timeout_sec_); uint32_t timeout = static_cast<uint32_t>(read_timeout_sec_ * 1000 + read_timeout_usec_ / 1000);
tv.tv_usec = static_cast<decltype(tv.tv_usec)>(read_timeout_usec_); setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, sizeof(timeout));
setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof(tv)); #else
} timeval tv;
{ tv.tv_sec = static_cast<long>(read_timeout_sec_);
timeval tv; tv.tv_usec = static_cast<decltype(tv.tv_usec)>(read_timeout_usec_);
tv.tv_sec = static_cast<long>(write_timeout_sec_); setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof(tv));
tv.tv_usec = static_cast<decltype(tv.tv_usec)>(write_timeout_usec_); #endif
setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (char *)&tv, sizeof(tv)); }
} {
#ifdef _WIN32
uint32_t timeout = static_cast<uint32_t>(write_timeout_sec_ * 1000 + write_timeout_usec_ / 1000);
setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (char *)&timeout, sizeof(timeout));
#else
timeval tv;
tv.tv_sec = static_cast<long>(read_timeout_sec_);
tv.tv_usec = static_cast<decltype(tv.tv_usec)>(read_timeout_usec_);
setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (char *)&tv, sizeof(tv));
#endif
}
#if __cplusplus > 201703L #if __cplusplus > 201703L
task_queue->enqueue([=, this]() { process_and_close_socket(sock); }); task_queue->enqueue([=, this]() { process_and_close_socket(sock); });