[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 0c47ffc487a655c4f916be161e6a3ad32e1d2e46
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 16 23:32:17 2009 +0000

            Disabling WebSocket tests on Tiger and Windows again, as they still time out.
    
            * platform/mac-tiger/Skipped:
            * platform/win/Skipped:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51059 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c7843b2..a6366be 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-16  Alexey Proskuryakov  <ap at apple.com>
+
+        Disabling WebSocket tests on Tiger and Windows again, as they still time out.
+
+        * platform/mac-tiger/Skipped:
+        * platform/win/Skipped:
+
 2009-11-16  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by Beth Dakin.
diff --git a/LayoutTests/platform/mac-tiger/Skipped b/LayoutTests/platform/mac-tiger/Skipped
index 7967882..880a4ab 100644
--- a/LayoutTests/platform/mac-tiger/Skipped
+++ b/LayoutTests/platform/mac-tiger/Skipped
@@ -69,3 +69,7 @@ media/media-fullscreen-not-in-document.html
 
 # Tests of accessibility functionality not supported on Tiger
 accessibility/aria-list-and-listitem.html
+
+# Tests time out on Tiger
+# https://bugs.webkit.org/show_bug.cgi?id=31501
+websocket
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index e742046..bcf93fb 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -699,3 +699,7 @@ inspector/timeline-paint.html
 
 # Need to add functionality to DumpRenderTree to handle error pages
 fast/history/back-forward-reset-after-error-handling.html
+
+# WebSocket server doesn't start on Windows.
+# https://bugs.webkit.org/show_bug.cgi?id=31479
+websocket

-- 
WebKit Debian packaging