From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 20 Apr 2020 08:26:11 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.7RC1~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a230b5a6c92ce816a7d660505e883a01065e4f9e;p=php

Merge branch 'PHP-7.3' into PHP-7.4

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

a230b5a6c92ce816a7d660505e883a01065e4f9e
diff --cc NEWS
index 9afe0d6734,8f00881b29..a94ab2ddc8
--- a/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)