add http proxy support for yt

Conflicts:
	src/gui/proxyserver_setup.cpp
	src/neutrino.cpp
	src/system/httptool.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 58124802ce
Author: martii <m4rtii@gmx.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)



------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-06-16 20:58:38 +02:00
committed by [CST] Focus
parent 71b1bcb846
commit 96ed06eb2c
4 changed files with 47 additions and 0 deletions

View File

@@ -140,6 +140,14 @@ bool cYTCache::download(MI_MOVIE_INFO *mi)
char cerror[CURL_ERROR_SIZE];
curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, cerror);
if(g_settings.softupdate_proxyserver != "") {
curl_easy_setopt(curl, CURLOPT_PROXY, g_settings.softupdate_proxyserver.c_str());
if(g_settings.softupdate_proxyusername != "") {
std::string tmp = g_settings.softupdate_proxyusername + ":" + g_settings.softupdate_proxypassword;
curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, tmp.c_str());
}
}
CURLcode res = curl_easy_perform(curl);
curl_easy_cleanup(curl);