mirror of https://github.com/Jackett/Jackett
This commit is contained in:
parent
d343046e61
commit
90c224fdea
|
@ -11,7 +11,7 @@
|
|||
<PackageReference Include="Autofac" Version="4.9.2" />
|
||||
<PackageReference Include="AutoMapper" Version="8.1.0" />
|
||||
<PackageReference Include="BencodeNET" Version="2.3.0" />
|
||||
<PackageReference Include="CloudFlareUtilities" Version="1.3.0" />
|
||||
<PackageReference Include="CloudflareSolverRe" Version="1.0.5" />
|
||||
<PackageReference Include="CommandLineParser" Version="2.5.0" />
|
||||
<PackageReference Include="CsQuery.NETStandard" Version="1.3.6.1" />
|
||||
<PackageReference Include="DotNet4.SocksProxy" Version="1.4.0.1" />
|
||||
|
|
|
@ -9,7 +9,7 @@ using System.Text;
|
|||
using System.Threading.Tasks;
|
||||
using com.LandonKey.SocksWebProxy;
|
||||
using com.LandonKey.SocksWebProxy.Proxy;
|
||||
using CloudFlareUtilities;
|
||||
using CloudflareSolverRe;
|
||||
using Jackett.Common.Models.Config;
|
||||
using Jackett.Common.Services.Interfaces;
|
||||
using NLog;
|
||||
|
@ -154,9 +154,11 @@ namespace Jackett.Common.Utils.Clients
|
|||
}
|
||||
}
|
||||
|
||||
using (ClearanceHandler clearanceHandlr = new ClearanceHandler())
|
||||
string userAgent = webRequest.EmulateBrowser.Value ? BrowserUtil.ChromeUserAgent : "Jackett/" + configService.GetVersion();
|
||||
|
||||
using (ClearanceHandler clearanceHandlr = new ClearanceHandler(userAgent))
|
||||
{
|
||||
clearanceHandlr.MaxRetries = 30;
|
||||
clearanceHandlr.MaxTries = 30;
|
||||
using (HttpClientHandler clientHandlr = new HttpClientHandler
|
||||
{
|
||||
CookieContainer = cookies,
|
||||
|
|
|
@ -9,7 +9,7 @@ using System.Text;
|
|||
using System.Threading.Tasks;
|
||||
using com.LandonKey.SocksWebProxy;
|
||||
using com.LandonKey.SocksWebProxy.Proxy;
|
||||
using CloudFlareUtilities;
|
||||
using CloudflareSolverRe;
|
||||
using Jackett.Common.Models.Config;
|
||||
using Jackett.Common.Services.Interfaces;
|
||||
using NLog;
|
||||
|
@ -122,8 +122,8 @@ namespace Jackett.Common.Utils.Clients
|
|||
|
||||
public void CreateClient()
|
||||
{
|
||||
clearanceHandlr = new ClearanceHandler();
|
||||
clearanceHandlr.MaxRetries = 30;
|
||||
clearanceHandlr = new ClearanceHandler(BrowserUtil.ChromeUserAgent);
|
||||
clearanceHandlr.MaxTries = 30;
|
||||
clientHandlr = new HttpClientHandler
|
||||
{
|
||||
CookieContainer = cookies,
|
||||
|
|
|
@ -9,7 +9,7 @@ using System.Text;
|
|||
using System.Threading.Tasks;
|
||||
using com.LandonKey.SocksWebProxy;
|
||||
using com.LandonKey.SocksWebProxy.Proxy;
|
||||
using CloudFlareUtilities;
|
||||
using CloudflareSolverRe;
|
||||
using Jackett.Common.Models.Config;
|
||||
using Jackett.Common.Services.Interfaces;
|
||||
using NLog;
|
||||
|
@ -118,8 +118,8 @@ namespace Jackett.Common.Utils.Clients
|
|||
|
||||
public void CreateClient()
|
||||
{
|
||||
clearanceHandlr = new ClearanceHandler();
|
||||
clearanceHandlr.MaxRetries = 30;
|
||||
clearanceHandlr = new ClearanceHandler(BrowserUtil.ChromeUserAgent);
|
||||
clearanceHandlr.MaxTries = 30;
|
||||
clientHandlr = new HttpClientHandler
|
||||
{
|
||||
CookieContainer = cookies,
|
||||
|
@ -169,10 +169,10 @@ namespace Jackett.Common.Utils.Clients
|
|||
request.Headers.ExpectContinue = false;
|
||||
request.RequestUri = new Uri(webRequest.Url);
|
||||
|
||||
if (webRequest.EmulateBrowser == true)
|
||||
request.Headers.UserAgent.ParseAdd(BrowserUtil.ChromeUserAgent);
|
||||
else
|
||||
request.Headers.UserAgent.ParseAdd("Jackett/" + configService.GetVersion());
|
||||
//if (webRequest.EmulateBrowser == true)
|
||||
// request.Headers.UserAgent.ParseAdd(BrowserUtil.ChromeUserAgent);
|
||||
//else
|
||||
// request.Headers.UserAgent.ParseAdd("Jackett/" + configService.GetVersion());
|
||||
|
||||
// clear cookies from cookiecontainer
|
||||
var oldCookies = cookies.GetCookies(request.RequestUri);
|
||||
|
|
|
@ -9,7 +9,7 @@ using System.Text;
|
|||
using System.Threading.Tasks;
|
||||
using com.LandonKey.SocksWebProxy;
|
||||
using com.LandonKey.SocksWebProxy.Proxy;
|
||||
using CloudFlareUtilities;
|
||||
using CloudflareSolverRe;
|
||||
using Jackett.Common.Models.Config;
|
||||
using Jackett.Common.Services.Interfaces;
|
||||
using NLog;
|
||||
|
@ -150,9 +150,11 @@ namespace Jackett.Common.Utils.Clients
|
|||
}
|
||||
}
|
||||
|
||||
using (ClearanceHandler clearanceHandlr = new ClearanceHandler())
|
||||
string userAgent = webRequest.EmulateBrowser.Value ? BrowserUtil.ChromeUserAgent : "Jackett/" + configService.GetVersion();
|
||||
|
||||
using (ClearanceHandler clearanceHandlr = new ClearanceHandler(userAgent))
|
||||
{
|
||||
clearanceHandlr.MaxRetries = 30;
|
||||
clearanceHandlr.MaxTries = 30;
|
||||
using (HttpClientHandler clientHandlr = new HttpClientHandler
|
||||
{
|
||||
CookieContainer = cookies,
|
||||
|
@ -169,10 +171,10 @@ namespace Jackett.Common.Utils.Clients
|
|||
clearanceHandlr.InnerHandler = clientHandlr;
|
||||
using (var client = new HttpClient(clearanceHandlr))
|
||||
{
|
||||
if (webRequest.EmulateBrowser == true)
|
||||
client.DefaultRequestHeaders.Add("User-Agent", BrowserUtil.ChromeUserAgent);
|
||||
else
|
||||
client.DefaultRequestHeaders.Add("User-Agent", "Jackett/" + configService.GetVersion());
|
||||
//if (webRequest.EmulateBrowser == true)
|
||||
// client.DefaultRequestHeaders.Add("User-Agent", BrowserUtil.ChromeUserAgent);
|
||||
//else
|
||||
// client.DefaultRequestHeaders.Add("User-Agent", "Jackett/" + configService.GetVersion());
|
||||
|
||||
HttpResponseMessage response = null;
|
||||
using (var request = new HttpRequestMessage())
|
||||
|
|
Loading…
Reference in New Issue