reverting http result factory change

pull/702/head
Luke Pulverenti 11 years ago
parent 2a444a70e5
commit 60508e1dd8

@ -360,19 +360,11 @@ namespace MediaBrowser.Server.Implementations.HttpServer
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);
}
private async Task<object> GetStaticResultTask(Task<IHasOptions> optionsTask,
IEnumerable<KeyValuePair<string, string>> responseHeaders)
{
var options = await optionsTask.ConfigureAwait(false);
AddResponseHeaders(options, responseHeaders);
AddResponseHeaders(hasOptions, responseHeaders);
return options;
return hasOptions;
}
/// <summary>
@ -670,4 +662,4 @@ namespace MediaBrowser.Server.Implementations.HttpServer
throw error;
}
}
}
}
Loading…
Cancel
Save