Skip to content

Commit d6baf06

Browse files
committed
Trying to get the proper content disposition
1 parent 1d1dfaf commit d6baf06

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/RestSharp/Request/RequestContent.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@ void AddFiles() {
6666

6767
if (file.ContentType != null)
6868
fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse(file.ContentType);
69+
70+
fileContent.Headers.ContentDisposition = new ContentDispositionHeaderValue("form-data") {
71+
Name = file.Name,
72+
FileName = file.FileName
73+
};
6974
mpContent.Add(fileContent, file.Name, file.FileName);
7075
}
7176

test/RestSharp.Tests.Integrated/MultipartFormDataTests.cs

Lines changed: 3 additions & 3 deletions
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; filename*=utf-8''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" +
@@ -123,8 +123,8 @@ public async Task MultipartFormData_HasDefaultContentType() {
123123
_output.WriteLine($"Expected: {expectedFileAndBodyRequestContent}");
124124
_output.WriteLine($"Actual: {response.Content}");
125125

126-
Assert.Equal(expectedFileAndBodyRequestContent, response.Content);
127-
Assert.Equal(expectedDefaultMultipartContentType, RequestHandler.CapturedContentType);
126+
response.Content.Should().Be(expectedFileAndBodyRequestContent);
127+
expectedDefaultMultipartContentType.Should().Be(RequestHandler.CapturedContentType);
128128
}
129129

130130
[Fact]

0 commit comments

Comments
 (0)