summaryrefslogtreecommitdiffstats
path: root/src/network/access/qhttpnetworkconnection.cpp
diff options
context:
space:
mode:
authorMarkus Goetz <Markus.Goetz@nokia.com>2010-10-26 13:48:42 (GMT)
committerMarkus Goetz <Markus.Goetz@nokia.com>2010-10-27 12:40:28 (GMT)
commitfb404765a5af559598dc5b3906e45d8c5e48884b (patch)
tree4ed25dade61ffb29614dc31c8546f964ebb8158d /src/network/access/qhttpnetworkconnection.cpp
parent3b87e4639edb2c7050c5ae74fa8280fd120b8de1 (diff)
downloadQt-fb404765a5af559598dc5b3906e45d8c5e48884b.zip
Qt-fb404765a5af559598dc5b3906e45d8c5e48884b.tar.gz
Qt-fb404765a5af559598dc5b3906e45d8c5e48884b.tar.bz2
QNAM HTTP: Move proxyAuthenticationRequired() to QHttpNetworkReply
Reviewed-by: Prasanth Task-Number: QTBUG-13234
Diffstat (limited to 'src/network/access/qhttpnetworkconnection.cpp')
-rw-r--r--src/network/access/qhttpnetworkconnection.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 1166a9a..f266322 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -354,7 +354,7 @@ bool QHttpNetworkConnectionPrivate::handleAuthenticateChallenge(QAbstractSocket
emit q->authenticationRequired(reply, reply->request(), auth, q);
#ifndef QT_NO_NETWORKPROXY
} else {
- emit q->proxyAuthenticationRequired(networkProxy, auth, q);
+ emit reply->proxyAuthenticationRequired(networkProxy, auth);
#endif
}
resumeConnection();
@@ -963,11 +963,10 @@ void QHttpNetworkConnection::ignoreSslErrors(const QList<QSslError> &errors, int
// e.g. it is for SOCKS proxies which require authentication.
void QHttpNetworkConnectionPrivate::emitProxyAuthenticationRequired(const QHttpNetworkConnectionChannel *chan, const QNetworkProxy &proxy, QAuthenticator* auth)
{
- Q_Q(QHttpNetworkConnection);
// Also pause the connection because socket notifiers may fire while an user
// dialog is displaying
pauseConnection();
- emit q->proxyAuthenticationRequired(proxy, auth, q);
+ emit chan->reply->proxyAuthenticationRequired(proxy, auth);
resumeConnection();
int i = indexOf(chan->socket);
copyCredentials(i, auth, true);