jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed at least two bugs when receiving non-standard requests.

Browse source
This commit is contained in:
eidheim 2015-11-24 20:02:11 +01:00
commit 7b5688468a
1 changed files with 30 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

48
server_http.hpp
View file

@ -269,25 +269,30 @@ namespace SimpleWeb {
void parse_request(std::shared_ptr<Request> request, std::istream& stream) const { void parse_request(std::shared_ptr<Request> request, std::istream& stream) const {
std::string line; std::string line;
getline(stream, line); getline(stream, line);
size_t method_end=line.find(' '); size_t method_end;
size_t path_end=line.find(' ', method_end+1); if((method_end=line.find(' '))!=std::string::npos) {
if(method_end!=std::string::npos && path_end!=std::string::npos) { size_t path_end;
request->method=line.substr(0, method_end); if((path_end=line.find(' ', method_end+1))!=std::string::npos) {
request->path=line.substr(method_end+1, path_end-method_end-1); request->method=line.substr(0, method_end);
request->http_version=line.substr(path_end+6, line.size()-path_end-7); request->path=line.substr(method_end+1, path_end-method_end-1);
if((path_end+6)<line.size())
getline(stream, line); request->http_version=line.substr(path_end+6, line.size()-(path_end+6)-1);
size_t param_end=line.find(':'); else
while(param_end!=std::string::npos) { request->http_version="1.0";
size_t value_start=param_end+1;
if(line[value_start]==' ')
value_start++;
std::string key=line.substr(0, param_end);
request->header.insert(std::make_pair(key, line.substr(value_start, line.size()-value_start-1)));
getline(stream, line); getline(stream, line);
param_end=line.find(':'); size_t param_end;
while((param_end=line.find(':'))!=std::string::npos) {
size_t value_start=param_end+1;
if((value_start)<line.size()) {
if(line[value_start]==' ')
value_start++;
if(value_start<line.size())
request->header.insert(std::make_pair(line.substr(0, param_end), line.substr(value_start, line.size()-value_start-1)));
}
getline(stream, line);
}
} }
} }
} }
@ -339,7 +344,14 @@ namespace SimpleWeb {
} }
if(timeout_content>0) if(timeout_content>0)
timer->cancel(); timer->cancel();
if(stof(request->http_version)>1.05) float http_version;
try {
http_version=stof(request->http_version);
}
catch(const std::exception &e) {
return;
}
if(http_version>1.05)
read_request_and_content(socket); read_request_and_content(socket);
}); });
} }