Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

reverting http result factory change

Browse Source
This commit is contained in:
Luke Pulverenti 2014-01-11 22:29:47 -05:00
parent 2a444a70e5
commit 60508e1dd8
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
View File

@ -360,19 +360,11 @@ namespace MediaBrowser.Server.Implementations.HttpServer
var compress = ShouldCompressResponse(requestContext, contentType); var compress = ShouldCompressResponse(requestContext, contentType);
var hasOptions = GetStaticResult(requestContext, responseHeaders, contentType, factoryFn, compress, isHeadRequest); var hasOptions = GetStaticResult(requestContext, responseHeaders, contentType, factoryFn, compress, isHeadRequest).Result;
return GetStaticResultTask(hasOptions, responseHeaders); AddResponseHeaders(hasOptions, responseHeaders);
}
private async Task<object> GetStaticResultTask(Task<IHasOptions> optionsTask, return hasOptions;
IEnumerable<KeyValuePair<string, string>> responseHeaders)
{
var options = await optionsTask.ConfigureAwait(false);
AddResponseHeaders(options, responseHeaders);
return options;
} }
/// <summary> /// <summary>
@ -670,4 +662,4 @@ namespace MediaBrowser.Server.Implementations.HttpServer
throw error; throw error;
} }
} }
} }