diff options
| author | Jacob Champion <jchampion@apache.org> | 2017-05-22 16:40:54 +0000 |
|---|---|---|
| committer | Jacob Champion <jchampion@apache.org> | 2017-05-22 16:40:54 +0000 |
| commit | 4b2a7701b1e94b0fbcd09c794941081ec59ce1e5 (patch) | |
| tree | b7607c2634a7207ba3db4df538f9a8df08e25abc | |
| parent | be128ce47d82b9154bf606a4220c3a61a60fbe1f (diff) | |
| download | httpd-4b2a7701b1e94b0fbcd09c794941081ec59ce1e5.tar.gz | |
ab: don't call malloc_init for OpenSSL 1.1.0
Patch by rjung.
The 1.1.0 compatibility macro for OpenSSL_malloc_init() causes problems
when mixed with procedure linkage stubs with some toolchains (e.g. GCC).
OpenSSL's malloc implementation doesn't recognize that the PLT stub
points back to it, which leads to infinite recursion.
Since the 1.1.0 documentation states that calling this function
explicitly is no longer necessary except "in certain shared-library
situations"(?), get rid of it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1795830 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | support/ab.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/support/ab.c b/support/ab.c index 5fcc1da333..09df8656d8 100644 --- a/support/ab.c +++ b/support/ab.c @@ -2576,8 +2576,6 @@ int main(int argc, const char * const argv[]) #else #if OPENSSL_VERSION_NUMBER < 0x10100000L CRYPTO_malloc_init(); -#else - OPENSSL_malloc_init(); #endif #endif SSL_load_error_strings(); |