diff options
| author | Max Rees <maxcrees@me.com> | 2020-03-25 07:26:01 +0000 |
|---|---|---|
| committer | Max Rees <maxcrees@me.com> | 2020-04-05 12:22:26 +0000 |
| commit | 1898956d4fb51404a527e909230781848a9d3118 (patch) | |
| tree | 809d21e6b0aa650fd626123b63b43b5cf64bf133 /user/php7/zip-glob-pathc.patch | |
| parent | 7f8d4d642ad643f553e0fe74c0d48d59c81d178c (diff) | |
| download | packages-1898956d4fb51404a527e909230781848a9d3118.tar.gz packages-1898956d4fb51404a527e909230781848a9d3118.tar.bz2 packages-1898956d4fb51404a527e909230781848a9d3118.tar.xz packages-1898956d4fb51404a527e909230781848a9d3118.zip | |
user/php7: bump to 7.4.4
* Use system libgd
* Use system oniguruma
* Upstream has migrated from pcre to pcre2
* Drop comments about extensions that aren't being built (imap, recode,
sodium, tidy)
* Drop php7-wddx (has been removed from core upstream)
* Drop php7-litespeed (I don't think anyone uses this)
* Pin subpackage versions to main package
* Fix _extensions_by_load_order so all extensions are tested
* This increases the test suite size from ~ 9000 to ~ 15000
* Add additional API/ABI checks from Fedora
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; |