Modified in order to solve path pieces duplication (issue 23)

Sebastiano Merlino · Sebastiano Merlino · commit 683c4ad67b28 · 2012-04-26T22:43:07.000+02:00
diff --git a/src/Webserver.cpp b/src/Webserver.cpp
@@ -649,13 +649,6 @@ int Webserver::answerToConnection(void* cls, MHD_Connection* connection,
         mr->dhr = &supportReq;
     }
 
-    mr->dhr->setPath(string(st_url));
-    mr->dhr->setMethod(string(method));
-
-    MHD_get_connection_values (connection, MHD_HEADER_KIND, &buildRequestHeader, (void*) mr->dhr);
-    MHD_get_connection_values (connection, MHD_FOOTER_KIND, &buildRequestFooter, (void*) mr->dhr);
-    MHD_get_connection_values (connection, MHD_COOKIE_KIND, &buildRequestCookie, (void*) mr->dhr);
-
     if (    0 == strcmp(method, MHD_HTTP_METHOD_DELETE) || 
         0 == strcmp(method, MHD_HTTP_METHOD_GET) ||
         0 == strcmp(method, MHD_HTTP_METHOD_HEAD) ||
@@ -688,6 +681,13 @@ int Webserver::answerToConnection(void* cls, MHD_Connection* connection,
         return method_not_acceptable_page(cls, connection);
     }
 
+    MHD_get_connection_values (connection, MHD_HEADER_KIND, &buildRequestHeader, (void*) mr->dhr);
+    MHD_get_connection_values (connection, MHD_FOOTER_KIND, &buildRequestFooter, (void*) mr->dhr);
+    MHD_get_connection_values (connection, MHD_COOKIE_KIND, &buildRequestCookie, (void*) mr->dhr);
+
+    mr->dhr->setPath(st_url);
+    mr->dhr->setMethod(method);
+
     if (0 == strcmp (method, MHD_HTTP_METHOD_POST) || 0 == strcmp(method, MHD_HTTP_METHOD_PUT)) 
     {
         supportReq = *(mr->dhr);
diff --git a/src/httpserver/HttpResponse.hpp b/src/httpserver/HttpResponse.hpp
@@ -99,10 +99,10 @@ class HttpResponse
         **/
         HttpResponse(const HttpResponse& b):
             content(b.content),
+            responseType(b.responseType),
             responseCode(b.responseCode),
             headers(b.headers),
             footers(b.footers),
-            responseType(b.responseType),
             realm(b.realm),
             opaque(b.opaque),
             reloadNonce(b.reloadNonce)
diff --git a/src/httpserver/HttpUtils.hpp b/src/httpserver/HttpUtils.hpp
@@ -31,7 +31,7 @@
 #include <gnutls/gnutls.h>
 #endif
 
-#define DEFAULT_MASK_VALUE 65535
+#define DEFAULT_MASK_VALUE 0xFFFF
 
 namespace httpserver {
 namespace http {
diff --git a/test/Test.cpp b/test/Test.cpp
@@ -34,6 +34,11 @@ HttpResponse Test::render_POST(const HttpRequest& r)
 	filestr << r.getContent() << endl;
 	filestr.close();
 	cout << "DOPO" << endl;
+    vector<string> vv = r.getPathPieces();
+    for(int i = 0; i < vv.size(); i++)
+    {
+        cout << vv[i] << endl;
+    }
 	return HttpResponse("OK",200);
 }
 
@@ -54,7 +59,7 @@ int main()
 	Test dt = Test();
 	Test2 dt2 = Test2();
     ws.registerResource(string("base/{var1}/{var2}/drop_test/{var3}/tail"), &dt2, true);
-    ws.registerResource(string("other"), &dt, true);
+    ws.registerResource(string("other/side"), &dt, true);
 	boost::thread* t1 = new boost::thread(boost::bind(&Webserver::start, ws, true));
 	t1->join();
 	return 0;
