Replace HTTPRequest's timeout by connect_timeout + read_timeout

The timeout in 5.2 only applied to the connect() syscall. Guzzle's timeout
option applies to the total transfer. Replace it by connect_timeout +
read_timeout for backwards compatibility for code that expected the actual
transfer to take an arbitrary amount of time.

diff --git a/wcfsetup/install/files/lib/util/HTTPRequest.class.php b/wcfsetup/install/files/lib/util/HTTPRequest.class.php
index a3dd16ef89cebb7f828899bf5abf065a95593331..2867920d993bbdb7ed5ac41dfa21cc1093d28911 100644 (file)
--- a/wcfsetup/install/files/lib/util/HTTPRequest.class.php
+++ b/wcfsetup/install/files/lib/util/HTTPRequest.class.php
@@ -166,7 +166,8 @@ final class HTTPRequest {
                };
                
                $options = [
-                       'timeout' => $this->options['timeout'],
+                       'connect_timeout' => $this->options['timeout'],
+                       'read_timeout' => $this->options['timeout'],
                        'allow_redirects' => [
                                'max' => $this->options['maxDepth'],
                                'track_redirects' => true,