Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #79497: Fix php_openssl_subtract_timeval()

diff --cc NEWS
index 9afe0d67346678d57252e6bccddc51fc0ab16c8a,8f00881b2956b82ae38d16754befa5eb4a06033d..a94ab2ddc8cea538b46740358672feefe0144996
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -19,9 -15,10 +19,13 @@@ PH
    . 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)
 +
  - Standard:
    . Fixed bug #79468 (SIGSEGV when closing stream handle with a stream filter
      appended). (dinosaur)

diff --cc ext/openssl/xp_ssl.c
Simple merge