diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-15 09:07:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-15 09:07:13 (GMT) |
| commit | 04d0a534c6fe64d308652da2ada109c7d6bd72ed (patch) | |
| tree | fcbbc2672e30b44215d7836fd8f926f00285278a | |
| parent | 7569e6601fb9dcf730ac20cd5c1d39307daa2810 (diff) | |
| parent | 6057909d2b73c2c3aa01a0e9216714ef07fb652f (diff) | |
| download | Qt-04d0a534c6fe64d308652da2ada109c7d6bd72ed.zip Qt-04d0a534c6fe64d308652da2ada109c7d6bd72ed.tar.gz Qt-04d0a534c6fe64d308652da2ada109c7d6bd72ed.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
HTTP internals: send password even if no username is set
| -rw-r--r-- | src/network/kernel/qauthenticator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp index 4f7f4ed..0423e22 100644 --- a/src/network/kernel/qauthenticator.cpp +++ b/src/network/kernel/qauthenticator.cpp @@ -395,7 +395,7 @@ void QAuthenticatorPrivate::parseHttpResponse(const QList<QPair<QByteArray, QByt case Basic: if(realm.isEmpty()) this->options[QLatin1String("realm")] = realm = QString::fromLatin1(options.value("realm")); - if (user.isEmpty()) + if (user.isEmpty() && password.isEmpty()) phase = Done; break; case Ntlm: @@ -406,7 +406,7 @@ void QAuthenticatorPrivate::parseHttpResponse(const QList<QPair<QByteArray, QByt this->options[QLatin1String("realm")] = realm = QString::fromLatin1(options.value("realm")); if (options.value("stale").toLower() == "true") phase = Start; - if (user.isEmpty()) + if (user.isEmpty() && password.isEmpty()) phase = Done; break; } |