[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kio/kio
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2011-01-26 13:46:36
Message-ID: 20110126134636.BE61DAC8BA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1217274 by adawit:

Disregard all errors received on valid redirects. Fixes BR# 263817
Improve debug message when receiving errors.

CCBUG:263817

 M  +10 -5     accessmanagerreply_p.cpp  


--- trunk/KDE/kdelibs/kio/kio/accessmanagerreply_p.cpp #1217273:1217274
@@ -274,29 +274,34 @@
             break;
         case KIO::ERR_COULD_NOT_AUTHENTICATE:
             setError(QNetworkReply::AuthenticationRequiredError, kJob->errorText());
-            kDebug(7044) << errcode;
+            kDebug(7044) << "KIO::ERR_COULD_NOT_AUTHENTICATE -> \
QNetworkReply::AuthenticationRequiredError";  break;
         case KIO::ERR_UNSUPPORTED_PROTOCOL:
         case KIO::ERR_NO_SOURCE_PROTOCOL:
             setError(QNetworkReply::ProtocolUnknownError, kJob->errorText());
-            kDebug(7044) << errcode;
+            kDebug(7044) << "KIO::ERR_UNSUPPORTED_PROTOCOL -> \
QNetworkReply::ProtocolUnknownError";  break;
+        case KIO::ERR_CONNECTION_BROKEN:
+            setError(QNetworkReply::RemoteHostClosedError, kJob->errorText());
+            kDebug(7044) << "KIO::ERR_CONNECTION_BROKEN -> \
QNetworkReply::RemoteHostClosedError"; +            break;
         case KIO::ERR_UNSUPPORTED_ACTION:
             setError(QNetworkReply::ProtocolInvalidOperationError, \
                kJob->errorText());
-            kDebug(7044) << errcode;
+            kDebug(7044) << "KIO::ERR_UNSUPPORTED_ACTION -> \
QNetworkReply::ProtocolInvalidOperationError";  break;
         default:
             setError(QNetworkReply::UnknownNetworkError, kJob->errorText());
-            kDebug(7044) << errcode;
+            kDebug(7044) << KIO::rawErrorDetail(errcode, QString()) << "-> \
QNetworkReply::UnknownNetworkError";  }
 
     const QUrl redirectUrl = \
attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();  if \
(redirectUrl.isValid())  readHttpResponseHeaders(m_kioJob);
-
+    else {
     setAttribute(static_cast<QNetworkRequest::Attribute>(KIO::AccessManager::KioError), \
errcode);  if (errcode)
         emit error(error());
+    }
     
     emit finished();
 }


[prev in list] [next in list] [prev in thread] [next in thread]