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

Improved Client::parse_response_header, and simplified endpoint code in Server::start.

Browse source
This commit is contained in:
eidheim 2015-11-26 14:29:43 +01:00
commit e6a3205e18
2 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
client_http.hpp
View file

@ -148,20 +148,23 @@ namespace SimpleWeb {
getline(stream, line); getline(stream, line);
size_t version_end=line.find(' '); size_t version_end=line.find(' ');
if(version_end!=std::string::npos) { if(version_end!=std::string::npos) {
response->http_version=line.substr(5, version_end-5); if(5<line.size())
response->status_code=line.substr(version_end+1, line.size()-version_end-2); response->http_version=line.substr(5, version_end-5);
if((version_end+1)<line.size())
response->status_code=line.substr(version_end+1, line.size()-(version_end+1)-1);
getline(stream, line); getline(stream, line);
size_t param_end=line.find(':'); size_t param_end;
while(param_end!=std::string::npos) { while((param_end=line.find(':'))!=std::string::npos) {
size_t value_start=param_end+1; size_t value_start=param_end+1;
if(line[value_start]==' ') if((value_start)<line.size()) {
value_start++; if(line[value_start]==' ')
value_start++;
response->header[line.substr(0, param_end)]=line.substr(value_start, line.size()-value_start-1); if(value_start<line.size())
response->header.insert(std::make_pair(line.substr(0, param_end), line.substr(value_start, line.size()-value_start-1)));
}
getline(stream, line); getline(stream, line);
param_end=line.find(':');
} }
} }
} }

10
server_http.hpp
View file

@ -137,14 +137,14 @@ namespace SimpleWeb {
if(io_service.stopped()) if(io_service.stopped())
io_service.reset(); io_service.reset();
std::unique_ptr<boost::asio::ip::tcp::endpoint> endpoint; boost::asio::ip::tcp::endpoint endpoint;
if(config.address.size()>0) if(config.address.size()>0)
endpoint=std::unique_ptr<boost::asio::ip::tcp::endpoint>(new boost::asio::ip::tcp::endpoint(boost::asio::ip::address::from_string(config.address), config.port)); endpoint=boost::asio::ip::tcp::endpoint(boost::asio::ip::address::from_string(config.address), config.port);
else else
endpoint=std::unique_ptr<boost::asio::ip::tcp::endpoint>(new boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), config.port)); endpoint=boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), config.port);
acceptor.open(endpoint->protocol()); acceptor.open(endpoint.protocol());
acceptor.set_option(boost::asio::socket_base::reuse_address(config.reuse_address)); acceptor.set_option(boost::asio::socket_base::reuse_address(config.reuse_address));
acceptor.bind(*endpoint); acceptor.bind(endpoint);
acceptor.listen(); acceptor.listen();
accept(); accept();