--- smsdaemon/HttpClient.cpp	2008/12/17 23:43:26	193
+++ smsdaemon/HttpClient.cpp	2010/02/19 08:47:31	592
@@ -11,12 +11,13 @@
 	std::string UrlEncode(std::string url)
 	{
 		std::ostringstream ss;
-		for (unsigned i=0; i<url.size(); i++) {
+		for (unsigned i=0; i<url.size(); i++)
+		{
 			char ch = url.at(i);
 			if (isalnum(ch))
 				ss << ch;
 			else
-				ss << "%" << std::setw(2) << std::hex << (int) ch;
+				ss << "%" << std::setw(2) << std::hex << std::setfill('0') <<(int) ch;
 		}
 		return ss.str();
 	}
@@ -29,11 +30,13 @@
 		char* bytes = reinterpret_cast<char*>(ptr);
 		std::vector<char>* vec = reinterpret_cast< std::vector<char>* >(stream);
 
+		vec->reserve( vec->size() + total); //allow vector to do a preallocation if necessary
+
 		int i;
-        for (i=0; i<total; i++)
-        {                           
-                vec->push_back( bytes[i] );
-        }
+		for (i=0; i<total; i++)
+		{
+			vec->push_back( bytes[i] );
+		}
 		return i;
 	}
 
@@ -48,13 +51,13 @@
 
 		curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errmsg);
 
-        curl_easy_setopt(curl, CURLOPT_URL, url.c_str() );
-        curl_easy_setopt(curl, CURLOPT_FAILONERROR,1);
-        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunction);
+		curl_easy_setopt(curl, CURLOPT_URL, url.c_str() );
+		curl_easy_setopt(curl, CURLOPT_FAILONERROR,1);
+		curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunction);
 		curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buf);
 
-        int res = curl_easy_perform(curl);
-        curl_easy_cleanup(curl);
+		int res = curl_easy_perform(curl);
+		curl_easy_cleanup(curl);
 
 		if (res != 0)
 			throw httpexception(errmsg);