com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/zip/php _zip.h
| From: | Remi Collet | Date: | Fri, 14 Oct 2016 15:31:26 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/zip/php _zip.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-95096@lists.php.net to get a copy of this message | ||
Commit: 20b1029e4cb2f3092ed6aff7f1b4df130e950c23
Author: Remi Collet <remi@php.net> Fri, 14 Oct 2016 17:31:26 +0200
Parents: 2cc3aeb4b98bcbc9572041b2f7d3276aabd51aae f1cf340e19658e51f9b2037c5efd408d0660ea60
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=20b1029e4cb2f3092ed6aff7f1b4df130e950c23
Log:
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
bump ext/zip version
Changed paths:
MM ext/zip/php_zip.h
Diff:
diff --cc ext/zip/php_zip.h
index 4e77932,3bc0cce..ef861a4
--- a/ext/zip/php_zip.h
+++ b/ext/zip/php_zip.h
@@@ -37,9 -37,24 +37,9 @@@ extern zend_module_entry zip_module_ent
#define ZIP_OVERWRITE ZIP_TRUNCATE
#endif
- #define PHP_ZIP_VERSION "1.13.4"
+ #define PHP_ZIP_VERSION "1.13.5"
-#ifndef Z_SET_REFCOUNT_P
-# if PHP_MAJOR_VERSION < 6 && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION <
3)
-# define Z_SET_REFCOUNT_P(pz, rc) pz->refcount = rc
-# define Z_UNSET_ISREF_P(pz) pz->is_ref = 0
-# endif
-#endif
-
-/* {{{ ZIP_OPENBASEDIR_CHECKPATH(filename) */
-#if PHP_API_VERSION < 20100412
-# define ZIP_OPENBASEDIR_CHECKPATH(filename) \
- (PG(safe_mode) && (!php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR))) ||
php_check_open_basedir(filename)
-#else
-#define ZIP_OPENBASEDIR_CHECKPATH(filename) \
- php_check_open_basedir(filename)
-#endif
-/* }}} */
+#define ZIP_OPENBASEDIR_CHECKPATH(filename) php_check_open_basedir(filename)
typedef struct _ze_zip_rsrc {
struct zip *za;