src/WebPage.cpp in capybara-webkit-1.5.2 vs src/WebPage.cpp in capybara-webkit-1.6.0

@@ -81,17 +81,19 @@
 
 void WebPage::setFrameProperties(QWebFrame *frame, QUrl &requestedUrl, NetworkReplyProxy *reply) {
   if (frame->requestedUrl() == requestedUrl) {
     int statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
     frame->setProperty("statusCode", statusCode);
-    QStringList headers;
-    foreach(QNetworkReply::RawHeaderPair header, reply->rawHeaderPairs())
-      headers << header.first+": "+header.second;
-    frame->setProperty("headers", headers);
-    frame->setProperty("body", reply->data());
-    QVariant contentMimeType = reply->header(QNetworkRequest::ContentTypeHeader);
-    frame->setProperty("contentType", contentMimeType);
+    if (statusCode != 304) {
+      QVariantMap headers;
+      foreach(QNetworkReply::RawHeaderPair header, reply->rawHeaderPairs())
+        headers[header.first] = QString(header.second);
+      frame->setProperty("headers", headers);
+      frame->setProperty("body", reply->data());
+      QVariant contentMimeType = reply->header(QNetworkRequest::ContentTypeHeader);
+      frame->setProperty("contentType", contentMimeType);
+    }
   }
 }
 
 void WebPage::unsupportedContentFinishedReply(QNetworkReply *reply) {
   m_manager->replyFinished(reply);
@@ -357,11 +359,11 @@
 
 int WebPage::getLastStatus() {
   return currentFrame()->property("statusCode").toInt();
 }
 
-QStringList WebPage::pageHeaders() {
-  return currentFrame()->property("headers").toStringList();
+QVariantMap WebPage::pageHeaders() {
+  return currentFrame()->property("headers").toMap();
 }
 
 QByteArray WebPage::body() {
   return currentFrame()->property("body").toByteArray();
 }