[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 5ff16147bc2f7daa726b655efb6aec98de6dc275
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 13 19:30:29 2009 +0000

            Disable websocket tests on Windows, as the server cannot start on buildbot.
    
            Filed <https://bugs.webkit.org/show_bug.cgi?id=31479> to investigate this issue.
    
            * platform/win/Skipped:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50957 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ce32c78..1f8300e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-13  Alexey Proskuryakov  <ap at apple.com>
+
+        Disable websocket tests on Windows, as the server cannot start on buildbot.
+
+        Filed <https://bugs.webkit.org/show_bug.cgi?id=31479> to investigate this issue.
+
+        * platform/win/Skipped:
+
 2009-11-12  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 82b8f44..f92bb0c 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -693,3 +693,7 @@ fast/multicol/single-line.html
 # inspector/timeline-paint passes by itself, but fails when run with other Inspector tests.
 # http://webkit.org/b/31402.
 inspector/timeline-paint.html
+
+# WebSocket server doesn't start on Windows.
+# https://bugs.webkit.org/show_bug.cgi?id=31479
+websocket

-- 
WebKit Debian packaging