pajoye Fri Sep 15 12:10:50 2006 UTC Added files: /php-src/ext/zip/tests bug8700.phpt
Modified files: /php-src/ext/zip php_zip.c Log: - PECL Bug #8700, zipArchive::getFromIndex() fails http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.14&r2=1.15&diff_format=u Index: php-src/ext/zip/php_zip.c diff -u php-src/ext/zip/php_zip.c:1.14 php-src/ext/zip/php_zip.c:1.15 --- php-src/ext/zip/php_zip.c:1.14 Tue Sep 12 12:04:03 2006 +++ php-src/ext/zip/php_zip.c Fri Sep 15 12:10:50 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_zip.c,v 1.14 2006/09/12 12:04:03 pajoye Exp $ */ +/* $Id: php_zip.c,v 1.15 2006/09/15 12:10:50 pajoye Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1719,7 +1719,7 @@ char *filename; int filename_len; - long index; + long index = -1; long flags = 0; long len = 0; @@ -1753,8 +1753,12 @@ 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; } @@ -1958,7 +1962,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Zip", "enabled"); - php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.14 2006/09/12 12:04:03 pajoye Exp $"); + php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.15 2006/09/15 12:10:50 pajoye Exp $"); php_info_print_table_row(2, "Zip version", "2.0.0"); php_info_print_table_row(2, "Libzip version", "0.7.1"); http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/bug8700.phpt?view=markup&rev=1.1 Index: php-src/ext/zip/tests/bug8700.phpt +++ php-src/ext/zip/tests/bug8700.phpt --TEST-- bug #8700, getFromIndex(0) fails --SKIPIF-- <?php /* $Id: bug8700.phpt,v 1.1 2006/09/15 12:10:50 pajoye Exp $ */ if(!extension_loaded('zip')) die('skip'); ?> --FILE-- <?php $thisdir = dirname(__FILE__); $filename = $thisdir . "/bug8009.zip"; $zip = new ZipArchive(); if ($zip->open($filename) === FALSE) { exit("cannot open $filename\n"); } $contents_from_idx = $zip->getFromIndex(0); $contents_from_name = $zip->getFromName('1.txt'); if ($contents_from_idx != $contents_from_name) { echo "failed:"; var_dump($content_from_idx, $content_from_name); } $zip->close(); echo "status: " . $zip->status . "\n"; echo "\n"; --EXPECT-- status: 0 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php