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

Some updates and improved examples and comments

Browse source
This commit is contained in:
eidheim 2014-07-05 17:55:03 +02:00
commit b9a57999d4
3 changed files with 31 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -8,7 +8,7 @@ A very simple, fast, multithreaded and platform independent HTTP server implemen
* Thread pool * Thread pool
* Platform independent * Platform independent
* HTTP persistent connection (for HTTP/1.1) * HTTP persistent connection (for HTTP/1.1)
* Simple way to add REST resources using regex for method and path, and anonymous functions * Simple way to add REST resources using regex for path and anonymous functions
###Usage ###Usage

26
httpserver.cpp
View file

@ -117,22 +117,18 @@ void HTTPServer::respond(shared_ptr<ip::tcp::socket> socket, shared_ptr<Request>
regex e(res.first); regex e(res.first);
smatch sm_res; smatch sm_res;
if(regex_match(request->path, sm_res, e)) { if(regex_match(request->path, sm_res, e)) {
for(auto& res_path: res.second) { if(res.second.count(request->method)>0) {
e=res_path.first; shared_ptr<boost::asio::streambuf> write_buffer(new boost::asio::streambuf);
smatch sm_path; ostream response(write_buffer.get());
if(regex_match(request->method, sm_path, e)) { res.second[request->method](response, *request, sm_res);
shared_ptr<boost::asio::streambuf> write_buffer(new boost::asio::streambuf);
ostream response(write_buffer.get());
res_path.second(response, *request, sm_res);
//Capture write_buffer in lambda so it is not destroyed before async_write is finished //Capture write_buffer in lambda so it is not destroyed before async_write is finished
async_write(*socket, *write_buffer, [this, socket, request, write_buffer](const boost::system::error_code& ec, size_t bytes_transferred) { async_write(*socket, *write_buffer, [this, socket, request, write_buffer](const boost::system::error_code& ec, size_t bytes_transferred) {
//HTTP persistent connection (HTTP 1.1): //HTTP persistent connection (HTTP 1.1):
if(!ec && stof(request->http_version)>1.05) if(!ec && stof(request->http_version)>1.05)
process_request_and_respond(socket); process_request_and_respond(socket);
}); });
return; return;
}
} }
} }
} }

27
main.cpp
View file

@ -10,11 +10,11 @@ using namespace boost::property_tree;
int main() { int main() {
//HTTP-server at port 8080 using 4 threads //HTTP-server at port 8080 using 4 threads
HTTPServer httpserver(8080, 1); HTTPServer httpserver(8080, 4);
//Add resources using regular expressions for path and method //Add resources using regular expression for path, a method-string and an anonymous function
//POST-example for the path /string, responds the posted string //POST-example for the path /string, responds the posted string
httpserver.resources["^/string/?$"]["^POST$"]=[](ostream& response, const Request& request, const smatch& path_match) { httpserver.resources["^/string/?$"]["POST"]=[](ostream& response, const Request& request, const smatch& path_match) {
//Retrieve string from istream (*request.content) //Retrieve string from istream (*request.content)
stringstream ss; stringstream ss;
*request.content >> ss.rdbuf(); *request.content >> ss.rdbuf();
@ -24,14 +24,14 @@ int main() {
}; };
//POST-example for the path /json, responds firstName+" "+lastName from the posted json //POST-example for the path /json, responds firstName+" "+lastName from the posted json
//Responds with an appropriate error message if the posted json is not correct, or if firstName or lastName is missing //Responds with an appropriate error message if the posted json is not valid, or if firstName or lastName is missing
//Example posted json: //Example posted json:
//{ //{
// "firstName": "John", // "firstName": "John",
// "lastName": "Smith", // "lastName": "Smith",
// "age": 25 // "age": 25
//} //}
httpserver.resources["^/json/?$"]["^POST$"]=[](ostream& response, const Request& request, const smatch& path_match) { httpserver.resources["^/json/?$"]["POST"]=[](ostream& response, const Request& request, const smatch& path_match) {
ptree pt; ptree pt;
try { try {
read_json(*request.content, pt); read_json(*request.content, pt);
@ -46,13 +46,24 @@ int main() {
}; };
//GET-example for the path / //GET-example for the path /
httpserver.resources["^/$"]["^GET$"]=[](ostream& response, const Request& request, const smatch& path_match) { //Responds with request-information
response << "HTTP/1.1 200 OK\r\nContent-Length: 13\r\n\r\nRoot resource"; httpserver.resources["^/$"]["GET"]=[](ostream& response, const Request& request, const smatch& path_match) {
stringstream content_stream;
content_stream << "<h1>Request:</h1>";
content_stream << request.method << " " << request.path << " HTTP/" << request.http_version << "<br>";
for(auto& header: request.header) {
content_stream << header.first << ": " << header.second << "<br>";
}
//find length of content_stream (length received using content_stream.tellp())
content_stream.seekp(0, ios::end);
response << "HTTP/1.1 200 OK\r\nContent-Length: " << content_stream.tellp() << "\r\n\r\n" << content_stream.rdbuf();
}; };
//GET-example for the path /match/[number], responds with the matched string in path (number) //GET-example for the path /match/[number], responds with the matched string in path (number)
//For instance a request GET /match/123 will receive: 123 //For instance a request GET /match/123 will receive: 123
httpserver.resources["^/match/([0-9]*)/?$"]["^GET$"]=[](ostream& response, const Request& request, const smatch& path_match) { httpserver.resources["^/match/([0-9]+)/?$"]["GET"]=[](ostream& response, const Request& request, const smatch& path_match) {
string number=path_match[1]; string number=path_match[1];
response << "HTTP/1.1 200 OK\r\nContent-Length: " << number.length() << "\r\n\r\n" << number; response << "HTTP/1.1 200 OK\r\nContent-Length: " << number.length() << "\r\n\r\n" << number;
}; };