From 5b917e55bcf0f1e9a1354da248d1e232394c5470 Mon Sep 17 00:00:00 2001 From: Joe Afflerbach Date: Wed, 1 Apr 2026 11:54:12 +0200 Subject: [PATCH] Fewer deprecation warnings for removed/no longer operational libcurl features: * `CURLSSLBACKEND_NSS`: removed in 8.3.0 * `CURLSSLBACKEND_GSKIT`: removed in 8.3.0 * `CURLSSLBACKEND_POLARSSL`: removed in 7.69.0 * `CURLOPT_SSL_ENABLE_NPN`: removed in 7.86.0 * `CURLOPT_RANDOM_FILE`: removed in 7.84.0 * `CURLOPT_EGDSOCKET`: removed in 7.84.0 --- src/php_http_client_curl.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/php_http_client_curl.c b/src/php_http_client_curl.c index a02a87e..ce7468d 100644 --- a/src/php_http_client_curl.c +++ b/src/php_http_client_curl.c @@ -677,15 +677,19 @@ static ZEND_RESULT_CODE php_http_curle_get_info(CURL *ch, HashTable *info) } #endif break; +#if !PHP_HTTP_CURL_VERSION(8,3,0) case CURLSSLBACKEND_NSS: backend = "nss"; break; case CURLSSLBACKEND_GSKIT: backend = "gskit"; break; +#endif +#if !PHP_HTTP_CURL_VERSION(7,69,0) case CURLSSLBACKEND_POLARSSL: backend = "polarssl"; break; +#endif case CURLSSLBACKEND_CYASSL: backend = "cyassl"; break; @@ -1592,6 +1596,7 @@ static void php_http_curle_options_init(php_http_options_t *registry) # endif } #endif +#if !PHP_HTTP_CURL_VERSION(7,84,0) if ((opt = php_http_option_register(ssl_registry, ZEND_STRL("random_file"), CURLOPT_RANDOM_FILE, IS_STRING))) { opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN; opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR; @@ -1600,6 +1605,7 @@ static void php_http_curle_options_init(php_http_options_t *registry) opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN; opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR; } +#endif if ((opt = php_http_option_register(ssl_registry, ZEND_STRL("issuercert"), CURLOPT_ISSUERCERT, IS_STRING))) { opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN; opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR; @@ -1615,9 +1621,11 @@ static void php_http_curle_options_init(php_http_options_t *registry) ZVAL_FALSE(&opt->defval); } #endif +#if !PHP_HTTP_CURL_VERSION(7,86,0) if ((opt = php_http_option_register(ssl_registry, ZEND_STRL("enable_npn"), CURLOPT_SSL_ENABLE_NPN, _IS_BOOL))) { ZVAL_BOOL(&opt->defval, 1); } +#endif if ((opt = php_http_option_register(ssl_registry, ZEND_STRL("enable_alpn"), CURLOPT_SSL_ENABLE_ALPN, _IS_BOOL))) { ZVAL_BOOL(&opt->defval, 1); }