Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

curl error msg for low version #2108

Merged
merged 4 commits into from Apr 15, 2019
Merged

curl error msg for low version #2108

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd36885
curl error msg for low version
Jul 17, 2018
bcfa6ba
curl error msg for low version
Aug 3, 2018
909ac9b
curl error msg for low version
Aug 3, 2018
f5203f7
Remove constant visibility
sagikazarmark Apr 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 20 additions & 7 deletions src/Handler/CurlFactory.php
View file
Open in desktop
Expand Up @@ -14,6 +14,9 @@
*/
class CurlFactory implements CurlFactoryInterface
{
const CURL_VERSION_STR = 'curl_version';
const LOW_CURL_VERSION_NUMBER = '7.21.2';

/** @var array */
private $handles = [];

Expand Down Expand Up @@ -137,6 +140,7 @@ private static function finishError(
'errno' => $easy->errno,
'error' => curl_error($easy->handle),
] + curl_getinfo($easy->handle);
$ctx[self::CURL_VERSION_STR] = curl_version()['version'];
$factory->release($easy);

// Retry when nothing is present or when curl failed to rewind.
Expand Down Expand Up @@ -172,13 +176,22 @@ private static function createRejection(EasyHandle $easy, array $ctx)
)
);
}

$message = sprintf(
'cURL error %s: %s (%s)',
$ctx['errno'],
$ctx['error'],
'see https://curl.haxx.se/libcurl/c/libcurl-errors.html'
);
if (version_compare($ctx[self::CURL_VERSION_STR], self::LOW_CURL_VERSION_NUMBER)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry to be late but this seems wrong, it's missing a comparison operator (either against 0 or as a third string argument, see examples). Currently it's basically testing curl_version()['version'] != '7.21.2'. I guess you intended > here? But actually I couldn't find any evidence that curl 7.21.2+ added the URI in the error message... Could you please explain your scenario?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

proposed #2648

$message = sprintf(
'cURL error %s: %s (%s)',
$ctx['errno'],
$ctx['error'],
'see https://curl.haxx.se/libcurl/c/libcurl-errors.html'
);
} else {
$message = sprintf(
'cURL error %s: %s (%s) for %s',
$ctx['errno'],
$ctx['error'],
'see https://curl.haxx.se/libcurl/c/libcurl-errors.html',
$easy->request->getUri()
);
}

// Create a connection exception if it was a specific error code.
$error = isset($connectionErrors[$easy->errno])
Expand Down