Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Make MAX_IFD_NESTING_LEVEL an actual nesting level

diff --cc ext/exif/exif.c
index 0edc8cadcdb85fbb808d55ecb6a54e6212099287,1ebc972d8d44c38e3764fd2fcbb7aa3ca4a9e934..9db4a2831bba3e790a15e7973e78528665290d88
--- 1/ext/exif/exif.c
--- 2/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@@ -2022,7 -1941,7 +2023,8 @@@ typedef struct 
        int             read_thumbnail;
        int             read_all;
        int             ifd_nesting_level;
+       int             ifd_count;
 +      int             num_errors;
        /* internal */
        file_section_list       file;
  } image_info_type;
@@@ -4446,7 -4433,7 +4469,8 @@@ static int exif_read_from_impl(image_in
  
  
        ImageInfo->ifd_nesting_level = 0;
+       ImageInfo->ifd_count = 0;
 +      ImageInfo->num_errors = 0;
  
        /* Scan the headers */
        ret = exif_scan_FILE_header(ImageInfo);