Title: [187074] branches/safari-601.1-branch/LayoutTests
- Revision
- 187074
- Author
- matthew_han...@apple.com
- Date
- 2015-07-20 21:37:43 -0700 (Mon, 20 Jul 2015)
Log Message
Merge r186988. rdar://problem/21567820
Modified Paths
Diff
Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (187073 => 187074)
--- branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-21 04:37:40 UTC (rev 187073)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-21 04:37:43 UTC (rev 187074)
@@ -1,5 +1,22 @@
2015-07-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r186988. rdar://problem/21567820
+
+ 2015-07-18 David Kilzer <ddkil...@apple.com>
+
+ REGRESSION (r186982): http/tests/contentdispositionattachmentsandbox/form-submission-disabled.html and loader/meta-refresh-disabled.html fail
+
+ Part of:
+ <https://bugs.webkit.org/show_bug.cgi?id=147044>
+ <rdar://problem/21567820>
+
+ * http/tests/contentdispositionattachmentsandbox/form-submission-disabled-expected.txt:
+ - Fix line number of console message.
+ * loader/meta-refresh-disabled-expected.txt:
+ - Add newly expected console message.
+
+2015-07-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r186982. rdar://problem/21567820
2015-07-17 Andy Estes <aes...@apple.com>
Modified: branches/safari-601.1-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/form-submission-disabled-expected.txt (187073 => 187074)
--- branches/safari-601.1-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/form-submission-disabled-expected.txt 2015-07-21 04:37:40 UTC (rev 187073)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/form-submission-disabled-expected.txt 2015-07-21 04:37:43 UTC (rev 187074)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 21: Blocked form submission to 'http://127.0.0.1:8000/contentdispositionattachmentsandbox/resources/form-submission-frame.php' because the form's frame is sandboxed and the 'allow-forms' permission is not set.
+CONSOLE MESSAGE: line 20: Blocked form submission to 'http://127.0.0.1:8000/contentdispositionattachmentsandbox/resources/form-submission-frame.php' because the form's frame is sandboxed and the 'allow-forms' permission is not set.
This test verifies that form submission is disabled when 'Content-Disposition: attachment' sandboxing is enabled. A security error will be logged to the console if the test passes.
Modified: branches/safari-601.1-branch/LayoutTests/loader/meta-refresh-disabled-expected.txt (187073 => 187074)
--- branches/safari-601.1-branch/LayoutTests/loader/meta-refresh-disabled-expected.txt 2015-07-21 04:37:40 UTC (rev 187073)
+++ branches/safari-601.1-branch/LayoutTests/loader/meta-refresh-disabled-expected.txt 2015-07-21 04:37:43 UTC (rev 187074)
@@ -1,3 +1,4 @@
+CONSOLE MESSAGE: line 33: http-equiv 'refresh' is disabled by the embedder.
This test makes sure the preference to disable meta refreshes works as expected.
You should see this text when the test is done.
If you do not see this text, and instead you see a blank page, then the redirect happened, which it should not have.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
