shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate libcurl

Browse Source
This commit is contained in:
flightlevel
2018-07-14 14:44:23 +10:00
parent f2f602dcc5
commit 51aa6fdf13
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Jackett.Common/Plumbing/JackettModule.cs
View File

@@ -62,24 +62,9 @@ namespace Jackett.Common.Plumbing
case "httpclient2": case "httpclient2":
RegisterWebClient<HttpWebClient2>(builder); RegisterWebClient<HttpWebClient2>(builder);
break; break;
case "safecurl":
RegisterWebClient<UnixSafeCurlWebClient>(builder);
break;
case "libcurl":
RegisterWebClient<UnixLibCurlWebClient>(builder);
break;
case "automatic":
default: default:
if (System.Environment.OSVersion.Platform != PlatformID.Unix)
{
RegisterWebClient<HttpWebClient>(builder);
break;
}
var usehttpclient = DetectMonoCompatabilityWithHttpClient(); var usehttpclient = DetectMonoCompatabilityWithHttpClient();
if (usehttpclient) RegisterWebClient<HttpWebClient>(builder);
RegisterWebClient<HttpWebClient>(builder);
else
RegisterWebClient<UnixLibCurlWebClient>(builder);
break; break;
} }
} }

8
src/Jackett.Console/Program.cs
View File

@@ -65,6 +65,14 @@ namespace Jackett.Console
Engine.Logger.Info("Jackett Data will be stored in: " + runtimeSettings.CustomDataFolder); Engine.Logger.Info("Jackett Data will be stored in: " + runtimeSettings.CustomDataFolder);
} }
if(!string.IsNullOrEmpty(runtimeSettings.ClientOverride))
{
if (runtimeSettings.ClientOverride != "httpclient" && runtimeSettings.ClientOverride != "httpclient2" && runtimeSettings.ClientOverride != "httpclientnetcore")
{
Engine.Logger.Error($"Client override ({runtimeSettings.ClientOverride}) has been deprecated, please remove it from your start arguments");
Environment.Exit(1);
}
}
// Use Proxy // Use Proxy
if (options.ProxyConnection != null) if (options.ProxyConnection != null)