[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit e880b7a02c7e7f62876e1a149ef2852b2a138e44
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 18 09:10:54 2010 +0000

    2010-02-18  William Chan  <willchan at chromium.org>
    
            Reviewed by Adam Barth.
    
            https://bugs.webkit.org/show_bug.cgi?id=35071
            Disable loader limiting of requests per host for the chromium port.
    
            No tests because we're only changing a constant.
    
            * platform/network/chromium/ResourceRequest.cpp:
            (WebCore::initializeMaximumHTTPConnectionCountPerHost):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54946 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a99c475..3628735 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-18  William Chan  <willchan at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35071
+        Disable loader limiting of requests per host for the chromium port.
+
+        No tests because we're only changing a constant.
+
+        * platform/network/chromium/ResourceRequest.cpp:
+        (WebCore::initializeMaximumHTTPConnectionCountPerHost):
+
 2010-02-18  Xan Lopez  <xlopez at igalia.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/network/chromium/ResourceRequest.cpp b/WebCore/platform/network/chromium/ResourceRequest.cpp
index 5b27c1b..016bd34 100644
--- a/WebCore/platform/network/chromium/ResourceRequest.cpp
+++ b/WebCore/platform/network/chromium/ResourceRequest.cpp
@@ -31,7 +31,10 @@ namespace WebCore {
 // This is used by the loader to control the number of issued parallel load requests. 
 unsigned initializeMaximumHTTPConnectionCountPerHost()
 {
-    return 6;
+    // The chromium network stack already handles limiting the number of
+    // parallel requests per host, so there's no need to do it here.  Therefore,
+    // this is set to a high value that should never be hit in practice.
+    return 10000;
 }
 
 } // namespace WebCore

-- 
WebKit Debian packaging