Merge branch 'PHP-7.4' into PHP-8.0

diff --cc NEWS
index 38e86d2619be622304514f0812459661f5df519c,80c3cdd9c73a4dfa05178bc53704ba44287dc66b..25ac8cad25b8cbc537c476aa3fafae6e482ecd39
--- 1/NEWS
--- 2/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)
  

diff --cc sapi/fpm/fpm/fpm_main.c
Simple merge

diff --cc sapi/fpm/tests/response.inc
Simple merge