diff options
| author | Remi Collet <remi@php.net> | 2020-01-29 14:25:16 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2020-01-29 14:25:16 +0100 |
| commit | bdcfdd4402b0b7c10a1ad27a5b7f8ac754886344 (patch) | |
| tree | a7b1c0c0a08e80cc384ea43713287cc43e3dd5ea | |
| parent | 6352e9a98925d375d0c2d3d8b0de66966d9522fc (diff) | |
| download | php-git-bdcfdd4402b0b7c10a1ad27a5b7f8ac754886344.tar.gz | |
zip: more constants
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/zip/php_zip.c | 24 |
2 files changed, 26 insertions, 1 deletions
@@ -55,7 +55,8 @@ PHP NEWS . Fixed bug #78969 (PASSWORD_DEFAULT should match PASSWORD_BCRYPT instead of being null). (kocsismate) - Zip: - . Add ZipArchive::CM_LZMA2 constant (since libzip 1.6.0). (remi) + . Add ZipArchive::CM_LZMA2 and ZipArchive::CM_XZ constants (since libzip 1.6.0). (remi) + . Add ZipArchive::ER_* missing constants. (remi) . Add ZipArchive::LIBZIP_VERSION constant. (remi) 23 Jan 2020, PHP 7.4.2 diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index bec14f7f77..c6ce639b88 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -3083,6 +3083,9 @@ static PHP_MINIT_FUNCTION(zip) #ifdef ZIP_CM_LZMA2 REGISTER_ZIP_CLASS_CONST_LONG("CM_LZMA2", ZIP_CM_LZMA2); #endif +#ifdef ZIP_CM_XZ + REGISTER_ZIP_CLASS_CONST_LONG("CM_XZ", ZIP_CM_XZ); +#endif REGISTER_ZIP_CLASS_CONST_LONG("CM_TERSE", ZIP_CM_TERSE); REGISTER_ZIP_CLASS_CONST_LONG("CM_LZ77", ZIP_CM_LZ77); REGISTER_ZIP_CLASS_CONST_LONG("CM_WAVPACK", ZIP_CM_WAVPACK); @@ -3113,6 +3116,27 @@ static PHP_MINIT_FUNCTION(zip) REGISTER_ZIP_CLASS_CONST_LONG("ER_INCONS", ZIP_ER_INCONS); /* N Zip archive inconsistent */ REGISTER_ZIP_CLASS_CONST_LONG("ER_REMOVE", ZIP_ER_REMOVE); /* S Can't remove file */ REGISTER_ZIP_CLASS_CONST_LONG("ER_DELETED", ZIP_ER_DELETED); /* N Entry has been deleted */ + REGISTER_ZIP_CLASS_CONST_LONG("ER_ENCRNOTSUPP", ZIP_ER_ENCRNOTSUPP);/* N Encryption method not supported */ + REGISTER_ZIP_CLASS_CONST_LONG("ER_RDONLY", ZIP_ER_RDONLY); /* N Read-only archive */ + REGISTER_ZIP_CLASS_CONST_LONG("ER_NOPASSWD", ZIP_ER_NOPASSWD); /* N Entry has been deleted */ + REGISTER_ZIP_CLASS_CONST_LONG("ER_WRONGPASSWD", ZIP_ER_WRONGPASSWD);/* N Wrong password provided */ +/* since 1.0.0 */ +#ifdef ZIP_ER_OPNOTSUPP + REGISTER_ZIP_CLASS_CONST_LONG("ER_OPNOTSUPP", ZIP_ER_OPNOTSUPP); /* N Operation not supported */ +#endif +#ifdef ZIP_ER_INUSE + REGISTER_ZIP_CLASS_CONST_LONG("ER_INUSE", ZIP_ER_INUSE); /* N Resource still in use */ +#endif +#ifdef ZIP_ER_TELL + REGISTER_ZIP_CLASS_CONST_LONG("ER_TELL", ZIP_ER_TELL); /* S Tell error */ +#endif +/* since 1.6.0 */ +#ifdef ZIP_ER_COMPRESSED_DATA + REGISTER_ZIP_CLASS_CONST_LONG("ER_COMPRESSED_DATA", ZIP_ER_COMPRESSED_DATA);/* N Compressed data invalid */ +#endif +#ifdef ZIP_ER_CANCELLED + REGISTER_ZIP_CLASS_CONST_LONG("ER_CANCELLED", ZIP_ER_CANCELLED); /* N Operation cancelled */ +#endif #ifdef ZIP_OPSYS_DEFAULT REGISTER_ZIP_CLASS_CONST_LONG("OPSYS_DOS", ZIP_OPSYS_DOS); |