diff options
Diffstat (limited to 'MediaBrowser.Common')
| -rw-r--r-- | MediaBrowser.Common/Kernel/BaseKernel.cs | 10 | ||||
| -rw-r--r-- | MediaBrowser.Common/Net/Handlers/BaseSerializationHandler.cs | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs index 44569cbad..cdde17b24 100644 --- a/MediaBrowser.Common/Kernel/BaseKernel.cs +++ b/MediaBrowser.Common/Kernel/BaseKernel.cs @@ -41,6 +41,14 @@ namespace MediaBrowser.Common.Kernel /// </summary>
public HttpServer HttpServer { get; private set; }
+ protected virtual string HttpServerUrlPrefix
+ {
+ get
+ {
+ return "http://+:" + Configuration.HttpServerPortNumber + "/mediabrowser/";
+ }
+ }
+
/// <summary>
/// Gets the kernel context. The UI kernel will have to override this.
/// </summary>
@@ -181,7 +189,7 @@ namespace MediaBrowser.Common.Kernel {
DisposeHttpServer();
- HttpServer = new HttpServer("http://+:" + Configuration.HttpServerPortNumber + "/mediabrowser/");
+ HttpServer = new HttpServer(HttpServerUrlPrefix);
}
/// <summary>
diff --git a/MediaBrowser.Common/Net/Handlers/BaseSerializationHandler.cs b/MediaBrowser.Common/Net/Handlers/BaseSerializationHandler.cs index a0696d4a6..dd3020e03 100644 --- a/MediaBrowser.Common/Net/Handlers/BaseSerializationHandler.cs +++ b/MediaBrowser.Common/Net/Handlers/BaseSerializationHandler.cs @@ -62,7 +62,7 @@ namespace MediaBrowser.Common.Net.Handlers protected async override Task WriteResponseToOutputStream(Stream stream)
{
- await EnsureObjectToSerialize();
+ await EnsureObjectToSerialize().ConfigureAwait(false);
switch (SerializationFormat)
{
|