com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/zip/php _zip.c
| From: | Xinchen Hui | Date: | Tue, 09 Feb 2016 15:35:55 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/zip/php _zip.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90977@lists.php.net to get a copy of this message | ||
Commit: 33417bf409f22b4f15d46d09a63bfdd7c4351999
Author: Xinchen Hui <laruence@gmail.com> Tue, 9 Feb 2016 23:35:55 +0800
Parents: a219fc175333f11c0e2fe90efd25e7d8fee5fdfb c339d5217aa1966689424c911c8f455652861bf7
Branches: PHP-7.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=33417bf409f22b4f15d46d09a63bfdd7c4351999
Log:
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/zip/php_zip..c
Changed paths:
MM ext/zip/php_zip.c
Diff:
diff --cc ext/zip/php_zip.c
index c31ace1,ccd0467..ff3e60e
--- 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;
}
}