diff options
| author | jmarshallnz <jcmarsha@gmail.com> | 2014-07-18 18:37:53 +1200 |
|---|---|---|
| committer | Jonathan Marshall <jmarshall@xbmc.org> | 2014-07-19 17:21:00 +1200 |
| commit | f92a074a74a570f52e546ba4f28d9346bf8ddd31 (patch) | |
| tree | f630a6f4dd36a708b823991dfa0466c9c540908a | |
| parent | 0ee2d331aca5a864295e6645afb0ded4880ca554 (diff) | |
Merge pull request #5039 from CEikermann/patch-1
Trac #15178: FTP TLS not working
| -rw-r--r-- | xbmc/filesystem/CurlFile.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp index 0a5ea14e54..4808465c1d 100644 --- a/xbmc/filesystem/CurlFile.cpp +++ b/xbmc/filesystem/CurlFile.cpp @@ -745,8 +745,6 @@ void CCurlFile::ParseAndCorrectUrl(CURL &url2) url2.GetProtocolOptions(options); if (options.size() > 0) { - // clear protocol options - url2.SetProtocolOptions(""); // set xbmc headers for(std::map<CStdString, CStdString>::const_iterator it = options.begin(); it != options.end(); ++it) { @@ -782,6 +780,9 @@ void CCurlFile::ParseAndCorrectUrl(CURL &url2) } } } + + // Unset the protocol options to have an url without protocol options + url2.SetProtocolOptions(""); if (m_username.length() > 0 && m_password.length() > 0) m_url = url2.GetWithoutUserDetails(); |