[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 6ebd7c3494e0243078b4911c6663569af1d5815e
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 8 02:40:46 2009 +0000

    2009-12-07  Yuzo Fujishima  <yuzo at google.com>
    
            Reviewed by Alexey Proskuryakov.
    
            Make run-webkit-websocketserver log to stderr rather than to a file.
            https://bugs.webkit.org/show_bug.cgi?id=32234
    
            * Scripts/run-webkit-websocketserver:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51824 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f6eac64..a1ce4b5 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-07  Yuzo Fujishima  <yuzo at google.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Make run-webkit-websocketserver log to stderr rather than to a file.
+        https://bugs.webkit.org/show_bug.cgi?id=32234
+
+        * Scripts/run-webkit-websocketserver:
+
 2009-12-07  Dmitry Titov  <dimich at chromium.org>
 
         Rubber-stamped by Darin Adler.
diff --git a/WebKitTools/Scripts/run-webkit-websocketserver b/WebKitTools/Scripts/run-webkit-websocketserver
index ada133d..e05303a 100755
--- a/WebKitTools/Scripts/run-webkit-websocketserver
+++ b/WebKitTools/Scripts/run-webkit-websocketserver
@@ -34,7 +34,7 @@ use warnings;
 
 use File::Spec;
 use FindBin;
-use IPC::Open3;
+use IPC::Open2;
 
 use lib $FindBin::Bin;
 use webkitdirs;
@@ -46,7 +46,6 @@ my $webSocketPort = 8880;
 
 my $srcDir = sourceDir();
 my $layoutTestsName = "$srcDir/LayoutTests";
-my $logFile = "/tmp/webkit-websocketserver.txt";
 my $testDirectory = File::Spec->rel2abs($layoutTestsName);
 my $webSocketServerPID = 0;
 
@@ -54,7 +53,6 @@ my $webSocketServerPID = 0;
 print "Starting Web Socket server...\n";
 openWebSocketServer();
 print "Started.\n";
-print "Logging to: $logFile\n";
 print "Hit [ENTER] to stop it.";
 <STDIN>;
 print "Stopping Web Socket server...\n";
@@ -75,11 +73,10 @@ sub openWebSocketServer()
         "-p", "$webSocketPort",
         "-d", "$webSocketHandlerDir",
         "-s", "$webSocketHandlerScanDir",
-        "-l", "$logFile",
     );
 
     $ENV{"PYTHONPATH"} = $webSocketPythonPath;
-    $webSocketServerPID = open3(\*WEBSOCKETSERVER_IN, \*WEBSOCKETSERVER_OUT, \*WEBSOCKETSERVER_ERR, $webSocketServerPath, @args);
+    $webSocketServerPID = open2(\*WEBSOCKETSERVER_IN, \*WEBSOCKETSERVER_OUT, $webSocketServerPath, @args);
 
     my $listen = "http://127.0.0.1:$webSocketPort";
     my $retryCount = 10;
@@ -94,7 +91,6 @@ sub closeWebSocketServer()
 {
     close WEBSOCKETSERVER_IN;
     close WEBSOCKETSERVER_OUT;
-    close WEBSOCKETSERVER_ERR;
     kill 15, $webSocketServerPID;
 }
 

-- 
WebKit Debian packaging