From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Thu, 18 Mar 2021 14:16:01 +0000 (+0100)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97cfdcd73b4d4816610c61011f02cfa788fee046;p=php

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #80783: PDO ODBC truncates BLOB records at every 256th byte
---

97cfdcd73b4d4816610c61011f02cfa788fee046
diff --cc NEWS
index 07451ebd00,d1001e22a2..1d9924c541
--- a/NEWS
+++ b/NEWS
@@@ -5,23 -5,16 +5,27 @@@ PH
  - DOM:
    . Fixed bug #66783 (UAF when appending DOMDocument to element). (cmb)
  
 +- FFI:
 +  . Fixed bug #80847 (CData structs with fields of type struct can't be passed
 +    as C function argument). (Nickolas Daniel da Silva, Dmitry)
 +
 +- Opcache:
 +  . Fixed bug #80839 (PHP problem with JIT). (Dmitry)
 +  . Fixed bug #80861 (erronous array key overflow in 2D array with JIT).
 +    (Dmitry)
 +
+ - PDO_ODBC:
+   . Fixed bug #80783 (PDO ODBC truncates BLOB records at every 256th byte).
+     (cmb)
+ 
 -01 Apr 2021, PHP 7.4.17
 +01 Apr 2021, PHP 8.0.4
  
  - Core:
 -  . Fixed bug #80781 (Error handler that throws ErrorException infinite loop).
 -    (Nikita)
    . Fixed bug #75776 (Flushing streams with compression filter is broken). (cmb)
 +  . Fixed bug #80811 (Function exec without $output but with $restult_code
 +    parameter crashes). (Nikita)
 +  . Fixed bug #80814 (threaded mod_php won't load on FreeBSD: No space
 +    available for static Thread Local Storage). (Dmitry)
  
  - Dba:
    . Fixed bug #80817 (dba_popen() may cause segfault during RSHUTDOWN). (cmb)