aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-01-11 00:49:18 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-01-11 00:49:18 -0500
commitef8b02d28543f9e9070c00877070016f032793bc (patch)
tree5598a7559da82ca4e29fb6b6753a1fe47a70b1ad /MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
parentec4000404d59ee0e8342805cf7ce0c4ca04023b4 (diff)
added dvdlib for better dvd runtimes
Diffstat (limited to 'MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs')
-rw-r--r--MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs14
1 files changed, 11 insertions, 3 deletions
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
index 798632af7..2419320a5 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
@@ -360,11 +360,19 @@ namespace MediaBrowser.Server.Implementations.HttpServer
var compress = ShouldCompressResponse(requestContext, contentType);
- var hasOptions = GetStaticResult(requestContext, responseHeaders, contentType, factoryFn, compress, isHeadRequest).Result;
+ var hasOptions = GetStaticResult(requestContext, responseHeaders, contentType, factoryFn, compress, isHeadRequest);
- AddResponseHeaders(hasOptions, responseHeaders);
+ return GetStaticResultTask(hasOptions, responseHeaders);
+ }
+
+ private async Task<object> GetStaticResultTask(Task<IHasOptions> optionsTask,
+ IEnumerable<KeyValuePair<string, string>> responseHeaders)
+ {
+ var options = await optionsTask.ConfigureAwait(false);
+
+ AddResponseHeaders(options, responseHeaders);
- return hasOptions;
+ return options;
}
/// <summary>