diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-07-19 01:32:27 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-07-19 01:32:27 (GMT) |
| commit | e2cb220eb67455f1041cf8ac863a5da4421ab424 (patch) | |
| tree | 830302d9d445e2c071afe59ff7bef0f0664440f5 /src/network/access/qhttpnetworkconnection.cpp | |
| parent | 5572ec653fe735c4f413195c1ef34382aa8c6105 (diff) | |
| parent | 53d3083eecf88a20bc36ada43942c7a18677af62 (diff) | |
| download | Qt-e2cb220eb67455f1041cf8ac863a5da4421ab424.zip Qt-e2cb220eb67455f1041cf8ac863a5da4421ab424.tar.gz Qt-e2cb220eb67455f1041cf8ac863a5da4421ab424.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/network/access/qhttpnetworkconnection.cpp')
| -rw-r--r-- | src/network/access/qhttpnetworkconnection.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index 1afabec..9e2b85e 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -286,13 +286,8 @@ bool QHttpNetworkConnectionPrivate::handleAuthenticateChallenge(QAbstractSocket resend = false; //create the response header to be used with QAuthenticatorPrivate. - QHttpResponseHeader responseHeader; QList<QPair<QByteArray, QByteArray> > fields = reply->header(); - QList<QPair<QByteArray, QByteArray> >::const_iterator it = fields.constBegin(); - while (it != fields.constEnd()) { - responseHeader.addValue(QString::fromLatin1(it->first), QString::fromUtf8(it->second)); - it++; - } + //find out the type of authentication protocol requested. QAuthenticatorPrivate::Method authMethod = reply->d_func()->authenticationMethod(isProxy); if (authMethod != QAuthenticatorPrivate::None) { @@ -310,7 +305,7 @@ bool QHttpNetworkConnectionPrivate::handleAuthenticateChallenge(QAbstractSocket if (auth->isNull()) auth->detach(); QAuthenticatorPrivate *priv = QAuthenticatorPrivate::getPrivate(*auth); - priv->parseHttpResponse(responseHeader, isProxy); + priv->parseHttpResponse(fields, isProxy); if (priv->phase == QAuthenticatorPrivate::Done) { if ((isProxy && pendingProxyAuthSignal) ||(!isProxy && pendingAuthSignal)) { |