diff options
| author | Remi Collet <remi@php.net> | 2018-06-12 09:31:41 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2018-06-12 09:31:41 +0200 |
| commit | 075e6854399755c6128b37e328f6b5e568a5b6b4 (patch) | |
| tree | 4352ca018ff68735e835c1bb26ba636c5ed369f3 | |
| parent | 7dcfa839c935096706d257d2bf8f9940b78b2903 (diff) | |
| download | php-git-075e6854399755c6128b37e328f6b5e568a5b6b4.tar.gz | |
Add OPSYS_CPM constant as documented and to match libzip naming
| -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 02482d2219..6444853b8b 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -3255,7 +3255,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 1d8653bca5..2fd6115576 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) |