cvs: pear /File_Archive Archive.php /File_Archive/Archive/Writer Zip.php

vincentlascaux Mon Aug 15 14:03:04 2005 EDT Modified files: /pear/File_Archive Archive.php /pear/File_Archive/Archive/Writer Zip.php Log: Bug #5095 http://cvs.php.net/diff.php/pear/File_Archive/Archive.php?r1=1.82&r2=1.83&ty=u Index: pear/File_Archive/Archive.php diff -u pear/File_Archive/Archive.php:1.82 pear/File_Archive/Archive.php:1.83 --- pear/File_Archive/Archive.php:1.82 Tue Jul 26 21:25:12 2005 +++ pear/File_Archive/Archive.php Mon Aug 15 14:03:02 2005 @@ -27,7 +27,7 @@ * @author Vincent Lascaux <vincentlascaux@php.net> * @copyright 1997-2005 The PHP Group * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version CVS: $Id: Archive.php,v 1.82 2005/07/27 01:25:12 vincentlascaux Exp $ + * @version CVS: $Id: Archive.php,v 1.83 2005/08/15 18:03:02 vincentlascaux Exp $ * @link http://pear.php.net/package/File_Archive */ @@ -377,8 +377,9 @@ } else { require_once "File/Archive/Reader/File.php"; - $parsedURL = parse_url($std); - $realPath = isset($parsedURL['path']) ? $parsedURL['path'] : ''; +// $parsedURL = parse_url($std); +// $realPath = isset($parsedURL['path']) ? $parsedURL['path'] : ''; + $realPath = $std; // Try to find a file with a known extension in the path ( // (to manage URLs like archive.tar/directory/file) @@ -406,7 +407,7 @@ //Build the URL back, with the new path to a file with an archive extension // or to a file / directory is is_file / is_dir cant be used (HTTP, or $source !== null) - $parsedURL['path'] = $file; +/* $parsedURL['path'] = $file; $file = ''; //Rebuild the real URL with the smaller path @@ -432,7 +433,7 @@ } if (isset($parsedURL['fragment'])) { $file .= '#'.$parsedURL['fragment']; - } + } */ $reachable = $file; //If we are reading from the file system http://cvs.php.net/diff.php/pear/File_Archive/Archive/Writer/Zip.php?r1=1.19&r2=1.20&ty=u Index: pear/File_Archive/Archive/Writer/Zip.php diff -u pear/File_Archive/Archive/Writer/Zip.php:1.19 pear/File_Archive/Archive/Writer/Zip.php:1.20 --- pear/File_Archive/Archive/Writer/Zip.php:1.19 Thu Jun 23 07:36:18 2005 +++ pear/File_Archive/Archive/Writer/Zip.php Mon Aug 15 14:03:03 2005 @@ -25,7 +25,7 @@ * @author Vincent Lascaux <vincentlascaux@php.net> * @copyright 1997-2005 The PHP Group * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version CVS: $Id: Zip.php,v 1.19 2005/06/23 11:36:18 vincentlascaux Exp $ + * @version CVS: $Id: Zip.php,v 1.20 2005/08/15 18:03:03 vincentlascaux Exp $ * @link http://pear.php.net/package/File_Archive */ @@ -93,7 +93,6 @@ function getMTime($time) { $mtime = ($time !== null ? getdate($time) : getdate()); - $mtime = getdate(mktime(0, 0, 0, 12, 32, 1997)); $mtime = preg_replace( "/(..){1}(..){1}(..){1}(..){1}/", "\\x\\4\\x\\3\\x\\2\\x\\1",