mirror of
https://github.com/ShareX/ShareX.git
synced 2024-09-30 01:07:21 +13:00
Use SendRequest in Amazon S3 and Azure Storage
This commit is contained in:
parent
4fcb1dd358
commit
bee6373ccd
2 changed files with 15 additions and 22 deletions
|
@ -190,21 +190,15 @@ public override UploadResult Upload(Stream stream, string fileName)
|
|||
string url = URLHelpers.CombineURL(host, canonicalURI);
|
||||
url = URLHelpers.ForcePrefix(url, "https://");
|
||||
|
||||
using (HttpWebResponse response = GetResponse(HttpMethod.PUT, url, stream, contentType, null, headers))
|
||||
{
|
||||
if (response != null)
|
||||
{
|
||||
NameValueCollection responseHeaders = response.Headers;
|
||||
SendRequest(HttpMethod.PUT, url, stream, contentType, null, headers);
|
||||
|
||||
if (responseHeaders != null && responseHeaders["ETag"] != null)
|
||||
{
|
||||
return new UploadResult
|
||||
{
|
||||
IsSuccess = true,
|
||||
URL = resultURL
|
||||
};
|
||||
}
|
||||
}
|
||||
if (LastResponseInfo != null && LastResponseInfo.Headers != null && LastResponseInfo.Headers["ETag"] != null)
|
||||
{
|
||||
return new UploadResult
|
||||
{
|
||||
IsSuccess = true,
|
||||
URL = resultURL
|
||||
};
|
||||
}
|
||||
|
||||
Errors.Add("Upload to Amazon S3 failed.");
|
||||
|
|
|
@ -108,16 +108,15 @@ public override UploadResult Upload(Stream stream, string fileName)
|
|||
|
||||
requestHeaders["Authorization"] = $"SharedKey {AzureStorageAccountName}:{stringToSign}";
|
||||
|
||||
using (HttpWebResponse response = GetResponse(HttpMethod.PUT, url, stream, contentType, null, requestHeaders, null))
|
||||
SendRequest(HttpMethod.PUT, url, stream, contentType, null, requestHeaders);
|
||||
|
||||
if (LastResponseInfo != null && LastResponseInfo.Headers != null && LastResponseInfo.Headers["ETag"] != null)
|
||||
{
|
||||
if (response != null && response.Headers != null)
|
||||
return new UploadResult
|
||||
{
|
||||
return new UploadResult
|
||||
{
|
||||
IsSuccess = true,
|
||||
URL = GenerateURL(uploadPath)
|
||||
};
|
||||
}
|
||||
IsSuccess = true,
|
||||
URL = GenerateURL(uploadPath)
|
||||
};
|
||||
}
|
||||
|
||||
Errors.Add("Upload failed.");
|
||||
|
|
Loading…
Reference in a new issue