diff options
author | Xinchen Hui <laruence@php.net> | 2013-11-05 18:47:12 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@php.net> | 2013-11-05 18:47:12 +0800 |
commit | 63dba7ec9d7ce1ec5e2d48742c71ce66db973b93 (patch) | |
tree | 3f2ad6160551e39c221a6dadf0794623f74b73dd /ext/phar/zip.c | |
parent | 906d3ae0edb1c371f4ad73585ef25337f8e0ef97 (diff) | |
download | php-git-63dba7ec9d7ce1ec5e2d48742c71ce66db973b93.tar.gz |
Remove outdate codes, make it clearer, although just a bit..
Diffstat (limited to 'ext/phar/zip.c')
-rw-r--r-- | ext/phar/zip.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/ext/phar/zip.c b/ext/phar/zip.c index 6ba745e9cb..e3b64859b8 100644 --- a/ext/phar/zip.c +++ b/ext/phar/zip.c @@ -578,10 +578,6 @@ foundit: /* construct actual offset to file start - local extra_len can be different from central extra_len */ entry.offset = entry.offset_abs = sizeof(local) + entry.header_offset + PHAR_GET_16(local.filename_len) + PHAR_GET_16(local.extra_len); -#if PHP_VERSION_ID < 50207 - /* work around Bug #46147 */ - fp->writepos = fp->readpos = 0; -#endif php_stream_seek(fp, entry.offset, SEEK_SET); /* these next lines should be for php < 5.2.6 after 5.3 filters are fixed */ fp->writepos = 0; @@ -605,9 +601,6 @@ foundit: if (!(entry.uncompressed_filesize = php_stream_copy_to_mem(fp, &actual_alias, entry.uncompressed_filesize, 0)) || !actual_alias) { pefree(entry.filename, entry.is_persistent); -#if PHP_VERSION_ID < 50207 - PHAR_ZIP_FAIL("unable to read in alias, truncated (PHP 5.2.7 and newer has a potential fix for this problem)"); -#endif PHAR_ZIP_FAIL("unable to read in alias, truncated"); } @@ -626,9 +619,6 @@ foundit: if (!(entry.uncompressed_filesize = php_stream_copy_to_mem(fp, &actual_alias, entry.uncompressed_filesize, 0)) || !actual_alias) { pefree(entry.filename, entry.is_persistent); -#if PHP_VERSION_ID < 50207 - PHAR_ZIP_FAIL("unable to read in alias, truncated (PHP 5.2.7 and newer has a potential fix for this problem)"); -#endif PHAR_ZIP_FAIL("unable to read in alias, truncated"); } |