[php-src] master: Use PHP version for zip extension
Remi Collet <[email protected]>
| Newsgroups | gmane.comp.php.cvs.general |
|---|---|
| Message-ID | <[email protected]> |
Author: Remi Collet (remicollet)
Date: 2026-07-08T08:52:48+02:00
Commit: https://github.com/php/php-src/commit/8ae6a8f1d688e638494a559a634fd9568226977a
Raw diff: https://github.com/php/php-src/commit/8ae6a8f1d688e638494a559a634fd9568226977a.diff
Use PHP version for zip extension
Changed paths:
M ext/zip/php_zip.c
M ext/zip/php_zip.h
Diff:
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index 9bc801455ed6..4156a8deb861 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -3209,7 +3209,6 @@ static PHP_MINFO_FUNCTION(zip)
php_info_print_table_start();
php_info_print_table_row(2, "Zip", "enabled");
- php_info_print_table_row(2, "Zip version", PHP_ZIP_VERSION);
#ifdef HAVE_LIBZIP_VERSION
if (strcmp(LIBZIP_VERSION, zip_libzip_version())) {
php_info_print_table_row(2, "Libzip headers version", LIBZIP_VERSION);
diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h
index 408c29708231..e734c4628f02 100644
--- a/ext/zip/php_zip.h
+++ b/ext/zip/php_zip.h
@@ -37,7 +37,8 @@ extern zend_module_entry zip_module_entry;
/* Additional flags not from libzip */
#define ZIP_FL_OPEN_FILE_NOW (1u<<30)
-#define PHP_ZIP_VERSION "1.22.8"
+#include "php_version.h"
+#define PHP_ZIP_VERSION PHP_VERSION
#ifdef HAVE_LIBZIP_VERSION
#define LIBZIP_VERSION_STR zip_libzip_version()