Skip to content
This repository was archived by the owner on May 30, 2023. It is now read-only.

Commit ca5a6c3

Browse files
author
pixiuPL
committed
Fix #12090
2 parents 1696e04 + bad3237 commit ca5a6c3

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/networkaccessmanager.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,11 @@ void NetworkAccessManager::handleStarted(QNetworkReply* reply, int requestId)
478478
data["headers"] = headers;
479479
data["requestHeaders"] = requestHeaders;
480480
data["time"] = QDateTime::currentDateTime();
481+
<<<<<<< HEAD
481482
data["body"] = "";
483+
=======
484+
data["fromCache"] = reply->attribute(QNetworkRequest::SourceIsFromCacheAttribute).toBool();
485+
>>>>>>> f1f3cd7b5aa0815028f4a18a65a1a7b76c41ade0
482486

483487
QWebFrame *frame = qobject_cast<QWebFrame *>(reply->request().originatingObject());
484488
data["frameName"] = frame->frameName();
@@ -519,9 +523,6 @@ void NetworkAccessManager::handleFinished(QNetworkReply* reply, int requestId, i
519523
data["redirectURL"] = reply->header(QNetworkRequest::LocationHeader);
520524
data["headers"] = headers;
521525
data["time"] = QDateTime::currentDateTime();
522-
data["body"] = body;
523-
data["bodySize"] = bodySize;
524-
525526
emit resourceReceived(data);
526527
}
527528

0 commit comments

Comments
 (0)