com php-src: Merge branch 'PHP-5.6': ext/zip/php_zip.c
| From: | Remi Collet | Date: | Mon, 07 Sep 2015 11:55:19 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/zip/php_zip.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88940@lists.php.net to get a copy of this message | ||
Commit: a5d6cf788ea9554cb7dc0b53ab84fc614048e98d
Author: Remi Collet <remi@php.net> Mon, 7 Sep 2015 13:55:19 +0200
Parents: aa352a34fd1077995ec159ba30a6cf62c70e64c7 debfc866d2971c69d4f47662fb4bb70feb0c0007
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a5d6cf788ea9554cb7dc0b53ab84fc614048e98d
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix build
Changed paths:
MM ext/zip/php_zip.c
Diff:
diff --cc ext/zip/php_zip.c
index 99adb72,c203148..f68534c
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@@ -1501,12 -1622,12 +1501,12 @@@ static ZIPARCHIVE_METHOD(close
RETURN_FALSE;
}
- ZIP_FROM_OBJECT(intern, this);
+ ZIP_FROM_OBJECT(intern, self);
- ze_obj = (ze_zip_object*) zend_object_store_get_object(this TSRMLS_CC);
+ ze_obj = Z_ZIP_P(self);
- if (err = zip_close(intern)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, zip_strerror(intern));
+ if ((err = zip_close(intern))) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zip_strerror(intern));
zip_discard(intern);
}