From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 9 Dec 2020 11:47:23 +0000 (+0100)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71b5f1446e45fd4ab9255fd3287cebeceaf45be3;p=php

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fixed bug #78154
---

71b5f1446e45fd4ab9255fd3287cebeceaf45be3
diff --cc NEWS
index 3d9fcb4a5b,d3c5e52139..526100616d
--- a/NEWS
+++ b/NEWS
@@@ -41,11 -34,9 +41,13 @@@ PH
      (Kamil Tekiela)
    . Fixed bug #63185 (nextRowset() ignores MySQL errors with native prepared
      statements). (Nikita)
+   . Fixed bug #78152 (PDO::exec() - Bad error handling with multiple commands).
+     (Nikita)
  
 +- Phar:
 +  . Fixed bug #73809 (Phar Zip parse crash - mmap fail). (cmb)
 +  . Fixed #75102 (`PharData` says invalid checksum for valid tar). (cmb)
 +
  - Phpdbg:
    . Fixed bug #76813 (Access violation near NULL on source operand). (cmb)