31868 2009-11-25 06:26:31 -0800 Web Inspector: Load InspectorResource mime type from CachedResource for 304 response 2009-11-25 08:15:59 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 apavlov webkit-unassigned bweinstein commit-queue joepeck pfeldman pmuellr rik timothy oldest_to_newest 166413 0 apavlov 2009-11-25 06:26:31 -0800 Currently, the mime type of cached resources is provided to the InspectorController in ResourceResponses (coming directly from the CFNetwork library). Since WebCore issues an "If-Modified-Since" request header, it is supposed to know the actual resource data it tries to revalidate. Other network libraries may fail to provide the revalidated resource mime type in the ResourceResponse, as the "Content-Type" header is absent in the 304 HTTP response, which results in a failure to determine the cached resource mime type in the Web Inspector. 166429 1 43843 apavlov 2009-11-25 07:29:32 -0800 Created attachment 43843 patch 166431 2 43843 pfeldman 2009-11-25 07:34:19 -0800 Comment on attachment 43843 patch > + if (response.httpStatusCode() == 304) { > + CachedResource* cachedResource = cache()->resourceForURL(response.url().string()); > + if (cachedResource) > + m_mimeType = cachedResource->response().mimeType(); > + } Could you do this only in case network stack did not provide this information && 304? 166437 3 43845 apavlov 2009-11-25 07:42:01 -0800 Created attachment 43845 patch (fixed) 166460 4 43845 commit-queue 2009-11-25 08:15:47 -0800 Comment on attachment 43845 patch (fixed) Clearing flags on attachment: 43845 Committed r51385: <http://trac.webkit.org/changeset/51385> 166461 5 commit-queue 2009-11-25 08:15:59 -0800 All reviewed patches have been landed. Closing bug. 43843 2009-11-25 07:29:32 -0800 2009-11-25 07:42:01 -0800 patch contenttype.patch text/plain 2340 apavlov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OTYxMjBjNS4uNTM4MmIxZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwOS0xMS0yNSAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIExvYWQgSW5zcGVjdG9yUmVzb3VyY2UgbWltZSB0eXBlIGZy b20gQ2FjaGVkUmVzb3VyY2UgZm9yIDMwNCByZXNwb25zZXMKKworICAgICAgICBGb3IgbmV0d29y ayBsaWJyYXJpZXMgdGhhdCBkbyBub3QgbWVyZ2UgY2FjaGUgZGF0YSBpbnRvIDMwNCBSZXNvdXJj ZVJlc3BvbnNlcywKKyAgICAgICAgdGhlIG1pbWUgdHlwZSBmb3IgY2FjaGVkIHJlc291cmNlcyBp cyB1bmtub3duLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MzE4NjgKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZTo6dXBkYXRlUmVzcG9uc2UpOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUmVzb3VyY2U6OnVwZGF0ZVNjcmlwdE9iamVjdCk6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZTo6dHlwZSk6CisKIDIwMDktMTEtMjUg IEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGd1c3Rhdm8ubm9yb25oYUBjb2xsYWJvcmEuY28udWs+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWGFuIExvcGV6LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2UuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yUmVzb3VyY2UuY3BwCmluZGV4IDA4NzAyNDAuLmM4NzM0MjAgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JSZXNvdXJjZS5jcHAKQEAgLTEwNSw2ICsxMDUsMTEgQEAgdm9pZCBJbnNwZWN0 b3JSZXNvdXJjZTo6dXBkYXRlUmVzcG9uc2UoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9u c2UpCiB7CiAgICAgbV9leHBlY3RlZENvbnRlbnRMZW5ndGggPSByZXNwb25zZS5leHBlY3RlZENv bnRlbnRMZW5ndGgoKTsKICAgICBtX21pbWVUeXBlID0gcmVzcG9uc2UubWltZVR5cGUoKTsKKyAg ICBpZiAocmVzcG9uc2UuaHR0cFN0YXR1c0NvZGUoKSA9PSAzMDQpIHsKKyAgICAgICAgQ2FjaGVk UmVzb3VyY2UqIGNhY2hlZFJlc291cmNlID0gY2FjaGUoKS0+cmVzb3VyY2VGb3JVUkwocmVzcG9u c2UudXJsKCkuc3RyaW5nKCkpOworICAgICAgICBpZiAoY2FjaGVkUmVzb3VyY2UpCisgICAgICAg ICAgICBtX21pbWVUeXBlID0gY2FjaGVkUmVzb3VyY2UtPnJlc3BvbnNlKCkubWltZVR5cGUoKTsK KyAgICB9CiAgICAgbV9yZXNwb25zZUhlYWRlckZpZWxkcyA9IHJlc3BvbnNlLmh0dHBIZWFkZXJG aWVsZHMoKTsKICAgICBtX3Jlc3BvbnNlU3RhdHVzQ29kZSA9IHJlc3BvbnNlLmh0dHBTdGF0dXND b2RlKCk7CiAgICAgbV9zdWdnZXN0ZWRGaWxlbmFtZSA9IHJlc3BvbnNlLnN1Z2dlc3RlZEZpbGVu YW1lKCk7CkBAIC0xODYsNyArMTkxLDcgQEAgdm9pZCBJbnNwZWN0b3JSZXNvdXJjZTo6dXBkYXRl U2NyaXB0T2JqZWN0KEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCkKICAgICAgICAganNvbk9i amVjdC5zZXQoInR5cGUiLCBzdGF0aWNfY2FzdDxpbnQ+KHR5cGUoKSkpOwogICAgICAgICBqc29u T2JqZWN0LnNldCgiZGlkVHlwZUNoYW5nZSIsIHRydWUpOwogICAgIH0KLSAgICAKKwogICAgIGlm IChtX2NoYW5nZXMuaGFzQ2hhbmdlKExlbmd0aENoYW5nZSkpIHsKICAgICAgICAganNvbk9iamVj dC5zZXQoImNvbnRlbnRMZW5ndGgiLCBtX2xlbmd0aCk7CiAgICAgICAgIGpzb25PYmplY3Quc2V0 KCJkaWRMZW5ndGhDaGFuZ2UiLCB0cnVlKTsKQEAgLTI4MSw5ICsyODYsOSBAQCBJbnNwZWN0b3JS ZXNvdXJjZTo6VHlwZSBJbnNwZWN0b3JSZXNvdXJjZTo6dHlwZSgpIGNvbnN0CiAKICAgICBpZiAo bV9sb2FkZXItPmZyYW1lTG9hZGVyKCkgJiYgbV9yZXF1ZXN0VVJMID09IG1fbG9hZGVyLT5mcmFt ZUxvYWRlcigpLT5pY29uVVJMKCkpCiAgICAgICAgIHJldHVybiBJbWFnZTsKLSAgICAKKwogICAg IHJldHVybiBjYWNoZWRSZXNvdXJjZVR5cGUoKTsKLSAgICAKKwogfQogCiB2b2lkIEluc3BlY3Rv clJlc291cmNlOjpzZXRYTUxIdHRwUmVzcG9uc2VUZXh0KGNvbnN0IFNjcmlwdFN0cmluZyYgZGF0 YSkK 43845 2009-11-25 07:42:01 -0800 2009-11-25 08:15:47 -0800 patch (fixed) contenttype.patch text/plain 2364 apavlov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OTYxMjBjNS4uNTM4MmIxZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwOS0xMS0yNSAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIExvYWQgSW5zcGVjdG9yUmVzb3VyY2UgbWltZSB0eXBlIGZy b20gQ2FjaGVkUmVzb3VyY2UgZm9yIDMwNCByZXNwb25zZXMKKworICAgICAgICBGb3IgbmV0d29y ayBsaWJyYXJpZXMgdGhhdCBkbyBub3QgbWVyZ2UgY2FjaGUgZGF0YSBpbnRvIDMwNCBSZXNvdXJj ZVJlc3BvbnNlcywKKyAgICAgICAgdGhlIG1pbWUgdHlwZSBmb3IgY2FjaGVkIHJlc291cmNlcyBp cyB1bmtub3duLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MzE4NjgKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZTo6dXBkYXRlUmVzcG9uc2UpOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUmVzb3VyY2U6OnVwZGF0ZVNjcmlwdE9iamVjdCk6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZTo6dHlwZSk6CisKIDIwMDktMTEtMjUg IEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGd1c3Rhdm8ubm9yb25oYUBjb2xsYWJvcmEuY28udWs+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWGFuIExvcGV6LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2UuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yUmVzb3VyY2UuY3BwCmluZGV4IDA4NzAyNDAuLjM4MWRmZDUgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JSZXNvdXJjZS5jcHAKQEAgLTEwNSw2ICsxMDUsMTEgQEAgdm9pZCBJbnNwZWN0 b3JSZXNvdXJjZTo6dXBkYXRlUmVzcG9uc2UoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9u c2UpCiB7CiAgICAgbV9leHBlY3RlZENvbnRlbnRMZW5ndGggPSByZXNwb25zZS5leHBlY3RlZENv bnRlbnRMZW5ndGgoKTsKICAgICBtX21pbWVUeXBlID0gcmVzcG9uc2UubWltZVR5cGUoKTsKKyAg ICBpZiAobV9taW1lVHlwZS5pc0VtcHR5KCkgJiYgcmVzcG9uc2UuaHR0cFN0YXR1c0NvZGUoKSA9 PSAzMDQpIHsKKyAgICAgICAgQ2FjaGVkUmVzb3VyY2UqIGNhY2hlZFJlc291cmNlID0gY2FjaGUo KS0+cmVzb3VyY2VGb3JVUkwocmVzcG9uc2UudXJsKCkuc3RyaW5nKCkpOworICAgICAgICBpZiAo Y2FjaGVkUmVzb3VyY2UpCisgICAgICAgICAgICBtX21pbWVUeXBlID0gY2FjaGVkUmVzb3VyY2Ut PnJlc3BvbnNlKCkubWltZVR5cGUoKTsKKyAgICB9CiAgICAgbV9yZXNwb25zZUhlYWRlckZpZWxk cyA9IHJlc3BvbnNlLmh0dHBIZWFkZXJGaWVsZHMoKTsKICAgICBtX3Jlc3BvbnNlU3RhdHVzQ29k ZSA9IHJlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCk7CiAgICAgbV9zdWdnZXN0ZWRGaWxlbmFtZSA9 IHJlc3BvbnNlLnN1Z2dlc3RlZEZpbGVuYW1lKCk7CkBAIC0xODYsNyArMTkxLDcgQEAgdm9pZCBJ bnNwZWN0b3JSZXNvdXJjZTo6dXBkYXRlU2NyaXB0T2JqZWN0KEluc3BlY3RvckZyb250ZW5kKiBm cm9udGVuZCkKICAgICAgICAganNvbk9iamVjdC5zZXQoInR5cGUiLCBzdGF0aWNfY2FzdDxpbnQ+ KHR5cGUoKSkpOwogICAgICAgICBqc29uT2JqZWN0LnNldCgiZGlkVHlwZUNoYW5nZSIsIHRydWUp OwogICAgIH0KLSAgICAKKwogICAgIGlmIChtX2NoYW5nZXMuaGFzQ2hhbmdlKExlbmd0aENoYW5n ZSkpIHsKICAgICAgICAganNvbk9iamVjdC5zZXQoImNvbnRlbnRMZW5ndGgiLCBtX2xlbmd0aCk7 CiAgICAgICAgIGpzb25PYmplY3Quc2V0KCJkaWRMZW5ndGhDaGFuZ2UiLCB0cnVlKTsKQEAgLTI4 MSw5ICsyODYsOSBAQCBJbnNwZWN0b3JSZXNvdXJjZTo6VHlwZSBJbnNwZWN0b3JSZXNvdXJjZTo6 dHlwZSgpIGNvbnN0CiAKICAgICBpZiAobV9sb2FkZXItPmZyYW1lTG9hZGVyKCkgJiYgbV9yZXF1 ZXN0VVJMID09IG1fbG9hZGVyLT5mcmFtZUxvYWRlcigpLT5pY29uVVJMKCkpCiAgICAgICAgIHJl dHVybiBJbWFnZTsKLSAgICAKKwogICAgIHJldHVybiBjYWNoZWRSZXNvdXJjZVR5cGUoKTsKLSAg ICAKKwogfQogCiB2b2lkIEluc3BlY3RvclJlc291cmNlOjpzZXRYTUxIdHRwUmVzcG9uc2VUZXh0 KGNvbnN0IFNjcmlwdFN0cmluZyYgZGF0YSkK