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

Cleanup of parse_request and connection close support

Browse source
This commit is contained in:
eidheim 2016-03-10 10:09:31 +01:00
commit 931ff3dba2
2 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

47
server_http.hpp
View file

@ -78,8 +78,7 @@ namespace SimpleWeb {
} }
}; };
public: public:
std::string method, path, protocol, http_version; std::string method, path, http_version;
bool con_close;
Content content; Content content;
@ -253,7 +252,8 @@ namespace SimpleWeb {
//streambuf (maybe some bytes of the content) is appended to in the async_read-function below (for retrieving content). //streambuf (maybe some bytes of the content) is appended to in the async_read-function below (for retrieving content).
size_t num_additional_bytes=request->streambuf.size()-bytes_transferred; size_t num_additional_bytes=request->streambuf.size()-bytes_transferred;
parse_request(request, request->content); if(!parse_request(request, request->content))
return;
//If content, read that as well //If content, read that as well
auto it=request->header.find("Content-Length"); auto it=request->header.find("Content-Length");
@ -293,7 +293,7 @@ namespace SimpleWeb {
}); });
} }
void parse_request(std::shared_ptr<Request> request, std::istream& stream) const { bool 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; size_t method_end;
@ -303,17 +303,14 @@ namespace SimpleWeb {
request->method=line.substr(0, method_end); request->method=line.substr(0, method_end);
request->path=line.substr(method_end+1, path_end-method_end-1); request->path=line.substr(method_end+1, path_end-method_end-1);
request->con_close = false; size_t protocol_end;
request->protocol.clear(); if((protocol_end=line.find('/', path_end+1))!=std::string::npos) {
request->http_version.clear(); if(line.substr(path_end+1, protocol_end-path_end-1)!="HTTP")
return false;
size_t proto_end; request->http_version=line.substr(protocol_end+1, line.size()-protocol_end-2);
if((proto_end=line.find('/', path_end+1))!=std::string::npos) {
request->protocol=line.substr(path_end+1, proto_end-path_end-1);
request->http_version=line.substr(proto_end+1, line.size()-(proto_end)-1);
} }
else else
request->http_version="1.0"; return false;
getline(stream, line); getline(stream, line);
@ -323,21 +320,19 @@ namespace SimpleWeb {
if((value_start)<line.size()) { if((value_start)<line.size()) {
if(line[value_start]==' ') if(line[value_start]==' ')
value_start++; value_start++;
if(value_start<line.size()) { if(value_start<line.size())
std::string key = line.substr(0, param_end); request->header.insert(std::make_pair(line.substr(0, param_end), line.substr(value_start, line.size()-value_start-1)));
std::string value = line.substr(value_start, line.size()-value_start-1);
request->header.insert(std::make_pair(key, value));
if(boost::iequals(key, "Connection") && boost::iequals(value, "close"))
request->con_close = true;
}
} }
getline(stream, line); getline(stream, line);
} }
} }
else
return false;
} }
else
return false;
return true;
} }
void find_resource(std::shared_ptr<socket_type> socket, std::shared_ptr<Request> request) { void find_resource(std::shared_ptr<socket_type> socket, std::shared_ptr<Request> request) {
@ -394,7 +389,13 @@ namespace SimpleWeb {
catch(const std::exception &e) { catch(const std::exception &e) {
return; return;
} }
if(http_version>1.05 && !request->con_close)
auto range=request->header.equal_range("Connection");
for(auto it=range.first;it!=range.second;it++) {
if(boost::iequals(it->second, "close"))
return;
}
if(http_version>1.05)
read_request_and_content(socket); read_request_and_content(socket);
}); });
} }

3
test/parse_test.cpp
View file

@ -21,7 +21,8 @@ public:
ss << "TestHeader2:test2\r\n"; ss << "TestHeader2:test2\r\n";
ss << "\r\n"; ss << "\r\n";
parse_request(request, ss); if(!parse_request(request, ss))
return 0;
if(request->method!="GET") if(request->method!="GET")
return 0; return 0;