summaryrefslogtreecommitdiff
path: root/Source/Core/Common/HttpRequest.cpp
diff options
context:
space:
mode:
authorSketch <75850871+SketchMaster2001@users.noreply.github.com>2023-11-11 09:51:46 -0500
committerAdmiral H. Curtiss <pikachu025@gmail.com>2023-12-01 19:52:21 +0100
commit0d908a83e7cc48f7fdee5a308ec92db5c423345f (patch)
treed33b54093c245bf80ab323991de84d094d1562ed /Source/Core/Common/HttpRequest.cpp
parent5f7e9d3bf1e522353fcaad7535e1103055ec550f (diff)
Common/HTTP: Implement Multiform
Diffstat (limited to 'Source/Core/Common/HttpRequest.cpp')
-rw-r--r--Source/Core/Common/HttpRequest.cpp30
1 files changed, 27 insertions, 3 deletions
diff --git a/Source/Core/Common/HttpRequest.cpp b/Source/Core/Common/HttpRequest.cpp
index afc6271542..cf26710372 100644
--- a/Source/Core/Common/HttpRequest.cpp
+++ b/Source/Core/Common/HttpRequest.cpp
@@ -33,7 +33,8 @@ public:
void FollowRedirects(long max);
s32 GetLastResponseCode();
Response Fetch(const std::string& url, Method method, const Headers& headers, const u8* payload,
- size_t size, AllowedReturnCodes codes = AllowedReturnCodes::Ok_Only);
+ size_t size, AllowedReturnCodes codes = AllowedReturnCodes::Ok_Only,
+ std::span<Multiform> multiform = {});
static int CurlProgressCallback(Impl* impl, curl_off_t dltotal, curl_off_t dlnow,
curl_off_t ultotal, curl_off_t ulnow);
@@ -174,6 +175,13 @@ void HttpRequest::Impl::UseIPv4()
curl_easy_setopt(m_curl.get(), CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
}
+HttpRequest::Response HttpRequest::PostMultiform(const std::string& url,
+ std::span<Multiform> multiform,
+ const Headers& headers, AllowedReturnCodes codes)
+{
+ return m_impl->Fetch(url, Impl::Method::POST, headers, nullptr, 0, codes, multiform);
+}
+
void HttpRequest::Impl::FollowRedirects(long max)
{
curl_easy_setopt(m_curl.get(), CURLOPT_FOLLOWLOCATION, 1);
@@ -225,17 +233,33 @@ static size_t header_callback(char* buffer, size_t size, size_t nitems, void* us
HttpRequest::Response HttpRequest::Impl::Fetch(const std::string& url, Method method,
const Headers& headers, const u8* payload,
- size_t size, AllowedReturnCodes codes)
+ size_t size, AllowedReturnCodes codes,
+ std::span<Multiform> multiform)
{
m_response_headers.clear();
curl_easy_setopt(m_curl.get(), CURLOPT_POST, method == Method::POST);
curl_easy_setopt(m_curl.get(), CURLOPT_URL, url.c_str());
- if (method == Method::POST)
+ if (method == Method::POST && multiform.empty())
{
curl_easy_setopt(m_curl.get(), CURLOPT_POSTFIELDS, payload);
curl_easy_setopt(m_curl.get(), CURLOPT_POSTFIELDSIZE, size);
}
+ curl_mime* form = nullptr;
+ Common::ScopeGuard multiform_guard{[&form] { curl_mime_free(form); }};
+ if (!multiform.empty())
+ {
+ form = curl_mime_init(m_curl.get());
+ for (const auto& value : multiform)
+ {
+ curl_mimepart* part = curl_mime_addpart(form);
+ curl_mime_name(part, value.name.c_str());
+ curl_mime_data(part, value.data.c_str(), value.data.size());
+ }
+
+ curl_easy_setopt(m_curl.get(), CURLOPT_MIMEPOST, form);
+ }
+
curl_slist* list = nullptr;
Common::ScopeGuard list_guard{[&list] { curl_slist_free_all(list); }};
for (const auto& [name, value] : headers)