Repository navigation
[13.x] Fix Redis throttle returning a timestamp as the remaining attempts - #61748
Merged
taylorotwell merged 2 commits intoSep 28, 2026
Merged
taylorotwell merged 2 commits into
taylorotwell merged 2 commits into
Conversation
âĶrationLimiter::tooManyAttempts()
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.
When using
throttleWithRedis()with a limit that only counts some responses, the first request of a window returns a Unix timestamp as the remaining attempts:DurationLimiter::tooManyAttempts()reads the Lua result as[decaysAt, remaining], but when the key doesn't exist or the window has expired the script returns{0, now + decay}, the other way around. Withoutafter()this is hidden becausehit()runs straight away and overwrites both values, but when the response isn't counted the header is built from the swapped values. The cache basedThrottleRequestsmiddleware returns5here.This returns the decay time and the max attempts in the right order, using
tonumber()soremainingis an integer like in the other branches. The existingDurationLimiterTestassertion that expected the timestamp placeholder is updated to match.