diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2012-04-24 16:47:55 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2012-04-27 01:38:41 +0200 |
| commit | 6a9e1ed2d94202eb1c7b334b1020abad64d8226f (patch) | |
| tree | cfaa734fb6921fd312f0a58a0640f4b77e9f99a2 /src/webpage.cpp | |
| parent | set Main Window on KDirLister (diff) | |
| download | rekonq-6a9e1ed2d94202eb1c7b334b1020abad64d8226f.tar.xz | |
Clean up url management
- Let ftp url(s) work again
- Do NOT check url twice via KUriFilter (removed MainWindow::filterUrl)
- ensure we are lowering just http url hosts
- mailto via urlbar handling
CCBUG: 298114
CCBUG: 284829
Conflicts:
src/mainwindow.cpp
Backporting from master with the needed fixes
Diffstat (limited to 'src/webpage.cpp')
| -rw-r--r-- | src/webpage.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/webpage.cpp b/src/webpage.cpp index f22d478b..86261e36 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -500,6 +500,10 @@ void WebPage::manageNetworkErrors(QNetworkReply *reply) break; case QNetworkReply::UnknownNetworkError: // unknown network-related error detected + // last chance for the strange things (eg: FTP, custom schemes, etc...) + if (_protHandler.postHandling(reply->request(), mainFrame())) + return; + case QNetworkReply::ConnectionRefusedError: // remote server refused connection case QNetworkReply::HostNotFoundError: // invalid hostname case QNetworkReply::TimeoutError: // connection time out |