archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-5.3' into PHP-5.4

Browse source 
* PHP-5.3:
  set current versions for libzip and zip ext
This commit is contained in:
Anatoliy Belsky 2012-06-07 22:37:32 +02:00
commit d24d5b62c1
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/zip/php_zip.c
View file

@ -2868,7 +2868,7 @@ static PHP_MINFO_FUNCTION(zip)
php_info_print_table_row(2, "Zip", "enabled"); php_info_print_table_row(2, "Zip", "enabled");
php_info_print_table_row(2, "Extension Version","$Id$"); 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, "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(); php_info_print_table_end();
} }

2
ext/zip/php_zip.h
View file

@ -30,7 +30,7 @@ extern zend_module_entry zip_module_entry;
#include "lib/zip.h" #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) #if ((PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 2) || PHP_MAJOR_VERSION >= 6)
# define PHP_ZIP_USE_OO 1 # define PHP_ZIP_USE_OO 1