diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2024-10-10 16:01:54 +0000 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2024-10-10 16:01:54 +0000 |
| commit | 468f464b486e2ed0527cfd7e80113d37cdd4d07c (patch) | |
| tree | 60b3243c3796d6a21a349ee7ae8e5c76d5d2717a /vendor/guzzlehttp/guzzle/src/Utils.php | |
| parent | 7fafad2ac2466b9a17b802d9b29d10056b439e29 (diff) | |
| parent | 124c4e254250ebac336392711b32dfd6fa3caef3 (diff) | |
Merge branch 'feature/guzzle-7.9.2' into 'master'
Update Guzzle to 7.9.2
See merge request tt-rss/tt-rss!70
Diffstat (limited to 'vendor/guzzlehttp/guzzle/src/Utils.php')
| -rw-r--r-- | vendor/guzzlehttp/guzzle/src/Utils.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor/guzzlehttp/guzzle/src/Utils.php b/vendor/guzzlehttp/guzzle/src/Utils.php index 93d6d39cd..df529270e 100644 --- a/vendor/guzzlehttp/guzzle/src/Utils.php +++ b/vendor/guzzlehttp/guzzle/src/Utils.php @@ -71,7 +71,7 @@ final class Utils return \STDOUT; } - return \GuzzleHttp\Psr7\Utils::tryFopen('php://output', 'w'); + return Psr7\Utils::tryFopen('php://output', 'w'); } /** @@ -87,7 +87,7 @@ final class Utils { $handler = null; - if (\defined('CURLOPT_CUSTOMREQUEST')) { + if (\defined('CURLOPT_CUSTOMREQUEST') && \function_exists('curl_version') && version_compare(curl_version()['version'], '7.21.2') >= 0) { if (\function_exists('curl_multi_exec') && \function_exists('curl_exec')) { $handler = Proxy::wrapSync(new CurlMultiHandler(), new CurlHandler()); } elseif (\function_exists('curl_exec')) { |