48773 2010-11-01 12:05:44 -0700 Web Inspector: use mimeType from cached resource in case response data contains none. 2010-11-02 03:32:21 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 302830 0 pfeldman 2010-11-01 12:05:44 -0700 For 304 Not Modified resources, response does not contain the mimeType data. Use the one from CachedResource in such cases. 302836 1 joepeck 2010-11-01 12:16:01 -0700 Someone just opened the following a few days ago: <http://webkit.org/b/48525> Web Inspector: Incorrectly reports warning on missing/incorrect content-type for 304s Is this a duplicate? 302839 2 72539 pfeldman 2010-11-01 12:19:20 -0700 Created attachment 72539 [PATCH] Proposed fix. 302840 3 pfeldman 2010-11-01 12:21:41 -0700 Hard to tell since the original report references localhost :) But we have good chances of fixing that issue once this patch lands. 302892 4 72550 pfeldman 2010-11-01 13:43:29 -0700 Created attachment 72550 [PATCH] A cleaner patch. 302949 5 72550 joepeck 2010-11-01 14:44:21 -0700 Comment on attachment 72550 [PATCH] A cleaner patch. lol, I was just going to suggest that exact change after looking at your first patch. Thanks for making it clearer. You could save a null check by moving this into the "if (cachedResource)" block above, but this is very readable. 302953 6 joepeck 2010-11-01 14:46:49 -0700 Oh, and it would be awesome if you could check if this fixes bug 48525 after landing. 303292 7 72550 pfeldman 2010-11-02 03:32:12 -0700 Comment on attachment 72550 [PATCH] A cleaner patch. Committing to http://svn.webkit.org/repository/webkit/trunk M WebCore/ChangeLog M WebCore/inspector/InspectorResourceAgent.cpp M WebCore/inspector/front-end/NetworkPanel.js Committed r71108 72539 2010-11-01 12:19:20 -0700 2010-11-01 13:43:29 -0700 [PATCH] Proposed fix. mimeType text/plain 2622 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NjdjYmEwMC4uYTdiYjg0NyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwxOSBAQAogCiAgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHVzZSBtaW1lVHlwZSBmcm9t IGNhY2hlZCByZXNvdXJjZQorICAgICAgICBpbiBjYXNlIHJlc3BvbnNlIGRhdGEgY29udGFpbnMg bm9uZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4 NzczCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpkaWRSZWNlaXZlUmVzcG9u c2UpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5cGUuX2NyZWF0ZVRhYmxlKToK KworMjAxMC0xMS0wMSAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBXZWIgSW5zcGVj dG9yOiBoaWdobGlnaHQgZnJhbWUgb24gaG92ZXIgaW4gcmVzb3VyY2VzIHBhbmVsLgogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDg3NjAKIApkaWZmIC0t Z2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAgYi9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcAppbmRleCAyZTk2NWI2Li5i MGY1ZjIwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFn ZW50LmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNw cApAQCAtMzAxLDYgKzMwMSwxMyBAQCB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmRpZFJl Y2VpdmVSZXNwb25zZSh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIERvY3VtZQogCiAgICAgICAg ICAgICBpZiAoZXF1YWxJZ25vcmluZ0ZyYWdtZW50SWRlbnRpZmllcihyZXNwb25zZS51cmwoKSwg bG9hZGVyLT51cmwoKSkgJiYgdHlwZSA9PSAiT3RoZXIiKQogICAgICAgICAgICAgICAgIHR5cGUg PSAiRG9jdW1lbnQiOworCisgICAgICAgICAgICAvLyBVc2UgbWltZSB0eXBlIGZyb20gY2FjaGVk IHJlc291cmNlIGluIGNhc2UgdGhlIG9uZSBpbiByZXNwb25zZSBpcyBlbXB0eS4KKyAgICAgICAg ICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlc291cmNlUmVzcG9uc2UgPSBidWlsZE9iamVj dEZvclJlc291cmNlUmVzcG9uc2UocmVzcG9uc2UpOworICAgICAgICAgICAgaWYgKHJlc3BvbnNl Lm1pbWVUeXBlKCkuaXNFbXB0eSgpICYmIGNhY2hlZFJlc291cmNlKQorICAgICAgICAgICAgICAg IHJlc291cmNlUmVzcG9uc2UtPnNldFN0cmluZygibWltZVR5cGUiLCBjYWNoZWRSZXNvdXJjZS0+ cmVzcG9uc2UoKS5taW1lVHlwZSgpKTsKKyAgICAgICAgICAgIG1fZnJvbnRlbmQtPmRpZFJlY2Vp dmVSZXNwb25zZShpZGVudGlmaWVyLCBjdXJyZW50VGltZSgpLCB0eXBlLCByZXNvdXJjZVJlc3Bv bnNlKTsKKyAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgIH0KICAgICBtX2Zyb250 ZW5kLT5kaWRSZWNlaXZlUmVzcG9uc2UoaWRlbnRpZmllciwgY3VycmVudFRpbWUoKSwgdHlwZSwg YnVpbGRPYmplY3RGb3JSZXNvdXJjZVJlc3BvbnNlKHJlc3BvbnNlKSk7CmRpZmYgLS1naXQgYS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzIGIvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwppbmRleCBjZGE2NWIxLi5hNzE3YzM0IDEw MDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCisr KyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMKQEAgLTE5Miw3 ICsxOTIsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAg ICAgY29sdW1ucy5zaXplLndpZHRoID0gIjEwJSI7CiAgICAgICAgIGNvbHVtbnMuc2l6ZS5hbGln bmVkID0gInJpZ2h0IjsKIAotICAgICAgICBjb2x1bW5zLnRpbWUudGl0bGVET01GcmFnbWVudCA9 IHRoaXMuX21ha2VIZWFkZXJGcmFnbWVudChXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRpbWUiKSwg V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEdXJhdGlvbiIpKTsKKyAgICAgICAgY29sdW1ucy50aW1l LnRpdGxlRE9NRnJhZ21lbnQgPSB0aGlzLl9tYWtlSGVhZGVyRnJhZ21lbnQoV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJUaW1lIiksIFdlYkluc3BlY3Rvci5VSVN0cmluZygiTGF0ZW5jeSIpKTsKICAg ICAgICAgY29sdW1ucy50aW1lLnNvcnRhYmxlID0gdHJ1ZTsKICAgICAgICAgY29sdW1ucy50aW1l LndpZHRoID0gIjEwJSI7CiAgICAgICAgIGNvbHVtbnMudGltZS5hbGlnbmVkID0gInJpZ2h0IjsK 72550 2010-11-01 13:43:29 -0700 2010-11-02 03:32:12 -0700 [PATCH] A cleaner patch. mime-type text/plain 2987 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZWE3NTllMi4uMDA4Y2YzMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0xMS0wMSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiB1c2UgbWltZVR5cGUgZnJvbSBjYWNo ZWQgcmVzb3VyY2UKKyAgICAgICAgaW4gY2FzZSByZXNwb25zZSBkYXRhIGNvbnRhaW5zIG5vbmUu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00ODc3Mwor CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZGlkUmVjZWl2ZVJlc3BvbnNlKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwucHJvdG90eXBlLl9jcmVhdGVUYWJsZSk6CisKIDIw MTAtMTEtMDEgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgQWRhbSBSb2Jlbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y UmVzb3VyY2VBZ2VudC5jcHAKaW5kZXggZWM1MGUxMi4uZWM3MGI4YiAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKKysrIGIvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKQEAgLTI5MSw2ICsyOTEsNyBAQCB2 b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6Om1hcmtSZXNvdXJjZUFzQ2FjaGVkKHVuc2lnbmVk IGxvbmcgaWRlbnRpZmllcikKIAogdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpkaWRSZWNl aXZlUmVzcG9uc2UodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1bWVudExvYWRlciogbG9h ZGVyLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKIHsKKyAgICBSZWZQdHI8SW5z cGVjdG9yT2JqZWN0PiByZXNvdXJjZVJlc3BvbnNlID0gYnVpbGRPYmplY3RGb3JSZXNvdXJjZVJl c3BvbnNlKHJlc3BvbnNlKTsKICAgICBTdHJpbmcgdHlwZSA9ICJPdGhlciI7CiAgICAgaWYgKGxv YWRlcikgewogICAgICAgICBpZiAoZXF1YWxJZ25vcmluZ0ZyYWdtZW50SWRlbnRpZmllcihyZXNw b25zZS51cmwoKSwgbG9hZGVyLT5mcmFtZUxvYWRlcigpLT5pY29uVVJMKCkpKQpAQCAtMzAyLDkg KzMwMywxMyBAQCB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmRpZFJlY2VpdmVSZXNwb25z ZSh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIERvY3VtZQogCiAgICAgICAgICAgICBpZiAoZXF1 YWxJZ25vcmluZ0ZyYWdtZW50SWRlbnRpZmllcihyZXNwb25zZS51cmwoKSwgbG9hZGVyLT51cmwo KSkgJiYgdHlwZSA9PSAiT3RoZXIiKQogICAgICAgICAgICAgICAgIHR5cGUgPSAiRG9jdW1lbnQi OworCisgICAgICAgICAgICAvLyBVc2UgbWltZSB0eXBlIGZyb20gY2FjaGVkIHJlc291cmNlIGlu IGNhc2UgdGhlIG9uZSBpbiByZXNwb25zZSBpcyBlbXB0eS4KKyAgICAgICAgICAgIGlmIChyZXNw b25zZS5taW1lVHlwZSgpLmlzRW1wdHkoKSAmJiBjYWNoZWRSZXNvdXJjZSkKKyAgICAgICAgICAg ICAgICByZXNvdXJjZVJlc3BvbnNlLT5zZXRTdHJpbmcoIm1pbWVUeXBlIiwgY2FjaGVkUmVzb3Vy Y2UtPnJlc3BvbnNlKCkubWltZVR5cGUoKSk7CiAgICAgICAgIH0KICAgICB9Ci0gICAgbV9mcm9u dGVuZC0+ZGlkUmVjZWl2ZVJlc3BvbnNlKGlkZW50aWZpZXIsIGN1cnJlbnRUaW1lKCksIHR5cGUs IGJ1aWxkT2JqZWN0Rm9yUmVzb3VyY2VSZXNwb25zZShyZXNwb25zZSkpOworICAgIG1fZnJvbnRl bmQtPmRpZFJlY2VpdmVSZXNwb25zZShpZGVudGlmaWVyLCBjdXJyZW50VGltZSgpLCB0eXBlLCBy ZXNvdXJjZVJlc3BvbnNlKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpkaWRS ZWNlaXZlQ29udGVudExlbmd0aCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGludCBsZW5ndGhS ZWNlaXZlZCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3Jr UGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCmlu ZGV4IGNkYTY1YjEuLmE3MTdjMzQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9OZXR3b3JrUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05l dHdvcmtQYW5lbC5qcwpAQCAtMTkyLDcgKzE5Miw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrUGFu ZWwucHJvdG90eXBlID0gewogICAgICAgICBjb2x1bW5zLnNpemUud2lkdGggPSAiMTAlIjsKICAg ICAgICAgY29sdW1ucy5zaXplLmFsaWduZWQgPSAicmlnaHQiOwogCi0gICAgICAgIGNvbHVtbnMu dGltZS50aXRsZURPTUZyYWdtZW50ID0gdGhpcy5fbWFrZUhlYWRlckZyYWdtZW50KFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiVGltZSIpLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkR1cmF0aW9uIikp OworICAgICAgICBjb2x1bW5zLnRpbWUudGl0bGVET01GcmFnbWVudCA9IHRoaXMuX21ha2VIZWFk ZXJGcmFnbWVudChXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRpbWUiKSwgV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJMYXRlbmN5IikpOwogICAgICAgICBjb2x1bW5zLnRpbWUuc29ydGFibGUgPSB0cnVl OwogICAgICAgICBjb2x1bW5zLnRpbWUud2lkdGggPSAiMTAlIjsKICAgICAgICAgY29sdW1ucy50 aW1lLmFsaWduZWQgPSAicmlnaHQiOwo=