Fix #4982: replaced CloudFlareUtilities with CloudflareSolverRe (#5897)

This commit is contained in:
Hazem Ahmed Amr
2019-08-22 21:35:49 +02:00
committed by garfield69
parent d343046e61
commit 90c224fdea
5 changed files with 25 additions and 21 deletions

View File

@@ -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())