fix(files): correct quota stream accounting - #64087
Draft
joshtrichards wants to merge 6 commits into
Draft
Conversation
Follow-up to PR #55731 Account for bytes actually read, preserve quota state on failed seeks, and prevent writes when the remaining allowance is exhausted. Document the per-stream allowance and support float quota values. Signed-off-by: Josh <josh.t.richards@gmail.com>
Add regression coverage for short reads, failed seeks, exhausted allowances, and short writes where the underlying stream writes fewer bytes than requested. Includes coverage for related PR #55731. Assisted-by: Copilot:gpt-5.6-luna Signed-off-by: Josh <josh.t.richards@gmail.com>
Signed-off-by: Josh <josh.t.richards@gmail.com>
Add coverage for failed end-relative seeks, negative remaining allowances, and float quota limits. Assisted-by: Copilot:gpt-5.6-luna Signed-off-by: Josh <josh.t.richards@gmail.com>
Not realistic to test and not really needed anyhow... Signed-off-by: Josh <josh.t.richards@gmail.com>
Detect the test payload and return zero for retry data so the test consistently verifies accounting for bytes actually written. Signed-off-by: Josh <josh.t.richards@gmail.com>
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Resolves: #Summary
Correct stream quota accounting and add regression coverage for short reads, short writes, and failed seeks.
Problem:
The quota stream tracks a mutable allowance for each wrapped stream. Several edge cases could make that allowance diverge from the actual stream state:
stream_read()reduced the allowance by the requested byte count, even when the underlying stream returned fewer bytes at EOF. This could consume allowance for bytes that were not actually read.stream_seek()adjusted the allowance before knowing whether the underlying seek succeeded. A failed seek could therefore change quota accounting.substr(), where PHP interprets it as a negative length rather than as zero available bytes.stream_write()reduced the allowance by the intended write size instead of the number of bytes actually written.Changes:
substr()lengths.int|floatbyte count.SEEK_SETandSEEK_ENDoperations;The short-write regression test also covers the behavior fixed by #55731.
TODO
Checklist
3. to review, feature component)stable32)AI (if applicable)