len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

rbutil: dont output a error if rbutil follows a http redirect.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22739 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Wenger 2009-09-19 21:00:07 +00:00
parent 6a9a196eae
commit d0b048e82d
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rbutil/rbutilqt/base/httpget.cpp
View file

@ -390,22 +390,24 @@ void HttpGet::httpResponseHeader(const QHttpResponseHeader &resp)
// if there is a network error abort all scheduled requests for // if there is a network error abort all scheduled requests for
// this download // this download
m_response = resp.statusCode(); m_response = resp.statusCode();
if(m_response != 200) {
// abort old request first.
http.abort();
}
// 301 -- moved permanently // 301 -- moved permanently
// 302 -- found // 302 -- found
// 303 -- see other // 303 -- see other
// 307 -- moved temporarily // 307 -- moved temporarily
// in all cases, header: location has the correct address so we can follow. // in all cases, header: location has the correct address so we can follow.
if(m_response == 301 || m_response == 302 || m_response == 303 || m_response == 307) { if(m_response == 301 || m_response == 302 || m_response == 303 || m_response == 307) {
//abort without sending any signals
http.blockSignals(true);
http.abort();
http.blockSignals(false);
// start new request with new url // start new request with new url
qDebug() << "[HTTP] response =" << m_response << "- following"; qDebug() << "[HTTP] response =" << m_response << "- following";
getFile(resp.value("location") + m_query); getFile(resp.value("location") + m_query);
} }
else if(m_response != 200) { else if(m_response != 200) {
// all other errors are fatal. // all other errors are fatal.
http.abort();
qDebug() << "[HTTP] Response error:" << m_response << resp.reasonPhrase(); qDebug() << "[HTTP] Response error:" << m_response << resp.reasonPhrase();
} }