summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--ext/openssl/xp_ssl.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index adbaf6223e..8f00881b29 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,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)
+
- Standard:
. Fixed bug #79468 (SIGSEGV when closing stream handle with a stream filter
appended). (dinosaur)
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 88d86c2096..ea29a34058 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -2209,8 +2209,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;