summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-05-12 10:38:22 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-05-12 10:38:22 (GMT)
commitcc957f4cb1a8dce2fb1eb406f54ccecb4092d238 (patch)
tree5463704092728f10a58931fba7a2a74fa71f73d0 /src/network
parentf14620878beed97c85c4b6a03a38f485800328d1 (diff)
parent8c0cdfdd4772e81164d838b9549e8c554ecf5966 (diff)
downloadQt-cc957f4cb1a8dce2fb1eb406f54ccecb4092d238.zip
Qt-cc957f4cb1a8dce2fb1eb406f54ccecb4092d238.tar.gz
Qt-cc957f4cb1a8dce2fb1eb406f54ccecb4092d238.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/network')
-rw-r--r--src/network/kernel/qauthenticator.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp
index 19243aa..a66672d 100644
--- a/src/network/kernel/qauthenticator.cpp
+++ b/src/network/kernel/qauthenticator.cpp
@@ -73,6 +73,15 @@ static QByteArray qNtlmPhase3(QAuthenticatorPrivate *ctx, const QByteArray& phas
authentication information to the socket when accessing services that
require authentication.
+ QAuthenticator supports the following authentication methods:
+ \list
+ \o Basic
+ \o NTLM version 1
+ \o Digest-MD5
+ \endlist
+
+ Note that, in particular, NTLM version 2 is not supported.
+
\sa QSslSocket
*/