Skip to content

stops Headers overrite the user defined ContentType #1238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 7, 2025
Merged

stops Headers overrite the user defined ContentType #1238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Minio.Functional.Tests/FunctionalTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,8 +1014,8 @@ internal static async Task<ObjectStat> PutObject_Tester(IMinioClient minio,
.WithStreamData(filestream)
.WithObjectSize(size)
.WithProgress(progress)
.WithContentType(contentType)
.WithHeaders(metaData);
.WithHeaders(metaData)
.WithContentType(contentType);
var statPutObj = await minio.PutObjectAsync(putObjectArgs).ConfigureAwait(false);

var statObjectArgs = new StatObjectArgs()
Expand Down Expand Up @@ -3228,7 +3228,7 @@ internal static async Task PutObject_Test1(IMinioClient minio)
var startTime = DateTime.Now;
var bucketName = GetRandomName(15);
var objectName = GetRandomObjectName(10);
var contentType = "application/octet-stream";
var contentType = "image/png";
var size = 1 * MB;
var args = new Dictionary<string, string>
(StringComparer.Ordinal)
Expand Down
2 changes: 1 addition & 1 deletion Minio/DataModel/Args/PutObjectArgs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ internal override HttpRequestMessageBuilder BuildRequest(HttpRequestMessageBuild
if (string.IsNullOrWhiteSpace(ContentType)) ContentType = "application/octet-stream";
if (!Headers.ContainsKey("Content-Type")) Headers["Content-Type"] = ContentType;

requestMessageBuilder.AddOrUpdateHeaderParameter("Content-Type", Headers["Content-Type"]);
requestMessageBuilder.AddOrUpdateHeaderParameter("Content-Type", ContentType);
if (!string.IsNullOrWhiteSpace(UploadId) && PartNumber > 0)
{
requestMessageBuilder.AddQueryParameter("uploadId", $"{UploadId}");
Expand Down
Loading