diff --git a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs index be7d2a81e..46d951b95 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs @@ -945,6 +945,11 @@ namespace NzbDrone.Core.Indexers.Cardigann public bool CheckIfLoginIsNeeded(HttpResponse response) { + if (_definition.Login == null || _definition.Login.Test == null) + { + return false; + } + if (response.HasHttpRedirect) { var domainHint = GetRedirectDomainHint(response); @@ -958,11 +963,6 @@ namespace NzbDrone.Core.Indexers.Cardigann return true; } - if (_definition.Login == null || _definition.Login.Test == null) - { - return false; - } - if (response.HasHttpError) { return true; @@ -1124,6 +1124,8 @@ namespace NzbDrone.Core.Indexers.Cardigann var request = new CardigannRequest(requestbuilder.SetEncoding(_encoding).Build(), variables, searchPath); + request.HttpRequest.AllowAutoRedirect = searchPath.Followredirect; + yield return request; } } diff --git a/src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabRequestGenerator.cs index 08a05debb..4ca28f18e 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabRequestGenerator.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Collections.Specialized; using System.Linq; +using DryIoc; using NzbDrone.Common.Extensions; using NzbDrone.Common.Http; using NzbDrone.Core.IndexerSearch.Definitions; @@ -268,7 +269,10 @@ namespace NzbDrone.Core.Indexers.Newznab parameters.Add("offset", searchCriteria.Offset.ToString()); } - yield return new IndexerRequest(string.Format("{0}&{1}", baseUrl, parameters.GetQueryString()), HttpAccept.Rss); + var request = new IndexerRequest(string.Format("{0}&{1}", baseUrl, parameters.GetQueryString()), HttpAccept.Rss); + request.HttpRequest.AllowAutoRedirect = true; + + yield return request; } private static string NewsnabifyTitle(string title) diff --git a/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs b/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs index 802803997..7ab4417a4 100644 --- a/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs +++ b/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs @@ -355,8 +355,6 @@ namespace NzbDrone.Core.Indexers request.HttpRequest.LogResponseContent = true; } - request.HttpRequest.AllowAutoRedirect = FollowRedirect; - var originalUrl = request.Url; Cookies = GetCookies();