Fixing once and for all that ugly baby of to_charp and extract from String, and fixing a couple of minor issues with dblib.lua

1 files changed, 2 insertions, 3 deletions

diff --git a/lib/HttpServ.cc b/lib/HttpServ.cc
index 80448a8..2e1779b 100644
--- a/lib/HttpServ.cc
+++ b/lib/HttpServ.cc
@@ -596,8 +596,7 @@ bool ProcessRequest::ParseUri(String & file, String & domain, String & gvars, Ha
 	ssize_t poshttp, posslash;
         Uri = p;
 	sppos = Uri.strrchr(' ');
-	p = Uri.to_charp(0, sppos - 1);
-	Uri = p;
+	Uri = Uri.extract(0, sppos - 1);
 	// On enlève tout le host spécifié éventuellement dans la requete.
 	if ((poshttp = Uri.strstr("http://")) > 0) {
 	    Uri = Uri.to_charp(poshttp + 7);
@@ -615,7 +614,7 @@ bool ProcessRequest::ParseUri(String & file, String & domain, String & gvars, Ha
 	posslash = Uri.strrchr('/');
 	file = Uri.to_charp(posslash + 1);
 	if (posslash > 0) {
-	    domain = Uri.to_charp(0, posslash - 1);
+	    domain = Uri.extract(0, posslash - 1);
 	} else {
 	    domain = "";
 	}