summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-06-09 16:56:35 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2020-06-09 16:56:35 +0200
commit34ede22fd8a7a9cc8fad3b36e81dd371a6bc2504 (patch)
tree5329d636e22be0e7eb7b8a58fe3b7b4bc0a911f8
parent4b76a2ddb350b316153437fcae2efabbc37147f6 (diff)
parent3c12c41927f6612bb59a8ed5edde9e27991a3b21 (diff)
downloadphp-git-34ede22fd8a7a9cc8fad3b36e81dd371a6bc2504.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Fix possibly unsupported timercmp() usage
-rw-r--r--main/network.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/network.c b/main/network.c
index b8ed1a2ca1..336d311068 100644
--- a/main/network.c
+++ b/main/network.c
@@ -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 {