Merge branch 'PHP-8.2'

nielsdos · nielsdos · commit 7c5a57077ab6 · 2023-07-09T01:09:56.000+02:00
* PHP-8.2:
  Fix return value of _php_server_push_callback in case of failure
diff --git a/ext/curl/multi.c b/ext/curl/multi.c
@@ -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)) {
 		php_error_docref(NULL, E_WARNING, "Cannot call the CURLMOPT_PUSHFUNCTION");
-		return CURL_PUSH_OK;
+		return rval;
 	}
 
 	parent = Z_CURL_P(pz_parent_ch);

Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ static int _php_server_push_callback(CURL parent_ch, CURL easy, size_t num_hea`
`384`	`384`
`385`	`385`	`if (UNEXPECTED(zend_fcall_info_init(&t->func_name, 0, &fci, &t->fci_cache, NULL, NULL) == FAILURE)) {`
`386`	`386`	`php_error_docref(NULL, E_WARNING, "Cannot call the CURLMOPT_PUSHFUNCTION");`
`387`		`- return CURL_PUSH_OK;`
	`387`	`+ return rval;`
`388`	`388`	`}`
`389`	`389`
`390`	`390`	`parent = Z_CURL_P(pz_parent_ch);`