patch.diff

commit decd0feb9122f48d5b4f33a295a5fb2c4b215846
Author: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Date:   Fri Jun 5 13:56:03 2009 +0200

    2009-06-05  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
    
            Reviewed by Simon Hausmann.
    
            Fix Qt build after r44452

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7bba1cc..a6586f6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Simon Hausmann.
 
+        Fix Qt build after r44452
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::QNetworkReplyHandler::sendResponseIfNeeded):
+
+2009-06-05  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
         [Qt] Remove some dead code (MenuEventProxy)
 
         * WebCore.pro:
diff --git a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
index 3e9b239..06b60bf 100644
--- a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
+++ b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
@@ -136,7 +136,6 @@ QNetworkReplyHandler::QNetworkReplyHandler(ResourceHandle* handle, LoadMode load
     , m_redirected(false)
     , m_responseSent(false)
     , m_loadMode(loadMode)
-    , m_startTime(0)
     , m_shouldStart(true)
     , m_shouldFinish(false)
     , m_shouldSendResponse(false)
@@ -292,7 +291,7 @@ void QNetworkReplyHandler::sendResponseIfNeeded()
     }
 
     if (isLocalFileReply)
-        response.setExpirationDate(m_startTime);
+        response.setHTTPHeaderField(QString::fromAscii("Cache-Control"), QString::fromAscii("no-cache"));
 
     QUrl redirection = m_reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
     if (redirection.isValid()) {
@@ -355,8 +354,6 @@ void QNetworkReplyHandler::start()
         && (!url.toLocalFile().isEmpty() || url.scheme() == QLatin1String("data")))
         m_method = QNetworkAccessManager::GetOperation;
 
-    m_startTime = QDateTime::currentDateTime().toTime_t();
-
     switch (m_method) {
         case QNetworkAccessManager::GetOperation:
             m_reply = manager->get(m_request);
diff --git a/WebCore/platform/network/qt/QNetworkReplyHandler.h b/WebCore/platform/network/qt/QNetworkReplyHandler.h
index 98be28d..3de6d88 100644
--- a/WebCore/platform/network/qt/QNetworkReplyHandler.h
+++ b/WebCore/platform/network/qt/QNetworkReplyHandler.h
@@ -72,7 +72,6 @@ private:
     LoadMode m_loadMode;
     QNetworkAccessManager::Operation m_method;
     QNetworkRequest m_request;
-    uint   m_startTime;
 
     // defer state holding
     bool m_shouldStart;