[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
abecsi at webkit.org
abecsi at webkit.org
Thu Apr 8 01:31:14 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit c599001d24e49ae6039941d832934b5c228bddeb
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jan 30 00:00:04 2010 +0000
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: http://svn.webkit.org/repository/webkit/trunk@54084 268f45cc-cd09-0410-ab3c-d52691b4dbfc
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 <abecsi at 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 at 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 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;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list