iliaa Fri Dec 6 19:48:21 2002 EDT Modified files: (Branch: PHP_4_3) /php4/main rfc1867.c Log: MFH Index: php4/main/rfc1867.c diff -u php4/main/rfc1867.c:1.122.2.3 php4/main/rfc1867.c:1.122.2.4 --- php4/main/rfc1867.c:1.122.2.3 Fri Nov 22 17:30:38 2002 +++ php4/main/rfc1867.c Fri Dec 6 19:48:21 2002 @@ -16,7 +16,7 @@ | Jani Taskinen <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: rfc1867.c,v 1.122.2.3 2002/11/22 22:30:38 iliaa Exp $ */ +/* $Id: rfc1867.c,v 1.122.2.4 2002/12/07 00:48:21 iliaa Exp $ */ /* * This product includes software developed by the Apache Group @@ -686,7 +686,7 @@ { char *boundary, *s=NULL, *boundary_end = NULL, *start_arr=NULL, *array_index=NULL; char *temp_filename=NULL, *lbuf=NULL, *abuf=NULL; - int boundary_len=0, total_bytes=0, cancel_upload=0, is_arr_upload=0, array_len=0, max_file_size=0; + int boundary_len=0, total_bytes=0, cancel_upload=0, is_arr_upload=0, +array_len=0, max_file_size=0, skip_upload=0; zval *http_post_files=NULL; zend_bool magic_quotes_gpc; multipart_buffer *mbuff; @@ -831,14 +831,23 @@ SAFE_RETURN; } - /* Handle file */ - fp = php_open_temporary_file(PG(upload_tmp_dir), "php", &temp_filename TSRMLS_CC); - if (!fp) { - efree(param); - efree(filename); - sapi_module.sapi_error(E_WARNING, "File upload error - unable to create a temporary file"); - SAFE_RETURN; + if (!skip_upload) { + /* Handle file */ + fp = php_open_temporary_file(PG(upload_tmp_dir), +"php", &temp_filename TSRMLS_CC); + if (!fp) { + sapi_module.sapi_error(E_WARNING, "File upload +error - unable to create a temporary file"); + skip_upload = 1; + } } + if (skip_upload) { + if (param) { + efree(param); + } + if (filename) { + efree(filename); + } + continue; + } total_bytes = 0; cancel_upload = 0;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php