Skip to content

Commit 9ebbe1e

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Fix GH-16723: CURLMOPT_PUSHFUNCTION issues
2 parents cc54e66 + 3a1a205 commit 9ebbe1e

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

ext/curl/interface.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,13 +1283,13 @@ void _php_setup_easy_copy_handlers(php_curl *ch, php_curl *source)
12831283
ch->handlers.read->res = source->handlers.read->res;
12841284

12851285
if (ZEND_FCC_INITIALIZED(source->handlers.read->fcc)) {
1286-
zend_fcc_dup(&source->handlers.read->fcc, &source->handlers.read->fcc);
1286+
zend_fcc_dup(&ch->handlers.read->fcc, &source->handlers.read->fcc);
12871287
}
12881288
if (ZEND_FCC_INITIALIZED(source->handlers.write->fcc)) {
1289-
zend_fcc_dup(&source->handlers.write->fcc, &source->handlers.write->fcc);
1289+
zend_fcc_dup(&ch->handlers.write->fcc, &source->handlers.write->fcc);
12901290
}
12911291
if (ZEND_FCC_INITIALIZED(source->handlers.write_header->fcc)) {
1292-
zend_fcc_dup(&source->handlers.write_header->fcc, &source->handlers.write_header->fcc);
1292+
zend_fcc_dup(&ch->handlers.write_header->fcc, &source->handlers.write_header->fcc);
12931293
}
12941294

12951295
curl_easy_setopt(ch->cp, CURLOPT_ERRORBUFFER, ch->err.str);

ext/curl/tests/curl_pushfunction_trampoline.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ sort($responses);
6060
print_r($responses);
6161
?>
6262
--EXPECT--
63+
Trampoline for trampoline
6364
Array
6465
(
6566
[0] => main response

0 commit comments

Comments
 (0)