Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (62 commits)
  Correct faulty 4.7->4.8 merge of Symbian def-files
  SSL documentation: correct enum name
  Updated changelog for Qt 4.8
  Fix QFile::copy() returning false but error() being NoError
  Symbian - disable memory mapping in QNetworkDiskCache
  Revert "Fixed deployment problems with MSVC 2005 and 2008 SP1"
  Harfbuzz shaper: kerning adjustment does not need to be modified by RTL
  QIODevice - disallow setTextMode when not open
  Adding items to a view with no delegate crashes.
  Update changelog for Qt 4.8
  Fix possible crash in glyph cache when deleting and creating contexts
  Added Lithuanian translation of Qt.
  Remove idc from mingw build.
  Update changelog for Qt 4.8
  Update changelog for Qt 4.8
  Doc: Fix example code
  Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504
  Add the ability to enable various SSL bug workarounds.
  Fix security issue on website due to bad JS.
  Fix security problem on webpage due to bad JS
  ...

1 files changed, 30 insertions, 0 deletions

diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp
index 586c894..b556328 100644
--- a/src/network/ssl/qssl.cpp
+++ b/src/network/ssl/qssl.cpp
@@ -120,4 +120,34 @@ QT_BEGIN_NAMESPACE
     the correct setting for your protocol.
 */
 
+/*!
+    \enum QSsl::SslOption
+
+    Describes the options that can be used to control the details of
+    SSL behaviour. These options are generally used to turn features off
+    to work around buggy servers.
+
+    \value SslOptionDisableEmptyFragments Disables the insertion of empty
+    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 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
+    extension. When enabled, this allows the data being passed over SSL to
+    be compressed, however some servers are not compatible with this
+    extension.
+    \value SslOptionDisableServerNameIndication Disables the SSL server
+    name indication extension. When enabled, this tells the server the virtual
+    host being accessed allowing it to respond with the correct certificate.
+
+    By default, SslOptionDisableEmptyFragments is turned on since this causes
+    problems with a large number of servers, but the other options are disabled.
+
+    Note: Availability of above options depends on the version of the SSL
+    backend in use.
+*/
+
+
 QT_END_NAMESPACE