diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-11-17 00:00:12 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-11-17 00:00:12 (GMT) |
| commit | 54c6d478fcad7f13563da713958bb359a17e7363 (patch) | |
| tree | 808e83a83141e2d8e93180bd34775bf3bc22c780 /src/network/ssl/qsslconfiguration.cpp | |
| parent | f992096a065c99f8307965f73e29ebad49ee6b9b (diff) | |
| parent | b0d54f150e9b4211e263b4835dd2c64ac07a8c86 (diff) | |
| download | Qt-54c6d478fcad7f13563da713958bb359a17e7363.zip Qt-54c6d478fcad7f13563da713958bb359a17e7363.tar.gz Qt-54c6d478fcad7f13563da713958bb359a17e7363.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src/network/ssl/qsslconfiguration.cpp')
| -rw-r--r-- | src/network/ssl/qsslconfiguration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp index e24076e..727130b 100644 --- a/src/network/ssl/qsslconfiguration.cpp +++ b/src/network/ssl/qsslconfiguration.cpp @@ -201,7 +201,7 @@ bool QSslConfiguration::isNull() const d->privateKey.isNull() && d->peerCertificate.isNull() && d->peerCertificateChain.count() == 0 && - d->sslOptions == 0); + d->sslOptions == QSsl::SslOptionDisableEmptyFragments|QSsl::SslOptionDisableLegacyRenegotiation); } /*! |