php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4'

Browse Source 
* PHP-8.4:
  Fix GH-16723: CURLMOPT_PUSHFUNCTION issues
This commit is contained in:
Christoph M. Becker
2024-11-09 12:44:16 +01:00
parent cc54e66ad8 3a1a205f2a
commit 9ebbe1e3f3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/curl/interface.c
View File

@@ -1283,13 +1283,13 @@ void _php_setup_easy_copy_handlers(php_curl *ch, php_curl *source)
ch->handlers.read->res = source->handlers.read->res;
if (ZEND_FCC_INITIALIZED(source->handlers.read->fcc)) {
zend_fcc_dup(&source->handlers.read->fcc, &source->handlers.read->fcc);
zend_fcc_dup(&ch->handlers.read->fcc, &source->handlers.read->fcc);
}
if (ZEND_FCC_INITIALIZED(source->handlers.write->fcc)) {
zend_fcc_dup(&source->handlers.write->fcc, &source->handlers.write->fcc);
zend_fcc_dup(&ch->handlers.write->fcc, &source->handlers.write->fcc);
}
if (ZEND_FCC_INITIALIZED(source->handlers.write_header->fcc)) {
zend_fcc_dup(&source->handlers.write_header->fcc, &source->handlers.write_header->fcc);
zend_fcc_dup(&ch->handlers.write_header->fcc, &source->handlers.write_header->fcc);
}
curl_easy_setopt(ch->cp, CURLOPT_ERRORBUFFER, ch->err.str);

1
ext/curl/tests/curl_pushfunction_trampoline.phpt
View File

@@ -60,6 +60,7 @@ sort($responses);
print_r($responses);
?>
--EXPECT--
Trampoline for trampoline
Array
(
[0] => main response