From: Michael Wallner <mike@php.net>
Date: Tue, 27 Aug 2024 17:59:56 +0000 (+0200)
Subject: curl: add workaround for CURLOPT_INTERFACE for v8.9-8.10
X-Git-Tag: v4.2.6~6
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=9c0294956c75fda02269432ba4f693afecea1c5b;p=m6w6%2Fext-http

curl: add workaround for CURLOPT_INTERFACE for v8.9-8.10
---

diff --git a/src/php_http_client_curl.c b/src/php_http_client_curl.c
index 4decc7a..ed778b1 100644
--- a/src/php_http_client_curl.c
+++ b/src/php_http_client_curl.c
@@ -1413,7 +1413,12 @@ static void php_http_curle_options_init(php_http_options_t *registry)
 #endif
 
 	/* outgoing interface */
-	php_http_option_register(registry, ZEND_STRL("interface"), CURLOPT_INTERFACE, IS_STRING);
+	if ((opt = php_http_option_register(registry, ZEND_STRL("interface"), CURLOPT_INTERFACE, IS_STRING))) {
+#if PHP_HTTP_CURL_VERSION(8,9,0) && !PHP_HTTP_CURL_VERSION(8,10,0)
+		// NULL support lost in v8.9 and restored in libcurl v8.10
+		opt->flags |= PHP_HTTP_CURLE_OPTION_IGNORE_RC;
+#endif
+	}
 	if ((opt = php_http_option_register(registry, ZEND_STRL("portrange"), CURLOPT_LOCALPORT, IS_ARRAY))) {
 		opt->setter = php_http_curle_option_set_portrange;
 	}