Merge branch 'development' into LTS_development

# Conflicts:
#	src/output/output_hds.cpp
This commit is contained in:
Erik Zandvliet 2016-01-26 14:15:17 +01:00
commit 90a53ddf70
9 changed files with 48618 additions and 7 deletions

View file

@ -286,7 +286,7 @@ void HTTP::Parser::SetBody(std::string s) {
/// Function that sets the body of a response or request, along with the correct Content-Length header.
/// \param buffer The buffer data to set the body to.
/// \param len Length of the buffer data.
void HTTP::Parser::SetBody(char * buffer, int len) {
void HTTP::Parser::SetBody(const char * buffer, int len) {
body = "";
body.append(buffer, len);
SetHeader("Content-Length", len);

View file

@ -24,7 +24,7 @@ namespace HTTP {
void setCORSHeaders();
void SetVar(std::string i, std::string v);
void SetBody(std::string s);
void SetBody(char * buffer, int len);
void SetBody(const char * buffer, int len);
std::string & BuildRequest();
std::string & BuildResponse();
std::string & BuildResponse(std::string code, std::string message);