projects
/
vuplus_xbmc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #5039 from CEikermann/patch-1
[vuplus_xbmc]
/
xbmc
/
filesystem
/
CurlFile.cpp
diff --git
a/xbmc/filesystem/CurlFile.cpp
b/xbmc/filesystem/CurlFile.cpp
index
0a5ea14
..
4808465
100644
(file)
--- 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)
{
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)
{
// 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();
if (m_username.length() > 0 && m_password.length() > 0)
m_url = url2.GetWithoutUserDetails();