Mirrors/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-10-29 23:12:39 +01:00
Code Issues Releases Wiki Activity

Fixed: uTorrent api proxy would fail on specific Win10 configurations. (The Phoenix Rises)

Browse Source 
Moved token queryparam to start since uTorrent requires it.
Fixed handling response missing an expected Set-Cookie header.
Force Cache-Control: no-cache for uTorrent.
Added Connection: KeepAlive to fix inexplicable uTorrent api failure.
This commit is contained in:
Taloth Saldono 2016-03-19 12:13:34 +01:00
parent edea488dbe
commit e1ea17cabf
5 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ namespace NzbDrone.Common.Http.Dispatchers
webRequest.Method = request.Method.ToString();
webRequest.UserAgent = UserAgentBuilder.UserAgent;
webRequest.KeepAlive = false;
webRequest.KeepAlive = request.ConnectionKeepAlive;
webRequest.AllowAutoRedirect = request.AllowAutoRedirect;
webRequest.CookieContainer = cookies;

1
src/NzbDrone.Common/Http/HttpRequest.cs
View File

@ -35,6 +35,7 @@ namespace NzbDrone.Common.Http
public string ContentSummary { get; set; }
public bool SuppressHttpError { get; set; }
public bool AllowAutoRedirect { get; set; }
public bool ConnectionKeepAlive { get; set; }
public Dictionary<string, string> Cookies { get; private set; }
public bool StoreResponseCookie { get; set; }
public TimeSpan RequestTimeout { get; set; }

22
src/NzbDrone.Common/Http/HttpRequestBuilder.cs
View File

@ -20,6 +20,7 @@ namespace NzbDrone.Common.Http
public HttpHeader Headers { get; private set; }
public bool SuppressHttpError { get; set; }
public bool AllowAutoRedirect { get; set; }
public bool ConnectionKeepAlive { get; set; }
public NetworkCredential NetworkCredential { get; set; }
public Dictionary<string, string> Cookies { get; private set; }
public List<HttpFormData> FormData { get; private set; }
@ -98,6 +99,7 @@ namespace NzbDrone.Common.Http
request.Method = Method;
request.SuppressHttpError = SuppressHttpError;
request.AllowAutoRedirect = AllowAutoRedirect;
request.ConnectionKeepAlive = ConnectionKeepAlive;
if (NetworkCredential != null)
{
@ -232,6 +234,13 @@ namespace NzbDrone.Common.Http
return this;
}
public virtual HttpRequestBuilder KeepAlive(bool keepAlive = true)
{
ConnectionKeepAlive = keepAlive;
return this;
}
public virtual HttpRequestBuilder Post()
{
Method = HttpMethod.POST;
@ -253,6 +262,19 @@ namespace NzbDrone.Common.Http
return this;
}
public virtual HttpRequestBuilder AddPrefixQueryParam(string key, object value, bool replace = false)
{
if (replace)
{
QueryParams.RemoveAll(v => v.Key == key);
SuffixQueryParams.RemoveAll(v => v.Key == key);
}
QueryParams.Insert(0, new KeyValuePair<string, string>(key, value.ToString()));
return this;
}
public virtual HttpRequestBuilder AddQueryParam(string key, object value, bool replace = false)
{
if (replace)

12
src/NzbDrone.Common/Http/HttpResponse.cs
View File

@ -61,12 +61,16 @@ namespace NzbDrone.Common.Http
{
var result = new Dictionary<string, string>();
foreach (var cookie in Headers.GetValues("Set-Cookie"))
var setCookieHeaders = Headers.GetValues("Set-Cookie");
if (setCookieHeaders != null)
{
var match = RegexSetCookie.Match(cookie);
if (match.Success)
foreach (var cookie in setCookieHeaders)
{
result[match.Groups[1].Value] = match.Groups[2].Value;
var match = RegexSetCookie.Match(cookie);
if (match.Success)
{
result[match.Groups[1].Value] = match.Groups[2].Value;
}
}
}

4
src/NzbDrone.Core/Download/Clients/uTorrent/UTorrentProxy.cs
View File

@ -158,6 +158,8 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
{
var requestBuilder = new HttpRequestBuilder(false, settings.Host, settings.Port)
.Resource("/gui/")
.KeepAlive()
.SetHeader("Cache-Control", "no-cache")
.Accept(HttpAccept.Json);
requestBuilder.NetworkCredential = new NetworkCredential(settings.Username, settings.Password);
@ -248,7 +250,7 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
}
requestBuilder.SetCookies(cookies);
requestBuilder.AddQueryParam("token", authToken, true);
requestBuilder.AddPrefixQueryParam("token", authToken, true);
}
}
}