lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix early filestream close

Browse Source
This commit is contained in:
crobibero 2020-10-29 13:56:29 -06:00
parent 429e59fb81
commit 3568c5f39b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
View File

@ -55,7 +55,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
var typeName = GetType().Name;
Logger.LogInformation("Opening " + typeName + " Live stream from {0}", url);
using var response = await _httpClientFactory.CreateClient(NamedClient.Default)
var response = await _httpClientFactory.CreateClient(NamedClient.Default)
.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, CancellationToken.None)
.ConfigureAwait(false);

6
Jellyfin.Api/Controllers/LiveTvController.cs
View File

@ -1220,11 +1220,11 @@ namespace Jellyfin.Api.Controllers
return NotFound();
}
await using var memoryStream = new MemoryStream();
await new ProgressiveFileCopier(liveStreamInfo, null, _transcodingJobHelper, CancellationToken.None)
.WriteToAsync(memoryStream, CancellationToken.None)
.WriteToAsync(Response.Body, CancellationToken.None)
.ConfigureAwait(false);
return File(memoryStream, MimeTypes.GetMimeType("file." + container));
Response.ContentType = MimeTypes.GetMimeType("file." + container);
return Ok();
}
private void AssertUserCanManageLiveTv()