From edb9194fc3c834af3ff79c159b2e9213f876c0f8 Mon Sep 17 00:00:00 2001 From: Jose Date: Fri, 10 Jun 2016 18:27:28 +0200 Subject: Fixes to support kFreeBSD --- cpp/src/IceSSL/OpenSSLEngine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cpp/src/IceSSL') diff --git a/cpp/src/IceSSL/OpenSSLEngine.cpp b/cpp/src/IceSSL/OpenSSLEngine.cpp index 76c83464b54..d664fc48cd5 100644 --- a/cpp/src/IceSSL/OpenSSLEngine.cpp +++ b/cpp/src/IceSSL/OpenSSLEngine.cpp @@ -102,7 +102,7 @@ IceSSL_opensslThreadIdCallback() // On some platforms, pthread_t is a pointer to a per-thread structure. // return reinterpret_cast(pthread_self()); -# elif (defined(__linux) || defined(__sun) || defined(__hpux)) || defined(_AIX) +# elif defined(__linux) || defined(__sun) || defined(__hpux) || defined(_AIX) || defined(__GLIBC__) // // On Linux, Solaris, HP-UX and AIX, pthread_t is an integer. // -- cgit v1.2.3 From a45bda2ca2fd314ac74caa410aef505c975daa09 Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 14 Jun 2016 17:29:45 +0200 Subject: Fixed ICE-7134 - PHP Ice/proxy test fails on Ubuntu 16.04 --- cpp/src/IceSSL/OpenSSLEngine.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'cpp/src/IceSSL') diff --git a/cpp/src/IceSSL/OpenSSLEngine.cpp b/cpp/src/IceSSL/OpenSSLEngine.cpp index d664fc48cd5..029cf825ffd 100644 --- a/cpp/src/IceSSL/OpenSSLEngine.cpp +++ b/cpp/src/IceSSL/OpenSSLEngine.cpp @@ -55,6 +55,9 @@ public: ~Init() { + CRYPTO_set_locking_callback(0); + CRYPTO_set_id_callback(0); + delete staticMutex; staticMutex = 0; -- cgit v1.2.3