diff options
author | Remi Collet <remi@php.net> | 2015-04-15 17:38:01 +0200 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2015-04-15 17:38:01 +0200 |
commit | c48bf6e55c2abf0b8f3fb359971375821673f776 (patch) | |
tree | 93be4aeb61ab383f6a87bce5833946367d2e6810 /ext | |
parent | 6aee1ee4a187b1653b4e702104e55332ef897691 (diff) | |
parent | 60b3526bfb5c9fe37d04ff69d0f5e7ea74ed947e (diff) | |
download | php-git-c48bf6e55c2abf0b8f3fb359971375821673f776.tar.gz |
Merge branch 'PHP-5.6'
* PHP-5.6:
bump zip release to match pecl version
Diffstat (limited to 'ext')
-rw-r--r-- | ext/zip/php_zip.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h index 31099053ef..e68c9fcec9 100644 --- a/ext/zip/php_zip.h +++ b/ext/zip/php_zip.h @@ -38,7 +38,7 @@ extern zend_module_entry zip_module_entry; #define ZIP_OVERWRITE ZIP_TRUNCATE #endif -#define PHP_ZIP_VERSION "1.12.4" +#define PHP_ZIP_VERSION "1.12.5" #ifndef Z_SET_REFCOUNT_P # if PHP_MAJOR_VERSION < 6 && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 3) |