Correct openHTTPD() to print requests to stdout if run-webkit-httpd is used.

This fixes a regression introduced in r53559.

Reviewed by Alexey Proskuryakov.

https://bugs.webkit.org/show_bug.cgi?id=34336

* Scripts/webkitperl/httpd.pm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@54084 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 945462cd0b16d652be9de1a928adcb7311003b13..2d2a15438a85fbc07221e6aaef2ce6e2322d4945 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-29  Andras Becsi  <abecsi@webkit.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Correct openHTTPD() to print requests to stdout if run-webkit-httpd is used.
+        This fixes a regression introduced in r53559.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34336
+
+        * Scripts/webkitperl/httpd.pm:
+
 2010-01-28  Jon Honeycutt  <jhoneycutt@apple.com>
 
         MSAA: Crash when posting a notification for a detached object

diff --git a/WebKitTools/Scripts/webkitperl/httpd.pm b/WebKitTools/Scripts/webkitperl/httpd.pm
index 8b5d25beceb1065b0451ac83c63141745a8750bb..d0828700ba13546e81ab63262159f559b1ba8af0 100644 (file)
--- a/WebKitTools/Scripts/webkitperl/httpd.pm
+++ b/WebKitTools/Scripts/webkitperl/httpd.pm
@@ -147,7 +147,7 @@ sub openHTTPD(@)
 
     $httpdPath = "/usr/sbin/httpd" unless ($httpdPath);
 
-    open2(\*HTTPDIN, \*HTTPDOUT, $httpdPath, @args);
+    open2(">&1", \*HTTPDIN, $httpdPath, @args);
 
     my $retryCount = 20;
     while (!-f $httpdPidFile && $retryCount) {
@@ -172,8 +172,6 @@ sub openHTTPD(@)
 sub closeHTTPD
 {
     close HTTPDIN;
-    close HTTPDOUT;
-
     if ($httpdPid) {
         kill 15, $httpdPid;
         my $retryCount = 20;