From 06b254d686a9fbed702e8d1777dc5c7adcba1fbe Mon Sep 17 00:00:00 2001 From: Mike Skec Date: Sat, 26 Dec 2020 16:55:43 +1100 Subject: Fix #79. Also added Ctrl+U shortcut for 'View page source' --- src/browsertab.cpp | 9 ++++++++- src/browsertab.hpp | 2 +- src/mainwindow.ui | 3 +++ 3 files changed, 12 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/browsertab.cpp b/src/browsertab.cpp index 136a01f..1180f11 100644 --- a/src/browsertab.cpp +++ b/src/browsertab.cpp @@ -668,12 +668,19 @@ void BrowserTab::on_inputRequired(const QString &query, const bool is_sensitive) } } -void BrowserTab::on_redirected(const QUrl &uri, bool is_permanent) +void BrowserTab::on_redirected(QUrl uri, bool is_permanent) { Q_UNUSED(is_permanent); this->network_timeout_timer.stop(); + // #79: Handle non-full url redirects + if (uri.isRelative()) + { + uri.setScheme(current_location.scheme()); + uri.setHost(current_location.host()); + } + if (redirection_count >= kristall::options.max_redirections) { setErrorMessage(QString("Too many consecutive redirections. The last redirection would have redirected you to:\r\n%1").arg(uri.toString(QUrl::FullyEncoded))); diff --git a/src/browsertab.hpp b/src/browsertab.hpp index 7ddd843..182e397 100644 --- a/src/browsertab.hpp +++ b/src/browsertab.hpp @@ -119,7 +119,7 @@ private: // network slots void on_requestProgress(qint64 transferred); void on_requestComplete(QByteArray const & data, QString const & mime); - void on_redirected(QUrl const & uri, bool is_permanent); + void on_redirected(QUrl uri, bool is_permanent); void on_inputRequired(QString const & user_query, bool is_sensitive); void on_networkError(ProtocolHandler::NetworkError error, QString const & reason); void on_certificateRequired(QString const & info); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index a10ad4b..8bda9c5 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -406,6 +406,9 @@ View document source + + Ctrl+U + -- cgit v1.2.3