From bb4c918bf8403b2058f5fbbf2c0b1943b4b5f327 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 2 Oct 2013 13:05:13 -0400
Subject: refactor http client factory for mono

---
 MediaBrowser.ServerApplication/ApplicationHost.cs  |  9 ++-----
 .../MediaBrowser.ServerApplication.csproj          |  2 +-
 .../Native/HttpClientFactory.cs                    | 30 ++++++++++++++++++++++
 .../Native/HttpMessageHandlerFactory.cs            | 26 -------------------
 4 files changed, 33 insertions(+), 34 deletions(-)
 create mode 100644 MediaBrowser.ServerApplication/Native/HttpClientFactory.cs
 delete mode 100644 MediaBrowser.ServerApplication/Native/HttpMessageHandlerFactory.cs

(limited to 'MediaBrowser.ServerApplication')

diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 9e13e548ad..a624fc18c4 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 cbcb3ac25c..efc3adf568 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/HttpClientFactory.cs b/MediaBrowser.ServerApplication/Native/HttpClientFactory.cs
new file mode 100644
index 0000000000..57f00ba03b
--- /dev/null
+++ b/MediaBrowser.ServerApplication/Native/HttpClientFactory.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Net;
+using System.Net.Cache;
+using System.Net.Http;
+
+namespace MediaBrowser.ServerApplication.Native
+{
+    /// <summary>
+    /// Class HttpClientFactory
+    /// </summary>
+    public static class HttpClientFactory
+    {
+        /// <summary>
+        /// Gets the HTTP client.
+        /// </summary>
+        /// <param name="enableHttpCompression">if set to <c>true</c> [enable HTTP compression].</param>
+        /// <returns>HttpClient.</returns>
+        public static HttpClient GetHttpClient(bool enableHttpCompression)
+        {
+            return new HttpClient(new WebRequestHandler
+            {
+                CachePolicy = new RequestCachePolicy(RequestCacheLevel.Revalidate),
+                AutomaticDecompression = enableHttpCompression ? DecompressionMethods.Deflate : DecompressionMethods.None
+            })
+            {
+                Timeout = TimeSpan.FromSeconds(20)
+            };
+        }
+    }
+}
diff --git a/MediaBrowser.ServerApplication/Native/HttpMessageHandlerFactory.cs b/MediaBrowser.ServerApplication/Native/HttpMessageHandlerFactory.cs
deleted file mode 100644
index 4bbcc9ea09..0000000000
--- a/MediaBrowser.ServerApplication/Native/HttpMessageHandlerFactory.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Net;
-using System.Net.Cache;
-using System.Net.Http;
-
-namespace MediaBrowser.ServerApplication.Native
-{
-    /// <summary>
-    /// Class HttpMessageHandlerFactory
-    /// </summary>
-    public static class HttpMessageHandlerFactory
-    {
-        /// <summary>
-        /// Gets the HTTP message handler.
-        /// </summary>
-        /// <param name="enableHttpCompression">if set to <c>true</c> [enable HTTP compression].</param>
-        /// <returns>HttpMessageHandler.</returns>
-        public static HttpMessageHandler GetHttpMessageHandler(bool enableHttpCompression)
-        {
-            return new WebRequestHandler
-            {
-                CachePolicy = new RequestCachePolicy(RequestCacheLevel.Revalidate),
-                AutomaticDecompression = enableHttpCompression ? DecompressionMethods.Deflate : DecompressionMethods.None
-            };
-        }
-    }
-}
-- 
cgit v1.2.3