From: Jakub Zelenka <bukka@php.net>
Date: Sun, 13 Dec 2020 18:42:11 +0000 (+0000)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d254078020c74c9bde1312fe68f66ce80971697d;p=php

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

d254078020c74c9bde1312fe68f66ce80971697d
diff --cc NEWS
index 38e86d2619,80c3cdd9c7..25ac8cad25
--- a/NEWS
+++ b/NEWS
@@@ -14,11 -18,10 +14,15 @@@ PH
  - Fileinfo:
    . Fixed bug #77961 (finfo_open crafted magic parsing SIGABRT). (cmb)
  
+ - FPM:
+   . Fixed bug #69625 (FPM returns 200 status on request without
+     SCRIPT_FILENAME env). (Jakub Zelenka)
+ 
 +- IMAP
 +  . Fixed bug #80438 (imap_msgno() incorrectly warns and return false on valid UIDs in PHP 8.0.0). (girgias)
 +  . Fix a regression with valid UIDs in imap_savebody() (girgias)
 +  . Make warnings for invalid message numbers/UIDs between functions consistent (girgias)
 +
  - Intl:
    . Fixed bug #80425 (MessageFormatAdapter::getArgTypeList redefined). (Nikita)