131379 2014-04-08 11:59:13 -0700 [GTK] [Stable] Backport "Allow passing extra initialization data to web extensions" 2014-05-05 07:03:18 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID P2 Normal --- 1 swagiaal webkit-unassigned cgarcia gustavo oldest_to_newest 998686 0 swagiaal 2014-04-08 11:59:13 -0700 The fix for Bug 125990 introduces great API. Would it make sense to backport this to the 2.2 series ? Should I add something tot he wiki ? I tried cherry-picking the patch and it seems to work correctly. I will attach my patch although I am not sure I have resolved conflicts correctly. 998688 1 228863 swagiaal 2014-04-08 12:00:55 -0700 Created attachment 228863 A cherry pick of 4c113670 "Allow passing extra data to web extensions" 1006329 2 cgarcia 2014-05-03 02:50:58 -0700 New features and new API are not allowed in stable branches (unless there's a good reason and changes are very low risk ones). Why don't you upgrade to 2.4 instead? 1006616 3 swagiaal 2014-05-05 07:03:18 -0700 (In reply to comment #2) > New features and new API are not allowed in stable branches Yeah, that makes sense. > Why don't you upgrade to 2.4 instead? That should not be a problem. The way I plan to implement this in Eclipse is to check for a minimum version of WebKit2 and if that is not available fall back on WebKit1. I just wanted to keep the WebKit2 version requirement as small as possible. 228863 2014-04-08 12:00:55 -0700 2014-04-08 12:00:55 -0700 A cherry pick of 4c113670 "Allow passing extra data to web extensions" cherry-pick-pass-extra-data-to-web-extensions.patch text/plain 22520 swagiaal Y29tbWl0IDI1MzkyMDRkMzJiMTRlN2ZiMjBiZDEwMmU4OWI2ZGQ2ODNiNzJlOTIKQXV0aG9yOiBj b21taXQtcXVldWVAd2Via2l0Lm9yZyA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmdAMjY4ZjQ1Y2Mt Y2QwOS0wNDEwLWFiM2MtZDUyNjkxYjRkYmZjPgpEYXRlOiAgIFR1ZSBKYW4gMjEgMTQ6NTc6NDUg MjAxNCArMDAwMAoKICAgIFtHVEtdIEFsbG93IHBhc3NpbmcgZXh0cmEgZGF0YSB0byB3ZWIgZXh0 ZW5zaW9ucwogICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTk5 MAogICAgCiAgICBQYXRjaCBieSBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvIDxhcGVyZXpAaWdhbGlh LmNvbT4gb24gMjAxNC0wMS0yMQogICAgUmV2aWV3ZWQgYnkgQ2FybG9zIEdhcmNpYSBDYW1wb3Mu CiAgICAKICAgIEFsbG93IHBhc3NpbmcgYWRkaXRpb25hbCBpbmZvcm1hdGlvbiB0byB0aGUgaW5q ZWN0ZWQgYnVuZGxlLiBPbiB0b3AKICAgIG9mIHRoZSBzdHJpbmcgY29udGFpbmluZyB0aGUgcGF0 aCB0byB0aGUgd2ViIGV4dGVuc2lvbnMgZGlyZWN0b3J5LAogICAgYSBHVmFyaWFudCBjYW4gYmUg c2V0IHdpdGggYWRkaXRpb25hbCBkYXRhIHVzaW5nCiAgICB3ZWJraXRfd2ViX2NvbnRleHRfc2V0 X3dlYl9leHRlbnNpb25zX2luaXRpYWxpemF0aW9uX3VzZXJfZGF0YSgpLgogICAgQWxzbywgYSBu ZXcgaW5pdGlhbGl6ZS13ZWItZXh0ZW5zaW9ucyBzaWduYWwgaXMgZW1pdHRlZCBiZWZvcmUKICAg IGxhdW5jaGluZyBhIG5ldyBXZWJQcm9jZXNzIHRvIGFsbG93IHNldHRpbmcgZGlmZmVyZW50IHVz ZXIgZGF0YQogICAgZm9yIGVhY2ggcHJvY2Vzcy4gVGhlIEdWYXJpYW50IGlzIHNlcmlhbGl6ZWQg YXMgYSBzdHJpbmcsIHBhc3NlZAogICAgdG8gdGhlIGluamVjdGVkIGJ1bmRsZSwgYW5kIHRoZSBp bmplY3RlZCBidW5kbGUgZGVzZXJpYWxpemVzIGJhY2sKICAgIHRoZSBkYXRhLCB3aGljaCBpcyBw YXNzZWQgdG8gd2ViIGV4dGVuc2lvbnMgd2hpY2ggZGVmaW5lIHRoZQogICAgd2Via2l0X3dlYl9l eHRlbnNpb25faW5pdGlhbGl6ZV93aXRoX3VzZXJfZGF0YSgpIGZ1bmN0aW9uIChmb3IKICAgIGJh Y2t3YXJkcyBjb21wYXRpYmlsaXR5LCB3ZWJraXRfd2ViX2V4dGVuc2lvbl9pbml0aWFsaXplKCkg aXMKICAgIHVzZWQgYXMgYSBmYWxsYmFjay4pCiAgICAKICAgIFNvdXJjZS9XZWJLaXQyOgogICAg CiAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEluamVjdGVkQnVuZGxlQ2xpZW50LmNwcDoK ICAgIChnZXRJbmplY3RlZEJ1bmRsZUluaXRpYWxpemF0aW9uVXNlckRhdGEpOiBEZWZpbmUgbmV3 IGNhbGxiYWNrCiAgICBmdW5jdGlvbiB3aGljaCBjYXVzZXMgZW1pc3Npb24gb2YgdGhlIGluaXRp YWxpemUtd2ViLWV4dGVuc2lvbnMKICAgIHNpZ25hbCwgYW5kIHNlcmlhbGl6ZXMgdGhlIGRhdGEg dG8gYmUgcGFzc2VkIHRvIHRoZSB3ZWIgcHJvY2Vzcy4KICAgIChhdHRhY2hJbmplY3RlZEJ1bmRs ZUNsaWVudFRvQ29udGV4dCk6IFNldCB0aGUKICAgIGdldEluamVjdGVkQnVuZGxlSW5pdGlhbGl6 YXRpb25Vc2VyRGF0YSgpIGNhbGxiYWNrLgogICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRX ZWJDb250ZXh0LmNwcDoKICAgICh3ZWJraXRfd2ViX2NvbnRleHRfY2xhc3NfaW5pdCk6IERlZmlu ZSB0aGUKICAgIGluaXRpYWxpemUtd2ViLWV4dGVuc2lvbnMgc2lnbmFsLgogICAgKHdlYmtpdF93 ZWJfY29udGV4dF9zZXRfd2ViX2V4dGVuc2lvbnNfZGlyZWN0b3J5KToKICAgIFdlYiBleHRlbnNp b25zIGRpcmVjdG9yeSBhcyBub3cgbWVtYmVyIG9mIFdlYktpdFdlYkNvbnRleHRQcml2YXRlLAog ICAgdG8gYmUgYWJsZSB0byByZXRyaWV2ZSBpdCBsYXRlci4KICAgICh3ZWJraXRfd2ViX2NvbnRl eHRfc2V0X3dlYl9leHRlbnNpb25zX2luaXRpYWxpemF0aW9uX3VzZXJfZGF0YSk6CiAgICBOZXcg QVBJIG1ldGhvZCB0byBzZXQgdGhlIHVzZXIgZGF0YSBwYXNzZWQgdG8gdGhlIHdlYiBleHRlbnNp b25zCiAgICB3aGVuIGluaXRpYWxpemVkLgogICAgKHdlYmtpdFdlYkNvbnRleHRJbml0aWFsaXpl V2ViRXh0ZW5zaW9ucyk6IFByaXZhdGUgZnVuY3Rpb24gdXNlZAogICAgdG8gdHJpZ2dlciBlbWlz c2lvbiBvZiB0aGUgaW5pdGlhbGl6ZS13ZWItZXh0ZW5zaW9ucyBzaWduYWwuCiAgICAqIFVJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuaDoKICAgIEFkZGVkIHByb3RvdHlwZSBmb3Ig bmV3IEFQSSBtZXRob2QKICAgIHdlYmtpdF93ZWJfY29udGV4dF9zZXRfd2ViX2V4dGVuc2lvbnNf aW5pdGlhbGl6YXRpb25fdXNlcl9kYXRhKCkuCiAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dFdlYkNvbnRleHRQcml2YXRlLmg6CiAgICBQcm90b3R5cGUgb2YgdGhlIG5ldyBwcml2YXRlIGZ1 bmN0aW9uLgogICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstc2VjdGlvbnMu dHh0OgogICAgQWRkIG5ldyBwdWJsaWMgQVBJIGJpdHMgdG8gdGhlIGRvY3VtZW50YXRpb24uCiAg ICAqIFdlYlByb2Nlc3MvZ3RrL1dlYkd0a0V4dGVuc2lvbk1hbmFnZXIuY3BwOgogICAgKFdlYktp dDo6V2ViR3RrRXh0ZW5zaW9uTWFuYWdlcjo6aW5pdGlhbGl6ZSk6CiAgICBEZXNlcmlhbGl6ZSB0 aGUgZGF0YSByZWNlaXZlZCBmcm9tIHRoZSBVSSBwcm9jZXNzIGFuZCBwYXNzIGl0IHRvCiAgICB3 ZWJraXRfd2ViX2V4dGVuc2lvbl9pbml0aWFsaXplX3dpdGhfdXNlcl9kYXRhKCkgaWYgYXZhaWxh YmxlLAogICAga2VlcGluZyB3ZWJraXRfd2ViX2V4dGVuc2lvbl9pbml0aWFsaXplKCkgYXMgZmFs bGJhY2suCiAgICAKICAgIFRvb2xzOgogICAgCiAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Mkd0ay9UZXN0V2ViRXh0ZW5zaW9ucy5jcHA6CiAgICAoaW5pdGlhbGl6ZVdlYkV4dGVuc2lv bnMpOiBIYW5kbGVzIHRoZSBpbml0aWFsaXplLXdlYi1leHRlbnNpb25zCiAgICBzaWduYWwsIGFu ZCBzZXRzIHRoZSB3ZWIgZXh0ZW5zaW9ucyBkaXJlY3RvcnkgYW5kIHRoZSBpbml0aWFsaXphdGlv bgogICAgdXNlciBkYXRhLgogICAgKHRlc3RXZWJFeHRlbnNpb25Jbml0aWFsaXphdGlvblVzZXJE YXRhKTogTmV3IHRlc3QgY2FzZSBmb3IgY2hlY2tpbmcKICAgIHRoZSB1c2VyIGRhdGEgcGFzc2Vk IG9uIGluaXRpYWxpemF0aW9uIHRvIHdlYiBleHRlbnNpb25zLgogICAgKiBUZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdDJHdGsvV2ViRXh0ZW5zaW9uVGVzdC5jcHA6CiAgICAobWV0aG9kQ2FsbENh bGxiYWNrKTogQWRkZWQgaW1wbGVtZW50YXRpb24gZm9yIHRoZQogICAgR2V0SW5pdGlhbGl6YXRp b25Vc2VyRGF0YSBELUJ1cyBtZXRob2QsIHVzZWQgYnkKICAgIHRlc3RXZWJFeHRlbnNpb25Jbml0 aWFsaXphdGlvblVzZXJEYXRhKCkuCiAgICAod2Via2l0X3dlYl9leHRlbnNpb25faW5pdGlhbGl6 ZV93aXRoX3VzZXJfZGF0YSk6IERlZmluZSB0aGUKICAgIGluaXRpYWxpemF0aW9uIGZ1bmN0aW9u IHdpdGggdGhlIGFkZGl0aW9uYWwgdXNlciBkYXRhIHBhcmFtZXRlci4KICAgIAogICAgZ2l0LXN2 bi1pZDogaHR0cDovL3N2bi53ZWJraXQub3JnL3JlcG9zaXRvcnkvd2Via2l0L3RydW5rQDE2MjQ0 MSAyNjhmNDVjYy1jZDA5LTA0MTAtYWIzYy1kNTI2OTFiNGRiZmMKICAgIAogICAgQ29uZmxpY3Rz OgogICAgCVNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwogICAgCVNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdEluamVjdGVkQnVuZGxlQ2xpZW50LmNwcAogICAgCVNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3BwCiAgICAJVG9vbHMv Q2hhbmdlTG9nCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0SW5qZWN0ZWRCdW5kbGVDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0SW5qZWN0ZWRCdW5kbGVDbGllbnQuY3BwCmluZGV4IDI2YTZmOGYuLjJl MWVmMzhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRJbmplY3RlZEJ1bmRsZUNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0SW5qZWN0ZWRCdW5kbGVDbGllbnQuY3BwCkBAIC0xMTgsNiArMTE4LDEz IEBAIHN0YXRpYyB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxlKFdLQ29u dGV4dFJlZiwgV0tTdHJpbmdSZWYgbWVzc2FnCiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgp OwogfQogCitzdGF0aWMgV0tUeXBlUmVmIGdldEluamVjdGVkQnVuZGxlSW5pdGlhbGl6YXRpb25V c2VyRGF0YShXS0NvbnRleHRSZWYsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCit7CisgICAgR1Jl ZlB0cjxHVmFyaWFudD4gZGF0YSA9IHdlYmtpdFdlYkNvbnRleHRJbml0aWFsaXplV2ViRXh0ZW5z aW9ucyhXRUJLSVRfV0VCX0NPTlRFWFQoY2xpZW50SW5mbykpOworICAgIEdPd25QdHI8Z2NoYXI+ IGRhdGFTdHJpbmcoZ192YXJpYW50X3ByaW50KGRhdGEuZ2V0KCksIFRSVUUpKTsKKyAgICByZXR1 cm4gc3RhdGljX2Nhc3Q8V0tUeXBlUmVmPihXS1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZyhk YXRhU3RyaW5nLmdldCgpKSk7Cit9CisKIHZvaWQgYXR0YWNoSW5qZWN0ZWRCdW5kbGVDbGllbnRU b0NvbnRleHQoV2ViS2l0V2ViQ29udGV4dCogd2ViQ29udGV4dCkKIHsKICAgICBXS0NvbnRleHRJ bmplY3RlZEJ1bmRsZUNsaWVudCB3a0luamVjdGVkQnVuZGxlQ2xpZW50ID0gewpAQCAtMTI1LDcg KzEzMiw3IEBAIHZvaWQgYXR0YWNoSW5qZWN0ZWRCdW5kbGVDbGllbnRUb0NvbnRleHQoV2ViS2l0 V2ViQ29udGV4dCogd2ViQ29udGV4dCkKICAgICAgICAgd2ViQ29udGV4dCwgLy8gY2xpZW50SW5m bwogICAgICAgICBkaWRSZWNlaXZlTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZSwKICAgICAgICAg MCwgLy8gZGlkUmVjZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZQotICAg ICAgICAwIC8vIGdldEluamVjdGVkQnVuZGxlSW5pdGlhbGl6YXRpb25Vc2VyRGF0YQorICAgICAg ICBnZXRJbmplY3RlZEJ1bmRsZUluaXRpYWxpemF0aW9uVXNlckRhdGEKICAgICB9OwogICAgIFdL Q29udGV4dFNldEluamVjdGVkQnVuZGxlQ2xpZW50KHRvQVBJKHdlYmtpdFdlYkNvbnRleHRHZXRD b250ZXh0KHdlYkNvbnRleHQpKSwgJndrSW5qZWN0ZWRCdW5kbGVDbGllbnQpOwogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNw cAppbmRleCBkMmM4YmJkLi5kMDAyMzFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcApAQCAtNzksNiArNzksNyBAQCB1 c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogCiBlbnVtIHsKICAgICBET1dOTE9BRF9TVEFSVEVELAor ICAgIElOSVRJQUxJWkVfV0VCX0VYVEVOU0lPTlMsCiAKICAgICBMQVNUX1NJR05BTAogfTsKQEAg LTE0NSw2ICsxNDYsOSBAQCBzdHJ1Y3QgX1dlYktpdFdlYkNvbnRleHRQcml2YXRlIHsKIAogICAg IEhhc2hNYXA8dWludDY0X3QsIFdlYktpdFdlYlZpZXcqPiB3ZWJWaWV3czsKICAgICBHUmVmUHRy PFdlYktpdFdlYlZpZXdHcm91cD4gZGVmYXVsdFdlYlZpZXdHcm91cDsKKworICAgIENTdHJpbmcg d2ViRXh0ZW5zaW9uc0RpcmVjdG9yeTsKKyAgICBHUmVmUHRyPEdWYXJpYW50PiB3ZWJFeHRlbnNp b25zSW5pdGlhbGl6YXRpb25Vc2VyRGF0YTsKIH07CiAKIHN0YXRpYyBndWludCBzaWduYWxzW0xB U1RfU0lHTkFMXSA9IHsgMCwgfTsKQEAgLTE3MCw2ICsxNzQsMjUgQEAgc3RhdGljIHZvaWQgd2Vi a2l0X3dlYl9jb250ZXh0X2NsYXNzX2luaXQoV2ViS2l0V2ViQ29udGV4dENsYXNzKiB3ZWJDb250 ZXh0Q2xhc3MKICAgICAgICAgICAgICAgICAgICAgIGdfY2Nsb3N1cmVfbWFyc2hhbF9WT0lEX19P QkpFQ1QsCiAgICAgICAgICAgICAgICAgICAgICBHX1RZUEVfTk9ORSwgMSwKICAgICAgICAgICAg ICAgICAgICAgIFdFQktJVF9UWVBFX0RPV05MT0FEKTsKKworICAgIC8qKgorICAgICAqIFdlYktp dFdlYkNvbnRleHQ6OmluaXRpYWxpemUtd2ViLWV4dGVuc2lvbnM6CisgICAgICogQGNvbnRleHQ6 IHRoZSAjV2ViS2l0V2ViQ29udGV4dAorICAgICAqCisgICAgICogVGhpcyBzaWduYWwgaXMgZW1p dHRlZCB3aGVuIGEgbmV3IHdlYiBwcm9jZXNzIGlzIGFib3V0IHRvIGJlCisgICAgICogbGF1bmNo ZWQuIEl0IHNpZ25hbHMgdGhlIG1vc3QgYXBwcm9wcmlhdGUgbW9tZW50IHRvIHVzZQorICAgICAq IHdlYmtpdF93ZWJfY29udGV4dF9zZXRfd2ViX2V4dGVuc2lvbnNfaW5pdGlhbGl6YXRpb25fdXNl cl9kYXRhKCkKKyAgICAgKiBhbmQgd2Via2l0X3dlYl9jb250ZXh0X3NldF93ZWJfZXh0ZW5zaW9u c19kaXJlY3RvcnkoKS4KKyAgICAgKgorICAgICAqIFNpbmNlOiAyLjQKKyAgICAgKi8KKyAgICBz aWduYWxzW0lOSVRJQUxJWkVfV0VCX0VYVEVOU0lPTlNdID0KKyAgICAgICAgZ19zaWduYWxfbmV3 KCJpbml0aWFsaXplLXdlYi1leHRlbnNpb25zIiwKKyAgICAgICAgICAgIEdfVFlQRV9GUk9NX0NM QVNTKGdPYmplY3RDbGFzcyksCisgICAgICAgICAgICBHX1NJR05BTF9SVU5fTEFTVCwKKyAgICAg ICAgICAgIDAsIG51bGxwdHIsIG51bGxwdHIsCisgICAgICAgICAgICBnX2NjbG9zdXJlX21hcnNo YWxfVk9JRF9fVk9JRCwKKyAgICAgICAgICAgIEdfVFlQRV9OT05FLCAwKTsKIH0KIAogc3RhdGlj IENTdHJpbmcgaW5qZWN0ZWRCdW5kbGVEaXJlY3RvcnkoKQpAQCAtNzYwLDE2ICs3ODMsNDAgQEAg V2ViS2l0VExTRXJyb3JzUG9saWN5IHdlYmtpdF93ZWJfY29udGV4dF9nZXRfdGxzX2Vycm9yc19w b2xpY3koV2ViS2l0V2ViQ29udGV4dCoKICAqIEBkaXJlY3Rvcnk6IHRoZSBkaXJlY3RvcnkgdG8g YWRkCiAgKgogICogU2V0IHRoZSBkaXJlY3Rvcnkgd2hlcmUgV2ViS2l0IHdpbGwgbG9vayBmb3Ig V2ViIEV4dGVuc2lvbnMuCi0gKiBUaGlzIG1ldGhvZCBtdXN0IGJlIGNhbGxlZCBiZWZvcmUgbG9h ZGluZyBhbnl0aGluZyBpbiB0aGlzIGNvbnRleHQsIG90aGVyd2lzZQotICogaXQgd2lsbCBub3Qg aGF2ZSBhbnkgZWZmZWN0LgorICogVGhpcyBtZXRob2QgbXVzdCBiZSBjYWxsZWQgYmVmb3JlIGxv YWRpbmcgYW55dGhpbmcgaW4gdGhpcyBjb250ZXh0LAorICogb3RoZXJ3aXNlIGl0IHdpbGwgbm90 IGhhdmUgYW55IGVmZmVjdC4gWW91IGNhbiBjb25uZWN0IHRvCisgKiAjV2ViS2l0V2ViQ29udGV4 dDo6aW5pdGlhbGl6ZS13ZWItZXh0ZW5zaW9ucyB0byBjYWxsIHRoaXMgbWV0aG9kCisgKiBiZWZv cmUgYW55dGhpbmcgaXMgbG9hZGVkLgogICovCiB2b2lkIHdlYmtpdF93ZWJfY29udGV4dF9zZXRf d2ViX2V4dGVuc2lvbnNfZGlyZWN0b3J5KFdlYktpdFdlYkNvbnRleHQqIGNvbnRleHQsIGNvbnN0 IGNoYXIqIGRpcmVjdG9yeSkKIHsKICAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJf Q09OVEVYVChjb250ZXh0KSk7CiAgICAgZ19yZXR1cm5faWZfZmFpbChkaXJlY3RvcnkpOwogCi0g ICAgLy8gV2UgcGFzcyB0aGUgYWRkaXRpb25hbCB3ZWIgZXh0ZW5zaW9ucyBkaXJlY3RvcnkgdG8g dGhlIGluamVjdGVkIGJ1bmRsZSBhcyBpbml0aWFsaXphdGlvbiB1c2VyIGRhdGEuCi0gICAgY29u dGV4dC0+cHJpdi0+Y29udGV4dC0+c2V0SW5qZWN0ZWRCdW5kbGVJbml0aWFsaXphdGlvblVzZXJE YXRhKFdlYlN0cmluZzo6Y3JlYXRlKFdlYkNvcmU6OmZpbGVuYW1lVG9TdHJpbmcoZGlyZWN0b3J5 KSkpOworICAgIGNvbnRleHQtPnByaXYtPndlYkV4dGVuc2lvbnNEaXJlY3RvcnkgPSBkaXJlY3Rv cnk7Cit9CisKKy8qKgorICogd2Via2l0X3dlYl9jb250ZXh0X3NldF93ZWJfZXh0ZW5zaW9uc19p bml0aWFsaXphdGlvbl91c2VyX2RhdGE6CisgKiBAY29udGV4dDogYSAjV2ViS2l0V2ViQ29udGV4 dAorICogQHVzZXJfZGF0YTogYSAjR1ZhcmlhbnQKKyAqCisgKiBTZXQgdXNlciBkYXRhIHRvIGJl IHBhc3NlZCB0byBXZWIgRXh0ZW5zaW9ucyBvbiBpbml0aWFsaXphdGlvbi4KKyAqIFRoZSBkYXRh IHdpbGwgYmUgcGFzc2VkIHRvIHRoZQorICogI1dlYktpdFdlYkV4dGVuc2lvbkluaXRpYWxpemVX aXRoVXNlckRhdGFGdW5jdGlvbi4KKyAqIFRoaXMgbWV0aG9kIG11c3QgYmUgY2FsbGVkIGJlZm9y ZSBsb2FkaW5nIGFueXRoaW5nIGluIHRoaXMgY29udGV4dCwKKyAqIG90aGVyd2lzZSBpdCB3aWxs IG5vdCBoYXZlIGFueSBlZmZlY3QuIFlvdSBjYW4gY29ubmVjdCB0bworICogI1dlYktpdFdlYkNv bnRleHQ6OmluaXRpYWxpemUtd2ViLWV4dGVuc2lvbnMgdG8gY2FsbCB0aGlzIG1ldGhvZAorICog YmVmb3JlIGFueXRoaW5nIGlzIGxvYWRlZC4KKyAqCisgKiBTaW5jZTogMi40CisgKi8KK3ZvaWQg d2Via2l0X3dlYl9jb250ZXh0X3NldF93ZWJfZXh0ZW5zaW9uc19pbml0aWFsaXphdGlvbl91c2Vy X2RhdGEoV2ViS2l0V2ViQ29udGV4dCogY29udGV4dCwgR1ZhcmlhbnQqIHVzZXJEYXRhKQorewor ICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9DT05URVhUKGNvbnRleHQpKTsKKyAg ICBnX3JldHVybl9pZl9mYWlsKHVzZXJEYXRhKTsKKworICAgIGNvbnRleHQtPnByaXYtPndlYkV4 dGVuc2lvbnNJbml0aWFsaXphdGlvblVzZXJEYXRhID0gdXNlckRhdGE7CiB9CiAKIC8qKgpAQCAt ODM3LDYgKzg4NCwxNCBAQCB2b2lkIHdlYmtpdFdlYkNvbnRleHREb3dubG9hZFN0YXJ0ZWQoV2Vi S2l0V2ViQ29udGV4dCogY29udGV4dCwgV2ViS2l0RG93bmxvYWQqCiAgICAgZ19zaWduYWxfZW1p dChjb250ZXh0LCBzaWduYWxzW0RPV05MT0FEX1NUQVJURURdLCAwLCBkb3dubG9hZCk7CiB9CiAK K0dWYXJpYW50KiB3ZWJraXRXZWJDb250ZXh0SW5pdGlhbGl6ZVdlYkV4dGVuc2lvbnMoV2ViS2l0 V2ViQ29udGV4dCogY29udGV4dCkKK3sKKyAgICBnX3NpZ25hbF9lbWl0KGNvbnRleHQsIHNpZ25h bHNbSU5JVElBTElaRV9XRUJfRVhURU5TSU9OU10sIDApOworICAgIHJldHVybiBnX3ZhcmlhbnRf bmV3KCIobXNtdikiLAorICAgICAgICBjb250ZXh0LT5wcml2LT53ZWJFeHRlbnNpb25zRGlyZWN0 b3J5LmRhdGEoKSwKKyAgICAgICAgY29udGV4dC0+cHJpdi0+d2ViRXh0ZW5zaW9uc0luaXRpYWxp emF0aW9uVXNlckRhdGEuZ2V0KCkpOworfQorCiBXZWJDb250ZXh0KiB3ZWJraXRXZWJDb250ZXh0 R2V0Q29udGV4dChXZWJLaXRXZWJDb250ZXh0KiBjb250ZXh0KQogewogICAgIGdfYXNzZXJ0KFdF QktJVF9JU19XRUJfQ09OVEVYVChjb250ZXh0KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmgKaW5kZXggZGQzOGMxZC4uYWYyY2Ji YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vi Q29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdl YkNvbnRleHQuaApAQCAtMTkyLDYgKzE5MiwxMSBAQCB3ZWJraXRfd2ViX2NvbnRleHRfc2V0X3dl Yl9leHRlbnNpb25zX2RpcmVjdG9yeSAgICAgKFdlYktpdFdlYkNvbnRleHQKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIgICAg ICAgICAgICAgICAgICAgKmRpcmVjdG9yeSk7CiAKIFdFQktJVF9BUEkgdm9pZAord2Via2l0X3dl Yl9jb250ZXh0X3NldF93ZWJfZXh0ZW5zaW9uc19pbml0aWFsaXphdGlvbl91c2VyX2RhdGEKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoV2ViS2l0 V2ViQ29udGV4dCAgICAgICAgICAgICAgKmNvbnRleHQsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdWYXJpYW50ICAgICAgICAgICAgICAgICAg ICAgICp1c2VyX2RhdGEpOworCitXRUJLSVRfQVBJIHZvaWQKIHdlYmtpdF93ZWJfY29udGV4dF9w cmVmZXRjaF9kbnMgICAgICAgICAgICAgICAgICAgICAoV2ViS2l0V2ViQ29udGV4dCAgICAgICAg ICAgICAgKmNvbnRleHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGNvbnN0IGdjaGFyICAgICAgICAgICAgICAgICAgICpob3N0bmFtZSk7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNv bnRleHRQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRX ZWJDb250ZXh0UHJpdmF0ZS5oCmluZGV4IDgxYzQ3M2MuLjk4MGViNzkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHRQcml2YXRlLmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dFBy aXZhdGUuaApAQCAtNDcsNSArNDcsNiBAQCB2b2lkIHdlYmtpdFdlYkNvbnRleHRDcmVhdGVQYWdl Rm9yV2ViVmlldyhXZWJLaXRXZWJDb250ZXh0KiwgV2ViS2l0V2ViVmlldyosIFdlYgogdm9pZCB3 ZWJraXRXZWJDb250ZXh0V2ViVmlld0Rlc3Ryb3llZChXZWJLaXRXZWJDb250ZXh0KiwgV2ViS2l0 V2ViVmlldyopOwogV2ViS2l0V2ViVmlldyogd2Via2l0V2ViQ29udGV4dEdldFdlYlZpZXdGb3JQ YWdlKFdlYktpdFdlYkNvbnRleHQqLCBXZWJLaXQ6OldlYlBhZ2VQcm94eSopOwogV2ViS2l0V2Vi Vmlld0dyb3VwKiB3ZWJraXRXZWJDb250ZXh0R2V0RGVmYXVsdFdlYlZpZXdHcm91cChXZWJLaXRX ZWJDb250ZXh0Kik7CitHVmFyaWFudCogd2Via2l0V2ViQ29udGV4dEluaXRpYWxpemVXZWJFeHRl bnNpb25zKFdlYktpdFdlYkNvbnRleHQqKTsKIAogI2VuZGlmIC8vIFdlYktpdFdlYkNvbnRleHRQ cml2YXRlX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2Rv Y3Mvd2Via2l0Mmd0ay1zZWN0aW9ucy50eHQgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9kb2NzL3dlYmtpdDJndGstc2VjdGlvbnMudHh0CmluZGV4IGU4YmU2MWYuLjAxOGZkZmQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0 Mmd0ay1zZWN0aW9ucy50eHQKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv ZG9jcy93ZWJraXQyZ3RrLXNlY3Rpb25zLnR4dApAQCAtNDYsNiArNDYsNyBAQCB3ZWJraXRfd2Vi X2NvbnRleHRfc2V0X3ByZWZlcnJlZF9sYW5ndWFnZXMKIHdlYmtpdF93ZWJfY29udGV4dF9zZXRf dGxzX2Vycm9yc19wb2xpY3kKIHdlYmtpdF93ZWJfY29udGV4dF9nZXRfdGxzX2Vycm9yc19wb2xp Y3kKIHdlYmtpdF93ZWJfY29udGV4dF9zZXRfd2ViX2V4dGVuc2lvbnNfZGlyZWN0b3J5Cit3ZWJr aXRfd2ViX2NvbnRleHRfc2V0X3dlYl9leHRlbnNpb25zX2luaXRpYWxpemF0aW9uX3VzZXJfZGF0 YQogd2Via2l0X3dlYl9jb250ZXh0X3ByZWZldGNoX2Rucwogd2Via2l0X3dlYl9jb250ZXh0X3Nl dF9kaXNrX2NhY2hlX2RpcmVjdG9yeQogCkBAIC0xMDE4LDYgKzEwMTksNyBAQCB3ZWJraXRfd2Vi X3ZpZXdfZ3JvdXBfZ2V0X3R5cGUKIDxGSUxFPldlYktpdFdlYkV4dGVuc2lvbjwvRklMRT4KIFdl YktpdFdlYkV4dGVuc2lvbgogV2ViS2l0V2ViRXh0ZW5zaW9uSW5pdGlhbGl6ZUZ1bmN0aW9uCitX ZWJLaXRXZWJFeHRlbnNpb25Jbml0aWFsaXplV2l0aFVzZXJEYXRhRnVuY3Rpb24KIHdlYmtpdF93 ZWJfZXh0ZW5zaW9uX2dldF9wYWdlCiAKIDxTVUJTRUNUSU9OIFN0YW5kYXJkPgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvZ3RrL1dlYktp dFdlYkV4dGVuc2lvbi5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRs ZS9BUEkvZ3RrL1dlYktpdFdlYkV4dGVuc2lvbi5oCmluZGV4IDY3YTRjZDUuLjM0MTM2YTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2d0 ay9XZWJLaXRXZWJFeHRlbnNpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0lu amVjdGVkQnVuZGxlL0FQSS9ndGsvV2ViS2l0V2ViRXh0ZW5zaW9uLmgKQEAgLTUwLDYgKzUwLDIx IEBAIHR5cGVkZWYgc3RydWN0IF9XZWJLaXRXZWJFeHRlbnNpb25Qcml2YXRlIFdlYktpdFdlYkV4 dGVuc2lvblByaXZhdGU7CiAgKi8KIHR5cGVkZWYgdm9pZCAoKiBXZWJLaXRXZWJFeHRlbnNpb25J bml0aWFsaXplRnVuY3Rpb24pIChXZWJLaXRXZWJFeHRlbnNpb24gKmV4dGVuc2lvbik7CiAKKy8q KgorICogV2ViS2l0V2ViRXh0ZW5zaW9uSW5pdGlhbGl6ZVdpdGhVc2VyRGF0YUZ1bmN0aW9uOgor ICogQGV4dGVuc2lvbjogYSAjV2ViS2l0V2ViRXh0ZW5zaW9uCisgKiBAdXNlcl9kYXRhOiBhICNH VmFyaWFudAorICoKKyAqIFR5cGUgZGVmaW5pdGlvbiBmb3IgYSBmdW5jdGlvbiB0aGF0IHdpbGwg YmUgY2FsbGVkIHRvIGluaXRpYWxpemUKKyAqIHRoZSB3ZWIgZXh0ZW5zaW9ucyB3aGVuIHRoZSB3 ZWIgcHJvY2VzcyBzdGFydHMsIGFuZCB3aGljaCByZWNlaXZlcworICogYXMgYWRkaXRpb25hbCBh cmd1bWVudCB0aGUgdXNlciBkYXRhIHNldCB3aXRoCisgKiB3ZWJraXRfd2ViX2NvbnRleHRfc2V0 X3dlYl9leHRlbnNpb25zX2luaXRpYWxpemF0aW9uX3VzZXJfZGF0YSgpLgorICoKKyAqIFNpbmNl OiAyLjQKKyAqLwordHlwZWRlZiB2b2lkICgqIFdlYktpdFdlYkV4dGVuc2lvbkluaXRpYWxpemVX aXRoVXNlckRhdGFGdW5jdGlvbikgKFdlYktpdFdlYkV4dGVuc2lvbiAqZXh0ZW5zaW9uLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbnN0IEdWYXJpYW50ICAgICAqdXNlcl9kYXRhKTsKKwogc3RydWN0IF9XZWJLaXRX ZWJFeHRlbnNpb24gewogICAgIEdPYmplY3QgcGFyZW50OwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL2d0ay9XZWJHdGtFeHRlbnNpb25NYW5hZ2VyLmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvZ3RrL1dlYkd0a0V4dGVuc2lvbk1hbmFnZXIuY3BwCmluZGV4 IGFkN2JhOTkuLmZiNjJmNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv Z3RrL1dlYkd0a0V4dGVuc2lvbk1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvZ3RrL1dlYkd0a0V4dGVuc2lvbk1hbmFnZXIuY3BwCkBAIC0yMiwxMSArMjIsMTMgQEAK IAogI2luY2x1ZGUgIkluamVjdGVkQnVuZGxlLmgiCiAjaW5jbHVkZSAiV0tCdW5kbGVBUElDYXN0 LmgiCisjaW5jbHVkZSAiV0tEaWN0aW9uYXJ5LmgiCiAjaW5jbHVkZSAiV0tTdHJpbmcuaCIKICNp bmNsdWRlICJXS1R5cGUuaCIKICNpbmNsdWRlICJXZWJLaXRXZWJFeHRlbnNpb25Qcml2YXRlLmgi CiAjaW5jbHVkZSA8V2ViQ29yZS9GaWxlU3lzdGVtLmg+CiAjaW5jbHVkZSA8d3RmL093blB0ci5o PgorI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAogbmFtZXNwYWNlIFdlYktpdCB7CiAK QEAgLTQ5LDE5ICs1MSw1NiBAQCB2b2lkIFdlYkd0a0V4dGVuc2lvbk1hbmFnZXI6OnNjYW5Nb2R1 bGVzKGNvbnN0IFN0cmluZyYgd2ViRXh0ZW5zaW9uc0RpcmVjdG9yeSwgVgogICAgIH0KIH0KIAot dm9pZCBXZWJHdGtFeHRlbnNpb25NYW5hZ2VyOjppbml0aWFsaXplKFdLQnVuZGxlUmVmIGJ1bmRs ZSwgV0tUeXBlUmVmIHVzZXJEYXRhKQorc3RhdGljIHZvaWQgcGFyc2VVc2VyRGF0YShXS1R5cGVS ZWYgdXNlckRhdGEsIFN0cmluZyYgd2ViRXh0ZW5zaW9uc0RpcmVjdG9yeSwgR1JlZlB0cjxHVmFy aWFudD4mIGluaXRpYWxpemF0aW9uVXNlckRhdGEpCiB7Ci0gICAgbV9leHRlbnNpb24gPSBhZG9w dEdSZWYod2Via2l0V2ViRXh0ZW5zaW9uQ3JlYXRlKHRvSW1wbChidW5kbGUpKSk7CisgICAgQVNT RVJUKHVzZXJEYXRhKTsKKyAgICBBU1NFUlQoV0tHZXRUeXBlSUQodXNlckRhdGEpID09IFdLU3Ry aW5nR2V0VHlwZUlEKCkpOwogCi0gICAgU3RyaW5nIHdlYkV4dGVuc2lvbnNEaXJlY3Rvcnk7Ci0g ICAgaWYgKHVzZXJEYXRhKSB7Ci0gICAgICAgIEFTU0VSVChXS0dldFR5cGVJRCh1c2VyRGF0YSkg PT0gV0tTdHJpbmdHZXRUeXBlSUQoKSk7Ci0gICAgICAgIHdlYkV4dGVuc2lvbnNEaXJlY3Rvcnkg PSB0b0ltcGwoc3RhdGljX2Nhc3Q8V0tTdHJpbmdSZWY+KHVzZXJEYXRhKSktPnN0cmluZygpOwor ICAgIENTdHJpbmcgdXNlckRhdGFTdHJpbmcgPSB0b0ltcGwoc3RhdGljX2Nhc3Q8V0tTdHJpbmdS ZWY+KHVzZXJEYXRhKSktPnN0cmluZygpLnV0ZjgoKTsKKyAgICBHUmVmUHRyPEdWYXJpYW50PiB2 YXJpYW50ID0gZ192YXJpYW50X3BhcnNlKG51bGxwdHIsIHVzZXJEYXRhU3RyaW5nLmRhdGEoKSwK KyAgICAgICAgdXNlckRhdGFTdHJpbmcuZGF0YSgpICsgdXNlckRhdGFTdHJpbmcubGVuZ3RoKCks IG51bGxwdHIsIG51bGxwdHIpOworCisgICAgQVNTRVJUKHZhcmlhbnQpOworICAgIEFTU0VSVChn X3ZhcmlhbnRfY2hlY2tfZm9ybWF0X3N0cmluZyh2YXJpYW50LmdldCgpLCAiKG0mc212KSIsIEZB TFNFKSk7CisKKyAgICBjb25zdCBjaGFyKiBkaXJlY3RvcnkgPSBudWxscHRyOworICAgIEdWYXJp YW50KiBkYXRhID0gbnVsbHB0cjsKKyAgICBnX3ZhcmlhbnRfZ2V0KHZhcmlhbnQuZ2V0KCksICIo bSZzbXYpIiwgJmRpcmVjdG9yeSwgJmRhdGEpOworCisgICAgd2ViRXh0ZW5zaW9uc0RpcmVjdG9y eSA9IFdlYkNvcmU6OmZpbGVuYW1lVG9TdHJpbmcoZGlyZWN0b3J5KTsKKyAgICBpbml0aWFsaXph dGlvblVzZXJEYXRhID0gYWRvcHRHUmVmKGRhdGEpOworfQorCitib29sIFdlYkd0a0V4dGVuc2lv bk1hbmFnZXI6OmluaXRpYWxpemVXZWJFeHRlbnNpb24oTW9kdWxlKiBleHRlbnNpb25Nb2R1bGUs IEdWYXJpYW50KiB1c2VyRGF0YSkKK3sKKyAgICBXZWJLaXRXZWJFeHRlbnNpb25Jbml0aWFsaXpl V2l0aFVzZXJEYXRhRnVuY3Rpb24gaW5pdGlhbGl6ZVdpdGhVc2VyRGF0YUZ1bmN0aW9uID0KKyAg ICAgICAgZXh0ZW5zaW9uTW9kdWxlLT5mdW5jdGlvblBvaW50ZXI8V2ViS2l0V2ViRXh0ZW5zaW9u SW5pdGlhbGl6ZVdpdGhVc2VyRGF0YUZ1bmN0aW9uPigid2Via2l0X3dlYl9leHRlbnNpb25faW5p dGlhbGl6ZV93aXRoX3VzZXJfZGF0YSIpOworICAgIGlmIChpbml0aWFsaXplV2l0aFVzZXJEYXRh RnVuY3Rpb24pIHsKKyAgICAgICAgaW5pdGlhbGl6ZVdpdGhVc2VyRGF0YUZ1bmN0aW9uKG1fZXh0 ZW5zaW9uLmdldCgpLCB1c2VyRGF0YSk7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKwor ICAgIFdlYktpdFdlYkV4dGVuc2lvbkluaXRpYWxpemVGdW5jdGlvbiBpbml0aWFsaXplRnVuY3Rp b24gPQorICAgICAgICBleHRlbnNpb25Nb2R1bGUtPmZ1bmN0aW9uUG9pbnRlcjxXZWJLaXRXZWJF eHRlbnNpb25Jbml0aWFsaXplRnVuY3Rpb24+KCJ3ZWJraXRfd2ViX2V4dGVuc2lvbl9pbml0aWFs aXplIik7CisgICAgaWYgKGluaXRpYWxpemVGdW5jdGlvbikgeworICAgICAgICBpbml0aWFsaXpl RnVuY3Rpb24obV9leHRlbnNpb24uZ2V0KCkpOworICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9 CiAKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKK3ZvaWQgV2ViR3RrRXh0ZW5zaW9uTWFuYWdlcjo6 aW5pdGlhbGl6ZShXS0J1bmRsZVJlZiBidW5kbGUsIFdLVHlwZVJlZiB1c2VyRGF0YVN0cmluZykK K3sKKyAgICBTdHJpbmcgd2ViRXh0ZW5zaW9uc0RpcmVjdG9yeTsKKyAgICBHUmVmUHRyPEdWYXJp YW50PiB1c2VyRGF0YTsKKyAgICBwYXJzZVVzZXJEYXRhKHVzZXJEYXRhU3RyaW5nLCB3ZWJFeHRl bnNpb25zRGlyZWN0b3J5LCB1c2VyRGF0YSk7CisKICAgICBpZiAod2ViRXh0ZW5zaW9uc0RpcmVj dG9yeS5pc051bGwoKSkKICAgICAgICAgcmV0dXJuOwogCisgICAgbV9leHRlbnNpb24gPSBhZG9w dEdSZWYod2Via2l0V2ViRXh0ZW5zaW9uQ3JlYXRlKHRvSW1wbChidW5kbGUpKSk7CisKICAgICBW ZWN0b3I8U3RyaW5nPiBtb2R1bGVQYXRoczsKICAgICBzY2FuTW9kdWxlcyh3ZWJFeHRlbnNpb25z RGlyZWN0b3J5LCBtb2R1bGVQYXRocyk7CiAKQEAgLTY5LDE0ICsxMDgsOCBAQCB2b2lkIFdlYkd0 a0V4dGVuc2lvbk1hbmFnZXI6OmluaXRpYWxpemUoV0tCdW5kbGVSZWYgYnVuZGxlLCBXS1R5cGVS ZWYgdXNlckRhdGEpCiAgICAgICAgIE93blB0cjxNb2R1bGU+IG1vZHVsZSA9IGFkb3B0UHRyKG5l dyBNb2R1bGUobW9kdWxlUGF0aHNbaV0pKTsKICAgICAgICAgaWYgKCFtb2R1bGUtPmxvYWQoKSkK ICAgICAgICAgICAgIGNvbnRpbnVlOwotCi0gICAgICAgIFdlYktpdFdlYkV4dGVuc2lvbkluaXRp YWxpemVGdW5jdGlvbiBpbml0aWFsaXplRnVuY3Rpb24gPQotICAgICAgICAgICAgbW9kdWxlLT5m dW5jdGlvblBvaW50ZXI8V2ViS2l0V2ViRXh0ZW5zaW9uSW5pdGlhbGl6ZUZ1bmN0aW9uPigid2Vi a2l0X3dlYl9leHRlbnNpb25faW5pdGlhbGl6ZSIpOwotICAgICAgICBpZiAoIWluaXRpYWxpemVG dW5jdGlvbikKLSAgICAgICAgICAgIGNvbnRpbnVlOwotCi0gICAgICAgIG1fZXh0ZW5zaW9uTW9k dWxlcy5hcHBlbmQobW9kdWxlLmxlYWtQdHIoKSk7Ci0gICAgICAgIGluaXRpYWxpemVGdW5jdGlv bihtX2V4dGVuc2lvbi5nZXQoKSk7CisgICAgICAgIGlmIChpbml0aWFsaXplV2ViRXh0ZW5zaW9u KG1vZHVsZS5nZXQoKSwgdXNlckRhdGEuZ2V0KCkpKQorICAgICAgICAgICAgbV9leHRlbnNpb25N b2R1bGVzLmFwcGVuZChtb2R1bGUubGVha1B0cigpKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvZ3RrL1dlYkd0a0V4dGVuc2lvbk1hbmFnZXIuaCBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvZ3RrL1dlYkd0a0V4dGVuc2lvbk1hbmFnZXIuaApp bmRleCAzMGY2ZGUxLi5hMmEzMzEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL2d0ay9XZWJHdGtFeHRlbnNpb25NYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9ndGsvV2ViR3RrRXh0ZW5zaW9uTWFuYWdlci5oCkBAIC00Niw2ICs0Niw3IEBAIHBy aXZhdGU6CiAgICAgV2ViR3RrRXh0ZW5zaW9uTWFuYWdlcigpOwogCiAgICAgdm9pZCBzY2FuTW9k dWxlcyhjb25zdCBTdHJpbmcmLCBWZWN0b3I8U3RyaW5nPiYpOworICAgIGJvb2wgaW5pdGlhbGl6 ZVdlYkV4dGVuc2lvbihNb2R1bGUqIGV4dGVuc2lvbk1vZHVsZSwgR1ZhcmlhbnQqIHVzZXJEYXRh KTsKIAogICAgIFZlY3RvcjxNb2R1bGUqPiBtX2V4dGVuc2lvbk1vZHVsZXM7CiAgICAgR1JlZlB0 cjxXZWJLaXRXZWJFeHRlbnNpb24+IG1fZXh0ZW5zaW9uOwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RXZWJFeHRlbnNpb25zLmNwcCBiL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2ViRXh0ZW5zaW9ucy5jcHAKaW5k ZXggYjAzYzlkYy4uZTllZjE5MiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXQyR3RrL1Rlc3RXZWJFeHRlbnNpb25zLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdDJHdGsvVGVzdFdlYkV4dGVuc2lvbnMuY3BwCkBAIC0yMyw2ICsyMyw3 IEBACiAjaW5jbHVkZSAiV2ViVmlld1Rlc3QuaCIKICNpbmNsdWRlIDx3dGYvZ29iamVjdC9HUmVm UHRyLmg+CiAKK3N0YXRpYyBjb25zdCBjaGFyKiB3ZWJFeHRlbnNpb25zVXNlckRhdGEgPSAiV2Vi IEV4dGVuc2lvbnMgdXNlciBkYXRhIjsKIHN0YXRpYyBXZWJLaXRUZXN0QnVzKiBidXM7CiAKIHN0 YXRpYyB2b2lkIHRlc3RXZWJFeHRlbnNpb25HZXRUaXRsZShXZWJWaWV3VGVzdCogdGVzdCwgZ2Nv bnN0cG9pbnRlcikKQEAgLTE3NSwxMyArMTc2LDQ0IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJFeHRl bnNpb25Jc29sYXRlZFdvcmxkKFdlYlZpZXdUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogICAg IGdfc2lnbmFsX2hhbmRsZXJfZGlzY29ubmVjdCh0ZXN0LT5tX3dlYlZpZXcsIHNjcmlwdERpYWxv Z0lEKTsKIH0KIAorc3RhdGljIHZvaWQgdGVzdFdlYkV4dGVuc2lvbkluaXRpYWxpemF0aW9uVXNl ckRhdGEoV2ViVmlld1Rlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCit7CisgICAgdGVzdC0+bG9h ZEh0bWwoIjxodG1sPjwvaHRtbD4iLCAwKTsKKyAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNo ZWQoKTsKKworICAgIEdSZWZQdHI8R0RCdXNQcm94eT4gcHJveHkgPSBhZG9wdEdSZWYoYnVzLT5j cmVhdGVQcm94eSgib3JnLndlYmtpdC5ndGsuV2ViRXh0ZW5zaW9uVGVzdCIsCisgICAgICAgICIv b3JnL3dlYmtpdC9ndGsvV2ViRXh0ZW5zaW9uVGVzdCIsICJvcmcud2Via2l0Lmd0ay5XZWJFeHRl bnNpb25UZXN0IiwgdGVzdC0+bV9tYWluTG9vcCkpOworCisgICAgR1JlZlB0cjxHVmFyaWFudD4g cmVzdWx0ID0gYWRvcHRHUmVmKGdfZGJ1c19wcm94eV9jYWxsX3N5bmMoCisgICAgICAgIHByb3h5 LmdldCgpLAorICAgICAgICAiR2V0SW5pdGlhbGl6YXRpb25Vc2VyRGF0YSIsCisgICAgICAgIG51 bGxwdHIsCisgICAgICAgIEdfREJVU19DQUxMX0ZMQUdTX05PTkUsCisgICAgICAgIC0xLCAwLCAw KSk7CisgICAgZ19hc3NlcnQocmVzdWx0KTsKKworICAgIGNvbnN0IGdjaGFyKiB1c2VyRGF0YSA9 IG51bGxwdHI7CisgICAgZ192YXJpYW50X2dldChyZXN1bHQuZ2V0KCksICIoJnMpIiwgJnVzZXJE YXRhKTsKKyAgICBnX2Fzc2VydF9jbXBzdHIodXNlckRhdGEsID09LCB3ZWJFeHRlbnNpb25zVXNl ckRhdGEpOworfQorCitzdGF0aWMgdm9pZCBpbml0aWFsaXplV2ViRXh0ZW5zaW9ucyhXZWJLaXRX ZWJDb250ZXh0KiBjb250ZXh0LCBncG9pbnRlcikKK3sKKyAgICB3ZWJraXRfd2ViX2NvbnRleHRf c2V0X3dlYl9leHRlbnNpb25zX2RpcmVjdG9yeShjb250ZXh0LCBXRUJLSVRfVEVTVF9XRUJfRVhU RU5TSU9OU19ESVIpOworICAgIHdlYmtpdF93ZWJfY29udGV4dF9zZXRfd2ViX2V4dGVuc2lvbnNf aW5pdGlhbGl6YXRpb25fdXNlcl9kYXRhKGNvbnRleHQsCisgICAgICAgIGdfdmFyaWFudF9uZXco IiZzIiwgd2ViRXh0ZW5zaW9uc1VzZXJEYXRhKSk7Cit9CisKIHZvaWQgYmVmb3JlQWxsKCkKIHsK LSAgICB3ZWJraXRfd2ViX2NvbnRleHRfc2V0X3dlYl9leHRlbnNpb25zX2RpcmVjdG9yeSh3ZWJr aXRfd2ViX2NvbnRleHRfZ2V0X2RlZmF1bHQoKSwgV0VCS0lUX1RFU1RfV0VCX0VYVEVOU0lPTlNf RElSKTsKKyAgICBnX3NpZ25hbF9jb25uZWN0KHdlYmtpdF93ZWJfY29udGV4dF9nZXRfZGVmYXVs dCgpLAorICAgICAgICAiaW5pdGlhbGl6ZS13ZWItZXh0ZW5zaW9ucyIsIEdfQ0FMTEJBQ0soaW5p dGlhbGl6ZVdlYkV4dGVuc2lvbnMpLCBudWxscHRyKTsKKwogICAgIGJ1cyA9IG5ldyBXZWJLaXRU ZXN0QnVzKCk7CiAgICAgaWYgKCFidXMtPnJ1bigpKQogICAgICAgICByZXR1cm47CiAKKyAgICBX ZWJWaWV3VGVzdDo6YWRkKCJXZWJLaXRXZWJDb250ZXh0IiwgImluaXRpYWxpemF0aW9uLXVzZXIt ZGF0YSIsIHRlc3RXZWJFeHRlbnNpb25Jbml0aWFsaXphdGlvblVzZXJEYXRhKTsKICAgICBXZWJW aWV3VGVzdDo6YWRkKCJXZWJLaXRXZWJFeHRlbnNpb24iLCAiZG9tLWRvY3VtZW50LXRpdGxlIiwg dGVzdFdlYkV4dGVuc2lvbkdldFRpdGxlKTsKICAgICBXZWJWaWV3VGVzdDo6YWRkKCJXZWJLaXRX ZWJFeHRlbnNpb24iLCAiZG9jdW1lbnQtbG9hZGVkLXNpZ25hbCIsIHRlc3REb2N1bWVudExvYWRl ZFNpZ25hbCk7CiAgICAgV2ViVmlld1Rlc3Q6OmFkZCgiV2ViS2l0V2ViVmlldyIsICJ3ZWItcHJv Y2Vzcy1jcmFzaGVkIiwgdGVzdFdlYktpdFdlYlZpZXdQcm9jZXNzQ3Jhc2hlZCk7CmRpZmYgLS1n aXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvV2ViRXh0ZW5zaW9uVGVz dC5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvV2ViRXh0ZW5zaW9u VGVzdC5jcHAKaW5kZXggNDBjYjZjYS4uZThhMmI5ZiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1dlYkV4dGVuc2lvblRlc3QuY3BwCisrKyBiL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9XZWJFeHRlbnNpb25UZXN0LmNwcApAQCAt NDUsNiArNDUsOSBAQCBzdGF0aWMgY29uc3QgY2hhciBpbnRyb3NwZWN0aW9uWE1MW10gPQogICAg ICIgICA8YXJnIHR5cGU9J3QnIG5hbWU9J3BhZ2VJRCcgZGlyZWN0aW9uPSdpbicvPiIKICAgICAi ICAgPGFyZyB0eXBlPSdzJyBuYW1lPSdzY3JpcHQnIGRpcmVjdGlvbj0naW4nLz4iCiAgICAgIiAg PC9tZXRob2Q+IgorICAgICIgIDxtZXRob2QgbmFtZT0nR2V0SW5pdGlhbGl6YXRpb25Vc2VyRGF0 YSc+IgorICAgICIgICA8YXJnIHR5cGU9J3MnIG5hbWU9J3VzZXJEYXRhJyBkaXJlY3Rpb249J291 dCcvPiIKKyAgICAiICA8L21ldGhvZD4iCiAgICAgIiAgPHNpZ25hbCBuYW1lPSdEb2N1bWVudExv YWRlZCcvPiIKICAgICAiICA8c2lnbmFsIG5hbWU9J1VSSUNoYW5nZWQnPiIKICAgICAiICAgPGFy ZyB0eXBlPSdzJyBuYW1lPSd1cmknIGRpcmVjdGlvbj0nb3V0Jy8+IgpAQCAtNTIsNiArNTUsOSBA QCBzdGF0aWMgY29uc3QgY2hhciBpbnRyb3NwZWN0aW9uWE1MW10gPQogICAgICIgPC9pbnRlcmZh Y2U+IgogICAgICI8L25vZGU+IjsKIAorc3RhdGljIEdSZWZQdHI8R1ZhcmlhbnQ+IGluaXRpYWxp emF0aW9uVXNlckRhdGE7CisKKwogdHlwZWRlZiBlbnVtIHsKICAgICBEb2N1bWVudExvYWRlZFNp Z25hbCwKICAgICBVUklDaGFuZ2VkU2lnbmFsLApAQCAtMjEwLDggKzIxNiwxNCBAQCBzdGF0aWMg dm9pZCBtZXRob2RDYWxsQ2FsbGJhY2soR0RCdXNDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBjb25z dCBjaGFyKiBzZW5kZXIsCiAgICAgICAgIEpTUmV0YWluUHRyPEpTU3RyaW5nUmVmPiBqc1Njcmlw dChBZG9wdCwgSlNTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoc2NyaXB0KSk7CiAgICAgICAg IEpTRXZhbHVhdGVTY3JpcHQoanNDb250ZXh0LCBqc1NjcmlwdC5nZXQoKSwgMCwgMCwgMCwgMCk7 CiAgICAgICAgIGdfZGJ1c19tZXRob2RfaW52b2NhdGlvbl9yZXR1cm5fdmFsdWUoaW52b2NhdGlv biwgMCk7Ci0gICAgfSBlbHNlIGlmICghZ19zdHJjbXAwKG1ldGhvZE5hbWUsICJBYm9ydFByb2Nl c3MiKSkKKyAgICB9IGVsc2UgaWYgKCFnX3N0cmNtcDAobWV0aG9kTmFtZSwgIkFib3J0UHJvY2Vz cyIpKSB7CiAgICAgICAgIGFib3J0KCk7CisgICAgfSBlbHNlIGlmICghZ19zdHJjbXAwKG1ldGhv ZE5hbWUsICJHZXRJbml0aWFsaXphdGlvblVzZXJEYXRhIikpIHsKKyAgICAgICAgZ19hc3NlcnQo aW5pdGlhbGl6YXRpb25Vc2VyRGF0YSk7CisgICAgICAgIGdfYXNzZXJ0KGdfdmFyaWFudF9pc19v Zl90eXBlKGluaXRpYWxpemF0aW9uVXNlckRhdGEuZ2V0KCksIEdfVkFSSUFOVF9UWVBFX1NUUklO RykpOworICAgICAgICBnX2RidXNfbWV0aG9kX2ludm9jYXRpb25fcmV0dXJuX3ZhbHVlKGludm9j YXRpb24sIGdfdmFyaWFudF9uZXcoIihzKSIsCisgICAgICAgICAgICBnX3ZhcmlhbnRfZ2V0X3N0 cmluZyhpbml0aWFsaXphdGlvblVzZXJEYXRhLmdldCgpLCBudWxscHRyKSkpOworICAgIH0KIH0K IAogc3RhdGljIGNvbnN0IEdEQnVzSW50ZXJmYWNlVlRhYmxlIGludGVyZmFjZVZpcnR1YWxUYWJs ZSA9IHsKQEAgLTI1MCw4ICsyNjIsMTAgQEAgc3RhdGljIHZvaWQgYnVzQWNxdWlyZWRDYWxsYmFj ayhHREJ1c0Nvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIGNvbnN0IGNoYXIqIG5hbWUsIGcKICAgICB9 CiB9CiAKLWV4dGVybiAiQyIgdm9pZCB3ZWJraXRfd2ViX2V4dGVuc2lvbl9pbml0aWFsaXplKFdl YktpdFdlYkV4dGVuc2lvbiogZXh0ZW5zaW9uKQorZXh0ZXJuICJDIiB2b2lkIHdlYmtpdF93ZWJf ZXh0ZW5zaW9uX2luaXRpYWxpemVfd2l0aF91c2VyX2RhdGEoV2ViS2l0V2ViRXh0ZW5zaW9uKiBl eHRlbnNpb24sIEdWYXJpYW50KiB1c2VyRGF0YSkKIHsKKyAgICBpbml0aWFsaXphdGlvblVzZXJE YXRhID0gdXNlckRhdGE7CisKICAgICBnX3NpZ25hbF9jb25uZWN0KGV4dGVuc2lvbiwgInBhZ2Ut Y3JlYXRlZCIsIEdfQ0FMTEJBQ0socGFnZUNyZWF0ZWRDYWxsYmFjayksIGV4dGVuc2lvbik7CiAg ICAgZ19zaWduYWxfY29ubmVjdCh3ZWJraXRfc2NyaXB0X3dvcmxkX2dldF9kZWZhdWx0KCksICJ3 aW5kb3ctb2JqZWN0LWNsZWFyZWQiLCBHX0NBTExCQUNLKHdpbmRvd09iamVjdENsZWFyZWQpLCAw KTsKIAo=