diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-06 10:43:05 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-06 10:43:05 +0100 |
| commit | 0b4da7e6da1b335d87a64b3b82dd5f2001bfdffc (patch) | |
| tree | f089884f9b376045ed83b140922ce9845e799059 /ext/curl/interface.c | |
| parent | 5c51a482c9594c6d5f4fa8779f98c24a329ead45 (diff) | |
| parent | 68f6ab711323678382d2746e57358d3f57a3446b (diff) | |
| download | php-git-0b4da7e6da1b335d87a64b3b82dd5f2001bfdffc.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Don't link against openssl 1.1 in curl
Diffstat (limited to 'ext/curl/interface.c')
| -rw-r--r-- | ext/curl/interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index a50fa9b6df..8f53f733c1 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -41,7 +41,7 @@ #endif /* {{{ cruft for thread safe SSL crypto locks */ -#if defined(ZTS) && defined(HAVE_CURL_OPENSSL) +#if defined(ZTS) && defined(HAVE_CURL_OLD_OPENSSL) # if defined(HAVE_OPENSSL_CRYPTO_H) # define PHP_CURL_NEED_OPENSSL_TSL # include <openssl/crypto.h> @@ -51,7 +51,7 @@ "openssl/crypto.h; thus no SSL crypto locking callbacks will be set, which may " \ "cause random crashes on SSL requests" # endif -#endif /* ZTS && HAVE_CURL_OPENSSL */ +#endif /* ZTS && HAVE_CURL_OLD_OPENSSL */ /* }}} */ #define SMART_STR_PREALLOC 4096 |