Murzaby/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-08-04 15:16:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

add fixes for .net core

Browse source
This commit is contained in:
Luke Pulverenti 2017-08-17 16:19:02 -04:00
parent a57c887f7f
commit a7dcf7191a
16 changed files with 132 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
View file

@ -66,8 +66,10 @@ namespace Emby.Server.Implementations.HttpClientManager
// http://stackoverflow.com/questions/566437/http-post-returns-the-error-417-expectation-failed-c
ServicePointManager.Expect100Continue = false;
// Trakt requests sometimes fail without this
#if NET46
// Trakt requests sometimes fail without this
ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3 | SecurityProtocolType.Tls;
#endif
}
/// <summary>
@ -428,7 +430,7 @@ namespace Emby.Server.Implementations.HttpClientManager
try
{
var bytes = options.RequestContentBytes ??
Encoding.UTF8.GetBytes(options.RequestContent ?? string.Empty);
Encoding.UTF8.GetBytes(options.RequestContent ?? string.Empty);
httpWebRequest.ContentType = options.RequestContentType ?? "application/x-www-form-urlencoded";
@ -727,7 +729,7 @@ namespace Emby.Server.Implementations.HttpClientManager
}
var webException = ex as WebException
?? ex.InnerException as WebException;
?? ex.InnerException as WebException;
if (webException != null)
{
@ -762,7 +764,7 @@ namespace Emby.Server.Implementations.HttpClientManager
}
var operationCanceledException = ex as OperationCanceledException
?? ex.InnerException as OperationCanceledException;
?? ex.InnerException as OperationCanceledException;
if (operationCanceledException != null)
{