summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Hartmann <peter.hartmann@nokia.com>2011-01-24 13:21:18 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2011-01-25 08:35:09 (GMT)
commit43867daa6a6b299038bd3a559078efc26608c74d (patch)
tree988fa814985e6b1e0fb4990670d906b068604fc3
parent6e49ead4a2f62f4cc951a80cd2ac6900f497b104 (diff)
downloadQt-43867daa6a6b299038bd3a559078efc26608c74d.zip
Qt-43867daa6a6b299038bd3a559078efc26608c74d.tar.gz
Qt-43867daa6a6b299038bd3a559078efc26608c74d.tar.bz2
HTTP: fix digest authentication
no need to extract the realm from the user; with digest authentication the realm is an attribute of its own. Reviewed-by: Markus Goetz Task-number: QTBUG-15070 (cherry picked from commit 1137379e98cab8cc67fac70b31c97001c4473eb0)
-rw-r--r--src/network/kernel/qauthenticator.cpp19
1 files changed, 1 insertions, 18 deletions
diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp
index 73143e1..d61d3b7 100644
--- a/src/network/kernel/qauthenticator.cpp
+++ b/src/network/kernel/qauthenticator.cpp
@@ -213,24 +213,6 @@ void QAuthenticator::setUser(const QString &user)
int separatorPosn = 0;
switch(d->method) {
- case QAuthenticatorPrivate::DigestMd5:
- if((separatorPosn = user.indexOf(QLatin1String("\\"))) != -1) {
- //domain name is present
- d->userDomain.clear();
- d->realm = user.left(separatorPosn);
- d->user = user.mid(separatorPosn + 1);
- } else if((separatorPosn = user.indexOf(QLatin1String("@"))) != -1) {
- //domain name is present
- d->userDomain.clear();
- d->realm = user.mid(separatorPosn + 1);
- d->user = user.left(separatorPosn);
- } else {
- d->user = user;
- d->realm.clear();
- d->userDomain.clear();
- }
- break;
-
case QAuthenticatorPrivate::Ntlm:
if((separatorPosn = user.indexOf(QLatin1String("\\"))) != -1) {
//domain name is present
@@ -253,6 +235,7 @@ void QAuthenticator::setUser(const QString &user)
break;
default:
d->user = user;
+ d->userDomain.clear();
break;
}
}