From fe59d3a82040e7202b4330a9da36fa4591e778c9 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Wed, 17 Jun 2009 10:13:16 +0200 Subject: 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 --- src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | 8 ++++++-- 1 file 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); -- cgit v0.12