Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix possibly unsupported timercmp() usage
This commit is contained in:
Christoph M. Becker 2020-06-09 16:56:35 +02:00
commit 34ede22fd8

View File

@ -918,7 +918,7 @@ skip_bind:
if (timeout) {
gettimeofday(&time_now, NULL);
if (timercmp(&time_now, &limit_time, >=)) {
if (!timercmp(&time_now, &limit_time, <)) {
/* time limit expired; don't attempt any further connections */
fatal = 1;
} else {