52628 2011-01-18 08:08:07 -0800 Web Inspector: fail resource.requestContent() immediately for WebSocket resources 2011-01-18 09:41:00 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 caseq caseq apavlov bweinstein commit-queue joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 335834 0 caseq 2011-01-18 08:08:07 -0800 Since we do not support content retrieval for resource type of WebSocket and WebSockets are potentially long-living, fail resource.requestContent() immediately to avoid long-lingering requests. 335836 1 79279 caseq 2011-01-18 08:22:26 -0800 Created attachment 79279 patch 335867 2 79279 commit-queue 2011-01-18 09:40:55 -0800 Comment on attachment 79279 patch Clearing flags on attachment: 79279 Committed r76030: <http://trac.webkit.org/changeset/76030> 335868 3 commit-queue 2011-01-18 09:41:00 -0800 All reviewed patches have been landed. Closing bug. 79279 2011-01-18 08:22:26 -0800 2011-01-18 09:40:55 -0800 patch resource-request.diff text/plain 6480 caseq ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiNmJhNzRmLi5hZWM3ODU1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDEt MTggIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBmYWlsIHJl c291cmNlLnJlcXVlc3RDb250ZW50KCkgaW1tZWRpYXRlbHkgZm9yIFdlYlNvY2tldCByZXNvdXJj ZXMKKyAgICAgICAgUmVtb3ZlIHdlYkluc3BlY3Rvci5yZXNvdXJjZXMuVHlwZXMgZnJvbSB0ZXN0 IGV4cGVjdGF0aW9ucy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTUyNjI4CisKKyAgICAgICAgKiBpbnNwZWN0b3IvZXh0ZW5zaW9ucy1hcGktZXhwZWN0 ZWQudHh0OgorCiAyMDExLTAxLTE4ICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRza3kuCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZXh0ZW5zaW9ucy1hcGktZXhwZWN0ZWQudHh0IGIv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMtYXBpLWV4cGVjdGVkLnR4dAppbmRleCAw MzhkYjU5Li4xNjYyZGFkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZXh0ZW5z aW9ucy1hcGktZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNp b25zLWFwaS1leHBlY3RlZC50eHQKQEAgLTM5LDE3ICszOSw2IEBAIFJVTk5JTkcgVEVTVDogZXh0 ZW5zaW9uX3Rlc3RBUEkKICAgICAgICAgICAgIGFkZExpc3RlbmVyIDogPGZ1bmN0aW9uPgogICAg ICAgICAgICAgcmVtb3ZlTGlzdGVuZXIgOiA8ZnVuY3Rpb24+CiAgICAgICAgIH0KLSAgICAgICAg VHlwZXMgOiB7Ci0gICAgICAgICAgICBEb2N1bWVudCA6ICJkb2N1bWVudCIKLSAgICAgICAgICAg IFN0eWxlc2hlZXQgOiAic3R5bGVzaGVldCIKLSAgICAgICAgICAgIEltYWdlIDogImltYWdlIgot ICAgICAgICAgICAgRm9udCA6ICJmb250IgotICAgICAgICAgICAgU2NyaXB0IDogInNjcmlwdCIK LSAgICAgICAgICAgIFhIUiA6ICJ4aHIiCi0gICAgICAgICAgICBNZWRpYSA6ICJtZWRpYSIKLSAg ICAgICAgICAgIFdlYlNvY2tldCA6ICJ3ZWJzb2NrZXQiCi0gICAgICAgICAgICBPdGhlciA6ICJv dGhlciIKLSAgICAgICAgfQogICAgICAgICBnZXRIQVIgOiA8ZnVuY3Rpb24+CiAgICAgICAgIGFk ZFJlcXVlc3RIZWFkZXJzIDogPGZ1bmN0aW9uPgogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4MjlhNDkx Li40NzcwOThiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDEtMTggIEFuZHJl eSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBmYWlsIHJlc291cmNlLnJl cXVlc3RDb250ZW50KCkgaW1tZWRpYXRlbHkgZm9yIFdlYlNvY2tldCByZXNvdXJjZXMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyNjI4CisKKyAgICAg ICAgKiBFbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6IFJlbmFtZSBXZWJTb2NrZXQg LT4gV2ViU29ja2V0cyBpbiByZXNvdXJjZSBjYXRldGVnb3JpZXMgKHJlc3QgYXJlIGluIHBsdXJh bCwgdG9vKQorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpz OiBEbyBub3QgZXhwb3NlIHdlYkluc3BlY3Rvci5yZXNvdXJjZXMuVHlwZXMgaW4gZXh0ZW5zaW9u cyBBUEkgKG9ic29sZXRlKQorICAgICAgICAoV2ViSW5zcGVjdG9yLkV4dGVuc2lvblNlcnZlci5w cm90b3R5cGUuX2J1aWxkRXh0ZW5zaW9uQVBJSW5qZWN0ZWRTY3JpcHQpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVz b3VyY2UuVHlwZS50b1VJU3RyaW5nKTogUmVtb3ZlIFJlc291cmNlVHlwZS5NZWRpYSBhcyBpdCdz IG5vdCB1c2VkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGUudG9TdHJpbmcp OiBkaXR0by4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUucmVxdWVz dENvbnRlbnQpOiBGYWlsIGltbWVkaWF0ZWx5IGZvciBXZWJTb2NrZXQgcmVzb3VyY2VzLgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOiBSZW5hbWUgV2ViU29ja2V0 IC0+IFdlYlNvY2tldHMgaW4gcmVzb3VyY2UgY2F0ZXRlZ29yaWVzIChyZXN0IGFyZSBpbiBwbHVy YWwsIHRvbykKKwogMjAxMS0wMS0xNyAgQW5kcmV5IEtvc3lha292ICA8Y2FzZXFAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRza3kuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggMmY3YzEy MTIzNjk2Y2UxZmJlMThkZGI4NDZlYjhhZTY1MGVmYzhiNy4uN2JkM2RhODlhZDc2YWJhYjlmMDM5 ODIwNGYxYzA4NjNhNDkwNTJkNCAxMDA2NDQKR0lUIGJpbmFyeSBwYXRjaApkZWx0YSAyNApnY21Y PndmJShWOzxfJmQ2OEgqPl45K2pWTFZ4X2JCKndIRWAwRX5rUT9FbkEoCgpkZWx0YSAyMgplY21Y PnlmJSg3JDxfJmQ2Q3BSM0dvQllIXll4QWsyUlpJWWFyVkIzcwoKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25TZXJ2ZXIuanMKaW5kZXggOTYx YzdhMi4uYjk3ZGNkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9FeHRlbnNpb25TZXJ2ZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9FeHRlbnNpb25TZXJ2ZXIuanMKQEAgLTM5Niw3ICszOTYsNiBAQCBXZWJJbnNwZWN0 b3IuRXh0ZW5zaW9uU2VydmVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICJ2YXIgYXBpUHJp dmF0ZSA9IHt9OyIgKwogICAgICAgICAgICAgIigiICsgV2ViSW5zcGVjdG9yLmNvbW1vbkV4dGVu c2lvblN5bWJvbHMudG9TdHJpbmcoKSArICIpKGFwaVByaXZhdGUpOyIgKwogICAgICAgICAgICAg IigiICsgV2ViSW5zcGVjdG9yLmluamVjdGVkRXh0ZW5zaW9uQVBJLnRvU3RyaW5nKCkgKyAiKS5h cHBseSh0aGlzLCBhcmd1bWVudHMpOyIgKwotICAgICAgICAgICAgIndlYkluc3BlY3Rvci5yZXNv dXJjZXMuVHlwZXMgPSAiICsgSlNPTi5zdHJpbmdpZnkocmVzb3VyY2VUeXBlcykgKyAiOyIgKwog ICAgICAgICAgICAgcGxhdGZvcm1BUEkgKwogICAgICAgICAgICAgIn0pIjsKICAgICB9LApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMKaW5kZXggNzM0 MDY0NS4uMDBjMWZiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1Jlc291cmNlLmpzCkBAIC00NCw3ICs0NCw2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBl ID0gewogICAgIEZvbnQ6ICAgICAgIDMsCiAgICAgU2NyaXB0OiAgICAgNCwKICAgICBYSFI6ICAg ICAgICA1LAotICAgIE1lZGlhOiAgICAgIDYsCiAgICAgV2ViU29ja2V0OiAgNywKICAgICBPdGhl cjogICAgICA4LAogCkBAIC02OCw4ICs2Nyw2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBl ID0gewogICAgICAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNjcmlw dCIpOwogICAgICAgICAgICAgY2FzZSB0aGlzLlhIUjoKICAgICAgICAgICAgICAgICByZXR1cm4g V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJYSFIiKTsKLSAgICAgICAgICAgIGNhc2UgdGhpcy5NZWRp YToKLSAgICAgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJNZWRpYSIp OwogICAgICAgICAgICAgY2FzZSB0aGlzLldlYlNvY2tldDoKICAgICAgICAgICAgICAgICByZXR1 cm4gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJXZWJTb2NrZXQiKTsKICAgICAgICAgICAgIGNhc2Ug dGhpcy5PdGhlcjoKQEAgLTk1LDggKzkyLDYgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGUg PSB7CiAgICAgICAgICAgICAgICAgcmV0dXJuICJzY3JpcHQiOwogICAgICAgICAgICAgY2FzZSB0 aGlzLlhIUjoKICAgICAgICAgICAgICAgICByZXR1cm4gInhociI7Ci0gICAgICAgICAgICBjYXNl IHRoaXMuTWVkaWE6Ci0gICAgICAgICAgICAgICAgcmV0dXJuICJtZWRpYSI7CiAgICAgICAgICAg ICBjYXNlIHRoaXMuV2ViU29ja2V0OgogICAgICAgICAgICAgICAgIHJldHVybiAid2Vic29ja2V0 IjsKICAgICAgICAgICAgIGNhc2UgdGhpcy5PdGhlcjoKQEAgLTY2OSw2ICs2NjQsMTMgQEAgV2Vi SW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZSA9IHsKIAogICAgIHJlcXVlc3RDb250ZW50OiBm dW5jdGlvbihjYWxsYmFjaykKICAgICB7CisgICAgICAgIC8vIFdlIGRvIG5vdCBzdXBwb3J0IGNv bnRlbnQgcmV0cmlldmFsIGZvciBXZWJTb2NrZXRzIGF0IHRoZSBtb21lbnQuCisgICAgICAgIC8v IFNpbmNlIFdlYlNvY2tldHMgYXJlIHBvdGVudGlhbGx5IGxvbmctbGl2aW5nLCBmYWlsIHJlcXVl c3RzIGltbWVkaWF0ZWx5CisgICAgICAgIC8vIHRvIHByZXZlbnQgY2FsbGVyIGJsb2NraW5nIHVu dGlsIHJlc291cmNlIGlzIG1hcmtlZCBhcyBmaW5pc2hlZC4KKyAgICAgICAgaWYgKHRoaXMudHlw ZSA9PT0gV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGUuV2ViU29ja2V0KSB7CisgICAgICAgICAg ICBjYWxsYmFjayhudWxsLCBudWxsKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQog ICAgICAgICBpZiAodGhpcy5fY29udGVudCkgewogICAgICAgICAgICAgY2FsbGJhY2sodGhpcy5f Y29udGVudCwgdGhpcy5fY29udGVudEVuY29kZWQpOwogICAgICAgICAgICAgcmV0dXJuOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwppbmRleCA3 OTZjMzczLi4yOTNjNmQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL2luc3BlY3Rvci5qcwpAQCAtNTM0LDcgKzUzNCw3IEBAIFdlYkluc3BlY3Rvci5kb0xvYWRl ZERvbmUgPSBmdW5jdGlvbigpCiAgICAgICAgIHNjcmlwdHM6IG5ldyBXZWJJbnNwZWN0b3IuUmVz b3VyY2VDYXRlZ29yeSgic2NyaXB0cyIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2NyaXB0cyIp LCAicmdiKDI1NSwxMjEsMCkiKSwKICAgICAgICAgeGhyOiBuZXcgV2ViSW5zcGVjdG9yLlJlc291 cmNlQ2F0ZWdvcnkoInhociIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiWEhSIiksICJyZ2IoMjMx LDIzMSwxMCkiKSwKICAgICAgICAgZm9udHM6IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VDYXRl Z29yeSgiZm9udHMiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkZvbnRzIiksICJyZ2IoMjU1LDgy LDYyKSIpLAotICAgICAgICB3ZWJzb2NrZXRzOiBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlQ2F0 ZWdvcnkoIndlYnNvY2tldHMiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIldlYlNvY2tldCIpLCAi cmdiKDE4NiwxODYsMTg2KSIpLCAvLyBGSVhNRTogRGVjaWRlIHRoZSBjb2xvci4KKyAgICAgICAg d2Vic29ja2V0czogbmV3IFdlYkluc3BlY3Rvci5SZXNvdXJjZUNhdGVnb3J5KCJ3ZWJzb2NrZXRz IiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJXZWJTb2NrZXRzIiksICJyZ2IoMTg2LDE4NiwxODYp IiksIC8vIEZJWE1FOiBEZWNpZGUgdGhlIGNvbG9yLgogICAgICAgICBvdGhlcjogbmV3IFdlYklu c3BlY3Rvci5SZXNvdXJjZUNhdGVnb3J5KCJvdGhlciIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygi T3RoZXIiKSwgInJnYigxODYsMTg2LDE4NikiKQogICAgIH07CiAK