From: Xinchen Hui <laruence@gmail.com>
Date: Tue, 9 Feb 2016 15:35:55 +0000 (+0800)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.4RC1~38^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33417bf409f22b4f15d46d09a63bfdd7c4351999;p=php

Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
	ext/zip/php_zip.c
---

33417bf409f22b4f15d46d09a63bfdd7c4351999
diff --cc ext/zip/php_zip.c
index c31ace1f8d,ccd0467fd3..ff3e60e4a9
--- a/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;
  			}
  		}