WebView: Don't try to load invalid one-word urls

And also save the host lookup in case of invalid url.
remotes/origin/falkon
David Rosca 11 years ago
parent fb4782dab2
commit 27f0f9afac
  1. 9
      src/lib/webengine/webview.cpp

@ -176,15 +176,18 @@ void WebView::load(const LoadRequest &request)
!reqUrl.path().contains(QL1C(' ')) && !reqUrl.path().contains(QL1C(' ')) &&
!reqUrl.path().contains(QL1C('.')) !reqUrl.path().contains(QL1C('.'))
) { ) {
// FIXME: This is blocking... QUrl u(QSL("http://") + reqUrl.path());
QHostInfo info = QHostInfo::fromName(reqUrl.path()); if (u.isValid()) {
// This is blocking...
QHostInfo info = QHostInfo::fromName(u.path());
if (info.error() == QHostInfo::NoError) { if (info.error() == QHostInfo::NoError) {
LoadRequest req = request; LoadRequest req = request;
req.setUrl(QUrl(QSL("http://") + reqUrl.path())); req.setUrl(u);
loadRequest(req); loadRequest(req);
return; return;
} }
} }
}
const LoadRequest searchRequest = mApp->searchEnginesManager()->searchResult(request.urlString()); const LoadRequest searchRequest = mApp->searchEnginesManager()->searchResult(request.urlString());
loadRequest(searchRequest); loadRequest(searchRequest);

Loading…
Cancel
Save