[pull] master from php:master#1032
Merged
Merged
Conversation
Use the zend_string APIs zend_string_equals* which are clearer, and can also do some pointer comparisons if the strings are interned for any reason.
The GitHub-hosted test-suite jobs had no timeout-minutes and fell back to GitHub's 6-hour default, so a hung step (e.g. apt) wasted ~6h of runner time. Cap them at 180 min, which clears the slowest legitimate nightly runs (LINUX_X64_ASAN ~158 min) with margin. The self-hosted jobs keep their existing 50-minute caps. Closes GH-22362
* PHP-8.2: ci: add 180-minute timeout to test-suite jobs
* PHP-8.3: ci: add 180-minute timeout to test-suite jobs
* PHP-8.4: ci: add 180-minute timeout to test-suite jobs
* PHP-8.5: ci: add 180-minute timeout to test-suite jobs
…_MAX (#22432) The input guard rejects only source_len > UINT_MAX, so source_len == UINT_MAX is permitted and assigned to bzs.avail_out (unsigned int). The per-iteration realloc then computed bzs.avail_out+1 in unsigned int arithmetic, which wraps to 0 at UINT_MAX, allocating no headroom while bz2 still believes avail_out bytes are available at next_out: the next decompress round writes past the buffer. Compute the term as (size_t)bzs.avail_out + 1 so the increment is done in size_t and cannot wrap, matching the (size_t) casts already used on the same call.
FileInputHelperTest::testReadWithPasteDetectionAbortsBeyondMaxBytes() causes massive amounts of system calls with USE_ZEND_ALLOC=0, leading to timeouts. Skip this test in our build. Closes GH-22450
* PHP-8.2: [skip ci] Fix timeout in Symfony community build
* PHP-8.3: [skip ci] Fix timeout in Symfony community build
* PHP-8.4: [skip ci] Fix timeout in Symfony community build
* PHP-8.5: [skip ci] Fix timeout in Symfony community build
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 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] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )