mirror of
https://github.com/php/php-src.git
synced 2024-09-26 20:37:29 +00:00
More accurate max_file_size / upload_max_filesize (fixes #45124)
This commit is contained in:
parent
156553ed9a
commit
d4df205018
@ -1335,12 +1335,12 @@ var_done:
|
||||
}
|
||||
|
||||
|
||||
if (PG(upload_max_filesize) > 0 && total_bytes > PG(upload_max_filesize)) {
|
||||
if (PG(upload_max_filesize) > 0 && (total_bytes+blen) > PG(upload_max_filesize)) {
|
||||
#if DEBUG_FILE_UPLOAD
|
||||
sapi_module.sapi_error(E_NOTICE, "upload_max_filesize of %ld bytes exceeded - file [%r=%r] not saved", PG(upload_max_filesize), param, filename);
|
||||
#endif
|
||||
cancel_upload = UPLOAD_ERROR_A;
|
||||
} else if (max_file_size && (total_bytes > max_file_size)) {
|
||||
} else if (max_file_size && ((total_bytes+blen) > max_file_size)) {
|
||||
#if DEBUG_FILE_UPLOAD
|
||||
sapi_module.sapi_error(E_NOTICE, "MAX_FILE_SIZE of %ld bytes exceeded - file [%r=%r] not saved", max_file_size, param, filename);
|
||||
#endif
|
||||
@ -1882,12 +1882,12 @@ static SAPI_POST_HANDLER_FUNC(rfc1867_post_handler_legacy)
|
||||
}
|
||||
|
||||
|
||||
if (PG(upload_max_filesize) > 0 && total_bytes > PG(upload_max_filesize)) {
|
||||
if (PG(upload_max_filesize) > 0 && (total_bytes+blen) > PG(upload_max_filesize)) {
|
||||
#if DEBUG_FILE_UPLOAD
|
||||
sapi_module.sapi_error(E_NOTICE, "upload_max_filesize of %ld bytes exceeded - file [%s=%s] not saved", PG(upload_max_filesize), param, filename);
|
||||
#endif
|
||||
cancel_upload = UPLOAD_ERROR_A;
|
||||
} else if (max_file_size && (total_bytes > max_file_size)) {
|
||||
} else if (max_file_size && ((total_bytes+blen) > max_file_size)) {
|
||||
#if DEBUG_FILE_UPLOAD
|
||||
sapi_module.sapi_error(E_NOTICE, "MAX_FILE_SIZE of %ld bytes exceeded - file [%s=%s] not saved", max_file_size, param, filename);
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user