Configure a 60 second timeout for Guzzle by default

This is acting as a safety net, because the default timeout is infinite.

diff --git a/wcfsetup/install/files/lib/system/io/HttpFactory.class.php b/wcfsetup/install/files/lib/system/io/HttpFactory.class.php
index 7ee07e2fe4cf2f8a7b822c197dc3ce6556c202c0..0868653556e96d3c109ff1e5f17b753a57f58a4c 100644 (file)
--- a/wcfsetup/install/files/lib/system/io/HttpFactory.class.php
+++ b/wcfsetup/install/files/lib/system/io/HttpFactory.class.php
@@ -57,6 +57,7 @@ final class HttpFactory {
                $defaults = [
                        'proxy' => PROXY_SERVER_HTTP,
                        'headers' => [],
+                       'timeout' => 60,
                ];
                
                foreach ($defaults as $key => $value) {

diff --git a/wcfsetup/install/files/lib/util/HTTPRequest.class.php b/wcfsetup/install/files/lib/util/HTTPRequest.class.php
index cfd678f4673c9fa57170fca7fee506a17e41a135..2c81c3b7d289cc9da96f261bffbfda0f12f74453 100644 (file)
--- a/wcfsetup/install/files/lib/util/HTTPRequest.class.php
+++ b/wcfsetup/install/files/lib/util/HTTPRequest.class.php
@@ -167,6 +167,8 @@ final class HTTPRequest {
                };
                
                $options = [
+                       // No overall timeout
+                       'timeout' => 0,
                        'connect_timeout' => $this->options['timeout'],
                        'read_timeout' => $this->options['timeout'],
                        'allow_redirects' => [