]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97ba6b0 7b42cdf)
Merge branch 'PHP-7.2' into PHP-7.3
authorRasmus Lerdorf <rasmus@lerdorf.com>
Tue, 21 May 2019 21:46:24 +0000 (14:46 -0700)
committerRasmus Lerdorf <rasmus@lerdorf.com>
Tue, 21 May 2019 21:46:24 +0000 (14:46 -0700)
* PHP-7.2:
  Fix precedence issue causing sub-second timeouts to be 0 in curl_multi_select

1  2 
ext/curl/multi.c patch | diff1 | diff2 | blob | history

diff --cc ext/curl/multi.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.