sfox Sun Jun 22 14:46:11 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar tar.c Log: - Revert the tar.c part of the inode calculation fix - All tests now pass under win32, please test under *nix/osx (4 known fails at present) http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tar.c?r1=1.55.2.14&r2=1.55.2.15&diff_format=u Index: php-src/ext/phar/tar.c diff -u php-src/ext/phar/tar.c:1.55.2.14 php-src/ext/phar/tar.c:1.55.2.15 --- php-src/ext/phar/tar.c:1.55.2.14 Sun Jun 22 00:50:32 2008 +++ php-src/ext/phar/tar.c Sun Jun 22 14:46:10 2008 @@ -223,11 +223,6 @@ zend_get_hash_value, NULL, (zend_bool)myphar->is_persistent); zend_hash_init(&myphar->virtual_dirs, 4 + (totalsize >> 11), zend_get_hash_value, NULL, (zend_bool)myphar->is_persistent); - myphar->fname = pestrndup(fname, fname_len, myphar->is_persistent); -#ifdef PHP_WIN32 - phar_unixify_path_separators(myphar->fname, fname_len); -#endif - myphar->fname_len = fname_len; myphar->is_tar = 1; /* remember whether this entire phar was compressed with gz/bzip2 */ myphar->flags = compression; @@ -549,6 +544,11 @@ return FAILURE; } + myphar->fname = pestrndup(fname, fname_len, myphar->is_persistent); +#ifdef PHP_WIN32 + phar_unixify_path_separators(myphar->fname, fname_len); +#endif + myphar->fname_len = fname_len; myphar->fp = fp; p = strrchr(myphar->fname, '/');
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php