diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-04-05 12:51:59 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-04-05 12:51:59 +0000 |
| commit | 343e40efb539159bff58339cae63279e2a7cf9c2 (patch) | |
| tree | 114140210c76d51c9946300ec02fa676aebf6ad5 /user/php7/zip-glob-pathc.patch | |
| parent | 0b10cc74d61cd3b81c5f3b54d44bc6c3e1723a03 (diff) | |
| parent | af409aaaaf71ee25115f59e64bf8ea566d278176 (diff) | |
| download | packages-343e40efb539159bff58339cae63279e2a7cf9c2.tar.gz packages-343e40efb539159bff58339cae63279e2a7cf9c2.tar.bz2 packages-343e40efb539159bff58339cae63279e2a7cf9c2.tar.xz packages-343e40efb539159bff58339cae63279e2a7cf9c2.zip | |
Merge branch 'bump/php744' into 'master'
Bump PHP to 7.4.4
See merge request adelie/packages!423
Diffstat (limited to 'user/php7/zip-glob-pathc.patch')
| -rw-r--r-- | user/php7/zip-glob-pathc.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/user/php7/zip-glob-pathc.patch b/user/php7/zip-glob-pathc.patch new file mode 100644 index 000000000..74b81754a --- /dev/null +++ b/user/php7/zip-glob-pathc.patch @@ -0,0 +1,15 @@ +Upstream: https://github.com/php/php-src/pull/5311 + +--- php-7.4.4/ext/zip/php_zip.c 2020-03-17 10:40:30.000000000 +0000 ++++ php-7.4.4/ext/zip/php_zip.c 2020-03-27 15:28:13.259857804 -0500 +@@ -606,8 +606,9 @@ int php_zip_glob(char *pattern, int pattern_len, zend_long flags, zval *return_v + add_next_index_string(return_value, globbuf.gl_pathv[n]+cwd_skip); + } + ++ ret = globbuf.gl_pathc; + globfree(&globbuf); +- return globbuf.gl_pathc; ++ return ret; + #else + zend_throw_error(NULL, "Glob support is not available"); + return 0; |