summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatoliy Belsky <ab@php.net>2012-06-07 20:37:32 (GMT)
committerAnatoliy Belsky <ab@php.net>2012-06-07 20:37:32 (GMT)
commitd24d5b62c1d55af4059c9a220c25cc080895b20c (patch)
tree31028ef441ec3e51755e97b1af71f222f1cac4f7
parent7907dc4d666e9879997c7a9b18074da9d05dadbd (diff)
parentbaacc2cb135280f18f6c908b4b99160fba262c6a (diff)
downloadphp-d24d5b62c1d55af4059c9a220c25cc080895b20c.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: set current versions for libzip and zip ext
-rw-r--r--ext/zip/php_zip.c2
-rw-r--r--ext/zip/php_zip.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index f1d5d3d..74f868b 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -2868,7 +2868,7 @@ static PHP_MINFO_FUNCTION(zip)
php_info_print_table_row(2, "Zip", "enabled");
php_info_print_table_row(2, "Extension Version","$Id$");
php_info_print_table_row(2, "Zip version", PHP_ZIP_VERSION_STRING);
- php_info_print_table_row(2, "Libzip version", "0.9.0");
+ php_info_print_table_row(2, "Libzip version", LIBZIP_VERSION);
php_info_print_table_end();
}
diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h
index a321d90..c9e88d6 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.1"
+#define PHP_ZIP_VERSION_STRING "1.9.2"
#if ((PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 2) || PHP_MAJOR_VERSION >= 6)
# define PHP_ZIP_USE_OO 1