Skip to content

Commit 3c12c41

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix possibly unsupported timercmp() usage
2 parents 85657b4 + 7ac0fb5 commit 3c12c41

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ PHP NEWS
1010
. Fixed bug #79657 ("yield from" hangs when invalid value encountered).
1111
(Nikita)
1212
. Fixed bug #79683 (Fake reflection scope affects __toString()). (Nikita)
13+
. Fixed possibly unsupported timercmp() usage. (cmb)
1314

1415
- Filter:
1516
. Fixed bug #73527 (Invalid memory access in php_filter_strip). (cmb)

main/network.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,7 @@ php_socket_t php_network_connect_socket_to_host(const char *host, unsigned short
920920
if (timeout) {
921921
gettimeofday(&time_now, NULL);
922922

923-
if (timercmp(&time_now, &limit_time, >=)) {
923+
if (!timercmp(&time_now, &limit_time, <)) {
924924
/* time limit expired; don't attempt any further connections */
925925
fatal = 1;
926926
} else {

0 commit comments

Comments
 (0)