eden-emu/cpp-httplib
14
0
Fork 0
mirror of https://github.com/yhirose/cpp-httplib.git synced 2025-05-15 01:08:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made a temporary fix for OpenSSL thread problem

Browse source
This commit is contained in:
yhirose 2018-04-20 00:17:51 -04:00
parent 4320d7ba3e
commit 5574d82eb3
2 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
httplib.h
View file

@ -2029,15 +2029,23 @@ inline std::shared_ptr<Response> Client::post(const char* path, const Headers& h
#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
namespace detail {
// TODO: OpenSSL 1.0.2 occasionally crashes... The upcoming 1.1.0 is going to be thread safe.
static std::mutex ssl_ctx_mutex_;
template <typename U, typename V, typename T>
inline bool read_and_close_socket_ssl(
socket_t sock, bool keep_alive,
SSL_CTX* ctx, U SSL_connect_or_accept, V setup,
T callback)
{
auto ssl = SSL_new(ctx);
if (!ssl) {
return false;
SSL* ssl = nullptr;
{
std::lock_guard<std::mutex> guard(ssl_ctx_mutex_);
ssl = SSL_new(ctx);
if (!ssl) {
return false;
}
}
auto bio = BIO_new_socket(sock, BIO_NOCLOSE);
@ -2069,8 +2077,14 @@ inline bool read_and_close_socket_ssl(
}
SSL_shutdown(ssl);
SSL_free(ssl);
{
std::lock_guard<std::mutex> guard(ssl_ctx_mutex_);
SSL_free(ssl);
}
close_socket(sock);
return ret;
}