@@ -606,7 +606,7 @@ static void *php_ap_memstr(char *haystack, int haystacklen, char *needle, int ne
606606}
607607
608608/* read until a boundary condition */
609- static int multipart_buffer_read (multipart_buffer * self , char * buf , size_t bytes , int * end )
609+ static size_t multipart_buffer_read (multipart_buffer * self , char * buf , size_t bytes , int * end )
610610{
611611 size_t len , max ;
612612 char * bound ;
@@ -645,7 +645,7 @@ static int multipart_buffer_read(multipart_buffer *self, char *buf, size_t bytes
645645 self -> buf_begin += len ;
646646 }
647647
648- return ( int ) len ;
648+ return len ;
649649}
650650
651651/*
@@ -655,7 +655,7 @@ static int multipart_buffer_read(multipart_buffer *self, char *buf, size_t bytes
655655static char * multipart_buffer_read_body (multipart_buffer * self , size_t * len )
656656{
657657 char buf [FILLUNIT ], * out = NULL ;
658- int total_bytes = 0 , read_bytes = 0 ;
658+ size_t total_bytes = 0 , read_bytes = 0 ;
659659
660660 while ((read_bytes = multipart_buffer_read (self , buf , sizeof (buf ), NULL ))) {
661661 out = erealloc (out , total_bytes + read_bytes + 1 );
@@ -682,7 +682,8 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
682682 char * boundary , * s = NULL , * boundary_end = NULL , * start_arr = NULL , * array_index = NULL ;
683683 char * lbuf = NULL , * abuf = NULL ;
684684 zend_string * temp_filename = NULL ;
685- int boundary_len = 0 , cancel_upload = 0 , is_arr_upload = 0 , array_len = 0 ;
685+ int boundary_len = 0 , cancel_upload = 0 , is_arr_upload = 0 ;
686+ size_t array_len = 0 ;
686687 int64_t total_bytes = 0 , max_file_size = 0 ;
687688 int skip_upload = 0 , anonindex = 0 , is_anonymous ;
688689 HashTable * uploaded_files = NULL ;
@@ -1116,7 +1117,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
11161117 is_arr_upload = (start_arr = strchr (param ,'[' )) && (param [strlen (param )- 1 ] == ']' );
11171118
11181119 if (is_arr_upload ) {
1119- array_len = ( int ) strlen (start_arr );
1120+ array_len = strlen (start_arr );
11201121 if (array_index ) {
11211122 efree (array_index );
11221123 }
0 commit comments