mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/cst-next' into ni/mp/cst-next

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d1fc0eee1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-12 (Wed, 12 Oct 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-12 17:06:06 +02:00
parent ca5c4b00d7 1afef53db4
commit e082f8a584
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/test_menu.cpp
View File

@@ -39,7 +39,7 @@
#include <driver/screen_max.h> #include <driver/screen_max.h>
#include <driver/display.h> #include <driver/display.h>
#include <system/debug.h> #include <system/debug.h>
#include <gui/color_custom.h>
#include <cs_api.h> #include <cs_api.h>
#include <unistd.h> #include <unistd.h>

1
src/system/httptool.cpp
View File

@@ -95,6 +95,7 @@ printf("url is %s\n", URL.c_str());
curl_easy_setopt(curl, CURLOPT_USERAGENT, userAgent.c_str()); curl_easy_setopt(curl, CURLOPT_USERAGENT, userAgent.c_str());
curl_easy_setopt(curl, CURLOPT_NOSIGNAL, (long)1); curl_easy_setopt(curl, CURLOPT_NOSIGNAL, (long)1);
curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout); //NI curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout); //NI
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, false); //NI
curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, connecttimeout); //NI curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, connecttimeout); //NI
curl_easy_setopt(curl, CURLOPT_FAILONERROR, true); curl_easy_setopt(curl, CURLOPT_FAILONERROR, true);
#ifdef DEBUG #ifdef DEBUG