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

Simplify SSL shutdown (#2059)

Browse Source
This commit is contained in:
Florian Albrechtskirchinger 2025-02-16 23:38:41 +01:00 committed by GitHub
parent 735e5930eb
commit 32bf5c9c09
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
httplib.h
View File

@ -9062,18 +9062,13 @@ inline void ssl_delete(std::mutex &ctx_mutex, SSL *ssl, socket_t sock,
// Note that it is not always possible to avoid SIGPIPE, this is merely a // Note that it is not always possible to avoid SIGPIPE, this is merely a
// best-efforts. // best-efforts.
if (shutdown_gracefully) { if (shutdown_gracefully) {
#ifdef _WIN32
(void)(sock); (void)(sock);
// SSL_shutdown() returns 0 on first call (indicating close_notify alert
// sent) and 1 on subsequent call (indicating close_notify alert received)
if (SSL_shutdown(ssl) == 0) {
// Expected to return 1, but even if it doesn't, we free ssl
SSL_shutdown(ssl); SSL_shutdown(ssl);
#else
detail::set_socket_opt_time(sock, SOL_SOCKET, SO_RCVTIMEO, 1, 0);
auto ret = SSL_shutdown(ssl);
while (ret == 0) {
std::this_thread::sleep_for(std::chrono::milliseconds{100});
ret = SSL_shutdown(ssl);
} }
#endif
} }
std::lock_guard<std::mutex> guard(ctx_mutex); std::lock_guard<std::mutex> guard(ctx_mutex);