Skip to content

Commit

Permalink
Merge branch '5.1' into 5.2
Browse files Browse the repository at this point in the history
* 5.1:
  Fix EncoderInterface::encode() return type
  [Lock] Prevent store exception break combined store
  Remove check for unsupported PHP version
  [Notifier] Rename test method names
  • Loading branch information
nicolas-grekas committed Dec 14, 2020
2 parents 13b0dab + 81c60c5 commit a77cbec
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Response/CurlResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ private static function perform(ClientState $multi, array &$responses = null): v
*/
private static function select(ClientState $multi, float $timeout): int
{
if (\PHP_VERSION_ID < 70123 || (70200 <= \PHP_VERSION_ID && \PHP_VERSION_ID < 70211)) {
if (\PHP_VERSION_ID < 70211) {
// workaround https://bugs.php.net/76480
$timeout = min($timeout, 0.01);
}
Expand Down

0 comments on commit a77cbec

Please sign in to comment.