summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatoliy Belsky <ab@php.net>2012-06-19 17:17:11 +0200
committerAnatoliy Belsky <ab@php.net>2012-06-19 17:17:11 +0200
commit34bd1c941b4124f80ef25fdfbb08702f89913d68 (patch)
tree8555c0a7594a6387db73296a66851056ade4efb6
parent5c001d42d415eb376413e76d0b69efd1ef28e138 (diff)
parente793539678caf3ae1999602de0b3dcdbb9ae9cd2 (diff)
downloadphp-git-34bd1c941b4124f80ef25fdfbb08702f89913d68.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: sync zip ext version with pecl
-rw-r--r--ext/zip/php_zip.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h
index c9e88d652a..f848ade8bc 100644
--- a/ext/zip/php_zip.h
+++ b/ext/zip/php_zip.h
@@ -30,7 +30,7 @@ extern zend_module_entry zip_module_entry;
#include "lib/zip.h"
-#define PHP_ZIP_VERSION_STRING "1.9.2"
+#define PHP_ZIP_VERSION_STRING "1.11.0"
#if ((PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 2) || PHP_MAJOR_VERSION >= 6)
# define PHP_ZIP_USE_OO 1