Merge branch 'PHP-7.2' into PHP-7.3

diff --cc ext/opcache/ZendAccelerator.c
index 6f76fc9435f41c6050c3bac5b4b0c710f270d5e9,257f9b43f430cb6b17e8395e48f284d176f85302..de5175ebbe477c375ceaed7c251192cd203f410b
--- 1/ext/opcache/ZendAccelerator.c
--- 2/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -2503,6 -2357,9 +2503,7 @@@ static inline int accel_find_sapi(void
                "cli-server",
                "cgi-fcgi",
                "fpm-fcgi",
 -              "isapi",
 -              "apache2filter",
+               "fpmi-fcgi",
                "apache2handler",
                "litespeed",
                "uwsgi",