132654 2014-05-07 11:08:42 -0700 Eliminate "well known MIME type" support 2014-05-07 11:21:04 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap oldest_to_newest 1007376 0 ap 2014-05-07 11:08:42 -0700 Well known MIME types were needed for FileSystem API, which was removed. Now, we use AllContentTypes everywhere. 1007377 1 231007 ap 2014-05-07 11:11:47 -0700 Created attachment 231007 proposed patch 1007379 2 231007 andersca 2014-05-07 11:13:01 -0700 Comment on attachment 231007 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=231007&action=review > Source/WebCore/fileapi/File.h:69 > + File(const String& path); Please make this explicit. 1007381 3 ap 2014-05-07 11:21:04 -0700 Committed <http://trac.webkit.org/r168430>. 231007 2014-05-07 11:11:47 -0700 2014-05-07 11:13:00 -0700 proposed patch WellKnownType.txt text/plain 10635 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2ODQyOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE0LTA1LTA3ICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIEVsaW1pbmF0ZSAid2VsbCBr bm93biBNSU1FIHR5cGUiIHN1cHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzMjY1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFZlc3RpZ2VzIG9mIEZpbGVTeXN0ZW0gQVBJLgorCisgICAgICAgICog ZG9tL0RhdGFUcmFuc2Zlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEYXRhVHJhbnNmZXI6OmZp bGVzKToKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFUcmFuc2Zlcjo6aGFzRmlsZU9mVHlwZSk6Cisg ICAgICAgICogZmlsZWFwaS9GaWxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZpbGU6OkZpbGUp OgorICAgICAgICAoV2ViQ29yZTo6RmlsZTo6Y29udGVudFR5cGVGcm9tRmlsZVBhdGhPck5hbWUp OgorICAgICAgICAqIGZpbGVhcGkvRmlsZS5oOgorICAgICAgICAqIGh0bWwvRmlsZUlucHV0VHlw ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGaWxlSW5wdXRUeXBlOjpjcmVhdGVGaWxlTGlzdCk6 CisgICAgICAgICogcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5jcHA6CisgICAgICAgIChXZWJD b3JlOjppbml0aWFsaXplU3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXMpOgorICAgICAgICAoV2ViQ29y ZTo6ZmluZE1pbWVUeXBlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Ok1JTUVUeXBlUmVn aXN0cnk6OmdldFdlbGxLbm93bk1JTUVUeXBlRm9yRXh0ZW5zaW9uKTogRGVsZXRlZC4KKyAgICAg ICAgKiBwbGF0Zm9ybS9NSU1FVHlwZVJlZ2lzdHJ5Lmg6CisKIDIwMTQtMDUtMDcgIENocmlzdG9w aGUgRHVtZXogIDxjaC5kdW1lekBzYW1zdW5nLmNvbT4KIAogICAgICAgICBbSFRNTF0gRGVmYXVs dCBhcmd1bWVudCB0byBIVE1MVGFibGVFbGVtZW50Lmluc2VydFJvdygpIHNob3VsZCBiZSAtMQpJ bmRleDogU291cmNlL1dlYkNvcmUvZG9tL0RhdGFUcmFuc2Zlci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvZG9tL0RhdGFUcmFuc2Zlci5jcHAJKHJldmlzaW9uIDE2ODQxMikKKysr IFNvdXJjZS9XZWJDb3JlL2RvbS9EYXRhVHJhbnNmZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x NzksNyArMTc5LDcgQEAgRmlsZUxpc3QqIERhdGFUcmFuc2Zlcjo6ZmlsZXMoKSBjb25zdAogCiAg ICAgaWYgKG5ld2x5Q3JlYXRlZEZpbGVMaXN0KSB7CiAgICAgICAgIGZvciAoY29uc3QgU3RyaW5n JiBmaWxlbmFtZSA6IG1fcGFzdGVib2FyZC0+cmVhZEZpbGVuYW1lcygpKQotICAgICAgICAgICAg bV9maWxlTGlzdC0+YXBwZW5kKEZpbGU6OmNyZWF0ZShmaWxlbmFtZSwgRmlsZTo6QWxsQ29udGVu dFR5cGVzKSk7CisgICAgICAgICAgICBtX2ZpbGVMaXN0LT5hcHBlbmQoRmlsZTo6Y3JlYXRlKGZp bGVuYW1lKSk7CiAgICAgfQogICAgIHJldHVybiBtX2ZpbGVMaXN0LmdldCgpOwogfQpAQCAtMTg5 LDcgKzE4OSw3IEBAIGJvb2wgRGF0YVRyYW5zZmVyOjpoYXNGaWxlT2ZUeXBlKGNvbnN0IFMKICAg ICBBU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElPTihjYW5SZWFkVHlwZXMoKSk7CiAKICAg ICBmb3IgKGNvbnN0IFN0cmluZyYgZmlsZW5hbWUgOiBtX3Bhc3RlYm9hcmQtPnJlYWRGaWxlbmFt ZXMoKSkgewotICAgICAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoRmlsZTo6Y29udGVudFR5cGVG cm9tRmlsZVBhdGhPck5hbWUoZmlsZW5hbWUsIEZpbGU6OkFsbENvbnRlbnRUeXBlcyksIHR5cGUp KQorICAgICAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoRmlsZTo6Y29udGVudFR5cGVGcm9tRmls ZVBhdGhPck5hbWUoZmlsZW5hbWUpLCB0eXBlKSkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwog ICAgIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvZmlsZWFwaS9GaWxlLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9maWxlYXBpL0ZpbGUuY3BwCShyZXZpc2lvbiAxNjg0MTIpCisr KyBTb3VyY2UvV2ViQ29yZS9maWxlYXBpL0ZpbGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNywy NCArMzcsMjQgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1GaWxlOjpGaWxlKGNvbnN0IFN0 cmluZyYgcGF0aCwgQ29udGVudFR5cGVMb29rdXBQb2xpY3kgcG9saWN5KQorRmlsZTo6RmlsZShj b25zdCBTdHJpbmcmIHBhdGgpCiAgICAgOiBCbG9iKHVuaW5pdGlhbGl6ZWRDb250cnVjdG9yKQog ICAgICwgbV9wYXRoKHBhdGgpCiAgICAgLCBtX25hbWUocGF0aEdldEZpbGVOYW1lKHBhdGgpKQog ewogICAgIG1faW50ZXJuYWxVUkwgPSBCbG9iVVJMOjpjcmVhdGVJbnRlcm5hbFVSTCgpOwotICAg IG1fdHlwZSA9IGNvbnRlbnRUeXBlRnJvbUZpbGVQYXRoT3JOYW1lKHBhdGgsIHBvbGljeSk7Cisg ICAgbV90eXBlID0gY29udGVudFR5cGVGcm9tRmlsZVBhdGhPck5hbWUocGF0aCk7CiAgICAgbV9z aXplID0gLTE7CiAgICAgVGhyZWFkYWJsZUJsb2JSZWdpc3RyeTo6cmVnaXN0ZXJGaWxlQmxvYlVS TChtX2ludGVybmFsVVJMLCBwYXRoLCBtX3R5cGUpOwogfQogCi1GaWxlOjpGaWxlKGNvbnN0IFN0 cmluZyYgcGF0aCwgY29uc3QgU3RyaW5nJiBuYW1lLCBDb250ZW50VHlwZUxvb2t1cFBvbGljeSBw b2xpY3kpCitGaWxlOjpGaWxlKGNvbnN0IFN0cmluZyYgcGF0aCwgY29uc3QgU3RyaW5nJiBuYW1l KQogICAgIDogQmxvYih1bmluaXRpYWxpemVkQ29udHJ1Y3RvcikKICAgICAsIG1fcGF0aChwYXRo KQogICAgICwgbV9uYW1lKG5hbWUpCiB7CiAgICAgbV9pbnRlcm5hbFVSTCA9IEJsb2JVUkw6OmNy ZWF0ZUludGVybmFsVVJMKCk7Ci0gICAgbV90eXBlID0gY29udGVudFR5cGVGcm9tRmlsZVBhdGhP ck5hbWUobmFtZSwgcG9saWN5KTsKKyAgICBtX3R5cGUgPSBjb250ZW50VHlwZUZyb21GaWxlUGF0 aE9yTmFtZShuYW1lKTsKICAgICBtX3NpemUgPSAtMTsKICAgICBUaHJlYWRhYmxlQmxvYlJlZ2lz dHJ5OjpyZWdpc3RlckZpbGVCbG9iVVJMKG1faW50ZXJuYWxVUkwsIHBhdGgsIG1fdHlwZSk7CiB9 CkBAIC04NywxNyArODcsMTIgQEAgdW5zaWduZWQgbG9uZyBsb25nIEZpbGU6OnNpemUoKSBjb25z dAogICAgIHJldHVybiBzdGF0aWNfY2FzdDx1bnNpZ25lZCBsb25nIGxvbmc+KHNpemUpOwogfQog Ci1TdHJpbmcgRmlsZTo6Y29udGVudFR5cGVGcm9tRmlsZVBhdGhPck5hbWUoY29uc3QgU3RyaW5n JiBuYW1lLCBGaWxlOjpDb250ZW50VHlwZUxvb2t1cFBvbGljeSBwb2xpY3kpCitTdHJpbmcgRmls ZTo6Y29udGVudFR5cGVGcm9tRmlsZVBhdGhPck5hbWUoY29uc3QgU3RyaW5nJiBuYW1lKQogewog ICAgIFN0cmluZyB0eXBlOwogICAgIGludCBpbmRleCA9IG5hbWUucmV2ZXJzZUZpbmQoJy4nKTsK ICAgICBpZiAoaW5kZXggIT0gLTEpIHsKLSAgICAgICAgaWYgKHBvbGljeSA9PSBGaWxlOjpXZWxs S25vd25Db250ZW50VHlwZXMpCi0gICAgICAgICAgICB0eXBlID0gTUlNRVR5cGVSZWdpc3RyeTo6 Z2V0V2VsbEtub3duTUlNRVR5cGVGb3JFeHRlbnNpb24obmFtZS5zdWJzdHJpbmcoaW5kZXggKyAx KSk7Ci0gICAgICAgIGVsc2UgewotICAgICAgICAgICAgQVNTRVJUKHBvbGljeSA9PSBGaWxlOjpB bGxDb250ZW50VHlwZXMpOwotICAgICAgICAgICAgdHlwZSA9IE1JTUVUeXBlUmVnaXN0cnk6Omdl dE1JTUVUeXBlRm9yRXh0ZW5zaW9uKG5hbWUuc3Vic3RyaW5nKGluZGV4ICsgMSkpOwotICAgICAg ICB9CisgICAgICAgIHR5cGUgPSBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZvckV4dGVu c2lvbihuYW1lLnN1YnN0cmluZyhpbmRleCArIDEpKTsKICAgICB9CiAgICAgcmV0dXJuIHR5cGU7 CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9maWxlYXBpL0ZpbGUuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9maWxlYXBpL0ZpbGUuaAkocmV2aXNpb24gMTY4NDEyKQorKysgU291cmNl L1dlYkNvcmUvZmlsZWFwaS9GaWxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTM2LDE2ICszNiw5IEBA IGNsYXNzIFVSTDsKIAogY2xhc3MgRmlsZSBmaW5hbCA6IHB1YmxpYyBCbG9iIHsKIHB1YmxpYzoK LSAgICAvLyBBbGxDb250ZW50VHlwZXMgc2hvdWxkIG9ubHkgYmUgdXNlZCB3aGVuIHRoZSBmdWxs IHBhdGgvbmFtZSBhcmUgdHJ1c3RlZDsgb3RoZXJ3aXNlLCBpdCBjb3VsZAotICAgIC8vIGFsbG93 IGFyYml0cmFyeSBwYWdlcyB0byBkZXRlcm1pbmUgd2hhdCBhcHBsaWNhdGlvbnMgYW4gdXNlciBo YXMgaW5zdGFsbGVkLgotICAgIGVudW0gQ29udGVudFR5cGVMb29rdXBQb2xpY3kgewotICAgICAg ICBXZWxsS25vd25Db250ZW50VHlwZXMsCi0gICAgICAgIEFsbENvbnRlbnRUeXBlcywKLSAgICB9 OwotCi0gICAgc3RhdGljIFBhc3NSZWZQdHI8RmlsZT4gY3JlYXRlKGNvbnN0IFN0cmluZyYgcGF0 aCwgQ29udGVudFR5cGVMb29rdXBQb2xpY3kgcG9saWN5ID0gV2VsbEtub3duQ29udGVudFR5cGVz KQorICAgIHN0YXRpYyBQYXNzUmVmUHRyPEZpbGU+IGNyZWF0ZShjb25zdCBTdHJpbmcmIHBhdGgp CiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IEZpbGUocGF0aCwgcG9saWN5KSk7 CisgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgRmlsZShwYXRoKSk7CiAgICAgfQogCiAgICAg c3RhdGljIFBhc3NSZWZQdHI8RmlsZT4gZGVzZXJpYWxpemUoY29uc3QgU3RyaW5nJiBwYXRoLCBj b25zdCBVUkwmIHNyY1VSTCwgY29uc3QgU3RyaW5nJiB0eXBlKQpAQCAtNTQsMTEgKzQ3LDExIEBA IHB1YmxpYzoKICAgICB9CiAKICAgICAvLyBDcmVhdGUgYSBmaWxlIHdpdGggYSBuYW1lIGV4cG9z ZWQgdG8gdGhlIGF1dGhvciAodmlhIEZpbGUubmFtZSBhbmQgYXNzb2NpYXRlZCBET00gcHJvcGVy dGllcykgdGhhdCBkaWZmZXJzIGZyb20gdGhlIG9uZSBwcm92aWRlZCBpbiB0aGUgcGF0aC4KLSAg ICBzdGF0aWMgUGFzc1JlZlB0cjxGaWxlPiBjcmVhdGVXaXRoTmFtZShjb25zdCBTdHJpbmcmIHBh dGgsIGNvbnN0IFN0cmluZyYgbmFtZSwgQ29udGVudFR5cGVMb29rdXBQb2xpY3kgcG9saWN5ID0g V2VsbEtub3duQ29udGVudFR5cGVzKQorICAgIHN0YXRpYyBQYXNzUmVmUHRyPEZpbGU+IGNyZWF0 ZVdpdGhOYW1lKGNvbnN0IFN0cmluZyYgcGF0aCwgY29uc3QgU3RyaW5nJiBuYW1lKQogICAgIHsK ICAgICAgICAgaWYgKG5hbWUuaXNFbXB0eSgpKQotICAgICAgICAgICAgcmV0dXJuIGFkb3B0UmVm KG5ldyBGaWxlKHBhdGgsIHBvbGljeSkpOwotICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IEZp bGUocGF0aCwgbmFtZSwgcG9saWN5KSk7CisgICAgICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3 IEZpbGUocGF0aCkpOworICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IEZpbGUocGF0aCwgbmFt ZSkpOwogICAgIH0KIAogICAgIHZpcnR1YWwgdW5zaWduZWQgbG9uZyBsb25nIHNpemUoKSBjb25z dCBvdmVycmlkZTsKQEAgLTcwLDExICs2MywxMSBAQCBwdWJsaWM6CiAgICAgLy8gVGhpcyByZXR1 cm5zIHRoZSBjdXJyZW50IGRhdGUgYW5kIHRpbWUgaWYgdGhlIGZpbGUncyBsYXN0IG1vZGlmaWVj YXRpb24gZGF0ZSBpcyBub3Qga25vd24gKHBlciBzcGVjOiBodHRwOi8vd3d3LnczLm9yZy9UUi9G aWxlQVBJLyNkZm4tbGFzdE1vZGlmaWVkRGF0ZSkuCiAgICAgZG91YmxlIGxhc3RNb2RpZmllZERh dGUoKSBjb25zdDsKIAotICAgIHN0YXRpYyBTdHJpbmcgY29udGVudFR5cGVGcm9tRmlsZVBhdGhP ck5hbWUoY29uc3QgU3RyaW5nJiwgQ29udGVudFR5cGVMb29rdXBQb2xpY3kpOworICAgIHN0YXRp YyBTdHJpbmcgY29udGVudFR5cGVGcm9tRmlsZVBhdGhPck5hbWUoY29uc3QgU3RyaW5nJik7CiAK IHByaXZhdGU6Ci0gICAgRmlsZShjb25zdCBTdHJpbmcmIHBhdGgsIENvbnRlbnRUeXBlTG9va3Vw UG9saWN5KTsKLSAgICBGaWxlKGNvbnN0IFN0cmluZyYgcGF0aCwgY29uc3QgU3RyaW5nJiBuYW1l LCBDb250ZW50VHlwZUxvb2t1cFBvbGljeSk7CisgICAgRmlsZShjb25zdCBTdHJpbmcmIHBhdGgp OworICAgIEZpbGUoY29uc3QgU3RyaW5nJiBwYXRoLCBjb25zdCBTdHJpbmcmIG5hbWUpOwogCiAg ICAgRmlsZShEZXNlcmlhbGl6YXRpb25Db250cnVjdG9yLCBjb25zdCBTdHJpbmcmIHBhdGgsIGNv bnN0IFVSTCYgc3JjVVJMLCBjb25zdCBTdHJpbmcmIHR5cGUpOwogCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9odG1sL0ZpbGVJbnB1dFR5cGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2h0bWwvRmlsZUlucHV0VHlwZS5jcHAJKHJldmlzaW9uIDE2ODQxMikKKysrIFNvdXJjZS9XZWJD b3JlL2h0bWwvRmlsZUlucHV0VHlwZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2Niw3ICsyNjYs NyBAQCBQYXNzUmVmUHRyPEZpbGVMaXN0PiBGaWxlSW5wdXRUeXBlOjpjcmVhCiB7CiAgICAgVmVj dG9yPFJlZlB0cjxGaWxlPj4gZmlsZU9iamVjdHM7CiAgICAgZm9yIChjb25zdCBGaWxlQ2hvb3Nl ckZpbGVJbmZvJiBpbmZvIDogZmlsZXMpCi0gICAgICAgIGZpbGVPYmplY3RzLmFwcGVuZChGaWxl OjpjcmVhdGVXaXRoTmFtZShpbmZvLnBhdGgsIGluZm8uZGlzcGxheU5hbWUsIEZpbGU6OkFsbENv bnRlbnRUeXBlcykpOworICAgICAgICBmaWxlT2JqZWN0cy5hcHBlbmQoRmlsZTo6Y3JlYXRlV2l0 aE5hbWUoaW5mby5wYXRoLCBpbmZvLmRpc3BsYXlOYW1lKSk7CiAKICAgICByZXR1cm4gRmlsZUxp c3Q6OmNyZWF0ZShzdGQ6Om1vdmUoZmlsZU9iamVjdHMpKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuY3BwCShyZXZpc2lvbiAxNjg0MTIpCisr KyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NSU1FVHlwZVJlZ2lzdHJ5LmNwcAkod29ya2luZyBj b3B5KQpAQCAtMTQ0LDQzICsxNDQsNiBAQCBzdGF0aWMgY29uc3QgY2hhciB0ZXh0SHRtbFtdID0g InRleHQvaHRtCiBzdGF0aWMgY29uc3QgY2hhciBpbWFnZUpwZWdbXSA9ICJpbWFnZS9qcGVnIjsK IHN0YXRpYyBjb25zdCBjaGFyIG9jdGV0U3RyZWFtW10gPSAiYXBwbGljYXRpb24vb2N0ZXQtc3Ry ZWFtIjsKIAotLy8gQSB0YWJsZSBvZiB3ZWxsIGtub3duIE1JTUUgdHlwZXMgdXNlZCB3aGVuIHdl IGRvbid0IHdhbnQgdG8gbGVhayB0byB0aGUKLS8vIGNhbGxlciBpbmZvcm1hdGlvbiBhYm91dCB0 eXBlcyBrbm93biB0byB1bmRlcmx5aW5nIHBsYXRmb3JtLgotc3RhdGljIGNvbnN0IFR5cGVFeHRl bnNpb25QYWlyIHdlbGxLbm93bk1pbWVUeXBlc1tdID0gewotICAgIHsgdGV4dFBsYWluLCAidHh0 IiB9LAotICAgIHsgdGV4dFBsYWluLCAidGV4dCIgfSwKLSAgICB7IHRleHRIdG1sLCAiaHRtbCIg fSwKLSAgICB7IHRleHRIdG1sLCAiaHRtIiB9LAotICAgIHsgInRleHQvY3NzIiwgImNzcyIgfSwK LSAgICB7ICJ0ZXh0L3htbCIsICJ4bWwiIH0sCi0gICAgeyAidGV4dC94c2wiLCAieHNsIiB9LAot ICAgIHsgImltYWdlL2dpZiIsICJnaWYiIH0sCi0gICAgeyAiaW1hZ2UvcG5nIiwgInBuZyIgfSwK LSAgICB7IGltYWdlSnBlZywgImpwZWciIH0sCi0gICAgeyBpbWFnZUpwZWcsICJqcGciIH0sCi0g ICAgeyBpbWFnZUpwZWcsICJqZmlmIiB9LAotICAgIHsgaW1hZ2VKcGVnLCAicGpwZWciIH0sCi0g ICAgeyAiaW1hZ2Uvd2VicCIsICJ3ZWJwIiB9LAotICAgIHsgImltYWdlL2JtcCIsICJibXAiIH0s Ci0gICAgeyAiYXBwbGljYXRpb24veGh0bWwreG1sIiwgInhodG1sIiB9LAotICAgIHsgImFwcGxp Y2F0aW9uL3gtamF2YXNjcmlwdCIsICJqcyIgfSwKLSAgICB7ICJhcHBsaWNhdGlvbi9qc29uIiwg Impzb24iIH0sCi0gICAgeyBvY3RldFN0cmVhbSwgImV4ZSIgfSwKLSAgICB7IG9jdGV0U3RyZWFt LCAiY29tIiB9LAotICAgIHsgb2N0ZXRTdHJlYW0sICJiaW4iIH0sCi0gICAgeyAiYXBwbGljYXRp b24vemlwIiwgInppcCIgfSwKLSAgICB7ICJhcHBsaWNhdGlvbi9nemlwIiwgImd6IiB9LAotICAg IHsgImFwcGxpY2F0aW9uL3BkZiIsICJwZGYiIH0sCi0gICAgeyAiYXBwbGljYXRpb24vcG9zdHNj cmlwdCIsICJwcyIgfSwKLSAgICB7ICJpbWFnZS94LWljb24iLCAiaWNvIiB9LAotICAgIHsgImlt YWdlL3RpZmYiLCAidGlmZiIgfSwKLSAgICB7ICJpbWFnZS94LXhiaXRtYXAiLCAieGJtIiB9LAot ICAgIHsgImltYWdlL3N2Zyt4bWwiLCAic3ZnIiB9LAotICAgIHsgImFwcGxpY2F0aW9uL3Jzcyt4 bWwiLCAicnNzIiB9LAotICAgIHsgImFwcGxpY2F0aW9uL3JkZit4bWwiLCAicmRmIiB9LAotICAg IHsgImFwcGxpY2F0aW9uL3gtc2hvY2t3YXZlLWZsYXNoIiwgInN3ZiIgfSwKLX07Ci0KIHN0YXRp YyBIYXNoU2V0PFN0cmluZz4qIHN1cHBvcnRlZEltYWdlUmVzb3VyY2VNSU1FVHlwZXM7CiBzdGF0 aWMgSGFzaFNldDxTdHJpbmc+KiBzdXBwb3J0ZWRJbWFnZU1JTUVUeXBlczsKIHN0YXRpYyBIYXNo U2V0PFN0cmluZz4qIHN1cHBvcnRlZEltYWdlTUlNRVR5cGVzRm9yRW5jb2Rpbmc7CkBAIC01MDYs MjYgKzQ2OSw2IEBAIHN0YXRpYyB2b2lkIGluaXRpYWxpemVNSU1FVHlwZVJlZ2lzdHJ5KCkKICAg ICBpbml0aWFsaXplVW5zdXBwb3J0ZWRUZXh0TUlNRVR5cGVzKCk7CiB9CiAKLXN0YXRpYyBTdHJp bmcgZmluZE1pbWVUeXBlKGNvbnN0IFR5cGVFeHRlbnNpb25QYWlyKiBwYWlycywgdW5zaWduZWQg bnVtUGFpcnMsIGNvbnN0IFN0cmluZyYgZXh0ZW5zaW9uKQotewotICAgIGlmICghZXh0ZW5zaW9u LmlzRW1wdHkoKSkgewotICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG51bVBhaXJzOyAr K2ksICsrcGFpcnMpIHsKLSAgICAgICAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoZXh0ZW5zaW9u LCBwYWlycy0+ZXh0ZW5zaW9uKSkKLSAgICAgICAgICAgICAgcmV0dXJuIFN0cmluZyhwYWlycy0+ dHlwZSk7Ci0gICAgICB9Ci0gICAgfQotICAgIHJldHVybiBTdHJpbmcoKTsKLX0KLQotU3RyaW5n IE1JTUVUeXBlUmVnaXN0cnk6OmdldFdlbGxLbm93bk1JTUVUeXBlRm9yRXh0ZW5zaW9uKGNvbnN0 IFN0cmluZyYgZXh0ZW5zaW9uKQotewotICAgIC8vIFRoaXMgbWV0aG9kIG11c3QgYmUgdGhyZWFk IHNhZmUgYW5kIHNob3VsZCBub3QgY29uc3VsdCB0aGUgT1MvcmVnaXN0cnkuCi0gICAgU3RyaW5n IGZvdW5kID0gZmluZE1pbWVUeXBlKHdlbGxLbm93bk1pbWVUeXBlcywgc2l6ZW9mKHdlbGxLbm93 bk1pbWVUeXBlcykgLyBzaXplb2Yod2VsbEtub3duTWltZVR5cGVzWzBdKSwgZXh0ZW5zaW9uKTsK LSAgICBpZiAoIWZvdW5kLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuIGZvdW5kOwotICAgIHJl dHVybiBmaW5kTWltZVR5cGUoY29tbW9uTWVkaWFUeXBlcywgc2l6ZW9mKGNvbW1vbk1lZGlhVHlw ZXMpIC8gc2l6ZW9mKGNvbW1vbk1lZGlhVHlwZXNbMF0pLCBleHRlbnNpb24pOwotfQotCiBTdHJp bmcgTUlNRVR5cGVSZWdpc3RyeTo6Z2V0TUlNRVR5cGVGb3JQYXRoKGNvbnN0IFN0cmluZyYgcGF0 aCkKIHsKICAgICBzaXplX3QgcG9zID0gcGF0aC5yZXZlcnNlRmluZCgnLicpOwpJbmRleDogU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuaAkocmV2aXNpb24gMTY4NDEy KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5oCSh3b3JraW5n IGNvcHkpCkBAIC0zNiw3ICszNiw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIE1JTUVU eXBlUmVnaXN0cnkgewogcHVibGljOgogICAgIHN0YXRpYyBTdHJpbmcgZ2V0TUlNRVR5cGVGb3JF eHRlbnNpb24oY29uc3QgU3RyaW5nJiBleHRlbnNpb24pOwotICAgIHN0YXRpYyBTdHJpbmcgZ2V0 V2VsbEtub3duTUlNRVR5cGVGb3JFeHRlbnNpb24oY29uc3QgU3RyaW5nJiBleHRlbnNpb24pOwog CiAgICAgc3RhdGljIFZlY3RvcjxTdHJpbmc+IGdldEV4dGVuc2lvbnNGb3JNSU1FVHlwZShjb25z dCBTdHJpbmcmIHR5cGUpOwogICAgIHN0YXRpYyBTdHJpbmcgZ2V0UHJlZmVycmVkRXh0ZW5zaW9u Rm9yTUlNRVR5cGUoY29uc3QgU3RyaW5nJiB0eXBlKTsK