Commit bf64f588045 for php
commit bf64f588045bdfdd6685a242db0e09a049a1fc5e
Merge: e0e2095a0d4 09e9e27ffb4
Author: Tim Düsterhus <tim@tideways-gmbh.com>
Date: Tue Nov 10 16:39:34 2026 +0100
Merge branch 'PHP-8.6'
* PHP-8.6:
Fix argument number in curl_multi_setopt() CURLMOPT_PUSHFUNCTION error (#25367)
Fix the argument named by the imageaffine() element TypeError (#25369)
diff --cc ext/curl/multi.c
index 6614a52809c,1df97d86930..6d1ec64216e
--- a/ext/curl/multi.c
+++ b/ext/curl/multi.c
@@@ -485,9 -478,9 +485,9 @@@ static bool _php_curl_multi_setopt(php_
}
char *error_str = NULL;
- if (UNEXPECTED(!zend_is_callable_ex(zvalue, /* object */ NULL, /* check_flags */ 0, /* callable_name */ NULL, &mh->handlers.server_push, /* error */ &error_str))) {
+ if (UNEXPECTED(!zend_is_callable(zvalue, &mh->handlers.server_push, &error_str))) {
if (!EG(exception)) {
- zend_argument_type_error(2, "must be a valid callback for option CURLMOPT_PUSHFUNCTION, %s", error_str);
+ zend_argument_type_error(3, "must be a valid callback for option CURLMOPT_PUSHFUNCTION, %s", error_str);
}
efree(error_str);
return false;