cvs: php4 /main rfc1867.c
| From: | Ilia Alshanetsky | Date: | Wed, 05 Mar 2003 17:00:10 +0000 |
| Subject: | cvs: php4 /main rfc1867.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-19394@lists.php.net to get a copy of this message | ||
iliaa Wed Mar 5 12:00:10 2003 EDT
Modified files:
/php4/main rfc1867.c
Log:
Fixed bug #22550 (overflow protection for upload_max_filesize ini setting).
Index: php4/main/rfc1867.c
diff -u php4/main/rfc1867.c:1.134 php4/main/rfc1867.c:1.135
--- php4/main/rfc1867.c:1.134 Thu Feb 20 17:21:49 2003
+++ php4/main/rfc1867.c Wed Mar 5 12:00:09 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: rfc1867.c,v 1.134 2003/02/20 22:21:49 rasmus Exp $ */
+/* $Id: rfc1867.c,v 1.135 2003/03/05 17:00:09 iliaa Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -861,7 +861,7 @@
while (!cancel_upload && (blen = multipart_buffer_read(mbuff, buff, sizeof(buff)
TSRMLS_CC)))
{
- if (total_bytes > PG(upload_max_filesize)) {
+ if (PG(upload_max_filesize) > 0 && total_bytes > PG(upload_max_filesize)) {
sapi_module.sapi_error(E_WARNING, "upload_max_filesize of %ld bytes exceeded - file
[%s=%s] not saved", PG(upload_max_filesize), param, filename);
cancel_upload = UPLOAD_ERROR_A;
} else if (max_file_size && (total_bytes > max_file_size)) {