mirror of
https://github.com/Radarr/Radarr
synced 2025-02-27 16:42:46 +00:00
Fixed curl multithreaded access.
This commit is contained in:
parent
7bc4249ede
commit
786e0b825a
1 changed files with 58 additions and 52 deletions
|
@ -40,56 +40,59 @@ public static bool CheckAvailability()
|
||||||
|
|
||||||
public HttpResponse GetResponse(HttpRequest httpRequest, HttpWebRequest webRequest)
|
public HttpResponse GetResponse(HttpRequest httpRequest, HttpWebRequest webRequest)
|
||||||
{
|
{
|
||||||
Stream responseStream = new MemoryStream();
|
lock (CurlGlobalHandle.Instance)
|
||||||
Stream headerStream = new MemoryStream();
|
|
||||||
|
|
||||||
var curlEasy = new CurlEasy();
|
|
||||||
curlEasy.AutoReferer = false;
|
|
||||||
curlEasy.WriteFunction = (b, s, n, o) =>
|
|
||||||
{
|
{
|
||||||
responseStream.Write(b, 0, s * n);
|
Stream responseStream = new MemoryStream();
|
||||||
return s * n;
|
Stream headerStream = new MemoryStream();
|
||||||
};
|
|
||||||
curlEasy.HeaderFunction = (b, s, n, o) =>
|
|
||||||
{
|
|
||||||
headerStream.Write(b, 0, s * n);
|
|
||||||
return s * n;
|
|
||||||
};
|
|
||||||
|
|
||||||
curlEasy.UserAgent = webRequest.UserAgent;
|
var curlEasy = new CurlEasy();
|
||||||
curlEasy.FollowLocation = webRequest.AllowAutoRedirect;
|
curlEasy.AutoReferer = false;
|
||||||
curlEasy.HttpGet = webRequest.Method == "GET";
|
curlEasy.WriteFunction = (b, s, n, o) =>
|
||||||
curlEasy.Post = webRequest.Method == "POST";
|
{
|
||||||
curlEasy.Put = webRequest.Method == "PUT";
|
responseStream.Write(b, 0, s * n);
|
||||||
curlEasy.Url = webRequest.RequestUri.ToString();
|
return s * n;
|
||||||
|
};
|
||||||
|
curlEasy.HeaderFunction = (b, s, n, o) =>
|
||||||
|
{
|
||||||
|
headerStream.Write(b, 0, s * n);
|
||||||
|
return s * n;
|
||||||
|
};
|
||||||
|
|
||||||
if (webRequest.CookieContainer != null)
|
curlEasy.UserAgent = webRequest.UserAgent;
|
||||||
{
|
curlEasy.FollowLocation = webRequest.AllowAutoRedirect;
|
||||||
curlEasy.Cookie = webRequest.CookieContainer.GetCookieHeader(webRequest.RequestUri);
|
curlEasy.HttpGet = webRequest.Method == "GET";
|
||||||
|
curlEasy.Post = webRequest.Method == "POST";
|
||||||
|
curlEasy.Put = webRequest.Method == "PUT";
|
||||||
|
curlEasy.Url = webRequest.RequestUri.ToString();
|
||||||
|
|
||||||
|
if (webRequest.CookieContainer != null)
|
||||||
|
{
|
||||||
|
curlEasy.Cookie = webRequest.CookieContainer.GetCookieHeader(webRequest.RequestUri);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!httpRequest.Body.IsNullOrWhiteSpace())
|
||||||
|
{
|
||||||
|
// TODO: This might not go well with encoding.
|
||||||
|
curlEasy.PostFields = httpRequest.Body;
|
||||||
|
curlEasy.PostFieldSize = httpRequest.Body.Length;
|
||||||
|
}
|
||||||
|
|
||||||
|
curlEasy.HttpHeader = SerializeHeaders(webRequest);
|
||||||
|
|
||||||
|
var result = curlEasy.Perform();
|
||||||
|
|
||||||
|
if (result != CurlCode.Ok)
|
||||||
|
{
|
||||||
|
throw new WebException(string.Format("Curl Error {0} for Url {1}", result, curlEasy.Url));
|
||||||
|
}
|
||||||
|
|
||||||
|
var webHeaderCollection = ProcessHeaderStream(webRequest, headerStream);
|
||||||
|
var responseData = ProcessResponseStream(webRequest, responseStream, webHeaderCollection);
|
||||||
|
|
||||||
|
var httpHeader = new HttpHeader(webHeaderCollection);
|
||||||
|
|
||||||
|
return new HttpResponse(httpRequest, httpHeader, responseData, (HttpStatusCode)curlEasy.ResponseCode);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!httpRequest.Body.IsNullOrWhiteSpace())
|
|
||||||
{
|
|
||||||
// TODO: This might not go well with encoding.
|
|
||||||
curlEasy.PostFields = httpRequest.Body;
|
|
||||||
curlEasy.PostFieldSize = httpRequest.Body.Length;
|
|
||||||
}
|
|
||||||
|
|
||||||
curlEasy.HttpHeader = SerializeHeaders(webRequest);
|
|
||||||
|
|
||||||
var result = curlEasy.Perform();
|
|
||||||
|
|
||||||
if (result != CurlCode.Ok)
|
|
||||||
{
|
|
||||||
throw new WebException(string.Format("Curl Error {0} for Url {1}", result, curlEasy.Url));
|
|
||||||
}
|
|
||||||
|
|
||||||
var webHeaderCollection = ProcessHeaderStream(webRequest, headerStream);
|
|
||||||
var responseData = ProcessResponseStream(webRequest, responseStream, webHeaderCollection);
|
|
||||||
|
|
||||||
var httpHeader = new HttpHeader(webHeaderCollection);
|
|
||||||
|
|
||||||
return new HttpResponse(httpRequest, httpHeader, responseData, (HttpStatusCode)curlEasy.ResponseCode);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private CurlSlist SerializeHeaders(HttpWebRequest webRequest)
|
private CurlSlist SerializeHeaders(HttpWebRequest webRequest)
|
||||||
|
@ -206,13 +209,16 @@ private CurlGlobalHandle()
|
||||||
|
|
||||||
public bool Initialize()
|
public bool Initialize()
|
||||||
{
|
{
|
||||||
if (_initialized)
|
lock (CurlGlobalHandle.Instance)
|
||||||
|
{
|
||||||
|
if (_initialized)
|
||||||
|
return _available;
|
||||||
|
|
||||||
|
_initialized = true;
|
||||||
|
_available = Curl.GlobalInit(CurlInitFlag.All) == CurlCode.Ok;
|
||||||
|
|
||||||
return _available;
|
return _available;
|
||||||
|
}
|
||||||
_initialized = true;
|
|
||||||
_available = Curl.GlobalInit(CurlInitFlag.All) == CurlCode.Ok;
|
|
||||||
|
|
||||||
return _available;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override bool ReleaseHandle()
|
protected override bool ReleaseHandle()
|
||||||
|
|
Loading…
Reference in a new issue