diff options
| author | Anatol Belski <ab@php.net> | 2016-05-30 10:16:12 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-05-30 10:32:43 +0200 |
| commit | 2c80459c24c7e124239b61d3773c076fc38b10d2 (patch) | |
| tree | fbd21dbbad0ae2a85d6a7932c73f603eb2f19553 | |
| parent | 1690dcb827e2b50eb575b1c6acadab0b8f248723 (diff) | |
| download | php-git-2c80459c24c7e124239b61d3773c076fc38b10d2.tar.gz | |
Expose missing flags from libzip at least >= 0.11.x
These are helpful with reading/writing zips containing non UTF-8
filenames to mitigate possibly changed libzip behaviors.
Partial cherry-pick of 893c2405ff34250ffefbbc1d223de4df6c154c8a
| -rw-r--r-- | ext/zip/php_zip.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 7c9adf4af7..88bb518442 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -3038,6 +3038,24 @@ static PHP_MINIT_FUNCTION(zip) REGISTER_ZIP_CLASS_CONST_LONG("FL_NODIR", ZIP_FL_NODIR); REGISTER_ZIP_CLASS_CONST_LONG("FL_COMPRESSED", ZIP_FL_COMPRESSED); REGISTER_ZIP_CLASS_CONST_LONG("FL_UNCHANGED", ZIP_FL_UNCHANGED); + +#ifdef ZIP_FL_ENC_GUESS + /* Default filename encoding policy. */ + REGISTER_ZIP_CLASS_CONST_LONG("FL_ENC_GUESS", ZIP_FL_ENC_GUESS); +#endif +#ifdef ZIP_FL_ENC_RAW + REGISTER_ZIP_CLASS_CONST_LONG("FL_ENC_RAW", ZIP_FL_ENC_RAW); +#endif +#ifdef ZIP_FL_ENC_STRICT + REGISTER_ZIP_CLASS_CONST_LONG("FL_ENC_STRICT", ZIP_FL_ENC_STRICT); +#endif +#ifdef ZIP_FL_ENC_UTF_8 + REGISTER_ZIP_CLASS_CONST_LONG("FL_ENC_UTF_8", ZIP_FL_ENC_UTF_8); +#endif +#ifdef ZIP_FL_ENC_CP437 + REGISTER_ZIP_CLASS_CONST_LONG("FL_ENC_CP437", ZIP_FL_ENC_CP437); +#endif + REGISTER_ZIP_CLASS_CONST_LONG("CM_DEFAULT", ZIP_CM_DEFAULT); REGISTER_ZIP_CLASS_CONST_LONG("CM_STORE", ZIP_CM_STORE); REGISTER_ZIP_CLASS_CONST_LONG("CM_SHRINK", ZIP_CM_SHRINK); |