cvs: php-src /main rfc1867.c
| From: | Arnaud Le Blanc | Date: | Sun, 07 Sep 2008 14:17:24 +0000 |
| Subject: | cvs: php-src /main rfc1867.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-52957@lists.php.net to get a copy of this message | ||
lbarnaud Sun Sep 7 14:17:24 2008 UTC
Modified files:
/php-src/main rfc1867.c
Log:
More accurate max_file_size / upload_max_filesize (fixes #45124)
http://cvs.php.net/viewvc.cgi/php-src/main/rfc1867.c?r1=1.196&r2=1.197&diff_format=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.196 php-src/main/rfc1867.c:1.197
--- php-src/main/rfc1867.c:1.196 Sat Sep 6 17:17:44 2008
+++ php-src/main/rfc1867.c Sun Sep 7 14:17:24 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: rfc1867.c,v 1.196 2008/09/06 17:17:44 lbarnaud Exp $ */
+/* $Id: rfc1867.c,v 1.197 2008/09/07 14:17:24 lbarnaud Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -1335,12 +1335,12 @@
}
- 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 @@
}
- 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