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/16141] plupload chunk_size incorrect when 'unlimited' is involved.

Browse source 
Change get_chunk_size() calculation to correctly calculate limits without
letting a zero "unlimited" value always win.  Also ensure get_chunk_size()
can only return zero if all of the limits were in fact set to unlimited.

PHPBB3-16141
This commit is contained in:
EA117 2019-08-28 20:22:33 -05:00
parent 4cdfb3f4ed
commit 73537bcc7d
1 changed files with 20 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
phpBB/phpbb/plupload/plupload.php
View file

@ -276,8 +276,14 @@ class plupload
} }
/** /**
* Checks various php.ini values and the maximum file size to determine * Checks various php.ini values to determine the maximum chunk
* the maximum size chunks a file can be split up into for upload * size a file should be split into for upload.
*
* The intention is to calculate a value which reflects whatever
* the most restrictive limit is set to. And to then set the chunk
* size to half that value, to ensure any required transfer overhead
* and POST data remains well within the limit. Or, if all of the
* limits are set to unlimited, the chunk size will also be unlimited.
* *
* @return int * @return int
*/ */
@ -285,48 +291,31 @@ class plupload
{ {
$max = 0; $max = 0;
$limit = $this->php_ini->getBytes('memory_limit'); // unlimited is -1 for memory_limit. 0 should be an invalid configuration.
$limit_memory = $this->php_ini->getBytes('memory_limit');
// unlimited is -1 for memory_limit. 0 would be an invalid configuration. if ($limit_memory > 0)
if ($limit > 0)
{ {
$max = $limit; $max = $limit_memory;
} }
// For all remaining limits, 0 means "unlimited". // For all remaining limits, 0 means "unlimited".
// For each limit, if there is a non-unlimited value to $limit_upload = $this->php_ini->getBytes('upload_max_filesize');
// apply, apply the limit if it's less than whatever non-
// unlimited max value is currently set. Also, apply the
// limit if the current max value is otherwise unlimited.
$limit = $this->php_ini->getBytes('upload_max_filesize'); if ($limit_upload > 0)
if ($limit > 0)
{ {
$max = min($limit, max($max, $limit)); $max = min($limit_upload, $max ? $max : $limit_upload);
} }
$limit = $this->php_ini->getBytes('post_max_size'); $limit_post = $this->php_ini->getBytes('post_max_size');
if ($limit > 0) if ($limit_post > 0)
{ {
$max = min($limit, max($max, $limit)); $max = min($limit_post, $max ? $max : $limit_post);
} }
$limit = $this->config['max_filesize']; // $config['max_filesize'] is not a limiter to chunk size.
if ($limit > 0)
{
$max = min($limit, max($max, $limit));
}
// Only if every limit was 0/unlimited will we still
// have a zero value in $max at this point.
// Use half of the maximum possible to leave plenty of
// room for other POST data and be well under limits.
return floor($max / 2); return floor($max / 2);
} }