diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-05-31 11:55:12 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-05-31 11:55:12 +0200 |
| commit | 7edb52b9be73a5e6e15a4b0bd2d408addcdeb917 (patch) | |
| tree | 434e5f3191b9daef754e7a2f288d69647299210a /phpBB/includes/functions_upload.php | |
| parent | 54bd800dabb189542b885a490c679efe615017b0 (diff) | |
| parent | 0261a9acffd47beb5b40bfa58d987e44b5ebf0c3 (diff) | |
| download | forums-7edb52b9be73a5e6e15a4b0bd2d408addcdeb917.tar forums-7edb52b9be73a5e6e15a4b0bd2d408addcdeb917.tar.gz forums-7edb52b9be73a5e6e15a4b0bd2d408addcdeb917.tar.bz2 forums-7edb52b9be73a5e6e15a4b0bd2d408addcdeb917.tar.xz forums-7edb52b9be73a5e6e15a4b0bd2d408addcdeb917.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10908] Document that 0 filesize configuration means limited by PHP
[ticket/10908] Download files only up to max_upload_filesize if limit is 0
Diffstat (limited to 'phpBB/includes/functions_upload.php')
| -rw-r--r-- | phpBB/includes/functions_upload.php | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index 71fe627ac8..f70e20e616 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -756,6 +756,31 @@ class fileupload $filename = $url['path']; $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; $errstr = ''; @@ -784,9 +809,9 @@ class fileupload $block = @fread($fsock, 1024); $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'])); return $file; @@ -812,9 +837,9 @@ class fileupload { $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'])); return $file; |