From: Jacob Champion <jchampion@apache.org>
Date: Mon, 22 May 2017 16:40:54 +0000 (+0000)
Subject: ab: don't call malloc_init for OpenSSL 1.1.0
X-Git-Tag: 2.5.0-alpha~411
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b2a7701b1e94b0fbcd09c794941081ec59ce1e5;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/support/ab.c b/support/ab.c
index 5fcc1da3332..09df8656d8b 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();