163538 2016-10-17 03:30:06 -0700 [SOUP] Downloads should always sniff contents 2016-10-17 03:54:53 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk, Soup P2 Normal --- 1 cgarcia webkit-unassigned achristensen bugs-noreply oldest_to_newest 1240912 0 cgarcia 2016-10-17 03:30:06 -0700 It's quite common that downloads have weird filenames with no extension, so it would be better if the loader sniff the contents to guess the mime type. 1240913 1 291806 cgarcia 2016-10-17 03:33:04 -0700 Created attachment 291806 Patch 1240920 2 291806 mcatanzaro 2016-10-17 03:49:48 -0700 Comment on attachment 291806 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=291806&action=review > Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp:640 > + g_assert_cmpstr(webkit_uri_response_get_mime_type(response), ==, "application/pdf"); So what did you actually do? Does this function call fail without your change? 1240921 3 cgarcia 2016-10-17 03:53:06 -0700 (In reply to comment #2) > Comment on attachment 291806 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=291806&action=review > > > Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp:640 > > + g_assert_cmpstr(webkit_uri_response_get_mime_type(response), ==, "application/pdf"); > > So what did you actually do? Does this function call fail without your > change? The assert fails, because the returned mime type is not application/pdf 1240923 4 cgarcia 2016-10-17 03:54:53 -0700 Committed r207405: <http://trac.webkit.org/changeset/207405> 291806 2016-10-17 03:33:04 -0700 2016-10-17 03:49:48 -0700 Patch wk2-downloads-sniff.diff text/plain 6665 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA4Zjg0Y2M2Li43MzE2MTI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTgg QEAKIDIwMTYtMTAtMTcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtTT1VQXSBEb3dubG9hZHMgc2hvdWxkIGFsd2F5cyBzbmlmZiBjb250ZW50 cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYzNTM4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSXQncyBx dWl0ZSBjb21tb24gdGhhdCBkb3dubG9hZHMgaGF2ZSB3ZWlyZCBmaWxlbmFtZXMgd2l0aCBubyBl eHRlbnNpb24sIHNvIGl0IHdvdWxkIGJlIGJldHRlciBpZiB0aGUgbG9hZGVyCisgICAgICAgIHNu aWZmIHRoZSBjb250ZW50cyB0byBndWVzcyB0aGUgbWltZSB0eXBlLgorCisgICAgICAgICogTmV0 d29ya1Byb2Nlc3MvRG93bmxvYWRzL3NvdXAvRG93bmxvYWRTb3VwLmNwcDoKKyAgICAgICAgKFdl YktpdDo6RG93bmxvYWQ6OnN0YXJ0TmV0d29ya0xvYWQpOiBQYXNzIHRydWUgZm9yIHNob3VsZENv bnRlbnRTbmlmZiBwYXJhbWV0ZXIgb2YgUmVzb3VyY2VIYW5kbGU6OmNyZWF0ZSgpLgorCisyMDE2 LTEwLTE3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKwogICAg ICAgICBbR1RLXSBTd2l0Y2ggdG8gdXNlIEFQSTo6RG93bmxvYWRDbGllbnQgaW5zdGVhZCBvZiB0 aGUgQyBBUEkgY2xpZW50CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNjM1MzcKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nl c3MvRG93bmxvYWRzL3NvdXAvRG93bmxvYWRTb3VwLmNwcCBiL1NvdXJjZS9XZWJLaXQyL05ldHdv cmtQcm9jZXNzL0Rvd25sb2Fkcy9zb3VwL0Rvd25sb2FkU291cC5jcHAKaW5kZXggNzI4MDQ2Yy4u NjgwNzkxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvRG93bmxv YWRzL3NvdXAvRG93bmxvYWRTb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJv Y2Vzcy9Eb3dubG9hZHMvc291cC9Eb3dubG9hZFNvdXAuY3BwCkBAIC0yMTIsNyArMjEyLDcgQEAg dm9pZCBEb3dubG9hZDo6c3RhcnROZXR3b3JrTG9hZCgpCiAgICAgQVNTRVJUKCFtX2Rvd25sb2Fk Q2xpZW50KTsKICAgICBBU1NFUlQoIW1fcmVzb3VyY2VIYW5kbGUpOwogICAgIG1fZG93bmxvYWRD bGllbnQgPSBzdGQ6Om1ha2VfdW5pcXVlPERvd25sb2FkQ2xpZW50PigqdGhpcyk7Ci0gICAgbV9y ZXNvdXJjZUhhbmRsZSA9IFJlc291cmNlSGFuZGxlOjpjcmVhdGUoMCwgbV9yZXF1ZXN0LCBtX2Rv d25sb2FkQ2xpZW50LmdldCgpLCBmYWxzZSwgZmFsc2UpOworICAgIG1fcmVzb3VyY2VIYW5kbGUg PSBSZXNvdXJjZUhhbmRsZTo6Y3JlYXRlKDAsIG1fcmVxdWVzdCwgbV9kb3dubG9hZENsaWVudC5n ZXQoKSwgZmFsc2UsIHRydWUpOwogICAgIGRpZFN0YXJ0KCk7CiB9CiAKZGlmZiAtLWdpdCBhL1Rv b2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwYjYwOWVjLi4yNDYyN2JhIDEw MDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTkgQEAKKzIwMTYtMTAtMTcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtTT1VQXSBEb3dubG9hZHMgc2hvdWxkIGFsd2F5cyBzbmlmZiBj b250ZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTYzNTM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkIGEgdGVzdCBjYXNlIHRvIGNoZWNrIHRoYXQgdGhlIE1JTUUgdHlwZSBpcyBjb3JyZWN0bHkg Z3Vlc3NlZCBmb3IgZG93bmxvYWRzLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXQyR3RrL1Rlc3REb3dubG9hZHMuY3BwOgorICAgICAgICAod3JpdGVOZXh0Q2h1bmspOgor ICAgICAgICAoc2VydmVyQ2FsbGJhY2spOgorICAgICAgICAodGVzdERvd25sb2FkTUlNRVR5cGUp OgorICAgICAgICAoYmVmb3JlQWxsKToKKyAgICAgICAgKHdyaXRlTmV4dENodW5rSWRsZSk6IERl bGV0ZWQuCisKIDIwMTYtMTAtMTYgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgog CiAgICAgICAgIEZpeCBQZXJsIHdhcm5pbmcgYWJvdXQgbWFza2VkIHZhcmlhYmxlIGZvbGxvd2lu ZyA8aHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMjA3MzgyPgpkaWZmIC0tZ2l0IGEv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3REb3dubG9hZHMuY3BwIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3REb3dubG9hZHMuY3BwCmlu ZGV4IGI0ZjIxYTEuLmMxOGY2MjkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Mkd0ay9UZXN0RG93bmxvYWRzLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdDJHdGsvVGVzdERvd25sb2Fkcy5jcHAKQEAgLTM4OCwxNSArMzg4LDE3IEBA IHN0YXRpYyB2b2lkIGFkZENvbnRlbnREaXNwb3NpdGlvbkhUVFBIZWFkZXJUb1Jlc3BvbnNlKFNv dXBNZXNzYWdlKiBtZXNzYWdlKQogICAgIHNvdXBfbWVzc2FnZV9oZWFkZXJzX2FwcGVuZChtZXNz YWdlLT5yZXNwb25zZV9oZWFkZXJzLCAiQ29udGVudC1EaXNwb3NpdGlvbiIsIGNvbnRlbnREaXNw b3NpdGlvbi5nZXQoKSk7CiB9CiAKLXN0YXRpYyBnYm9vbGVhbiB3cml0ZU5leHRDaHVua0lkbGUo U291cE1lc3NhZ2UqIG1lc3NhZ2UpCi17Ci0gICAgc291cF9tZXNzYWdlX2JvZHlfYXBwZW5kKG1l c3NhZ2UtPnJlc3BvbnNlX2JvZHksIFNPVVBfTUVNT1JZX1NUQVRJQywgImNodW5rIiwgNSk7Ci0g ICAgcmV0dXJuIEZBTFNFOwotfQotCiBzdGF0aWMgdm9pZCB3cml0ZU5leHRDaHVuayhTb3VwTWVz c2FnZSogbWVzc2FnZSkKIHsKLSAgICBnX3RpbWVvdXRfYWRkKDEwMCwgcmVpbnRlcnByZXRfY2Fz dDxHU291cmNlRnVuYz4od3JpdGVOZXh0Q2h1bmtJZGxlKSwgbWVzc2FnZSk7CisgICAgLyogV2Ug bmVlZCBhIGJpZyBlbm91Z2ggY2h1bmsgZm9yIHRoZSBzbmlmZmVyIHRvIG5vdCBibG9jayB0aGUg bG9hZCAqLworICAgIHN0YXRpYyBjb25zdCBjaGFyKiBjaHVuayA9ICJUZXN0aW5nIVRlc3Rpbmch VGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nISIKKyAgICAgICAgIlRlc3Rp bmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGlu ZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nISIKKyAgICAgICAgIlRlc3RpbmchVGVz dGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0 aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nISIKKyAgICAgICAgIlRlc3RpbmchVGVzdGluZyFU ZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRl c3RpbmchVGVzdGluZyFUZXN0aW5nISIKKyAgICAgICAgIlRlc3RpbmchVGVzdGluZyFUZXN0aW5n IVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3Rpbmch VGVzdGluZyFUZXN0aW5nISIKKyAgICAgICAgIlRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3Rp bmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGlu ZyFUZXN0aW5nISIKKyAgICAgICAgIlRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVz dGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0 aW5nISI7CisgICAgc291cF9tZXNzYWdlX2JvZHlfYXBwZW5kKG1lc3NhZ2UtPnJlc3BvbnNlX2Jv ZHksIFNPVVBfTUVNT1JZX1NUQVRJQywgY2h1bmssIHN0cmxlbihjaHVuaykpOwogfQogCiBzdGF0 aWMgdm9pZCBzZXJ2ZXJDYWxsYmFjayhTb3VwU2VydmVyKiBzZXJ2ZXIsIFNvdXBNZXNzYWdlKiBt ZXNzYWdlLCBjb25zdCBjaGFyKiBwYXRoLCBHSGFzaFRhYmxlKiwgU291cENsaWVudENvbnRleHQq LCBncG9pbnRlcikKQEAgLTQxNyw2ICs0MTksOSBAQCBzdGF0aWMgdm9pZCBzZXJ2ZXJDYWxsYmFj ayhTb3VwU2VydmVyKiBzZXJ2ZXIsIFNvdXBNZXNzYWdlKiBtZXNzYWdlLCBjb25zdCBjaGFyKgog ICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAgaWYgKGdfc3RyX2VxdWFsKHBhdGgsICIvdW5r bm93biIpKQorICAgICAgICBwYXRoID0gIi90ZXN0LnBkZiI7CisKICAgICBHVW5pcXVlUHRyPGNo YXI+IGZpbGVQYXRoKGdfYnVpbGRfZmlsZW5hbWUoVGVzdDo6Z2V0UmVzb3VyY2VzRGlyKCkuZGF0 YSgpLCBwYXRoLCBudWxscHRyKSk7CiAgICAgY2hhciogY29udGVudHM7CiAgICAgZ3NpemUgY29u dGVudHNMZW5ndGg7CkBAIC02MTIsNiArNjE3LDMzIEBAIHN0YXRpYyB2b2lkIHRlc3RQb2xpY3lS ZXNwb25zZURvd25sb2FkKFBvbGljeVJlc3BvbnNlRG93bmxvYWRUZXN0KiB0ZXN0LCBnY29uc3Rw CiAgICAgdGVzdC0+Y2FuY2VsRG93bmxvYWRBbmRXYWl0VW50aWxGaW5pc2hlZCgpOwogfQogCitz dGF0aWMgdm9pZCB0ZXN0RG93bmxvYWRNSU1FVHlwZShEb3dubG9hZFRlc3QqIHRlc3QsIGdjb25z dHBvaW50ZXIpCit7CisgICAgR1JlZlB0cjxXZWJLaXREb3dubG9hZD4gZG93bmxvYWQgPSBhZG9w dEdSZWYodGVzdC0+ZG93bmxvYWRVUklBbmRXYWl0VW50aWxGaW5pc2hlcyhrU2VydmVyLT5nZXRV UklGb3JQYXRoKCIvdW5rbm93biIpKSk7CisgICAgZ19hc3NlcnQoIXdlYmtpdF9kb3dubG9hZF9n ZXRfd2ViX3ZpZXcoZG93bmxvYWQuZ2V0KCkpKTsKKworICAgIFZlY3RvcjxEb3dubG9hZFRlc3Q6 OkRvd25sb2FkRXZlbnQ+JiBldmVudHMgPSB0ZXN0LT5tX2Rvd25sb2FkRXZlbnRzOworICAgIGdf YXNzZXJ0X2NtcGludChldmVudHMuc2l6ZSgpLCA9PSwgNSk7CisgICAgZ19hc3NlcnRfY21waW50 KGV2ZW50c1swXSwgPT0sIERvd25sb2FkVGVzdDo6U3RhcnRlZCk7CisgICAgZ19hc3NlcnRfY21w aW50KGV2ZW50c1sxXSwgPT0sIERvd25sb2FkVGVzdDo6UmVjZWl2ZWRSZXNwb25zZSk7CisgICAg Z19hc3NlcnRfY21waW50KGV2ZW50c1syXSwgPT0sIERvd25sb2FkVGVzdDo6Q3JlYXRlZERlc3Rp bmF0aW9uKTsKKyAgICBnX2Fzc2VydF9jbXBpbnQoZXZlbnRzWzNdLCA9PSwgRG93bmxvYWRUZXN0 OjpSZWNlaXZlZERhdGEpOworICAgIGdfYXNzZXJ0X2NtcGludChldmVudHNbNF0sID09LCBEb3du bG9hZFRlc3Q6OkZpbmlzaGVkKTsKKyAgICBldmVudHMuY2xlYXIoKTsKKworICAgIFdlYktpdFVS SVJlcXVlc3QqIHJlcXVlc3QgPSB3ZWJraXRfZG93bmxvYWRfZ2V0X3JlcXVlc3QoZG93bmxvYWQu Z2V0KCkpOworICAgIFdFQktJVF9JU19VUklfUkVRVUVTVChyZXF1ZXN0KTsKKyAgICBBU1NFUlRf Q01QX0NTVFJJTkcod2Via2l0X3VyaV9yZXF1ZXN0X2dldF91cmkocmVxdWVzdCksID09LCBrU2Vy dmVyLT5nZXRVUklGb3JQYXRoKCIvdW5rbm93biIpKTsKKworICAgIFdlYktpdFVSSVJlc3BvbnNl KiByZXNwb25zZSA9IHdlYmtpdF9kb3dubG9hZF9nZXRfcmVzcG9uc2UoZG93bmxvYWQuZ2V0KCkp OworICAgIFdFQktJVF9JU19VUklfUkVTUE9OU0UocmVzcG9uc2UpOworICAgIGdfYXNzZXJ0X2Nt cHN0cih3ZWJraXRfdXJpX3Jlc3BvbnNlX2dldF9taW1lX3R5cGUocmVzcG9uc2UpLCA9PSwgImFw cGxpY2F0aW9uL3BkZiIpOworCisgICAgZ19hc3NlcnQod2Via2l0X2Rvd25sb2FkX2dldF9kZXN0 aW5hdGlvbihkb3dubG9hZC5nZXQoKSkpOworICAgIGdfYXNzZXJ0X2NtcGZsb2F0KHdlYmtpdF9k b3dubG9hZF9nZXRfZXN0aW1hdGVkX3Byb2dyZXNzKGRvd25sb2FkLmdldCgpKSwgPT0sIDEpOwor ICAgIHRlc3QtPmNoZWNrRGVzdGluYXRpb25BbmREZWxldGVGaWxlKGRvd25sb2FkLmdldCgpLCBr U2VydmVyU3VnZ2VzdGVkRmlsZW5hbWUpOworfQorCiB2b2lkIGJlZm9yZUFsbCgpCiB7CiAgICAg a1NlcnZlciA9IG5ldyBXZWJLaXRUZXN0U2VydmVyKCk7CkBAIC02MjUsNiArNjU3LDcgQEAgdm9p ZCBiZWZvcmVBbGwoKQogICAgIERvd25sb2FkRXJyb3JUZXN0OjphZGQoIkRvd25sb2FkcyIsICJy ZW1vdGUtZmlsZS1lcnJvciIsIHRlc3REb3dubG9hZFJlbW90ZUZpbGVFcnJvcik7CiAgICAgV2Vi Vmlld0Rvd25sb2FkVGVzdDo6YWRkKCJXZWJLaXRXZWJWaWV3IiwgImRvd25sb2FkLXVyaSIsIHRl c3RXZWJWaWV3RG93bmxvYWRVUkkpOwogICAgIFBvbGljeVJlc3BvbnNlRG93bmxvYWRUZXN0Ojph ZGQoIkRvd25sb2FkcyIsICJwb2xpY3ktZGVjaXNpb24tZG93bmxvYWQiLCB0ZXN0UG9saWN5UmVz cG9uc2VEb3dubG9hZCk7CisgICAgRG93bmxvYWRUZXN0OjphZGQoIkRvd25sb2FkcyIsICJtaW1l LXR5cGUiLCB0ZXN0RG93bmxvYWRNSU1FVHlwZSk7CiB9CiAKIHZvaWQgYWZ0ZXJBbGwoKQo=