34686 2010-02-06 14:42:05 -0800 [Haiku] Improve MIME type data base implementation on Haiku 2010-04-13 06:45:38 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 0 superstippi webkit-unassigned commit-queue leavengood simon.maxime oldest_to_newest 188476 0 superstippi 2010-02-06 14:42:05 -0800 Patch implements using the Haiku MIME type data base as a fall back for unknown file extensions. The hard-coded MIME types have been sorted to resolve more frequenly used extensions quicker. 188477 1 48299 superstippi 2010-02-06 14:44:47 -0800 Created attachment 48299 Patch makes MIMETypeRegistry fall back to use system data base on Haiku Patch against r54275. 189458 2 48299 eric 2010-02-10 13:33:13 -0800 Comment on attachment 48299 Patch makes MIMETypeRegistry fall back to use system data base on Haiku The mime type lines used to be sorted alphabetically. Why change that? There is no performance benefit to your change. The CPU on my cellphone can execute a billion comparisons a second, so shortening the array walk by a few places is no perf savings. :) 190334 3 leavengood 2010-02-14 10:59:39 -0800 Hi Eric, Would you accept this patch if the ordering/optimization of the list was changed back to how it was? Though I think you are being pretty strict here. Don't ports get some leeway in defining how their platform code works? Either way I think falling back to the Haiku MIME database is a very valid platform-specific feature we should make use of in our port. So I would hope you would accept a patch with those changes at least. 211435 4 53112 superstippi 2010-04-11 14:35:04 -0700 Created attachment 53112 [Haiku] Fall back to the system MIME database, return correct string for unknown types. Revised patch, also fixes string returned for unknown types, which other code relies on. 211869 5 53112 levin 2010-04-12 23:27:54 -0700 Comment on attachment 53112 [Haiku] Fall back to the system MIME database, return correct string for unknown types. r- for struct name change (and the fact that I can't get you to change it on landing). > 2010-04-10 Adam Barth <abarth@webkit.org> > > Unreviewed. Rename m_forceSandboxFlags to m_forcedSandoxFlags, as > Index: WebCore/platform/haiku/MIMETypeRegistryHaiku.cpp > -static const ExtensionMap extensionMap [] = { > +static const ExtensionMap sExtensionMap[] = { Please don't change the name of this struct. WebKit doesn't use this style of notation for static const arrays. > + // Try system mime database Please add a "." > + String fakeFileName("filename."); > + fakeFileName.append(str); > + > + BMimeType type; > + if (BMimeType::GuessMimeType(fakeFileName.utf8().data(), &type) == B_OK) Mild concern about passing untrusted data (derived from ext) to system api, but since it is a a null terminated string, this appears fine. 211901 6 53233 superstippi 2010-04-13 02:00:00 -0700 Created attachment 53233 [Haiku] Fall back to the system MIME database, return correct string for unknown types. Revised patch after review. Thanks! Somehow I was under the wrong impression that the style guide said this about static variables, but was obviously mistaken. 211922 7 53233 commit-queue 2010-04-13 06:45:33 -0700 Comment on attachment 53233 [Haiku] Fall back to the system MIME database, return correct string for unknown types. Clearing flags on attachment: 53233 Committed r57513: <http://trac.webkit.org/changeset/57513> 211923 8 commit-queue 2010-04-13 06:45:38 -0700 All reviewed patches have been landed. Closing bug. 48299 2010-02-06 14:44:47 -0800 2010-04-11 14:35:04 -0700 Patch makes MIMETypeRegistry fall back to use system data base on Haiku mimetype.diff text/plain 3220 superstippi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NDMyNSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTAtMDItMDMgIFN0ZXBoYW4gQcOfbXVzICA8c3VwZXJzdGlwcGlA Z214LmRlPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFVzZSB0aGUgSGFpa3UgTUlNRSB0eXBlIGRhdGEgYmFzZSBhcyBhIGZhbGwgYmFjayBmb3IgdW5r bm93biBmaWxlIGV4dGVuc2lvbnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0zNDY4NgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9wbGF0Zm9ybS9oYWlrdS9NSU1FVHlwZVJlZ2lzdHJ5SGFp a3UuY3BwOiBTb3J0IGhhcmQtY29kZWQgTUlNRSB0eXBlcyB0byByZXNvbHZlIG1vcmUgZnJlcXVl bmx5CisgICAgICAgICAgdXNlZCBleHRlbnNpb25zIHF1aWNrZXIsIHVzZSB0aGUgc3lzdGVtIGRh dGEgYmFzZSBhcyBmYWxsYmFjay4KKwogMjAxMC0wMi0wMyAgU3RldmUgRmFsa2VuYnVyZyAgPHNm YWxrZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFdpbmRvd3MgRGVidWdfQWxsIGJ1aWxkIGZpeC4K SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vaGFpa3UvTUlNRVR5cGVSZWdpc3RyeUhhaWt1LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2hhaWt1L01JTUVUeXBlUmVnaXN0cnlIYWlr dS5jcHAJKHJldmlzaW9uIDU0Mjc1KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9oYWlrdS9NSU1FVHlw ZVJlZ2lzdHJ5SGFpa3UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yLDYgKzIsNyBAQAogICogQ29w eXJpZ2h0IChDKSAyMDA2IFphY2sgUnVzaW4gPHphY2tAa2RlLm9yZz4KICAqIENvcHlyaWdodCAo QykgMjAwNiBBcHBsZSBDb21wdXRlciwgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENv cHlyaWdodCAoQykgMjAwNyBUcm9sbHRlY2ggQVNBCisgKiBDb3B5cmlnaHQgKEMpIDIwMTAgU3Rl cGhhbiBBw59tdXMgPHN1cGVyc3RpcHBpQGdteC5kZT4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBh bmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1v ZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29u ZGl0aW9ucwpAQCAtMjgsOCArMjksMTEgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRl ICJNSU1FVHlwZVJlZ2lzdHJ5LmgiCiAKKyNpbmNsdWRlICJDU3RyaW5nLmgiCiAjaW5jbHVkZSAi UGxhdGZvcm1TdHJpbmcuaCIKIAorI2luY2x1ZGUgPE1pbWVUeXBlLmg+CisKIAogbmFtZXNwYWNl IFdlYkNvcmUgewogc3RydWN0IEV4dGVuc2lvbk1hcCB7CkBAIC0zNywyMCArNDEsMjAgQEAgc3Ry dWN0IEV4dGVuc2lvbk1hcCB7CiAgICAgY29uc3QgY2hhciogbWltZVR5cGU7CiB9OwogCi1zdGF0 aWMgY29uc3QgRXh0ZW5zaW9uTWFwIGV4dGVuc2lvbk1hcCBbXSA9IHsKLSAgICB7ICJibXAiLCAi aW1hZ2UvYm1wIiB9LAorc3RhdGljIGNvbnN0IEV4dGVuc2lvbk1hcCBleHRlbnNpb25NYXBbXSA9 IHsKKyAgICB7ICJwbmciLCAiaW1hZ2UvcG5nIiB9LAorICAgIHsgImpwZyIsICJpbWFnZS9qcGVn IiB9LAogICAgIHsgImdpZiIsICJpbWFnZS9naWYiIH0sCiAgICAgeyAiaHRtbCIsICJ0ZXh0L2h0 bWwiIH0sCi0gICAgeyAiaWNvIiwgImltYWdlL3gtaWNvbiIgfSwgICAKLSAgICB7ICJqcGVnIiwg ImltYWdlL2pwZWciIH0sCi0gICAgeyAianBnIiwgImltYWdlL2pwZWciIH0sCi0gICAgeyAianMi LCAiYXBwbGljYXRpb24veC1qYXZhc2NyaXB0IiB9LAotICAgIHsgInBkZiIsICJhcHBsaWNhdGlv bi9wZGYiIH0sCi0gICAgeyAicG5nIiwgImltYWdlL3BuZyIgfSwKLSAgICB7ICJyc3MiLCAiYXBw bGljYXRpb24vcnNzK3htbCIgfSwKICAgICB7ICJzdmciLCAiaW1hZ2Uvc3ZnK3htbCIgfSwKKyAg ICB7ICJqcyIsICJhcHBsaWNhdGlvbi94LWphdmFzY3JpcHQiIH0sCiAgICAgeyAidGV4dCIsICJ0 ZXh0L3BsYWluIiB9LAogICAgIHsgInR4dCIsICJ0ZXh0L3BsYWluIiB9LAorICAgIHsgImJtcCIs ICJpbWFnZS9ibXAiIH0sCisgICAgeyAiaWNvIiwgImltYWdlL3gtaWNvbiIgfSwKKyAgICB7ICJq cGVnIiwgImltYWdlL2pwZWciIH0sCisgICAgeyAicGRmIiwgImFwcGxpY2F0aW9uL3BkZiIgfSwK KyAgICB7ICJyc3MiLCAiYXBwbGljYXRpb24vcnNzK3htbCIgfSwKICAgICB7ICJ4Ym0iLCAiaW1h Z2UveC14Yml0bWFwIiB9LAogICAgIHsgInhtbCIsICJ0ZXh0L3htbCIgfSwKICAgICB7ICJ4c2wi LCAidGV4dC94c2wiIH0sCkBAIC02MiwxMiArNjYsMjMgQEAgc3RhdGljIGNvbnN0IEV4dGVuc2lv bk1hcCBleHRlbnNpb25NYXAgWwogU3RyaW5nIE1JTUVUeXBlUmVnaXN0cnk6OmdldE1JTUVUeXBl Rm9yRXh0ZW5zaW9uKGNvbnN0IFN0cmluZyAmZXh0KQogewogICAgIFN0cmluZyBzdHIgPSBleHQu bG93ZXIoKTsKKworICAgIC8vIFRyeSBzeXN0ZW0gYnVpbHQtaW4gdHlwZXMKICAgICBjb25zdCBF eHRlbnNpb25NYXAgKmV4dE1hcCA9IGV4dGVuc2lvbk1hcDsKICAgICB3aGlsZSAoZXh0TWFwLT5l eHRlbnNpb24pIHsKICAgICAgICAgaWYgKHN0ciA9PSBleHRNYXAtPmV4dGVuc2lvbikKICAgICAg ICAgICAgIHJldHVybiBleHRNYXAtPm1pbWVUeXBlOwogICAgICAgICArK2V4dE1hcDsKICAgICB9 CisKKyAgICAvLyBUcnkgc3lzdGVtIG1pbWUgZGF0YWJhc2UKKyAgICBTdHJpbmcgZmFrZUZpbGVO YW1lKCJmaWxlbmFtZS4iKTsKKyAgICBmYWtlRmlsZU5hbWUuYXBwZW5kKHN0cik7CisKKyAgICBC TWltZVR5cGUgdHlwZTsKKyAgICBpZiAoQk1pbWVUeXBlOjpHdWVzc01pbWVUeXBlKGZha2VGaWxl TmFtZS51dGY4KCkuZGF0YSgpLCAmdHlwZSkgPT0gQl9PSykKKyAgICAgICAgcmV0dXJuIHR5cGUu VHlwZSgpOworCiAgICAgLy8gdW5rbm93biwgbGV0J3MganVzdCBhc3N1bWUgcGxhaW4gdGV4dAog ICAgIHJldHVybiAidGV4dC9wbGFpbiI7CiB9Cg== 53112 2010-04-11 14:35:04 -0700 2010-04-13 02:00:00 -0700 [Haiku] Fall back to the system MIME database, return correct string for unknown types. MIMETypeRegistryHaiku.diff text/plain 3235 superstippi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzQ1OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDQtMTEgIFN0ZXBoYW4gQcOfbXVzICA8c3VwZXJzdGlwcGlA Z214LmRlPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFVzZSB0aGUgSGFpa3UgTUlNRSB0eXBlIGRhdGEgYmFzZSBhcyBhIGZhbGwgYmFjayBmb3IgdW5r bm93biBmaWxlIGV4dGVuc2lvbnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0zNDY4NgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9oYWlrdS9NSU1FVHlwZVJlZ2lzdHJ5SGFpa3UuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6KToKKyAgICAgICAgICAgIC0gZml4ZWQgY29kaW5nIHN0eWxlIGlz c3VlcworICAgICAgICAoV2ViQ29yZTo6TUlNRVR5cGVSZWdpc3RyeTo6Z2V0TUlNRVR5cGVGb3JF eHRlbnNpb24pOgorICAgICAgICAgICAgLSBmYWxsIGJhY2sgdG8gdGhlIHN5c3RlbSBNSU1FIGRh dGFiYXNlIGZvciB1bmtub3duIHR5cGVzLgorICAgICAgICAgICAgLSByZXR1cm4gZW1wdHkgU3Ry aW5nIGFzIGxhc3QgcmVzb3J0LCB0aGlzIGlzIHVzZWQKKyAgICAgICAgICAgICAgZWxzZXdoZXJl IGFzIGluZGljYXRvciBmb3IgdW5rbm93biB0eXBlcy4KKwogMjAxMC0wNC0xMCAgQWRhbSBCYXJ0 aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQuICBSZW5hbWUgbV9m b3JjZVNhbmRib3hGbGFncyB0byBtX2ZvcmNlZFNhbmRveEZsYWdzLCBhcwpJbmRleDogV2ViQ29y ZS9wbGF0Zm9ybS9oYWlrdS9NSU1FVHlwZVJlZ2lzdHJ5SGFpa3UuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvcGxhdGZvcm0vaGFpa3UvTUlNRVR5cGVSZWdpc3RyeUhhaWt1LmNwcAkocmV2aXNp b24gNTcyNzQpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2hhaWt1L01JTUVUeXBlUmVnaXN0cnlIYWlr dS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIsNiArMiw3IEBACiAgKiBDb3B5cmlnaHQgKEMpIDIw MDYgWmFjayBSdXNpbiA8emFja0BrZGUub3JnPgogICogQ29weXJpZ2h0IChDKSAyMDA2IEFwcGxl IENvbXB1dGVyLCBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAy MDA3IFRyb2xsdGVjaCBBU0EKKyAqIENvcHlyaWdodCAoQykgMjAxMCBTdGVwaGFuIEHDn211cyA8 c3VwZXJzdGlwcGlAZ214LmRlPgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291 cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBh cmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0y OSw3ICszMCw4IEBACiAjaW5jbHVkZSAiTUlNRVR5cGVSZWdpc3RyeS5oIgogCiAjaW5jbHVkZSAi UGxhdGZvcm1TdHJpbmcuaCIKLQorI2luY2x1ZGUgPE1pbWVUeXBlLmg+CisjaW5jbHVkZSA8d3Rm L3RleHQvQ1N0cmluZy5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBzdHJ1Y3QgRXh0ZW5zaW9u TWFwIHsKQEAgLTM3LDExICszOSwxMSBAQCBzdHJ1Y3QgRXh0ZW5zaW9uTWFwIHsKICAgICBjb25z dCBjaGFyKiBtaW1lVHlwZTsKIH07CiAKLXN0YXRpYyBjb25zdCBFeHRlbnNpb25NYXAgZXh0ZW5z aW9uTWFwIFtdID0geworc3RhdGljIGNvbnN0IEV4dGVuc2lvbk1hcCBzRXh0ZW5zaW9uTWFwW10g PSB7CiAgICAgeyAiYm1wIiwgImltYWdlL2JtcCIgfSwKICAgICB7ICJnaWYiLCAiaW1hZ2UvZ2lm IiB9LAogICAgIHsgImh0bWwiLCAidGV4dC9odG1sIiB9LAotICAgIHsgImljbyIsICJpbWFnZS94 LWljb24iIH0sICAgCisgICAgeyAiaWNvIiwgImltYWdlL3gtaWNvbiIgfSwKICAgICB7ICJqcGVn IiwgImltYWdlL2pwZWciIH0sCiAgICAgeyAianBnIiwgImltYWdlL2pwZWciIH0sCiAgICAgeyAi anMiLCAiYXBwbGljYXRpb24veC1qYXZhc2NyaXB0IiB9LApAQCAtNTgsMjMgKzYwLDM0IEBAIHN0 YXRpYyBjb25zdCBFeHRlbnNpb25NYXAgZXh0ZW5zaW9uTWFwIFsKICAgICB7IDAsIDAgfQogfTsK IAotLy8gRklYTUU6IFVzZSB0aGUgSGFpa3UgTUlNRSByZWdpc3RyeQotU3RyaW5nIE1JTUVUeXBl UmVnaXN0cnk6OmdldE1JTUVUeXBlRm9yRXh0ZW5zaW9uKGNvbnN0IFN0cmluZyAmZXh0KQorU3Ry aW5nIE1JTUVUeXBlUmVnaXN0cnk6OmdldE1JTUVUeXBlRm9yRXh0ZW5zaW9uKGNvbnN0IFN0cmlu ZyYgZXh0KQogewogICAgIFN0cmluZyBzdHIgPSBleHQubG93ZXIoKTsKLSAgICBjb25zdCBFeHRl bnNpb25NYXAgKmV4dE1hcCA9IGV4dGVuc2lvbk1hcDsKKworICAgIC8vIFRyeSBXZWJDb3JlIGJ1 aWx0LWluIHR5cGVzCisgICAgY29uc3QgRXh0ZW5zaW9uTWFwKiBleHRNYXAgPSBzRXh0ZW5zaW9u TWFwOwogICAgIHdoaWxlIChleHRNYXAtPmV4dGVuc2lvbikgewogICAgICAgICBpZiAoc3RyID09 IGV4dE1hcC0+ZXh0ZW5zaW9uKQogICAgICAgICAgICAgcmV0dXJuIGV4dE1hcC0+bWltZVR5cGU7 CiAgICAgICAgICsrZXh0TWFwOwogICAgIH0KLSAgICAvLyB1bmtub3duLCBsZXQncyBqdXN0IGFz c3VtZSBwbGFpbiB0ZXh0Ci0gICAgcmV0dXJuICJ0ZXh0L3BsYWluIjsKKworICAgIC8vIFRyeSBz eXN0ZW0gbWltZSBkYXRhYmFzZQorICAgIFN0cmluZyBmYWtlRmlsZU5hbWUoImZpbGVuYW1lLiIp OworICAgIGZha2VGaWxlTmFtZS5hcHBlbmQoc3RyKTsKKworICAgIEJNaW1lVHlwZSB0eXBlOwor ICAgIGlmIChCTWltZVR5cGU6Okd1ZXNzTWltZVR5cGUoZmFrZUZpbGVOYW1lLnV0ZjgoKS5kYXRh KCksICZ0eXBlKSA9PSBCX09LKQorICAgICAgICByZXR1cm4gdHlwZS5UeXBlKCk7CisKKyAgICAv LyB1bmtub3duCisgICAgcmV0dXJuIFN0cmluZygpOwogfQogCiBib29sIE1JTUVUeXBlUmVnaXN0 cnk6OmlzQXBwbGljYXRpb25QbHVnaW5NSU1FVHlwZShjb25zdCBTdHJpbmcmKQogewogICAgIHJl dHVybiBmYWxzZTsKIH0KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCg== 53233 2010-04-13 02:00:00 -0700 2010-04-13 06:45:33 -0700 [Haiku] Fall back to the system MIME database, return correct string for unknown types. MIMETypeRegistryHaiku.diff text/plain 3235 superstippi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzQ1OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDQtMTEgIFN0ZXBoYW4gQcOfbXVzICA8c3VwZXJzdGlwcGlA Z214LmRlPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFVzZSB0aGUgSGFpa3UgTUlNRSB0eXBlIGRhdGEgYmFzZSBhcyBhIGZhbGwgYmFjayBmb3IgdW5r bm93biBmaWxlIGV4dGVuc2lvbnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0zNDY4NgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9oYWlrdS9NSU1FVHlwZVJlZ2lzdHJ5SGFpa3UuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6KToKKyAgICAgICAgICAgIC0gZml4ZWQgY29kaW5nIHN0eWxlIGlz c3VlcworICAgICAgICAoV2ViQ29yZTo6TUlNRVR5cGVSZWdpc3RyeTo6Z2V0TUlNRVR5cGVGb3JF eHRlbnNpb24pOgorICAgICAgICAgICAgLSBmYWxsIGJhY2sgdG8gdGhlIHN5c3RlbSBNSU1FIGRh dGFiYXNlIGZvciB1bmtub3duIHR5cGVzLgorICAgICAgICAgICAgLSByZXR1cm4gZW1wdHkgU3Ry aW5nIGFzIGxhc3QgcmVzb3J0LCB0aGlzIGlzIHVzZWQKKyAgICAgICAgICAgICAgZWxzZXdoZXJl IGFzIGluZGljYXRvciBmb3IgdW5rbm93biB0eXBlcy4KKwogMjAxMC0wNC0xMCAgQWRhbSBCYXJ0 aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQuICBSZW5hbWUgbV9m b3JjZVNhbmRib3hGbGFncyB0byBtX2ZvcmNlZFNhbmRveEZsYWdzLCBhcwpJbmRleDogV2ViQ29y ZS9wbGF0Zm9ybS9oYWlrdS9NSU1FVHlwZVJlZ2lzdHJ5SGFpa3UuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvcGxhdGZvcm0vaGFpa3UvTUlNRVR5cGVSZWdpc3RyeUhhaWt1LmNwcAkocmV2aXNp b24gNTcyNzQpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2hhaWt1L01JTUVUeXBlUmVnaXN0cnlIYWlr dS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIsNiArMiw3IEBACiAgKiBDb3B5cmlnaHQgKEMpIDIw MDYgWmFjayBSdXNpbiA8emFja0BrZGUub3JnPgogICogQ29weXJpZ2h0IChDKSAyMDA2IEFwcGxl IENvbXB1dGVyLCBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAy MDA3IFRyb2xsdGVjaCBBU0EKKyAqIENvcHlyaWdodCAoQykgMjAxMCBTdGVwaGFuIEHDn211cyA8 c3VwZXJzdGlwcGlAZ214LmRlPgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291 cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBh cmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0y OSw3ICszMCw4IEBACiAjaW5jbHVkZSAiTUlNRVR5cGVSZWdpc3RyeS5oIgogCiAjaW5jbHVkZSAi UGxhdGZvcm1TdHJpbmcuaCIKLQorI2luY2x1ZGUgPE1pbWVUeXBlLmg+CisjaW5jbHVkZSA8d3Rm L3RleHQvQ1N0cmluZy5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBzdHJ1Y3QgRXh0ZW5zaW9u TWFwIHsKQEAgLTM3LDExICszOSwxMSBAQCBzdHJ1Y3QgRXh0ZW5zaW9uTWFwIHsKICAgICBjb25z dCBjaGFyKiBtaW1lVHlwZTsKIH07CiAKLXN0YXRpYyBjb25zdCBFeHRlbnNpb25NYXAgZXh0ZW5z aW9uTWFwIFtdID0geworc3RhdGljIGNvbnN0IEV4dGVuc2lvbk1hcCBleHRlbnNpb25NYXBbXSA9 IHsKICAgICB7ICJibXAiLCAiaW1hZ2UvYm1wIiB9LAogICAgIHsgImdpZiIsICJpbWFnZS9naWYi IH0sCiAgICAgeyAiaHRtbCIsICJ0ZXh0L2h0bWwiIH0sCi0gICAgeyAiaWNvIiwgImltYWdlL3gt aWNvbiIgfSwgICAKKyAgICB7ICJpY28iLCAiaW1hZ2UveC1pY29uIiB9LAogICAgIHsgImpwZWci LCAiaW1hZ2UvanBlZyIgfSwKICAgICB7ICJqcGciLCAiaW1hZ2UvanBlZyIgfSwKICAgICB7ICJq cyIsICJhcHBsaWNhdGlvbi94LWphdmFzY3JpcHQiIH0sCkBAIC01OCwyMyArNjAsMzQgQEAgc3Rh dGljIGNvbnN0IEV4dGVuc2lvbk1hcCBleHRlbnNpb25NYXAgWwogICAgIHsgMCwgMCB9CiB9Owog Ci0vLyBGSVhNRTogVXNlIHRoZSBIYWlrdSBNSU1FIHJlZ2lzdHJ5Ci1TdHJpbmcgTUlNRVR5cGVS ZWdpc3RyeTo6Z2V0TUlNRVR5cGVGb3JFeHRlbnNpb24oY29uc3QgU3RyaW5nICZleHQpCitTdHJp bmcgTUlNRVR5cGVSZWdpc3RyeTo6Z2V0TUlNRVR5cGVGb3JFeHRlbnNpb24oY29uc3QgU3RyaW5n JiBleHQpCiB7CiAgICAgU3RyaW5nIHN0ciA9IGV4dC5sb3dlcigpOwotICAgIGNvbnN0IEV4dGVu c2lvbk1hcCAqZXh0TWFwID0gZXh0ZW5zaW9uTWFwOworCisgICAgLy8gVHJ5IFdlYkNvcmUgYnVp bHQtaW4gdHlwZXMuCisgICAgY29uc3QgRXh0ZW5zaW9uTWFwKiBleHRNYXAgPSBleHRlbnNpb25N YXA7CiAgICAgd2hpbGUgKGV4dE1hcC0+ZXh0ZW5zaW9uKSB7CiAgICAgICAgIGlmIChzdHIgPT0g ZXh0TWFwLT5leHRlbnNpb24pCiAgICAgICAgICAgICByZXR1cm4gZXh0TWFwLT5taW1lVHlwZTsK ICAgICAgICAgKytleHRNYXA7CiAgICAgfQotICAgIC8vIHVua25vd24sIGxldCdzIGp1c3QgYXNz dW1lIHBsYWluIHRleHQKLSAgICByZXR1cm4gInRleHQvcGxhaW4iOworCisgICAgLy8gVHJ5IHN5 c3RlbSBtaW1lIGRhdGFiYXNlLgorICAgIFN0cmluZyBmYWtlRmlsZU5hbWUoImZpbGVuYW1lLiIp OworICAgIGZha2VGaWxlTmFtZS5hcHBlbmQoc3RyKTsKKworICAgIEJNaW1lVHlwZSB0eXBlOwor ICAgIGlmIChCTWltZVR5cGU6Okd1ZXNzTWltZVR5cGUoZmFrZUZpbGVOYW1lLnV0ZjgoKS5kYXRh KCksICZ0eXBlKSA9PSBCX09LKQorICAgICAgICByZXR1cm4gdHlwZS5UeXBlKCk7CisKKyAgICAv LyB1bmtub3duCisgICAgcmV0dXJuIFN0cmluZygpOwogfQogCiBib29sIE1JTUVUeXBlUmVnaXN0 cnk6OmlzQXBwbGljYXRpb25QbHVnaW5NSU1FVHlwZShjb25zdCBTdHJpbmcmKQogewogICAgIHJl dHVybiBmYWxzZTsKIH0KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCg==