makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 06:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10908] Download files only up to max_upload_filesize if limit is 0

Browse source 
PHPBB3-10908
This commit is contained in:
Nils Adermann 2012-05-29 14:27:25 +02:00
parent efa96e1817
commit 13f30e8d9d
1 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
phpBB/includes/functions_upload.php
View file

@ -751,6 +751,31 @@ class fileupload
$filename = $url['path']; $filename = $url['path'];
$filesize = 0; $filesize = 0;
$remote_max_filesize = $this->max_filesize;
if (!$remote_max_filesize)
{
$max_filesize = @ini_get('upload_max_filesize');
if (!empty($max_filesize))
{
$unit = strtolower(substr($max_filesize, -1, 1));
$remote_max_filesize = (int) $max_filesize;
switch ($unit)
{
case 'g':
$remote_max_filesize *= 1024;
// no break
case 'm':
$remote_max_filesize *= 1024;
// no break
case 'k':
$remote_max_filesize *= 1024;
// no break
}
}
}
$errno = 0; $errno = 0;
$errstr = ''; $errstr = '';
@ -779,9 +804,9 @@ class fileupload
$block = @fread($fsock, 1024); $block = @fread($fsock, 1024);
$filesize += strlen($block); $filesize += strlen($block);
if ($this->max_filesize && $filesize > $this->max_filesize) if ($remote_max_filesize && $filesize > $remote_max_filesize)
{ {
$max_filesize = get_formatted_filesize($this->max_filesize, false); $max_filesize = get_formatted_filesize($remote_max_filesize, false);
$file = new fileerror(sprintf($user->lang[$this->error_prefix . 'WRONG_FILESIZE'], $max_filesize['value'], $max_filesize['unit'])); $file = new fileerror(sprintf($user->lang[$this->error_prefix . 'WRONG_FILESIZE'], $max_filesize['value'], $max_filesize['unit']));
return $file; return $file;
@ -807,9 +832,9 @@ class fileupload
{ {
$length = (int) str_replace('content-length: ', '', strtolower($line)); $length = (int) str_replace('content-length: ', '', strtolower($line));
if ($length && $length > $this->max_filesize) if ($remote_max_filesize && $length && $length > $remote_max_filesize)
{ {
$max_filesize = get_formatted_filesize($this->max_filesize, false); $max_filesize = get_formatted_filesize($remote_max_filesize, false);
$file = new fileerror(sprintf($user->lang[$this->error_prefix . 'WRONG_FILESIZE'], $max_filesize['value'], $max_filesize['unit'])); $file = new fileerror(sprintf($user->lang[$this->error_prefix . 'WRONG_FILESIZE'], $max_filesize['value'], $max_filesize['unit']));
return $file; return $file;