From: Jakub Zelenka <bukka@php.net>
Date: Sun, 21 Mar 2021 19:00:38 +0000 (+0000)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=713b82131b9bb75f1fa3bdc487f13086aa590e20;p=php

Merge branch 'PHP-7.4' into PHP-8.0
---

713b82131b9bb75f1fa3bdc487f13086aa590e20
diff --cc NEWS
index 430c07b951,eef3b0302c..5fda640c33
--- a/NEWS
+++ b/NEWS
@@@ -5,15 -5,10 +5,19 @@@ 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)
 +
+ - FPM:
+   . Fixed bug #80024 (Duplication of info about inherited socket after pool
+     removing). (Jakub Zelenka)
+ 
 +- 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)