summaryrefslogtreecommitdiff
path: root/ext/zip/php_zip.c
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2006-09-15 12:12:25 +0000
committerPierre Joye <pajoye@php.net>2006-09-15 12:12:25 +0000
commita0aabccac6c0e992184ced3fac73d0ccfd672d06 (patch)
treed677834d1b45833e5bb471216040c7f11f59b710 /ext/zip/php_zip.c
parent04da0582846db07dde5b6e5242ca80df9ea109cf (diff)
downloadphp-git-a0aabccac6c0e992184ced3fac73d0ccfd672d06.tar.gz
- MFH: PECL Bug #8700, zipArchive::getFromIndex() fails
Diffstat (limited to 'ext/zip/php_zip.c')
-rw-r--r--ext/zip/php_zip.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index e684de1417..279bac2858 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -1744,7 +1744,7 @@ static void php_zip_get_from(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */
char *filename;
int filename_len;
- long index;
+ long index = -1;
long flags = 0;
long len = 0;
@@ -1778,8 +1778,12 @@ static void php_zip_get_from(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */
if (len < 1) {
len = sb.size;
}
+ if (index >= 0) {
+ zf = zip_fopen_index(intern, index, flags);
+ } else {
+ zf = zip_fopen(intern, filename, flags);
+ }
- zf = zip_fopen(intern, filename, flags);
if (zf == NULL) {
RETURN_FALSE;
}