144748 2015-05-07 09:34:58 -0700 [GTK] Expose allowFileAccessFromFileURLs setting to WebKit2 GTK+ API 2015-05-08 04:55:26 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned gustavo svillar oldest_to_newest 1092615 0 cgarcia 2015-05-07 09:34:58 -0700 This is needed by local applications loaded as a file URI that do XMLHttpRequests. 1092616 1 252594 cgarcia 2015-05-07 09:38:34 -0700 Created attachment 252594 Patch 1093065 2 252594 svillar 2015-05-07 23:45:01 -0700 Comment on attachment 252594 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=252594&action=review That's a r=me. Another WebKitGtk reviewer must approve the new API though > Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp:3060 > + if (currentValue == allowed) currentValue is not really needed. I think using the function call directly is explicit enough. 1093077 3 cgarcia 2015-05-07 23:57:45 -0700 (In reply to comment #2) > Comment on attachment 252594 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=252594&action=review > > That's a r=me. Another WebKitGtk reviewer must approve the new API though Thanks!, you can safely r+, cq- I won't land it until I get the second approval. > > Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp:3060 > > + if (currentValue == allowed) > > currentValue is not really needed. I think using the function call directly > is explicit enough. Yes, we have that pattern in the whole file, I don't remember if there was a reason, or we just copy-pasted every time :-) 1093163 4 252594 gustavo 2015-05-08 04:23:20 -0700 Comment on attachment 252594 Patch Yep, makes sense to me =) 1093164 5 cgarcia 2015-05-08 04:55:26 -0700 Committed r183992: <http://trac.webkit.org/changeset/183992> 252594 2015-05-07 09:38:34 -0700 2015-05-08 00:13:20 -0700 Patch wk2-file-xhr.diff text/plain 11914 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAxNzBhNzc0Li4xN2VhM2I1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjQg QEAKIDIwMTUtMDUtMDcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIEV4cG9zZSBhbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMgc2V0 dGluZyB0byBXZWJLaXQyIEdUSysgQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNDQ3NDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBUaGlzIGlzIG5lZWRlZCBieSBsb2NhbCBhcHBsaWNhdGlvbnMgbG9h ZGVkIGFzIGEgZmlsZSBVUkkgdGhhdCBkbyBYTUxIdHRwUmVxdWVzdHMuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5jcHA6CisgICAgICAgICh3ZWJLaXRTZXR0 aW5nc1NldFByb3BlcnR5KToKKyAgICAgICAgKHdlYktpdFNldHRpbmdzR2V0UHJvcGVydHkpOgor ICAgICAgICAod2Via2l0X3NldHRpbmdzX2NsYXNzX2luaXQpOgorICAgICAgICAod2Via2l0X3Nl dHRpbmdzX2dldF9hbGxvd19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJscyk6CisgICAgICAgICh3 ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay00LjAtc2VjdGlvbnMudHh0OgorICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay1kb2NzLnNnbWw6CisKKzIwMTUt MDUtMDcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCiAgICAg ICAgIFVucmV2aWV3ZWQuIFVwZGF0ZSBPcHRpb25zR1RLLmNtYWtlIGFuZCBORVdTIGZvciAyLjku MSByZWxlYXNlLgogCiAgICAgICAgICogZ3RrL05FV1M6IEFkZCByZWxlYXNlIG5vdGVzIGZvciAy LjkuMS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dFNldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNl dHRpbmdzLmNwcAppbmRleCA3NmYzYjczLi4zMjZjMGJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuY3BwCkBAIC0xNDMsNyArMTQz LDggQEAgZW51bSB7CiAgICAgUFJPUF9FTkFCTEVfV1JJVEVfQ09OU09MRV9NRVNTQUdFU19UT19T VERPVVQsCiAgICAgUFJPUF9FTkFCTEVfTUVESUFfU1RSRUFNLAogICAgIFBST1BfRU5BQkxFX1NQ QVRJQUxfTkFWSUdBVElPTiwKLSAgICBQUk9QX0VOQUJMRV9NRURJQVNPVVJDRQorICAgIFBST1Bf RU5BQkxFX01FRElBU09VUkNFLAorICAgIFBST1BfQUxMT1dfRklMRV9BQ0NFU1NfRlJPTV9GSUxF X1VSTFMKIH07CiAKIHN0YXRpYyB2b2lkIHdlYktpdFNldHRpbmdzQ29uc3RydWN0ZWQoR09iamVj dCogb2JqZWN0KQpAQCAtMzA5LDYgKzMxMCw5IEBAIHN0YXRpYyB2b2lkIHdlYktpdFNldHRpbmdz U2V0UHJvcGVydHkoR09iamVjdCogb2JqZWN0LCBndWludCBwcm9wSWQsIGNvbnN0IEdWYWx1CiAg ICAgY2FzZSBQUk9QX0VOQUJMRV9NRURJQVNPVVJDRToKICAgICAgICAgd2Via2l0X3NldHRpbmdz X3NldF9lbmFibGVfbWVkaWFzb3VyY2Uoc2V0dGluZ3MsIGdfdmFsdWVfZ2V0X2Jvb2xlYW4odmFs dWUpKTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBQUk9QX0FMTE9XX0ZJTEVfQUNDRVNTX0ZS T01fRklMRV9VUkxTOgorICAgICAgICB3ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93X2ZpbGVfYWNj ZXNzX2Zyb21fZmlsZV91cmxzKHNldHRpbmdzLCBnX3ZhbHVlX2dldF9ib29sZWFuKHZhbHVlKSk7 CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIEdfT0JKRUNUX1dBUk5fSU5W QUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3BJZCwgcGFyYW1TcGVjKTsKICAgICAgICAgYnJl YWs7CkBAIC00NjQsNyArNDY4LDkgQEAgc3RhdGljIHZvaWQgd2ViS2l0U2V0dGluZ3NHZXRQcm9w ZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BJZCwgR1ZhbHVlKiB2YWwKICAgICBjYXNl IFBST1BfRU5BQkxFX01FRElBU09VUkNFOgogICAgICAgICBnX3ZhbHVlX3NldF9ib29sZWFuKHZh bHVlLCB3ZWJraXRfc2V0dGluZ3NfZ2V0X2VuYWJsZV9tZWRpYXNvdXJjZShzZXR0aW5ncykpOwog ICAgICAgICBicmVhazsKLQorICAgIGNhc2UgUFJPUF9BTExPV19GSUxFX0FDQ0VTU19GUk9NX0ZJ TEVfVVJMUzoKKyAgICAgICAgZ192YWx1ZV9zZXRfYm9vbGVhbih2YWx1ZSwgd2Via2l0X3NldHRp bmdzX2dldF9hbGxvd19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJscyhzZXR0aW5ncykpOworICAg ICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBHX09CSkVDVF9XQVJOX0lOVkFMSURf UFJPUEVSVFlfSUQob2JqZWN0LCBwcm9wSWQsIHBhcmFtU3BlYyk7CiAgICAgICAgIGJyZWFrOwpA QCAtMTIxNyw2ICsxMjIzLDI1IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9zZXR0aW5nc19jbGFzc19p bml0KFdlYktpdFNldHRpbmdzQ2xhc3MqIGtsYXNzKQogICAgICAgICAgICAgXygiV2hldGhlciBN ZWRpYVNvdXJjZSBzaG91bGQgYmUgZW5hYmxlZC4iKSwKICAgICAgICAgICAgIEZBTFNFLAogICAg ICAgICAgICAgcmVhZFdyaXRlQ29uc3RydWN0UGFyYW1GbGFncykpOworCisgICAgLyoqCisgICAg ICogV2ViS2l0U2V0dGluZ3M6YWxsb3ctZmlsZS1hY2Nlc3MtZnJvbS1maWxlLXVybHM6CisgICAg ICoKKyAgICAgKiBXaGV0aGVyIGZpbGUgYWNjZXNzIGlzIGFsbG93ZWQgZnJvbSBmaWxlIFVSTHMu IEJ5IGRlZmF1bHQsIHdoZW4KKyAgICAgKiBzb21ldGhpbmcgaXMgbG9hZGVkIGluIGEgI1dlYktp dFdlYlZpZXcgdXNpbmcgYSBmaWxlIFVSSSwgY3Jvc3MKKyAgICAgKiBvcmlnaW4gcmVxdWVzdHMg dG8gb3RoZXIgZmlsZSByZXNvdXJjZXMgYXJlIG5vdCBhbGxvd2VkLiBUaGlzCisgICAgICogc2V0 dGluZyBhbGxvd3MgeW91IHRvIGNoYW5nZSB0aGF0IGJlaGF2aW91ciwgc28gdGhhdCBpdCB3b3Vs ZCBiZQorICAgICAqIHBvc3NpYmxlIHRvIGRvIGEgWE1MSHR0cFJlcXVlc3Qgb2YgYSBsb2NhbCBm aWxlLCBmb3IgZXhhbXBsZS4KKyAgICAgKgorICAgICAqIFNpbmNlOiAyLjEwCisgICAgICovCisg ICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9wcm9wZXJ0eShnT2JqZWN0Q2xhc3MsCisgICAgICAg IFBST1BfQUxMT1dfRklMRV9BQ0NFU1NfRlJPTV9GSUxFX1VSTFMsCisgICAgICAgIGdfcGFyYW1f c3BlY19ib29sZWFuKCJhbGxvdy1maWxlLWFjY2Vzcy1mcm9tLWZpbGUtdXJscyIsCisgICAgICAg ICAgICBfKCJBbGxvdyBmaWxlIGFjY2VzcyBmcm9tIGZpbGUgVVJMcyIpLAorICAgICAgICAgICAg XygiV2hldGhlciBmaWxlIGFjY2VzcyBpcyBhbGxvd2VkIGZyb20gZmlsZSBVUkxzLiIpLAorICAg ICAgICAgICAgRkFMU0UsCisgICAgICAgICAgICByZWFkV3JpdGVDb25zdHJ1Y3RQYXJhbUZsYWdz KSk7CiB9CiAKIFdlYlByZWZlcmVuY2VzKiB3ZWJraXRTZXR0aW5nc0dldFByZWZlcmVuY2VzKFdl YktpdFNldHRpbmdzKiBzZXR0aW5ncykKQEAgLTI5OTksMyArMzAyNCw0MiBAQCB2b2lkIHdlYmtp dF9zZXR0aW5nc19zZXRfZW5hYmxlX21lZGlhc291cmNlKFdlYktpdFNldHRpbmdzKiBzZXR0aW5n cywgZ2Jvb2xlYW4gZQogICAgIHByaXYtPnByZWZlcmVuY2VzLT5zZXRNZWRpYVNvdXJjZUVuYWJs ZWQoZW5hYmxlZCk7CiAgICAgZ19vYmplY3Rfbm90aWZ5KEdfT0JKRUNUKHNldHRpbmdzKSwgImVu YWJsZS1tZWRpYXNvdXJjZSIpOwogfQorCisvKioKKyAqIHdlYmtpdF9zZXR0aW5nc19nZXRfYWxs b3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHM6CisgKiBAc2V0dGluZ3M6IGEgI1dlYktpdFNl dHRpbmdzCisgKgorICogR2V0IHRoZSAjV2ViS2l0U2V0dGluZ3M6YWxsb3ctZmlsZS1hY2Nlc3Mt ZnJvbS1maWxlLXVybHMgcHJvcGVydHkuCisgKgorICogUmV0dXJuczogJVRSVUUgSWYgZmlsZSBh Y2Nlc3MgZnJvbSBmaWxlIFVSTHMgaXMgYWxsb3dlZCBvciAlRkFMU0Ugb3RoZXJ3aXNlLgorICoK KyAqIFNpbmNlOiAyLjEwCisgKi8KK2dib29sZWFuIHdlYmtpdF9zZXR0aW5nc19nZXRfYWxsb3df ZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHMoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzKQorewor ICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19TRVRUSU5HUyhzZXR0aW5ncyksIEZB TFNFKTsKKworICAgIHJldHVybiBzZXR0aW5ncy0+cHJpdi0+cHJlZmVyZW5jZXMtPmFsbG93Rmls ZUFjY2Vzc0Zyb21GaWxlVVJMcygpOworfQorCisvKioKKyAqIHdlYmtpdF9zZXR0aW5nc19zZXRf YWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHM6CisgKiBAc2V0dGluZ3M6IGEgI1dlYktp dFNldHRpbmdzCisgKiBAYWxsb3dlZDogVmFsdWUgdG8gYmUgc2V0CisgKgorICogU2V0IHRoZSAj V2ViS2l0U2V0dGluZ3M6YWxsb3ctZmlsZS1hY2Nlc3MtZnJvbS1maWxlLXVybHMgcHJvcGVydHku CisgKgorICogU2luY2U6IDIuMTAKKyAqLwordm9pZCB3ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93 X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzKFdlYktpdFNldHRpbmdzKiBzZXR0aW5ncywgZ2Jv b2xlYW4gYWxsb3dlZCkKK3sKKyAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19TRVRUSU5H UyhzZXR0aW5ncykpOworCisgICAgV2ViS2l0U2V0dGluZ3NQcml2YXRlKiBwcml2ID0gc2V0dGlu Z3MtPnByaXY7CisgICAgYm9vbCBjdXJyZW50VmFsdWUgPSBwcml2LT5wcmVmZXJlbmNlcy0+YWxs b3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzKCk7CisgICAgaWYgKGN1cnJlbnRWYWx1ZSA9PSBhbGxv d2VkKQorICAgICAgICByZXR1cm47CisKKyAgICBwcml2LT5wcmVmZXJlbmNlcy0+c2V0QWxsb3dG aWxlQWNjZXNzRnJvbUZpbGVVUkxzKGFsbG93ZWQpOworICAgIGdfb2JqZWN0X25vdGlmeShHX09C SkVDVChzZXR0aW5ncyksICJhbGxvdy1maWxlLWFjY2Vzcy1mcm9tLWZpbGUtdXJscyIpOworfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGlu Z3MuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmgK aW5kZXggNjZlNjg3Zi4uZDllYzQ4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5oCkBAIC00MTQsNiArNDE0LDEzIEBAIFdFQktJVF9B UEkgdm9pZAogd2Via2l0X3NldHRpbmdzX3NldF9lbmFibGVfbWVkaWFzb3VyY2UgICAgICAgICAg ICAgICAgICAgICAgICAgKFdlYktpdFNldHRpbmdzICpzZXR0aW5ncywKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnYm9vbGVh biAgICAgICAgZW5hYmxlZCk7CiAKK1dFQktJVF9BUEkgZ2Jvb2xlYW4KK3dlYmtpdF9zZXR0aW5n c19nZXRfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHMgICAgICAgICAgIChXZWJLaXRT ZXR0aW5ncyAqc2V0dGluZ3MpOworCitXRUJLSVRfQVBJIHZvaWQKK3dlYmtpdF9zZXR0aW5nc19z ZXRfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHMgICAgICAgICAgIChXZWJLaXRTZXR0 aW5ncyAqc2V0dGluZ3MsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZ2Jvb2xlYW4gICAgICAgIGFsbG93ZWQpOworCiBHX0VO RF9ERUNMUwogCiAjZW5kaWYgLyogV2ViS2l0U2V0dGluZ3NfaCAqLwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQyZ3RrLTQuMC1zZWN0aW9u cy50eHQgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGst NC4wLXNlY3Rpb25zLnR4dAppbmRleCBiY2Q1ZjRkLi5lNTAyYmQ3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstNC4wLXNlY3Rpb25z LnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJn dGstNC4wLXNlY3Rpb25zLnR4dApAQCAtNDMxLDYgKzQzMSw4IEBAIHdlYmtpdF9zZXR0aW5nc19n ZXRfZW5hYmxlX3NwYXRpYWxfbmF2aWdhdGlvbgogd2Via2l0X3NldHRpbmdzX3NldF9lbmFibGVf c3BhdGlhbF9uYXZpZ2F0aW9uCiB3ZWJraXRfc2V0dGluZ3NfZ2V0X2VuYWJsZV9tZWRpYXNvdXJj ZQogd2Via2l0X3NldHRpbmdzX3NldF9lbmFibGVfbWVkaWFzb3VyY2UKK3dlYmtpdF9zZXR0aW5n c19nZXRfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHMKK3dlYmtpdF9zZXR0aW5nc19z ZXRfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHMKIAogPFNVQlNFQ1RJT04gU3RhbmRh cmQ+CiBXZWJLaXRTZXR0aW5nc0NsYXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstZG9jcy5zZ21sIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQyZ3RrLWRvY3Muc2dtbAppbmRleCA1YTg1YmI0 Li4zNGQ4Zjg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9k b2NzL3dlYmtpdDJndGstZG9jcy5zZ21sCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay1kb2NzLnNnbWwKQEAgLTg5LDUgKzg5LDEwIEBACiAgICAg PHhpOmluY2x1ZGUgaHJlZj0ieG1sL2FwaS1pbmRleC0yLjgueG1sIj48eGk6ZmFsbGJhY2sgLz48 L3hpOmluY2x1ZGU+CiAgIDwvaW5kZXg+CiAKKyAgPGluZGV4IGlkPSJhcGktaW5kZXgtMi0xMCIg cm9sZT0iMi4xMCI+CisgICAgPHRpdGxlPkluZGV4IG9mIG5ldyBzeW1ib2xzIGluIDIuMTA8L3Rp dGxlPgorICAgIDx4aTppbmNsdWRlIGhyZWY9InhtbC9hcGktaW5kZXgtMi4xMC54bWwiPjx4aTpm YWxsYmFjayAvPjwveGk6aW5jbHVkZT4KKyAgPC9pbmRleD4KKwogICA8eGk6aW5jbHVkZSBocmVm PSJ4bWwvYW5ub3RhdGlvbi1nbG9zc2FyeS54bWwiPjx4aTpmYWxsYmFjayAvPjwveGk6aW5jbHVk ZT4KIDwvYm9vaz4KZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxv ZwppbmRleCAxOTU3MzllLi4yNzczNTNiIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysr IGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTUtMDUtMDcgIENhcmxvcyBH YXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEV4cG9z ZSBhbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMgc2V0dGluZyB0byBXZWJLaXQyIEdUSysgQVBJ CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQ3NDgK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2ViS2l0U2V0dGluZ3MuY3BwOgorICAgICAg ICAodGVzdFdlYktpdFNldHRpbmdzKTogQ2hlY2sgdGhlIG5ldyBzZXR0aW5nIGlzIGNvcnJlY3Rs eQorICAgICAgICBpbml0aWFsaXplZCBhbmQgdXBkYXRlZC4KKyAgICAgICAgKiBUZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdDJHdGsvVGVzdFdlYktpdFdlYkNvbnRleHQuY3BwOgorICAgICAgICAo dGVzdFdlYkNvbnRleHRTZWN1cml0eUZpbGVYSFIpOiBDaGVjayBYSFIgdG8gbG9jYWwgZmlsZXMg aXMKKyAgICAgICAgYWxsb3dlZCBmcm9tIGZpbGUgVVJMcyBhZnRlciBjaGFuZ2luZyB0aGUgc2V0 dGluZy4KKyAgICAgICAgKGJlZm9yZUFsbCk6IEFkZCBuZXcgdGVzdC4KKwogMjAxNS0wNS0wNiAg QWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBpT1MgYnVpbGQg Zml4IGF0dGVtcHQKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Mkd0ay9UZXN0V2ViS2l0U2V0dGluZ3MuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXQyR3RrL1Rlc3RXZWJLaXRTZXR0aW5ncy5jcHAKaW5kZXggZmIxMDkxOC4uNzA3Y2Y3OCAx MDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RXZWJL aXRTZXR0aW5ncy5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3Rr L1Rlc3RXZWJLaXRTZXR0aW5ncy5jcHAKQEAgLTI3Myw2ICsyNzMsMTEgQEAgc3RhdGljIHZvaWQg dGVzdFdlYktpdFNldHRpbmdzKFRlc3QqLCBnY29uc3Rwb2ludGVyKQogICAgIHdlYmtpdF9zZXR0 aW5nc19zZXRfZW5hYmxlX21lZGlhc291cmNlKHNldHRpbmdzLCBUUlVFKTsKICAgICBnX2Fzc2Vy dCh3ZWJraXRfc2V0dGluZ3NfZ2V0X2VuYWJsZV9tZWRpYXNvdXJjZShzZXR0aW5ncykpOwogCisg ICAgLy8gRmlsZSBhY2Nlc3MgZnJvbSBmaWxlIFVSTHMgaXMgbm90IGFsbG93ZWQgYnkgZGVmYXVs dC4KKyAgICBnX2Fzc2VydCghd2Via2l0X3NldHRpbmdzX2dldF9hbGxvd19maWxlX2FjY2Vzc19m cm9tX2ZpbGVfdXJscyhzZXR0aW5ncykpOworICAgIHdlYmtpdF9zZXR0aW5nc19zZXRfYWxsb3df ZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHMoc2V0dGluZ3MsIFRSVUUpOworICAgIGdfYXNzZXJ0 KHdlYmtpdF9zZXR0aW5nc19nZXRfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHMoc2V0 dGluZ3MpKTsKKwogICAgIGdfb2JqZWN0X3VucmVmKEdfT0JKRUNUKHNldHRpbmdzKSk7CiB9CiAK ZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2Vi S2l0V2ViQ29udGV4dC5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsv VGVzdFdlYktpdFdlYkNvbnRleHQuY3BwCmluZGV4IDMxYjU1ZjkuLmY4YTNhZTEgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2ViS2l0V2ViQ29u dGV4dC5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RX ZWJLaXRXZWJDb250ZXh0LmNwcApAQCAtNDExLDYgKzQxMSwzOSBAQCBzdGF0aWMgdm9pZCB0ZXN0 V2ViQ29udGV4dFNlY3VyaXR5UG9saWN5KFNlY3VyaXR5UG9saWN5VGVzdCogdGVzdCwgZ2NvbnN0 cG9pbnRlcgogICAgICAgICB8IFNlY3VyaXR5UG9saWN5VGVzdDo6Q09SU0VuYWJsZWQgfCBTZWN1 cml0eVBvbGljeVRlc3Q6OkVtcHR5RG9jdW1lbnQpOwogfQogCitzdGF0aWMgdm9pZCB0ZXN0V2Vi Q29udGV4dFNlY3VyaXR5RmlsZVhIUihXZWJWaWV3VGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikK K3sKKyAgICBHVW5pcXVlUHRyPGNoYXI+IGZpbGVVUkwoZ19zdHJkdXBfcHJpbnRmKCJmaWxlOi8v JXMvc2ltcGxlLmh0bWwiLCBUZXN0OjpnZXRSZXNvdXJjZXNEaXIoVGVzdDo6V2ViS2l0MlJlc291 cmNlcykuZGF0YSgpKSk7CisgICAgdGVzdC0+bG9hZFVSSShmaWxlVVJMLmdldCgpKTsKKyAgICB0 ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKKworICAgIEdVbmlxdWVQdHI8Y2hhcj4ganNv blVSTChnX3N0cmR1cF9wcmludGYoImZpbGU6Ly8lcy9zaW1wbGUuanNvbiIsIFRlc3Q6OmdldFJl c291cmNlc0RpcigpLmRhdGEoKSkpOworICAgIEdVbmlxdWVQdHI8Y2hhcj4geGhyKGdfc3RyZHVw X3ByaW50ZigidmFyIHhociA9IG5ldyBYTUxIdHRwUmVxdWVzdDsgeGhyLm9wZW4oXCJHRVRcIiwg XCIlc1wiKTsgeGhyLnNlbmQoKTsiLCBqc29uVVJMLmdldCgpKSk7CisKKyAgICAvLyBCeSBkZWZh dWx0IGZpbGUgYWNjZXNzIGlzIG5vdCBhbGxvd2VkLCB0aGlzIHdpbGwgZmFpbCB3aXRoIGEgY3Jv c3Mtb3JpZ2luIGVycm9yLgorICAgIEdVbmlxdWVPdXRQdHI8R0Vycm9yPiBlcnJvcjsKKyAgICBX ZWJLaXRKYXZhc2NyaXB0UmVzdWx0KiBqYXZhc2NyaXB0UmVzdWx0ID0gdGVzdC0+cnVuSmF2YVNj cmlwdEFuZFdhaXRVbnRpbEZpbmlzaGVkKHhoci5nZXQoKSwgJmVycm9yLm91dFB0cigpKTsKKyAg ICBnX2Fzc2VydCghamF2YXNjcmlwdFJlc3VsdCk7CisgICAgZ19hc3NlcnRfZXJyb3IoZXJyb3Iu Z2V0KCksIFdFQktJVF9KQVZBU0NSSVBUX0VSUk9SLCBXRUJLSVRfSkFWQVNDUklQVF9FUlJPUl9T Q1JJUFRfRkFJTEVEKTsKKworICAgIC8vIEFsbG93IGZpbGUgYWNjZXNzIGZyb20gZmlsZSBVUkxz LgorICAgIHdlYmtpdF9zZXR0aW5nc19zZXRfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3Vy bHMod2Via2l0X3dlYl92aWV3X2dldF9zZXR0aW5ncyh0ZXN0LT5tX3dlYlZpZXcpLCBUUlVFKTsK KyAgICB0ZXN0LT5sb2FkVVJJKGZpbGVVUkwuZ2V0KCkpOworICAgIHRlc3QtPndhaXRVbnRpbExv YWRGaW5pc2hlZCgpOworICAgIGphdmFzY3JpcHRSZXN1bHQgPSB0ZXN0LT5ydW5KYXZhU2NyaXB0 QW5kV2FpdFVudGlsRmluaXNoZWQoeGhyLmdldCgpLCAmZXJyb3Iub3V0UHRyKCkpOworICAgIGdf YXNzZXJ0KGphdmFzY3JpcHRSZXN1bHQpOworICAgIGdfYXNzZXJ0KCFlcnJvcik7CisKKyAgICAv LyBJdCBpc24ndCBzdGlsbCBwb3NzaWJsZSB0byBsb2FkIGZpbGUgZnJvbSBhbiBIVFRQIFVSTC4K KyAgICB0ZXN0LT5sb2FkVVJJKGtTZXJ2ZXItPmdldFVSSUZvclBhdGgoIi8iKS5kYXRhKCkpOwor ICAgIHRlc3QtPndhaXRVbnRpbExvYWRGaW5pc2hlZCgpOworICAgIGphdmFzY3JpcHRSZXN1bHQg PSB0ZXN0LT5ydW5KYXZhU2NyaXB0QW5kV2FpdFVudGlsRmluaXNoZWQoeGhyLmdldCgpLCAmZXJy b3Iub3V0UHRyKCkpOworICAgIGdfYXNzZXJ0KCFqYXZhc2NyaXB0UmVzdWx0KTsKKyAgICBnX2Fz c2VydF9lcnJvcihlcnJvci5nZXQoKSwgV0VCS0lUX0pBVkFTQ1JJUFRfRVJST1IsIFdFQktJVF9K QVZBU0NSSVBUX0VSUk9SX1NDUklQVF9GQUlMRUQpOworCisgICAgd2Via2l0X3NldHRpbmdzX3Nl dF9hbGxvd19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJscyh3ZWJraXRfd2ViX3ZpZXdfZ2V0X3Nl dHRpbmdzKHRlc3QtPm1fd2ViVmlldyksIEZBTFNFKTsKK30KKwogdm9pZCBiZWZvcmVBbGwoKQog ewogICAgIGtTZXJ2ZXIgPSBuZXcgV2ViS2l0VGVzdFNlcnZlcigpOwpAQCAtNDIzLDYgKzQ1Niw3 IEBAIHZvaWQgYmVmb3JlQWxsKCkKICAgICBUZXN0OjphZGQoIldlYktpdFdlYkNvbnRleHQiLCAi c3BlbGwtY2hlY2tlciIsIHRlc3RXZWJDb250ZXh0U3BlbGxDaGVja2VyKTsKICAgICBXZWJWaWV3 VGVzdDo6YWRkKCJXZWJLaXRXZWJDb250ZXh0IiwgImxhbmd1YWdlcyIsIHRlc3RXZWJDb250ZXh0 TGFuZ3VhZ2VzKTsKICAgICBTZWN1cml0eVBvbGljeVRlc3Q6OmFkZCgiV2ViS2l0U2VjdXJpdHlN YW5hZ2VyIiwgInNlY3VyaXR5LXBvbGljeSIsIHRlc3RXZWJDb250ZXh0U2VjdXJpdHlQb2xpY3kp OworICAgIFdlYlZpZXdUZXN0OjphZGQoIldlYktpdFNlY3VyaXR5TWFuYWdlciIsICJmaWxlLXho ciIsIHRlc3RXZWJDb250ZXh0U2VjdXJpdHlGaWxlWEhSKTsKIH0KIAogdm9pZCBhZnRlckFsbCgp Cg==