summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Goetz <Markus.Goetz@nokia.com>2009-06-17 08:13:16 (GMT)
committerMarkus Goetz <Markus.Goetz@nokia.com>2009-06-17 09:11:52 (GMT)
commitfe59d3a82040e7202b4330a9da36fa4591e778c9 (patch)
tree91c422c9bf7d8814c3d5cf754b4d2ab270caef95
parent9fb3b6c953228023eb735c31b8610f2171999015 (diff)
downloadQt-fe59d3a82040e7202b4330a9da36fa4591e778c9.zip
Qt-fe59d3a82040e7202b4330a9da36fa4591e778c9.tar.gz
Qt-fe59d3a82040e7202b4330a9da36fa4591e778c9.tar.bz2
QWebPage: Don't call supportsSsl()
This stops QWebPage from loading the OpenSSL libs, certificates etc. when they are not needed for the non-HTTPS case. Reviewed-by: Simon Hausmann
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
index dc0eebd..2decbca 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
@@ -2585,8 +2585,12 @@ QString QWebPage::userAgentForUrl(const QUrl& url) const
QChar securityStrength(QLatin1Char('N'));
#if !defined(QT_NO_OPENSSL)
- if (QSslSocket::supportsSsl())
- securityStrength = QLatin1Char('U');
+ // we could check QSslSocket::supportsSsl() here, but this makes
+ // OpenSSL, certificates etc being loaded in all cases were QWebPage
+ // is used. This loading is not needed for non-https.
+ securityStrength = QLatin1Char('U');
+ // this may lead to a false positive: We indicate SSL since it is
+ // compiled in even though supportsSsl() might return false
#endif
ua = ua.arg(securityStrength);