[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 eb9769cffee0f6effcf2ddb40ee84a694451ebbb
Author: ukai at chromium.org <ukai at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 10 05:46:31 2010 +0000

    2010-03-09  Fumitoshi Ukai  <ukai at chromium.org>
    
            Unreviewed.
    
            Obvious fix for --cgi-paths of pywebsocket.
    
            * Scripts/run-webkit-websocketserver:
            * Scripts/webkitpy/layout_tests/port/websocket_server.py:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55763 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 16b44d2..34f14f2 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-09  Fumitoshi Ukai  <ukai at chromium.org>
+
+        Unreviewed.
+
+        Obvious fix for --cgi-paths of pywebsocket.
+
+        * Scripts/run-webkit-websocketserver:
+        * Scripts/webkitpy/layout_tests/port/websocket_server.py:
+
 2010-03-09  Jakub Wieczorek  <jwieczorek at webkit.org>
 
         Unreviewed.
diff --git a/WebKitTools/Scripts/run-webkit-websocketserver b/WebKitTools/Scripts/run-webkit-websocketserver
index f0c6704..06f9079 100755
--- a/WebKitTools/Scripts/run-webkit-websocketserver
+++ b/WebKitTools/Scripts/run-webkit-websocketserver
@@ -76,7 +76,7 @@ sub openWebSocketServer()
         "--document-root", "$webSocketHandlerDir",
         "--scan-dir", "$webSocketHandlerScanDir",
         "--websock-handlers-map-file", "$webSocketHandlerMapFile",
-        "--cgi-paths", "/websocket/tests/cookies",
+        "--cgi-paths", "/websocket/tests",
     );
 
     $ENV{"PYTHONPATH"} = $webSocketPythonPath;
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py
index fee1abc..d6d2c6f 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py
@@ -162,7 +162,7 @@ class PyWebSocket(http_server.Lighttpd):
             '--port', str(self._port),
             '--document-root', self._layout_tests,
             '--scan-dir', self._web_socket_tests,
-            '--cgi-paths', '/websocket/tests/cookies',
+            '--cgi-paths', '/websocket/tests',
             '--log-file', error_log,
         ]
 

-- 
WebKit Debian packaging