Merge pull request #15571 from craftcms/bugfix/guzzle-timeout

Add a default connect_timeout of 15 seconds for all craftnet Api requests
craftcms · Aug 21, 2024 · 5d2fd35 · 5d2fd35
2 parents 058b152 + 51447c8
commit 5d2fd35
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Fixed a bug where the “Default Values” Table field setting wasn’t escaping column headings. ([#15552](https://github.com/craftcms/cms/issues/15552))
 - Fixed a bug where Craft couldn’t be installed with existing project config files, if any plugins specified their schema version via `composer.json`. ([#15559](https://github.com/craftcms/cms/issues/15559))
 - Fixed a bug where Money fields’ min, max, and default values weren’t being set to the correct currency. ([#15565](https://github.com/craftcms/cms/issues/15565), [#15566](https://github.com/craftcms/cms/pull/15566))
+- Fixed a bug where PHP-originated Craft Console API requests weren’t timing out if the API was down. ([#15571](https://github.com/craftcms/cms/pull/15571))
 
 ## 4.11.3 - 2024-08-13
 

diff --git a/src/services/Api.php b/src/services/Api.php
@@ -43,6 +43,7 @@ public function init(): void
         if (!isset($this->client)) {
             $this->client = Craft::createGuzzleClient([
                 'base_uri' => Craft::$app->baseApiUrl,
+                'connect_timeout' => 15,
             ]);
         }
     }