Add IPv4 fallback on connection timeout, and adds COMPOSER_IPRESOLVE env var #11791
Conversation
|
@stof thanks, all feedback should be addressed. |
| @@ -143,7 +143,7 @@ public function download(callable $resolve, callable $reject, string $origin, st | |||
| /** | |||
| * @param mixed[] $options | |||
| * | |||
| * @param array{retryAuthFailure?: bool, redirects?: int<0, max>, retries?: int<0, max>, storeAuth?: 'prompt'|bool} $attributes | |||
| * @param array{retryAuthFailure?: bool, redirects?: int<0, max>, retries?: int<0, max>, storeAuth?: 'prompt'|bool, ipResolve?: 4|6|null} $attributes | |||
There was a problem hiding this comment.
can't make up your mind whether to use |null or ? and here you use both? ;-)
There was a problem hiding this comment.
It's optional to pass it but it defaults to null so yeah this looks weird but works well enough
There was a problem hiding this comment.
The ? after a key does not indicate nullability but the fact that this key is optional in the array.
| @@ -199,6 +206,12 @@ private function initDownload(callable $resolve, callable $reject, string $origi | |||
| curl_setopt($curlHandle, CURLOPT_ENCODING, ""); // let cURL set the Accept-Encoding header to what it supports | |||
| curl_setopt($curlHandle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS); | |||
|
|
|||
| if ($attributes['ipResolve'] === 4) { | |||
| curl_setopt($curlHandle, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); | |||
There was a problem hiding this comment.
curl_setopt($curlHandle, CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS, 0);When using the IPv4 protocol, is it possible to change the default 200ms wait for IPv6 to 0ms?
There was a problem hiding this comment.
if resolution is forced to be ipv4, there won't be any happy eyeballs happening, so this timeout won't ever be used.
There was a problem hiding this comment.
Yeah that would be my expectation as well, so I don't think this is necessary.
fixes composer/packagist#530