[php-src] master: Merge branch 'PHP-7.4' into PHP-8.0
| From: | Christoph M. Becker | Date: | Tue, 27 Apr 2021 11:45:39 +0000 |
| Subject: | [php-src] master: Merge branch 'PHP-7.4' into PHP-8.0 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-115876@lists.php.net to get a copy of this message | ||
Author: Christoph M. Becker (cmb69)
Date: 2021-04-27T13:43:12+02:00
Commit: https://github.com/php/php-src/commit/3e518e069dbf3245065f0ef9de13ada77f5205d7
Raw diff: https://github.com/php/php-src/commit/3e518e069dbf3245065f0ef9de13ada77f5205d7.diff
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Add missing NEWS entry for #80710
Changed paths:
M NEWS
Diff:
diff --git a/NEWS b/NEWS
index 619642645359..822d0ba8f820 100644
--- a/NEWS
+++ b/NEWS
@@ -41,6 +41,9 @@ PHP NEWS
. Fixed bug #80880 (SSL_read on shutdown, ftp/proc_open). (cmb, Jakub
Zelenka)
+- Imap:
+ . Fixed bug #80710 (imap_mail_compose() header injection). (cmb, Stas)
+
- LibXML:
. Fixed bug #73533 (Invalid memory access in php_libxml_xmlCheckUTF8). (cmb)