diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-01 04:02:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-01 04:02:20 (GMT) |
| commit | 9dbf970d12e6670b247ea92570311a091a22cc69 (patch) | |
| tree | 63508a97fc42b3ac04037509885ecd0920551892 | |
| parent | 1bdbed7dbf04fd73c465c0bad28b23a1e5b80f23 (diff) | |
| parent | 9d5c920bb23b949a0b98f1268679a0a2c06dd1d9 (diff) | |
| download | Qt-9dbf970d12e6670b247ea92570311a091a22cc69.zip Qt-9dbf970d12e6670b247ea92570311a091a22cc69.tar.gz Qt-9dbf970d12e6670b247ea92570311a091a22cc69.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
SSL documentation: correct enum name
| -rw-r--r-- | src/network/ssl/qssl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp index 08a05ff..b556328 100644 --- a/src/network/ssl/qssl.cpp +++ b/src/network/ssl/qssl.cpp @@ -131,7 +131,7 @@ QT_BEGIN_NAMESPACE fragments into the data when using block ciphers. When enabled, this prevents some attacks (such as the BEAST attack), however it is incompatible with some servers. - \value SslOptionDisableTickets Disables the SSL session ticket + \value SslOptionDisableSessionTickets Disables the SSL session ticket extension. This can cause slower connection setup, however some servers are not compatible with the extension. \value SslOptionDisableCompression Disables the SSL compression |