Repository navigation
[6.x] Add a timeout to Marketplace API requests - #15591
Merged
jasonvarga merged 1 commit intoOct 7, 2026
Merged
Conversation
This was referenced Oct 15, 2026
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 pull request fixes an issue where the CP dashboard hangs (and ends in a 504) when statamic.com accepts connections but never responds.
The Marketplace client sent its requests without a timeout, and Guzzle waits forever by default. The updater widget and the
/cp/updater/countbadge both go through it, so every CP page load sat on the hung request. On top of that,Marketplaceonly caughtRequestException, and a timeout throws aConnectException, so adding a timeout alone would turn the 504 into a 500.This PR fixes it by giving the client a 5 second timeout (same as Outpost) and catching
TransferExceptioninstead, so a timeout falls back to the empty response like an HTTP error already does.Fixes #15590