diff options
| author | Jose <jose@zeroc.com> | 2016-06-14 17:29:45 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-06-14 17:29:45 +0200 |
| commit | a45bda2ca2fd314ac74caa410aef505c975daa09 (patch) | |
| tree | 8d38dee3cfbac294536d16c9b8bdf4de46e2c6fc /cpp | |
| parent | Fixed ICE-7185 - Global destructor segfault in powerpc (diff) | |
| download | ice-a45bda2ca2fd314ac74caa410aef505c975daa09.tar.bz2 ice-a45bda2ca2fd314ac74caa410aef505c975daa09.tar.xz ice-a45bda2ca2fd314ac74caa410aef505c975daa09.zip | |
Fixed ICE-7134 - PHP Ice/proxy test fails on Ubuntu 16.04
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/IceSSL/OpenSSLEngine.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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; |