From 482717484e1a3e67773f68a7c4ffea19099b3fb6 Mon Sep 17 00:00:00 2001
From: shogo-ohta <shogo-ohta@cookpad.com>
Date: Fri, 26 Aug 2011 23:15:41 +0900
Subject: [PATCH] Response headers should be reset

---
 src/Reset.cpp   | 2 +-
 src/WebPage.cpp | 9 +++++----
 src/WebPage.h   | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Reset.cpp b/src/Reset.cpp
index b46adc08..e5663ea7 100644
--- a/src/Reset.cpp
+++ b/src/Reset.cpp
@@ -13,7 +13,7 @@ void Reset::start(QStringList &arguments) {
   page()->networkAccessManager()->setCookieJar(new QNetworkCookieJar());
   page()->setCustomNetworkAccessManager();
   page()->setUserAgent(NULL);
-  page()->resetLastStatus();
+  page()->resetResponseHeaders();
   emit finished(new Response(true));
 }
 
diff --git a/src/WebPage.cpp b/src/WebPage.cpp
index c49c8b6d..18cfcad4 100644
--- a/src/WebPage.cpp
+++ b/src/WebPage.cpp
@@ -173,7 +173,7 @@ QString WebPage::getLastAttachedFileName() {
 void WebPage::replyFinished(QNetworkReply *reply) {
   if (reply->url() == this->currentFrame()->url()) {
     QStringList headers;
-    lastStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+    m_lastStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
     QList<QByteArray> list = reply->rawHeaderList();
 
     int length = list.size();
@@ -186,11 +186,12 @@ void WebPage::replyFinished(QNetworkReply *reply) {
 }
 
 int WebPage::getLastStatus() {
-  return lastStatus;
+  return m_lastStatus;
 }
 
-void WebPage::resetLastStatus() {
-  lastStatus = 0;
+void WebPage::resetResponseHeaders() {
+  m_lastStatus = 0;
+  m_pageHeaders = QString();
 }
 
 QString WebPage::pageHeaders() {
diff --git a/src/WebPage.h b/src/WebPage.h
index 52db100d..32f73f2f 100644
--- a/src/WebPage.h
+++ b/src/WebPage.h
@@ -11,7 +11,7 @@ class WebPage : public QWebPage {
     QString userAgentForUrl(const QUrl &url ) const;
     void setUserAgent(QString userAgent);
     int getLastStatus();
-    void resetLastStatus();
+    void resetResponseHeaders();
     void setCustomNetworkAccessManager();
     bool render(const QString &fileName);
     virtual bool extension (Extension extension, const ExtensionOption *option=0, ExtensionReturn *output=0);
@@ -40,7 +40,7 @@ class WebPage : public QWebPage {
     QString getLastAttachedFileName();
     void loadJavascript();
     void setUserStylesheet();
-    int lastStatus;
+    int m_lastStatus;
     QString m_pageHeaders;
 };