Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Libcurl] 404 fix + misc. tweaks #7137

Merged
merged 2 commits into from
May 15, 2015
Merged

[Libcurl] 404 fix + misc. tweaks #7137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93db3b5
changed: Prevent Curl log spam with Webdav + only retry without range…
May 6, 2015
6ed6d30
changed: Improve HTTP dir error logging
May 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions xbmc/filesystem/CurlFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,10 +334,16 @@ long CCurlFile::CReadState::Connect(unsigned int size)
// read some data in to try and obtain the length
// maybe there's a better way to get this info??
m_stillRunning = 1;

// (Try to) fill buffer
if (!FillBuffer(1))
{
CLog::Log(LOGERROR, "CCurlFile::CReadState::Connect, didn't get any data from stream.");
return -1;
// Check response code
long response;
if (CURLE_OK == g_curlInterface.easy_getinfo(m_easyHandle, CURLINFO_RESPONSE_CODE, &response))
return response;

This comment was marked as spam.

Sign in to view

else
return -1;
}

double length;
Expand Down Expand Up @@ -939,8 +945,11 @@ bool CCurlFile::Open(const CURL& url)
m_state->m_sendRange = m_seekable;

m_httpresponse = m_state->Connect(m_bufferSize);
if( m_httpresponse < 0 || m_httpresponse >= 400)
if (m_httpresponse < 0 || m_httpresponse >= 400)
{
CLog::Log(LOGERROR, "CCurlFile::Open failed with code %li for %s", m_httpresponse, url.GetRedacted().c_str());
return false;
}

SetCorrectHeaders(m_state);

Expand Down Expand Up @@ -1480,11 +1489,14 @@ bool CCurlFile::CReadState::FillBuffer(unsigned int want)
if (msg->data.result == CURLE_OK)
return true;

long httpCode = 0;
if (msg->data.result == CURLE_HTTP_RETURNED_ERROR)
{
long httpCode;
g_curlInterface.easy_getinfo(msg->easy_handle, CURLINFO_RESPONSE_CODE, &httpCode);
CLog::Log(LOGERROR, "CCurlFile::FillBuffer - Failed: HTTP returned error %ld", httpCode);

// Don't log 404 not-found errors to prevent log-spam
if (httpCode != 404)
CLog::Log(LOGERROR, "CCurlFile::FillBuffer - Failed: HTTP returned error %ld", httpCode);
}
else
{
Expand All @@ -1499,7 +1511,7 @@ bool CCurlFile::CReadState::FillBuffer(unsigned int want)
!m_bFirstLoop)
CURLresult = msg->data.result;
else if ( (msg->data.result == CURLE_HTTP_RANGE_ERROR ||
msg->data.result == CURLE_HTTP_RETURNED_ERROR) &&
httpCode == 416 /* = Requested Range Not Satisfiable */) &&
m_bFirstLoop &&
m_filePos == 0 &&
m_sendRange)
Expand Down
2 changes: 1 addition & 1 deletion xbmc/filesystem/HTTPDirectory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ bool CHTTPDirectory::GetDirectory(const CURL& url, CFileItemList &items)

if(!http.Open(url))
{
CLog::Log(LOGERROR, "%s - Unable to get http directory", __FUNCTION__);
CLog::Log(LOGERROR, "%s - Unable to get http directory (%s)", __FUNCTION__, url.GetRedacted().c_str());
return false;
}

Expand Down