<unknown> is often dumped instead of path in test output
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Aug 2013 18:40:48 +0000 (18:40 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Aug 2013 18:40:48 +0000 (18:40 +0000)
https://bugs.webkit.org/show_bug.cgi?id=119590

Reviewed by Anders Carlsson.

Tools:

There were two reasons for <unknown>:
1. When delegate logging is enabled via a testRunner call, that obviously happens
after main resource load starts, so we don't record its URL.
2. Authentication delegate logging relied on URL recording, but it's only turned on
when enabling resource loading delegate logging, not auth one.

URL recording was made conditional in <http://trac.webkit.org/r19316>, which was
landed without posted rationale and unreviewed. Just undoing that change now.

* DumpRenderTree/mac/ResourceLoadDelegate.mm:
(-[ResourceLoadDelegate webView:identifierForInitialRequest:fromDataSource:]):
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::didInitiateLoadForResource):

LayoutTests:

Updating test results.

* fast/loader/file-protocol-fragment-expected.txt:
* fast/loader/main-document-url-for-non-http-loads-expected.txt:
* http/tests/cache/iframe-304-crash-expected.txt:
* http/tests/cache/willsendrequest-returns-null-for-memory-cache-load-expected.txt:
* http/tests/loading/307-after-303-after-post-expected.txt:
* http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt:
* http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt:
* http/tests/loading/basic-credentials-sent-automatically-expected.txt:
* http/tests/loading/redirect-methods-expected.txt:
* http/tests/misc/401-alternative-content-expected.txt:
* http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt:
* http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt:
* http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt:
* http/tests/misc/favicon-loads-with-images-disabled-expected.txt:
* http/tests/misc/link-rel-icon-beforeload-expected.txt:
* http/tests/misc/will-send-request-returns-null-on-redirect-expected.txt:
* http/tests/misc/window-dot-stop-expected.txt:
* http/tests/security/401-logout/401-logout-expected.txt:
* http/tests/security/XFrameOptions/x-frame-options-allowall-expected.txt:
* http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt:
* http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-expected.txt:
* http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body-expected.txt:
* http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-allow-expected.txt:
* http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny-expected.txt:
* http/tests/security/XFrameOptions/x-frame-options-invalid-expected.txt:
* http/tests/security/XFrameOptions/x-frame-options-multiple-headers-conflict-expected.txt:
* http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-allow-expected.txt:
* http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-deny-expected.txt:
* http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt:
* http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt:
* http/tests/xmlhttprequest/failed-auth-expected.txt:
* http/tests/xmlhttprequest/remember-bad-password-expected.txt:
* loader/go-back-cached-main-resource-expected.txt:
* platform/efl-wk2/loader/go-back-cached-main-resource-expected.txt:
* platform/mac/fast/images/support-broken-image-delegate-expected.txt:
* platform/mac/security/block-test-expected.txt:
* platform/mac/security/block-test-no-port-expected.txt:
* platform/mac/webarchive/loading/cache-expired-subresource-expected.txt:
* webarchive/loading/test-loading-archive-expected.txt:
* webarchive/loading/test-loading-archive-subresource-null-mimetype-expected.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@153903 268f45cc-cd09-0410-ab3c-d52691b4dbfc

44 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/loader/file-protocol-fragment-expected.txt
LayoutTests/fast/loader/main-document-url-for-non-http-loads-expected.txt
LayoutTests/http/tests/cache/iframe-304-crash-expected.txt
LayoutTests/http/tests/cache/willsendrequest-returns-null-for-memory-cache-load-expected.txt
LayoutTests/http/tests/loading/307-after-303-after-post-expected.txt
LayoutTests/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt
LayoutTests/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt
LayoutTests/http/tests/loading/basic-credentials-sent-automatically-expected.txt
LayoutTests/http/tests/loading/redirect-methods-expected.txt
LayoutTests/http/tests/misc/401-alternative-content-expected.txt
LayoutTests/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt
LayoutTests/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt
LayoutTests/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt
LayoutTests/http/tests/misc/favicon-loads-with-images-disabled-expected.txt
LayoutTests/http/tests/misc/link-rel-icon-beforeload-expected.txt
LayoutTests/http/tests/misc/will-send-request-returns-null-on-redirect-expected.txt
LayoutTests/http/tests/misc/window-dot-stop-expected.txt
LayoutTests/http/tests/security/401-logout/401-logout-expected.txt
LayoutTests/http/tests/security/XFrameOptions/x-frame-options-allowall-expected.txt
LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt
LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-expected.txt
LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body-expected.txt
LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-allow-expected.txt
LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny-expected.txt
LayoutTests/http/tests/security/XFrameOptions/x-frame-options-invalid-expected.txt
LayoutTests/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-conflict-expected.txt
LayoutTests/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-allow-expected.txt
LayoutTests/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-deny-expected.txt
LayoutTests/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt
LayoutTests/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt
LayoutTests/http/tests/xmlhttprequest/failed-auth-expected.txt
LayoutTests/http/tests/xmlhttprequest/remember-bad-password-expected.txt
LayoutTests/loader/go-back-cached-main-resource-expected.txt
LayoutTests/platform/efl-wk2/loader/go-back-cached-main-resource-expected.txt
LayoutTests/platform/mac/fast/images/support-broken-image-delegate-expected.txt
LayoutTests/platform/mac/security/block-test-expected.txt
LayoutTests/platform/mac/security/block-test-no-port-expected.txt
LayoutTests/platform/mac/webarchive/loading/cache-expired-subresource-expected.txt
LayoutTests/webarchive/loading/test-loading-archive-expected.txt
LayoutTests/webarchive/loading/test-loading-archive-subresource-null-mimetype-expected.txt
Tools/ChangeLog
Tools/DumpRenderTree/mac/ResourceLoadDelegate.mm
Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

index 1714534..9526076 100644 (file)
@@ -1,3 +1,53 @@
+2013-08-09  Alexey Proskuryakov  <ap@apple.com>
+
+        <unknown> is often dumped instead of path in test output
+        https://bugs.webkit.org/show_bug.cgi?id=119590
+
+        Reviewed by Anders Carlsson.
+
+        Updating test results.
+
+        * fast/loader/file-protocol-fragment-expected.txt:
+        * fast/loader/main-document-url-for-non-http-loads-expected.txt:
+        * http/tests/cache/iframe-304-crash-expected.txt:
+        * http/tests/cache/willsendrequest-returns-null-for-memory-cache-load-expected.txt:
+        * http/tests/loading/307-after-303-after-post-expected.txt:
+        * http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt:
+        * http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt:
+        * http/tests/loading/basic-credentials-sent-automatically-expected.txt:
+        * http/tests/loading/redirect-methods-expected.txt:
+        * http/tests/misc/401-alternative-content-expected.txt:
+        * http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt:
+        * http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt:
+        * http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt:
+        * http/tests/misc/favicon-loads-with-images-disabled-expected.txt:
+        * http/tests/misc/link-rel-icon-beforeload-expected.txt:
+        * http/tests/misc/will-send-request-returns-null-on-redirect-expected.txt:
+        * http/tests/misc/window-dot-stop-expected.txt:
+        * http/tests/security/401-logout/401-logout-expected.txt:
+        * http/tests/security/XFrameOptions/x-frame-options-allowall-expected.txt:
+        * http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt:
+        * http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-expected.txt:
+        * http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body-expected.txt:
+        * http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-allow-expected.txt:
+        * http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny-expected.txt:
+        * http/tests/security/XFrameOptions/x-frame-options-invalid-expected.txt:
+        * http/tests/security/XFrameOptions/x-frame-options-multiple-headers-conflict-expected.txt:
+        * http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-allow-expected.txt:
+        * http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-deny-expected.txt:
+        * http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt:
+        * http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt:
+        * http/tests/xmlhttprequest/failed-auth-expected.txt:
+        * http/tests/xmlhttprequest/remember-bad-password-expected.txt:
+        * loader/go-back-cached-main-resource-expected.txt:
+        * platform/efl-wk2/loader/go-back-cached-main-resource-expected.txt:
+        * platform/mac/fast/images/support-broken-image-delegate-expected.txt:
+        * platform/mac/security/block-test-expected.txt:
+        * platform/mac/security/block-test-no-port-expected.txt:
+        * platform/mac/webarchive/loading/cache-expired-subresource-expected.txt:
+        * webarchive/loading/test-loading-archive-expected.txt:
+        * webarchive/loading/test-loading-archive-subresource-null-mimetype-expected.txt:
+
 2013-08-09  Mihai Tica  <mitica@adobe.com>
 
         Modify the existing canvas blending test suite to test both
index cc848dd..1673839 100644 (file)
@@ -1,6 +1,6 @@
 resources/stylesheet.css - willSendRequest <NSURLRequest URL resources/stylesheet.css, main document URL file-protocol-fragment.html, http method GET> redirectResponse (null)
 resources/stylesheet.css - willSendRequest <NSURLRequest URL resources/stylesheet.css, main document URL file-protocol-fragment.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
+file-protocol-fragment.html - didFinishLoading
 resources/stylesheet.css - didReceiveResponse <NSURLResponse resources/stylesheet.css, http status code 0>
 resources/stylesheet.css - didFinishLoading
 resources/stylesheet.css - didReceiveResponse <NSURLResponse resources/stylesheet.css, http status code 0>
index fd1d20b..e3918a7 100644 (file)
@@ -1,5 +1,5 @@
 resources/subframe-notify-done.html - willSendRequest <NSURLRequest URL resources/subframe-notify-done.html, main document URL main-document-url-for-non-http-loads.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
+main-document-url-for-non-http-loads.html - didFinishLoading
 resources/subframe-notify-done.html - didReceiveResponse <NSURLResponse resources/subframe-notify-done.html, http status code 0>
 Radar 6616664 - Non-HTTP/HTTPS loads need to have their main document URL set.
 When run in DumpRenderTree, this test will dump the resource load callback for the following subframe to make sure it had its main document URL set in its NSURLRequest.
index 32f782a..c917c95 100644 (file)
@@ -1,5 +1,5 @@
 http://127.0.0.1:8000/cache/resources/iframe304.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/cache/resources/iframe304.php, main document URL http://127.0.0.1:8000/cache/iframe-304-crash.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
+http://127.0.0.1:8000/cache/iframe-304-crash.html - didFinishLoading
 http://127.0.0.1:8000/cache/resources/iframe304.php - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/cache/resources/iframe304.php, http status code 200>
 http://127.0.0.1:8000/cache/resources/iframe304.php - didFinishLoading
 http://127.0.0.1:8000/cache/resources/iframe304.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/cache/resources/iframe304.php, main document URL http://127.0.0.1:8000/cache/iframe-304-crash.html, http method GET> redirectResponse (null)
index aec358d..e2a6168 100644 (file)
@@ -1,7 +1,7 @@
 http://127.0.0.1:8000/misc/resources/compass.jpg - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/misc/resources/compass.jpg, main document URL (null), http method GET> redirectResponse (null)
 http://127.0.0.1:8000/misc/resources/compass.jpg - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/misc/resources/compass.jpg, http status code 200>
 http://127.0.0.1:8000/misc/resources/compass.jpg - didFinishLoading
-<unknown> - didFinishLoading
+http://127.0.0.1:8000/cache/willsendrequest-returns-null-for-memory-cache-load.html - didFinishLoading
 http://127.0.0.1:8000/cache/resources/cached-image.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/cache/resources/cached-image.html, main document URL http://127.0.0.1:8000/cache/willsendrequest-returns-null-for-memory-cache-load.html, http method GET> redirectResponse (null)
 http://127.0.0.1:8000/cache/resources/cached-image.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/cache/resources/cached-image.html, http status code 200>
 http://127.0.0.1:8000/misc/resources/compass.jpg - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/misc/resources/compass.jpg, main document URL (null), http method GET> redirectResponse (null)
index cf00ef8..1bbb12b 100644 (file)
@@ -4,7 +4,7 @@ main frame - didFinishDocumentLoadForFrame
 main frame - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/post-to-303-target.php 
 main frame - didHandleOnloadEventsForFrame
 main frame - didFinishLoadForFrame
-<unknown> - didFinishLoading
+http://127.0.0.1:8000/loading/307-after-303-after-post.html - didFinishLoading
 main frame - didStartProvisionalLoadForFrame
 http://127.0.0.1:8000/loading/resources/post-to-303-target.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/post-to-303-target.php, main document URL http://127.0.0.1:8000/loading/resources/post-to-303-target.php, http method POST> redirectResponse (null)
 http://127.0.0.1:8000/loading/resources/post-to-303-target.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/303-to-307-target.php, main document URL http://127.0.0.1:8000/loading/resources/303-to-307-target.php, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/post-to-303-target.php, http status code 303>
index d5e367b..9f04d16 100644 (file)
@@ -3,7 +3,7 @@ main frame - didCommitLoadForFrame
 frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
 main frame - didFinishDocumentLoadForFrame
 frame "<!--framePath //<!--frame0-->-->" - didReceiveServerRedirectForProvisionalLoadForFrame
-<unknown> - didReceiveAuthenticationChallenge - Responding with httpUsername:httpPassword
+http://localhost:8000/loading/authentication-after-redirect-stores-wrong-credentials/resources/wrong-credential-1-redirect-to-auth.php - didReceiveAuthenticationChallenge - Responding with httpUsername:httpPassword
 frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
 frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
 frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
index 868c4c3..f5b2bf0 100644 (file)
@@ -2,14 +2,14 @@ main frame - didStartProvisionalLoadForFrame
 main frame - didCommitLoadForFrame
 frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
 main frame - didFinishDocumentLoadForFrame
-<unknown> - didReceiveAuthenticationChallenge - Responding with wrongusername:wrongpassword
+http://127.0.0.1:8000/loading/resources/test2/protected-resource.php - 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
+http://127.0.0.1:8000/loading/resources/test2/basic-auth-testing.php?username=correctusername&password=correctpassword - didReceiveAuthenticationChallenge - Responding with correctusername:correctpassword
 frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame
 frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame
 frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame
index fbcd21a..29a5d2f 100644 (file)
@@ -2,14 +2,14 @@ main frame - didStartProvisionalLoadForFrame
 main frame - didCommitLoadForFrame
 frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
 main frame - didFinishDocumentLoadForFrame
-<unknown> - didReceiveAuthenticationChallenge - Responding with first:first-pw
+http://127.0.0.1:8000/loading/resources/subresources/protected-resource.php - 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
+http://127.0.0.1:8000/loading/resources/protected-resource.php - didReceiveAuthenticationChallenge - Responding with second:second-pw
 frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame
 frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame
 frame "<!--framePath //<!--frame2-->-->" - didStartProvisionalLoadForFrame
index cd3a591..7663622 100644 (file)
@@ -3,7 +3,7 @@ main frame - didCommitLoadForFrame
 main frame - didFinishDocumentLoadForFrame
 main frame - didHandleOnloadEventsForFrame
 main frame - didFinishLoadForFrame
-<unknown> - didFinishLoading
+http://127.0.0.1:8000/loading/redirect-methods.html - didFinishLoading
 frame "0" - didStartProvisionalLoadForFrame
 frame "0" - didCommitLoadForFrame
 frame "0" - didFinishDocumentLoadForFrame
index 5336c18..e61607c 100644 (file)
@@ -1,2 +1,2 @@
-<unknown> - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
+http://127.0.0.1:8000/misc/401-alternative-content.php - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
 PASS
index 48ae63d..b0a9833 100644 (file)
@@ -1,4 +1,4 @@
-<unknown> - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
+http://localhost:8000/misc/authentication-redirect-1/resources/auth-then-redirect.php?redirect=301 - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
 https://bugs.webkit.org/show_bug.cgi?id=40138
 You should load this page at 127.0.0.1:8000 so localhost:8000 is considered a different security origin.
 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.
index 097588e..7ddbd8c 100644 (file)
@@ -1,4 +1,4 @@
-<unknown> - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
+http://127.0.0.1:8000/misc/authentication-redirect-2/resources/auth-then-redirect.php?redirect=301 - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
 https://bugs.webkit.org/show_bug.cgi?id=66354
 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.
 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.
index 12fb7e8..b27daf8 100644 (file)
@@ -1,4 +1,4 @@
-<unknown> - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
+http://127.0.0.1:8000/misc/authentication-redirect-4/resources/auth-then-redirect.php?redirect - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
 https://bugs.webkit.org/show_bug.cgi?id=105190
 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.
 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.
index c6c9bc5..b739af3 100644 (file)
@@ -1,4 +1,4 @@
-<unknown> - didFinishLoading
+http://127.0.0.1:8000/misc/favicon-loads-with-images-disabled.html - didFinishLoading
 http://127.0.0.1:8000/misc/favicon-loads-with-images-disabled.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/misc/favicon-loads-with-images-disabled.html, main document URL http://127.0.0.1:8000/misc/favicon-loads-with-images-disabled.html, http method GET> redirectResponse (null)
 http://127.0.0.1:8000/misc/favicon-loads-with-images-disabled.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/misc/favicon-loads-with-images-disabled.html, http status code 200>
 Radar 6973106 and https://bugs.webkit.org/show_bug.cgi?id=27896 - Favicons still load when automatic image loading is disabled.
index 9f3ee65..ad8ba16 100644 (file)
@@ -1,4 +1,4 @@
-<unknown> - didFinishLoading
+http://127.0.0.1:8000/misc/link-rel-icon-beforeload.html - didFinishLoading
 http://127.0.0.1:8000/misc/link-rel-icon-beforeload.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/misc/link-rel-icon-beforeload.html, main document URL http://127.0.0.1:8000/misc/link-rel-icon-beforeload.html, http method GET> redirectResponse (null)
 http://127.0.0.1:8000/misc/link-rel-icon-beforeload.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/misc/link-rel-icon-beforeload.html, http status code 200>
 http://127.0.0.1:8000/favicon.ico - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/favicon.ico, main document URL http://127.0.0.1:8000/misc/link-rel-icon-beforeload.html, http method GET> redirectResponse (null)
index 3d6c16f..fa3da88 100644 (file)
@@ -1,5 +1,5 @@
 http://127.0.0.1:8000/misc/resources/redirect-to-http-url.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/misc/resources/redirect-to-http-url.php, main document URL http://127.0.0.1:8000/misc/will-send-request-returns-null-on-redirect.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
+http://127.0.0.1:8000/misc/will-send-request-returns-null-on-redirect.html - didFinishLoading
 http://127.0.0.1:8000/misc/resources/redirect-to-http-url.php - willSendRequest <NSURLRequest URL http://www.example.com/, main document URL http://127.0.0.1:8000/misc/will-send-request-returns-null-on-redirect.html, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/misc/resources/redirect-to-http-url.php, http status code 302>
 Returning null for this redirect
 http://127.0.0.1:8000/misc/resources/redirect-to-http-url.php - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999>
index b6a6ec9..a32bd01 100644 (file)
@@ -1,6 +1,6 @@
 http://127.0.0.1:8000/incremental/slow-utf8-text.pl - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/incremental/slow-utf8-text.pl, main document URL http://127.0.0.1:8000/misc/window-dot-stop.html, http method GET> redirectResponse (null)
 http://127.0.0.1:8000/incremental/slow-utf8-text.pl - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "http://127.0.0.1:8000/incremental/slow-utf8-text.pl">
-<unknown> - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "http://127.0.0.1:8000/misc/window-dot-stop.html">
+http://127.0.0.1:8000/misc/window-dot-stop.html - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "http://127.0.0.1:8000/misc/window-dot-stop.html">
 This tests for the successful use of window.stop()
 
 
index 7562ba0..271e98e 100644 (file)
@@ -1,3 +1,3 @@
-<unknown> - didReceiveAuthenticationChallenge - Responding with username:password
-<unknown> - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
+http://127.0.0.1:8000/security/401-logout/401-logout.php?uid=username - didReceiveAuthenticationChallenge - Responding with username:password
+http://127.0.0.1:8000/security/401-logout/401-logout.php?uid=username&logout=1 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
 PASS
index ed0b214..2bd6037 100644 (file)
@@ -1,5 +1,5 @@
 http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-allowall.cgi - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-allowall.cgi, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-allowall.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-allowall.html - didFinishLoading
 http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-allowall.cgi - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-allowall.cgi, http status code 200>
 The frame below should load, and 'ALLOWALL' should be accepted as a valid header.
 
index f4ecb52..5d163cb 100644 (file)
@@ -1,5 +1,5 @@
 http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny.cgi - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny.cgi, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-deny.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-deny.html - didFinishLoading
 CONSOLE MESSAGE: Refused to display 'http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny.cgi' in a frame because it set 'X-Frame-Options' to 'deny'.
 CONSOLE MESSAGE: Sandbox access violation: Blocked a frame at "http://127.0.0.1:8000" from accessing a frame at "null".  The frame being accessed is sandboxed and lacks the "allow-same-origin" flag.
 CONSOLE MESSAGE: line 13: PASS: Could not read contentWindow.location.href
index 2b9a8b0..e97bf54 100644 (file)
@@ -1,5 +1,5 @@
 http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-deny-meta-tag.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-deny-meta-tag.html - didFinishLoading
 http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html, http status code 200>
 http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html">
 CONSOLE MESSAGE: Refused to display 'http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html' in a frame because it set 'X-Frame-Options' to 'deny'.
index 2b4880f..5e2ef0c 100644 (file)
@@ -1,5 +1,5 @@
 http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body.html - didFinishLoading
 http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html, http status code 200>
 http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html">
 CONSOLE MESSAGE: Refused to display 'http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html' in a frame because it set 'X-Frame-Options' to 'deny'.
index b893324..12cca6d 100644 (file)
@@ -1,5 +1,5 @@
 http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-allow.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-allow.html, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-allow.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-allow.html - didFinishLoading
 http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-allow.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-allow.html, http status code 200>
 ALERT: PASS: onload fired.
 There should be content in the iframe below
index 57b57e4..9afce67 100644 (file)
@@ -1,5 +1,5 @@
 http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html - willSendRequest <NSURLRequest URL http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny.html - didFinishLoading
 http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html - didReceiveResponse <NSURLResponse http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html, http status code 200>
 http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html">
 CONSOLE MESSAGE: Refused to display 'http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html' in a frame because it set 'X-Frame-Options' to 'sameorigin'.
index f5ca462..4a6d75d 100644 (file)
@@ -1,5 +1,5 @@
 http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-invalid.cgi - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-invalid.cgi, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-invalid.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-invalid.html - didFinishLoading
 CONSOLE MESSAGE: Invalid 'X-Frame-Options' header encountered when loading 'http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-invalid.cgi': 'INVALID INVALID INVALID' is not a recognized directive. The header will be ignored.
 http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-invalid.cgi - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-invalid.cgi, http status code 200>
 The frame below should load, and a console message should be generated that notes the invalid header.
index 925966e..0eedd1e 100644 (file)
@@ -1,5 +1,5 @@
 http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-conflict.cgi - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-conflict.cgi, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-multiple-headers-conflict.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-multiple-headers-conflict.html - didFinishLoading
 CONSOLE MESSAGE: Multiple 'X-Frame-Options' headers with conflicting values ('ALLOWALL, DENY') encountered when loading 'http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-conflict.cgi'. Falling back to 'DENY'.
 CONSOLE MESSAGE: Refused to display 'http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-conflict.cgi' in a frame because it set 'X-Frame-Options' to 'ALLOWALL, DENY'.
 http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-conflict.cgi - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-conflict.cgi">
index 73bf1ae..b2d7906 100644 (file)
@@ -1,5 +1,5 @@
 http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-sameorigin.cgi - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-sameorigin.cgi, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-allow.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-allow.html - didFinishLoading
 http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-sameorigin.cgi - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-sameorigin.cgi, http status code 200>
 The frame below should load, proving that 'sameorigin, sameorigin' === 'sameorigin'.
 
index d4f2310..699e977 100644 (file)
@@ -1,5 +1,5 @@
 http://localhost:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-sameorigin.cgi - willSendRequest <NSURLRequest URL http://localhost:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-sameorigin.cgi, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-deny.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-deny.html - didFinishLoading
 CONSOLE MESSAGE: Refused to display 'http://localhost:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-sameorigin.cgi' in a frame because it set 'X-Frame-Options' to 'SAMEORIGIN, SAMEORIGIN'.
 CONSOLE MESSAGE: Sandbox access violation: Blocked a frame at "http://127.0.0.1:8000" from accessing a frame at "null".  The frame being accessed is sandboxed and lacks the "allow-same-origin" flag.
 CONSOLE MESSAGE: line 16: PASS: Could not read contentWindow.location.href
index aa87d8a..f96cd69 100644 (file)
@@ -1,5 +1,5 @@
 http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-parent-same-origin-allow.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-parent-same-origin-allow.html - didFinishLoading
 http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi, http status code 200>
 There should be content in the iframe below
 
index 2602f4b..935a173 100644 (file)
@@ -1,5 +1,5 @@
 http://localhost:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi - willSendRequest <NSURLRequest URL http://localhost:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-parent-same-origin-deny.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-parent-same-origin-deny.html - didFinishLoading
 CONSOLE MESSAGE: Refused to display 'http://localhost:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi' in a frame because it set 'X-Frame-Options' to 'sameorigin'.
 CONSOLE MESSAGE: Sandbox access violation: Blocked a frame at "http://127.0.0.1:8000" from accessing a frame at "null".  The frame being accessed is sandboxed and lacks the "allow-same-origin" flag.
 CONSOLE MESSAGE: line 13: PASS: Could not read contentWindow.location.href
index 0332741..9f7b1dc 100644 (file)
@@ -1,5 +1,5 @@
-<unknown> - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
-<unknown> - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
+http://127.0.0.1:8000/xmlhttprequest/resources/basic-auth/basic-auth.php?uid=login3 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
+http://badname:passpw@127.0.0.1:8000/xmlhttprequest/resources/basic-auth/basic-auth.php?uid=login4 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
 Test for bug 13075: XMLHttpRequest with failed authentication should set status to 401.
 
 Sync, no credentials: OK
index 6e8ac8d..2708b32 100644 (file)
@@ -1,5 +1,5 @@
-<unknown> - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
-<unknown> - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
+http://foo:bar@127.0.0.1:8000/xmlhttprequest/resources/remember-bad-password/count-failures.php - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
+http://127.0.0.1:8000/xmlhttprequest/resources/remember-bad-password/count-failures.php - 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.
index 09c6dda..0be61de 100644 (file)
@@ -1,5 +1,5 @@
 resources/first-page.html - willSendRequest <NSURLRequest URL resources/first-page.html, main document URL resources/first-page.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
+go-back-cached-main-resource.html - didFinishLoading
 resources/first-page.html - didReceiveResponse <NSURLResponse resources/first-page.html, http status code 0>
 resources/first-page.html - didFinishLoading
 resources/other-page.html - willSendRequest <NSURLRequest URL resources/other-page.html, main document URL resources/other-page.html, http method GET> redirectResponse (null)
index 30db1ff..02afa20 100644 (file)
@@ -1,5 +1,5 @@
 resources/first-page.html - willSendRequest <NSURLRequest URL resources/first-page.html, main document URL first-page.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
+go-back-cached-main-resource.html - didFinishLoading
 resources/first-page.html - didReceiveResponse <NSURLResponse resources/first-page.html, http status code 0>
 resources/first-page.html - didFinishLoading
 resources/other-page.html - willSendRequest <NSURLRequest URL resources/other-page.html, main document URL other-page.html, http method GET> redirectResponse (null)
index d22002f..331146e 100644 (file)
@@ -1,5 +1,5 @@
 resources/broken-image-with-invalid-format.png - willSendRequest <NSURLRequest URL resources/broken-image-with-invalid-format.png, main document URL support-broken-image-delegate.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
+support-broken-image-delegate.html - didFinishLoading
 resources/broken-image-with-invalid-format.png - didReceiveResponse <NSURLResponse resources/broken-image-with-invalid-format.png, http status code 0>
 resources/broken-image-with-invalid-format.png - shouldPaintBrokenImage: NO
 resources/broken-image-with-invalid-format.png - didFinishLoading
index 296c4ba..5f83ab9 100644 (file)
@@ -1,5 +1,5 @@
 http://255.255.255.255:1/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:1/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
+block-test.html - didFinishLoading
 http://255.255.255.255:1/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:1/test.jpg">
 http://255.255.255.255:7/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:7/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 http://255.255.255.255:7/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:7/test.jpg">
index be6d782..95e0a0a 100644 (file)
@@ -1,5 +1,5 @@
 http://255.255.255.255/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255/test.jpg, main document URL block-test-no-port.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
+block-test-no-port.html - didFinishLoading
 http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "http://255.255.255.255/test.jpg">
 This test attempts to change the src of an IMG tag to a blocked IP with no port to confirm that WebKit returns the correct error for it - blocked instead of cannot find. Due to the nature of this test, the results can only be processed automatically via DumpRenderTree. In addition, on some systems the results may depend on the behavior of the proxy.
 
index 3c2a8e9..2072da8 100644 (file)
@@ -3,7 +3,7 @@ main frame - didCommitLoadForFrame
 frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
 resources/cache-expired-subresource.webarchive - willSendRequest <NSURLRequest URL resources/cache-expired-subresource.webarchive, main document URL cache-expired-subresource.html, http method GET> redirectResponse (null)
 main frame - didFinishDocumentLoadForFrame
-<unknown> - didFinishLoading
+cache-expired-subresource.html - didFinishLoading
 resources/cache-expired-subresource.webarchive - didReceiveResponse <NSURLResponse resources/cache-expired-subresource.webarchive, http status code 0>
 frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
 http://localhost/pink-bullet.png - willSendRequest <NSURLRequest URL http://localhost/pink-bullet.png, main document URL cache-expired-subresource.html, http method GET> redirectResponse (null)
index 6d03cd2..f351c2e 100644 (file)
@@ -3,7 +3,7 @@ main frame - didCommitLoadForFrame
 frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
 resources/helloworld.webarchive - willSendRequest <NSURLRequest URL resources/helloworld.webarchive, main document URL test-loading-archive.html, http method GET> redirectResponse (null)
 main frame - didFinishDocumentLoadForFrame
-<unknown> - didFinishLoading
+test-loading-archive.html - didFinishLoading
 resources/helloworld.webarchive - didReceiveResponse <NSURLResponse resources/helloworld.webarchive, http status code 0>
 frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
 frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
index 54bbc92..db3874a 100644 (file)
@@ -3,7 +3,7 @@ main frame - didCommitLoadForFrame
 frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
 resources/subresource-null-mimetype.webarchive - willSendRequest <NSURLRequest URL resources/subresource-null-mimetype.webarchive, main document URL test-loading-archive-subresource-null-mimetype.html, http method GET> redirectResponse (null)
 main frame - didFinishDocumentLoadForFrame
-<unknown> - didFinishLoading
+test-loading-archive-subresource-null-mimetype.html - didFinishLoading
 resources/subresource-null-mimetype.webarchive - didReceiveResponse <NSURLResponse resources/subresource-null-mimetype.webarchive, http status code 0>
 frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
 test.png - willSendRequest <NSURLRequest URL test.png, main document URL test-loading-archive-subresource-null-mimetype.html, http method GET> redirectResponse (null)
index 4c7b3d9..5625ea3 100644 (file)
@@ -1,3 +1,24 @@
+2013-08-09  Alexey Proskuryakov  <ap@apple.com>
+
+        <unknown> is often dumped instead of path in test output
+        https://bugs.webkit.org/show_bug.cgi?id=119590
+
+        Reviewed by Anders Carlsson.
+
+        There were two reasons for <unknown>:
+        1. When delegate logging is enabled via a testRunner call, that obviously happens
+        after main resource load starts, so we don't record its URL.
+        2. Authentication delegate logging relied on URL recording, but it's only turned on
+        when enabling resource loading delegate logging, not auth one.
+
+        URL recording was made conditional in <http://trac.webkit.org/r19316>, which was
+        landed without posted rationale and unreviewed. Just undoing that change now.
+
+        * DumpRenderTree/mac/ResourceLoadDelegate.mm:
+        (-[ResourceLoadDelegate webView:identifierForInitialRequest:fromDataSource:]):
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::InjectedBundlePage::didInitiateLoadForResource):
+
 2013-08-08  Alex Christensen  <achristensen@apple.com>
 
         Windows build fixes.
index 0f558ee..7cf0b8e 100644 (file)
@@ -121,7 +121,7 @@ using namespace std;
 {
     ASSERT([[dataSource webFrame] dataSource] || [[dataSource webFrame] provisionalDataSource]);
 
-    if (!done && gTestRunner->dumpResourceLoadCallbacks())
+    if (!done)
         return [[request URL] _drt_descriptionSuitableForTestResult];
 
     return @"<unknown>";
index 932367f..f40adef 100644 (file)
@@ -1050,9 +1050,6 @@ void InjectedBundlePage::didInitiateLoadForResource(WKBundlePageRef page, WKBund
     if (!InjectedBundle::shared().isTestRunning())
         return;
 
-    if (!InjectedBundle::shared().testRunner()->shouldDumpResourceLoadCallbacks())
-        return;
-
     WKRetainPtr<WKURLRef> url = adoptWK(WKURLRequestCopyURL(request));
     assignedUrlsCache.add(identifier, pathSuitableForTestResult(url.get()));
 }