X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhttp%2Futils.cpp;h=e52309aae50aab02648a1f1278d6787027063e74;hb=ee01d294f9078fbf17dc6a0a645ad3a342c49b1a;hp=870b86fea19ac54ee53c14f7e377a92a68dc5a42;hpb=ebf4d62dd7d119b79cbd3c64570949dbdf9cdde9;p=libs%2Fnet.git

diff --git a/source/http/utils.cpp b/source/http/utils.cpp
index 870b86f..e52309a 100644
--- a/source/http/utils.cpp
+++ b/source/http/utils.cpp
@@ -1,5 +1,5 @@
 #include <algorithm>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include <msp/strings/regex.h>
 #include <msp/strings/utils.h>
 #include "utils.h"
@@ -79,7 +79,7 @@ string urldecode(const string &str)
 
 Url parse_url(const string &str)
 {
-	static Regex r_url("^(([a-z]+)://)?([a-zA-Z0-9-]+(\\.[a-zA-Z0-9-]+)*(:[0-9]+)?)?(/[^?#]*)?(\\?([^#]+))?(#(.*))?$");
+	static Regex r_url("^(([a-z]+)://)?([a-zA-Z0-9-]+(\\.[a-zA-Z0-9-]+)*(:[0-9]+)?)?(/[^?#]*)?(\\?([^#]*))?(#(.*))?$");
 	if(RegMatch m = r_url.match(str))
 	{
 		Url url;
@@ -123,7 +123,7 @@ Query parse_query(const std::string &str)
 	Query query;
 	for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
 	{
-		unsigned equals = i->find('=');
+		string::size_type equals = i->find('=');
 		string &value = query[urldecode(i->substr(0, equals))];
 		if(equals!=string::npos)
 			value = urldecode(i->substr(equals+1));