From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 13 Jan 2020 12:22:43 +0000 (+0100)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.7RC1~312
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0cdd8cc53c94134d4d61829e07e38f99e73e272;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #79084: mysqlnd may fetch wrong column indexes with MYSQLI_BOTH
---

b0cdd8cc53c94134d4d61829e07e38f99e73e272
diff --cc NEWS
index b3815a3229,8f20e99211..ba070d30ae
--- a/NEWS
+++ b/NEWS
@@@ -6,24 -6,15 +6,28 @@@ PH
    . Fixed bug #79078 (Hypothetical use-after-free in curl_multi_add_handle()).
      (cmb)
  
+ - MySQLnd:
+   . Fixed bug #79084 (mysqlnd may fetch wrong column indexes with MYSQLI_BOTH).
+     (cmb)
+ 
 -23 Jan 2020, PHP 7.3.14
 +23 Jan 2020, PHP 7.4.2
  
 -- Core
 +- Core:
 +  . Preloading support on Windows has been disabled. (Nikita)
 +  . Fixed bug #79022 (class_exists returns True for classes that are not ready
 +    to be used). (Laruence)
 +  . Fixed bug #78929 (plus signs in cookie values are converted to spaces).
 +    (Alexey Kachalin)
 +  . Fixed bug #78973 (Destructor during CV freeing causes segfault if opline
 +    never saved). (Nikita)
 +  . Fixed bug #78776 (Abstract method implementation from trait does not check
 +    "static"). (Nikita)
    . Fixed bug #78999 (Cycle leak when using function result as temporary).
      (Dmitry)
 +  . Fixed bug #79008 (General performance regression with PHP 7.4 on Windows).
 +    (cmb)
 +  . Fixed bug #79002 (Serializing uninitialized typed properties with __sleep
 +    makes unserialize throw). (Nikita)
  
  - CURL:
    . Fixed bug #79033 (Curl timeout error with specific url and post). (cmb)