diff options
| author | Peter Hartmann <phartmann@rim.com> | 2012-12-21 14:02:38 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-06 23:24:44 +0100 |
| commit | b5652df775efbd1c52eecee5f08e40e600e5d70b (patch) | |
| tree | 6e860637d9f4997234d9f3631d339796481911a2 /src/network/ssl/qsslsocket_openssl_p.h | |
| parent | 7765dff1bb8104ea145d55d32da194acb2de03ce (diff) | |
SSL: Implement session sharing and use it from QNetworkAccessManager
This improves performance since a network round trip can be avoided.
Change-Id: I1aaff7e48ef9638cb137de0f43942c3a4dd2884a
Initial-patch-by: Markus Goetz <markus@woboq.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/network/ssl/qsslsocket_openssl_p.h')
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h index 9acdcbd1c5..7d5fa0bd6d 100644 --- a/src/network/ssl/qsslsocket_openssl_p.h +++ b/src/network/ssl/qsslsocket_openssl_p.h @@ -61,7 +61,10 @@ #if defined(OCSP_RESPONSE) #undef OCSP_RESPONSE #endif +#if defined(X509_NAME) +#undef X509_NAME #endif +#endif // Q_OS_WIN #include <openssl/asn1.h> #include <openssl/bio.h> @@ -101,8 +104,6 @@ public: bool initSslContext(); void destroySslContext(); SSL *ssl; - SSL_CTX *ctx; - EVP_PKEY *pkey; BIO *readBio; BIO *writeBio; SSL_SESSION *session; |