patch.diff

commit b588b4b97f59496ac447ed3fb5ad8d0696c4a619
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..689b90c 100644
--- a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
+++ b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
@@ -292,7 +292,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()) {