diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-06-09 16:54:04 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-06-09 16:54:43 +0200 |
| commit | 3c12c41927f6612bb59a8ed5edde9e27991a3b21 (patch) | |
| tree | 8c5fa981d3544e3b7863a1450e3297ef40967a29 | |
| parent | 85657b486f863368dd891410d59d6c1878b753ae (diff) | |
| parent | 7ac0fb5ae48b2513c8949780c2b067be7bfdceb0 (diff) | |
| download | php-git-3c12c41927f6612bb59a8ed5edde9e27991a3b21.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix possibly unsupported timercmp() usage
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | main/network.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -10,6 +10,7 @@ PHP NEWS . Fixed bug #79657 ("yield from" hangs when invalid value encountered). (Nikita) . Fixed bug #79683 (Fake reflection scope affects __toString()). (Nikita) + . Fixed possibly unsupported timercmp() usage. (cmb) - Filter: . Fixed bug #73527 (Invalid memory access in php_filter_strip). (cmb) diff --git a/main/network.c b/main/network.c index 04da866d27..f2c54ed3b0 100644 --- a/main/network.c +++ b/main/network.c @@ -920,7 +920,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 { |