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

[ap at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 173019a358ce750c100ef3055c7c112de536fa4e
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 18 21:58:07 2010 +0000

            Rubber-stamped by Adam Roben.
    
            Change a newly added WebSocket test to work on Windows.
    
            * websocket/tests/multiple-connections.html: Decrease the number of simultaneous connections
            from 100 to 50. On Windows buildbot, only ~70 connections are allowed for some reason - but
            we only need much fewer to compare to HTTP simultaneous connection limit anyway.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53427 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3dfdc16..32cbb6c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-18  Alexey Proskuryakov  <ap at apple.com>
+
+        Rubber-stamped by Adam Roben.
+
+        Change a newly added WebSocket test to work on Windows.
+
+        * websocket/tests/multiple-connections.html: Decrease the number of simultaneous connections
+        from 100 to 50. On Windows buildbot, only ~70 connections are allowed for some reason - but
+        we only need much fewer to compare to HTTP simultaneous connection limit anyway.
+
 2010-01-18  Csaba Osztrogonác  <ossy at webkit.org>
 
         [Qt] Skip test introduced in r53423 because of missing layoutTestController.setDomainRelaxationForbiddenForURLScheme()
diff --git a/LayoutTests/websocket/tests/multiple-connections.html b/LayoutTests/websocket/tests/multiple-connections.html
index 9049a82..70f722d 100644
--- a/LayoutTests/websocket/tests/multiple-connections.html
+++ b/LayoutTests/websocket/tests/multiple-connections.html
@@ -6,7 +6,7 @@ if (window.layoutTestController) {
     layoutTestController.waitUntilDone();
 }
 
-var socketCount = 100;
+var socketCount = 50;
 var result = document.getElementById("result");
 var sockets = [];
 

-- 
WebKit Debian packaging