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

[ukai at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 183321a5d2e483b4f370f37b116e5cc597a20008
Author: ukai at chromium.org <ukai at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 17 00:44:10 2009 +0000

    2009-12-16  Fumitoshi Ukai  <ukai at chromium.org>
    
            Reviewed by Darin Adler.
    
            Fix LayoutTests/websocket/tests/url-with-query-for-no-query.html
            https://bugs.webkit.org/show_bug.cgi?id=32606
    
            It should test with /websocket/tests/no-query
    
            * websocket/tests/script-tests/url-with-query-for-no-query.js:
            * websocket/tests/url-with-query-for-no-query-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52230 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4a1af9b..321f624 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-16  Fumitoshi Ukai  <ukai at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Fix LayoutTests/websocket/tests/url-with-query-for-no-query.html
+        https://bugs.webkit.org/show_bug.cgi?id=32606
+
+        It should test with /websocket/tests/no-query
+
+        * websocket/tests/script-tests/url-with-query-for-no-query.js:
+        * websocket/tests/url-with-query-for-no-query-expected.txt:
+
 2009-12-16  Csaba Osztrogonác  <ossy at webkit.org>
 
         [Qt] editing/selection/empty-cell-right-click.html introduced in r52220 failed.
diff --git a/LayoutTests/websocket/tests/script-tests/url-with-query-for-no-query.js b/LayoutTests/websocket/tests/script-tests/url-with-query-for-no-query.js
index d1d112b..5d3c332 100644
--- a/LayoutTests/websocket/tests/script-tests/url-with-query-for-no-query.js
+++ b/LayoutTests/websocket/tests/script-tests/url-with-query-for-no-query.js
@@ -3,7 +3,7 @@ description("Make sure handshake with URL with query components fails against se
 if (window.layoutTestController)
     layoutTestController.waitUntilDone();
 
-var url = "ws://127.0.0.1:8880/websocket/tests/no-query-support?";
+var url = "ws://127.0.0.1:8880/websocket/tests/no-query?";
 var handshake_success = false;
 var ws_location;
 
diff --git a/LayoutTests/websocket/tests/url-with-query-for-no-query-expected.txt b/LayoutTests/websocket/tests/url-with-query-for-no-query-expected.txt
index 39af77c..b9a713e 100644
--- a/LayoutTests/websocket/tests/url-with-query-for-no-query-expected.txt
+++ b/LayoutTests/websocket/tests/url-with-query-for-no-query-expected.txt
@@ -1,8 +1,9 @@
+CONSOLE MESSAGE: line 0: Error during WebSocket handshake: location mismatch: ws://127.0.0.1:8880/websocket/tests/no-query? != /websocket/tests/no-query
 Make sure handshake with URL with query components fails against server that doesn't support query component.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
-url=ws://127.0.0.1:8880/websocket/tests/no-query-support?
+url=ws://127.0.0.1:8880/websocket/tests/no-query?
 WebSocket is closed
 PASS handshake_success is false
 PASS ws_location is undefined.

-- 
WebKit Debian packaging