diff options
| author | Remi Collet <remi@php.net> | 2020-02-03 10:09:27 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2020-02-03 10:09:27 +0100 |
| commit | 5eb9cffa145651ab7a128319b1fffdade836c596 (patch) | |
| tree | fe15c77f65eb64c958cb93e09b804e48e84718b1 /ext/zip/php_zip.c | |
| parent | 98a8ab1389ea045e328bc000408e96768fafbab1 (diff) | |
| parent | 3375cfe0cf8755cb167a2eb551177d3284c5d92e (diff) | |
| download | php-git-5eb9cffa145651ab7a128319b1fffdade836c596.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
NEWS
Fixed bug #73119 Wrong return for ZipArchive::addEmptyDir Method
Diffstat (limited to 'ext/zip/php_zip.c')
| -rw-r--r-- | ext/zip/php_zip.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 74d992a5f6..eadbd0e76e 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -1581,11 +1581,12 @@ static ZIPARCHIVE_METHOD(addEmptyDir) if (idx >= 0) { RETVAL_FALSE; } else { - if (zip_add_dir(intern, (const char *)s) == -1) { + if (zip_dir_add(intern, (const char *)s, 0) == -1) { RETVAL_FALSE; + } else { + zip_error_clear(intern); + RETVAL_TRUE; } - zip_error_clear(intern); - RETVAL_TRUE; } if (s != dirname) { @@ -3020,6 +3021,9 @@ static PHP_MINIT_FUNCTION(zip) REGISTER_ZIP_CLASS_CONST_LONG("EXCL", ZIP_EXCL); REGISTER_ZIP_CLASS_CONST_LONG("CHECKCONS", ZIP_CHECKCONS); REGISTER_ZIP_CLASS_CONST_LONG("OVERWRITE", ZIP_OVERWRITE); +#ifdef ZIP_RDONLY + REGISTER_ZIP_CLASS_CONST_LONG("RDONLY", ZIP_RDONLY); +#endif REGISTER_ZIP_CLASS_CONST_LONG("FL_NOCASE", ZIP_FL_NOCASE); REGISTER_ZIP_CLASS_CONST_LONG("FL_NODIR", ZIP_FL_NODIR); |