[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
tony at chromium.org
tony at chromium.org
Wed Dec 22 13:09:28 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit d9ed752d712bec4d14c8155bd07cccd007154469
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 7 23:10:45 2010 +0000
2010-09-07 Tony Chang <tony at chromium.org>
Reviewed by Kent Tamura.
turn off php output buffering in multipart tests
https://bugs.webkit.org/show_bug.cgi?id=45232
This was causing hanging multipart resources to not output anything.
On Lucid, the output buffer is enabled by default, but it's not enabled on Hardy.
http://www.php.net/manual/en/function.ob-end-flush.php
* http/tests/multipart/resources/multipart-wait-before-boundary.php:
* http/tests/multipart/resources/multipart.php:
* platform/chromium/drt_expectations.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66924 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3681e7f..4cb6fd4 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-07 Tony Chang <tony at chromium.org>
+
+ Reviewed by Kent Tamura.
+
+ turn off php output buffering in multipart tests
+ https://bugs.webkit.org/show_bug.cgi?id=45232
+
+ This was causing hanging multipart resources to not output anything.
+ On Lucid, the output buffer is enabled by default, but it's not enabled on Hardy.
+ http://www.php.net/manual/en/function.ob-end-flush.php
+
+ * http/tests/multipart/resources/multipart-wait-before-boundary.php:
+ * http/tests/multipart/resources/multipart.php:
+ * platform/chromium/drt_expectations.txt:
+
2010-09-07 Zhenyao Mo <zmo at google.com>
Unreviewed.
diff --git a/LayoutTests/http/tests/multipart/resources/multipart-wait-before-boundary.php b/LayoutTests/http/tests/multipart/resources/multipart-wait-before-boundary.php
index 34de0f2..db49c5d 100644
--- a/LayoutTests/http/tests/multipart/resources/multipart-wait-before-boundary.php
+++ b/LayoutTests/http/tests/multipart/resources/multipart-wait-before-boundary.php
@@ -25,6 +25,7 @@
}
sendHeader();
+ ob_end_flush();
echo("test html\n");
echo("<!-- $padding -->");
flush();
diff --git a/LayoutTests/http/tests/multipart/resources/multipart.php b/LayoutTests/http/tests/multipart/resources/multipart.php
index 6e407e5..155b255 100644
--- a/LayoutTests/http/tests/multipart/resources/multipart.php
+++ b/LayoutTests/http/tests/multipart/resources/multipart.php
@@ -26,6 +26,7 @@
echo("--$boundary\r\n");
+ ob_end_flush();
do {
for ($k = 1; $k < $i; $k++) {
sendPart($images[$k]);
diff --git a/LayoutTests/platform/chromium/drt_expectations.txt b/LayoutTests/platform/chromium/drt_expectations.txt
index f197548..2651074 100644
--- a/LayoutTests/platform/chromium/drt_expectations.txt
+++ b/LayoutTests/platform/chromium/drt_expectations.txt
@@ -147,7 +147,6 @@ BUG_DRT LINUX : fast/text/international/hindi-spacing.html = IMAGE+TEXT
BUG_DRT LINUX : fast/text/international/hindi-whitespace.html = IMAGE+TEXT
BUG_DRT LINUX : fast/text/international/thai-baht-space.html = IMAGE+TEXT
BUG_DRT LINUX : fast/text/international/wrap-CJK-001.html = IMAGE
-BUG_DRT LINUX : http/tests/multipart/invalid-image-data.html = IMAGE
BUG_DRT LINUX : platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle.html = IMAGE+TEXT
BUG_DRT LINUX : svg/W3C-SVG-1.1/paths-data-03-f.svg = IMAGE
BUG_DRT LINUX : svg/W3C-SVG-1.1/paths-data-12-t.svg = IMAGE+TEXT
@@ -185,8 +184,6 @@ BUG_DRT LINUX : svg/text/select-textLength-spacingAndGlyphs-stretch-3.svg = IMAG
BUG_DRT LINUX : svg/text/select-textLength-spacingAndGlyphs-stretch-4.svg = IMAGE
BUG_DRT LINUX : svg/text/text-text-01-b.svg = IMAGE
BUG_DRT LINUX : transforms/2d/transform-borderbox.html = IMAGE
-BUG_DRT LINUX : http/tests/multipart/multipart-wait-before-boundary.html = TIMEOUT
-BUG_DRT LINUX : http/tests/multipart/stop-crash.html = TIMEOUT
BUG_DRT WIN MAC LINUX : media/media-can-play-mpeg4-video.html = TEXT
BUG_DRT WIN MAC LINUX : fast/loader/stateobjects/pushstate-clears-forward-history.html = CRASH
BUG_DRT WIN : http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html = CRASH
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list