<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[173760] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173760">173760</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-19 10:38:13 -0700 (Fri, 19 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WTR and DRT didReceiveAuthenticationChallengeInFrame should print messages consistently
https://bugs.webkit.org/show_bug.cgi?id=136847
Tools:
Added protection space host and port logging to WTR didReceiveAuthenticationChallengeInFrame.
Patch by Youenn Fablet <youenn.fablet@crf.canon.fr> on 2014-09-19
Reviewed by Alexey Proskuryakov.
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::didReceiveAuthenticationChallengeInFrame):
LayoutTests:
Updated WK2 expected.txt files according new logging of didReceiveAuthenticationChallengeInFrame.
Factorized efl/gtk platform specific expected files as WK2 expected files.
Patch by Youenn Fablet <youenn.fablet@crf.canon.fr> on 2014-09-19
Reviewed by Alexey Proskuryakov.
* platform/gtk/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt: Removed.
* platform/gtk/http/tests/loading/basic-credentials-sent-automatically-expected.txt: Removed.
* platform/gtk/http/tests/media/video-auth-expected.txt: Removed.
* platform/gtk/http/tests/misc/401-alternative-content-expected.txt: Removed.
* platform/gtk/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt: Removed.
* platform/gtk/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt: Removed.
* platform/gtk/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt: Removed.
* platform/gtk/http/tests/security/401-logout/401-logout-expected.txt: Removed.
* platform/gtk/http/tests/xmlhttprequest/failed-auth-expected.txt: Removed.
* platform/gtk/http/tests/xmlhttprequest/remember-bad-password-expected.txt: Removed.
* platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt:
* platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt:
* platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt:
* platform/wk2/http/tests/media/video-auth-expected.txt: Renamed from LayoutTests/platform/efl/http/tests/media/video-auth-expected.txt.
* platform/wk2/http/tests/misc/401-alternative-content-expected.txt:
* platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt:
* platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt:
* platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt:
* platform/wk2/http/tests/security/401-logout/401-logout-expected.txt:
* platform/wk2/http/tests/xmlhttprequest/failed-auth-expected.txt:
* platform/wk2/http/tests/xmlhttprequest/remember-bad-password-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformwk2httptestsloadingauthenticationafterredirectstoreswrongcredentialsauthenticationafterredirectstoreswrongcredentialsexpectedtxt">trunk/LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformwk2httptestsloadingbasicauthresendwrongcredentialsexpectedtxt">trunk/LayoutTests/platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformwk2httptestsloadingbasiccredentialssentautomaticallyexpectedtxt">trunk/LayoutTests/platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformwk2httptestsmisc401alternativecontentexpectedtxt">trunk/LayoutTests/platform/wk2/http/tests/misc/401-alternative-content-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformwk2httptestsmiscauthenticationredirect1authenticationsenttoredirectcrossoriginexpectedtxt">trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformwk2httptestsmiscauthenticationredirect2authenticationsenttoredirectsameoriginexpectedtxt">trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformwk2httptestsmiscauthenticationredirect4authenticationsenttoredirectsameoriginurlexpectedtxt">trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformwk2httptestssecurity401logout401logoutexpectedtxt">trunk/LayoutTests/platform/wk2/http/tests/security/401-logout/401-logout-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformwk2httptestsxmlhttprequestfailedauthexpectedtxt">trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/failed-auth-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformwk2httptestsxmlhttprequestrememberbadpasswordexpectedtxt">trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/remember-bad-password-expected.txt</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/platform/wk2/http/tests/media/</li>
<li><a href="#trunkLayoutTestsplatformwk2httptestsmediavideoauthexpectedtxt">trunk/LayoutTests/platform/wk2/http/tests/media/video-auth-expected.txt</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformeflhttptestsmediavideoauthexpectedtxt">trunk/LayoutTests/platform/efl/http/tests/media/video-auth-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkhttptestsloadingbasicauthresendwrongcredentialsexpectedtxt">trunk/LayoutTests/platform/gtk/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkhttptestsloadingbasiccredentialssentautomaticallyexpectedtxt">trunk/LayoutTests/platform/gtk/http/tests/loading/basic-credentials-sent-automatically-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkhttptestsmediavideoauthexpectedtxt">trunk/LayoutTests/platform/gtk/http/tests/media/video-auth-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkhttptestsmisc401alternativecontentexpectedtxt">trunk/LayoutTests/platform/gtk/http/tests/misc/401-alternative-content-expected.txt</a></li>
<li>trunk/LayoutTests/platform/gtk/http/tests/misc/authentication-redirect-1/</li>
<li>trunk/LayoutTests/platform/gtk/http/tests/misc/authentication-redirect-2/</li>
<li>trunk/LayoutTests/platform/gtk/http/tests/misc/authentication-redirect-4/</li>
<li>trunk/LayoutTests/platform/gtk/http/tests/security/401-logout/</li>
<li><a href="#trunkLayoutTestsplatformgtkhttptestsxmlhttprequestfailedauthexpectedtxt">trunk/LayoutTests/platform/gtk/http/tests/xmlhttprequest/failed-auth-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkhttptestsxmlhttprequestrememberbadpasswordexpectedtxt">trunk/LayoutTests/platform/gtk/http/tests/xmlhttprequest/remember-bad-password-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (173759 => 173760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/ChangeLog 2014-09-19 17:38:13 UTC (rev 173760)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-09-19 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ WTR and DRT didReceiveAuthenticationChallengeInFrame should print messages consistently
+ https://bugs.webkit.org/show_bug.cgi?id=136847
+
+ Updated WK2 expected.txt files according new logging of didReceiveAuthenticationChallengeInFrame.
+ Factorized efl/gtk platform specific expected files as WK2 expected files.
+
+ Reviewed by Alexey Proskuryakov.
+
+ * platform/gtk/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt: Removed.
+ * platform/gtk/http/tests/loading/basic-credentials-sent-automatically-expected.txt: Removed.
+ * platform/gtk/http/tests/media/video-auth-expected.txt: Removed.
+ * platform/gtk/http/tests/misc/401-alternative-content-expected.txt: Removed.
+ * platform/gtk/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt: Removed.
+ * platform/gtk/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt: Removed.
+ * platform/gtk/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt: Removed.
+ * platform/gtk/http/tests/security/401-logout/401-logout-expected.txt: Removed.
+ * platform/gtk/http/tests/xmlhttprequest/failed-auth-expected.txt: Removed.
+ * platform/gtk/http/tests/xmlhttprequest/remember-bad-password-expected.txt: Removed.
+ * platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt:
+ * platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt:
+ * platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt:
+ * platform/wk2/http/tests/media/video-auth-expected.txt: Renamed from LayoutTests/platform/efl/http/tests/media/video-auth-expected.txt.
+ * platform/wk2/http/tests/misc/401-alternative-content-expected.txt:
+ * platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt:
+ * platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt:
+ * platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt:
+ * platform/wk2/http/tests/security/401-logout/401-logout-expected.txt:
+ * platform/wk2/http/tests/xmlhttprequest/failed-auth-expected.txt:
+ * platform/wk2/http/tests/xmlhttprequest/remember-bad-password-expected.txt:
+
</ins><span class="cx"> 2014-09-18 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r168921): SVG elements may be unnecessarily rebuilt
</span></span></pre></div>
<a id="trunkLayoutTestsplatformeflhttptestsmediavideoauthexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/efl/http/tests/media/video-auth-expected.txt (173759 => 173760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/http/tests/media/video-auth-expected.txt 2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/efl/http/tests/media/video-auth-expected.txt 2014-09-19 17:38:13 UTC (rev 173760)
</span><span class="lines">@@ -1,6 +0,0 @@
</span><del>-didReceiveAuthenticationChallenge - Responding with username:password
-
-Tests that the media player sends authorization credentials when requesting a media file.
-EVENT(canplay)
-END OF TEST
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformgtkhttptestsloadingbasicauthresendwrongcredentialsexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/gtk/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt (173759 => 173760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt 2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/gtk/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt 2014-09-19 17:38:13 UTC (rev 173760)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-<unknown> - didReceiveAuthenticationChallenge - Responding with wrongusername:wrongpassword
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-<unknown> - didReceiveAuthenticationChallenge - Responding with correctusername:correctpassword
-frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame1-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-This test makes sure that once WebCore preemptively sends out Basic credentials it thinks apply to a new resource, and that resource response with a 401 challenge, that it doesn't try to send the same wrong credentials a second time.
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-Authenticated as user: wrongusername password: wrongpassword
-
---------
-Frame: '<!--framePath //<!--frame1-->-->'
---------
-Authenticated as user: correctusername password: correctpassword
</del></span></pre></div>
<a id="trunkLayoutTestsplatformgtkhttptestsloadingbasiccredentialssentautomaticallyexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/gtk/http/tests/loading/basic-credentials-sent-automatically-expected.txt (173759 => 173760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/http/tests/loading/basic-credentials-sent-automatically-expected.txt 2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/gtk/http/tests/loading/basic-credentials-sent-automatically-expected.txt 2014-09-19 17:38:13 UTC (rev 173760)
</span><span class="lines">@@ -1,57 +0,0 @@
</span><del>-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-<unknown> - didReceiveAuthenticationChallenge - Responding with first:first-pw
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-<unknown> - didReceiveAuthenticationChallenge - Responding with second:second-pw
-frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame2-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame1-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame2-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame2-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame3-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame2-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame2-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame3-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame3-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame3-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame3-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-This test makes sure that once an HTTP Basic Auth. protected path is authenticated once, urls that emanate from that path automatically have their credentials sent without a challenge.
-The first frame's path is /loading/resources/subresources/protected-resource.php, and we should get a challenge for it.
-It will be authorized with first/first-pw.
-The second frame's path is /loading/resources/protected-resource.php, and we should get a challenge for it, because it does not share a common subpath of the previously authorized resource.
-It will be authorized with second/second-pw.
-The third frame's path is also /loading/resources/protected-resource.php, and we should *not* get a challenge for it because we authorized to this path for the second frame.
-It will be authorized with second/second-pw.
-The fourth frame's path is /loading/resources/othersubresources/protected-resource.php, and we should *not* get a challenge for it, because it has a common subpath with the previously authorized second and third frames.
-It will be authorized with second/second-pw.
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-Authenticated as user: first password: first-pw
-
---------
-Frame: '<!--framePath //<!--frame1-->-->'
---------
-Authenticated as user: second password: second-pw
-
---------
-Frame: '<!--framePath //<!--frame2-->-->'
---------
-Authenticated as user: second password: second-pw
-
---------
-Frame: '<!--framePath //<!--frame3-->-->'
---------
-Authenticated as user: second password: second-pw
</del></span></pre></div>
<a id="trunkLayoutTestsplatformgtkhttptestsmediavideoauthexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/gtk/http/tests/media/video-auth-expected.txt (173759 => 173760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/http/tests/media/video-auth-expected.txt 2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/gtk/http/tests/media/video-auth-expected.txt 2014-09-19 17:38:13 UTC (rev 173760)
</span><span class="lines">@@ -1,6 +0,0 @@
</span><del>-didReceiveAuthenticationChallenge - Responding with username:password
-
-Tests that the media player sends authorization credentials when requesting a media file.
-EVENT(canplay)
-END OF TEST
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformgtkhttptestsmisc401alternativecontentexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/gtk/http/tests/misc/401-alternative-content-expected.txt (173759 => 173760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/http/tests/misc/401-alternative-content-expected.txt 2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/gtk/http/tests/misc/401-alternative-content-expected.txt 2014-09-19 17:38:13 UTC (rev 173760)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-<unknown> - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
-PASS
</del></span></pre></div>
<a id="trunkLayoutTestsplatformgtkhttptestsxmlhttprequestfailedauthexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/gtk/http/tests/xmlhttprequest/failed-auth-expected.txt (173759 => 173760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/http/tests/xmlhttprequest/failed-auth-expected.txt 2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/gtk/http/tests/xmlhttprequest/failed-auth-expected.txt 2014-09-19 17:38:13 UTC (rev 173760)
</span><span class="lines">@@ -1,8 +0,0 @@
</span><del>-<unknown> - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
-<unknown> - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
-Test for bug 13075: XMLHttpRequest with failed authentication should set status to 401.
-
-Sync, no credentials: OK
-Sync, incorrect credentials: OK
-Async, no credentials: OK
-Async, incorrect credentials: OK
</del></span></pre></div>
<a id="trunkLayoutTestsplatformgtkhttptestsxmlhttprequestrememberbadpasswordexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/gtk/http/tests/xmlhttprequest/remember-bad-password-expected.txt (173759 => 173760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/http/tests/xmlhttprequest/remember-bad-password-expected.txt 2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/gtk/http/tests/xmlhttprequest/remember-bad-password-expected.txt 2014-09-19 17:38:13 UTC (rev 173760)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-<unknown> - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
-<unknown> - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
-rdar://problem/7062824 A wrong password entered for site or proxy auth remains in WebCore credential storage, and is sent with subsequent requests.
-
-This test counts the number of failed requests server side.
-
-PASS
-
-Sync
-With credentials Without credentials
-Async
-With credentials Without credentials
-Status
</del></span></pre></div>
<a id="trunkLayoutTestsplatformwk2httptestsloadingauthenticationafterredirectstoreswrongcredentialsauthenticationafterredirectstoreswrongcredentialsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt (173759 => 173760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt 2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt 2014-09-19 17:38:13 UTC (rev 173760)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
</span><span class="cx"> main frame - didFinishDocumentLoadForFrame
</span><span class="cx"> frame "<!--framePath //<!--frame0-->-->" - didReceiveServerRedirectForProvisionalLoadForFrame
</span><del>-didReceiveAuthenticationChallenge - Responding with httpUsername:httpPassword
</del><ins>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with httpUsername:httpPassword
</ins><span class="cx"> frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
</span><span class="cx"> frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
</span><span class="cx"> frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwk2httptestsloadingbasicauthresendwrongcredentialsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt (173759 => 173760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt 2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt 2014-09-19 17:38:13 UTC (rev 173760)
</span><span class="lines">@@ -2,14 +2,14 @@
</span><span class="cx"> main frame - didCommitLoadForFrame
</span><span class="cx"> frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
</span><span class="cx"> main frame - didFinishDocumentLoadForFrame
</span><del>-didReceiveAuthenticationChallenge - Responding with wrongusername:wrongpassword
</del><ins>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with wrongusername:wrongpassword
</ins><span class="cx"> frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
</span><span class="cx"> frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
</span><span class="cx"> main frame - didHandleOnloadEventsForFrame
</span><span class="cx"> frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame
</span><span class="cx"> frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
</span><span class="cx"> frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
</span><del>-didReceiveAuthenticationChallenge - Responding with correctusername:correctpassword
</del><ins>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with correctusername:correctpassword
</ins><span class="cx"> frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame
</span><span class="cx"> frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame
</span><span class="cx"> frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwk2httptestsloadingbasiccredentialssentautomaticallyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt (173759 => 173760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt 2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt 2014-09-19 17:38:13 UTC (rev 173760)
</span><span class="lines">@@ -2,14 +2,14 @@
</span><span class="cx"> main frame - didCommitLoadForFrame
</span><span class="cx"> frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
</span><span class="cx"> main frame - didFinishDocumentLoadForFrame
</span><del>-didReceiveAuthenticationChallenge - Responding with first:first-pw
</del><ins>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with first:first-pw
</ins><span class="cx"> frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
</span><span class="cx"> frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
</span><span class="cx"> main frame - didHandleOnloadEventsForFrame
</span><span class="cx"> frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame
</span><span class="cx"> frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
</span><span class="cx"> frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
</span><del>-didReceiveAuthenticationChallenge - Responding with second:second-pw
</del><ins>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with second:second-pw
</ins><span class="cx"> frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame
</span><span class="cx"> frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame
</span><span class="cx"> frame "<!--framePath //<!--frame2-->-->" - didStartProvisionalLoadForFrame
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwk2httptestsmediavideoauthexpectedtxtfromrev173755trunkLayoutTestsplatformgtkhttptestsmediavideoauthexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/wk2/http/tests/media/video-auth-expected.txt (from rev 173755, trunk/LayoutTests/platform/gtk/http/tests/media/video-auth-expected.txt) (0 => 173760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wk2/http/tests/media/video-auth-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/wk2/http/tests/media/video-auth-expected.txt 2014-09-19 17:38:13 UTC (rev 173760)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with username:password
+
+Tests that the media player sends authorization credentials when requesting a media file.
+EVENT(canplay)
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformwk2httptestsmisc401alternativecontentexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/wk2/http/tests/misc/401-alternative-content-expected.txt (173759 => 173760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wk2/http/tests/misc/401-alternative-content-expected.txt 2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/wk2/http/tests/misc/401-alternative-content-expected.txt 2014-09-19 17:38:13 UTC (rev 173760)
</span><span class="lines">@@ -1,2 +1,2 @@
</span><del>-didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
</del><ins>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
</ins><span class="cx"> PASS
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwk2httptestsmiscauthenticationredirect1authenticationsenttoredirectcrossoriginexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt (173759 => 173760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt 2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt 2014-09-19 17:38:13 UTC (rev 173760)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-didReceiveAuthenticationChallenge - Responding with testUser:testPassword
</del><ins>+localhost:8000 - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
</ins><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=40138
</span><span class="cx"> You should load this page at 127.0.0.1:8000 so localhost:8000 is considered a different security origin.
</span><span class="cx"> This test loads a php script which demands http authentication, then uses it to redirect to another script in a different origin that shows what authentication headers were sent with the final request.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwk2httptestsmiscauthenticationredirect2authenticationsenttoredirectsameoriginexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt (173759 => 173760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt 2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt 2014-09-19 17:38:13 UTC (rev 173760)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-didReceiveAuthenticationChallenge - Responding with testUser:testPassword
</del><ins>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
</ins><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=66354
</span><span class="cx"> You should load this page at 127.0.0.1:8000 because the test relies on redirects within the 127.0.0.1:8000 security origin.
</span><span class="cx"> This test loads a php script which demands http authentication, then uses it to redirect to another script in the same origin that shows what authentication headers were sent with the final request.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwk2httptestsmiscauthenticationredirect4authenticationsenttoredirectsameoriginurlexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt (173759 => 173760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt 2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt 2014-09-19 17:38:13 UTC (rev 173760)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-didReceiveAuthenticationChallenge - Responding with testUser:testPassword
</del><ins>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
</ins><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=105190
</span><span class="cx"> You should load this page at 127.0.0.1:8000 because the test relies on redirects within the 127.0.0.1:8000 security origin.
</span><span class="cx"> This test loads a php script which demands http authentication, then uses it to redirect via 301 to another script in the same origin that shows what authentication headers were sent with the final request. It verifies that the credentials are not placed in the final URL.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwk2httptestssecurity401logout401logoutexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/wk2/http/tests/security/401-logout/401-logout-expected.txt (173759 => 173760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wk2/http/tests/security/401-logout/401-logout-expected.txt 2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/401-logout/401-logout-expected.txt 2014-09-19 17:38:13 UTC (rev 173760)
</span><span class="lines">@@ -1,3 +1,3 @@
</span><del>-didReceiveAuthenticationChallenge - Responding with username:password
-didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
</del><ins>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with username:password
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
</ins><span class="cx"> PASS
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwk2httptestsxmlhttprequestfailedauthexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/failed-auth-expected.txt (173759 => 173760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/failed-auth-expected.txt 2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/failed-auth-expected.txt 2014-09-19 17:38:13 UTC (rev 173760)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>-didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
-didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
</del><ins>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
</ins><span class="cx"> Test for bug 13075: XMLHttpRequest with failed authentication should set status to 401.
</span><span class="cx">
</span><span class="cx"> Sync, no credentials: OK
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwk2httptestsxmlhttprequestrememberbadpasswordexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/remember-bad-password-expected.txt (173759 => 173760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/remember-bad-password-expected.txt 2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/remember-bad-password-expected.txt 2014-09-19 17:38:13 UTC (rev 173760)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>-didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
-didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
</del><ins>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
</ins><span class="cx"> rdar://problem/7062824 A wrong password entered for site or proxy auth remains in WebCore credential storage, and is sent with subsequent requests.
</span><span class="cx">
</span><span class="cx"> This test counts the number of failed requests server side.
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (173759 => 173760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/Tools/ChangeLog 2014-09-19 17:38:13 UTC (rev 173760)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-09-19 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ WTR and DRT didReceiveAuthenticationChallengeInFrame should print messages consistently
+ https://bugs.webkit.org/show_bug.cgi?id=136847
+
+ Added protection space host and port logging to WTR didReceiveAuthenticationChallengeInFrame.
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::didReceiveAuthenticationChallengeInFrame):
+
</ins><span class="cx"> 2014-09-19 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Missing inspector files in the tarball
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (173759 => 173760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2014-09-19 17:38:13 UTC (rev 173760)
</span><span class="lines">@@ -1276,11 +1276,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- String message;
</del><ins>+ std::string host = toSTD(adoptWK(WKProtectionSpaceCopyHost(protectionSpace)).get());
+ int port = WKProtectionSpaceGetPort(protectionSpace);
+ String message = String::format("%s:%d - didReceiveAuthenticationChallenge - ", host.c_str(), port);
</ins><span class="cx"> if (!m_handlesAuthenticationChallenges)
</span><del>- message = "didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet\n";
</del><ins>+ message.append("Simulating cancelled authentication sheet\n");
</ins><span class="cx"> else
</span><del>- message = String::format("didReceiveAuthenticationChallenge - Responding with %s:%s\n", m_authenticationUsername.utf8().data(), m_authenticationPassword.utf8().data());
</del><ins>+ message.append(String::format("Responding with %s:%s\n", m_authenticationUsername.utf8().data(), m_authenticationPassword.utf8().data()));
</ins><span class="cx"> m_currentInvocation->outputText(message);
</span><span class="cx">
</span><span class="cx"> if (!m_handlesAuthenticationChallenges) {
</span></span></pre>
</div>
</div>
</body>
</html>