From ae911242a18ed9253b81749fd1f9902adec8f776 Mon Sep 17 00:00:00 2001
From: Jani Taskinen <jani@php.net>
Date: Tue, 29 Dec 2009 19:25:09 +0000
Subject: [PATCH] - Sync with HEAD

---
 main/rfc1867.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/main/rfc1867.c b/main/rfc1867.c
index 6d6ae7eafe..64acaa2945 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -263,7 +263,7 @@ static void register_http_post_files_variable_ex(char *var, zval *val, zval *htt
 }
 /* }}} */
 
-static int unlink_filename(char **filename TSRMLS_DC) /* {{{ */
+static int unlink_filename(char **filename TSRMLS_DC) /* {{{ */
 {
 	VCWD_UNLINK(*filename);
 	return 0;
@@ -304,7 +304,7 @@ typedef struct {
 
 /*
  * Fill up the buffer with client data.
- * returns number of bytes added to buffer.
+ * Returns number of bytes added to buffer.
  */
 static int fill_buffer(multipart_buffer *self TSRMLS_DC)
 {
@@ -417,7 +417,7 @@ static char *next_line(multipart_buffer *self)
 	return line;
 }
 
-/* returns the next CRLF terminated line from the client */
+/* Returns the next CRLF terminated line from the client */
 static char *get_line(multipart_buffer *self TSRMLS_DC)
 {
 	char* ptr = next_line(self);
@@ -665,7 +665,7 @@ look_for_quote:
  * Search for a string in a fixed-length byte string.
  * If partial is true, partial matches are allowed at the end of the buffer.
  * Returns NULL if not found, or a pointer to the start of the first match.
-*/
+ */
 static void *php_ap_memstr(char *haystack, int haystacklen, char *needle, int needlen, int partial)
 {
 	int len = haystacklen;
@@ -747,12 +747,14 @@ static char *multipart_buffer_read_body(multipart_buffer *self, unsigned int *le
 		total_bytes += read_bytes;
 	}
 
-	if (out) out[total_bytes] = '\0';
+	if (out) {
+		out[total_bytes] = '\0';
+	}
 	*len = total_bytes;
 
 	return out;
 }
-/* }}} */
+/* }}} */
 
 /*
  * The combined READER/HANDLER
@@ -773,7 +775,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
 #endif
 	multipart_buffer *mbuff;
 	zval *array_ptr = (zval *) arg;
-	int fd=-1;
+	int fd = -1;
 	zend_llist header;
 	void *event_extra_data = NULL;
 	int llen = 0;
@@ -860,7 +862,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
 	while (!multipart_buffer_eof(mbuff TSRMLS_CC))
 	{
 		char buff[FILLUNIT];
-		char *cd = NULL,*param = NULL, *filename = NULL, *tmp = NULL;
+		char *cd = NULL, *param = NULL, *filename = NULL, *tmp = NULL;
 		size_t blen = 0, wlen = 0;
 		off_t offset;
 
@@ -1084,7 +1086,6 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
 #endif
 					cancel_upload = UPLOAD_ERROR_B;
 				} else if (blen > 0) {
-
 					wlen = write(fd, buff, blen);
 
 					if (wlen == -1) {
@@ -1119,7 +1120,6 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
 				cancel_upload = 5;
 			}
 #endif
-
 			if (php_rfc1867_callback != NULL) {
 				multipart_event_file_end event_file_end;
 
@@ -1153,7 +1153,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
 				if (array_index) {
 					efree(array_index);
 				}
-				array_index = estrndup(start_arr+1, array_len-2);
+				array_index = estrndup(start_arr + 1, array_len - 2);
 			}
 
 			/* Add $foo_name */
@@ -1339,6 +1339,7 @@ filedone:
 			efree(param);
 		}
 	}
+
 fileupload_done:
 	if (php_rfc1867_callback != NULL) {
 		multipart_event_end event_end;
@@ -1349,6 +1350,7 @@ fileupload_done:
 
 	SAFE_RETURN;
 }
+/* }}} */
 
 /*
  * Local variables:
-- 
2.50.1