New: Platform Updates, Socket Closure Workaround

src/NzbDrone.Common/Http/HttpClient.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -31,12 +31,19 @@ namespace NzbDrone.Common.Http
         private readonly ICached<CookieContainer> _cookieContainerCache;
         private readonly List<IHttpRequestInterceptor> _requestInterceptors;
         private readonly IHttpDispatcher _httpDispatcher;
+        private readonly IUserAgentBuilder _userAgentBuilder;
 
-        public HttpClient(IEnumerable<IHttpRequestInterceptor> requestInterceptors, ICacheManager cacheManager, IRateLimitService rateLimitService, IHttpDispatcher httpDispatcher, Logger logger)
+        public HttpClient(IEnumerable<IHttpRequestInterceptor> requestInterceptors,
+            ICacheManager cacheManager,
+            IRateLimitService rateLimitService,
+            IHttpDispatcher httpDispatcher,
+            IUserAgentBuilder userAgentBuilder,
+            Logger logger)
         {
             _requestInterceptors = requestInterceptors.ToList();
             _rateLimitService = rateLimitService;
             _httpDispatcher = httpDispatcher;
+            _userAgentBuilder = userAgentBuilder;
             _logger = logger;
 
             ServicePointManager.DefaultConnectionLimit = 12;
@@ -71,7 +78,7 @@ namespace NzbDrone.Common.Http
                 while (response.HasHttpRedirect);
             }
 
-            if (response.HasHttpRedirect && !RuntimeInfoBase.IsProduction)
+            if (response.HasHttpRedirect && !RuntimeInfo.IsProduction)
             {
                 _logger.Error("Server requested a redirect to [{0}] while in developer mode. Update the request URL to avoid this redirect.", response.Headers["Location"]);
             }
@@ -143,19 +150,30 @@ namespace NzbDrone.Common.Http
                 if (!request.IgnorePersistentCookies)
                 {
                     var persistentCookies = presistentContainer.GetCookies((Uri)request.Url);
-                    sourceContainer.Add(persistentCookies);   
+                    sourceContainer.Add(persistentCookies);
                 }
 
                 if (request.Cookies.Count != 0)
                 {
                     foreach (var pair in request.Cookies)
                     {
-                        var cookie = new Cookie(pair.Key, pair.Value, "/")
+                        Cookie cookie;
+                        if (pair.Value == null)
                         {
-                            // Use Now rather than UtcNow to work around Mono cookie expiry bug.
-                            // See https://gist.github.com/ta264/7822b1424f72e5b4c961
-                            Expires = DateTime.Now.AddHours(1)
-                        };
+                            cookie = new Cookie(pair.Key, "", "/")
+                            {
+                                Expires = DateTime.Now.AddDays(-1)
+                            };
+                        }
+                        else
+                        {
+                            cookie = new Cookie(pair.Key, pair.Value, "/")
+                            {
+                                // Use Now rather than UtcNow to work around Mono cookie expiry bug.
+                                // See https://gist.github.com/ta264/7822b1424f72e5b4c961
+                                Expires = DateTime.Now.AddHours(1)
+                            };
+                        }
 
                         sourceContainer.Add((Uri)request.Url, cookie);
 
@@ -178,7 +196,6 @@ namespace NzbDrone.Common.Http
                 var presistentContainer = _cookieContainerCache.Get("container", () => new CookieContainer());
                 var persistentCookies = presistentContainer.GetCookies((Uri)request.Url);
                 var existingCookies = cookieContainer.GetCookies((Uri)request.Url);
-
                 cookieContainer.Add(persistentCookies);
                 cookieContainer.Add(existingCookies);
             }*/
@@ -226,13 +243,11 @@ namespace NzbDrone.Common.Http
                 _logger.Debug("Downloading [{0}] to [{1}]", url, fileName);
 
                 var stopWatch = Stopwatch.StartNew();
-                using (var webClient = new GZipWebClient())
-                {
-                    webClient.Headers.Add(HttpRequestHeader.UserAgent, UserAgentBuilder.UserAgent);
-                    webClient.DownloadFile(url, fileName);
-                    stopWatch.Stop();
-                    _logger.Debug("Downloading Completed. took {0:0}s", stopWatch.Elapsed.Seconds);
-                }
+                var webClient = new GZipWebClient();
+                webClient.Headers.Add(HttpRequestHeader.UserAgent, _userAgentBuilder.GetUserAgent());
+                webClient.DownloadFile(url, fileName);
+                stopWatch.Stop();
+                _logger.Debug("Downloading Completed. took {0:0}s", stopWatch.Elapsed.Seconds);
             }
             catch (WebException e)
             {
@@ -255,6 +270,7 @@ namespace NzbDrone.Common.Http
         public HttpResponse<T> Get<T>(HttpRequest request) where T : new()
         {
             var response = Get(request);
+            CheckResponseContentType(response);
             return new HttpResponse<T>(response);
         }
 
@@ -273,7 +289,16 @@ namespace NzbDrone.Common.Http
         public HttpResponse<T> Post<T>(HttpRequest request) where T : new()
         {
             var response = Post(request);
+            CheckResponseContentType(response);
             return new HttpResponse<T>(response);
         }
+
+        private void CheckResponseContentType(HttpResponse response)
+        {
+            if (response.Headers.ContentType != null && response.Headers.ContentType.Contains("text/html"))
+            {
+                throw new UnexpectedHtmlContentException(response);
+            }
+        }
     }
 }