[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[zecke at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 3b3b57d8d73bf3d008e2c44391e8144bec23446f
Author: zecke at webkit.org <zecke at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 14 11:09:13 2009 +0000

    [Qt] Connect QNetworkReply via direct connections.
    
    https://bugs.webkit.org/show_bug.cgi?id=32113
    
    In the past we have switched from auto connections to queued
    connections to get some more stability. The problem with the
    Queued connections is latency. Even when running simple loading
    tests the time it takes to runs highly varies and by using
    direct connections these tests produce a stable result.
    
    We will have to look out for crashes coming from within the
    QNetworkAccessManager due this patch and address them then.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52089 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6291d75..504498b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2009-12-03  Holger Hans Peter Freyther  <zecke at selfish.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Connect QNetworkReply via direct connections.
+        https://bugs.webkit.org/show_bug.cgi?id=32113
+
+        In the past we have switched from auto connections to queued
+        connections to get some more stability. The problem with the
+        Queued connections is latency. Even when running simple loading
+        tests the time it takes to runs highly varies and by using
+        direct connections these tests produce a stable result.
+
+        We will have to look out for crashes coming from within the
+        QNetworkAccessManager due this patch and address them then.
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::QNetworkReplyHandler::start):
+
 2009-12-14  Holger Hans Peter Freyther  <zecke at selfish.org>
 
         Rubber-stamped by Simon Hausmann.
diff --git a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
index f7bbb9d..f352688 100644
--- a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
+++ b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
@@ -427,18 +427,18 @@ void QNetworkReplyHandler::start()
     m_reply->setParent(this);
 
     connect(m_reply, SIGNAL(finished()),
-            this, SLOT(finish()), Qt::QueuedConnection);
+            this, SLOT(finish()), Qt::DirectConnection);
 
     // For http(s) we know that the headers are complete upon metaDataChanged() emission, so we
     // can send the response as early as possible
     if (scheme == QLatin1String("http") || scheme == QLatin1String("https"))
         connect(m_reply, SIGNAL(metaDataChanged()),
-                this, SLOT(sendResponseIfNeeded()), Qt::QueuedConnection);
+                this, SLOT(sendResponseIfNeeded()), Qt::DirectConnection);
 
     connect(m_reply, SIGNAL(readyRead()),
-            this, SLOT(forwardData()), Qt::QueuedConnection);
+            this, SLOT(forwardData()), Qt::DirectConnection);
     connect(this, SIGNAL(processQueuedItems()),
-            this, SLOT(sendQueuedItems()), Qt::QueuedConnection);
+            this, SLOT(sendQueuedItems()), Qt::DirectConnection);
 }
 
 void QNetworkReplyHandler::resetState()

-- 
WebKit Debian packaging