[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 dbaeff337dbed30c3ef06fbed3c57e388153a294
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 18 19:56:26 2010 +0000

            Reviewed by Darin Adler.
    
            https://bugs.webkit.org/show_bug.cgi?id=33804
            Test that WebSocket is not subject to HTTP connection limit
    
            * websocket/tests/multiple-connections-expected.txt: Added.
            * websocket/tests/multiple-connections.html: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53419 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9d79a77..578fb02 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-18  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33804
+        Test that WebSocket is not subject to HTTP connection limit
+
+        * websocket/tests/multiple-connections-expected.txt: Added.
+        * websocket/tests/multiple-connections.html: Added.
+
 2010-01-18  Daniel Cheng  <dcheng at google.com>
 
         Reviewed by Adam Roben
diff --git a/LayoutTests/websocket/tests/multiple-connections-expected.txt b/LayoutTests/websocket/tests/multiple-connections-expected.txt
new file mode 100644
index 0000000..cee1efb
--- /dev/null
+++ b/LayoutTests/websocket/tests/multiple-connections-expected.txt
@@ -0,0 +1,3 @@
+Test that WebSocket is not subject to HTTP connection limit. Should say PASS:
+
+PASS
diff --git a/LayoutTests/websocket/tests/multiple-connections.html b/LayoutTests/websocket/tests/multiple-connections.html
new file mode 100644
index 0000000..9049a82
--- /dev/null
+++ b/LayoutTests/websocket/tests/multiple-connections.html
@@ -0,0 +1,34 @@
+<p>Test that WebSocket is not subject to HTTP connection limit. Should say PASS:</p>
+<p id=result>Running...</p>
+<script>
+if (window.layoutTestController) {
+    layoutTestController.dumpAsText();
+    layoutTestController.waitUntilDone();
+}
+
+var socketCount = 100;
+var result = document.getElementById("result");
+var sockets = [];
+
+for (i = 0; i < socketCount; ++i) {
+    var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/echo");
+    sockets[i] = ws;
+    ws.onopen = function() {
+        var num = parseInt(result.innerHTML);
+        if (!num)
+            num = 0;
+        if (num != socketCount - 1)
+            result.innerHTML = num + 1;
+        else {
+            result.innerHTML = "PASS";
+            for (j = 0; j < socketCount; ++j) {
+                sockets[j].onclose = null;
+                sockets[j].close();
+            }
+            if (window.layoutTestController)
+                layoutTestController.notifyDone();
+        }
+    }
+    ws.onclose = function() { alert("FAIL: unexpected close event") }
+}
+</script>

-- 
WebKit Debian packaging