[pull] master from php:master #619
Open
+1,478,339
−1,819,676
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dstogov
force-pushed
the
master
branch
2 times, most recently
from
63c8ce8 to
7dc352e
Compare
iluuu1994
force-pushed
the
master
branch
4 times, most recently
from
49b8168 to
6d3d4df
Compare
* PHP-8.1: intl: Fix tests for icu update
* PHP-8.2: intl: Fix tests for icu update
* PHP-8.3: intl: Fix tests for icu update
* PHP-8.4: intl: Fix tests for icu update
* PHP-8.5: intl: Fix tests for icu update
* PHP-8.4: PHP-8.4 is now for PHP 8.4.17-dev
* PHP-8.5: PHP-8.4 is now for PHP 8.4.17-dev
* PHP-8.2: Fix yet another xml deprecation
* PHP-8.3: Fix yet another xml deprecation
* PHP-8.4: Fix yet another xml deprecation
* PHP-8.5: Fix yet another xml deprecation
the timeout needed to be unsigned. close GH-20634
* PHP-8.3: Fix GH-20603 issue on windows 32 bits.
* PHP-8.4: Fix GH-20603 issue on windows 32 bits.
* PHP-8.5: Fix GH-20603 issue on windows 32 bits.
…old implementation
* PHP-8.2: xml: Fix deprecation properly by backporting the modern-but-actually-old implementation
The current code causes the phar entry to remain in the fname cache. This would be fine for uncompressed phars, but is a problem for compressed phars when they try to reopen the file pointer. The reopen code will try to use the compressed file pointer as if it were an uncompressed file pointer. In that case, for the given test, the file offsets are out of bounds for the compressed file pointer because they are the uncompressed offsets. This results in empty files. In other cases, it's possible to read compressed parts of the file that don't belong to that particular file. To solve this, we simply remove the phar entry from the fname cache if the file pointer was closed but the phar is compressed. This will make sure that reopening the phar will not go through the cache and instead opens up a fresh file pointer with the right decompression settings. Closes GH-20754.
* PHP-8.4: Fix bug #74154: Phar extractTo creates empty files
* PHP-8.5: Fix bug #74154: Phar extractTo creates empty files
PHP 8.5 defines constant ZEND_VM_KIND since GH-19574, but this name is also used by zend_vm_gen.php. This causes zend_vm_gen.php to generate invalid code when executed with PHP 8.5 in an older branch. Here I rename the constant in zend_vm_gen.php.
* PHP-8.3: Fix zend_vm_gen.php when executed with PHP 8.5
* PHP-8.4: Fix zend_vm_gen.php when executed with PHP 8.5
* PHP-8.5: Fix zend_vm_gen.php when executed with PHP 8.5
With macos Tahoe and clang "17.0.0" (Xcode) the ext/posix/tests/posix_getgrgid_macosx.phpt test crashes as follow: ext/posix/posix.c:681:19: runtime error: load of misaligned address 0x60800000e972 for type 'char **', which requires 8 byte alignment 0x60800000e972: note: pointer points here 70 00 2a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 seems memcpy had been translated to a load instruction ? anyhow, we force to copy a "proper" char * source. close GH-20744
* PHP-8.3: ext/posix: (Further) fix groups array creation on macos.
* PHP-8.4: ext/posix: (Further) fix groups array creation on macos.
* PHP-8.5: ext/posix: (Further) fix groups array creation on macos.
* PHP-8.2: [skip ci] Drop CI for 8.1
* PHP-8.3: [skip ci] Drop CI for 8.1
* PHP-8.4: [skip ci] Drop CI for 8.1
* PHP-8.5: [skip ci] Drop CI for 8.1
* PHP-8.4: [ci skip] Add missing EXTENSIONS dependency to test
* PHP-8.5: [ci skip] Add missing EXTENSIONS dependency to test
In eaee504 the session's save_path global was changed to a zend_string pointer, but there are a few direct char-pointer accesses in ext/session/mod_mm.c that slipped through the cracks. GCC-15 notices them and fails to build due to the incompatible pointer types. Three ZSTR_* wrappers are all that is needed. Gentoo-Bug: https://bugs.gentoo.org/967862 Closes GH-20772.
…tring If nothing was added to a smart_str, the interned empty string is returned, and therefore ZVAL_NEW_STR is wrong as it'll set the REFCOUNTED flag. Closes GH-20773.
* PHP-8.5: Fix GH-20771: Assertion failure when getUnicodeHost() returns empty string ext/session/mod_mm.c: add a few missing ZSTR macros
* PHP-8.3: Fix NEWS formatting
* PHP-8.4: Fix NEWS formatting
* PHP-8.5: Fix NEWS formatting
trusting the call to handle invalid process id via errnos. see #20709 (comment) for rationale. close GH-20731
* PHP-8.4: ext/pcntl: fix pcntl_getcpuaffinity() for solaris.
* PHP-8.5: ext/pcntl: fix pcntl_getcpuaffinity() for solaris.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )