diff options
| author | Michael Cronenworth <mike@cchtml.com> | 2014-06-09 08:38:12 -0500 |
|---|---|---|
| committer | Michael Cronenworth <mike@cchtml.com> | 2014-06-09 08:38:12 -0500 |
| commit | 9f74cbfd1fe66cc32a0604c7971abb1a6afd3a6d (patch) | |
| tree | d6a70c00aff1820551e7675bec260ce003d35863 /xbmc-13.1-curl.patch | |
| parent | b3154eb2409f36635c416e0ee1533daff3b3822e (diff) | |
| download | xbmc-rpm-9f74cbfd1fe66cc32a0604c7971abb1a6afd3a6d.tar.gz xbmc-rpm-9f74cbfd1fe66cc32a0604c7971abb1a6afd3a6d.tar.xz xbmc-rpm-9f74cbfd1fe66cc32a0604c7971abb1a6afd3a6d.zip | |
Update to 13.1 final
Diffstat (limited to 'xbmc-13.1-curl.patch')
| -rw-r--r-- | xbmc-13.1-curl.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/xbmc-13.1-curl.patch b/xbmc-13.1-curl.patch new file mode 100644 index 0000000..f4a586f --- /dev/null +++ b/xbmc-13.1-curl.patch @@ -0,0 +1,36 @@ +From b47117d9d0e1be09a298079919cc335baf2f37f0 Mon Sep 17 00:00:00 2001 +From: Pierre Ossman <pierre@ossman.eu> +Date: Sun, 25 May 2014 17:10:03 +0200 +Subject: [PATCH] curl: don't mess with the default cipher list as we can't + know the format + +--- + xbmc/filesystem/CurlFile.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp +index 30de6f9..0a5ea14 100644 +--- a/xbmc/filesystem/CurlFile.cpp ++++ b/xbmc/filesystem/CurlFile.cpp +@@ -394,7 +394,7 @@ CCurlFile::CCurlFile() + m_username = ""; + m_password = ""; + m_httpauth = ""; +- m_cipherlist = "DEFAULT"; ++ m_cipherlist = ""; + m_proxytype = PROXY_HTTP; + m_state = new CReadState(); + m_oldState = NULL; +@@ -608,7 +608,8 @@ void CCurlFile::SetCommonOptions(CReadState* state) + g_curlInterface.easy_setopt(h, CURLOPT_IGNORE_CONTENT_LENGTH, 1); + + // Setup allowed TLS/SSL ciphers. New versions of cURL may deprecate things that are still in use. +- g_curlInterface.easy_setopt(h, CURLOPT_SSL_CIPHER_LIST, m_cipherlist.c_str()); ++ if (!m_cipherlist.empty()) ++ g_curlInterface.easy_setopt(h, CURLOPT_SSL_CIPHER_LIST, m_cipherlist.c_str()); + } + + void CCurlFile::SetRequestHeaders(CReadState* state) +-- +1.9.3 + |