GitHub-Mirror/minihttp
2
0
Fork 0
mirror of https://github.com/Fishwaldo/minihttp.git synced 2025-07-06 12:58:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow supplying custom headers in HTTP request

Browse source
This commit is contained in:
fgenesis 2015-04-29 20:49:17 +02:00
parent 587deb0e0e
commit 68e6e1ecd2
2 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
minihttp.cpp
View file

@ -726,25 +726,31 @@ bool HttpSocket::_OnUpdate()
return true;
}
bool HttpSocket::Download(const std::string& url, void *user /* = NULL */)
bool HttpSocket::Download(const std::string& url, const char *extraRequest /*= NULL*/, void *user /* = NULL */)
{
Request req;
req.user = user;
SplitURI(url, req.host, req.resource, req.port, req.useSSL);
if(req.port < 0)
req.port = req.useSSL ? 443 : 80;
if(extraRequest)
req.extraGetHeaders = extraRequest;
return SendGet(req, false);
}
bool HttpSocket::SendGet(const std::string what, void *user /* = NULL */)
bool HttpSocket::SendGet(const std::string what, const char *extraRequest /*= NULL*/, void *user /* = NULL */)
{
Request req(what, _host, _lastport, user);
if(extraRequest)
req.extraGetHeaders = extraRequest;
return SendGet(req, false);
}
bool HttpSocket::QueueGet(const std::string what, void *user /* = NULL */)
bool HttpSocket::QueueGet(const std::string what, const char *extraRequest /*= NULL*/, void *user /* = NULL */)
{
Request req(what, _host, _lastport, user);
if(extraRequest)
req.extraGetHeaders = extraRequest;
return SendGet(req, true);
}
@ -771,6 +777,13 @@ bool HttpSocket::SendGet(Request& req, bool enqueue)
if(_accept_encoding.length())
r << "Accept-Encoding: " << _accept_encoding << crlf;
if(req.extraGetHeaders.length())
{
r << req.extraGetHeaders;
if(req.extraGetHeaders.compare(req.extraGetHeaders.length() - 2, std::string::npos, crlf))
r << crlf;
}
r << crlf; // header terminator
req.header = r.str();
@ -967,7 +980,7 @@ bool HttpSocket::_HandleStatus()
if(const char *loc = Hdr("location"))
{
traceprint("Following HTTP redirect to: %s\n", loc);
Download(loc, _curRequest.user);
Download(loc, _curRequest.extraGetHeaders.c_str(), _curRequest.user);
}
return false;

7
minihttp.h
View file

@ -129,6 +129,7 @@ struct Request
std::string host;
std::string header; // set by socket
std::string resource;
std::string extraGetHeaders;
int port;
void *user;
bool useSSL;
@ -152,10 +153,10 @@ public:
void SetFollowRedirect(bool follow) { _followRedir = follow; }
void SetAlwaysHandle(bool h) { _alwaysHandle = h; }
bool Download(const std::string& url, void *user = NULL);
bool Download(const std::string& url, const char *extraRequest = NULL, void *user = NULL);
bool SendGet(Request& what, bool enqueue);
bool SendGet(const std::string what, void *user = NULL);
bool QueueGet(const std::string what, void *user = NULL);
bool SendGet(const std::string what, const char *extraRequest = NULL, void *user = NULL);
bool QueueGet(const std::string what, const char *extraRequest = NULL, void *user = NULL);
unsigned int GetRemaining() const { return _remaining; }