diff options
| author | Arnaud Bienner <arnaud.bienner@gmail.com> | 2014-05-13 20:19:12 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-02 14:37:26 +0200 |
| commit | cbd1f795bd7a62bf7cb0587c371df41f135e7ca4 (patch) | |
| tree | 6c87c7b452f287578f54e439f5cfdc43a9f101df /src | |
| parent | ea0ab2cdec43fc64b5b1380b3441ab68e3eec3bc (diff) | |
| download | qt4-tools-cbd1f795bd7a62bf7cb0587c371df41f135e7ca4.tar.gz | |
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>
(cherry picked from qtbase/34590e84d4aaceb5874d8acb6a2b7a95c153cd6a)
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/access/qnetworkreply.cpp | 3 | ||||
| -rw-r--r-- | src/network/ssl/qsslsocket.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp index 52b71cba1d..4cdfe1f547 100644 --- a/src/network/access/qnetworkreply.cpp +++ b/src/network/access/qnetworkreply.cpp @@ -620,7 +620,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 86f32e7ed6..cc956b6382 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -1704,7 +1704,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: |