diff options
| author | Florian Bruhin <me@the-compiler.org> | 2022-01-29 11:31:58 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2022-01-29 11:31:58 +0100 |
| commit | 438b8b46094890a28db6bac07ff1ae67bbc5ee78 (patch) | |
| tree | 74a725b05fd1814f8ea8856263176d83666a60f9 | |
| parent | fd277275f4e1829e1c9c6d485cd6967b43b3d54b (diff) | |
| download | qutebrowser-438b8b46094890a28db6bac07ff1ae67bbc5ee78.tar.gz qutebrowser-438b8b46094890a28db6bac07ff1ae67bbc5ee78.zip | |
Drop old Debian error page workaround
Manual revert of d741bdf2f92b9dcf897b15c9d850fff6442f1cf7
See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=882805
See #5078, #3773
| -rw-r--r-- | doc/changelog.asciidoc | 3 | ||||
| -rw-r--r-- | qutebrowser/browser/webengine/webenginetab.py | 17 |
2 files changed, 8 insertions, 12 deletions
diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index 100d4151f..b8870af02 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -72,6 +72,9 @@ Fixed with `confirm_quit` and multiple windows remain. - Crash when a previous crash-log file contains non-ASCII characters (which should never happen unless it was edited manually) +- Due to changes in Debian, an old workaround (for broken QtWebEngine patching + on Debian) caused the inferior qutebrowser error page to be displayed, when + Chromium's would have worked fine. The workaround was now dropped. [[v2.4.1]] v2.4.1 (unreleased) diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index fa877f560..7fa0b2b65 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -1522,15 +1522,14 @@ class WebEngineTab(browsertab.AbstractTab): } self.renderer_process_terminated.emit(status_map[status], exitcode) - def _error_page_workaround(self, js_enabled, html): + def _error_page_workaround(self, html): """Check if we're displaying a Chromium error page. - This gets called if we got a loadFinished(False), so we can display at - least some error page in situations where Chromium's can't be + This gets called if we got a loadFinished(False) without JavaScript, so + we can display at least some error page, since Chromium's can't be displayed. WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66643 - WORKAROUND for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=882805 """ match = re.search(r'"errorCode":"([^"]*)"', html) if match is None: @@ -1538,11 +1537,6 @@ class WebEngineTab(browsertab.AbstractTab): error = match.group(1) log.webview.error("Load error: {}".format(error)) - - missing_jst = 'jstProcess(' in html and 'jstProcess=' not in html - if js_enabled and not missing_jst: - return - self._show_error_page(self.url(), error=error) @pyqtSlot(int) @@ -1565,9 +1559,8 @@ class WebEngineTab(browsertab.AbstractTab): # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-65223 self._update_load_status(ok) - self.dump_async(functools.partial( - self._error_page_workaround, - self.settings.test_attribute('content.javascript.enabled'))) + if not self.settings.test_attribute('content.javascript.enabled'): + self.dump_async(self._error_page_workaround) @pyqtSlot(certificateerror.CertificateErrorWrapper) def _on_ssl_errors(self, error): |