From 2a3810966f88cba723cd7e601eb12b8f4c99cc5d Mon Sep 17 00:00:00 2001 From: "abecsi@webkit.org" Date: Sat, 30 Jan 2010 00:00:04 +0000 Subject: [PATCH] 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 --- WebKitTools/ChangeLog | 11 +++++++++++ WebKitTools/Scripts/webkitperl/httpd.pm | 4 +--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog index 945462c..2d2a154 100644 --- a/WebKitTools/ChangeLog +++ b/WebKitTools/ChangeLog @@ -1,3 +1,14 @@ +2010-01-29 Andras Becsi + + 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 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 8b5d25b..d082870 100644 --- 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; -- 1.8.3.1