[12.x] Fix infinite rate limiter TTL on custom increments#59693
Merged
taylorotwell merged 3 commits intolaravel:12.xfrom Apr 15, 2026
Merged
[12.x] Fix infinite rate limiter TTL on custom increments#59693taylorotwell merged 3 commits intolaravel:12.xfrom
taylorotwell merged 3 commits intolaravel:12.xfrom
Conversation
|
Thanks for submitting a PR! Note that draft PRs are not reviewed. If you would like a review, please mark your pull request as ready for review in the GitHub user interface. Pull requests that are abandoned in draft may be closed due to inactivity. |
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.
This fixes a race condition in
RateLimiter::increment()when the increment$amountis greater than1.If the counter key disappears after Laravel checks for it but before the
increment()happens, the cache can recreate that key duringincrement(). When that happens, Laravel needs to write the value back with the proper decay time so the key does not live forever.The bug was that this recovery logic only checked for
== 1. That works for the default increment, but not for calls likeincrement(..., 5), where the recreated value is5. This change checks against$amountinstead, so custom increments also get the correct TTL.See #20684 for additional context.