]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.3' into PHP-7.4
authorRasmus Lerdorf <rasmus@lerdorf.com>
Tue, 21 May 2019 21:46:44 +0000 (14:46 -0700)
committerRasmus Lerdorf <rasmus@lerdorf.com>
Tue, 21 May 2019 21:46:44 +0000 (14:46 -0700)
commit12c1d7419a562989fb4d56ac95489fd9abab4b9b
tree5d88c06cc1a42112b811dca5d1321a2ce877e848
parentf260c0918f07a5adccef01cdb1b3b1f91fc92a72
parent2d29263a9ff6fc400891c0de2d8e4ae194513f57
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix precedence issue causing sub-second timeouts to be 0 in curl_multi_select
ext/curl/multi.c