From bc8fece0cf43be05dcf5022b851d5429c8977401 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 12 Jun 2019 15:26:06 +0200 Subject: Don't warn if libcurl SSL library not detected libcurl may link against 7 different ssl libraries, all of which are thread-safe -- apart from openssl, of course. We check for openssl and register locking callbacks in that case, but we should not warn if any other library is used. --- ext/curl/interface.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) (limited to 'ext/curl/interface.c') diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 5b6e5f814c..5db1be99e8 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -47,27 +47,17 @@ # ifdef PHP_WIN32 # define PHP_CURL_NEED_OPENSSL_TSL # include -# else /* !PHP_WIN32 */ -# if defined(HAVE_CURL_OPENSSL) -# if defined(HAVE_OPENSSL_CRYPTO_H) -# define PHP_CURL_NEED_OPENSSL_TSL -# include -# else -# warning \ - "libcurl was compiled with OpenSSL support, but configure could not find " \ - "openssl/crypto.h; thus no SSL crypto locking callbacks will be set, which may " \ - "cause random crashes on SSL requests" -# endif -# elif defined(HAVE_CURL_GNUTLS) - /* Modern versions of GnuTLS use the nette backend rather than gcrypt, so there - * is nothing to do here anymore. */ +# elif defined(HAVE_CURL_OPENSSL) +# if defined(HAVE_OPENSSL_CRYPTO_H) +# define PHP_CURL_NEED_OPENSSL_TSL +# include # else # warning \ - "libcurl was compiled with SSL support, but configure could not determine which" \ - "library was used; thus no SSL crypto locking callbacks will be set, which may " \ + "libcurl was compiled with OpenSSL support, but configure could not find " \ + "openssl/crypto.h; thus no SSL crypto locking callbacks will be set, which may " \ "cause random crashes on SSL requests" -# endif /* HAVE_CURL_OPENSSL || HAVE_CURL_GNUTLS */ -# endif /* PHP_WIN32 */ +# endif +# endif /* HAVE_CURL_OPENSSL */ #endif /* ZTS && HAVE_CURL_SSL */ /* }}} */ -- cgit v1.2.1