lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Figure out why it's failing

Browse Source
This commit is contained in:
Bond_009 2018-12-30 13:01:52 +01:00
parent a1b96a3135
commit 0bbc4f8219
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
View File

@ -5,6 +5,7 @@ using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
using System.Net.Cache;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -122,17 +123,17 @@ namespace Emby.Server.Implementations.HttpClientManager
private WebRequest GetRequest(HttpRequestOptions options, string method) private WebRequest GetRequest(HttpRequestOptions options, string method)
{ {
var url = options.Url; string url = options.Url;
var uriAddress = new Uri(url); Uri uriAddress = new Uri(url);
var userInfo = uriAddress.UserInfo; string userInfo = uriAddress.UserInfo;
if (!string.IsNullOrWhiteSpace(userInfo)) if (!string.IsNullOrWhiteSpace(userInfo))
{ {
_logger.LogInformation("Found userInfo in url: {0} ... url: {1}", userInfo, url); _logger.LogInformation("Found userInfo in url: {0} ... url: {1}", userInfo, url);
url = url.Replace(userInfo + "@", string.Empty); url = url.Replace(userInfo + "@", string.Empty);
} }
var request = CreateWebRequest(url); WebRequest request = CreateWebRequest(url);
if (request is HttpWebRequest httpWebRequest) if (request is HttpWebRequest httpWebRequest)
{ {
@ -140,15 +141,11 @@ namespace Emby.Server.Implementations.HttpClientManager
if (options.EnableHttpCompression) if (options.EnableHttpCompression)
{ {
if (options.DecompressionMethod.HasValue) httpWebRequest.AutomaticDecompression = DecompressionMethods.Deflate;
if (options.DecompressionMethod.HasValue
&& options.DecompressionMethod.Value == CompressionMethod.Gzip)
{ {
httpWebRequest.AutomaticDecompression = options.DecompressionMethod.Value == CompressionMethod.Gzip httpWebRequest.AutomaticDecompression = DecompressionMethods.GZip;
? DecompressionMethods.GZip
: DecompressionMethods.Deflate;
}
else
{
httpWebRequest.AutomaticDecompression = DecompressionMethods.Deflate;
} }
} }
else else
@ -156,10 +153,7 @@ namespace Emby.Server.Implementations.HttpClientManager
httpWebRequest.AutomaticDecompression = DecompressionMethods.None; httpWebRequest.AutomaticDecompression = DecompressionMethods.None;
} }
if (options.EnableKeepAlive) httpWebRequest.KeepAlive = options.EnableKeepAlive;
{
httpWebRequest.KeepAlive = true;
}
if (!string.IsNullOrEmpty(options.Host)) if (!string.IsNullOrEmpty(options.Host))
{ {
@ -172,7 +166,7 @@ namespace Emby.Server.Implementations.HttpClientManager
} }
} }
request.CachePolicy = new System.Net.Cache.RequestCachePolicy(System.Net.Cache.RequestCacheLevel.BypassCache); request.CachePolicy = new RequestCachePolicy(RequestCacheLevel.BypassCache);
request.Method = method; request.Method = method;
request.Timeout = options.TimeoutMs; request.Timeout = options.TimeoutMs;

4
MediaBrowser.Providers/Movies/MovieDbProvider.cs
View File

@ -146,7 +146,7 @@ namespace MediaBrowser.Providers.Movies
return _tmdbSettings; return _tmdbSettings;
} }
using (var response = await GetMovieDbResponse(new HttpRequestOptions using (HttpResponseInfo response = await GetMovieDbResponse(new HttpRequestOptions
{ {
Url = string.Format(TmdbConfigUrl, ApiKey), Url = string.Format(TmdbConfigUrl, ApiKey),
CancellationToken = cancellationToken, CancellationToken = cancellationToken,
@ -154,7 +154,7 @@ namespace MediaBrowser.Providers.Movies
}).ConfigureAwait(false)) }).ConfigureAwait(false))
{ {
using (var json = response.Content) using (Stream json = response.Content)
{ {
_tmdbSettings = await _jsonSerializer.DeserializeFromStreamAsync<TmdbSettingsResult>(json).ConfigureAwait(false); _tmdbSettings = await _jsonSerializer.DeserializeFromStreamAsync<TmdbSettingsResult>(json).ConfigureAwait(false);