diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-01-06 05:38:47 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-01-06 05:39:48 +0000 |
| commit | a49aaf9ab08af0d61addabe6bce92c61893820df (patch) | |
| tree | 1f4c63fbfab2dfade7add51d6bdabb424f7671a1 /ext/zip/php_zip.c | |
| parent | 12bbeaa45e3f2c4f3896b7e53f189e2fca5380df (diff) | |
| parent | c36ce04dd36c5d90363f843bc7fea1bb753cef93 (diff) | |
| download | php-git-a49aaf9ab08af0d61addabe6bce92c61893820df.tar.gz | |
Merge branch 'pull-request/1430' into PHP-7.0
* pull-request/1430:
Fix #70103: ZipArchive::addGlob ignores remove_all_path option
news entry for PR 1430
Diffstat (limited to 'ext/zip/php_zip.c')
| -rw-r--r-- | ext/zip/php_zip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index a920e86ddb..67204b08b4 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -1704,8 +1704,8 @@ static void php_zip_add_from_pattern(INTERNAL_FUNCTION_PARAMETERS, int type) /* entry_name = entry_name_buf; entry_name_len = strlen(entry_name); } else { - entry_name = Z_STRVAL_P(zval_file); - entry_name_len = Z_STRLEN_P(zval_file); + entry_name = file_stripped; + entry_name_len = file_stripped_len; } if (basename) { zend_string_release(basename); |