Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #71848: getimagesize with $imageinfo returns false

diff --cc NEWS
index 38098ef40ebfa7e0c024cec41825bdb192b6914c,d21ff66990adddb62f5cd0d1d536cf085039e8aa..76b457bdc136c1adfa9bc81307c3e21d3c670496
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -41,16 -32,9 +41,17 @@@ PH
  - Standard:
    . Fixed bug #76505 (array_merge_recursive() is duplicating sub-array keys).
      (Laruence)
+   . Fixed bug #71848 (getimagesize with $imageinfo returns false). (cmb)
  
 -22 Jun 2019, PHP 7.1.19
 +- ZIP:
 +  . Fixed bug #76461 (OPSYS_Z_CPM defined instead of OPSYS_CPM).
 +    (Dennis Birkholz, Remi)
 +
 +07 Jun 2018, PHP 7.2.7
 +
 +- Core:
 +  . Fixed bug #76337 (segfault when opcache enabled + extension use
 +    zend_register_class_alias). (xKhorasan)
  
  - CLI Server:
    . Fixed bug #76333 (PHP built-in server does not find files if root path

diff --cc ext/standard/image.c
Simple merge