3 files changed, 14 insertions, 15 deletions
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 9e13e548a..a624fc18c 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -672,14 +672,9 @@ namespace MediaBrowser.ServerApplication
             OnApplicationUpdated(package.version);
         }
 
-        /// <summary>
-        /// Gets the HTTP message handler.
-        /// </summary>
-        /// <param name="enableHttpCompression">if set to <c>true</c> [enable HTTP compression].</param>
-        /// <returns>HttpMessageHandler.</returns>
-        protected override HttpMessageHandler GetHttpMessageHandler(bool enableHttpCompression)
+        protected override HttpClient CreateHttpClient(bool enableHttpCompression)
         {
-            return HttpMessageHandlerFactory.GetHttpMessageHandler(enableHttpCompression);
+            return HttpClientFactory.GetHttpClient(enableHttpCompression);
         }
 
         protected override void ConfigureAutoRunAtStartup(bool autorun)
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index cbcb3ac25..efc3adf56 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -188,7 +188,7 @@
     <Compile Include="EntryPoints\StartupWizard.cs" />
     <Compile Include="FFMpeg\FFMpegInfo.cs" />
     <Compile Include="Native\Assemblies.cs" />
-    <Compile Include="Native\HttpMessageHandlerFactory.cs" />
+    <Compile Include="Native\HttpClientFactory.cs" />
     <Compile Include="Native\NativeApp.cs" />
     <Compile Include="Native\ServerAuthorization.cs" />
     <Compile Include="Native\Autorun.cs" />
diff --git a/MediaBrowser.ServerApplication/Native/HttpMessageHandlerFactory.cs b/MediaBrowser.ServerApplication/Native/HttpClientFactory.cs
index 4bbcc9ea0..57f00ba03 100644
--- a/MediaBrowser.ServerApplication/Native/HttpMessageHandlerFactory.cs
+++ b/MediaBrowser.ServerApplication/Native/HttpClientFactory.cs
@@ -1,25 +1,29 @@
-using System.Net;
+using System;
+using System.Net;
 using System.Net.Cache;
 using System.Net.Http;
 
 namespace MediaBrowser.ServerApplication.Native
 {
     /// <summary>
-    /// Class HttpMessageHandlerFactory
+    /// Class HttpClientFactory
     /// </summary>
-    public static class HttpMessageHandlerFactory
+    public static class HttpClientFactory
     {
         /// <summary>
-        /// Gets the HTTP message handler.
+        /// Gets the HTTP client.
         /// </summary>
         /// <param name="enableHttpCompression">if set to <c>true</c> [enable HTTP compression].</param>
-        /// <returns>HttpMessageHandler.</returns>
-        public static HttpMessageHandler GetHttpMessageHandler(bool enableHttpCompression)
+        /// <returns>HttpClient.</returns>
+        public static HttpClient GetHttpClient(bool enableHttpCompression)
         {
-            return new WebRequestHandler
+            return new HttpClient(new WebRequestHandler
             {
                 CachePolicy = new RequestCachePolicy(RequestCacheLevel.Revalidate),
                 AutomaticDecompression = enableHttpCompression ? DecompressionMethods.Deflate : DecompressionMethods.None
+            })
+            {
+                Timeout = TimeSpan.FromSeconds(20)
             };
         }
     }