--- a/src/network/ssl/qsslsocket.cpp Tue Jul 06 15:10:48 2010 +0300
+++ b/src/network/ssl/qsslsocket.cpp Wed Aug 18 10:37:55 2010 +0300
@@ -574,7 +574,7 @@
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 @@
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.
@@ -1329,8 +1329,8 @@
/*!
Returns the current default CA certificate database. This database
is originally set to your system's default CA certificate database.
- If no system default database is found, Qt will provide its own
- default database. You can override the default CA certificate database
+ If no system default database is found, an empty database will be
+ returned. You can override the default CA certificate database
with your own CA certificate database using setDefaultCaCertificates().
Each SSL socket's CA certificate database is initialized to the
@@ -1344,8 +1344,8 @@
}
/*!
- This function provides a default CA certificate database
- shipped together with Qt. The CA certificate database
+ This function provides the CA certificate database
+ provided by the operating system. The CA certificate database
returned by this function is used to initialize the database
returned by defaultCaCertificates(). You can replace that database
with your own with setDefaultCaCertificates().
@@ -1556,7 +1556,7 @@
*/
bool QSslSocket::supportsSsl()
{
- return QSslSocketPrivate::ensureInitialized();
+ return QSslSocketPrivate::supportsSsl();
}
/*!