@@ -442,19 +442,19 @@ private HttpContent PrepareMultipartFormDataContent(RequestOptions options)
442442 var boundary = "---------" + Guid . NewGuid ( ) . ToString ( ) . ToUpperInvariant ( ) ;
443443 var multipartContent = new MultipartFormDataContent ( boundary ) ;
444444 foreach ( var formParameter in options . FormParameters )
445- multipartContent . Add ( new StringContent ( formParameter . Value ) , formParameter . Key ) ;
445+ foreach ( var parameterValue in formParameter . Value )
446+ multipartContent . Add ( new StringContent ( parameterValue ) , formParameter . Key ) ;
446447
447448 if ( options . FileParameters != null && options . FileParameters . Count > 0 )
448- foreach ( var fileParam in options . FileParameters )
449- {
450- var fileStreamName = fileParam . Value is FileStream fileStream
451- ? Path . GetFileName ( fileStream . Name )
452- : null ;
453- var content = new StreamContent ( fileParam . Value ) ;
454- content . Headers . ContentType = new MediaTypeHeaderValue ( "application/octet-stream" ) ;
455- multipartContent . Add ( content , fileParam . Key ,
456- fileStreamName ?? "no_file_name_provided" ) ;
457- }
449+ foreach ( var fileParameter in options . FileParameters )
450+ foreach ( var parameterValue in fileParameter . Value )
451+ {
452+ var content = new StreamContent ( parameterValue . Content ) ;
453+ content . Headers . ContentType = new MediaTypeHeaderValue ( parameterValue . ContentType ) ;
454+ var fileStreamName = parameterValue . Name ?? "no_name_provided" ;
455+
456+ multipartContent . Add ( content , fileParameter . Key , fileStreamName ) ;
457+ }
458458
459459 return multipartContent ;
460460 }
@@ -517,10 +517,6 @@ private HttpRequestMessage NewRequest(
517517 {
518518 request . Content = PrepareMultipartFormDataContent ( options ) ;
519519 }
520- else if ( contentType == "application/x-www-form-urlencoded" )
521- {
522- request . Content = new FormUrlEncodedContent ( options . FormParameters ) ;
523- }
524520 else
525521 {
526522 if ( options . Data != null )
0 commit comments