From 6fdbb2b659421d84608816e7f2238a08fca1c2ee Mon Sep 17 00:00:00 2001 From: Lloyd Sparkes Date: Sat, 23 Apr 2016 11:06:10 +0100 Subject: [PATCH] Fix merging issues & API changes - that conflict resolution did not detect --- src/NzbDrone.Common/Http/Dispatchers/CurlHttpDispatcher.cs | 2 +- src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs | 2 +- src/NzbDrone.Common/NzbDrone.Common.csproj | 1 + src/NzbDrone.Core/HealthCheck/Checks/ProxyCheck.cs | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/NzbDrone.Common/Http/Dispatchers/CurlHttpDispatcher.cs b/src/NzbDrone.Common/Http/Dispatchers/CurlHttpDispatcher.cs index 0a06d64d1..109e673d6 100644 --- a/src/NzbDrone.Common/Http/Dispatchers/CurlHttpDispatcher.cs +++ b/src/NzbDrone.Common/Http/Dispatchers/CurlHttpDispatcher.cs @@ -76,7 +76,7 @@ namespace NzbDrone.Common.Http.Dispatchers return s * n; }; - if(request.Proxy != null && !request.Proxy.ShouldProxyBeBypassed(request.Url)) + if(request.Proxy != null && !request.Proxy.ShouldProxyBeBypassed(new Uri(request.Url.FullUri))) { switch (request.Proxy.Type) diff --git a/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs b/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs index 8c6e55633..1a94a92b6 100644 --- a/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs +++ b/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs @@ -29,7 +29,7 @@ namespace NzbDrone.Common.Http.Dispatchers webRequest.Timeout = (int)Math.Ceiling(request.RequestTimeout.TotalMilliseconds); } - if (request.Proxy != null && !request.Proxy.ShouldProxyBeBypassed(request.Url)) + if (request.Proxy != null && !request.Proxy.ShouldProxyBeBypassed(new Uri(request.Url.FullUri))) { var addresses = Dns.GetHostAddresses(request.Proxy.Host); var socksUsername = request.Proxy.Username == null ? string.Empty : request.Proxy.Username; diff --git a/src/NzbDrone.Common/NzbDrone.Common.csproj b/src/NzbDrone.Common/NzbDrone.Common.csproj index 5fe24e16d..8d040a199 100644 --- a/src/NzbDrone.Common/NzbDrone.Common.csproj +++ b/src/NzbDrone.Common/NzbDrone.Common.csproj @@ -45,6 +45,7 @@ ..\packages\NLog.4.3.0-rc1\lib\net40\NLog.dll + ..\packages\DotNet4.SocksProxy.1.0.0.0\lib\net40\Org.Mentalis.dll True diff --git a/src/NzbDrone.Core/HealthCheck/Checks/ProxyCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/ProxyCheck.cs index ede53acf2..9266a44f7 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/ProxyCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/ProxyCheck.cs @@ -32,7 +32,7 @@ namespace NzbDrone.Core.HealthCheck.Checks return new HealthCheck(GetType(), HealthCheckResult.Error, "Failed to resolve the IP Address for the Configured Proxy Host: " + _configService.ProxyHostname); } - var request = new HttpRequestBuilder("https://services.sonarr.tv/").Build("/ping"); + var request = new HttpRequestBuilder("https://services.sonarr.tv/ping").Build(); try {