Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

2 files changed, 29 insertions, 20 deletions

diff --git a/src/network/access/qhttp.cpp b/src/network/access/qhttp.cpp
index 96ccc91..2002641 100644
--- a/src/network/access/qhttp.cpp
+++ b/src/network/access/qhttp.cpp
@@ -1446,7 +1446,7 @@ QString QHttpRequestHeader::toString() const
     that indicates if the request finished with an error.
 
     To make an HTTP request you must set up suitable HTTP headers. The
-    following example demonstrates, how to request the main HTML page
+    following example demonstrates how to request the main HTML page
     from the Trolltech home page (i.e., the URL
     \c http://qtsoftware.com/index.html):
 
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index d4bf008..43fbb16 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -703,27 +703,37 @@ void QHttpNetworkConnectionPrivate::handleStatus(QAbstractSocket *socket, QHttpN
     switch (statusCode) {
     case 401:
     case 407:
-        handleAuthenticateChallenge(socket, reply, (statusCode == 407), resend);
-        if (resend) {
-            int i = indexOf(socket);
-
-            QNonContiguousByteDevice* uploadByteDevice = channels[i].request.uploadByteDevice();
-            if (uploadByteDevice) {
-                if (uploadByteDevice->reset()) {
-                    channels[i].written = 0;
-                } else {
-                    emitReplyError(socket, reply, QNetworkReply::ContentReSendError);
-                    break;
+        if (handleAuthenticateChallenge(socket, reply, (statusCode == 407), resend)) {
+            if (resend) {
+                int i = indexOf(socket);
+
+                QNonContiguousByteDevice* uploadByteDevice = channels[i].request.uploadByteDevice();
+                if (uploadByteDevice) {
+                    if (uploadByteDevice->reset()) {
+                        channels[i].written = 0;
+                    } else {
+                        emitReplyError(socket, reply, QNetworkReply::ContentReSendError);
+                        break;
+                    }
                 }
-            }
-
-            eraseData(reply);
 
-            // also use async _q_startNextRequest so we dont break with closed
-            // proxy or server connections..
-            channels[i].resendCurrent = true;
-            QMetaObject::invokeMethod(q, "_q_startNextRequest", Qt::QueuedConnection);
+                eraseData(reply);
 
+                // also use async _q_startNextRequest so we dont break with closed
+                // proxy or server connections..
+                channels[i].resendCurrent = true;
+                QMetaObject::invokeMethod(q, "_q_startNextRequest", Qt::QueuedConnection);
+            }
+        } else {
+            int i = indexOf(socket);
+            emit channels[i].reply->headerChanged();
+            emit channels[i].reply->readyRead();
+            QNetworkReply::NetworkError errorCode = (statusCode == 407)
+                ? QNetworkReply::ProxyAuthenticationRequiredError
+                : QNetworkReply::AuthenticationRequiredError;
+            reply->d_func()->errorString = errorDetail(errorCode, socket);
+            emit q->error(errorCode, reply->d_func()->errorString);
+            emit channels[i].reply->finished();
         }
         break;
     default:
@@ -826,7 +836,6 @@ bool QHttpNetworkConnectionPrivate::handleAuthenticateChallenge(QAbstractSocket
             // authentication is cancelled, send the current contents to the user.
             emit channels[i].reply->headerChanged();
             emit channels[i].reply->readyRead();
-            emit channels[i].reply->finished();
             QNetworkReply::NetworkError errorCode =
                 isProxy
                 ? QNetworkReply::ProxyAuthenticationRequiredError