mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

SNeutrinoSettings: convert more char[...] configuration values to std::string

Browse Source
This commit is contained in:
M. Liebmann
2014-01-18 17:11:12 +01:00
parent afbd87083b
commit 004aa84e32
7 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/system/httptool.cpp
View File

@@ -96,21 +96,18 @@ printf("url is %s\n", URL.c_str());
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
#endif
if(strcmp(g_settings.softupdate_proxyserver, "")!=0)
{//use proxyserver
if (!g_settings.softupdate_proxyserver.empty()) {//use proxyserver
#ifdef DEBUG
printf("use proxyserver : %s\n", g_settings.softupdate_proxyserver);
printf("use proxyserver : %s\n", g_settings.softupdate_proxyserver.c_str());
#endif
curl_easy_setopt(curl, CURLOPT_PROXY, g_settings.softupdate_proxyserver);
curl_easy_setopt(curl, CURLOPT_PROXY, g_settings.softupdate_proxyserver.c_str());
if(strcmp(g_settings.softupdate_proxyusername,"")!=0)
{//use auth
if (!g_settings.softupdate_proxyusername.empty()) {//use auth
//printf("use proxyauth\n");
char tmp[200];
strcpy(tmp, g_settings.softupdate_proxyusername);
strcat(tmp, ":");
strcat(tmp, g_settings.softupdate_proxypassword);
curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, tmp);
std::string tmp = g_settings.softupdate_proxyusername;
tmp += ":";
tmp += g_settings.softupdate_proxypassword;
curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, tmp.c_str());
}
}
#ifdef DEBUG