]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 18 Jul 2019 12:41:22 +0000 (14:41 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 18 Jul 2019 12:41:35 +0000 (14:41 +0200)
1  2 
NEWS
ext/curl/interface.c
ext/curl/multi.c
ext/curl/php_curl.h

diff --cc NEWS
index 5ce6212a0543e081d963b19eb205a8a3d71270b7,b0ba11ad8fd5ca915fa759ce56a5f8e96751019d..721773e4b884af885ce459d4b9efbc5cf2a92dd9
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,7 -1,11 +1,11 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2019, PHP 7.2.22
 +?? ??? ????, PHP 7.3.9
  
+ - Curl:
+   . Fixed bug #77946 (Bad cURL resources returned by curl_multi_info_read()).
+     (Abyr Valg)
  - Standard:
    . Fixed bug #69100 (Bus error from stream_copy_to_stream (file -> SSL stream)
      with invalid length). (Nikita)
Simple merge
Simple merge
Simple merge