From: Remi Collet <remi@php.net>
Date: Mon, 22 Feb 2016 17:18:43 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~585
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29cc01082993cabd12f95088f0970c657e03b852;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  update bundled libzip to 1.1.2
---

29cc01082993cabd12f95088f0970c657e03b852
diff --cc ext/zip/php_zip.h
index dd1600f651,f5df19e79a..ad65fdeb9d
--- 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.0"
+ #define PHP_ZIP_VERSION "1.13.2"
  
 -#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;