Merge r1795830 from trunk:

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.
Submitted by: jchampion
Reviewed by: jchampion, ylavic, gsmith

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1795907 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 19f15b933c4b7c9fce99d8a93dabcaff90e40274..3e75a415a63499302ab2780b1be869ac3e25afba 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -120,18 +120,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   *) confirm ab + https w/ openssl 1.1.0 on unix is OK.
-      Gregg says it's broken on Windows.
-      Document it somewhere either way.
-      jchampion: hangs on my Ubuntu box too. Looks like a CRYPTO_malloc()
-                 infinite loop during library initialization?
-      jj: Is this *really* a showstopper??
-      covener: I would be OK with a release note / announcement kind of thing
-               instead.
-
-      trunk patch: https://svn.apache.org/r1795830
-      2.4.x patch: trunk works
-      +1: jchampion, ylavic, gsmith
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:

diff --git a/support/ab.c b/support/ab.c
index a2560b3cd9c0f71ea485cdf78123f5a07fc4f960..25926e9ccd860d830a60ca31d82242dd475eb2c7 100644 (file)
--- a/support/ab.c
+++ b/support/ab.c
@@ -2501,8 +2501,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();