[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[jocelyn.turcotte at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit b216401b91cbb00114b62876935ef117fa079d08
Author: jocelyn.turcotte at nokia.com <jocelyn.turcotte at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 10 10:41:33 2010 +0000

    [Qt] Make sure we send the response before any data.
    https://bugs.webkit.org/show_bug.cgi?id=50760
    
    Reviewed by Kenneth Rohde Christiansen.
    
    This patch make sure the data available flag is set before
    we call sendResponseIfNeeded.
    
    * platform/network/qt/QNetworkReplyHandler.cpp:
    (WebCore::QNetworkReplyHandler::QNetworkReplyHandler):
    (WebCore::QNetworkReplyHandler::finish):
    (WebCore::QNetworkReplyHandler::sendResponseIfNeeded):
    (WebCore::QNetworkReplyHandler::forwardData):
    (WebCore::QNetworkReplyHandler::resetState):
    * platform/network/qt/QNetworkReplyHandler.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73707 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b155891..a547b92 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-12-09  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Make sure we send the response before any data.
+        https://bugs.webkit.org/show_bug.cgi?id=50760
+
+        This patch make sure the data available flag is set before
+        we call sendResponseIfNeeded.
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::QNetworkReplyHandler::QNetworkReplyHandler):
+        (WebCore::QNetworkReplyHandler::finish):
+        (WebCore::QNetworkReplyHandler::sendResponseIfNeeded):
+        (WebCore::QNetworkReplyHandler::forwardData):
+        (WebCore::QNetworkReplyHandler::resetState):
+        * platform/network/qt/QNetworkReplyHandler.h:
+
 2010-12-10  Koan-Sin Tan  <koansin.tan at gmail.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
index 01e624e..ac17261 100644
--- a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
+++ b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
@@ -184,7 +184,7 @@ QNetworkReplyHandler::QNetworkReplyHandler(ResourceHandle* handle, LoadMode load
     , m_resourceHandle(handle)
     , m_redirected(false)
     , m_responseSent(false)
-    , m_responseDataSent(false)
+    , m_responseContainsData(false)
     , m_loadMode(loadMode)
     , m_shouldStart(true)
     , m_shouldFinish(false)
@@ -305,7 +305,7 @@ void QNetworkReplyHandler::finish()
     if (m_redirected) {
         resetState();
         start();
-    } else if (!m_reply->error() || ignoreHttpError(m_reply, m_responseDataSent)) {
+    } else if (!m_reply->error() || ignoreHttpError(m_reply, m_responseContainsData)) {
         client->didFinishLoading(m_resourceHandle, 0);
     } else {
         QUrl url = m_reply->url();
@@ -331,7 +331,7 @@ void QNetworkReplyHandler::sendResponseIfNeeded()
     if (m_shouldSendResponse)
         return;
 
-    if (m_reply->error() && !ignoreHttpError(m_reply, m_responseDataSent))
+    if (m_reply->error() && !ignoreHttpError(m_reply, m_responseContainsData))
         return;
 
     if (m_responseSent || !m_resourceHandle)
@@ -438,6 +438,9 @@ void QNetworkReplyHandler::forwardData()
     if (m_shouldForwardData)
         return;
 
+    if (m_reply->bytesAvailable())
+        m_responseContainsData = true;
+
     sendResponseIfNeeded();
 
     // don't emit the "Document has moved here" type of HTML
@@ -453,10 +456,8 @@ void QNetworkReplyHandler::forwardData()
     if (!client)
         return;
 
-    if (!data.isEmpty()) {
-        m_responseDataSent = true;
+    if (!data.isEmpty())
         client->didReceiveData(m_resourceHandle, data.constData(), data.length(), data.length() /*FixMe*/);
-    }
 }
 
 void QNetworkReplyHandler::uploadProgress(qint64 bytesSent, qint64 bytesTotal)
@@ -568,7 +569,7 @@ void QNetworkReplyHandler::resetState()
 {
     m_redirected = false;
     m_responseSent = false;
-    m_responseDataSent = false;
+    m_responseContainsData = false;
     m_shouldStart = true;
     m_shouldFinish = false;
     m_shouldSendResponse = false;
diff --git a/WebCore/platform/network/qt/QNetworkReplyHandler.h b/WebCore/platform/network/qt/QNetworkReplyHandler.h
index 884a1a4..190f59f 100644
--- a/WebCore/platform/network/qt/QNetworkReplyHandler.h
+++ b/WebCore/platform/network/qt/QNetworkReplyHandler.h
@@ -73,7 +73,7 @@ private:
     ResourceHandle* m_resourceHandle;
     bool m_redirected;
     bool m_responseSent;
-    bool m_responseDataSent;
+    bool m_responseContainsData;
     LoadMode m_loadMode;
     QNetworkAccessManager::Operation m_method;
     QNetworkRequest m_request;

-- 
WebKit Debian packaging