From: Uwe Schindler <thetaphi@php.net>
Date: Mon, 4 Apr 2005 15:00:13 +0000 (+0000)
Subject: Bug #32491 (File upload error - unable to create a temporary file) - Changing file... 
X-Git-Tag: php-5.0.5RC1~489
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7842bb07c54266f63d4090a67eba135ebdcf61f;p=php

Bug #32491 (File upload error - unable to create a temporary file) - Changing file upload from stdio to posix
---

diff --git a/NEWS b/NEWS
index 32685ef96c..405da5f8b7 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ PHP                                                                        NEWS
 - Fixed bug #32560 (configure looks for incorrect db2 library). (Tony)
 - Fixed bug #32530 (chunk_split() does not append endstr if chunklen is  
   longer then the original string). (Ilia)
+- Fixed bug #32491 (File upload error - unable to create a temporary file).
+  (Uwe Schindler)
 - Fixed bug #28839 (SIGSEGV in interactive mode (php -a)).
   (kameshj at fastmail dot fm)
 
diff --git a/main/rfc1867.c b/main/rfc1867.c
index cc54e4e54a..adcfc10099 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -784,7 +784,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
 	zend_bool magic_quotes_gpc;
 	multipart_buffer *mbuff;
 	zval *array_ptr = (zval *) arg;
-	FILE *fp;
+	int fd=-1;
 	zend_llist header;
 
 	if (SG(request_info).content_length > SG(post_max_size)) {
@@ -969,8 +969,8 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
 
 			if (!skip_upload) {
 				/* Handle file */
-				fp = php_open_temporary_file(PG(upload_tmp_dir), "php", &temp_filename TSRMLS_CC);
-				if (!fp) {
+				fd = php_open_temporary_fd(PG(upload_tmp_dir), "php", &temp_filename TSRMLS_CC);
+				if (fd==-1) {
 					sapi_module.sapi_error(E_WARNING, "File upload error - unable to create a temporary file");
 					cancel_upload = UPLOAD_ERROR_E;
 				}
@@ -1001,7 +1001,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
 #endif
 					cancel_upload = UPLOAD_ERROR_B;
 				} else if (blen > 0) {
-					wlen = fwrite(buff, 1, blen, fp);
+					wlen = write(fd, buff, blen);
 			
 					if (wlen < blen) {
 #if DEBUG_FILE_UPLOAD
@@ -1013,8 +1013,8 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
 					}
 				} 
 			}
-			if (fp) { /* may not be initialized if file could not be created */
-				fclose(fp);
+			if (fd!=-1) { /* may not be initialized if file could not be created */
+				close(fd);
 			}
 
 #if DEBUG_FILE_UPLOAD