summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhorchi <vdr@jwendel.de>2017-10-09 19:27:14 +0200
committerhorchi <vdr@jwendel.de>2017-10-09 19:27:14 +0200
commit1633749d2a188add75ad2aa68dc8bea9b7cd6c85 (patch)
treeedc74b6911bb0b6ec741d1cf21bbba13efe08b3a
parente0aee67ccc08de9e2b23d2c866aa147128a87202 (diff)
downloadvdr-epg-daemon-1633749d2a188add75ad2aa68dc8bea9b7cd6c85.tar.gz
vdr-epg-daemon-1633749d2a188add75ad2aa68dc8bea9b7cd6c85.tar.bz2
2017-10-09: version 1.1.118 (horchi)\n - change: Fixed curl SSL mode \n\n
-rw-r--r--HISTORY.h7
-rw-r--r--lib/curl.c2
-rw-r--r--lib/test.c7
3 files changed, 11 insertions, 5 deletions
diff --git a/HISTORY.h b/HISTORY.h
index c02208b..7f47547 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -4,8 +4,8 @@
* -----------------------------------
*/
-#define _VERSION "1.1.117"
-#define VERSION_DATE "09.06.2017"
+#define _VERSION "1.1.118"
+#define VERSION_DATE "09.10.2017"
#define DB_API 4
#ifdef GIT_REV
@@ -17,6 +17,9 @@
/*
* ------------------------------------
+2017-10-09: version 1.1.118 (horchi)
+ - change: Fixed curl SSL mode
+
2017-06-09: version 1.1.117 (horchi)
- change: Fixed install of eventviews*
diff --git a/lib/curl.c b/lib/curl.c
index abcb2da..d87ceba 100644
--- a/lib/curl.c
+++ b/lib/curl.c
@@ -63,7 +63,7 @@ int cCurl::create()
{
// call only once per process and *before* any thread is started!
- if (curl_global_init(CURL_GLOBAL_NOTHING /*CURL_GLOBAL_ALL*/) != 0)
+ if (curl_global_init(CURL_GLOBAL_SSL /*CURL_GLOBAL_ALL*/) != 0)
{
tell(0, "Error, something went wrong with curl_global_init()");
return fail;
diff --git a/lib/test.c b/lib/test.c
index bdc5d0a..705cc2f 100644
--- a/lib/test.c
+++ b/lib/test.c
@@ -668,8 +668,11 @@ int main(int argc, char** argv)
data.clear();
- asprintf(&url, "%s/eplist.cgi?action=show&file=%s",
- "www.eplists.de", argv[1]);
+ if (strncmp(argv[1], "http", 4) == 0)
+ asprintf(&url, "%s", argv[1]);
+ else
+ asprintf(&url, "%s/eplist.cgi?action=show&file=%s",
+ "www.eplists.de", argv[1]);
tell(0, "try to download [%s]", url);