diff options
| author | arnova <arnova@void.org> | 2013-03-16 16:49:43 +0100 |
|---|---|---|
| committer | arnova <arnova@void.org> | 2013-04-01 12:34:58 +0200 |
| commit | 557e70b8d74f9ba2545cffe6718aef6e82b3a10e (patch) | |
| tree | d30d45fb76f637dea7106a05d8d0fce3280a006b | |
| parent | a5e6fa761a82ce8360690e206c22e29f0d426243 (diff) | |
changed: For Curl stat we should overrule the default timeout else we'll fail on slow servers/links
| -rw-r--r-- | xbmc/filesystem/CurlFile.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp index a91efad45f..9dbf994196 100644 --- a/xbmc/filesystem/CurlFile.cpp +++ b/xbmc/filesystem/CurlFile.cpp @@ -1241,7 +1241,7 @@ int CCurlFile::Stat(const CURL& url, struct __stat64* buffer) SetCommonOptions(m_state); SetRequestHeaders(m_state); - g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_TIMEOUT, 5); + g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_TIMEOUT, g_advancedSettings.m_curlconnecttimeout); g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_NOBODY, 1); g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_WRITEDATA, NULL); /* will cause write failure*/ g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_FILETIME , 1); @@ -1273,10 +1273,10 @@ int CCurlFile::Stat(const CURL& url, struct __stat64* buffer) /* somehow curl doesn't reset CURLOPT_NOBODY properly so reset everything */ SetCommonOptions(m_state); SetRequestHeaders(m_state); - g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_TIMEOUT, 5); + g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_TIMEOUT, g_advancedSettings.m_curlconnecttimeout); g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_RANGE, "0-0"); g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_WRITEDATA, NULL); /* will cause write failure*/ - g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_FILETIME , 1); + g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_FILETIME, 1); result = g_curlInterface.easy_perform(m_state->m_easyHandle); } |