Skip to content

Commit 6c7b73b

Browse files
committed
Wrap filename and param name in quotes for disposition
1 parent bc0850c commit 6c7b73b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/RestSharp/Request/RequestContent.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ void AddFiles() {
6868
fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse(file.ContentType);
6969

7070
fileContent.Headers.ContentDisposition = new ContentDispositionHeaderValue("form-data") {
71-
Name = file.Name,
72-
FileName = file.FileName
71+
Name = $"\"{file.Name}\"",
72+
FileName = $"\"{file.FileName}\""
7373
};
7474
mpContent.Add(fileContent, file.Name, file.FileName);
7575
}
@@ -132,7 +132,7 @@ void AddBody(bool hasPostParameters) {
132132
// here we must use multipart form data
133133
var mpContent = Content as MultipartFormDataContent ?? new MultipartFormDataContent();
134134
var ct = bodyContent.Headers.ContentType?.MediaType;
135-
var name = bodyParameter!.Name.IsEmpty() ? ct : bodyParameter!.Name;
135+
var name = bodyParameter!.Name.IsEmpty() ? ct : bodyParameter.Name;
136136

137137
if (name.IsEmpty())
138138
mpContent.Add(bodyContent);

test/RestSharp.Tests.Integrated/MultipartFormDataTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public MultipartFormDataTests(ITestOutputHelper output) {
3434
const string ExpectedFileAndBodyRequestContent =
3535
"--{0}" +
3636
$"{LineBreak}{KnownHeaders.ContentType}: application/octet-stream" +
37-
$"{LineBreak}{KnownHeaders.ContentDisposition}: form-data; name=fileName; filename=TestFile.txt" +
37+
$"{LineBreak}{KnownHeaders.ContentDisposition}: form-data; name=\"fileName\"; filename=\"TestFile.txt\"" +
3838
$"{LineBreak}{LineBreak}This is a test file for RestSharp.{LineBreak}" +
3939
$"--{{0}}{LineBreak}{KnownHeaders.ContentType}: application/json; {CharsetString}" +
4040
$"{LineBreak}{KnownHeaders.ContentDisposition}: form-data; name=controlName" +

0 commit comments

Comments
 (0)