git-svn-id: file:///svn/phpbb/trunk@7877 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2007-07-13 03:16:59 +00:00
parent c1531d9925
commit b011f383f9
2 changed files with 18 additions and 11 deletions

View file

@ -221,6 +221,7 @@ p a {
<li>[Fix] Correctly deliver avatar if readfile function has been disabled (Bug #13309)</li> <li>[Fix] Correctly deliver avatar if readfile function has been disabled (Bug #13309)</li>
<li>[Fix] Display php information page with the correct direction (Bug #12557)</li> <li>[Fix] Display php information page with the correct direction (Bug #12557)</li>
<li>[Fix] Increased the number of style objects (styles, templates, themes and imagesets) possible from 127 to 65535 for MySQL (Bug #13179)</li> <li>[Fix] Increased the number of style objects (styles, templates, themes and imagesets) possible from 127 to 65535 for MySQL (Bug #13179)</li>
<li>[Fix] Although theoretically impossible in our code, removed the chance of (Bug #13327)</li>
</ul> </ul>

View file

@ -12,7 +12,7 @@
* Class for handling archives (compression/decompression) * Class for handling archives (compression/decompression)
* @package phpBB3 * @package phpBB3
*/ */
class compress class compress
{ {
var $fp = 0; var $fp = 0;
@ -434,12 +434,15 @@ class compress_zip extends compress
header("Content-Type: $mimetype; name=\"$download_name.zip\""); header("Content-Type: $mimetype; name=\"$download_name.zip\"");
header("Content-disposition: attachment; filename=$download_name.zip"); header("Content-disposition: attachment; filename=$download_name.zip");
$fp = fopen("{$phpbb_root_path}store/$filename.zip", 'rb'); $fp = @fopen("{$phpbb_root_path}store/$filename.zip", 'rb');
while ($buffer = fread($fp, 1024)) if ($fp)
{ {
echo $buffer; while ($buffer = fread($fp, 1024))
{
echo $buffer;
}
fclose($fp);
} }
fclose($fp);
} }
} }
@ -546,8 +549,8 @@ class compress_tar extends compress
{ {
$fzwrite = ($this->isbz && function_exists('bzwrite')) ? 'bzwrite' : (($this->isgz && @extension_loaded('zlib')) ? 'gzwrite' : 'fwrite'); $fzwrite = ($this->isbz && function_exists('bzwrite')) ? 'bzwrite' : (($this->isgz && @extension_loaded('zlib')) ? 'gzwrite' : 'fwrite');
// Symbolizes that there are no more files // The end of a tar archive ends in two records of all NULLs (1024 bytes of \0)
$fzwrite($this->fp, str_repeat("\0", 512)); $fzwrite($this->fp, str_repeat("\0", 1024));
} }
$fzclose($this->fp); $fzclose($this->fp);
@ -648,12 +651,15 @@ class compress_tar extends compress
header("Content-Type: $mimetype; name=\"$download_name$this->type\""); header("Content-Type: $mimetype; name=\"$download_name$this->type\"");
header("Content-disposition: attachment; filename=$download_name$this->type"); header("Content-disposition: attachment; filename=$download_name$this->type");
$fp = fopen("{$phpbb_root_path}store/$filename$this->type", 'rb'); $fp = @fopen("{$phpbb_root_path}store/$filename$this->type", 'rb');
while ($buffer = fread($fp, 1024)) if ($fp)
{ {
echo $buffer; while ($buffer = fread($fp, 1024))
{
echo $buffer;
}
fclose($fp);
} }
fclose($fp);
} }
} }