diff options
| author | Remi Collet <remi@php.net> | 2014-01-29 14:01:03 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-01-29 14:01:03 +0100 |
| commit | cbb109777062c73d3860536b4d59909c4d0454bd (patch) | |
| tree | b4709efee55da260abe743e7bf203f39687268c2 | |
| parent | 83c302840e50ac7fbc3386b71a7995a2c25c1c7b (diff) | |
| parent | f06f4c9254c28844c11748c67dbb1dbf2628622b (diff) | |
| download | php-git-cbb109777062c73d3860536b4d59909c4d0454bd.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
zip extension version 1.12.4
| -rw-r--r-- | ext/zip/lib/zipconf.h | 2 | ||||
| -rw-r--r-- | ext/zip/php_zip.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/zip/lib/zipconf.h b/ext/zip/lib/zipconf.h index 1cb5c0467a..955d85b4ef 100644 --- a/ext/zip/lib/zipconf.h +++ b/ext/zip/lib/zipconf.h @@ -7,7 +7,7 @@ This file was generated automatically by CMake
based on ../cmake-zipconf.h.in.
*/
-#define LIBZIP_VERSION "0.11.1"
+#define LIBZIP_VERSION "0.11.2"
/* #undef HAVE_INTTYPES_H_LIBZIP */
#if defined(_WIN32)
diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h index 591b907aa8..ffe4530415 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-dev" +#define PHP_ZIP_VERSION "1.12.4" #if ((PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 2) || PHP_MAJOR_VERSION >= 6) # define PHP_ZIP_USE_OO 1 |