155058 2016-03-04 17:34:19 -0800 Fix file mime-types when using NetworkSession 2016-03-05 12:15:30 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen commit-queue oldest_to_newest 1171128 0 achristensen 2016-03-04 17:34:19 -0800 Fix file mime-types when using NetworkSession 1171131 1 273062 achristensen 2016-03-04 17:39:10 -0800 Created attachment 273062 Patch 1171138 2 273062 commit-queue 2016-03-04 19:30:12 -0800 Comment on attachment 273062 Patch Clearing flags on attachment: 273062 Committed r197606: <http://trac.webkit.org/changeset/197606> 1171139 3 commit-queue 2016-03-04 19:30:16 -0800 All reviewed patches have been landed. Closing bug. 1171239 4 273062 darin 2016-03-05 12:15:30 -0800 Comment on attachment 273062 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=273062&action=review > Source/WebKit2/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:100 > + if (shouldContentSniff == WebCore::DoNotSniffContent || url.protocolIs("file")) { At other call sites we use url.isLocalFile() rather than url.protocolIs("file"). I think we should do that here. > Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm:174 > + // Avoid MIME type sniffing if the response comes back as 304 Not Modified. > + int statusCode = [response respondsToSelector:@selector(statusCode)] ? [(id)response statusCode] : 0; > + if (statusCode != 304) > + WebCore::adjustMIMETypeIfNecessary(response._CFURLResponse); Comment is unclear because “adjustMIMETypeIfNecessary” does not seem to be the same thing as “MIME type sniffing”. Maybe we should rename something or change the comment a bit? Is 304 the *only* response where we don’t want to do sniffing? If so, why is it just that one? 273062 2016-03-04 17:39:10 -0800 2016-03-04 19:30:12 -0800 Patch bug-155058-20160304173855.patch text/plain 4587 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NzU5MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE2LTAzLTA0ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IGZpbGUg bWltZS10eXBlcyB3aGVuIHVzaW5nIE5ldHdvcmtTZXNzaW9uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTUwNTgKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGZpeGVzIHBsYXRmb3JtL21hYy9mYXN0 L2xvYWRlci9maWxlLXVybC1taW1ldHlwZXMtMy5odG1sCisgICAgICAgIGFuZCBwbGF0Zm9ybS9t YWMvZmFzdC9sb2FkZXIvZmlsZS11cmwtbWltZXR5cGVzLmh0bWwuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9uZXR3b3JrL21hYy9XZWJDb3JlVVJMUmVzcG9uc2UuaDoKKwogMjAxNi0wMy0wNCAgR2F2 aW4gQmFycmFjbG91Z2ggIDxiYXJyYWNsb3VnaEBhcHBsZS5jb20+CiAKICAgICAgICAgTWF4IG91 dCB0aW1lciB0aHJvdHRsaW5nIGltbWVkaWF0ZWx5IGZvciBwcmUtcmVuZGVyIHBhZ2VzCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9XZWJDb3JlVVJMUmVzcG9uc2Uu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9XZWJD b3JlVVJMUmVzcG9uc2UuaAkocmV2aXNpb24gMTk3NTkwKQorKysgU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9tYWMvV2ViQ29yZVVSTFJlc3BvbnNlLmgJKHdvcmtpbmcgY29weSkKQEAg LTQzLDUgKzQzLDUgQEAgV0VCQ09SRV9FWFBPUlQgTlNVUkxSZXNwb25zZSAqc3ludGhlc2l6ZQog I2VuZGlmIC8vIF9fT0JKQ19fCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKLXZvaWQgYWRqdXN0TUlN RVR5cGVJZk5lY2Vzc2FyeShDRlVSTFJlc3BvbnNlUmVmKTsKK1dFQkNPUkVfRVhQT1JUIHZvaWQg YWRqdXN0TUlNRVR5cGVJZk5lY2Vzc2FyeShDRlVSTFJlc3BvbnNlUmVmKTsKIH0KSW5kZXg6IFNv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cJKHJldmlzaW9uIDE5NzYwNCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE2LTAzLTA0ICBBbGV4IENocmlzdGVuc2Vu ICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IGZpbGUgbWltZS10eXBl cyB3aGVuIHVzaW5nIE5ldHdvcmtTZXNzaW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNTUwNTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFz a0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrRGF0YVRhc2s6Ok5ldHdvcmtEYXRh VGFzayk6CisgICAgICAgIENhbGwgYWRqdXN0TUlNRVR5cGVJZk5lY2Vzc2FyeSBsaWtlIHdlIGRv IGluIGNvbm5lY3Rpb24gZGlkUmVjZWl2ZVJlc3BvbnNlIGluIAorICAgICAgICBXZWJDb3JlUmVz b3VyY2VIYW5kbGVBc09wZXJhdGlvblF1ZXVlRGVsZWdhdGUubW0uCisgICAgICAgICogTmV0d29y a1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbToKKyAgICAgICAgKC1bV0tOZXR3 b3JrU2Vzc2lvbkRlbGVnYXRlIFVSTFNlc3Npb246ZGF0YVRhc2s6ZGlkUmVjZWl2ZVJlc3BvbnNl OmNvbXBsZXRpb25IYW5kbGVyOl0pOgorICAgICAgICBEb24ndCBjb250ZW50IHNuaWZmIGZpbGUg dXJscy4gIFRoaXMgY2hlY2sgaXMgYW5hbG9nb3VzIHRvIFJlc291cmNlSGFuZGxlOjpzaG91bGRD b250ZW50U25pZmZVUkwuCisKIDIwMTYtMDMtMDQgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBh cHBsZS5jb20+CiAKICAgICAgICAgU3R1YiBBUEkgdG8gc3VwcG9ydCBhIGRlYnVnIG1lbnUgb3B0 aW9uIGZvciBtZWFzdXJpbmcgcmVzb3VyY2UgbG9hZCBzdGF0aXN0aWNzCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0 YVRhc2tDb2NvYS5tbQkocmV2aXNpb24gMTk3NTkwKQorKysgU291cmNlL1dlYktpdDIvTmV0d29y a1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAg LTk3LDcgKzk3LDcgQEAgTmV0d29ya0RhdGFUYXNrOjpOZXR3b3JrRGF0YVRhc2soTmV0d29yawog I2VuZGlmCiAgICAgCiAgICAgTlNVUkxSZXF1ZXN0ICpuc1JlcXVlc3QgPSByZXF1ZXN0Lm5zVVJM UmVxdWVzdChXZWJDb3JlOjpVcGRhdGVIVFRQQm9keSk7Ci0gICAgaWYgKHNob3VsZENvbnRlbnRT bmlmZiA9PSBXZWJDb3JlOjpEb05vdFNuaWZmQ29udGVudCkgeworICAgIGlmIChzaG91bGRDb250 ZW50U25pZmYgPT0gV2ViQ29yZTo6RG9Ob3RTbmlmZkNvbnRlbnQgfHwgdXJsLnByb3RvY29sSXMo ImZpbGUiKSkgewogICAgICAgICBOU011dGFibGVVUkxSZXF1ZXN0ICptdXRhYmxlUmVxdWVzdCA9 IFtbbnNSZXF1ZXN0IG11dGFibGVDb3B5XSBhdXRvcmVsZWFzZV07CiAgICAgICAgIFttdXRhYmxl UmVxdWVzdCBfc2V0UHJvcGVydHk6QChOTykgZm9yS2V5OihOU1N0cmluZyAqKV9rQ0ZVUkxDb25u ZWN0aW9uUHJvcGVydHlTaG91bGRTbmlmZl07CiAgICAgICAgIG5zUmVxdWVzdCA9IG11dGFibGVS ZXF1ZXN0OwpJbmRleDogU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29y a1Nlc3Npb25Db2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJv Y2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCShyZXZpc2lvbiAxOTc1OTApCisrKyBT b3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1t CSh3b3JraW5nIGNvcHkpCkBAIC00Niw2ICs0Niw3IEBACiAjaW1wb3J0IDxXZWJDb3JlL1Jlc291 cmNlUmVzcG9uc2UuaD4KICNpbXBvcnQgPFdlYkNvcmUvU2hhcmVkQnVmZmVyLmg+CiAjaW1wb3J0 IDxXZWJDb3JlL1VSTC5oPgorI2ltcG9ydCA8V2ViQ29yZS9XZWJDb3JlVVJMUmVzcG9uc2UuaD4K ICNpbXBvcnQgPHd0Zi9NYWluVGhyZWFkLmg+CiAjaW1wb3J0IDx3dGYvTmV2ZXJEZXN0cm95ZWQu aD4KIApAQCAtMTY2LDYgKzE2NywxMiBAQCAtICh2b2lkKVVSTFNlc3Npb246KE5TVVJMU2Vzc2lv biAqKXNlc3NpCiAgICAgYXV0byBzdG9yZWRDcmVkZW50aWFscyA9IHNlc3Npb24uY29uZmlndXJh dGlvbi5VUkxDcmVkZW50aWFsU3RvcmFnZSA/IFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzOjpB bGxvd1N0b3JlZENyZWRlbnRpYWxzIDogV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHM6OkRvTm90 QWxsb3dTdG9yZWRDcmVkZW50aWFsczsKICAgICBpZiAoYXV0byogbmV0d29ya0RhdGFUYXNrID0g X3Nlc3Npb24tPmRhdGFUYXNrRm9ySWRlbnRpZmllcihkYXRhVGFzay50YXNrSWRlbnRpZmllciwg c3RvcmVkQ3JlZGVudGlhbHMpKSB7CiAgICAgICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Cisg ICAgICAgIAorICAgICAgICAvLyBBdm9pZCBNSU1FIHR5cGUgc25pZmZpbmcgaWYgdGhlIHJlc3Bv bnNlIGNvbWVzIGJhY2sgYXMgMzA0IE5vdCBNb2RpZmllZC4KKyAgICAgICAgaW50IHN0YXR1c0Nv ZGUgPSBbcmVzcG9uc2UgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihzdGF0dXNDb2RlKV0g PyBbKGlkKXJlc3BvbnNlIHN0YXR1c0NvZGVdIDogMDsKKyAgICAgICAgaWYgKHN0YXR1c0NvZGUg IT0gMzA0KQorICAgICAgICAgICAgV2ViQ29yZTo6YWRqdXN0TUlNRVR5cGVJZk5lY2Vzc2FyeShy ZXNwb25zZS5fQ0ZVUkxSZXNwb25zZSk7CisgICAgICAgIAogICAgICAgICBXZWJDb3JlOjpSZXNv dXJjZVJlc3BvbnNlIHJlc291cmNlUmVzcG9uc2UocmVzcG9uc2UpOwogICAgICAgICBjb3B5VGlt aW5nRGF0YShbZGF0YVRhc2sgX3RpbWluZ0RhdGFdLCByZXNvdXJjZVJlc3BvbnNlLnJlc291cmNl TG9hZFRpbWluZygpKTsKICAgICAgICAgYXV0byBjb21wbGV0aW9uSGFuZGxlckNvcHkgPSBCbG9j a19jb3B5KGNvbXBsZXRpb25IYW5kbGVyKTsK