Skip to content

[pull] master from php:master #885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 6 commits into from
Apr 24, 2026
Merged

[pull] master from php:master #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6563ae2
ext/phar: pass NULL pointer for error instead of freeing it immediately
Girgias Apr 23, 2026
046ffa2
[skip ci] Restrict Windows+Clang build to PHP 8.6
iluuu1994 Apr 23, 2026
67437bc
Merge branch 'PHP-8.2' into PHP-8.3
iluuu1994 Apr 23, 2026
ea43822
Merge branch 'PHP-8.3' into PHP-8.4
iluuu1994 Apr 23, 2026
49a74a8
Merge branch 'PHP-8.4' into PHP-8.5
iluuu1994 Apr 23, 2026
3291dea
Merge branch 'PHP-8.5'
iluuu1994 Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/matrix.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
if ($all_variations) {
$matrix[] = ['asan' => true, 'opcache' => true, 'x64' => true, 'zts' => true];
$matrix[] = ['asan' => false, 'opcache' => false, 'x64' => false, 'zts' => false];
if (version_compare($php_version, '8.5', '>=')) {
if (version_compare($php_version, '8.6', '>=')) {
$matrix[] = ['asan' => false, 'opcache' => true, 'x64' => true, 'zts' => true, 'clang' => true];
}
}
Expand Down
10 changes: 2 additions & 8 deletions ext/phar/stream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,11 +742,8 @@ static int phar_wrapper_rename(php_stream_wrapper *wrapper, const char *url_from
php_error_docref(NULL, E_WARNING, "phar error: cannot rename \"%s\" to \"%s\": invalid or non-writable url \"%s\"", url_from, url_to, url_from);
return 0;
}
if (SUCCESS != phar_get_archive(&pfrom, ZSTR_VAL(resource_from->host), ZSTR_LEN(resource_from->host), NULL, 0, &error)) {
if (SUCCESS != phar_get_archive(&pfrom, ZSTR_VAL(resource_from->host), ZSTR_LEN(resource_from->host), NULL, 0, NULL)) {
pfrom = NULL;
if (error) {
efree(error);
}
}
if (PHAR_G(readonly) && (!pfrom || !pfrom->is_data)) {
php_url_free(resource_from);
Expand All @@ -760,10 +757,7 @@ static int phar_wrapper_rename(php_stream_wrapper *wrapper, const char *url_from
php_error_docref(NULL, E_WARNING, "phar error: cannot rename \"%s\" to \"%s\": invalid or non-writable url \"%s\"", url_from, url_to, url_to);
return 0;
}
if (SUCCESS != phar_get_archive(&pto, ZSTR_VAL(resource_to->host), ZSTR_LEN(resource_to->host), NULL, 0, &error)) {
if (error) {
efree(error);
}
if (SUCCESS != phar_get_archive(&pto, ZSTR_VAL(resource_to->host), ZSTR_LEN(resource_to->host), NULL, 0, NULL)) {
pto = NULL;
}
if (PHAR_G(readonly) && (!pto || !pto->is_data)) {
Expand Down