Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit 11e2eb654b9f · 2019-10-15T14:38:35.000+02:00
* 4.3:
  [HttpClient] workaround curl_multi_select() issue
  [CI] fix building local packages
  Increase limits for flakey appveyor tests
diff --git a/Response/CurlResponse.php b/Response/CurlResponse.php
@@ -286,6 +286,11 @@ private static function perform(CurlClientState $multi, array &$responses = null
      */
     private static function select(CurlClientState $multi, float $timeout): int
     {
+        if (\PHP_VERSION_ID < 70123 || (70200 <= \PHP_VERSION_ID && \PHP_VERSION_ID < 70211)) {
+            // workaround https://bugs.php.net/76480
+            $timeout = min($timeout, 0.01);
+        }
+
         return curl_multi_select($multi->handle, $timeout);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -286,6 +286,11 @@ private static function perform(CurlClientState $multi, array &$responses = null`
`286`	`286`	`*/`
`287`	`287`	`private static function select(CurlClientState $multi, float $timeout): int`
`288`	`288`	`{`
	`289`	`+ if (\PHP_VERSION_ID < 70123 \|\| (70200 <= \PHP_VERSION_ID && \PHP_VERSION_ID < 70211)) {`
	`290`	`+ // workaround https://bugs.php.net/76480`
	`291`	`+ $timeout = min($timeout, 0.01);`
	`292`	`+ }`
	`293`	`+`
`289`	`294`	`return curl_multi_select($multi->handle, $timeout);`
`290`	`295`	`}`
`291`	`296`