rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disable certificate workaround on Qt >= 5.9

Browse Source 
Fixes #4020
This commit is contained in:
Florian Bruhin 2018-06-25 20:35:48 +02:00
parent 3f923b41e0
commit 8a4bba11ed
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/changelog.asciidoc
View File

@ -104,6 +104,8 @@ Changed
Existing dictionaries are copied over. Existing dictionaries are copied over.
- If an error while parsing `~/.netrc` occurs, the cause of the error is now - If an error while parsing `~/.netrc` occurs, the cause of the error is now
logged. logged.
- On Qt 5.9 or newer, certificate errors now show Chromium's detailed error
page.
Fixed Fixed
~~~~~ ~~~~~

11
qutebrowser/browser/webengine/webview.py
View File

@ -199,15 +199,18 @@ class WebEnginePage(QWebEnginePage):
"{}".format(error)) "{}".format(error))
ignore = False ignore = False
log.webview.debug("ignore {}, URL {}, requested {}".format(
ignore, url, self.requestedUrl()))
# WORKAROUND for https://bugreports.qt.io/browse/QTBUG-56207
# We can't really know when to show an error page, as the error might # We can't really know when to show an error page, as the error might
# have happened when loading some resource. # have happened when loading some resource.
# However, self.url() is not available yet and self.requestedUrl() # However, self.url() is not available yet and self.requestedUrl()
# might not match the URL we get from the error - so we just apply a # might not match the URL we get from the error - so we just apply a
# heuristic here. # heuristic here.
# See https://bugreports.qt.io/browse/QTBUG-56207 if (not qtutils.version_check('5.9') and
log.webview.debug("ignore {}, URL {}, requested {}".format( not ignore and
ignore, url, self.requestedUrl())) url.matches(self.requestedUrl(), QUrl.RemoveScheme)):
if not ignore and url.matches(self.requestedUrl(), QUrl.RemoveScheme):
self.setHtml(error_page) self.setHtml(error_page)
return ignore return ignore