Diff
Modified: trunk/LayoutTests/ChangeLog (275355 => 275356)
--- trunk/LayoutTests/ChangeLog 2021-04-01 13:37:02 UTC (rev 275355)
+++ trunk/LayoutTests/ChangeLog 2021-04-01 14:02:09 UTC (rev 275356)
@@ -1,3 +1,17 @@
+2021-04-01 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, reverting r275295.
+ https://bugs.webkit.org/show_bug.cgi?id=224046
+
+ Broken 3 layout tests on wk1
+
+ Reverted changeset:
+
+ "[LayoutTests] Convert http/tests/download convert PHP to
+ Python"
+ https://bugs.webkit.org/show_bug.cgi?id=222618
+ https://trac.webkit.org/changeset/275295
+
2021-04-01 Aditya Keerthi <akeer...@apple.com>
[iOS] '-webkit-appearance: none' is not respected for searchfield decorations
Modified: trunk/LayoutTests/http/tests/download/default-encoding-expected.txt (275355 => 275356)
--- trunk/LayoutTests/http/tests/download/default-encoding-expected.txt 2021-04-01 13:37:02 UTC (rev 275355)
+++ trunk/LayoutTests/http/tests/download/default-encoding-expected.txt 2021-04-01 14:02:09 UTC (rev 275356)
@@ -1,4 +1,4 @@
-Policy delegate: attempt to load http://127.0.0.1:8000/download/resources/literal-koi8-r.py with navigation type 'link clicked' originating from #text > A > BODY > HTML > #document
+Policy delegate: attempt to load http://127.0.0.1:8000/download/resources/literal-koi8-r.php with navigation type 'link clicked' originating from #text > A > BODY > HTML > #document
Policy delegate: resource is an attachment, suggested file name 'SUССЕSS.txt'
Downloaded file name should be "SUССЕSS.txt" (letters "CCE" are Cyrillic).
Modified: trunk/LayoutTests/http/tests/download/default-encoding.html (275355 => 275356)
--- trunk/LayoutTests/http/tests/download/default-encoding.html 2021-04-01 13:37:02 UTC (rev 275355)
+++ trunk/LayoutTests/http/tests/download/default-encoding.html 2021-04-01 14:02:09 UTC (rev 275356)
@@ -8,7 +8,7 @@
}
</script>
<p>Downloaded file name should be "SUССЕSS.txt" (letters "CCE" are Cyrillic).</p>
-<a href="" id=link>Click Me</a>
+<a href="" id=link>Click Me</a>
<script>
if (window.eventSender) {
Modified: trunk/LayoutTests/http/tests/download/inherited-encoding-expected.txt (275355 => 275356)
--- trunk/LayoutTests/http/tests/download/inherited-encoding-expected.txt 2021-04-01 13:37:02 UTC (rev 275355)
+++ trunk/LayoutTests/http/tests/download/inherited-encoding-expected.txt 2021-04-01 14:02:09 UTC (rev 275356)
@@ -1,4 +1,4 @@
-Policy delegate: attempt to load http://127.0.0.1:8000/download/resources/literal-koi8-r.py with navigation type 'link clicked' originating from #text > A > BODY > HTML > #document
+Policy delegate: attempt to load http://127.0.0.1:8000/download/resources/literal-koi8-r.php with navigation type 'link clicked' originating from #text > A > BODY > HTML > #document
Policy delegate: resource is an attachment, suggested file name 'SUССЕSS.txt'
Downloaded file name should be "SUССЕSS.txt" (letters "CCE" are Cyrillic).
Modified: trunk/LayoutTests/http/tests/download/inherited-encoding-form-submission-result-expected.txt (275355 => 275356)
--- trunk/LayoutTests/http/tests/download/inherited-encoding-form-submission-result-expected.txt 2021-04-01 13:37:02 UTC (rev 275355)
+++ trunk/LayoutTests/http/tests/download/inherited-encoding-form-submission-result-expected.txt 2021-04-01 14:02:09 UTC (rev 275356)
@@ -1,4 +1,4 @@
-Policy delegate: attempt to load http://127.0.0.1:8000/download/resources/literal-koi8-r.py? with navigation type 'form submitted'
+Policy delegate: attempt to load http://127.0.0.1:8000/download/resources/literal-koi8-r.php? with navigation type 'form submitted'
Policy delegate: resource is an attachment, suggested file name 'SUССЕSS.txt'
Downloaded file name should be "SUССЕSS.txt" (letters "CCE" are Cyrillic).
Modified: trunk/LayoutTests/http/tests/download/inherited-encoding-form-submission-result.html (275355 => 275356)
--- trunk/LayoutTests/http/tests/download/inherited-encoding-form-submission-result.html 2021-04-01 13:37:02 UTC (rev 275355)
+++ trunk/LayoutTests/http/tests/download/inherited-encoding-form-submission-result.html 2021-04-01 14:02:09 UTC (rev 275356)
@@ -7,7 +7,7 @@
}
</script>
<p>Downloaded file name should be "SU\xF3\xF3\xE5SS.txt" (letters "CCE" are Cyrillic).</p>
-<form action=""
+<form action=""
</form>
<script>
Modified: trunk/LayoutTests/http/tests/download/inherited-encoding.html (275355 => 275356)
--- trunk/LayoutTests/http/tests/download/inherited-encoding.html 2021-04-01 13:37:02 UTC (rev 275355)
+++ trunk/LayoutTests/http/tests/download/inherited-encoding.html 2021-04-01 14:02:09 UTC (rev 275356)
@@ -7,7 +7,7 @@
}
</script>
<p>Downloaded file name should be "SU\xF3\xF3\xE5SS.txt" (letters "CCE" are Cyrillic).</p>
-<a href="" id=link>Click Me</a>
+<a href="" id=link>Click Me</a>
<script>
if (window.eventSender) {
Modified: trunk/LayoutTests/http/tests/download/literal-utf-8-expected.txt (275355 => 275356)
--- trunk/LayoutTests/http/tests/download/literal-utf-8-expected.txt 2021-04-01 13:37:02 UTC (rev 275355)
+++ trunk/LayoutTests/http/tests/download/literal-utf-8-expected.txt 2021-04-01 14:02:09 UTC (rev 275356)
@@ -1,4 +1,4 @@
-Policy delegate: attempt to load http://127.0.0.1:8000/download/resources/literal-utf-8.py with navigation type 'other'
+Policy delegate: attempt to load http://127.0.0.1:8000/download/resources/literal-utf-8.php with navigation type 'other'
Policy delegate: resource is an attachment, suggested file name 'SUССЕSS.txt'
Downloaded file name should be "SUССЕSS.txt" (letters "CCE" are Cyrillic).
Modified: trunk/LayoutTests/http/tests/download/literal-utf-8.html (275355 => 275356)
--- trunk/LayoutTests/http/tests/download/literal-utf-8.html 2021-04-01 13:37:02 UTC (rev 275355)
+++ trunk/LayoutTests/http/tests/download/literal-utf-8.html 2021-04-01 14:02:09 UTC (rev 275356)
@@ -6,4 +6,4 @@
}
</script>
<p>Downloaded file name should be "SU\xF3\xF3\xE5SS.txt" (letters "CCE" are Cyrillic).</p>
-<iframe src=""
+<iframe src=""
Added: trunk/LayoutTests/http/tests/download/resources/literal-koi8-r.php (0 => 275356)
--- trunk/LayoutTests/http/tests/download/resources/literal-koi8-r.php (rev 0)
+++ trunk/LayoutTests/http/tests/download/resources/literal-koi8-r.php 2021-04-01 14:02:09 UTC (rev 275356)
@@ -0,0 +1,6 @@
+<?php
+header("Content-Disposition: attachment; filename=SU\xf3\xf3\xe5SS.txt");
+header("Content-Type: text/plain; charset=windows-1251"); // Content-Type charset does not affect header charset.
+?>
+
+Test file content.
Deleted: trunk/LayoutTests/http/tests/download/resources/literal-koi8-r.py (275355 => 275356)
--- trunk/LayoutTests/http/tests/download/resources/literal-koi8-r.py 2021-04-01 13:37:02 UTC (rev 275355)
+++ trunk/LayoutTests/http/tests/download/resources/literal-koi8-r.py 2021-04-01 14:02:09 UTC (rev 275356)
@@ -1,9 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-
-sys.stdout.write('Content-Disposition: attachment; filename=SU\xf3\xf3\xe5SS.txt\r\n'.encode('latin-1').decode('utf-8', 'replace'))
-sys.stdout.write(
- 'Content-Type: text/plain; charset=windows-1251\r\n\r\n'
- 'Test file content.'
-)
\ No newline at end of file
Added: trunk/LayoutTests/http/tests/download/resources/literal-utf-8.php (0 => 275356)
--- trunk/LayoutTests/http/tests/download/resources/literal-utf-8.php (rev 0)
+++ trunk/LayoutTests/http/tests/download/resources/literal-utf-8.php 2021-04-01 14:02:09 UTC (rev 275356)
@@ -0,0 +1,6 @@
+<?php
+header("Content-Disposition: attachment; filename=SU\xd0\xa1\xd0\xa1\xd0\x95SS.txt");
+header("Content-Type: text/plain; charset=koi8-r"); // Content-Type charset does not affect header charset.
+?>
+
+Test file content.
Deleted: trunk/LayoutTests/http/tests/download/resources/literal-utf-8.py (275355 => 275356)
--- trunk/LayoutTests/http/tests/download/resources/literal-utf-8.py 2021-04-01 13:37:02 UTC (rev 275355)
+++ trunk/LayoutTests/http/tests/download/resources/literal-utf-8.py 2021-04-01 14:02:09 UTC (rev 275356)
@@ -1,9 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-
-sys.stdout.write('Content-Disposition: attachment; filename=SU\xd0\xa1\xd0\xa1\xd0\x95SS.txt\r\n'.encode('latin-1').decode('utf-8', 'replace'))
-sys.stdout.write(
- 'Content-Type: text/plain; charset=koi8-r\r\n\r\n'
- 'Test file content.'
-)
\ No newline at end of file
