Merge branch 'PHP-8.4' into PHP-8.5

nielsdos · nielsdos · commit 64d2a3fe9416 · 2025-10-01T10:54:46.000+02:00
* PHP-8.4:
  Fix build
diff --git a/ext/phar/tar.c b/ext/phar/tar.c
@@ -1172,13 +1172,13 @@ void phar_tar_flush(phar_archive_data *phar, zend_string *user_stub, bool is_def
 	zend_hash_apply_with_argument(&phar->manifest, phar_tar_writeheaders, (void *) &pass);
 
 	if (error && *error) {
-		if (closeoldfile) {
+		if (must_close_old_file) {
 			php_stream_close(oldfile);
 		}
 
 		/* on error in the hash iterator above, error is set */
 		php_stream_close(newfile);
-		return EOF;
+		return;
 	}
 
 	/* add signature for executable tars or tars explicitly set with setSignatureAlgorithm */

Original file line number	Diff line number	Diff line change
`@@ -1172,13 +1172,13 @@ void phar_tar_flush(phar_archive_data phar, zend_string user_stub, bool is_def`
`1172`	`1172`	`zend_hash_apply_with_argument(&phar->manifest, phar_tar_writeheaders, (void *) &pass);`
`1173`	`1173`
`1174`	`1174`	`if (error && *error) {`
`1175`		`- if (closeoldfile) {`
	`1175`	`+ if (must_close_old_file) {`
`1176`	`1176`	`php_stream_close(oldfile);`
`1177`	`1177`	`}`
`1178`	`1178`
`1179`	`1179`	`/* on error in the hash iterator above, error is set */`
`1180`	`1180`	`php_stream_close(newfile);`
`1181`		`- return EOF;`
	`1181`	`+ return;`
`1182`	`1182`	`}`
`1183`	`1183`
`1184`	`1184`	`/* add signature for executable tars or tars explicitly set with setSignatureAlgorithm */`