diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-20 10:26:11 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-20 10:26:22 +0200 |
| commit | a230b5a6c92ce816a7d660505e883a01065e4f9e (patch) | |
| tree | 96cc3c26b9387b34a46ec64b8708944a526c5f80 | |
| parent | b2376be81ddd8b3401acde47443744a50c25a4bb (diff) | |
| parent | 94e09bfe558656d3f1470dc960b900a951b0dffc (diff) | |
| download | php-git-a230b5a6c92ce816a7d660505e883a01065e4f9e.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79497: Fix php_openssl_subtract_timeval()
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/openssl/xp_ssl.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -19,6 +19,10 @@ PHP NEWS . Fixed bug #79441 (Segfault in mb_chr() if internal encoding is unsupported). (Girgias) +- OpenSSL: + . Fixed bug #79497 (stream_socket_client() throws an unknown error sometimes + with <1s timeout). (Joe Cai) + - SPL: . Fixed bug #69264 (__debugInfo() ignored while extending SPL classes). (cmb) diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 635bcbf330..c6e9a29b45 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -2253,8 +2253,8 @@ static struct timeval php_openssl_subtract_timeval(struct timeval a, struct time difference.tv_usec = a.tv_usec - b.tv_usec; if (a.tv_usec < b.tv_usec) { - b.tv_sec -= 1L; - b.tv_usec += 1000000L; + difference.tv_sec -= 1L; + difference.tv_usec += 1000000L; } return difference; |