Use HttpFactory::makeClientWithTimeout()

diff --git a/wcfsetup/install/files/lib/action/AbstractOauth2Action.class.php b/wcfsetup/install/files/lib/action/AbstractOauth2Action.class.php
index 7bee94bdd449ea942b839eef182eb669c3364471..a08d5c4a854b8cfcc8f55fe069eeb2cb440d4aa9 100644 (file)
--- a/wcfsetup/install/files/lib/action/AbstractOauth2Action.class.php
+++ b/wcfsetup/install/files/lib/action/AbstractOauth2Action.class.php
@@ -52,9 +52,7 @@ abstract class AbstractOauth2Action extends AbstractAction
     final protected function getHttpClient(): ClientInterface
     {
         if (!$this->httpClient) {
-            $this->httpClient = HttpFactory::makeClient([
-                RequestOptions::TIMEOUT => 5,
-            ]);
+            $this->httpClient = HttpFactory::makeClientWithTimeout(5);
         }
 
         return $this->httpClient;

diff --git a/wcfsetup/install/files/lib/action/ImageProxyAction.class.php b/wcfsetup/install/files/lib/action/ImageProxyAction.class.php
index d67272342231fc73aa8dbaa123bb64049c6a2a94..36514de4c341669fb6d1922677f0cbc0dbffc520 100644 (file)
--- a/wcfsetup/install/files/lib/action/ImageProxyAction.class.php
+++ b/wcfsetup/install/files/lib/action/ImageProxyAction.class.php
@@ -105,9 +105,7 @@ class ImageProxyAction extends AbstractAction
 
                     // download image
                     try {
-                        $client = HttpFactory::makeClient([
-                            RequestOptions::TIMEOUT => 10,
-                        ]);
+                        $client = HttpFactory::makeClientWithTimeout(10);
                         $request = new Request('GET', $url, [
                             'via' => '1.1 wsc',
                             'accept' => 'image/*',

diff --git a/wcfsetup/install/files/lib/system/background/job/DownloadRankImageJob.class.php b/wcfsetup/install/files/lib/system/background/job/DownloadRankImageJob.class.php
index 485957403ac0490f036965d8badb9c01c49e0d97..e7006cec40e0c0d64b23c0b61a849dd153418927 100644 (file)
--- a/wcfsetup/install/files/lib/system/background/job/DownloadRankImageJob.class.php
+++ b/wcfsetup/install/files/lib/system/background/job/DownloadRankImageJob.class.php
@@ -64,9 +64,7 @@ class DownloadRankImageJob extends AbstractBackgroundJob
 
         $extension = \pathinfo(Url::parse($rank->rankImage)['path'], \PATHINFO_EXTENSION);
         if (\in_array($extension, ['gif', 'png', 'jpg', 'jpeg', 'svg', 'webp'])) {
-            $http = HttpFactory::makeClient([
-                RequestOptions::TIMEOUT => 10,
-            ]);
+            $http = HttpFactory::makeClientWithTimeout(10);
 
             $imageDest = WCF_DIR . UserRank::RANK_IMAGE_DIR . $rank->rankID . '-rankImage.' . $extension;
             $http->send(new Request('GET', $rank->rankImage), [