Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
	ext/zip/php_zip.c

diff --cc ext/zip/php_zip.c
index c31ace1f8dbd6f39bc76c84611423c885aa8e9af,ccd0467fd353f0f5c2d8834a51ab217aa6053e0d..ff3e60e4a917980e698a4d06861035e4d394b366
--- 1/ext/zip/php_zip.c
--- 2/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@@ -2668,7 -2713,7 +2668,7 @@@ static ZIPARCHIVE_METHOD(extractTo
  
                for (i = 0; i < filecount; i++) {
                        char *file = (char*)zip_get_name(intern, i, ZIP_FL_UNCHANGED);
-                       if (!php_zip_extract_file(intern, pathto, file, strlen(file))) {
 -                      if (!file || !php_zip_extract_file(intern, pathto, file, strlen(file) TSRMLS_CC)) {
++                      if (!file || !php_zip_extract_file(intern, pathto, file, strlen(file))) {
                                        RETURN_FALSE;
                        }
                }