diff --git a/main_http.cpp b/main_http.cpp index 120ac71..466710f 100644 --- a/main_http.cpp +++ b/main_http.cpp @@ -17,7 +17,7 @@ int main() { //Add resources using regular expression for path, a method-string, and an anonymous function //POST-example for the path /string, responds the posted string - server.resources["^/string/?$"]["POST"]=[](ostream& response, Request& request) { + server.resource["^/string/?$"]["POST"]=[](ostream& response, Request& request) { //Retrieve string from istream (*request.content) stringstream ss; *request.content >> ss.rdbuf(); @@ -34,7 +34,7 @@ int main() { // "lastName": "Smith", // "age": 25 //} - server.resources["^/json/?$"]["POST"]=[](ostream& response, Request& request) { + server.resource["^/json/?$"]["POST"]=[](ostream& response, Request& request) { try { ptree pt; read_json(*request.content, pt); @@ -50,7 +50,7 @@ int main() { //GET-example for the path /info //Responds with request-information - server.resources["^/info/?$"]["GET"]=[](ostream& response, Request& request) { + server.resource["^/info/?$"]["GET"]=[](ostream& response, Request& request) { stringstream content_stream; content_stream << "

Request:

"; content_stream << request.method << " " << request.path << " HTTP/" << request.http_version << "
"; @@ -66,7 +66,7 @@ int main() { //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 - server.resources["^/match/([0-9]+)/?$"]["GET"]=[](ostream& response, Request& request) { + server.resource["^/match/([0-9]+)/?$"]["GET"]=[](ostream& response, Request& request) { string number=request.path_match[1]; response << "HTTP/1.1 200 OK\r\nContent-Length: " << number.length() << "\r\n\r\n" << number; }; diff --git a/main_https.cpp b/main_https.cpp index 0e3544a..18676a8 100644 --- a/main_https.cpp +++ b/main_https.cpp @@ -17,7 +17,7 @@ int main() { //Add resources using regular expression for path, a method-string, and an anonymous function //POST-example for the path /string, responds the posted string - server.resources["^/string/?$"]["POST"]=[](ostream& response, Request& request) { + server.resource["^/string/?$"]["POST"]=[](ostream& response, Request& request) { //Retrieve string from istream (*request.content) stringstream ss; *request.content >> ss.rdbuf(); @@ -34,7 +34,7 @@ int main() { // "lastName": "Smith", // "age": 25 //} - server.resources["^/json/?$"]["POST"]=[](ostream& response, Request& request) { + server.resource["^/json/?$"]["POST"]=[](ostream& response, Request& request) { try { ptree pt; read_json(*request.content, pt); @@ -50,7 +50,7 @@ int main() { //GET-example for the path /info //Responds with request-information - server.resources["^/info/?$"]["GET"]=[](ostream& response, Request& request) { + server.resource["^/info/?$"]["GET"]=[](ostream& response, Request& request) { stringstream content_stream; content_stream << "

Request:

"; content_stream << request.method << " " << request.path << " HTTP/" << request.http_version << "
"; @@ -66,7 +66,7 @@ int main() { //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 - server.resources["^/match/([0-9]+)/?$"]["GET"]=[](ostream& response, Request& request) { + server.resource["^/match/([0-9]+)/?$"]["GET"]=[](ostream& response, Request& request) { string number=request.path_match[1]; response << "HTTP/1.1 200 OK\r\nContent-Length: " << number.length() << "\r\n\r\n" << number; }; diff --git a/server_http.hpp b/server_http.hpp index 1264f05..650a432 100644 --- a/server_http.hpp +++ b/server_http.hpp @@ -24,7 +24,7 @@ namespace SimpleWeb { template class ServerBase { public: - resource_type resources; + resource_type resource; resource_type default_resource; @@ -34,7 +34,7 @@ namespace SimpleWeb { void start() { //All resources with default_resource at the end of vector //Used in the respond-method - for(auto it=resources.begin(); it!=resources.end();it++) { + for(auto it=resource.begin(); it!=resource.end();it++) { all_resources.push_back(it); } for(auto it=default_resource.begin(); it!=default_resource.end();it++) {