Title: [179336] trunk/LayoutTests
- Revision
- 179336
- Author
- commit-qu...@webkit.org
- Date
- 2015-01-28 23:00:37 -0800 (Wed, 28 Jan 2015)
Log Message
security/mixedContent/redirect-https-to-http-iframe-in-main-frame test is the same as security/mixedContent/redirect-http-to-https-iframe-in-main-frame.html
https://bugs.webkit.org/show_bug.cgi?id=140876
Patch by Michael Catanzaro <mcatanz...@igalia.com> on 2015-01-28
Reviewed by Darin Adler.
Fix the test so it's not identical to the redirect-http-to-https-iframe-in-main-frame
test, and update the expected results.
* http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt:
* http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (179335 => 179336)
--- trunk/LayoutTests/ChangeLog 2015-01-29 05:23:28 UTC (rev 179335)
+++ trunk/LayoutTests/ChangeLog 2015-01-29 07:00:37 UTC (rev 179336)
@@ -1,3 +1,16 @@
+2015-01-28 Michael Catanzaro <mcatanz...@igalia.com>
+
+ security/mixedContent/redirect-https-to-http-iframe-in-main-frame test is the same as security/mixedContent/redirect-http-to-https-iframe-in-main-frame.html
+ https://bugs.webkit.org/show_bug.cgi?id=140876
+
+ Reviewed by Darin Adler.
+
+ Fix the test so it's not identical to the redirect-http-to-https-iframe-in-main-frame
+ test, and update the expected results.
+
+ * http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt:
+ * http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame.html:
+
2015-01-28 Benjamin Poulain <bpoul...@apple.com>
Start fixing the handling of Element's attributes when they contain non-ASCII characters
Modified: trunk/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt (179335 => 179336)
--- trunk/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt 2015-01-29 05:23:28 UTC (rev 179335)
+++ trunk/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt 2015-01-29 07:00:37 UTC (rev 179336)
@@ -4,10 +4,10 @@
main frame - didFinishLoadForFrame
main frame - didCommitLoadForFrame
frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-CONSOLE MESSAGE: The page at about:blank displayed insecure content from http://127.0.0.1:8080/resources/redirect.php?url=""
+main frame - didFinishDocumentLoadForFrame
+CONSOLE MESSAGE: The page at about:blank displayed insecure content from http://127.0.0.1:8080/security/mixedContent/resources/boring.html.
didDisplayInsecureContent
-main frame - didFinishDocumentLoadForFrame
frame "<!--framePath //<!--frame0-->-->" - didReceiveServerRedirectForProvisionalLoadForFrame
frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
Modified: trunk/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame.html (179335 => 179336)
--- trunk/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame.html 2015-01-29 05:23:28 UTC (rev 179335)
+++ trunk/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame.html 2015-01-29 07:00:37 UTC (rev 179336)
@@ -20,7 +20,7 @@
in the window is HTTPS but is displaying content that can be controlled by an
active network attacker.</p>
<script>
-window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-http-to-https-frame.html");
+window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-https-to-http-frame.html");
</script>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
