44702 2010-08-26 11:56:45 -0700 Make it possible for http tests to log resource requests 2010-08-26 13:16:03 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser ap oldest_to_newest 270012 0 simon.fraser 2010-08-26 11:56:45 -0700 For bug 24223, I need to be able to log individual resource requests. 270032 1 65599 simon.fraser 2010-08-26 12:33:44 -0700 Created attachment 65599 Patch 270057 2 65599 ap 2010-08-26 13:02:51 -0700 Comment on attachment 65599 Patch > +main frame - didStartProvisionalLoadForFrame > +main frame - didCommitLoadForFrame > +main frame - didFinishDocumentLoadForFrame > +main frame - didHandleOnloadEventsForFrame > +main frame - didFinishLoadForFrame It seems like this test needn't be in loading subdirectory - or we need a way to avoid this noise output. + generateNoCacheHTTPHeader(); + header("Last-Modified: " . gmdate("D, d M Y H:i:s T", filemtime($resourceLogFile))); Why bother with Last-Modified if the response not cacheable? r=me. 270068 3 simon.fraser 2010-08-26 13:16:03 -0700 http://trac.webkit.org/changeset/66128 65599 2010-08-26 12:33:44 -0700 2010-08-26 13:02:51 -0700 Patch bug-44702-20100826123343.patch text/plain 7041 simon.fraser ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwYjUzNzUyYjdlZTU1ZDZjNTQ3NWFhOTRmZjJjMTU0NWQ2MzA0YmMyLi4xMGI0YWU4 M2Y0OTUwYTYzZmU5ODZmNTkzNmRjNzdhODhjMGE1YTkyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAK KzIwMTAtMDgtMjYgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBpdCBwb3Nz aWJsZSBmb3IgaHR0cCB0ZXN0cyB0byBsb2cgcmVzb3VyY2UgcmVxdWVzdHMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0NzAyCisgICAgICAgIAorICAg ICAgICBFbmhhbmNlIG5ldHdvcmstc2ltdWxhdG9yLnBocCB0byBiZSBhYmxlIHRvIGxvZyByZXNv dXJjZQorICAgICAgICByZXF1ZXN0cyB0byBhIGZpbGUsIGFuZCB0aGVuIHJldHVybiB0aGUgbGlz dCBvZiByZXF1ZXN0cy4KKyAgICAgICAgCisgICAgICAgIFRlc3Qgd2l0aCBhIG5ldyBsb2FkaW5n IHRlc3QgdGhhdCBsb2dzIENTUy1yZWxhdGVkIGltYWdlIHJlcXVlc3RzLgorICAgICAgICAKKyAg ICAgICAgKiBodHRwL3Rlc3RzL2xvYWRpbmcvY3NzLWltYWdlLWxvYWRpbmctZXhwZWN0ZWQudHh0 OiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL2xvYWRpbmcvY3NzLWltYWdlLWxvYWRpbmcu aHRtbDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9sb2FkaW5nL3Jlc291cmNlcy9yZXF1 ZXN0LWxvZ2dpbmcuanM6IEFkZGVkLgorICAgICAgICAoQ2FsbENvbW1hbmQpOgorICAgICAgICAo c3RhcnRUZXN0KToKKyAgICAgICAgKGVuZFRlc3QpOgorICAgICAgICAoZ2V0UmVzb3VyY2VMb2cp OgorICAgICAgICAqIGh0dHAvdGVzdHMvcmVzb3VyY2VzL25ldHdvcmstc2ltdWxhdG9yLnBocDoK KwogMjAxMC0wOC0yNiAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlciBhbmQgTWFjaWVqIFN0YWNob3dpYWsuCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2xvYWRpbmcvY3NzLWltYWdlLWxvYWRp bmctZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9sb2FkaW5nL2Nzcy1pbWFn ZS1sb2FkaW5nLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zZGNmZDUzZDM1YTEyOWRhMDEwOTk2 NTQ2OTE5YjMzODNkNGJlY2U0Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90 ZXN0cy9sb2FkaW5nL2Nzcy1pbWFnZS1sb2FkaW5nLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDE2 IEBACittYWluIGZyYW1lIC0gZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZQorbWFpbiBm cmFtZSAtIGRpZENvbW1pdExvYWRGb3JGcmFtZQorbWFpbiBmcmFtZSAtIGRpZEZpbmlzaERvY3Vt ZW50TG9hZEZvckZyYW1lCittYWluIGZyYW1lIC0gZGlkSGFuZGxlT25sb2FkRXZlbnRzRm9yRnJh bWUKK21haW4gZnJhbWUgLSBkaWRGaW5pc2hMb2FkRm9yRnJhbWUKK2l0ZW0KK1Jlc291cmNlIHJl cXVlc3RzOgorCisKK2JhY2tncm91bmQxLmpwZworYmFja2dyb3VuZDIuanBnCitjb250ZW50LWlt YWdlMS5qcGcKK2NvbnRlbnQtaW1hZ2UyLmpwZworY29udGVudC1pbWFnZTMuanBnCitsaXN0LWlt YWdlMS5qcGcKK2xpc3QtaW1hZ2UyLmpwZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90 ZXN0cy9sb2FkaW5nL2Nzcy1pbWFnZS1sb2FkaW5nLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL2xvYWRpbmcvY3NzLWltYWdlLWxvYWRpbmcuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43ZWQxMzQxNjE3 ODFiZWFkNDg3YWVmNWUzNTE1ZjM5ZmQ5N2U2NzBiCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9sb2FkaW5nL2Nzcy1pbWFnZS1sb2FkaW5nLmh0bWwKQEAgLTAsMCAr MSw0MyBAQAorPGh0bWw+Cis8aGVhZD4KKyAgPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBl IiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9VVRGLTgiPgorICA8c2NyaXB0IHNyYz0icmVz b3VyY2VzL3JlcXVlc3QtbG9nZ2luZy5qcyIgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBjaGFyc2V0 PSJ1dGYtOCI+PC9zY3JpcHQ+CisKKyAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KKyAgICAuYm94 IHsKKyAgICAgIGhlaWdodDogMTAwcHg7CisgICAgICB3aWR0aDogMTAwcHg7CisgICAgICBiYWNr Z3JvdW5kLWltYWdlOiB1cmwoIi9yZXNvdXJjZXMvbmV0d29yay1zaW11bGF0b3IucGhwP2NvbW1h bmQ9bG9nLXJlc291cmNlLXJlcXVlc3QmcGF0aD1iYWNrZ3JvdW5kMS5qcGciKTsKKyAgICB9Cisg ICAgCisgICAgLmJhY2tncm91bmQgeworICAgICAgYmFja2dyb3VuZC1pbWFnZTogdXJsKCIvcmVz b3VyY2VzL25ldHdvcmstc2ltdWxhdG9yLnBocD9jb21tYW5kPWxvZy1yZXNvdXJjZS1yZXF1ZXN0 JnBhdGg9YmFja2dyb3VuZDIuanBnIik7CisgICAgfQorICAgIAorICAgIC5jb250ZW50IHsKKyAg ICAgIGNvbnRlbnQ6IHVybCgiL3Jlc291cmNlcy9uZXR3b3JrLXNpbXVsYXRvci5waHA/Y29tbWFu ZD1sb2ctcmVzb3VyY2UtcmVxdWVzdCZwYXRoPWNvbnRlbnQtaW1hZ2UxLmpwZyIpOworICAgIH0K KworICAgIC50ZXN0IHsKKyAgICAgIGNvbnRlbnQ6IHVybCgiL3Jlc291cmNlcy9uZXR3b3JrLXNp bXVsYXRvci5waHA/Y29tbWFuZD1sb2ctcmVzb3VyY2UtcmVxdWVzdCZwYXRoPWNvbnRlbnQtaW1h Z2UyLmpwZyIpICJmb29weSIgdXJsKCIvcmVzb3VyY2VzL25ldHdvcmstc2ltdWxhdG9yLnBocD9j b21tYW5kPWxvZy1yZXNvdXJjZS1yZXF1ZXN0JnBhdGg9Y29udGVudC1pbWFnZTMuanBnIik7Cisg ICAgfQorICAgIAorICAgIHVsIHsKKyAgICAgIGxpc3Qtc3R5bGUtaW1hZ2U6IHVybCgiL3Jlc291 cmNlcy9uZXR3b3JrLXNpbXVsYXRvci5waHA/Y29tbWFuZD1sb2ctcmVzb3VyY2UtcmVxdWVzdCZw YXRoPWxpc3QtaW1hZ2UxLmpwZyIpOworICAgIH0KKyAgICAubGlzdCB7CisgICAgICBsaXN0LXN0 eWxlLWltYWdlOiB1cmwoIi9yZXNvdXJjZXMvbmV0d29yay1zaW11bGF0b3IucGhwP2NvbW1hbmQ9 bG9nLXJlc291cmNlLXJlcXVlc3QmcGF0aD1saXN0LWltYWdlMi5qcGciKTsKKyAgICB9CisgICAg CisgIDwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKworICA8ZGl2IGNsYXNzPSJib3ggYmFja2dy b3VuZCI+PC9kaXY+CisgIDxkaXYgY2xhc3M9ImNvbnRlbnQgdGVzdCI+PC9kaXY+CisgIDx1bCBj bGFzcz0ibGlzdCI+PGxpPml0ZW08L2xpPjwvZGl2PgorCisgIDxoMj5SZXNvdXJjZSByZXF1ZXN0 czo8L2gyPgorICA8cHJlIGlkPSJyZXN1bHQiPlJlcXVlc3QgbG9nIGdvZXMgaGVyZSBpbiBEUlQ8 L3ByZT4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVz dHMvbG9hZGluZy9yZXNvdXJjZXMvcmVxdWVzdC1sb2dnaW5nLmpzIGIvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9sb2FkaW5nL3Jlc291cmNlcy9yZXF1ZXN0LWxvZ2dpbmcuanMKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u OTQ5MWM2MTI1ZWE2Zjg0YWEzNDE1MzU0MDllMDIzMmQyMGZmYTJkZgotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbG9hZGluZy9yZXNvdXJjZXMvcmVxdWVzdC1sb2dn aW5nLmpzCkBAIC0wLDAgKzEsNDEgQEAKK2Z1bmN0aW9uIENhbGxDb21tYW5kKGNtZCkKK3sKKyB0 cnkgeworICAgICB2YXIgcmVxID0gbmV3IFhNTEh0dHBSZXF1ZXN0OworICAgICByZXEub3Blbigi R0VUIiwgIi9yZXNvdXJjZXMvbmV0d29yay1zaW11bGF0b3IucGhwP2NvbW1hbmQ9IiArIGNtZCwg ZmFsc2UpOworICAgICByZXEuc2VuZChudWxsKTsKKyAgICAgcmV0dXJuIHJlcS5yZXNwb25zZVRl eHQ7CisgfSBjYXRjaCAoZXgpIHsKKyAgICAgcmV0dXJuICIiOworIH0KK30KKworZnVuY3Rpb24g c3RhcnRUZXN0KCkKK3sKKyAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7Cisg ICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKyAgICAgICAgbGF5b3V0 VGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9uZSgpOworICAgIH0KKyAKKyAgICB3aW5kb3cuc2V0 VGltZW91dChlbmRUZXN0LCAwKTsKK30KKworZnVuY3Rpb24gZW5kVGVzdCgpCit7CisgICAgZ2V0 UmVzb3VyY2VMb2coKTsKKyAgICBDYWxsQ29tbWFuZCgiY2xlYXItcmVzb3VyY2UtcmVxdWVzdC1s b2ciKTsKKworICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgIGxh eW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoKTsKK30KKworZnVuY3Rpb24gZ2V0UmVzb3Vy Y2VMb2coKQoreworICAgIHZhciBsb2cgPSBDYWxsQ29tbWFuZCgiZ2V0LXJlc291cmNlLXJlcXVl c3QtbG9nIik7CisgICAgdmFyIGxvZ0xpbmVzID0gbG9nLnNwbGl0KCdcbicpOworICAgIGxvZ0xp bmVzLnNvcnQoKTsKKyAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgncmVzdWx0JykuaW5uZXJU ZXh0ID0gbG9nTGluZXMuam9pbignXG4nKTsKK30KKworQ2FsbENvbW1hbmQoInN0YXJ0LXJlc291 cmNlLXJlcXVlc3QtbG9nIik7Cit3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcignbG9hZCcsIHN0YXJ0 VGVzdCwgZmFsc2UpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9yZXNvdXJj ZXMvbmV0d29yay1zaW11bGF0b3IucGhwIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9yZXNvdXJj ZXMvbmV0d29yay1zaW11bGF0b3IucGhwCmluZGV4IDNmMTIwMWY1YjI5NTJkM2JjMGE2NjgzYmFj ZDU1OTNiMWM4NTcwOTkuLjZkN2VmNWM2ZWMwMmVjNjFmMTAzM2E2YjkwMzAwYzIxODUxNTBlNTkg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvcmVzb3VyY2VzL25ldHdvcmstc2lt dWxhdG9yLnBocAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3Jlc291cmNlcy9uZXR3b3Jr LXNpbXVsYXRvci5waHAKQEAgLTEyMCw2ICsxMjAsMzkgQEAgZnVuY3Rpb24gaGFuZGxlR2V0UmVz b3VyY2VDb3VudENvbW1hbmQoJHBhdGgpCiAgICAgfQogfQogCitmdW5jdGlvbiBoYW5kbGVTdGFy dFJlc291cmNlUmVxdWVzdHNMb2coKQoreworICAgICRyZXNvdXJjZUxvZ0ZpbGUgPSBzeXNfZ2V0 X3RlbXBfZGlyKCkgLiAiL3Jlc291cmNlLWxvZyI7CisgICAgZmlsZV9wdXRfY29udGVudHMoJHJl c291cmNlTG9nRmlsZSwgICIiKTsKK30KKworZnVuY3Rpb24gaGFuZGxlQ2xlYXJSZXNvdXJjZVJl cXVlc3RzTG9nKCkKK3sKKyAgICAkcmVzb3VyY2VMb2dGaWxlID0gc3lzX2dldF90ZW1wX2Rpcigp IC4gIi9yZXNvdXJjZS1sb2ciOworICAgIGZpbGVfcHV0X2NvbnRlbnRzKCRyZXNvdXJjZUxvZ0Zp bGUsICIiKTsKK30KKworZnVuY3Rpb24gaGFuZGxlR2V0UmVzb3VyY2VSZXF1ZXN0c0xvZygpCit7 CisgICAgJHJlc291cmNlTG9nRmlsZSA9IHN5c19nZXRfdGVtcF9kaXIoKSAuICIvcmVzb3VyY2Ut bG9nIjsKKworICAgIGdlbmVyYXRlTm9DYWNoZUhUVFBIZWFkZXIoKTsKKyAgICBoZWFkZXIoIkxh c3QtTW9kaWZpZWQ6ICIgLiBnbWRhdGUoIkQsIGQgTSBZIEg6aTpzIFQiLCBmaWxlbXRpbWUoJHJl c291cmNlTG9nRmlsZSkpKTsKKyAgICBoZWFkZXIoIkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbiIp OworCisgICAgcHJpbnQgZmlsZV9nZXRfY29udGVudHMoJHJlc291cmNlTG9nRmlsZSk7Cit9CisK K2Z1bmN0aW9uIGhhbmRsZUxvZ1Jlc291cmNlUmVxdWVzdCgkcGF0aCkKK3sKKyAgICAkcmVzb3Vy Y2VMb2dGaWxlID0gc3lzX2dldF90ZW1wX2RpcigpIC4gIi9yZXNvdXJjZS1sb2ciOworICAgIAor ICAgICRuZXdEYXRhID0gIlxuIi4kcGF0aDsKKyAgICAvLyBEb2N1bWVudGF0aW9uIHNheXMgdGhh dCBhcHBlbmRzIGFyZSBhdG9taWMuCisgICAgZmlsZV9wdXRfY29udGVudHMoJHJlc291cmNlTG9n RmlsZSwgJG5ld0RhdGEsIEZJTEVfQVBQRU5EKTsKKyAgICBnZW5lcmF0ZVJlc3BvbnNlKCRwYXRo KTsKK30KKwogJHN0YXRlRmlsZSA9IHN5c19nZXRfdGVtcF9kaXIoKSAuICIvbmV0d29yay1zaW11 bGF0b3Itc3RhdGUiOwogJGNvbW1hbmQgPSAkX0dFVFsnY29tbWFuZCddOwogaWYgKCRjb21tYW5k KSB7CkBAIC0xMzMsNiArMTY2LDE0IEBAIGlmICgkY29tbWFuZCkgewogICAgICAgICBoYW5kbGVS ZXNldFJlc291cmNlQ291bnRDb21tYW5kKCk7CiAgICAgZWxzZSBpZiAoJGNvbW1hbmQgPT0gImdl dC1yZXNvdXJjZS1jb3VudCIpCiAgICAgICAgIGhhbmRsZUdldFJlc291cmNlQ291bnRDb21tYW5k KCRfR0VUWydwYXRoJ10pOworICAgIGVsc2UgaWYgKCRjb21tYW5kID09ICJzdGFydC1yZXNvdXJj ZS1yZXF1ZXN0LWxvZyIpCisgICAgICAgIGhhbmRsZVN0YXJ0UmVzb3VyY2VSZXF1ZXN0c0xvZygp OworICAgIGVsc2UgaWYgKCRjb21tYW5kID09ICJjbGVhci1yZXNvdXJjZS1yZXF1ZXN0LWxvZyIp CisgICAgICAgIGhhbmRsZUNsZWFyUmVzb3VyY2VSZXF1ZXN0c0xvZygpOworICAgIGVsc2UgaWYg KCRjb21tYW5kID09ICJnZXQtcmVzb3VyY2UtcmVxdWVzdC1sb2ciKQorICAgICAgICBoYW5kbGVH ZXRSZXNvdXJjZVJlcXVlc3RzTG9nKCk7CisgICAgZWxzZSBpZiAoJGNvbW1hbmQgPT0gImxvZy1y ZXNvdXJjZS1yZXF1ZXN0IikKKyAgICAgICAgaGFuZGxlTG9nUmVzb3VyY2VSZXF1ZXN0KCRfR0VU WydwYXRoJ10pOwogICAgIGVsc2UKICAgICAgICAgZWNobyAiVW5rbm93biBjb21tYW5kOiAiIC4g JGNvbW1hbmQgLiAiXG4iOwogICAgIGV4aXQoKTsK