cvs: php4 /main rfc1867.c

sniper Fri Mar 29 21:58:19 2002 EDT Modified files: /php4/main rfc1867.c Log: Fixed a bug with file_uploads=off -> normal post variables not set. Index: php4/main/rfc1867.c diff -u php4/main/rfc1867.c:1.95 php4/main/rfc1867.c:1.96 --- php4/main/rfc1867.c:1.95 Sun Mar 10 06:03:04 2002 +++ php4/main/rfc1867.c Fri Mar 29 21:58:19 2002 @@ -16,7 +16,7 @@ | Jani Taskinen <sniper@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: rfc1867.c,v 1.95 2002/03/10 11:03:04 sesser Exp $ */ +/* $Id: rfc1867.c,v 1.96 2002/03/30 02:58:19 sniper Exp $ */ /* * This product includes software developed by the Apache Group @@ -591,12 +591,6 @@ FILE *fp; zend_llist header; - - if (!PG(file_uploads)) { - sapi_module.sapi_error(E_WARNING, "File uploads are disabled"); - return; - } - if (SG(request_info).content_length > SG(post_max_size)) { sapi_module.sapi_error(E_WARNING, "POST Content-Length of %d bytes exceeds the limit of %d bytes", SG(request_info).content_length, SG(post_max_size)); return; @@ -704,6 +698,13 @@ efree(param); efree(value); + continue; + } + + /* If file_uploads=off, skip the file part */ + if (!PG(file_uploads)) { + efree(filename); + efree(param); continue; }