summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaud Bienner <arnaud.bienner@gmail.com>2014-05-13 20:19:12 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-27 19:38:43 +0200
commit34590e84d4aaceb5874d8acb6a2b7a95c153cd6a (patch)
tree40e8dca481c4cde3b1929739af9d7c93303580bd
parent8746a6a3e2a21f952badd6301565783f07f61c03 (diff)
Doc: be more explicit about need to set expected SSL cert in errors
Note added in QNetworkReply and QSslSocket documentation. Task-number: QTBUG-16770 Change-Id: I2dd8cfb913ec29a96b5465a905cd213713b8d537 Reviewed-by: Richard J. Moore <rich@kde.org>
-rw-r--r--src/network/access/qnetworkreply.cpp3
-rw-r--r--src/network/ssl/qsslsocket.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp
index bfe870c783..2d9a128559 100644
--- a/src/network/access/qnetworkreply.cpp
+++ b/src/network/access/qnetworkreply.cpp
@@ -657,7 +657,8 @@ void QNetworkReply::setSslConfiguration(const QSslConfiguration &config)
If this function is called, the SSL errors given in \a errors
will be ignored.
- Note that you can set the expected certificate in the SSL error:
+ \note Because most SSL errors are associated with a certificate, for most
+ of them you must set the expected certificate this SSL error is related to.
If, for instance, you want to issue a request to a server that uses
a self-signed certificate, consider the following snippet:
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index de6e879a71..90f6e25b97 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -1771,7 +1771,8 @@ void QSslSocket::ignoreSslErrors()
This method tells QSslSocket to ignore only the errors given in \a
errors.
- Note that you can set the expected certificate in the SSL error:
+ \note Because most SSL errors are associated with a certificate, for most
+ of them you must set the expected certificate this SSL error is related to.
If, for instance, you want to connect to a server that uses
a self-signed certificate, consider the following snippet: