mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix merging issues & API changes - that conflict resolution did not detect

This commit is contained in:
Lloyd Sparkes 2016-04-23 11:06:10 +01:00
parent bfe134ee54
commit 6fdbb2b659
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/NzbDrone.Common/Http/Dispatchers/CurlHttpDispatcher.cs
View File

@ -76,7 +76,7 @@ namespace NzbDrone.Common.Http.Dispatchers
return s * n; 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) switch (request.Proxy.Type)

2
src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs
View File

@ -29,7 +29,7 @@ namespace NzbDrone.Common.Http.Dispatchers
webRequest.Timeout = (int)Math.Ceiling(request.RequestTimeout.TotalMilliseconds); 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 addresses = Dns.GetHostAddresses(request.Proxy.Host);
var socksUsername = request.Proxy.Username == null ? string.Empty : request.Proxy.Username; var socksUsername = request.Proxy.Username == null ? string.Empty : request.Proxy.Username;

1
src/NzbDrone.Common/NzbDrone.Common.csproj
View File

@ -45,6 +45,7 @@
</Reference> </Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.3.0-rc1\lib\net40\NLog.dll</HintPath> <HintPath>..\packages\NLog.4.3.0-rc1\lib\net40\NLog.dll</HintPath>
</Reference>
<Reference Include="Org.Mentalis, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Org.Mentalis, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DotNet4.SocksProxy.1.0.0.0\lib\net40\Org.Mentalis.dll</HintPath> <HintPath>..\packages\DotNet4.SocksProxy.1.0.0.0\lib\net40\Org.Mentalis.dll</HintPath>
<Private>True</Private> <Private>True</Private>

2
src/NzbDrone.Core/HealthCheck/Checks/ProxyCheck.cs
View File

@ -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); 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 try
{ {