Solved a logical error in http_resource route

Sebastiano Merlino · Sebastiano Merlino · commit 1f53fb0a3e0e · 2012-07-23T15:42:33.000+02:00
Added some debug prints
diff --git a/src/http_resource.cpp b/src/http_resource.cpp
@@ -39,6 +39,14 @@ http_resource::http_resource()
     this->allowed_methods[MHD_HTTP_METHOD_TRACE] = true;
     this->allowed_methods[MHD_HTTP_METHOD_CONNECT] = true;
     this->allowed_methods[MHD_HTTP_METHOD_OPTIONS] = true;
+#ifdef DEBUG
+    std::map<std::string, bool>::iterator it;
+    for(it = allowed_methods.begin(); it != allowed_methods.end(); it++)
+    {
+        std::cout << (*it).first << " -> " << (*it).second << std::endl;
+    }
+#endif //DEBUG
+
 }
 
 http_resource::~http_resource() 
@@ -47,14 +55,7 @@ http_resource::~http_resource()
 
 http_response http_resource::render(const http_request& r) 
 {
-    if(this->is_allowed(r.get_method()))
-    {
-        return this->render_404();
-    } 
-    else 
-    {
-        return this->render_405();
-    }
+    return this->render_404();
 }
 
 http_response http_resource::render_404() 
@@ -120,41 +121,48 @@ http_response http_resource::route_request(const http_request& r)
 
     http_response res;
 
-    if(method == MHD_HTTP_METHOD_GET) 
-    {
-        res = this->render_GET(r);
-    } 
-    else if (method == MHD_HTTP_METHOD_POST) 
+    if(this->is_allowed(method))
     {
-        res = this->render_POST(r);
-    } 
-    else if (method == MHD_HTTP_METHOD_PUT) 
-    {
-        res = this->render_PUT(r);
-    } 
-    else if (method == MHD_HTTP_METHOD_DELETE) 
-    {
-        res = this->render_DELETE(r);
-    } 
-    else if (method == MHD_HTTP_METHOD_HEAD) 
-    {
-        res = this->render_HEAD(r);
-    } 
-    else if (method == MHD_HTTP_METHOD_TRACE) 
-    {
-        res = this->render_TRACE(r);
-    } 
-    else if (method == MHD_HTTP_METHOD_OPTIONS) 
-    {
-        res = this->render_OPTIONS(r);
-    } 
-    else if (method == MHD_HTTP_METHOD_CONNECT) 
-    {
-        res = this->render_CONNECT(r);
-    } 
-    else 
+        if(method == MHD_HTTP_METHOD_GET) 
+        {
+            res = this->render_GET(r);
+        } 
+        else if (method == MHD_HTTP_METHOD_POST) 
+        {
+            res = this->render_POST(r);
+        } 
+        else if (method == MHD_HTTP_METHOD_PUT) 
+        {
+            res = this->render_PUT(r);
+        } 
+        else if (method == MHD_HTTP_METHOD_DELETE) 
+        {
+            res = this->render_DELETE(r);
+        } 
+        else if (method == MHD_HTTP_METHOD_HEAD) 
+        {
+            res = this->render_HEAD(r);
+        } 
+        else if (method == MHD_HTTP_METHOD_TRACE) 
+        {
+            res = this->render_TRACE(r);
+        } 
+        else if (method == MHD_HTTP_METHOD_OPTIONS) 
+        {
+            res = this->render_OPTIONS(r);
+        } 
+        else if (method == MHD_HTTP_METHOD_CONNECT) 
+        {
+            res = this->render_CONNECT(r);
+        } 
+        else 
+        {
+            res = this->render(r);
+        }
+    }
+    else
     {
-        res = this->render(r);
+        res = this->render_405();
     }
     return res;
 }
diff --git a/src/httpserver/http_resource.hpp b/src/httpserver/http_resource.hpp
@@ -22,6 +22,10 @@
 #include <map>
 #include <string>
 
+#ifdef DEBUG
+#include <iostream>
+#endif
+
 namespace httpserver
 {
 
@@ -157,6 +161,13 @@ class http_resource
             }
             else
             {
+#ifdef DEBUG
+                std::map<std::string, bool>::iterator it;
+                for(it = allowed_methods.begin(); it != allowed_methods.end(); it++)
+                {
+                    std::cout << (*it).first << " -> " << (*it).second << std::endl;
+                }
+#endif //DEBUG
                 return false;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,10 @@`
`22`	`22`	`#include <map>`
`23`	`23`	`#include <string>`
`24`	`24`
	`25`	`+#ifdef DEBUG`
	`26`	`+#include <iostream>`
	`27`	`+#endif`
	`28`	`+`
`25`	`29`	`namespace httpserver`
`26`	`30`	`{`
`27`	`31`
`@@ -157,6 +161,13 @@ class http_resource`
`157`	`161`	`}`
`158`	`162`	`else`
`159`	`163`	`{`
	`164`	`+#ifdef DEBUG`
	`165`	`+ std::map<std::string, bool>::iterator it;`
	`166`	`+ for(it = allowed_methods.begin(); it != allowed_methods.end(); it++)`
	`167`	`+ {`
	`168`	`+ std::cout << (it).first << " -> " << (it).second << std::endl;`
	`169`	`+ }`
	`170`	`+#endif //DEBUG`
`160`	`171`	`return false;`
`161`	`172`	`}`
`162`	`173`	`}`