summaryrefslogtreecommitdiff
path: root/src/network/ssl/qsslsocket.cpp
diff options
context:
space:
mode:
authorPeter Hartmann <phartmann@blackberry.com>2013-04-30 14:48:22 +0200
committerPeter Hartmann <phartmann@blackberry.com>2013-06-03 12:50:15 +0200
commit054e85bfdae2af37f0c2ee17d131e0b3cb2d2f25 (patch)
treeab51c7b9c845455c94a3997c23da2bb77d0673f1 /src/network/ssl/qsslsocket.cpp
parent84eb6200ff0850db8bab8d32b70e571ca9db2bda (diff)
downloadqt4-tools-054e85bfdae2af37f0c2ee17d131e0b3cb2d2f25.tar.gz
[BB10-internal] QSslConfiguration: add API to persist and resume SSL sessions4.8-bb10
Session tickets can be cached on the client side for hours (e.g. graph.facebook.com: ~ 24 hours, api.twitter.com: 4 hours), because the server does not need to maintain state. We need public API for it so an application can cache the session (e.g. to disk) and resume a session already with the 1st handshake, saving one network round trip. Task-number: QTBUG-20668 (backport of commit 3be197881f100d1c3c8f3ce00501d7a32eb51119) Change-Id: I4c7f3a749edf0012b52deeb495706e550d24c42d Signed-off-by: Peter Hartmann <phartmann@blackberry.com>
Diffstat (limited to 'src/network/ssl/qsslsocket.cpp')
-rw-r--r--src/network/ssl/qsslsocket.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index be46ca5ffb..fc75fa52e1 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -897,6 +897,9 @@ void QSslSocket::setSslConfiguration(const QSslConfiguration &configuration)
d->configuration.peerVerifyMode = configuration.peerVerifyMode();
d->configuration.protocol = configuration.protocol();
d->configuration.sslOptions = configuration.d->sslOptions;
+ d->configuration.cacheSslSession = configuration.d->cacheSslSession;
+ d->configuration.sslSession = configuration.d->sslSession;
+ d->configuration.sslSessionTicketLifeTimeHint = configuration.d->sslSessionTicketLifeTimeHint;
// if the CA certificates were set explicitly (either via
// QSslConfiguration::setCaCertificates() or QSslSocket::setCaCertificates(),