Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Improve fix for #72520
  #72482, revert for 5.6 for now

Conflicts:
	ext/zip/zip_stream.c

diff --cc ext/gd/libgd/gd.c
Simple merge

diff --cc ext/zip/zip_stream.c
index d586233deeb9bbfdb5702e62eb6123954b26e601,a0a34757a38c92b7477924af2fa0fec940fe17a8..244ff4dfa5528535ef47a6dae5d2c0d8ce43fc24
--- 1/ext/zip/zip_stream.c
--- 2/ext/zip/zip_stream.c
+++ b/ext/zip/zip_stream.c
@@@ -124,13 -116,14 +124,13 @@@ static int php_zip_ops_stat(php_stream 
  {
        struct zip_stat sb;
        const char *path = stream->orig_path;
-       int path_len = strlen(stream->orig_path);
+       size_t path_len = strlen(stream->orig_path);
 -      char *file_basename;
 -      size_t file_basename_len;
        char file_dirname[MAXPATHLEN];
        struct zip *za;
        char *fragment;
-       int fragment_len;
+       size_t fragment_len;
        int err;
 +      zend_string *file_basename;
  
        fragment = strchr(path, '#');
        if (!fragment) {