Skip to content

Commit

Permalink
ab: don't call malloc_init for OpenSSL 1.1.0
Browse files Browse the repository at this point in the history
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
  • Loading branch information
jchampio committed May 22, 2017
1 parent 80242f0 commit 6f1b18e
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions support/ab.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 6f1b18e

Please sign in to comment.