Merge remote-tracking branch 'tuxbox/master'

Origin commit data
------------------
Branch: ni/coolstream
Commit: 48ff7b36a2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2017-01-30 21:36:09 +01:00
23 changed files with 122 additions and 77 deletions

View File

@@ -148,7 +148,7 @@ bool cYTCache::download(MI_MOVIE_INFO *mi)
curl_easy_setopt(curl, CURLOPT_NOPROGRESS, (long)0);
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
char cerror[CURL_ERROR_SIZE];
char cerror[CURL_ERROR_SIZE] = {0};
curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, cerror);
if(!g_settings.softupdate_proxyserver.empty()) {

View File

@@ -151,7 +151,7 @@ bool cYTFeedParser::getUrl(std::string &url, std::string &answer, CURL *_curl_ha
}
}
char cerror[CURL_ERROR_SIZE];
char cerror[CURL_ERROR_SIZE] = {0};
curl_easy_setopt(_curl_handle, CURLOPT_ERRORBUFFER, cerror);
printf("try to get [%s] ...\n", url.c_str());
@@ -192,7 +192,7 @@ bool cYTFeedParser::DownloadUrl(std::string &url, std::string &file, CURL *_curl
}
}
char cerror[CURL_ERROR_SIZE];
char cerror[CURL_ERROR_SIZE] = {0};
curl_easy_setopt(_curl_handle, CURLOPT_ERRORBUFFER, cerror);
printf("try to get [%s] ...\n", url.c_str());