216375 2020-09-10 12:35:30 -0700 Move _setCookieAcceptPolicy to WKHTTPCookieStore 2020-09-11 15:03:35 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen ggaren webkit-bug-importer oldest_to_newest 1687502 0 achristensen 2020-09-10 12:35:30 -0700 Remove unneeded WKContextUseTestingNetworkSession 1687513 1 408471 achristensen 2020-09-10 13:04:39 -0700 Created attachment 408471 Patch 1687528 2 408471 ggaren 2020-09-10 14:06:02 -0700 Comment on attachment 408471 Patch r=me 1687662 3 achristensen 2020-09-10 23:15:04 -0700 In order to adopt this SPI, Safari needs two more things: 1. An optional initial cookie accept policy on the WebsiteDataStoreConfiguration. This is mostly used for ephemeral sessions, which would begin with the default cookie accept policy but we want to set it, in this case to be the same as the persistent cookie accept policy. 2. A way to update the cookie accept policies for all website data stores. This could technically be done without SPI, but iterating all existing website data stores is a lot easier in WebKit because we already have nonDefaultDataStores(). I plan to implement this as a class method on WKWebsiteDataStore called something like +_setCookieAcceptPolicyOnAllWebsiteDataStores:completionHandler: I plan to add these with tests in the morning. 1687788 4 achristensen 2020-09-11 12:43:18 -0700 Just kidding. I think those things are not actually necessary. 1687818 5 achristensen 2020-09-11 15:02:14 -0700 http://trac.webkit.org/r266951 1687819 6 webkit-bug-importer 2020-09-11 15:03:35 -0700 <rdar://problem/68734104> 408471 2020-09-10 13:04:39 -0700 2020-09-10 14:33:57 -0700 Patch bug-216375-20200910130438.patch text/plain 19759 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2NzUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGE5NDNhYzVkZTQ0ZWEx MzRiNDM5ZTc3MGI3MTUwMmM5MzBhNDc5Zi4uODdkZTg5ZjVjYWVjZDZhY2E3MjgwM2FmNWFmMGZk MThkY2NiZTMwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIwLTA5LTEwICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTW92ZSBf c2V0Q29va2llQWNjZXB0UG9saWN5IHRvIFdLSFRUUENvb2tpZVN0b3JlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTYzNzUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY29j b2EvSFRUUENvb2tpZUFjY2VwdFBvbGljeUNvY29hLmg6CisKIDIwMjAtMDktMDggIFNhbSBXZWlu aWcgIDx3ZWluaWdAYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJJRExdIEFkZCBzdXBwb3J0IGZv ciBwYXJ0aWFsIGludGVyZmFjZSBtaXhpbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMDM4YWJhMTllZWMwYzNjOTE2 Zjk0ZjcyZmYzMGZjZTVkOTIxNTM4YS4uZGM2YTk1NTc1ZjUyMjkxYjE4MjQzOThiZGEzYWZlMTQ5 Y2EyN2M4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNCBAQAorMjAyMC0wOS0xMCAgQWxleCBDaHJp c3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIE1vdmUgX3NldENv b2tpZUFjY2VwdFBvbGljeSB0byBXS0hUVFBDb29raWVTdG9yZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2Mzc1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSXQgaXMgb25seSB1c2VkIGJ5IFNhZmFyaSwg d2hpY2ggSSBhbSBjaGFuZ2luZyBhbG9uZyB3aXRoIHRoaXMgaW4gcmRhcjovL3Byb2JsZW0vNjg2 NTk5MzcKKyAgICAgICAgSSBuZWVkIGl0IHRvIG5vdCBiZSBvbiB0aGUgcHJvY2VzcyBwb29sIGZv ciBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2MDQxCisgICAgICAg IGFuZCBiZWNhdXNlIHRoZSBjb29raWUgc3RvcmUncyBqb2IgaXMgdG8gbWFuYWdlIGNvb2tpZSBz dG9yYWdlLiAgVGhlIGZhY3QgdGhhdCBpdCB3YXMgb24gdGhlIHByb2Nlc3MgcG9vbAorICAgICAg ICBpcyBqdXN0IGEgaGlzdG9yaWNhbCBhcnRpZmFjdCBvZiB1cyB0cnlpbmcgdG8gbWFrZSBpdCBn bG9iYWwuCisKKyAgICAgICAgV0tDb250ZXh0VXNlVGVzdGluZ05ldHdvcmtTZXNzaW9uIGhhcyBo YWQgaXRzIGltcG9ydGFudCBwYXJ0cyByZXBsYWNlZCBieSBXS1dlYnNpdGVEYXRhU3RvcmVDb25m aWd1cmF0aW9uU2V0VGVzdGluZ1Nlc3Npb25FbmFibGVkCisgICAgICAgIGJ1dCBpdCB3YXMgc3Rp bGwgYmVpbmcgdXNlZCB0byBkZXRlcm1pbnRlIHdoZXRoZXIgdGhlIFVJIHByb2Nlc3Mgc2hvdWxk IHBlcnNpc3QgdGhlIGNvb2tpZSBhY2NlcHQgcG9saWN5LiAgV2UgZG9uJ3QgbmVlZCB0aGlzCisg ICAgICAgIGFueSBtb3JlIGJlY2F1c2Ugd2Ugc2VuZCBhIG1lc3NhZ2UgdG8gdGhlIG5ldHdvcmsg cHJvY2VzcyBhbmQgbGV0IGl0IG1hbmFnZSB0aGUgY29va2llIGFjY2VwdCBwb2xpY3kuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0LmNwcDoKKyAgICAgICAgKFdLQ29udGV4 dFVzZVRlc3RpbmdOZXR3b3JrU2Vzc2lvbik6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9DL1dLQ29udGV4dFByaXZhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29h L1dLSFRUUENvb2tpZVN0b3JlLm1tOgorICAgICAgICAoLVtXS0hUVFBDb29raWVTdG9yZSBfc2V0 Q29va2llQWNjZXB0UG9saWN5OmNvbXBsZXRpb25IYW5kbGVyOl0pOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tIVFRQQ29va2llU3RvcmVQcml2YXRlLmg6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1Byb2Nlc3NQb29sLm1tOgorICAgICAgICAoLVtXS1Byb2Nlc3NQ b29sIF9zZXRDb29raWVBY2NlcHRQb2xpY3k6XSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1Byb2Nlc3NQb29sUHJpdmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJDb29r aWVNYW5hZ2VyUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb29raWVNYW5hZ2VyUHJv eHk6OnNldEhUVFBDb29raWVBY2NlcHRQb2xpY3kpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQ cm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjp1c2VUZXN0 aW5nTmV0d29ya1Nlc3Npb24pOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9j ZXNzUG9vbC5oOgorCiAyMDIwLTA5LTA4ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2Vu QHdlYmtpdC5vcmc+CiAKICAgICAgICAgTnVsbCBjaGVjayBtX2xheWVySG9zdGluZ0NvbnRleHQg aW4gVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnNlbmREaWRGaXJzdExheWVyRmx1c2hJ Zk5lZWRlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2Nv YS9IVFRQQ29va2llQWNjZXB0UG9saWN5Q29jb2EuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvY29jb2EvSFRUUENvb2tpZUFjY2VwdFBvbGljeUNvY29hLmgKaW5kZXggMjE3MjQ4 MDhmYjFhNzhjYjg5ZTJiY2E5NmVlM2Y3NzMxYjMyOGUzZS4uMzE1NWE4MzhmNjk0NzQ4ZmUyMDhm M2Y0MmFhY2JiYzYzOGU3ZDA5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9jb2NvYS9IVFRQQ29va2llQWNjZXB0UG9saWN5Q29jb2EuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL0hUVFBDb29raWVBY2NlcHRQb2xpY3lDb2Nv YS5oCkBAIC0yNiw2ICsyNiw3IEBACiAjcHJhZ21hIG9uY2UKIAogI2luY2x1ZGUgIkhUVFBDb29r aWVBY2NlcHRQb2xpY3kuaCIKKyNpbmNsdWRlIDxwYWwvc3BpL2NmL0NGTmV0d29ya1NQSS5oPgog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9DL1dLQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9X S0NvbnRleHQuY3BwCmluZGV4IDhmYjhlMDk2ZDQ2NmUyMzYxY2RiNTIwM2VmYzljNTY4YzllNjk1 MTEuLmRmMzEzZmZiODZmYzFlZjdlNzMxYTU0NGQ1N2NiNzRjZDMwZDRhY2QgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dC5jcHAKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0LmNwcApAQCAtNTQzLDExICs1NDMsNiBA QCB2b2lkIFdLQ29udGV4dFNldEphdmFTY3JpcHRHYXJiYWdlQ29sbGVjdG9yVGltZXJFbmFibGVk KFdLQ29udGV4dFJlZiBjb250ZXh0UmVmLAogICAgIFdlYktpdDo6dG9JbXBsKGNvbnRleHRSZWYp LT5zZXRKYXZhU2NyaXB0R2FyYmFnZUNvbGxlY3RvclRpbWVyRW5hYmxlZChlbmFibGUpOwogfQog Ci12b2lkIFdLQ29udGV4dFVzZVRlc3RpbmdOZXR3b3JrU2Vzc2lvbihXS0NvbnRleHRSZWYgY29u dGV4dCkKLXsKLSAgICBXZWJLaXQ6OnRvSW1wbChjb250ZXh0KS0+dXNlVGVzdGluZ05ldHdvcmtT ZXNzaW9uKCk7Ci19Ci0KIHZvaWQgV0tDb250ZXh0U2V0QWxsb3dzQW55U1NMQ2VydGlmaWNhdGVG b3JXZWJTb2NrZXRUZXN0aW5nKFdLQ29udGV4dFJlZiBjb250ZXh0LCBib29sIGFsbG93cykKIHsK ICAgICBXZWJLaXQ6OnRvSW1wbChjb250ZXh0KS0+c2V0QWxsb3dzQW55U1NMQ2VydGlmaWNhdGVG b3JXZWJTb2NrZXQoYWxsb3dzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9DL1dLQ29udGV4dFByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D L1dLQ29udGV4dFByaXZhdGUuaAppbmRleCAzOWMwY2E3Y2M2YTZiNmI1NWM4MDNiODNjZGU1YjM4 YmZjMTljOThlLi43YzI3MTBmMzM5ZmNlNzdkM2E1MmE4YTU1ZThiMWFlNmNlYjU1N2E1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRQcml2YXRlLmgK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0UHJpdmF0ZS5oCkBA IC04OSw5ICs4OSw2IEBAIFdLX0VYUE9SVCB2b2lkIFdLQ29udGV4dFRlcm1pbmF0ZVNlcnZpY2VX b3JrZXJzKFdLQ29udGV4dFJlZik7CiBXS19FWFBPUlQgdm9pZCBXS0NvbnRleHRTZXRBbGxvd3NB bnlTU0xDZXJ0aWZpY2F0ZUZvcldlYlNvY2tldFRlc3RpbmcoV0tDb250ZXh0UmVmLCBib29sKTsK IFdLX0VYUE9SVCB2b2lkIFdLQ29udGV4dFNldEFsbG93c0FueVNTTENlcnRpZmljYXRlRm9yU2Vy dmljZVdvcmtlclRlc3RpbmcoV0tDb250ZXh0UmVmLCBib29sKTsKIAotLy8gVGVzdCBvbmx5LiBT aG91bGQgYmUgY2FsbGVkIGJlZm9yZSBhbnkgc2Vjb25kYXJ5IHByb2Nlc3NlcyBhcmUgc3RhcnRl ZC4KLVdLX0VYUE9SVCB2b2lkIFdLQ29udGV4dFVzZVRlc3RpbmdOZXR3b3JrU2Vzc2lvbihXS0Nv bnRleHRSZWYgY29udGV4dCk7Ci0KIC8vIFRlc3Qgb25seS4gU2hvdWxkIGJlIGNhbGxlZCBiZWZv cmUgcnVubmluZyBhIHRlc3QuCiBXS19FWFBPUlQgdm9pZCBXS0NvbnRleHRDbGVhckNhY2hlZENy ZWRlbnRpYWxzKFdLQ29udGV4dFJlZiBjb250ZXh0KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLSFRUUENvb2tpZVN0b3JlLm1tIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLSFRUUENvb2tpZVN0b3JlLm1tCmluZGV4IDAyM2E1 MjNmYjI2NmE2ODM3MzdlYjI3NGViOTg3ZDlhMzhmYzA5OTEuLjc1NGIzZjJjNGRkNWJiNTg1Yzkz YjA4NDBmNjYxYzc3ZjFiM2YyMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS0hUVFBDb29raWVTdG9yZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tIVFRQQ29va2llU3RvcmUubW0KQEAgLTI4LDYgKzI4LDcgQEAKIAog I2ltcG9ydCA8V2ViQ29yZS9Db29raWUuaD4KICNpbXBvcnQgPFdlYkNvcmUvSFRUUENvb2tpZUFj Y2VwdFBvbGljeS5oPgorI2ltcG9ydCA8V2ViQ29yZS9IVFRQQ29va2llQWNjZXB0UG9saWN5Q29j b2EuaD4KICNpbXBvcnQgPHBhbC9zcGkvY2YvQ0ZOZXR3b3JrU1BJLmg+CiAjaW1wb3J0IDx3dGYv QmxvY2tQdHIuaD4KICNpbXBvcnQgPHd0Zi9IYXNoTWFwLmg+CkBAIC0xMzgsNCArMTM5LDExIEBA IHByaXZhdGU6CiAgICAgfSk7CiB9CiAKKy0gKHZvaWQpX3NldENvb2tpZUFjY2VwdFBvbGljeToo TlNIVFRQQ29va2llQWNjZXB0UG9saWN5KXBvbGljeSBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAo XikoKSljb21wbGV0aW9uSGFuZGxlcgoreworICAgIF9jb29raWVTdG9yZS0+c2V0SFRUUENvb2tp ZUFjY2VwdFBvbGljeShXZWJDb3JlOjp0b0hUVFBDb29raWVBY2NlcHRQb2xpY3kocG9saWN5KSwg W2NvbXBsZXRpb25IYW5kbGVyID0gbWFrZUJsb2NrUHRyKGNvbXBsZXRpb25IYW5kbGVyKV0gewor ICAgICAgICBjb21wbGV0aW9uSGFuZGxlci5nZXQoKSgpOworICAgIH0pOworfQorCiBAZW5kCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tIVFRQQ29va2ll U3RvcmVQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tIVFRQ Q29va2llU3RvcmVQcml2YXRlLmgKaW5kZXggOGNjZTRhZWJiMjU3NWY4ZTFlNTgyMzBmNDZlYzNh YTBmN2M2NTk2Yi4uN2RlMzc2NTg0ZGM3MTMwZjU3MTQ4YjQ5MWI0YjJiZDZiNjcyZjgwNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLSFRUUENvb2tpZVN0 b3JlUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0hU VFBDb29raWVTdG9yZVByaXZhdGUuaApAQCAtMjcsNCArMjcsNSBAQAogCiBAaW50ZXJmYWNlIFdL SFRUUENvb2tpZVN0b3JlIChXS1ByaXZhdGUpCiAtICh2b2lkKV9nZXRDb29raWVzRm9yVVJMOihO U1VSTCAqKXVybCBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoTlNBcnJheTxOU0hUVFBDb29r aWUgKj4gKikpY29tcGxldGlvbkhhbmRsZXIgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNf VEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKKy0gKHZvaWQpX3NldENvb2tpZUFjY2VwdFBvbGljeToo TlNIVFRQQ29va2llQWNjZXB0UG9saWN5KXBvbGljeSBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAo XikoKSljb21wbGV0aW9uSGFuZGxlciBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEp LCBpb3MoV0tfSU9TX1RCQSkpOwogQGVuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL1dLUHJvY2Vzc1Bvb2wubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tQcm9jZXNzUG9vbC5tbQppbmRleCA2ODIwZjQ5MWU5NDc1OTVlMDBkMGNi ZDJkNTg4OTUyMDcwM2E1ODA4Li5hYzcyODBkNWUxMDU0YTIxZDcwNTY4MzQzMTJmODE5NjQwMWM4 M2UyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcm9j ZXNzUG9vbC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcm9j ZXNzUG9vbC5tbQpAQCAtMjAxLDcgKzIwMSw2IEBAIHN0YXRpYyBXS1Byb2Nlc3NQb29sICpzaGFy ZWRQcm9jZXNzUG9vbDsKIAogLSAodm9pZClfc2V0Q29va2llQWNjZXB0UG9saWN5OihOU0hUVFBD b29raWVBY2NlcHRQb2xpY3kpcG9saWN5CiB7Ci0gICAgX3Byb2Nlc3NQb29sLT5zdXBwbGVtZW50 PFdlYktpdDo6V2ViQ29va2llTWFuYWdlclByb3h5PigpLT5zZXRIVFRQQ29va2llQWNjZXB0UG9s aWN5KFBBTDo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCksIFdlYkNvcmU6OnRvSFRUUENv b2tpZUFjY2VwdFBvbGljeShwb2xpY3kpLCBbXSgpIHsgfSk7CiB9CiAKIC0gKGlkKV9vYmplY3RG b3JCdW5kbGVQYXJhbWV0ZXI6KE5TU3RyaW5nICopcGFyYW1ldGVyCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcm9jZXNzUG9vbFByaXZhdGUuaCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1Byb2Nlc3NQb29sUHJpdmF0ZS5oCmlu ZGV4IGQzOWRiMWRkYjA5YzA4Y2M3ODAxN2Q0ZTFmNDVmYzhkMjU2ZjVjZGYuLjJiNTEzMDIyZTY1 YzhmYTUyZGEwYTNlODNkZGZmNjI5YzllNTQ2YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1Byb2Nlc3NQb29sUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1Byb2Nlc3NQb29sUHJpdmF0ZS5oCkBAIC01MCw3 ICs1MCw3IEBACiAKIC0gKHZvaWQpX3NldEFsbG93c1NwZWNpZmljSFRUUFNDZXJ0aWZpY2F0ZToo TlNBcnJheSAqKWNlcnRpZmljYXRlQ2hhaW4gZm9ySG9zdDooTlNTdHJpbmcgKilob3N0OwogLSAo dm9pZClfc2V0Q2FuSGFuZGxlSFRUUFNTZXJ2ZXJUcnVzdEV2YWx1YXRpb246KEJPT0wpdmFsdWUg V0tfQVBJX0RFUFJFQ0FURURfV0lUSF9SRVBMQUNFTUVOVCgiX1dLV2Vic2l0ZURhdGFTdG9yZUNv bmZpZ3VyYXRpb24uZmFzdFNlcnZlclRydXN0RXZhbHVhdGlvbkVuYWJsZWQiLCBtYWNvcygxMC4x MSwgV0tfTUFDX1RCQSksIGlvcyg5LjAsIFdLX0lPU19UQkEpKTsKLS0gKHZvaWQpX3NldENvb2tp ZUFjY2VwdFBvbGljeTooTlNIVFRQQ29va2llQWNjZXB0UG9saWN5KXBvbGljeTsKKy0gKHZvaWQp X3NldENvb2tpZUFjY2VwdFBvbGljeTooTlNIVFRQQ29va2llQWNjZXB0UG9saWN5KXBvbGljeSBX S19BUElfREVQUkVDQVRFRF9XSVRIX1JFUExBQ0VNRU5UKCJXS0hUVFBDb29raWVTdG9yZS5fc2V0 Q29va2llQWNjZXB0UG9saWN5OmNvbXBsZXRpb25IYW5kbGVyOiIsIG1hY29zKDEwLjEwLCBXS19N QUNfVEJBKSwgaW9zKDguMCwgV0tfSU9TX1RCQSkpOwogCiAtIChpZClfb2JqZWN0Rm9yQnVuZGxl UGFyYW1ldGVyOihOU1N0cmluZyAqKXBhcmFtZXRlcjsKIC0gKHZvaWQpX3NldE9iamVjdDooaWQg PE5TQ29weWluZywgTlNTZWN1cmVDb2Rpbmc+KW9iamVjdCBmb3JCdW5kbGVQYXJhbWV0ZXI6KE5T U3RyaW5nICopcGFyYW1ldGVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViQ29va2llTWFuYWdlclByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkNv b2tpZU1hbmFnZXJQcm94eS5jcHAKaW5kZXggNDAxODYwZDIwYzI3ODc2ZWM0MDgyNzU0YzVmMGIy ZDZiMzc1YWYzNi4uY2M1MjZhYWYzYWFmYjFjMTQ2ZGE0YjI0MTk0NTliMTA5MjAxYjYxMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQ29va2llTWFuYWdlclByb3h5LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJDb29raWVNYW5hZ2VyUHJveHkuY3Bw CkBAIC0yMTEsMTAgKzIxMSw2IEBAIHZvaWQgV2ViQ29va2llTWFuYWdlclByb3h5Ojpjb29raWVz RGlkQ2hhbmdlKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCkKIAogdm9pZCBXZWJDb29raWVNYW5h Z2VyUHJveHk6OnNldEhUVFBDb29raWVBY2NlcHRQb2xpY3koUEFMOjpTZXNzaW9uSUQsIEhUVFBD b29raWVBY2NlcHRQb2xpY3kgcG9saWN5LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY2Fs bGJhY2tGdW5jdGlvbikKIHsKLSNpZiBQTEFURk9STShDT0NPQSkKLSAgICBpZiAoIXByb2Nlc3NQ b29sKCktPmlzVXNpbmdUZXN0aW5nTmV0d29ya1Nlc3Npb24oKSkKLSAgICAgICAgcGVyc2lzdEhU VFBDb29raWVBY2NlcHRQb2xpY3kocG9saWN5KTsKLSNlbmRpZgogI2lmIFVTRShTT1VQKQogICAg IHByb2Nlc3NQb29sKCktPnNldEluaXRpYWxIVFRQQ29va2llQWNjZXB0UG9saWN5KHBvbGljeSk7 CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQ b29sLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAppbmRl eCBmM2U2MDFiZTA0ZTQ3ZGM4ZDhkOGRmYmYyOTA0NjcyNDVmZWFkMWMxLi42ODcxOGQ5NjAxMmUx YzEyMzZlZmE3MDA4MGZmMGVjNzE1ZGVlY2Y0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUHJvY2Vzc1Bvb2wuY3BwCkBAIC0xNzY2LDIwICsxNzY2LDYgQEAgdm9pZCBXZWJQcm9jZXNz UG9vbDo6c3RvcE1lbW9yeVNhbXBsZXIoKQogICAgIHNlbmRUb0FsbFByb2Nlc3NlcyhNZXNzYWdl czo6V2ViUHJvY2Vzczo6U3RvcE1lbW9yeVNhbXBsZXIoKSk7CiB9CiAKLXZvaWQgV2ViUHJvY2Vz c1Bvb2w6OnVzZVRlc3RpbmdOZXR3b3JrU2Vzc2lvbigpCi17Ci0gICAgQVNTRVJUKG1fcHJvY2Vz c2VzLmlzRW1wdHkoKSk7Ci0gICAgQVNTRVJUKCFtX25ldHdvcmtQcm9jZXNzKTsKLQotICAgIGlm IChtX25ldHdvcmtQcm9jZXNzKQotICAgICAgICByZXR1cm47Ci0KLSAgICBpZiAoIW1fcHJvY2Vz c2VzLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgbV9zaG91bGRVc2VUZXN0aW5n TmV0d29ya1Nlc3Npb24gPSB0cnVlOwotfQotCiB0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFt ZSBVPgogdm9pZCBXZWJQcm9jZXNzUG9vbDo6c2VuZFN5bmNUb05ldHdvcmtpbmdQcm9jZXNzKFQm JiBtZXNzYWdlLCBVJiYgcmVwbHkpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQcm9jZXNzUG9vbC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vz c1Bvb2wuaAppbmRleCA2OTY5NjMyYTZiZTRkMjg5YjUzODNmMTRhNTQwY2U4M2E1ZDYxYTMyLi45 NTI5MjdlYzc5NjUwZTcwZGRiYzNmYjA0ZTM4YWIxYjZkMTIzNzU3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgKQEAgLTMxOCw5ICszMTgsNiBAQCBwdWJsaWM6CiAg ICAgfTsKICAgICBzdGF0aWMgU3RhdGlzdGljcyYgc3RhdGlzdGljcygpOyAgICAKIAotICAgIHZv aWQgdXNlVGVzdGluZ05ldHdvcmtTZXNzaW9uKCk7Ci0gICAgYm9vbCBpc1VzaW5nVGVzdGluZ05l dHdvcmtTZXNzaW9uKCkgY29uc3QgeyByZXR1cm4gbV9zaG91bGRVc2VUZXN0aW5nTmV0d29ya1Nl c3Npb247IH0KLQogICAgIHZvaWQgc2V0QWxsb3dzQW55U1NMQ2VydGlmaWNhdGVGb3JXZWJTb2Nr ZXQoYm9vbCk7CiAKICAgICB2b2lkIGNsZWFyQ2FjaGVkQ3JlZGVudGlhbHMoKTsKQEAgLTcyNSw4 ICs3MjIsNiBAQCBwcml2YXRlOgogICAgIFJldGFpblB0cjxOU09iamVjdD4gbV9hY2Nlc3NpYmls aXR5RW5hYmxlZE9ic2VydmVyOwogI2VuZGlmCiAKLSAgICBib29sIG1fc2hvdWxkVXNlVGVzdGlu Z05ldHdvcmtTZXNzaW9uIHsgZmFsc2UgfTsKLQogICAgIGJvb2wgbV9wcm9jZXNzVGVybWluYXRp b25FbmFibGVkIHsgdHJ1ZSB9OwogCiAgICAgc3RkOjp1bmlxdWVfcHRyPE5ldHdvcmtQcm9jZXNz UHJveHk+IG1fbmV0d29ya1Byb2Nlc3M7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9U b29scy9DaGFuZ2VMb2cKaW5kZXggZDRkMTAwODJlZDI1MzBjOTM1YWVmNzE4YWM0YTQ5MzQwMTk1 YTMzZC4uOTAxMmRkMTQ0M2E4YWVmZjc4MzY2NDlkMjA3NDQ3ZWMzYjA0OWQ2MyAxMDA2NDQKLS0t IGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBA CisyMDIwLTA5LTEwICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+ CisKKyAgICAgICAgTW92ZSBfc2V0Q29va2llQWNjZXB0UG9saWN5IHRvIFdLSFRUUENvb2tpZVN0 b3JlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTYz NzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvQ29va2llQWNjZXB0UG9saWN5Lm1tOgorICAg ICAgICAoVEVTVCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Q cm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1Rl c3RDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OmdlbmVyYXRl UGFnZUNvbmZpZ3VyYXRpb24pOgorCiAyMDIwLTA5LTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVk YXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBbd2Via2l0Y29yZXB5XSBSZWdpc3RlciBhbm90aGVy IHBhY2thZ2UgaW4gdGhlIFdlYktpdCByZXBvc2l0b3J5IChGb2xsb3ctdXAgZml4KQpkaWZmIC0t Z2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Db29raWVBY2NlcHRQ b2xpY3kubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0Nvb2tpZUFj Y2VwdFBvbGljeS5tbQppbmRleCA3ZjRmYzI1OTk5OTVkNGY1YWY4NDc5MTE2OTVlNmNkNzE2OGRh NWMwLi40NmE0NWI0OWYzNGIzNzRiMTJhYWYwNmE3NThmMWY3ODkxNjJjMTM4IDEwMDY0NAotLS0g YS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0Nvb2tpZUFjY2VwdFBvbGlj eS5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0Nvb2tpZUFj Y2VwdFBvbGljeS5tbQpAQCAtMjYsMTcgKzI2LDEzIEBACiAjaW1wb3J0ICJjb25maWcuaCIKIAog I2ltcG9ydCAiUGxhdGZvcm1VdGlsaXRpZXMuaCIKLSNpbXBvcnQgPFdlYktpdC9XS1Byb2Nlc3NQ b29sLmg+CisjaW1wb3J0IDxXZWJLaXQvV0tIVFRQQ29va2llU3RvcmVQcml2YXRlLmg+CiAjaW1w b3J0IDxXZWJLaXQvV0tQcm9jZXNzUG9vbFByaXZhdGUuaD4KICNpbXBvcnQgPFdlYktpdC9XS1dl YlZpZXcuaD4KICNpbXBvcnQgPFdlYktpdC9XS1dlYlZpZXdDb25maWd1cmF0aW9uLmg+CiAjaW1w b3J0IDxwYWwvc3BpL2NmL0NGTmV0d29ya1NQSS5oPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5o PgogCi0vLyBGSVhNRTogVGhpcyB0ZXN0IGlzIGNhdXNpbmcgZmxha2luZXNzIGluIEFQSSB0ZXN0 cy4gSXQgc2V0cyB0aGUgY29va2llIGFjY2VwdCBwb2xpY3kgdG8gJ05ldmVyJwotLy8gYW5kIGZv bGxvd2luZyB0ZXN0cyBvZnRlbiBhcmUgdW5hYmxlIHRvIHNldCBjb29raWVzLgotI2lmICFQTEFU Rk9STShJT1NfRkFNSUxZKQotCiBzdGF0aWMgYm9vbCByZWNlaXZlZFNjcmlwdE1lc3NhZ2UgPSBm YWxzZTsKIHN0YXRpYyBSZXRhaW5QdHI8V0tTY3JpcHRNZXNzYWdlPiBsYXN0U2NyaXB0TWVzc2Fn ZTsKIApAQCAtNTYsMjUgKzUyLDI3IEBAIHN0YXRpYyBSZXRhaW5QdHI8V0tTY3JpcHRNZXNzYWdl PiBsYXN0U2NyaXB0TWVzc2FnZTsKIFRFU1QoV2ViS2l0LCBDb29raWVBY2NlcHRQb2xpY3kpCiB7 CiAgICAgYXV0byBvcmlnaW5hbENvb2tpZUFjY2VwdFBvbGljeSA9IFtbTlNIVFRQQ29va2llU3Rv cmFnZSBzaGFyZWRIVFRQQ29va2llU3RvcmFnZV0gY29va2llQWNjZXB0UG9saWN5XTsKLSAgICAK LSAgICBSZXRhaW5QdHI8V0tXZWJWaWV3Q29uZmlndXJhdGlvbj4gY29uZmlndXJhdGlvbiA9IGFk b3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7Ci0gICAgCi0gICAg UmV0YWluUHRyPFdLUHJvY2Vzc1Bvb2w+IHByb2Nlc3NQb29sID0gYWRvcHROUyhbW1dLUHJvY2Vz c1Bvb2wgYWxsb2NdIGluaXRdKTsKLSAgICBbY29uZmlndXJhdGlvbiBzZXRQcm9jZXNzUG9vbDpw cm9jZXNzUG9vbC5nZXQoKV07Ci0gICAgCi0gICAgUmV0YWluUHRyPENvb2tpZUFjY2VwdFBvbGlj eU1lc3NhZ2VIYW5kbGVyPiBoYW5kbGVyID0gYWRvcHROUyhbW0Nvb2tpZUFjY2VwdFBvbGljeU1l c3NhZ2VIYW5kbGVyIGFsbG9jXSBpbml0XSk7CisKKyAgICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBh ZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworCisgICAgYXV0 byBoYW5kbGVyID0gYWRvcHROUyhbW0Nvb2tpZUFjY2VwdFBvbGljeU1lc3NhZ2VIYW5kbGVyIGFs bG9jXSBpbml0XSk7CiAgICAgW1tjb25maWd1cmF0aW9uIHVzZXJDb250ZW50Q29udHJvbGxlcl0g YWRkU2NyaXB0TWVzc2FnZUhhbmRsZXI6aGFuZGxlci5nZXQoKSBuYW1lOkAidGVzdEhhbmRsZXIi XTsKLSAgICAKLSAgICBSZXRhaW5QdHI8V0tXZWJWaWV3PiB3ZWJWaWV3ID0gYWRvcHROUyhbW1dL V2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBj b25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCldKTsKLSAgICAKKworICAgIGF1dG8gd2Vi VmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVj dCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpXSk7CisK ICAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJM OltbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gVVJMRm9yUmVzb3VyY2U6QCJDb29raWVNZXNzYWdlIiB3 aXRoRXh0ZW5zaW9uOkAiaHRtbCIgc3ViZGlyZWN0b3J5OkAiVGVzdFdlYktpdEFQSS5yZXNvdXJj ZXMiXV07Ci0gICAgW3Byb2Nlc3NQb29sIF9zZXRDb29raWVBY2NlcHRQb2xpY3k6TlNIVFRQQ29v a2llQWNjZXB0UG9saWN5TmV2ZXJdOworICAgIF9fYmxvY2sgYm9vbCBzZXRQb2xpY3kgPSBmYWxz ZTsKKyAgICBbY29uZmlndXJhdGlvbi5nZXQoKS53ZWJzaXRlRGF0YVN0b3JlLmh0dHBDb29raWVT dG9yZSBfc2V0Q29va2llQWNjZXB0UG9saWN5Ok5TSFRUUENvb2tpZUFjY2VwdFBvbGljeU5ldmVy IGNvbXBsZXRpb25IYW5kbGVyOl57CisgICAgICAgIHNldFBvbGljeSA9IHRydWU7CisgICAgfV07 CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZzZXRQb2xpY3kpOwogICAgIFt3ZWJWaWV3 IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOwogICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVj ZWl2ZWRTY3JpcHRNZXNzYWdlKTsKICAgICBFWFBFQ1RfU1RSRVEoWyhOU1N0cmluZyAqKVtsYXN0 U2NyaXB0TWVzc2FnZSBib2R5XSBVVEY4U3RyaW5nXSwgIkNPT0tJRToiKTsKLSAgICAKLSAgICBb W05TSFRUUENvb2tpZVN0b3JhZ2Ugc2hhcmVkSFRUUENvb2tpZVN0b3JhZ2VdIHNldENvb2tpZUFj Y2VwdFBvbGljeTpvcmlnaW5hbENvb2tpZUFjY2VwdFBvbGljeV07Ci0gICAgW1tOU0hUVFBDb29r aWVTdG9yYWdlIHNoYXJlZEhUVFBDb29raWVTdG9yYWdlXSBfc2F2ZUNvb2tpZXNdOwotfQogCi0j ZW5kaWYgLy8gIVBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgc2V0UG9saWN5ID0gZmFsc2U7Cisg ICAgW2NvbmZpZ3VyYXRpb24uZ2V0KCkud2Vic2l0ZURhdGFTdG9yZS5odHRwQ29va2llU3RvcmUg X3NldENvb2tpZUFjY2VwdFBvbGljeTpvcmlnaW5hbENvb2tpZUFjY2VwdFBvbGljeSBjb21wbGV0 aW9uSGFuZGxlcjpeeworICAgICAgICBzZXRQb2xpY3kgPSB0cnVlOworICAgIH1dOworICAgIFRl c3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmc2V0UG9saWN5KTsKK30KZGlmZiAtLWdpdCBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24u bW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25O YXZpZ2F0aW9uLm1tCmluZGV4IGFjZTdmNTRkZDlmYTgzZjNiOWVkYzZkOTQ2MDc5ODJlZWM0ZTVh MWUuLjFmOTY2MWNhZjA2OGYwYmUzMDBhMTQ1NzQ1NTBkZGEyODI3Y2M1OTEgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmln YXRpb24ubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9j ZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQpAQCAtMzEsNiArMzEsNyBAQAogI2ltcG9ydCAiVGVzdFdL V2ViVmlldy5oIgogI2ltcG9ydCA8V2ViS2l0L1dLQmFja0ZvcndhcmRMaXN0SXRlbVByaXZhdGUu aD4KICNpbXBvcnQgPFdlYktpdC9XS0NvbnRlbnRSdWxlTGlzdFN0b3JlLmg+CisjaW1wb3J0IDxX ZWJLaXQvV0tIVFRQQ29va2llU3RvcmVQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tOYXZp Z2F0aW9uRGVsZWdhdGVQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tOYXZpZ2F0aW9uUHJp dmF0ZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dLUHJlZmVyZW5jZXNQcml2YXRlLmg+CkBAIC01Mzk3 LDYgKzUzOTgsOCBAQCBURVNUKFByb2Nlc3NTd2FwLCBVc2VQcmV3YXJtZWRQcm9jZXNzQWZ0ZXJU ZXJtaW5hdGluZ05ldHdvcmtQcm9jZXNzKQogCiBURVNUKFByb2Nlc3NTd2FwLCBVc2VTZXNzaW9u Q29va2llc0FmdGVyUHJvY2Vzc1N3YXBJblByaXZhdGVCcm93c2luZykKIHsKKyAgICBhdXRvIG9y aWdpbmFsQ29va2llQWNjZXB0UG9saWN5ID0gW1tOU0hUVFBDb29raWVTdG9yYWdlIHNoYXJlZEhU VFBDb29raWVTdG9yYWdlXSBjb29raWVBY2NlcHRQb2xpY3ldOworCiAgICAgYXV0byBwcm9jZXNz UG9vbENvbmZpZ3VyYXRpb24gPSBwc29uUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uKCk7CiAgICAg YXV0byBwcm9jZXNzUG9vbCA9IGFkb3B0TlMoW1tXS1Byb2Nlc3NQb29sIGFsbG9jXSBfaW5pdFdp dGhDb25maWd1cmF0aW9uOnByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKV0pOwogICAgIFJl dGFpblB0cjxXS1dlYnNpdGVEYXRhU3RvcmU+IGVwaGVtZXJhbFN0b3JlID0gW1dLV2Vic2l0ZURh dGFTdG9yZSBub25QZXJzaXN0ZW50RGF0YVN0b3JlXTsKQEAgLTU0MTUsNyArNTQxOCwxMSBAQCBU RVNUKFByb2Nlc3NTd2FwLCBVc2VTZXNzaW9uQ29va2llc0FmdGVyUHJvY2Vzc1N3YXBJblByaXZh dGVCcm93c2luZykKICAgICBhdXRvIGRlbGVnYXRlID0gYWRvcHROUyhbW1BTT05OYXZpZ2F0aW9u RGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKICAgICBbd2ViVmlldyBzZXROYXZpZ2F0aW9uRGVsZWdh dGU6ZGVsZWdhdGUuZ2V0KCldOwogCi0gICAgW3Byb2Nlc3NQb29sIF9zZXRDb29raWVBY2NlcHRQ b2xpY3k6TlNIVFRQQ29va2llQWNjZXB0UG9saWN5QWx3YXlzXTsKKyAgICBfX2Jsb2NrIGJvb2wg c2V0UG9saWN5ID0gZmFsc2U7CisgICAgW3dlYlZpZXcuZ2V0KCkuY29uZmlndXJhdGlvbi53ZWJz aXRlRGF0YVN0b3JlLmh0dHBDb29raWVTdG9yZSBfc2V0Q29va2llQWNjZXB0UG9saWN5Ok5TSFRU UENvb2tpZUFjY2VwdFBvbGljeUFsd2F5cyBjb21wbGV0aW9uSGFuZGxlcjpeeworICAgICAgICBz ZXRQb2xpY3kgPSB0cnVlOworICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigm c2V0UG9saWN5KTsKIAogICAgIE5TVVJMUmVxdWVzdCAqcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3Qg cmVxdWVzdFdpdGhVUkw6W1tOU0J1bmRsZSBtYWluQnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpAIlNl dFNlc3Npb25Db29raWUiIHdpdGhFeHRlbnNpb246QCJodG1sIiBzdWJkaXJlY3Rvcnk6QCJUZXN0 V2ViS2l0QVBJLnJlc291cmNlcyJdXTsKICAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0 XTsKQEAgLTU0NTAsMTAgKzU0NTcsMTggQEAgVEVTVChQcm9jZXNzU3dhcCwgVXNlU2Vzc2lvbkNv b2tpZXNBZnRlclByb2Nlc3NTd2FwSW5Qcml2YXRlQnJvd3NpbmcpCiAKICAgICBFWFBFQ1RfRVEo MXUsIFtyZWNlaXZlZE1lc3NhZ2VzIGNvdW50XSk7CiAgICAgRVhQRUNUX1dLX1NUUkVRKEAiZm9v PWJhciIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMF0pOworICAgIAorICAgIHNldFBvbGljeSA9 IGZhbHNlOworICAgIFt3ZWJWaWV3LmdldCgpLmNvbmZpZ3VyYXRpb24ud2Vic2l0ZURhdGFTdG9y ZS5odHRwQ29va2llU3RvcmUgX3NldENvb2tpZUFjY2VwdFBvbGljeTpvcmlnaW5hbENvb2tpZUFj Y2VwdFBvbGljeSBjb21wbGV0aW9uSGFuZGxlcjpeeworICAgICAgICBzZXRQb2xpY3kgPSB0cnVl OworICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmc2V0UG9saWN5KTsKIH0K IAogVEVTVChQcm9jZXNzU3dhcCwgVXNlU2Vzc2lvbkNvb2tpZXNBZnRlclByb2Nlc3NTd2FwSW5O b25EZWZhdWx0UGVyc2lzdGVudFNlc3Npb24pCiB7CisgICAgYXV0byBvcmlnaW5hbENvb2tpZUFj Y2VwdFBvbGljeSA9IFtbTlNIVFRQQ29va2llU3RvcmFnZSBzaGFyZWRIVFRQQ29va2llU3RvcmFn ZV0gY29va2llQWNjZXB0UG9saWN5XTsKKwogICAgIGF1dG8gcHJvY2Vzc1Bvb2xDb25maWd1cmF0 aW9uID0gcHNvblByb2Nlc3NQb29sQ29uZmlndXJhdGlvbigpOwogCiAgICAgLy8gUHJldmVudCBX ZWJQcm9jZXNzIHJldXNlLgpAQCAtNTQ4MSw3ICs1NDk2LDExIEBAIFRFU1QoUHJvY2Vzc1N3YXAs IFVzZVNlc3Npb25Db29raWVzQWZ0ZXJQcm9jZXNzU3dhcEluTm9uRGVmYXVsdFBlcnNpc3RlbnRT ZXNzaW9uCiAgICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tQU09OTmF2aWdhdGlvbkRlbGVn YXRlIGFsbG9jXSBpbml0XSk7CiAgICAgW3dlYlZpZXcgc2V0TmF2aWdhdGlvbkRlbGVnYXRlOmRl bGVnYXRlLmdldCgpXTsKIAotICAgIFtwcm9jZXNzUG9vbCBfc2V0Q29va2llQWNjZXB0UG9saWN5 Ok5TSFRUUENvb2tpZUFjY2VwdFBvbGljeUFsd2F5c107CisgICAgX19ibG9jayBib29sIHNldFBv bGljeSA9IGZhbHNlOworICAgIFt3ZWJWaWV3LmdldCgpLmNvbmZpZ3VyYXRpb24ud2Vic2l0ZURh dGFTdG9yZS5odHRwQ29va2llU3RvcmUgX3NldENvb2tpZUFjY2VwdFBvbGljeTpOU0hUVFBDb29r aWVBY2NlcHRQb2xpY3lBbHdheXMgY29tcGxldGlvbkhhbmRsZXI6XnsKKyAgICAgICAgc2V0UG9s aWN5ID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnNldFBv bGljeSk7CiAKICAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVl c3RXaXRoVVJMOltbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gVVJMRm9yUmVzb3VyY2U6QCJTZXRTZXNz aW9uQ29va2llIiB3aXRoRXh0ZW5zaW9uOkAiaHRtbCIgc3ViZGlyZWN0b3J5OkAiVGVzdFdlYktp dEFQSS5yZXNvdXJjZXMiXV07CiAgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CkBA IC01NTE3LDYgKzU1MzYsMTIgQEAgVEVTVChQcm9jZXNzU3dhcCwgVXNlU2Vzc2lvbkNvb2tpZXNB ZnRlclByb2Nlc3NTd2FwSW5Ob25EZWZhdWx0UGVyc2lzdGVudFNlc3Npb24KIAogICAgIEVYUEVD VF9FUSgxdSwgW3JlY2VpdmVkTWVzc2FnZXMgY291bnRdKTsKICAgICBFWFBFQ1RfV0tfU1RSRVEo QCJmb289YmFyIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVswXSk7CisKKyAgICBzZXRQb2xpY3kg PSBmYWxzZTsKKyAgICBbd2ViVmlldy5nZXQoKS5jb25maWd1cmF0aW9uLndlYnNpdGVEYXRhU3Rv cmUuaHR0cENvb2tpZVN0b3JlIF9zZXRDb29raWVBY2NlcHRQb2xpY3k6b3JpZ2luYWxDb29raWVB Y2NlcHRQb2xpY3kgY29tcGxldGlvbkhhbmRsZXI6XnsKKyAgICAgICAgc2V0UG9saWN5ID0gdHJ1 ZTsKKyAgICB9XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnNldFBvbGljeSk7CiB9 CiAKIFRFU1QoUHJvY2Vzc1N3YXAsIFByb2Nlc3NTd2FwSW5SZWxhdGVkVmlldykKZGlmZiAtLWdp dCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwIGIvVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKaW5kZXggMWViOWFhYjM5ODhjMWFlNGQ2 NWEzYzIyZTdmY2Q3ZmRiZDZhNjIxMS4uZTg1ODNiOGMxMmE0NTk3ODlkNDA5NGE4OTY5N2UwZjc2 MGIwYzEwMiAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxl ci5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKQEAg LTU3OSw3ICs1NzksNiBAQCBXS1JldGFpblB0cjxXS1BhZ2VDb25maWd1cmF0aW9uUmVmPiBUZXN0 Q29udHJvbGxlcjo6Z2VuZXJhdGVQYWdlQ29uZmlndXJhdGlvbihjbwogICAgICAgICAgICAgV0tD b250ZXh0U2V0SWNvbkRhdGFiYXNlUGF0aChtX2NvbnRleHQuZ2V0KCksIHRvV0soZW1wdHlTdHJp bmcoKSkuZ2V0KCkpOwogICAgICAgICB9CiAKLSAgICAgICAgV0tDb250ZXh0VXNlVGVzdGluZ05l dHdvcmtTZXNzaW9uKG1fY29udGV4dC5nZXQoKSk7CiAgICAgICAgIFdLQ29udGV4dFNldENhY2hl TW9kZWwobV9jb250ZXh0LmdldCgpLCBrV0tDYWNoZU1vZGVsRG9jdW1lbnRCcm93c2VyKTsKIAog ICAgICAgICBwbGF0Zm9ybUluaXRpYWxpemVDb250ZXh0KCk7Cg==