hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2020-09-24 20:01:51 +02:00
commit 8ba7baea98
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/http_parser.cpp
View file

@ -34,6 +34,7 @@ void HTTP::Parser::Clean(){
void HTTP::Parser::CleanPreserveHeaders(){ void HTTP::Parser::CleanPreserveHeaders(){
seenHeaders = false; seenHeaders = false;
seenReq = false; seenReq = false;
possiblyComplete = false;
getChunks = false; getChunks = false;
doingChunk = 0; doingChunk = 0;
bufferChunks = false; bufferChunks = false;
@ -498,6 +499,10 @@ void HTTP::Parser::SetVar(std::string i, std::string v){
/// returned. If not, as much as can be interpreted is removed and false returned. \param conn The /// returned. If not, as much as can be interpreted is removed and false returned. \param conn The
/// socket to read from. \return True if a whole request or response was read, false otherwise. /// socket to read from. \return True if a whole request or response was read, false otherwise.
bool HTTP::Parser::Read(Socket::Connection &conn, Util::DataCallback &cb){ bool HTTP::Parser::Read(Socket::Connection &conn, Util::DataCallback &cb){
//In this case, we might have a broken connection and need to check if we're done
if (!conn.Received().size()){
return (parse(conn.Received().get(), cb) && (!possiblyComplete || !conn || !JSON::Value(url).asInt()));
}
while (conn.Received().size()){ while (conn.Received().size()){
// Make sure the received data ends in a newline (\n). // Make sure the received data ends in a newline (\n).
while ((!seenHeaders || (getChunks && !doingChunk)) && conn.Received().get().size() && while ((!seenHeaders || (getChunks && !doingChunk)) && conn.Received().get().size() &&
@ -516,8 +521,7 @@ bool HTTP::Parser::Read(Socket::Connection &conn, Util::DataCallback &cb){
} }
// return true if a parse succeeds, and is not a request // return true if a parse succeeds, and is not a request
if (parse(conn.Received().get(), cb) && (!JSON::Value(url).isInt() || headerOnly || length || if (parse(conn.Received().get(), cb) && (!possiblyComplete || !conn || !JSON::Value(url).asInt())){
getChunks || (!conn && !conn.Received().size()))){
return true; return true;
} }
} }
@ -625,7 +629,7 @@ bool HTTP::Parser::parse(std::string &HTTPbuffer, Util::DataCallback &cb){
} }
if (seenHeaders){ if (seenHeaders){
if (headerOnly){return true;} if (headerOnly){return true;}
if (length > 0){ if (length > 0 && !getChunks){
unsigned int toappend = length - body.length(); unsigned int toappend = length - body.length();
// limit the amount of bytes that will be appended to the amount there // limit the amount of bytes that will be appended to the amount there
@ -723,12 +727,13 @@ bool HTTP::Parser::parse(std::string &HTTPbuffer, Util::DataCallback &cb){
HTTPbuffer.erase(0, toappend); HTTPbuffer.erase(0, toappend);
// return true if there is no body, otherwise we only stop when the connection is dropped // return true if there is no body, otherwise we only stop when the connection is dropped
possiblyComplete = true;
return true; return true;
} }
} }
} }
} }
return false; // empty input return possiblyComplete; // empty input
}// HTTPReader::parse }// HTTPReader::parse
/// HTTP variable parser to std::map<std::string, std::string> structure. /// HTTP variable parser to std::map<std::string, std::string> structure.

1
lib/http_parser.h
View file

@ -68,6 +68,7 @@ namespace HTTP{
bool seenHeaders; bool seenHeaders;
bool seenReq; bool seenReq;
bool getChunks; bool getChunks;
bool possiblyComplete;
unsigned int doingChunk; unsigned int doingChunk;
bool parse(std::string &HTTPbuffer, Util::DataCallback &cb = Util::defaultDataCallback); bool parse(std::string &HTTPbuffer, Util::DataCallback &cb = Util::defaultDataCallback);
std::string builder; std::string builder;