summaryrefslogtreecommitdiff
path: root/src/networkaccessmanager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/networkaccessmanager.cpp')
-rw-r--r--src/networkaccessmanager.cpp73
1 files changed, 62 insertions, 11 deletions
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index eadbfab3..e1d2e6eb 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -3,16 +3,17 @@
* This file is a part of the rekonq project
*
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>*
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+*
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License or (at your option) version 3 or any later version
* accepted by the membership of KDE e.V. (or its successor approved
-* by the membership of KDE e.V.), which shall act as a proxy
+* by the membership of KDE e.V.), which shall act as a proxy
* defined in Section 14 of version 3 of the license.
-*
+*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -24,6 +25,7 @@
* ============================================================ */
+
// Self Includes
#include "networkaccessmanager.h"
#include "networkaccessmanager.moc"
@@ -31,23 +33,72 @@
// Local Includes
#include "application.h"
#include "adblockmanager.h"
-#include <KDebug>
+#include "webpage.h"
+
+// KDE Includes
+#include <KLocale>
+#include <KProtocolManager>
+
+// Qt Includes
+#include <QtNetwork/QNetworkReply>
+
NetworkAccessManager::NetworkAccessManager(QObject *parent)
- : AccessManager(parent)
+ : AccessManager(parent)
{
+ QString c = KGlobal::locale()->country();
+ if (c == QL1S("C"))
+ c = QL1S("en_US");
+ if (c != QL1S("en_US"))
+ c.append(QL1S(", en_US"));
+
+ _acceptLanguage = c.toLatin1();
}
-QNetworkReply *NetworkAccessManager::createRequest(Operation op, const QNetworkRequest &req, QIODevice *outgoingData)
+QNetworkReply *NetworkAccessManager::createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData)
{
- // Adblock
+ WebPage *parentPage = qobject_cast<WebPage *>(parent());
+
+ QNetworkReply *reply = 0;
+
+ QNetworkRequest req = request;
+ req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
+ req.setRawHeader("Accept-Language", _acceptLanguage);
+
+ KIO::CacheControl cc = KProtocolManager::cacheControl();
+ switch (cc)
+ {
+ case KIO::CC_CacheOnly: // Fail request if not in cache.
+ req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysCache);
+ break;
+
+ case KIO::CC_Refresh: // Always validate cached entry with remote site.
+ req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferNetwork);
+ break;
+
+ case KIO::CC_Reload: // Always fetch from remote site
+ req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork);
+ break;
+
+ case KIO::CC_Cache: // Use cached entry if available.
+ case KIO::CC_Verify: // Validate cached entry with remote site if expired.
+ default:
+ req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
+ break;
+ }
+
+
if (op == QNetworkAccessManager::GetOperation)
{
- QNetworkReply *reply = Application::adblockManager()->block(req);
- if (reply)
- return reply;
+ reply = Application::adblockManager()->block(req, parentPage);
}
- return AccessManager::createRequest(op,req,outgoingData);
+ if(!reply)
+ reply = AccessManager::createRequest(op, req, outgoingData);
+
+ if(parentPage->hasNetworkAnalyzerEnabled())
+ emit networkData( op, req, reply );
+
+ return reply;
}