|
|
@ -565,13 +565,12 @@ namespace Emby.Server.Implementations.HttpServer
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch (NotSupportedException)
|
|
|
|
catch (NotSupportedException)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(rangeHeader) && totalContentLength.HasValue)
|
|
|
|
if (!string.IsNullOrWhiteSpace(rangeHeader) && totalContentLength.HasValue)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var hasHeaders = new RangeRequestWriter(rangeHeader, totalContentLength.Value, stream, contentType, isHeadRequest, _logger)
|
|
|
|
var hasHeaders = new RangeRequestWriter(rangeHeader, totalContentLength.Value, stream, contentType, isHeadRequest)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
OnComplete = options.OnComplete
|
|
|
|
OnComplete = options.OnComplete
|
|
|
|
};
|
|
|
|
};
|
|
|
@ -608,8 +607,11 @@ namespace Emby.Server.Implementations.HttpServer
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
/// Adds the caching responseHeaders.
|
|
|
|
/// Adds the caching responseHeaders.
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
|
private void AddCachingHeaders(IDictionary<string, string> responseHeaders, TimeSpan? cacheDuration,
|
|
|
|
private void AddCachingHeaders(
|
|
|
|
bool noCache, DateTime? lastModifiedDate)
|
|
|
|
IDictionary<string, string> responseHeaders,
|
|
|
|
|
|
|
|
TimeSpan? cacheDuration,
|
|
|
|
|
|
|
|
bool noCache,
|
|
|
|
|
|
|
|
DateTime? lastModifiedDate)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (noCache)
|
|
|
|
if (noCache)
|
|
|
|
{
|
|
|
|
{
|
|
|
|