summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-09-06 01:39:56 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-09-06 01:41:44 +0200
commitc0bc8cfe4a9b8240b2261109c8f1e0124efac05d (patch)
tree336cf2da91d11bcaf9f5e3eba451e363c02747b7 /src
parentrekonq 0.5.86 (diff)
downloadrekonq-c0bc8cfe4a9b8240b2261109c8f1e0124efac05d.tar.xz
Revert "This hacks should fix (a lot of) javascript handling."
Really sorry. Proposed fix does not handle cookies This reverts commit b08c67eb1e45cb94dc6250fe555d84f0c0e7debe. CCBUG:250298
Diffstat (limited to 'src')
-rw-r--r--src/analyzer/networkanalyzer.cpp3
-rw-r--r--src/networkaccessmanager.cpp18
-rw-r--r--src/protocolhandler.cpp1
3 files changed, 6 insertions, 16 deletions
diff --git a/src/analyzer/networkanalyzer.cpp b/src/analyzer/networkanalyzer.cpp
index d0044f47..c5b08835 100644
--- a/src/analyzer/networkanalyzer.cpp
+++ b/src/analyzer/networkanalyzer.cpp
@@ -162,8 +162,7 @@ void NetworkAnalyzer::requestFinished( QObject *replyObject )
QString contentType = reply->header( QNetworkRequest::ContentTypeHeader ).toString();
item->setText( 4, contentType );
- if ( status == 302 )
- {
+ if ( status == 302 ) {
QUrl target = reply->attribute( QNetworkRequest::RedirectionTargetAttribute ).toUrl();
item->setText( 5, i18n("Redirect: %1", target.toString() ) );
}
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 60fecace..9d9101b9 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -86,18 +86,10 @@ QNetworkReply *NetworkAccessManager::createRequest(QNetworkAccessManager::Operat
}
// WARNING
- // There are actually 3 exceptions here handled with QNAM
+ // There are actually 2 exceptions here handled with QNAM
// instead of KIO that need fixes upstream before removing. They are:
- // 1) AJAX requests handling
- // 2) DeleteOperation
- // 3) CustomOperation
-
- // this is used to handle "AJAX" requests
- QByteArray header = req.rawHeader("x-requested-with");
- if(!header.isNull())
- {
- return QNetworkAccessManager::createRequest(op, req, outgoingData);
- }
+ // 1) DeleteOperation
+ // 2) CustomOperation
switch(op)
{
@@ -118,14 +110,14 @@ QNetworkReply *NetworkAccessManager::createRequest(QNetworkAccessManager::Operat
kDebug() << "DELETE OPERATION...";
reply = QNetworkAccessManager::createRequest(op, req, outgoingData);
if(!reply)
- kDebug() << "oh oh... DELETE REPLY NULL";
+ kDebug() << "OOOOOOOOOOOOOOOOOOO DELETE REPLY NULL";
break;
case QNetworkAccessManager::CustomOperation:
kDebug() << "CUSTOM OPERATION...";
reply = QNetworkAccessManager::createRequest(op, req, outgoingData);
if(!reply)
- kDebug() << "oh oh... CUSTOM REPLY NULL";
+ kDebug() << "OOOOOOOOOOOOOOOOOOO CUSTOM REPLY NULL";
break;
default:
diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index c0b8a6c2..be236843 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -85,7 +85,6 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra
// javascript handling
if (_url.protocol() == QL1S("javascript"))
{
- kDebug() << "JAVASCRIPT URL: " << _url;
QString scriptSource = _url.authority();
if(scriptSource.isEmpty()) {
// if javascript:<code here> then authority() returns