|
|
|
@ -177,10 +177,7 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|
|
|
|
/// <param name="httpMethod">The HTTP method.</param>
|
|
|
|
|
/// <returns>Task{HttpResponseInfo}.</returns>
|
|
|
|
|
public Task<HttpResponseInfo> SendAsync(HttpRequestOptions options, string httpMethod)
|
|
|
|
|
{
|
|
|
|
|
var httpMethod2 = GetHttpMethod(httpMethod);
|
|
|
|
|
return SendAsync(options, httpMethod2);
|
|
|
|
|
}
|
|
|
|
|
=> SendAsync(options, new HttpMethod(httpMethod));
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// send as an asynchronous operation.
|
|
|
|
@ -216,40 +213,6 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|
|
|
|
return response;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private HttpMethod GetHttpMethod(string httpMethod)
|
|
|
|
|
{
|
|
|
|
|
if (httpMethod.Equals("DELETE", StringComparison.OrdinalIgnoreCase))
|
|
|
|
|
{
|
|
|
|
|
return HttpMethod.Delete;
|
|
|
|
|
}
|
|
|
|
|
else if (httpMethod.Equals("GET", StringComparison.OrdinalIgnoreCase))
|
|
|
|
|
{
|
|
|
|
|
return HttpMethod.Get;
|
|
|
|
|
}
|
|
|
|
|
else if (httpMethod.Equals("HEAD", StringComparison.OrdinalIgnoreCase))
|
|
|
|
|
{
|
|
|
|
|
return HttpMethod.Head;
|
|
|
|
|
}
|
|
|
|
|
else if (httpMethod.Equals("OPTIONS", StringComparison.OrdinalIgnoreCase))
|
|
|
|
|
{
|
|
|
|
|
return HttpMethod.Options;
|
|
|
|
|
}
|
|
|
|
|
else if (httpMethod.Equals("POST", StringComparison.OrdinalIgnoreCase))
|
|
|
|
|
{
|
|
|
|
|
return HttpMethod.Post;
|
|
|
|
|
}
|
|
|
|
|
else if (httpMethod.Equals("PUT", StringComparison.OrdinalIgnoreCase))
|
|
|
|
|
{
|
|
|
|
|
return HttpMethod.Put;
|
|
|
|
|
}
|
|
|
|
|
else if (httpMethod.Equals("TRACE", StringComparison.OrdinalIgnoreCase))
|
|
|
|
|
{
|
|
|
|
|
return HttpMethod.Trace;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
throw new ArgumentException("Invalid HTTP method", nameof(httpMethod));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private HttpResponseInfo GetCachedResponse(string responseCachePath, TimeSpan cacheLength, string url)
|
|
|
|
|
{
|
|
|
|
|
if (File.Exists(responseCachePath)
|
|
|
|
@ -301,23 +264,15 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|
|
|
|
}
|
|
|
|
|
else if (options.RequestContent != null)
|
|
|
|
|
{
|
|
|
|
|
httpWebRequest.Content = new StringContent(options.RequestContent);
|
|
|
|
|
httpWebRequest.Content = new StringContent(
|
|
|
|
|
options.RequestContent,
|
|
|
|
|
null,
|
|
|
|
|
options.RequestContentType);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
httpWebRequest.Content = new ByteArrayContent(Array.Empty<byte>());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// TODO: add correct content type
|
|
|
|
|
/*
|
|
|
|
|
var contentType = options.RequestContentType ?? "application/x-www-form-urlencoded";
|
|
|
|
|
|
|
|
|
|
if (options.AppendCharsetToMimeType)
|
|
|
|
|
{
|
|
|
|
|
contentType = contentType.TrimEnd(';') + "; charset=\"utf-8\"";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
httpWebRequest.Headers.Add(HeaderNames.ContentType, contentType);*/
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (options.LogRequest)
|
|
|
|
|