diff options
| author | Remi Collet <remi@php.net> | 2018-06-12 09:36:14 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2018-06-12 09:36:14 +0200 |
| commit | 25188727b17dd7244b06946a49226b35ed2b1101 (patch) | |
| tree | eea40d8b279cbb868064f538bb9bb959bd7fcbe5 /ext/zip | |
| parent | 72104d2b6ecbbabd18de15f10739be5ce3dc9ce0 (diff) | |
| parent | eb2a3c6c654a85cb8d6a4c3bf77869cb2044ad5c (diff) | |
| download | php-git-25188727b17dd7244b06946a49226b35ed2b1101.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
NEWS
Add OPSYS_CPM constant as documented and to match libzip naming
Diffstat (limited to 'ext/zip')
| -rw-r--r-- | ext/zip/php_zip.c | 3 | ||||
| -rw-r--r-- | ext/zip/php_zip.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 0aaef7d21a..d355ca3425 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -3258,7 +3258,8 @@ static PHP_MINIT_FUNCTION(zip) REGISTER_ZIP_CLASS_CONST_LONG("OPSYS_OS_2", ZIP_OPSYS_OS_2); REGISTER_ZIP_CLASS_CONST_LONG("OPSYS_MACINTOSH", ZIP_OPSYS_MACINTOSH); REGISTER_ZIP_CLASS_CONST_LONG("OPSYS_Z_SYSTEM", ZIP_OPSYS_Z_SYSTEM); - REGISTER_ZIP_CLASS_CONST_LONG("OPSYS_Z_CPM", ZIP_OPSYS_CPM); + REGISTER_ZIP_CLASS_CONST_LONG("OPSYS_Z_CPM", ZIP_OPSYS_CPM); // typo kept for BC + REGISTER_ZIP_CLASS_CONST_LONG("OPSYS_CPM", ZIP_OPSYS_CPM); REGISTER_ZIP_CLASS_CONST_LONG("OPSYS_WINDOWS_NTFS", ZIP_OPSYS_WINDOWS_NTFS); REGISTER_ZIP_CLASS_CONST_LONG("OPSYS_MVS", ZIP_OPSYS_MVS); REGISTER_ZIP_CLASS_CONST_LONG("OPSYS_VSE", ZIP_OPSYS_VSE); diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h index 4442e29cec..231e3aa995 100644 --- a/ext/zip/php_zip.h +++ b/ext/zip/php_zip.h @@ -37,7 +37,7 @@ extern zend_module_entry zip_module_entry; #define ZIP_OVERWRITE ZIP_TRUNCATE #endif -#define PHP_ZIP_VERSION "1.15.2" +#define PHP_ZIP_VERSION "1.15.3" #define ZIP_OPENBASEDIR_CHECKPATH(filename) php_check_open_basedir(filename) |