1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.2'

* PHP-8.2:
  Fix return value of _php_server_push_callback in case of failure
This commit is contained in:
Niels Dossche
2023-07-09 01:09:56 +02:00

View File

@@ -384,7 +384,7 @@ static int _php_server_push_callback(CURL *parent_ch, CURL *easy, size_t num_hea
if (UNEXPECTED(zend_fcall_info_init(&t->func_name, 0, &fci, &t->fci_cache, NULL, NULL) == FAILURE)) { if (UNEXPECTED(zend_fcall_info_init(&t->func_name, 0, &fci, &t->fci_cache, NULL, NULL) == FAILURE)) {
php_error_docref(NULL, E_WARNING, "Cannot call the CURLMOPT_PUSHFUNCTION"); php_error_docref(NULL, E_WARNING, "Cannot call the CURLMOPT_PUSHFUNCTION");
return CURL_PUSH_OK; return rval;
} }
parent = Z_CURL_P(pz_parent_ch); parent = Z_CURL_P(pz_parent_ch);