From 545ca2edec49b7aed688bec052cc6609f68b39ed Mon Sep 17 00:00:00 2001
From: Alexander Lantsev <aunsane@gmail.com>
Date: Mon, 13 Jun 2016 19:11:23 +0000
Subject: Tox: toxme.io used for search instead of toxdns

git-svn-id: http://svn.miranda-ng.org/main/trunk@16971 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Tox/src/http_request.h | 96 +++++++++++-----------------------------
 1 file changed, 27 insertions(+), 69 deletions(-)

(limited to 'protocols/Tox/src/http_request.h')

diff --git a/protocols/Tox/src/http_request.h b/protocols/Tox/src/http_request.h
index e52de2c179..1ffa523775 100644
--- a/protocols/Tox/src/http_request.h
+++ b/protocols/Tox/src/http_request.h
@@ -41,75 +41,6 @@ private:
 protected:
 	enum HttpRequestUrlFormat { FORMAT };
 
-	void AddHeader(LPCSTR szName, LPCSTR szValue)
-	{
-		headers = (NETLIBHTTPHEADER*)mir_realloc(headers, sizeof(NETLIBHTTPHEADER) * (headersCount + 1));
-		headers[headersCount].szName = mir_strdup(szName);
-		headers[headersCount].szValue = mir_strdup(szValue);
-		headersCount++;
-	}
-
-	void AddBasicAuthHeader(LPCSTR szLogin, LPCSTR szPassword)
-	{
-		char cPair[128];
-		mir_snprintf(
-			cPair,
-			_countof(cPair),
-			"%s:%s",
-			szLogin,
-			szPassword);
-
-		char *ePair = (char *)mir_base64_encode((BYTE*)cPair, (UINT)mir_strlen(cPair));
-
-		char value[128];
-		mir_snprintf(
-			value,
-			_countof(value),
-			"Basic %s",
-			ePair);
-
-		mir_free(ePair);
-
-		headers = (NETLIBHTTPHEADER*)mir_realloc(headers, sizeof(NETLIBHTTPHEADER)*(headersCount + 1));
-		headers[headersCount].szName = mir_strdup("Authorization");
-		headers[headersCount].szValue = mir_strdup(value);
-		headersCount++;
-	}
-
-	void AddBearerAuthHeader(LPCSTR szValue)
-	{
-		char value[128];
-		mir_snprintf(
-			value,
-			_countof(value),
-			"Bearer %s",
-			szValue);
-
-		headers = (NETLIBHTTPHEADER*)mir_realloc(headers, sizeof(NETLIBHTTPHEADER)*(headersCount + 1));
-		headers[headersCount].szName = mir_strdup("Authorization");
-		headers[headersCount].szValue = mir_strdup(value);
-		headersCount++;
-	}
-
-	void AddUrlParameter(const char *urlFormat, ...)
-	{
-		va_list urlArgs;
-		va_start(urlArgs, urlFormat);
-		m_szUrl += m_szUrl.Find('?') == -1 ? '?' : '&';
-		m_szUrl.AppendFormatV(urlFormat, urlArgs);
-		va_end(urlArgs);
-	}
-
-	void SetData(const char *data, size_t size)
-	{
-		if (pData != NULL)
-			mir_free(pData);
-
-		dataLength = (int)size;
-		pData = (char*)mir_alloc(size);
-		memcpy(pData, data, size);
-	}
-
 public:
 	HttpRequest(int type, LPCSTR url)
 	{
@@ -140,6 +71,33 @@ public:
 			mir_free(pData);
 	}
 
+	void AddHeader(LPCSTR szName, LPCSTR szValue)
+	{
+		headers = (NETLIBHTTPHEADER*)mir_realloc(headers, sizeof(NETLIBHTTPHEADER) * (headersCount + 1));
+		headers[headersCount].szName = mir_strdup(szName);
+		headers[headersCount].szValue = mir_strdup(szValue);
+		headersCount++;
+	}
+
+	void AddUrlParameter(const char *urlFormat, ...)
+	{
+		va_list urlArgs;
+		va_start(urlArgs, urlFormat);
+		m_szUrl += m_szUrl.Find('?') == -1 ? '?' : '&';
+		m_szUrl.AppendFormatV(urlFormat, urlArgs);
+		va_end(urlArgs);
+	}
+
+	void SetData(const char *data, size_t size)
+	{
+		if (pData != NULL)
+			mir_free(pData);
+
+		dataLength = (int)size;
+		pData = (char*)mir_alloc(size);
+		memcpy(pData, data, size);
+	}
+
 	NETLIBHTTPREQUEST* Send(HANDLE hNetlibConnection)
 	{
 		m_szUrl.Replace('\\', '/');
-- 
cgit v1.2.3