aboutsummaryrefslogtreecommitdiff
path: root/src/cachehandler.cpp
diff options
context:
space:
mode:
authorKarol Kosek <krkk@krkk.ct8.pl>2021-01-13 00:23:29 +0100
committerFelix Queißner <felix@ib-queissner.de>2021-01-13 08:58:06 +0100
commit3bdbb94cb9ffc1cc740de060016152be769b897c (patch)
tree45dde4ff5498ff533e1b5d0f511e6d23106d9600 /src/cachehandler.cpp
parent3a5b99104288d292dc3ab2935617268f335cd455 (diff)
CacheHandler: don't remove trailing slashes from url
Partly reverts commit 50729c19ebf75ab91ee285fe7af86abbdaec411c.
Diffstat (limited to 'src/cachehandler.cpp')
-rw-r--r--src/cachehandler.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/cachehandler.cpp b/src/cachehandler.cpp
index 3559fd4..b2708df 100644
--- a/src/cachehandler.cpp
+++ b/src/cachehandler.cpp
@@ -4,7 +4,7 @@
#include <QDebug>
-void CacheHandler::push(const QUrl &u, const QByteArray &body, const MimeType &mime)
+void CacheHandler::push(const QUrl &url, const QByteArray &body, const MimeType &mime)
{
// Skip if this item is above the cached item size threshold
int bodysize = body.size();
@@ -20,8 +20,7 @@ void CacheHandler::push(const QUrl &u, const QByteArray &body, const MimeType &m
this->popOldest();
}
- QUrl url = IoUtil::uniformUrl(u);
- QString urlstr = url.toString(QUrl::FullyEncoded);;
+ QString urlstr = url.toString(QUrl::FullyEncoded | QUrl::RemoveFragment);
if (this->page_cache.find(urlstr) != this->page_cache.end())
{
@@ -34,7 +33,7 @@ void CacheHandler::push(const QUrl &u, const QByteArray &body, const MimeType &m
}
this->page_cache[urlstr] = std::make_shared<CachedPage>(
- u, body, mime, QDateTime::currentDateTime());
+ url, body, mime, QDateTime::currentDateTime());
qDebug() << "cache: pushing url " << url;
@@ -52,7 +51,7 @@ std::shared_ptr<CachedPage> CacheHandler::find(const QString &url)
std::shared_ptr<CachedPage> CacheHandler::find(const QUrl &url)
{
- return this->find(IoUtil::uniformUrlString(url));
+ return this->find(url.toString(QUrl::FullyEncoded | QUrl::RemoveFragment));
}
bool CacheHandler::contains(const QString &url)
@@ -62,7 +61,7 @@ bool CacheHandler::contains(const QString &url)
bool CacheHandler::contains(const QUrl &url)
{
- return this->contains(IoUtil::uniformUrlString(url));
+ return this->contains(url.toString(QUrl::FullyEncoded | QUrl::RemoveFragment));
}
int CacheHandler::size()