Merge pull request #5613 from accek/accek-samsung-dlna-fix

(cherry picked from commit e64f9f2f66bca134bba040709a44b43dba4afcd1)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
Claus Vium 2021-03-24 23:04:28 +01:00 committed by Joshua M. Boniface
parent 7d1d159b8a
commit de1896828f

View File

@ -46,7 +46,8 @@ namespace Jellyfin.Api.Helpers
if (isHeadRequest) if (isHeadRequest)
{ {
return new FileContentResult(Array.Empty<byte>(), contentType); httpContext.Response.Headers[HeaderNames.ContentType] = contentType;
return new OkResult();
} }
return new FileStreamResult(await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false), contentType); return new FileStreamResult(await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false), contentType);
@ -68,10 +69,10 @@ namespace Jellyfin.Api.Helpers
{ {
httpContext.Response.ContentType = contentType; httpContext.Response.ContentType = contentType;
// if the request is a head request, return a NoContent result with the same headers as it would with a GET request // if the request is a head request, return an OkResult (200) with the same headers as it would with a GET request
if (isHeadRequest) if (isHeadRequest)
{ {
return new NoContentResult(); return new OkResult();
} }
return new PhysicalFileResult(path, contentType) { EnableRangeProcessing = true }; return new PhysicalFileResult(path, contentType) { EnableRangeProcessing = true };