4 files changed, 5 insertions, 21 deletions
diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp
index a0d97b4ff9..d94361bb96 100644
--- a/protocols/VKontakte/src/misc.cpp
+++ b/protocols/VKontakte/src/misc.cpp
@@ -37,15 +37,6 @@ bool IsEmpty(LPCSTR str)
 	return (str == nullptr || str[0] == 0);
 }
 
-LPCSTR findHeader(NETLIBHTTPREQUEST *pReq, LPCSTR szField)
-{
-	for (int i = 0; i < pReq->headersCount; i++)
-		if (!_stricmp(pReq->headers[i].szName, szField))
-			return pReq->headers[i].szValue;
-
-	return nullptr;
-}
-
 bool wlstrstr(wchar_t *_s1, wchar_t *_s2)
 {
 	wchar_t s1[1024], s2[1024];
@@ -487,11 +478,8 @@ CMStringW CVkProto::RunRenameNick(LPCWSTR pwszOldName)
 void CVkProto::GrabCookies(NETLIBHTTPREQUEST *nhr)
 {
 	debugLogA("CVkProto::GrabCookies");
-	for (int i = 0; i < nhr->headersCount; i++) {
-		if (_stricmp(nhr->headers[i].szName, "Set-cookie"))
-			continue;
-
-		CMStringA szValue = nhr->headers[i].szValue, szCookieName, szCookieVal, szDomain;
+	if (auto *pszCookie = Netlib_GetHeader(nhr, "Set-cookie")) {
+		CMStringA szValue = pszCookie, szCookieName, szCookieVal, szDomain;
 		int iStart = 0;
 		while (true) {
 			bool bFirstToken = (iStart == 0);
diff --git a/protocols/VKontakte/src/vk.h b/protocols/VKontakte/src/vk.h
index 12f9f378d9..1f6b5107c7 100644
--- a/protocols/VKontakte/src/vk.h
+++ b/protocols/VKontakte/src/vk.h
@@ -104,7 +104,6 @@ struct CVkProto;
 extern mir_cs csInstances;
 extern bool g_bMessageState;
 
-LPCSTR findHeader(NETLIBHTTPREQUEST *hdr, LPCSTR szField);
 bool wlstrstr(wchar_t *_s1, wchar_t *_s2);
 
 void InitIcons(void);
diff --git a/protocols/VKontakte/src/vk_struct.cpp b/protocols/VKontakte/src/vk_struct.cpp
index cbe70b3566..90f3e7cba5 100644
--- a/protocols/VKontakte/src/vk_struct.cpp
+++ b/protocols/VKontakte/src/vk_struct.cpp
@@ -67,11 +67,8 @@ AsyncHttpRequest::AsyncHttpRequest(CVkProto *ppro, int iRequestType, LPCSTR _url
 
 void AsyncHttpRequest::Redirect(NETLIBHTTPREQUEST *nhr)
 {
-	for (int i = 0; i < nhr->headersCount; i++) {
-		LPCSTR szValue = nhr->headers[i].szValue;
-		if (!_stricmp(nhr->headers[i].szName, "Location"))
-			m_szUrl = szValue;
-	}
+	if (auto *pszHdr = Netlib_GetHeader(nhr, "Location"))
+		m_szUrl = pszHdr;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/VKontakte/src/vk_thread.cpp b/protocols/VKontakte/src/vk_thread.cpp
index cbc9b269df..2669fdc883 100644
--- a/protocols/VKontakte/src/vk_thread.cpp
+++ b/protocols/VKontakte/src/vk_thread.cpp
@@ -199,7 +199,7 @@ void CVkProto::OnOAuthAuthorize(NETLIBHTTPREQUEST *reply, AsyncHttpRequest*)
 	GrabCookies(reply);
 
 	if (reply->resultCode == 302) { // manual redirect
-		LPCSTR pszLocation = findHeader(reply, "Location");
+		LPCSTR pszLocation = Netlib_GetHeader(reply, "Location");
 		if (pszLocation) {
 			if (!_strnicmp(pszLocation, szBlankUrl, sizeof(szBlankUrl) - 1)) {
 				m_szAccessToken = nullptr;