Skip to content

[pull] master from php:master #1166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 2, 2025
+9 −46
Merged

[pull] master from php:master #1166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,7 @@ PHP NEWS
- Zip:
. Fixed ZipArchive callback being called after executor has shut down.
(ilutov)
. Support minimum version for libzip dependency updated to 1.0.0.
(David Carlier)

<<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>
9 changes: 1 addition & 8 deletions ext/zip/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,11 @@ PHP_ARG_WITH([zip],
[Include Zip read/write support])])

if test "$PHP_ZIP" != "no"; then
PKG_CHECK_MODULES([LIBZIP], [libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0])
PKG_CHECK_MODULES([LIBZIP], [libzip >= 1.0.0 libzip != 1.3.1 libzip != 1.7.0])

PHP_EVAL_INCLINE([$LIBZIP_CFLAGS])
PHP_EVAL_LIBLINE([$LIBZIP_LIBS], [ZIP_SHARED_LIBADD])

PHP_CHECK_LIBRARY([zip], [zip_file_set_mtime],
[AC_DEFINE([HAVE_SET_MTIME], [1],
[Define to 1 if libzip library has the 'zip_file_set_mtime' function
(available since 1.0.0).])],
[AC_MSG_WARN([Libzip >= 1.0.0 needed for setting mtime])],
[$LIBZIP_LIBS])

PHP_CHECK_LIBRARY([zip], [zip_file_set_encryption],
[AC_DEFINE([HAVE_ENCRYPTION], [1],
[Define to 1 if libzip library has encryption support (available since
Expand Down
44 changes: 6 additions & 38 deletions ext/zip/php_zip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,17 +496,11 @@ static zend_long php_zip_status(ze_zip_object *obj) /* {{{ */
int zep = obj->err_zip; /* saved err if closed */

if (obj->za) {
#if LIBZIP_VERSION_MAJOR < 1
int syp;

zip_error_get(obj->za, &zep, &syp);
#else
zip_error_t *err;

err = zip_get_error(obj->za);
zep = zip_error_code_zip(err);
zip_error_fini(err);
#endif
}
return zep;
}
Expand All @@ -523,17 +517,11 @@ static zend_long php_zip_status_sys(ze_zip_object *obj) /* {{{ */
int syp = obj->err_sys; /* saved err if closed */

if (obj->za) {
#if LIBZIP_VERSION_MAJOR < 1
int zep;

zip_error_get(obj->za, &zep, &syp);
#else
zip_error_t *err;

err = zip_get_error(obj->za);
syp = zip_error_code_system(err);
zip_error_fini(err);
#endif
}
return syp;
}
Expand Down Expand Up @@ -1529,18 +1517,12 @@ PHP_METHOD(ZipArchive, close)
if (err) {
php_error_docref(NULL, E_WARNING, "%s", zip_strerror(intern));
/* Save error for property reader */
#if LIBZIP_VERSION_MAJOR < 1
zip_error_get(intern, &ze_obj->err_zip, &ze_obj->err_sys);
#else
{
zip_error_t *ziperr;

ziperr = zip_get_error(intern);
ze_obj->err_zip = zip_error_code_zip(ziperr);
ze_obj->err_sys = zip_error_code_system(ziperr);
zip_error_fini(ziperr);
}
#endif
zip_error_t *ziperr;

ziperr = zip_get_error(intern);
ze_obj->err_zip = zip_error_code_zip(ziperr);
ze_obj->err_sys = zip_error_code_system(ziperr);
zip_error_fini(ziperr);
zip_discard(intern);
} else {
ze_obj->err_zip = 0;
Expand Down Expand Up @@ -1601,10 +1583,6 @@ PHP_METHOD(ZipArchive, clearError)
PHP_METHOD(ZipArchive, getStatusString)
{
zval *self = ZEND_THIS;
#if LIBZIP_VERSION_MAJOR < 1
int zep, syp, len;
char error_string[128];
#endif
ze_zip_object *ze_obj;

if (zend_parse_parameters_none() == FAILURE) {
Expand All @@ -1613,15 +1591,6 @@ PHP_METHOD(ZipArchive, getStatusString)

ze_obj = Z_ZIP_P(self); /* not ZIP_FROM_OBJECT as we can use saved error after close */

#if LIBZIP_VERSION_MAJOR < 1
if (ze_obj->za) {
zip_error_get(ze_obj->za, &zep, &syp);
len = zip_error_to_str(error_string, 128, zep, syp);
} else {
len = zip_error_to_str(error_string, 128, ze_obj->err_zip, ze_obj->err_sys);
}
RETVAL_STRINGL(error_string, len);
#else
if (ze_obj->za) {
zip_error_t *err;

Expand All @@ -1636,7 +1605,6 @@ PHP_METHOD(ZipArchive, getStatusString)
RETVAL_STRING(zip_error_strerror(&err));
zip_error_fini(&err);
}
#endif
}
/* }}} */

Expand Down