diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-07-13 08:18:50 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-07-13 08:18:50 (GMT) |
| commit | c93c9bbfe94cd271aeda9e2730d343e3eee31ec5 (patch) | |
| tree | 7d5d2ec2102f1e5920ec17905d1695f475abd32f | |
| parent | 1d3aa6681423d7a39a8ed375448a9418ef33a1f5 (diff) | |
| parent | 2c48de46fdfeb935d1f31ae18f13add52c162ac8 (diff) | |
| download | Qt-c93c9bbfe94cd271aeda9e2730d343e3eee31ec5.zip Qt-c93c9bbfe94cd271aeda9e2730d343e3eee31ec5.tar.gz Qt-c93c9bbfe94cd271aeda9e2730d343e3eee31ec5.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
| -rw-r--r-- | src/network/ssl/qsslsocket.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index f85fa84..f73068e 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -574,7 +574,7 @@ void QSslSocket::setProtocol(QSsl::SslProtocol protocol) certificate is valid. The default mode is AutoVerifyPeer, which tells QSslSocket to use - VerifyPeer for clients, QueryPeer for clients. + VerifyPeer for clients and QueryPeer for servers. \sa setPeerVerifyMode(), peerVerifyDepth(), mode() */ @@ -594,7 +594,7 @@ QSslSocket::PeerVerifyMode QSslSocket::peerVerifyMode() const certificate is valid. The default mode is AutoVerifyPeer, which tells QSslSocket to use - VerifyPeer for clients, QueryPeer for clients. + VerifyPeer for clients and QueryPeer for servers. Setting this mode after encryption has started has no effect on the current connection. |