Adjusted in order to avoid errors in regex matching

Sebastiano Merlino · Sebastiano Merlino · commit 9b4055e5219c · 2012-07-13T15:51:31.000+02:00
diff --git a/src/http_endpoint.cpp b/src/http_endpoint.cpp
@@ -46,6 +46,7 @@ http_endpoint::http_endpoint(const string& url, bool family, bool registration):
     bool first = true;
     if(registration)
     {
+        this->url_modded = "^/";
         for(unsigned int i = 0; i< parts.size(); i++)
         {
             if((parts[i] != "") && (parts[i][0] != '{')) 
@@ -107,7 +108,8 @@ http_endpoint::http_endpoint(const string& url, bool family, bool registration):
             }
             this->url_pieces.push_back(parts[i]);
         }
-        regcomp(&(this->re_url_modded), url_modded.c_str(), REG_EXTENDED|REG_ICASE);
+        this->url_modded += "$";
+        regcomp(&(this->re_url_modded), url_modded.c_str(), REG_EXTENDED|REG_ICASE|REG_NOSUB);
         reg_compiled = true;
     }
     else
@@ -138,7 +140,7 @@ http_endpoint::http_endpoint(const http_endpoint& h):
     reg_compiled(h.reg_compiled)
 {
     if(this->reg_compiled)
-        regcomp(&(this->re_url_modded), url_modded.c_str(), REG_EXTENDED|REG_ICASE);
+        regcomp(&(this->re_url_modded), url_modded.c_str(), REG_EXTENDED|REG_ICASE|REG_NOSUB);
 }
 
 http_endpoint& http_endpoint::operator =(const http_endpoint& h)
@@ -148,7 +150,7 @@ http_endpoint& http_endpoint::operator =(const http_endpoint& h)
     this->family_url = h.family_url;
     this->reg_compiled = h.reg_compiled;
     if(this->reg_compiled)
-        regcomp(&(this->re_url_modded), url_modded.c_str(), REG_EXTENDED|REG_ICASE);
+        regcomp(&(this->re_url_modded), url_modded.c_str(), REG_EXTENDED|REG_ICASE|REG_NOSUB);
     this->url_pars = h.url_pars;
     this->url_pieces = h.url_pieces;
     this->chunk_positions = h.chunk_positions;
diff --git a/test/Test.cpp b/test/Test.cpp
@@ -23,6 +23,7 @@ http_response Test::render_GET(const http_request& r)
 	cout << r.get_requestor_port() << endl;
 	cout << "PROVA: " << r.get_arg("prova") << endl;
 	cout << "ALTRO: " << r.get_arg("altro") << endl;
+    cout << "THUMB: " << r.get_arg("thumbId") << endl;
 	string pp = r.get_arg("prova");
 	return http_file_response("/home/etr/progs/libhttpserver/test/readme", 200);
 }
@@ -59,7 +60,7 @@ int main()
 	Test dt = Test();
 	Test2 dt2 = Test2();
     ws.register_resource(string("base/{var1}/{var2}/drop_test/{var3}/tail"), &dt2, true);
-    ws.register_resource(string("other/side"), &dt, true);
+    ws.register_resource(string("other/side/{thumbId|[0-9]*}"), &dt, true);
 	boost::thread* t1 = new boost::thread(boost::bind(&webserver::start, ws, true));
 	t1->join();
 	return 0;

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ http_endpoint::http_endpoint(const string& url, bool family, bool registration):`
`46`	`46`	`bool first = true;`
`47`	`47`	`if(registration)`
`48`	`48`	`{`
	`49`	`+ this->url_modded = "^/";`
`49`	`50`	`for(unsigned int i = 0; i< parts.size(); i++)`
`50`	`51`	`{`
`51`	`52`	`if((parts[i] != "") && (parts[i][0] != '{'))`
`@@ -107,7 +108,8 @@ http_endpoint::http_endpoint(const string& url, bool family, bool registration):`
`107`	`108`	`}`
`108`	`109`	`this->url_pieces.push_back(parts[i]);`
`109`	`110`	`}`
`110`		`- regcomp(&(this->re_url_modded), url_modded.c_str(), REG_EXTENDED\|REG_ICASE);`
	`111`	`+ this->url_modded += "$";`
	`112`	`+ regcomp(&(this->re_url_modded), url_modded.c_str(), REG_EXTENDED\|REG_ICASE\|REG_NOSUB);`
`111`	`113`	`reg_compiled = true;`
`112`	`114`	`}`
`113`	`115`	`else`
`@@ -138,7 +140,7 @@ http_endpoint::http_endpoint(const http_endpoint& h):`
`138`	`140`	`reg_compiled(h.reg_compiled)`
`139`	`141`	`{`
`140`	`142`	`if(this->reg_compiled)`
`141`		`- regcomp(&(this->re_url_modded), url_modded.c_str(), REG_EXTENDED\|REG_ICASE);`
	`143`	`+ regcomp(&(this->re_url_modded), url_modded.c_str(), REG_EXTENDED\|REG_ICASE\|REG_NOSUB);`
`142`	`144`	`}`
`143`	`145`
`144`	`146`	`http_endpoint& http_endpoint::operator =(const http_endpoint& h)`
`@@ -148,7 +150,7 @@ http_endpoint& http_endpoint::operator =(const http_endpoint& h)`
`148`	`150`	`this->family_url = h.family_url;`
`149`	`151`	`this->reg_compiled = h.reg_compiled;`
`150`	`152`	`if(this->reg_compiled)`
`151`		`- regcomp(&(this->re_url_modded), url_modded.c_str(), REG_EXTENDED\|REG_ICASE);`
	`153`	`+ regcomp(&(this->re_url_modded), url_modded.c_str(), REG_EXTENDED\|REG_ICASE\|REG_NOSUB);`
`152`	`154`	`this->url_pars = h.url_pars;`
`153`	`155`	`this->url_pieces = h.url_pieces;`
`154`	`156`	`this->chunk_positions = h.chunk_positions;`