Merge pull request #151 from etr/body_methods_2

Enable body for delete requests and enable patch requests

Author: etr

ChangeLog

@@ -1,4 +1,8 @@
-Sat Jan 27 21:59:11 2018 -0800
+Tue Aug 06 22:22:14 2019 -0800
+	Added support for body parsing in DELETE requests.
+	Added support for PATCH method
+
+Sat Jan 27 21:59:11 2019 -0800
 	libhttpserver now includes set of examples to demonstrate the main capabilities of the library
 	"examples" are now optionally disabled.
 	Adds valgrind memcheck to the build system on travis
@@ -7,7 +11,7 @@ Sat Jan 27 21:59:11 2018 -0800
 	All classes now implement move constructor and move assignment operator
 	The library now avoids collecting connection properties (headers, arguments, footers, cookies, etc...) unless explicitly asked by the client code.
 
-Sat Jan 12 00:51:00 2018 -0800
+Sat Jan 12 00:51:00 2019 -0800
 	Removed the support for integrated COMET logic.
 	Removed the support for caching logic.
 	Added integ tests.

src/http_resource.cpp

@@ -43,6 +43,7 @@ void resource_init(map<string, bool>& allowed_methods)
     allowed_methods[MHD_HTTP_METHOD_TRACE] = true;
     allowed_methods[MHD_HTTP_METHOD_CONNECT] = true;
     allowed_methods[MHD_HTTP_METHOD_OPTIONS] = true;
+    allowed_methods[MHD_HTTP_METHOD_PATCH] = true;
 }
 
 namespace details

src/http_utils.cpp

@@ -205,6 +205,7 @@ const std::string http_utils::http_method_options = MHD_HTTP_METHOD_OPTIONS;
 const std::string http_utils::http_method_post = MHD_HTTP_METHOD_POST;
 const std::string http_utils::http_method_put = MHD_HTTP_METHOD_PUT;
 const std::string http_utils::http_method_trace = MHD_HTTP_METHOD_TRACE;
+const std::string http_utils::http_method_patch = MHD_HTTP_METHOD_PATCH;
 
 const std::string http_utils::http_post_encoding_form_urlencoded =
     MHD_HTTP_POST_ENCODING_FORM_URLENCODED;

src/httpserver/http_resource.hpp

@@ -136,6 +136,15 @@ class http_resource
         {
             return render(req);
         }
+        /**
+         * Method used to answer to a PATCH request
+         * @param req Request passed through http
+         * @return A http_response object
+        **/
+        virtual const std::shared_ptr<http_response> render_PATCH(const http_request& req)
+        {
+            return render(req);
+        }
         /**
          * Method used to answer to a CONNECT request
          * @param req Request passed through http

src/httpserver/http_utils.hpp

@@ -102,6 +102,7 @@ class http_utils
     static const short http_method_post_code;
     static const short http_method_put_code;
     static const short http_method_trace_code;
+    static const short http_method_patch_code;
     static const short http_method_unknown_code;
 
     static const int http_continue;
@@ -224,6 +225,7 @@ class http_utils
     static const std::string http_method_post;
     static const std::string http_method_put;
     static const std::string http_method_trace;
+    static const std::string http_method_patch;
 
     static const std::string http_post_encoding_form_urlencoded;
     static const std::string http_post_encoding_multipart_formdata;

src/webserver.cpp

@@ -787,6 +787,12 @@ int webserver::answer_to_connection(void* cls, MHD_Connection* connection,
     else if (0 == strcasecmp(method,http_utils::http_method_delete.c_str()))
     {
         mr->callback = &http_resource::render_DELETE;
+        body = true;
+    }
+    else if (0 == strcasecmp(method, http_utils::http_method_patch.c_str()))
+    {
+        mr->callback = &http_resource::render_PATCH;
+        body = true;
     }
     else if (0 == strcasecmp(method, http_utils::http_method_head.c_str()))
     {

test/integ/basic.cpp

@@ -158,6 +158,10 @@ class complete_test_resource : public http_resource
         {
             return shared_ptr<string_response>(new string_response("OK", 200, "text/plain"));
         }
+        const shared_ptr<http_response> render_PATCH(const http_request& req)
+        {
+            return shared_ptr<string_response>(new string_response("OK", 200, "text/plain"));
+        }
 };
 
 class only_render_resource : public http_resource
@@ -483,6 +487,14 @@ LT_BEGIN_AUTO_TEST(basic_suite, complete)
     curl_easy_cleanup(curl);
     }
 
+    {
+    CURL* curl = curl_easy_init();
+    curl_easy_setopt(curl, CURLOPT_URL, "localhost:8080/base");
+    curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PATCH");
+    CURLcode res = curl_easy_perform(curl);
+    LT_ASSERT_EQ(res, 0);
+    curl_easy_cleanup(curl);
+    }
 /*
     {
     CURL* curl = curl_easy_init();