improve httpclient resource disposal

Emby.Dlna/ContentDirectory/ContentDirectoryBrowser.cs

@@ -43,8 +43,8 @@ namespace Emby.Dlna.ContentDirectory
 
             options.RequestContent = GetRequestBody(request);
 
-            var response = await _httpClient.SendAsync(options, "POST");
+            using (var response = await _httpClient.SendAsync(options, "POST"))
-
+            {
                 using (var reader = new StreamReader(response.Content))
                 {
                     var doc = XDocument.Parse(reader.ReadToEnd(), LoadOptions.PreserveWhitespace);
@@ -76,6 +76,7 @@ namespace Emby.Dlna.ContentDirectory
                     return queryResult;
                 }
             }
+        }
 
         private string GetRequestBody(ContentDirectoryBrowseRequest request)
         {

Emby.Dlna/Eventing/EventManager.cs

@@ -182,7 +182,10 @@ namespace Emby.Dlna.Eventing
 
             try
             {
-                await _httpClient.SendAsync(options, "NOTIFY").ConfigureAwait(false);
+                using (await _httpClient.SendAsync(options, "NOTIFY").ConfigureAwait(false))
+                {
+
+                }
             }
             catch (OperationCanceledException)
             {

Emby.Dlna/PlayTo/SsdpHttpClient.cs

@@ -31,9 +31,9 @@ namespace Emby.Dlna.PlayTo
             bool logRequest = true,
             string header = null)
         {
-            var response = await PostSoapDataAsync(NormalizeServiceUrl(baseUrl, service.ControlUrl), "\"" + service.ServiceType + "#" + command + "\"", postData, header, logRequest)
+            using (var response = await PostSoapDataAsync(NormalizeServiceUrl(baseUrl, service.ControlUrl), "\"" + service.ServiceType + "#" + command + "\"", postData, header, logRequest)
-                .ConfigureAwait(false);
+                .ConfigureAwait(false))
-
+            {
                 using (var stream = response.Content)
                 {
                     using (var reader = new StreamReader(stream, Encoding.UTF8))
@@ -42,6 +42,7 @@ namespace Emby.Dlna.PlayTo
                     }
                 }
             }
+        }
 
         private string NormalizeServiceUrl(string baseUrl, string serviceUrl)
         {
@@ -79,7 +80,10 @@ namespace Emby.Dlna.PlayTo
             options.RequestHeaders["NT"] = "upnp:event";
             options.RequestHeaders["TIMEOUT"] = "Second-" + timeOut.ToString(_usCulture);
 
-            await _httpClient.SendAsync(options, "SUBSCRIBE").ConfigureAwait(false);
+            using (await _httpClient.SendAsync(options, "SUBSCRIBE").ConfigureAwait(false))
+            {
+
+            }
         }
 
         public async Task<XDocument> GetDataAsync(string url)
@@ -94,7 +98,9 @@ namespace Emby.Dlna.PlayTo
 
             options.RequestHeaders["FriendlyName.DLNA.ORG"] = FriendlyName;
 
-            using (var stream = await _httpClient.Get(options).ConfigureAwait(false))
+            using (var response = await _httpClient.SendAsync(options, "GET").ConfigureAwait(false))
+            {
+                using (var stream = response.Content)
                 {
                     using (var reader = new StreamReader(stream, Encoding.UTF8))
                     {
@@ -102,6 +108,7 @@ namespace Emby.Dlna.PlayTo
                     }
                 }
             }
+        }
 
         private Task<HttpResponseInfo> PostSoapDataAsync(string url, 
             string soapAction, 

Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs

@@ -279,39 +279,9 @@ namespace Emby.Server.Implementations.HttpClientManager
         public async Task<Stream> Get(HttpRequestOptions options)
         {
             var response = await GetResponse(options).ConfigureAwait(false);
-
             return response.Content;
         }
 
-        /// <summary>
-        /// Performs a GET request and returns the resulting stream
-        /// </summary>
-        /// <param name="url">The URL.</param>
-        /// <param name="resourcePool">The resource pool.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task{Stream}.</returns>
-        public Task<Stream> Get(string url, SemaphoreSlim resourcePool, CancellationToken cancellationToken)
-        {
-            return Get(new HttpRequestOptions
-            {
-                Url = url,
-                ResourcePool = resourcePool,
-                CancellationToken = cancellationToken,
-                BufferContent = resourcePool != null
-            });
-        }
-
-        /// <summary>
-        /// Gets the specified URL.
-        /// </summary>
-        /// <param name="url">The URL.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task{Stream}.</returns>
-        public Task<Stream> Get(string url, CancellationToken cancellationToken)
-        {
-            return Get(url, null, cancellationToken);
-        }
-
         /// <summary>
         /// send as an asynchronous operation.
         /// </summary>
@@ -589,26 +559,6 @@ namespace Emby.Server.Implementations.HttpClientManager
             return response.Content;
         }
 
-        /// <summary>
-        /// Performs a POST request
-        /// </summary>
-        /// <param name="url">The URL.</param>
-        /// <param name="postData">Params to add to the POST data.</param>
-        /// <param name="resourcePool">The resource pool.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>stream on success, null on failure</returns>
-        public Task<Stream> Post(string url, Dictionary<string, string> postData, SemaphoreSlim resourcePool, CancellationToken cancellationToken)
-        {
-            return Post(new HttpRequestOptions
-            {
-                Url = url,
-                ResourcePool = resourcePool,
-                CancellationToken = cancellationToken,
-                BufferContent = resourcePool != null
-
-            }, postData);
-        }
-
         /// <summary>
         /// Downloads the contents of a given url into a temporary location
         /// </summary>
@@ -891,18 +841,6 @@ namespace Emby.Server.Implementations.HttpClientManager
             }
         }
 
-        /// <summary>
-        /// Posts the specified URL.
-        /// </summary>
-        /// <param name="url">The URL.</param>
-        /// <param name="postData">The post data.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task{Stream}.</returns>
-        public Task<Stream> Post(string url, Dictionary<string, string> postData, CancellationToken cancellationToken)
-        {
-            return Post(url, postData, null, cancellationToken);
-        }
-
         private Task<WebResponse> GetResponseAsync(WebRequest request, TimeSpan timeout)
         {
             var taskCompletion = new TaskCompletionSource<WebResponse>();

Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs

@@ -58,7 +58,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
 
                     season.Name = seasonNumber == 0 ?
                         args.LibraryOptions.SeasonZeroDisplayName :
-                        string.Format(_localization.GetLocalizedString("NameSeasonNumber"), seasonNumber.ToString(UsCulture));
+                        string.Format(_localization.GetLocalizedString("NameSeasonNumber"), seasonNumber.ToString(UsCulture), args.GetLibraryOptions().PreferredMetadataLanguage);
                 }
 
                 return season;

Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs

@@ -1463,6 +1463,9 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     _timerProvider.AddOrUpdate(timer, false);
 
                     await SaveRecordingMetadata(timer, recordPath, seriesPath).ConfigureAwait(false);
+
+                    CreateRecordingFolders();
+
                     TriggerRefresh(recordPath);
                     EnforceKeepUpTo(timer, seriesPath);
                 };

Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs

@@ -541,7 +541,9 @@ namespace Emby.Server.Implementations.LiveTv.Listings
 
             try
             {
-                using (Stream responce = await Get(options, false, info).ConfigureAwait(false))
+                using (var httpResponse = await Get(options, false, info).ConfigureAwait(false))
+                {
+                    using (Stream responce = httpResponse.Content)
                     {
                         var root = _jsonSerializer.DeserializeFromStream<List<ScheduleDirect.Headends>>(responce);
 
@@ -565,6 +567,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                         }
                     }
                 }
+            }
             catch (Exception ex)
             {
                 _logger.Error("Error getting headends", ex);
@@ -671,13 +674,13 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             return await Post(options, false, providerInfo).ConfigureAwait(false);
         }
 
-        private async Task<Stream> Get(HttpRequestOptions options,
+        private async Task<HttpResponseInfo> Get(HttpRequestOptions options,
             bool enableRetry,
             ListingsProviderInfo providerInfo)
         {
             try
             {
-                return await _httpClient.Get(options).ConfigureAwait(false);
+                return await _httpClient.SendAsync(options, "GET").ConfigureAwait(false);
             }
             catch (HttpException ex)
             {
@@ -797,13 +800,16 @@ namespace Emby.Server.Implementations.LiveTv.Listings
 
             try
             {
-                using (var response = await Get(options, false, null).ConfigureAwait(false))
+                using (var httpResponse = await Get(options, false, null).ConfigureAwait(false))
+                {
+                    using (var response = httpResponse.Content)
                     {
                         var root = _jsonSerializer.DeserializeFromStream<ScheduleDirect.Lineups>(response);
 
                         return root.lineups.Any(i => string.Equals(info.ListingsId, i.lineup, StringComparison.OrdinalIgnoreCase));
                     }
                 }
+            }
             catch (HttpException ex)
             {
                 // Apparently we're supposed to swallow this
@@ -879,7 +885,9 @@ namespace Emby.Server.Implementations.LiveTv.Listings
 
             var list = new List<ChannelInfo>();
 
-            using (var response = await Get(httpOptions, true, info).ConfigureAwait(false))
+            using (var httpResponse = await Get(httpOptions, true, info).ConfigureAwait(false))
+            {
+                using (var response = httpResponse.Content)
                 {
                     var root = _jsonSerializer.DeserializeFromStream<ScheduleDirect.Channel>(response);
                     _logger.Info("Found " + root.map.Count + " channels on the lineup on ScheduleDirect");
@@ -928,6 +936,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                         list.Add(channelInfo);
                     }
                 }
+            }
 
             return list;
         }

Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs

@@ -86,7 +86,9 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                 CancellationToken = cancellationToken,
                 BufferContent = false
             };
-            using (var stream = await _httpClient.Get(options).ConfigureAwait(false))
+            using (var response = await _httpClient.SendAsync(options, "GET").ConfigureAwait(false))
+            {
+                using (var stream = response.Content)
                 {
                     var lineup = JsonSerializer.DeserializeFromStream<List<Channels>>(stream) ?? new List<Channels>();
 
@@ -98,6 +100,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                     return lineup.Where(i => !i.DRM).ToList();
                 }
             }
+        }
 
         private class HdHomerunChannelInfo : ChannelInfo
         {
@@ -143,26 +146,29 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
 
             try
             {
-                using (var stream = await _httpClient.Get(new HttpRequestOptions()
+                using (var response = await _httpClient.SendAsync(new HttpRequestOptions()
                 {
                     Url = string.Format("{0}/discover.json", GetApiUrl(info, false)),
                     CancellationToken = cancellationToken,
                     TimeoutMs = Convert.ToInt32(TimeSpan.FromSeconds(5).TotalMilliseconds),
                     BufferContent = false
 
-                }).ConfigureAwait(false))
+                }, "GET").ConfigureAwait(false))
                 {
-                    var response = JsonSerializer.DeserializeFromStream<DiscoverResponse>(stream);
+                    using (var stream = response.Content)
+                    {
+                        var discoverResponse = JsonSerializer.DeserializeFromStream<DiscoverResponse>(stream);
 
                         if (!string.IsNullOrWhiteSpace(info.Id))
                         {
                             lock (_modelCache)
                             {
-                            _modelCache[info.Id] = response;
+                                _modelCache[info.Id] = discoverResponse;
                             }
                         }
 
-                    return response;
+                        return discoverResponse;
+                    }
                 }
             }
             catch (HttpException ex)

Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHttpStream.cs

@@ -91,6 +91,8 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                         EnableHttpCompression = false
 
                     }, "GET").ConfigureAwait(false))
+                    {
+                        using (var stream = response.Content)
                         {
                             Logger.Info("Opened HDHR stream from {0}", url);
 
@@ -99,7 +101,8 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                             FileSystem.CreateDirectory(FileSystem.GetDirectoryName(TempFilePath));
                             using (var fileStream = FileSystem.GetFileStream(TempFilePath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, FileOpenOptions.None))
                             {
-                            StreamHelper.CopyTo(response.Content, fileStream, 81920, () => Resolve(openTaskCompletionSource), cancellationToken);
+                                StreamHelper.CopyTo(stream, fileStream, 81920, () => Resolve(openTaskCompletionSource), cancellationToken);
+                            }
                         }
                     }
                 }

Emby.Server.Implementations/Localization/LocalizationManager.cs

@@ -315,6 +315,11 @@ namespace Emby.Server.Implementations.Localization
 
         public string GetLocalizedString(string phrase, string culture)
         {
+            if (string.IsNullOrWhiteSpace(culture))
+            {
+                culture = _configurationManager.Configuration.UICulture;
+            }
+
             var dictionary = GetLocalizationDictionary(culture);
 
             string value;

Emby.Server.Implementations/News/NewsEntryPoint.cs

@@ -88,7 +88,9 @@ namespace Emby.Server.Implementations.News
                 BufferContent = false
             };
 
-            using (var stream = await _httpClient.Get(requestOptions).ConfigureAwait(false))
+            using (var response = await _httpClient.SendAsync(requestOptions, "GET").ConfigureAwait(false))
+            {
+                using (var stream = response.Content)
                 {
                     using (var reader = XmlReader.Create(stream))
                     {
@@ -100,6 +102,7 @@ namespace Emby.Server.Implementations.News
                     }
                 }
             }
+        }
 
         private Task CreateNotifications(List<NewsItem> items, DateTime? lastUpdate, CancellationToken cancellationToken)
         {

Emby.Server.Implementations/Security/PluginSecurityManager.cs

@@ -293,11 +293,14 @@ namespace Emby.Server.Implementations.Security
 
                     options.SetPostData(data);
 
-                    using (var json = (await _httpClient.Post(options).ConfigureAwait(false)).Content)
+                    using (var response = (await _httpClient.Post(options).ConfigureAwait(false)))
+                    {
+                        using (var json = response.Content)
                         {
                             reg = _jsonSerializer.DeserializeFromStream<RegRecord>(json);
                             success = true;
                         }
+                    }
 
                     if (reg.registered)
                     {

Emby.Server.Implementations/Session/HttpSessionController.cs

@@ -66,19 +66,22 @@ namespace Emby.Server.Implementations.Session
             return SendMessage(name, new Dictionary<string, string>(), cancellationToken);
         }
 
-        private Task SendMessage(string name,
+        private async Task SendMessage(string name,
             Dictionary<string, string> args,
             CancellationToken cancellationToken)
         {
             var url = PostUrl + "/" + name + ToQueryString(args);
 
-            return _httpClient.Post(new HttpRequestOptions
+            using ((await _httpClient.Post(new HttpRequestOptions
             {
                 Url = url,
                 CancellationToken = cancellationToken,
                 BufferContent = false
 
-            });
+            }).ConfigureAwait(false)))
+            {
+
+            }
         }
 
         public Task SendSessionEndedNotification(SessionInfoDto sessionInfo, CancellationToken cancellationToken)

Emby.Server.Implementations/Updates/InstallationManager.cs

@@ -175,7 +175,17 @@ namespace Emby.Server.Implementations.Updates
                     { "systemid", _applicationHost.SystemId }
                 };
 
-                using (var json = await _httpClient.Post("https://www.mb3admin.com/admin/service/package/retrieveall?includeAllRuntimes=true", data, cancellationToken).ConfigureAwait(false))
+                var options = new HttpRequestOptions
+                {
+                    Url = "https://www.mb3admin.com/admin/service/package/retrieveall?includeAllRuntimes=true",
+                    CancellationToken = cancellationToken
+                };
+
+                options.SetPostData(data);
+
+                using (var response = await _httpClient.SendAsync(options, "POST").ConfigureAwait(false))
+                {
+                    using (var json = response.Content)
                     {
                         cancellationToken.ThrowIfCancellationRequested();
 
@@ -184,6 +194,7 @@ namespace Emby.Server.Implementations.Updates
                         return FilterPackages(packages, packageType, applicationVersion);
                     }
                 }
+            }
             else
             {
                 var packages = await GetAvailablePackagesWithoutRegistrationInfo(cancellationToken).ConfigureAwait(false);

MediaBrowser.Api/Images/RemoteImageService.cs

@@ -262,13 +262,13 @@ namespace MediaBrowser.Api.Images
         /// <returns>Task.</returns>
         private async Task DownloadImage(string url, Guid urlHash, string pointerCachePath)
         {
-            var result = await _httpClient.GetResponse(new HttpRequestOptions
+            using (var result = await _httpClient.GetResponse(new HttpRequestOptions
             {
                 Url = url,
                 BufferContent = false
 
-            }).ConfigureAwait(false);
+            }).ConfigureAwait(false))
-
+            {
                 var ext = result.ContentType.Split('/').Last();
 
                 var fullCachePath = GetFullCachePath(urlHash + "." + ext);
@@ -285,6 +285,7 @@ namespace MediaBrowser.Api.Images
                 _fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(pointerCachePath));
                 _fileSystem.WriteAllText(pointerCachePath, fullCachePath);
             }
+        }
 
         /// <summary>
         /// Gets the full cache path.

MediaBrowser.Common/Net/IHttpClient.cs

@@ -18,24 +18,6 @@ namespace MediaBrowser.Common.Net
         /// <returns>Task{HttpResponseInfo}.</returns>
         Task<HttpResponseInfo> GetResponse(HttpRequestOptions options);
 
-        /// <summary>
-        /// Performs a GET request and returns the resulting stream
-        /// </summary>
-        /// <param name="url">The URL.</param>
-        /// <param name="resourcePool">The resource pool.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task{Stream}.</returns>
-        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
-        Task<Stream> Get(string url, SemaphoreSlim resourcePool, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Gets the specified URL.
-        /// </summary>
-        /// <param name="url">The URL.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task{Stream}.</returns>
-        Task<Stream> Get(string url, CancellationToken cancellationToken);
-
         /// <summary>
         /// Gets the specified options.
         /// </summary>
@@ -51,35 +33,6 @@ namespace MediaBrowser.Common.Net
         /// <returns>Task{HttpResponseInfo}.</returns>
         Task<HttpResponseInfo> SendAsync(HttpRequestOptions options, string httpMethod);
 
-        /// <summary>
-        /// Performs a POST request
-        /// </summary>
-        /// <param name="url">The URL.</param>
-        /// <param name="postData">Params to add to the POST data.</param>
-        /// <param name="resourcePool">The resource pool.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>stream on success, null on failure</returns>
-        /// <exception cref="System.ArgumentNullException">postData</exception>
-        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
-        Task<Stream> Post(string url, Dictionary<string, string> postData, SemaphoreSlim resourcePool, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Posts the specified URL.
-        /// </summary>
-        /// <param name="url">The URL.</param>
-        /// <param name="postData">The post data.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task{Stream}.</returns>
-        Task<Stream> Post(string url, Dictionary<string, string> postData, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Posts the specified options with post data
-        /// </summary>
-        /// <param name="options">The options</param>
-        /// <param name="postData">The post data</param>
-        /// <returns>Task{Stream}</returns>
-        Task<Stream> Post(HttpRequestOptions options, Dictionary<string, string> postData);
-
         /// <summary>
         /// Posts the specified options.
         /// </summary>

MediaBrowser.Common/Updates/GithubUpdater.cs

@@ -40,13 +40,16 @@ namespace MediaBrowser.Common.Updates
                 options.CacheLength = cacheLength;
             }
 
-            using (var stream = await _httpClient.Get(options).ConfigureAwait(false))
+            using (var response = await _httpClient.SendAsync(options, "GET").ConfigureAwait(false))
+            {
+                using (var stream = response.Content)
                 {
                     var obj = _jsonSerializer.DeserializeFromStream<RootObject[]>(stream);
 
                     return CheckForUpdateResult(obj, minVersion, updateLevel, assetFilename, packageName, targetFilename);
                 }
             }
+        }
 
         private CheckForUpdateResult CheckForUpdateResult(RootObject[] obj, Version minVersion, PackageVersionClass updateLevel, string assetFilename, string packageName, string targetFilename)
         {
@@ -110,7 +113,9 @@ namespace MediaBrowser.Common.Updates
                 BufferContent = false
             };
 
-            using (var stream = await _httpClient.Get(options).ConfigureAwait(false))
+            using (var response = await _httpClient.SendAsync(options, "GET").ConfigureAwait(false))
+            {
+                using (var stream = response.Content)
                 {
                     var obj = _jsonSerializer.DeserializeFromStream<RootObject[]>(stream);
 
@@ -123,6 +128,7 @@ namespace MediaBrowser.Common.Updates
                     return list;
                 }
             }
+        }
 
         public Version GetVersion(RootObject obj)
         {

MediaBrowser.Providers/BoxSets/MovieDbBoxSetProvider.cs

@@ -179,16 +179,19 @@ namespace MediaBrowser.Providers.BoxSets
 
             RootObject mainResult = null;
 
-            using (var json = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
+            using (var response = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
             {
                 Url = url,
                 CancellationToken = cancellationToken,
                 AcceptHeader = MovieDbSearch.AcceptHeader
 
             }).ConfigureAwait(false))
+            {
+                using (var json = response.Content)
                 {
                     mainResult = _json.DeserializeFromStream<RootObject>(json);
                 }
+            }
 
             cancellationToken.ThrowIfCancellationRequested();
 
@@ -204,18 +207,21 @@ namespace MediaBrowser.Providers.BoxSets
                         url += "&include_image_language=" + MovieDbProvider.GetImageLanguagesParam(language);
                     }
 
-                    using (var json = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
+                    using (var response = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
                     {
                         Url = url,
                         CancellationToken = cancellationToken,
                         AcceptHeader = MovieDbSearch.AcceptHeader
 
                     }).ConfigureAwait(false))
+                    {
+                        using (var json = response.Content)
                         {
                             mainResult = _json.DeserializeFromStream<RootObject>(json);
                         }
                     }
                 }
+            }
             return mainResult;
         }
 

MediaBrowser.Providers/Manager/ProviderManager.cs

@@ -153,16 +153,16 @@ namespace MediaBrowser.Providers.Manager
 
         public async Task SaveImage(IHasMetadata item, string url, ImageType type, int? imageIndex, CancellationToken cancellationToken)
         {
-            var response = await _httpClient.GetResponse(new HttpRequestOptions
+            using (var response = await _httpClient.GetResponse(new HttpRequestOptions
             {
                 CancellationToken = cancellationToken,
                 Url = url,
                 BufferContent = false
 
-            }).ConfigureAwait(false);
+            }).ConfigureAwait(false))
-
+            {
-            await SaveImage(item, response.Content, response.ContentType, type, imageIndex, cancellationToken)
+                await SaveImage(item, response.Content, response.ContentType, type, imageIndex, cancellationToken).ConfigureAwait(false);
-                    .ConfigureAwait(false);
+            }
         }
 
         public Task SaveImage(IHasMetadata item, Stream source, string mimeType, ImageType type, int? imageIndex, CancellationToken cancellationToken)

MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs

@@ -274,13 +274,15 @@ namespace MediaBrowser.Providers.Movies
 
             try
             {
-                using (var response = await _httpClient.Get(new HttpRequestOptions
+                using (var httpResponse = await _httpClient.SendAsync(new HttpRequestOptions
                 {
                     Url = url,
                     CancellationToken = cancellationToken,
                     BufferContent = true
 
-                }).ConfigureAwait(false))
+                }, "GET").ConfigureAwait(false))
+                {
+                    using (var response = httpResponse.Content)
                     {
                         using (var fileStream = _fileSystem.GetFileStream(path, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, true))
                         {
@@ -288,6 +290,7 @@ namespace MediaBrowser.Providers.Movies
                         }
                     }
                 }
+            }
             catch (HttpException exception)
             {
                 if (exception.StatusCode.HasValue && exception.StatusCode.Value == HttpStatusCode.NotFound)

MediaBrowser.Providers/Movies/MovieDbProvider.cs

@@ -146,19 +146,22 @@ namespace MediaBrowser.Providers.Movies
                 return _tmdbSettings;
             }
 
-            using (var json = await GetMovieDbResponse(new HttpRequestOptions
+            using (var response = await GetMovieDbResponse(new HttpRequestOptions
             {
                 Url = string.Format(TmdbConfigUrl, ApiKey),
                 CancellationToken = cancellationToken,
                 AcceptHeader = AcceptHeader
 
             }).ConfigureAwait(false))
+            {
+                using (var json = response.Content)
                 {
                     _tmdbSettings = _jsonSerializer.DeserializeFromStream<TmdbSettingsResult>(json);
 
                     return _tmdbSettings;
                 }
             }
+        }
 
         private const string TmdbConfigUrl = "https://api.themoviedb.org/3/configuration?api_key={0}";
         private const string GetMovieInfo3 = @"https://api.themoviedb.org/3/movie/{0}?api_key={1}&append_to_response=casts,releases,images,keywords,trailers";
@@ -339,7 +342,7 @@ namespace MediaBrowser.Providers.Movies
 
             try
             {
-                using (var json = await GetMovieDbResponse(new HttpRequestOptions
+                using (var response = await GetMovieDbResponse(new HttpRequestOptions
                 {
                     Url = url,
                     CancellationToken = cancellationToken,
@@ -348,10 +351,13 @@ namespace MediaBrowser.Providers.Movies
                     CacheLength = cacheLength
 
                 }).ConfigureAwait(false))
+                {
+                    using (var json = response.Content)
                     {
                         mainResult = _jsonSerializer.DeserializeFromStream<CompleteMovieData>(json);
                     }
                 }
+            }
             catch (HttpException ex)
             {
                 // Return null so that callers know there is no metadata for this id
@@ -381,7 +387,7 @@ namespace MediaBrowser.Providers.Movies
                     url += "&include_image_language=" + GetImageLanguagesParam(language);
                 }
 
-                using (var json = await GetMovieDbResponse(new HttpRequestOptions
+                using (var response = await GetMovieDbResponse(new HttpRequestOptions
                 {
                     Url = url,
                     CancellationToken = cancellationToken,
@@ -390,12 +396,15 @@ namespace MediaBrowser.Providers.Movies
                     CacheLength = cacheLength
 
                 }).ConfigureAwait(false))
+                {
+                    using (var json = response.Content)
                     {
                         var englishResult = _jsonSerializer.DeserializeFromStream<CompleteMovieData>(json);
 
                         mainResult.overview = englishResult.overview;
                     }
                 }
+            }
 
             return mainResult;
         }
@@ -407,7 +416,7 @@ namespace MediaBrowser.Providers.Movies
         /// <summary>
         /// Gets the movie db response.
         /// </summary>
-        internal async Task<Stream> GetMovieDbResponse(HttpRequestOptions options)
+        internal async Task<HttpResponseInfo> GetMovieDbResponse(HttpRequestOptions options)
         {
             var delayTicks = (requestIntervalMs * 10000) - (DateTime.UtcNow.Ticks - _lastRequestTicks);
             var delayMs = Math.Min(delayTicks / 10000, requestIntervalMs);
@@ -423,7 +432,7 @@ namespace MediaBrowser.Providers.Movies
             options.BufferContent = true;
             options.UserAgent = "Emby/" + _appHost.ApplicationVersion;
 
-            return await _httpClient.Get(options).ConfigureAwait(false);
+            return await _httpClient.SendAsync(options, "GET").ConfigureAwait(false);
         }
 
         /// <summary>

MediaBrowser.Providers/Movies/MovieDbSearch.cs

@@ -154,13 +154,15 @@ namespace MediaBrowser.Providers.Movies
 
             var url3 = string.Format(Search3, WebUtility.UrlEncode(name), ApiKey, language, type);
 
-            using (var json = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
+            using (var response = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
             {
                 Url = url3,
                 CancellationToken = cancellationToken,
                 AcceptHeader = AcceptHeader
 
             }).ConfigureAwait(false))
+            {
+                using (var json = response.Content)
                 {
                     var searchResults = _json.DeserializeFromStream<TmdbMovieSearchResults>(json);
 
@@ -196,6 +198,7 @@ namespace MediaBrowser.Providers.Movies
                         .ToList();
                 }
             }
+        }
 
         private async Task<List<RemoteSearchResult>> GetSearchResultsTv(string name, int? year, string language, string baseImageUrl, CancellationToken cancellationToken)
         {
@@ -206,13 +209,15 @@ namespace MediaBrowser.Providers.Movies
 
             var url3 = string.Format(Search3, WebUtility.UrlEncode(name), ApiKey, language, "tv");
 
-            using (var json = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
+            using (var response = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
             {
                 Url = url3,
                 CancellationToken = cancellationToken,
                 AcceptHeader = AcceptHeader
 
             }).ConfigureAwait(false))
+            {
+                using (var json = response.Content)
                 {
                     var searchResults = _json.DeserializeFromStream<TmdbTvSearchResults>(json);
 
@@ -248,6 +253,7 @@ namespace MediaBrowser.Providers.Movies
                         .ToList();
                 }
             }
+        }
 
         /// <summary>
         /// Class TmdbMovieSearchResult

MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs

@@ -161,12 +161,14 @@ namespace MediaBrowser.Providers.Music
 
 			_fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(path));
 
-            using (var response = await _httpClient.Get(new HttpRequestOptions
+            using (var httpResponse = await _httpClient.SendAsync(new HttpRequestOptions
             {
                 Url = url,
                 CancellationToken = cancellationToken
 
-            }).ConfigureAwait(false))
+            }, "GET").ConfigureAwait(false))
+            {
+                using (var response = httpResponse.Content)
                 {
                     using (var xmlFileStream = _fileSystem.GetFileStream(path, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, true))
                     {
@@ -174,6 +176,7 @@ namespace MediaBrowser.Providers.Music
                     }
                 }
             }
+        }
 
         private static string GetAlbumDataPath(IApplicationPaths appPaths, string musicBrainzReleaseGroupId)
         {

MediaBrowser.Providers/Music/AudioDbArtistProvider.cs

@@ -147,13 +147,15 @@ namespace MediaBrowser.Providers.Music
 
             var path = GetArtistInfoPath(_config.ApplicationPaths, musicBrainzId);
 
-            using (var response = await _httpClient.Get(new HttpRequestOptions
+            using (var httpResponse = await _httpClient.SendAsync(new HttpRequestOptions
             {
                 Url = url,
                 CancellationToken = cancellationToken,
                 BufferContent = true
 
-            }).ConfigureAwait(false))
+            }, "GET").ConfigureAwait(false))
+            {
+                using (var response = httpResponse.Content)
                 {
                     _fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(path));
 
@@ -163,6 +165,7 @@ namespace MediaBrowser.Providers.Music
                     }
                 }
             }
+        }
 
         /// <summary>
         /// Gets the artist data path.

MediaBrowser.Providers/Music/FanArtArtistProvider.cs

@@ -251,13 +251,15 @@ namespace MediaBrowser.Providers.Music
 
             try
             {
-                using (var response = await _httpClient.Get(new HttpRequestOptions
+                using (var httpResponse = await _httpClient.SendAsync(new HttpRequestOptions
                 {
                     Url = url,
                     CancellationToken = cancellationToken,
                     BufferContent = true
 
-                }).ConfigureAwait(false))
+                }, "GET").ConfigureAwait(false))
+                {
+                    using (var response = httpResponse.Content)
                     {
                         using (var saveFileStream = _fileSystem.GetFileStream(jsonPath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, true))
                         {
@@ -265,6 +267,7 @@ namespace MediaBrowser.Providers.Music
                         }
                     }
                 }
+            }
             catch (HttpException ex)
             {
                 if (ex.StatusCode.HasValue && ex.StatusCode.Value == HttpStatusCode.NotFound)

MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs

@@ -83,11 +83,14 @@ namespace MediaBrowser.Providers.Music
 
             if (!string.IsNullOrWhiteSpace(url))
             {
-                using (var stream = await GetMusicBrainzResponse(url, isNameSearch, forceMusicBrainzProper, cancellationToken).ConfigureAwait(false))
+                using (var response = await GetMusicBrainzResponse(url, isNameSearch, forceMusicBrainzProper, cancellationToken).ConfigureAwait(false))
+                {
+                    using (var stream = response.Content)
                     {
                         return GetResultsFromResponse(stream);
                     }
                 }
+            }
 
             return new List<RemoteSearchResult>();
         }
@@ -226,7 +229,9 @@ namespace MediaBrowser.Providers.Music
                 WebUtility.UrlEncode(albumName),
                 artistId);
 
-            using (var stream = await GetMusicBrainzResponse(url, true, cancellationToken).ConfigureAwait(false))
+            using (var response = await GetMusicBrainzResponse(url, true, cancellationToken).ConfigureAwait(false))
+            {
+                using (var stream = response.Content)
                 {
                     using (var oReader = new StreamReader(stream, Encoding.UTF8))
                     {
@@ -243,6 +248,7 @@ namespace MediaBrowser.Providers.Music
                     }
                 }
             }
+        }
 
         private async Task<ReleaseResult> GetReleaseResultByArtistName(string albumName, string artistName, CancellationToken cancellationToken)
         {
@@ -250,7 +256,9 @@ namespace MediaBrowser.Providers.Music
                 WebUtility.UrlEncode(albumName),
                 WebUtility.UrlEncode(artistName));
 
-            using (var stream = await GetMusicBrainzResponse(url, true, cancellationToken).ConfigureAwait(false))
+            using (var response = await GetMusicBrainzResponse(url, true, cancellationToken).ConfigureAwait(false))
+            {
+                using (var stream = response.Content)
                 {
                     using (var oReader = new StreamReader(stream, Encoding.UTF8))
                     {
@@ -267,6 +275,7 @@ namespace MediaBrowser.Providers.Music
                     }
                 }
             }
+        }
 
         private class ReleaseResult
         {
@@ -431,7 +440,9 @@ namespace MediaBrowser.Providers.Music
         {
             var url = string.Format("/ws/2/release?release-group={0}", releaseGroupId);
 
-            using (var stream = await GetMusicBrainzResponse(url, true, true, cancellationToken).ConfigureAwait(false))
+            using (var response = await GetMusicBrainzResponse(url, true, true, cancellationToken).ConfigureAwait(false))
+            {
+                using (var stream = response.Content)
                 {
                     using (var oReader = new StreamReader(stream, Encoding.UTF8))
                     {
@@ -452,6 +463,7 @@ namespace MediaBrowser.Providers.Music
                         }
                     }
                 }
+            }
 
             return null;
         }
@@ -466,7 +478,9 @@ namespace MediaBrowser.Providers.Music
         {
             var url = string.Format("/ws/2/release-group/?query=reid:{0}", releaseEntryId);
 
-            using (var stream = await GetMusicBrainzResponse(url, false, cancellationToken).ConfigureAwait(false))
+            using (var response = await GetMusicBrainzResponse(url, false, cancellationToken).ConfigureAwait(false))
+            {
+                using (var stream = response.Content)
                 {
                     using (var oReader = new StreamReader(stream, Encoding.UTF8))
                     {
@@ -517,6 +531,7 @@ namespace MediaBrowser.Providers.Music
                     }
                 }
             }
+        }
 
         private string GetFirstReleaseGroupId(XmlReader reader)
         {
@@ -598,12 +613,15 @@ namespace MediaBrowser.Providers.Music
                         UserAgent = _appHost.Name + "/" + _appHost.ApplicationVersion
                     };
 
-                    using (var stream = await _httpClient.Get(options).ConfigureAwait(false))
+                    using (var response = await _httpClient.SendAsync(options, "GET").ConfigureAwait(false))
+                    {
+                        using (var stream = response.Content)
                         {
                             var results = _json.DeserializeFromStream<List<MbzUrl>>(stream);
 
                             list = results;
                         }
+                    }
                     _lastMbzUrlQueryTicks = DateTime.UtcNow.Ticks;
                 }
                 catch (Exception ex)
@@ -626,7 +644,7 @@ namespace MediaBrowser.Providers.Music
             return list;
         }
 
-        internal Task<Stream> GetMusicBrainzResponse(string url, bool isSearch, CancellationToken cancellationToken)
+        internal Task<HttpResponseInfo> GetMusicBrainzResponse(string url, bool isSearch, CancellationToken cancellationToken)
         {
             return GetMusicBrainzResponse(url, isSearch, false, cancellationToken);
         }
@@ -634,7 +652,7 @@ namespace MediaBrowser.Providers.Music
         /// <summary>
         /// Gets the music brainz response.
         /// </summary>
-        internal async Task<Stream> GetMusicBrainzResponse(string url, bool isSearch, bool forceMusicBrainzProper, CancellationToken cancellationToken)
+        internal async Task<HttpResponseInfo> GetMusicBrainzResponse(string url, bool isSearch, bool forceMusicBrainzProper, CancellationToken cancellationToken)
         {
             var urlInfo = await GetMbzUrl(forceMusicBrainzProper).ConfigureAwait(false);
             var throttleMs = urlInfo.throttleMs;
@@ -656,7 +674,7 @@ namespace MediaBrowser.Providers.Music
                 BufferContent = throttleMs > 0
             };
 
-            return await _httpClient.Get(options).ConfigureAwait(false);
+            return await _httpClient.SendAsync(options, "GET").ConfigureAwait(false);
         }
 
         public int Order

MediaBrowser.Providers/Music/MusicBrainzArtistProvider.cs

@@ -35,12 +35,14 @@ namespace MediaBrowser.Providers.Music
             {
                 var url = string.Format("/ws/2/artist/?query=arid:{0}", musicBrainzId);
 
-                using (var stream = await MusicBrainzAlbumProvider.Current.GetMusicBrainzResponse(url, false, cancellationToken)
+                using (var response = await MusicBrainzAlbumProvider.Current.GetMusicBrainzResponse(url, false, cancellationToken).ConfigureAwait(false))
-                            .ConfigureAwait(false))
+                {
+                    using (var stream = response.Content)
                     {
                         return GetResultsFromResponse(stream);
                     }
                 }
+            }
             else
             {
                 // They seem to throw bad request failures on any term with a slash
@@ -48,7 +50,9 @@ namespace MediaBrowser.Providers.Music
 
                 var url = String.Format("/ws/2/artist/?query=artist:\"{0}\"", UrlEncode(nameToSearch));
 
-                using (var stream = await MusicBrainzAlbumProvider.Current.GetMusicBrainzResponse(url, true, cancellationToken).ConfigureAwait(false))
+                using (var response = await MusicBrainzAlbumProvider.Current.GetMusicBrainzResponse(url, true, cancellationToken).ConfigureAwait(false))
+                {
+                    using (var stream = response.Content)
                     {
                         var results = GetResultsFromResponse(stream);
 
@@ -57,18 +61,22 @@ namespace MediaBrowser.Providers.Music
                             return results;
                         }
                     }
+                }
 
                 if (HasDiacritics(searchInfo.Name))
                 {
                     // Try again using the search with accent characters url
                     url = String.Format("/ws/2/artist/?query=artistaccent:\"{0}\"", UrlEncode(nameToSearch));
 
-                    using (var stream = await MusicBrainzAlbumProvider.Current.GetMusicBrainzResponse(url, true, cancellationToken).ConfigureAwait(false))
+                    using (var response = await MusicBrainzAlbumProvider.Current.GetMusicBrainzResponse(url, true, cancellationToken).ConfigureAwait(false))
+                    {
+                        using (var stream = response.Content)
                         {
                             return GetResultsFromResponse(stream);
                         }
                     }
                 }
+            }
 
             return new List<RemoteSearchResult>();
         }

MediaBrowser.Providers/Omdb/OmdbItemProvider.cs

@@ -126,7 +126,9 @@ namespace MediaBrowser.Providers.Omdb
 
             var url =  OmdbProvider.GetOmdbUrl(urlQuery, cancellationToken);
 
-            using (var stream = await OmdbProvider.GetOmdbResponse(_httpClient, url, cancellationToken).ConfigureAwait(false))
+            using (var response = await OmdbProvider.GetOmdbResponse(_httpClient, url, cancellationToken).ConfigureAwait(false))
+            {
+                using (var stream = response.Content)
                 {
                     var resultList = new List<SearchResult>();
 
@@ -187,6 +189,7 @@ namespace MediaBrowser.Providers.Omdb
                     });
                 }
             }
+        }
 
         public Task<MetadataResult<Trailer>> GetMetadata(TrailerInfo info, CancellationToken cancellationToken)
         {

MediaBrowser.Providers/Omdb/OmdbProvider.cs

@@ -301,12 +301,15 @@ namespace MediaBrowser.Providers.Omdb
 
             var url = GetOmdbUrl(string.Format("i={0}&plot=short&tomatoes=true&r=json", imdbParam), cancellationToken);
 
-            using (var stream = await GetOmdbResponse(_httpClient, url, cancellationToken).ConfigureAwait(false))
+            using (var response = await GetOmdbResponse(_httpClient, url, cancellationToken).ConfigureAwait(false))
+            {
+                using (var stream = response.Content)
                 {
                     var rootObject = _jsonSerializer.DeserializeFromStream<RootObject>(stream);
                     _fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(path));
                     _jsonSerializer.SerializeToFile(rootObject, path);
                 }
+            }
 
             return path;
         }
@@ -335,25 +338,28 @@ namespace MediaBrowser.Providers.Omdb
 
             var url = GetOmdbUrl(string.Format("i={0}&season={1}&detail=full", imdbParam, seasonId), cancellationToken);
 
-            using (var stream = await GetOmdbResponse(_httpClient, url, cancellationToken).ConfigureAwait(false))
+            using (var response = await GetOmdbResponse(_httpClient, url, cancellationToken).ConfigureAwait(false))
+            {
+                using (var stream = response.Content)
                 {
                     var rootObject = _jsonSerializer.DeserializeFromStream<SeasonRootObject>(stream);
                     _fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(path));
                     _jsonSerializer.SerializeToFile(rootObject, path);
                 }
+            }
 
             return path;
         }
 
-        public static Task<Stream> GetOmdbResponse(IHttpClient httpClient, string url, CancellationToken cancellationToken)
+        public static Task<HttpResponseInfo> GetOmdbResponse(IHttpClient httpClient, string url, CancellationToken cancellationToken)
         {
-            return httpClient.Get(new HttpRequestOptions
+            return httpClient.SendAsync(new HttpRequestOptions
             {
                 Url = url,
                 CancellationToken = cancellationToken,
                 BufferContent = true,
                 EnableDefaultUserAgent = true
-            });
+            }, "GET");
         }
 
         internal string GetDataFilePath(string imdbId)

MediaBrowser.Providers/People/MovieDbPersonProvider.cs

@@ -91,13 +91,15 @@ namespace MediaBrowser.Providers.People
 
             var url = string.Format(@"https://api.themoviedb.org/3/search/person?api_key={1}&query={0}", WebUtility.UrlEncode(searchInfo.Name), MovieDbProvider.ApiKey);
 
-            using (var json = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
+            using (var response = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
             {
                 Url = url,
                 CancellationToken = cancellationToken,
                 AcceptHeader = MovieDbProvider.AcceptHeader
 
             }).ConfigureAwait(false))
+            {
+                using (var json = response.Content)
                 {
                     var result = _jsonSerializer.DeserializeFromStream<PersonSearchResults>(json) ??
                                  new PersonSearchResults();
@@ -105,6 +107,7 @@ namespace MediaBrowser.Providers.People
                     return result.Results.Select(i => GetSearchResult(i, tmdbImageUrl));
                 }
             }
+        }
 
         private RemoteSearchResult GetSearchResult(PersonSearchResult i, string baseImageUrl)
         {
@@ -223,13 +226,15 @@ namespace MediaBrowser.Providers.People
 
             var url = string.Format(@"https://api.themoviedb.org/3/person/{1}?api_key={0}&append_to_response=credits,images,external_ids", MovieDbProvider.ApiKey, id);
 
-            using (var json = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
+            using (var response = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
             {
                 Url = url,
                 CancellationToken = cancellationToken,
                 AcceptHeader = MovieDbProvider.AcceptHeader
 
             }).ConfigureAwait(false))
+            {
+                using (var json = response.Content)
                 {
                     _fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(dataFilePath));
 
@@ -239,6 +244,7 @@ namespace MediaBrowser.Providers.People
                     }
                 }
             }
+        }
 
         private static string GetPersonDataPath(IApplicationPaths appPaths, string tmdbId)
         {

MediaBrowser.Providers/TV/FanArt/FanartSeriesProvider.cs

@@ -316,13 +316,15 @@ namespace MediaBrowser.Providers.TV
 
             try
             {
-                using (var response = await _httpClient.Get(new HttpRequestOptions
+                using (var httpResponse = await _httpClient.SendAsync(new HttpRequestOptions
                 {
                     Url = url,
                     CancellationToken = cancellationToken,
                     BufferContent = true
 
-                }).ConfigureAwait(false))
+                }, "GET").ConfigureAwait(false))
+                {
+                    using (var response = httpResponse.Content)
                     {
                         using (var fileStream = _fileSystem.GetFileStream(path, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, true))
                         {
@@ -330,6 +332,7 @@ namespace MediaBrowser.Providers.TV
                         }
                     }
                 }
+            }
             catch (HttpException exception)
             {
                 if (exception.StatusCode.HasValue && exception.StatusCode.Value == HttpStatusCode.NotFound)

MediaBrowser.Providers/TV/TheMovieDb/MovieDbProviderBase.cs

@@ -125,17 +125,20 @@ namespace MediaBrowser.Providers.TV
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (var json = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
+            using (var response = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
             {
                 Url = url,
                 CancellationToken = cancellationToken,
                 AcceptHeader = MovieDbProvider.AcceptHeader
 
             }).ConfigureAwait(false))
+            {
+                using (var json = response.Content)
                 {
                     return _jsonSerializer.DeserializeFromStream<RootObject>(json);
                 }
             }
+        }
 
         protected Task<HttpResponseInfo> GetResponse(string url, CancellationToken cancellationToken)
         {

MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeasonProvider.cs

@@ -214,17 +214,20 @@ namespace MediaBrowser.Providers.TV
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (var json = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
+            using (var response = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
             {
                 Url = url,
                 CancellationToken = cancellationToken,
                 AcceptHeader = MovieDbProvider.AcceptHeader
 
             }).ConfigureAwait(false))
+            {
+                using (var json = response.Content)
                 {
                     return _jsonSerializer.DeserializeFromStream<RootObject>(json);
                 }
             }
+        }
 
         public class Episode
         {

MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs

@@ -352,13 +352,15 @@ namespace MediaBrowser.Providers.TV
 
             RootObject mainResult;
 
-            using (var json = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
+            using (var response = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
             {
                 Url = url,
                 CancellationToken = cancellationToken,
                 AcceptHeader = MovieDbProvider.AcceptHeader
 
             }).ConfigureAwait(false))
+            {
+                using (var json = response.Content)
                 {
                     mainResult = _jsonSerializer.DeserializeFromStream<RootObject>(json);
 
@@ -367,6 +369,7 @@ namespace MediaBrowser.Providers.TV
                         mainResult.ResultLanguage = language;
                     }
                 }
+            }
 
             cancellationToken.ThrowIfCancellationRequested();
 
@@ -386,13 +389,15 @@ namespace MediaBrowser.Providers.TV
                     url += "&include_image_language=" + MovieDbProvider.GetImageLanguagesParam(language);
                 }
 
-                using (var json = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
+                using (var response = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
                 {
                     Url = url,
                     CancellationToken = cancellationToken,
                     AcceptHeader = MovieDbProvider.AcceptHeader
 
                 }).ConfigureAwait(false))
+                {
+                    using (var json = response.Content)
                     {
                         var englishResult = _jsonSerializer.DeserializeFromStream<RootObject>(json);
 
@@ -400,6 +405,7 @@ namespace MediaBrowser.Providers.TV
                         mainResult.ResultLanguage = "en";
                     }
                 }
+            }
 
             return mainResult;
         }
@@ -449,13 +455,15 @@ namespace MediaBrowser.Providers.TV
                 MovieDbProvider.ApiKey,
                 externalSource);
 
-            using (var json = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
+            using (var response = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
             {
                 Url = url,
                 CancellationToken = cancellationToken,
                 AcceptHeader = MovieDbProvider.AcceptHeader
 
             }).ConfigureAwait(false))
+            {
+                using (var json = response.Content)
                 {
                     var result = _jsonSerializer.DeserializeFromStream<MovieDbSearch.ExternalIdLookupResult>(json);
 
@@ -481,6 +489,7 @@ namespace MediaBrowser.Providers.TV
                         }
                     }
                 }
+            }
 
             return null;
         }

MediaBrowser.Providers/TV/TheTVDB/TvdbPrescanTask.cs

@@ -142,17 +142,21 @@ namespace MediaBrowser.Providers.TV
             if (string.IsNullOrEmpty(lastUpdateTime))
             {
                 // First get tvdb server time
-                using (var stream = await _httpClient.Get(new HttpRequestOptions
+                using (var response = await _httpClient.SendAsync(new HttpRequestOptions
                 {
                     Url = ServerTimeUrl,
                     CancellationToken = cancellationToken,
                     EnableHttpCompression = true,
                     BufferContent = false
 
-                }).ConfigureAwait(false))
+                }, "GET").ConfigureAwait(false))
+                {
+                    // First get tvdb server time
+                    using (var stream = response.Content)
                     {
                         newUpdateTime = GetUpdateTime(stream);
                     }
+                }
 
                 existingDirectories.AddRange(missingSeries);
 
@@ -238,14 +242,16 @@ namespace MediaBrowser.Providers.TV
         private async Task<Tuple<IEnumerable<string>, string>> GetSeriesIdsToUpdate(IEnumerable<string> existingSeriesIds, string lastUpdateTime, CancellationToken cancellationToken)
         {
             // First get last time
-            using (var stream = await _httpClient.Get(new HttpRequestOptions
+            using (var response = await _httpClient.SendAsync(new HttpRequestOptions
             {
                 Url = string.Format(UpdatesUrl, lastUpdateTime),
                 CancellationToken = cancellationToken,
                 EnableHttpCompression = true,
                 BufferContent = false
 
-            }).ConfigureAwait(false))
+            }, "GET").ConfigureAwait(false))
+            {
+                using (var stream = response.Content)
                 {
                     var data = GetUpdatedSeriesIdList(stream);
 
@@ -257,6 +263,7 @@ namespace MediaBrowser.Providers.TV
                     return new Tuple<IEnumerable<string>, string>(seriesList, data.Item2);
                 }
             }
+        }
 
         private Tuple<List<string>, string> GetUpdatedSeriesIdList(Stream stream)
         {

MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs

@@ -216,13 +216,15 @@ namespace MediaBrowser.Providers.TV
 
             var url = string.Format(SeriesGetZip, TVUtils.TvdbApiKey, seriesId, NormalizeLanguage(preferredMetadataLanguage));
 
-            using (var zipStream = await _httpClient.Get(new HttpRequestOptions
+            using (var response = await _httpClient.SendAsync(new HttpRequestOptions
             {
                 Url = url,
                 CancellationToken = cancellationToken,
                 BufferContent = false
 
-            }).ConfigureAwait(false))
+            }, "GET").ConfigureAwait(false))
+            {
+                using (var zipStream = response.Content)
                 {
                     // Delete existing files
                     DeleteXmlFiles(seriesDataPath);
@@ -236,6 +238,7 @@ namespace MediaBrowser.Providers.TV
                         _zipClient.ExtractAllFromZip(ms, seriesDataPath, true);
                     }
                 }
+            }
 
             // Sanitize all files, except for extracted episode files
             foreach (var file in _fileSystem.GetFilePaths(seriesDataPath, true).ToList()
@@ -260,17 +263,20 @@ namespace MediaBrowser.Providers.TV
         {
             var url = string.Format(GetSeriesByImdbId, id, NormalizeLanguage(language));
 
-            using (var result = await _httpClient.Get(new HttpRequestOptions
+            using (var response = await _httpClient.SendAsync(new HttpRequestOptions
             {
                 Url = url,
                 CancellationToken = cancellationToken,
                 BufferContent = false
 
-            }).ConfigureAwait(false))
+            }, "GET").ConfigureAwait(false))
+            {
+                using (var result = response.Content)
                 {
                     return FindSeriesId(result);
                 }
             }
+        }
 
         private string FindSeriesId(Stream stream)
         {
@@ -514,13 +520,15 @@ namespace MediaBrowser.Providers.TV
 
             var comparableName = GetComparableName(name);
 
-            using (var stream = await _httpClient.Get(new HttpRequestOptions
+            using (var response = await _httpClient.SendAsync(new HttpRequestOptions
             {
                 Url = url,
                 CancellationToken = cancellationToken,
                 BufferContent = false
 
-            }).ConfigureAwait(false))
+            }, "GET").ConfigureAwait(false))
+            {
+                using (var stream = response.Content)
                 {
                     var settings = _xmlSettings.Create(false);
 
@@ -577,6 +585,7 @@ namespace MediaBrowser.Providers.TV
                         }
                     }
                 }
+            }
 
             if (searchResults.Count == 0)
             {