diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-12-22 14:08:17 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2012-01-04 17:39:30 (GMT) |
| commit | c5ddcb3387f968ce0c2ac6420a05c5ebc528b260 (patch) | |
| tree | f08c9f2a1c5ed5d5b7115dd16cd4959b6791c276 /src/network/kernel | |
| parent | ef91776735216f23b3d708032b81435d045e8e56 (diff) | |
| download | Qt-c5ddcb3387f968ce0c2ac6420a05c5ebc528b260.zip Qt-c5ddcb3387f968ce0c2ac6420a05c5ebc528b260.tar.gz Qt-c5ddcb3387f968ce0c2ac6420a05c5ebc528b260.tar.bz2 | |
Fix http authentication to a different realm on the same server
This is a regression caused by the NTLMv2 authentication patch.
I have manually tested NTLMv2 authentication against MS IIS and reverting
these two lines does not break it.
Task-number: QT-5209
Change-Id: I64159cbe468e1a7f834f8726fd0c9d4ab4c54b38
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
(cherry-picked from 4954f71648aa7f74a4cb8b1dd26470b5da44459e)
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/qauthenticator.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp index ac8b4b9..d0524ee 100644 --- a/src/network/kernel/qauthenticator.cpp +++ b/src/network/kernel/qauthenticator.cpp @@ -388,8 +388,7 @@ void QAuthenticatorPrivate::parseHttpResponse(const QList<QPair<QByteArray, QByt switch(method) { case Basic: - if(realm.isEmpty()) - this->options[QLatin1String("realm")] = realm = QString::fromLatin1(options.value("realm")); + this->options[QLatin1String("realm")] = realm = QString::fromLatin1(options.value("realm")); if (user.isEmpty() && password.isEmpty()) phase = Done; break; @@ -397,8 +396,7 @@ void QAuthenticatorPrivate::parseHttpResponse(const QList<QPair<QByteArray, QByt // #### extract from header break; case DigestMd5: { - if(realm.isEmpty()) - this->options[QLatin1String("realm")] = realm = QString::fromLatin1(options.value("realm")); + this->options[QLatin1String("realm")] = realm = QString::fromLatin1(options.value("realm")); if (options.value("stale").toLower() == "true") phase = Start; if (user.isEmpty() && password.isEmpty()) |