github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-02 06:06:59 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: HttpRequest multipart support

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6158 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-06-29 18:52:38 +00:00
parent 243ed78eb3
commit 54be50c44c
6 changed files with 47 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
uppsrc/Core/Http.cpp
View file

@ -118,6 +118,25 @@ HttpRequest& HttpRequest::Post(const char *id, const String& data)
return *this;
}
HttpRequest& HttpRequest::Part(const char *id, const String& data,
const char *content_type, const char *filename)
{
if(IsNull(multipart)) {
POST();
multipart = AsString(Uuid::Create());
ContentType("multipart/form-data; boundary=" + multipart);
}
postdata << "--" << multipart << "\r\n"
<< "Content-Disposition: form-data; name=\"" << id << "\"";
if(filename && *filename)
postdata << "; filename=\"" << filename << "\"";
postdata << "\r\n";
if(content_type && *content_type)
postdata << "Content-Type: " << content_type << "\r\n";
postdata << "\r\n" << data << "\r\n";
return *this;
}
HttpRequest& HttpRequest::UrlVar(const char *id, const String& data)
{
int c = *path.Last();
@ -481,6 +500,8 @@ void HttpRequest::StartRequest()
}
data << " HTTP/1.1\r\n";
String pd = postdata;
if(!IsNull(multipart))
pd << "--" << multipart << "--\r\n";
if(method == METHOD_GET || method == METHOD_HEAD)
pd.Clear();
if(std_headers) {
@ -521,7 +542,8 @@ void HttpRequest::StartRequest()
else
if(!force_digest && (!IsNull(username) || !IsNull(password)))
data << "Authorization: Basic " << Base64Encode(username + ":" + password) << "\r\n";
data << request_headers << "\r\n" << pd;
data << request_headers;
data << "\r\n" << pd;
LLOG("HTTP REQUEST " << host << ":" << port);
LLOG("HTTP request:\n" << data);
}
@ -717,7 +739,6 @@ void HttpRequest::Finish()
}
if(status_code >= 300 && status_code < 400) {
String url = GetRedirectUrl();
GET();
if(url.GetCount() && redirect_count++ < max_redirects) {
LLOG("--- HTTP redirect " << url);
Url(url);
@ -752,6 +773,8 @@ String HttpRequest::GetPhaseName() const
"Receiving chunk header",
"Receiving content chunk",
"Receiving trailer",
"Request with continue",
"Waiting for continue header",
"Finished",
"Failed",
};