Merge branch '2.2' into main

main
Jordi Boggiano 2 years ago
commit 35995c2d87
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC

@ -358,7 +358,7 @@ class CurlDownloader
if ( if (
(!isset($job['options']['http']['method']) || $job['options']['http']['method'] === 'GET') (!isset($job['options']['http']['method']) || $job['options']['http']['method'] === 'GET')
&& ( && (
in_array($errno, array(7 /* CURLE_COULDNT_CONNECT */, 16 /* CURLE_HTTP2 */, 92 /* CURLE_HTTP2_STREAM */), true) in_array($errno, array(7 /* CURLE_COULDNT_CONNECT */, 16 /* CURLE_HTTP2 */, 92 /* CURLE_HTTP2_STREAM */, 6 /* CURLE_COULDNT_RESOLVE_HOST */), true)
|| ($errno === 35 /* CURLE_SSL_CONNECT_ERROR */ && false !== strpos($error, 'Connection reset by peer')) || ($errno === 35 /* CURLE_SSL_CONNECT_ERROR */ && false !== strpos($error, 'Connection reset by peer'))
) && $job['attributes']['retries'] < $this->maxRetries ) && $job['attributes']['retries'] < $this->maxRetries
) { ) {

Loading…
Cancel
Save