201916 2019-09-18 08:33:50 -0700 Drop FrameLoaderClient::sessionID() 2019-09-18 10:41:23 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen beidson commit-queue dbates ews-watchlist ggaren japhet webkit-bug-importer youennf oldest_to_newest 1571901 0 cdumez 2019-09-18 08:33:50 -0700 Drop FrameLoaderClient::sessionID(). The Frame can get the sessionID from its page (Which is what the FrameLoaderClient::sessionID() ended up doing) and other call sites at WebKit2 layer can get the sessionID from the WebProcess singleton. 1571902 1 379039 cdumez 2019-09-18 08:36:07 -0700 Created attachment 379039 Patch 1571918 2 379041 cdumez 2019-09-18 09:14:14 -0700 Created attachment 379041 Patch 1571939 3 379041 ggaren 2019-09-18 10:09:37 -0700 Comment on attachment 379041 Patch r=me 1571948 4 379041 cdumez 2019-09-18 10:14:20 -0700 Comment on attachment 379041 Patch Clearing flags on attachment: 379041 Committed r250043: <https://trac.webkit.org/changeset/250043> 1571949 5 cdumez 2019-09-18 10:14:22 -0700 All reviewed patches have been landed. Closing bug. 1571950 6 webkit-bug-importer 2019-09-18 10:15:19 -0700 <rdar://problem/55482907> 1571951 7 webkit-bug-importer 2019-09-18 10:15:23 -0700 <rdar://problem/55482910> 379039 2019-09-18 08:36:07 -0700 2019-09-18 09:14:12 -0700 Patch bug-201916-20190918083538.patch text/plain 13537 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMDE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDEwODc3NzgyNzgwOWRl M2MyMjYxNTMzNGFkMjYxZTA2OGIwNTYxNC4uM2NiYmRjYWQzNDA3MGVhOWU0MGNiOTNhYmYxZTg0 NWNlMDc5OWUwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE5LTA5LTE4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgRHJvcCBGcmFtZUxvYWRlckNs aWVudDo6c2Vzc2lvbklEKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwMTkxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIERyb3AgRnJhbWVMb2FkZXJDbGllbnQ6OnNlc3Npb25JRCgpLiBUaGUgRnJhbWUg Y2FuIGdldCB0aGUgc2Vzc2lvbklEIGZyb20gaXRzIHBhZ2UgKFdoaWNoIGlzCisgICAgICAgIHdo YXQgdGhlIEZyYW1lTG9hZGVyQ2xpZW50OjpzZXNzaW9uSUQoKSBlbmRlZCB1cCBkb2luZykgYW5k IG90aGVyIGNhbGwgc2l0ZXMgYXQgV2ViS2l0MiBsYXllcgorICAgICAgICBjYW4gZ2V0IHRoZSBz ZXNzaW9uSUQgZnJvbSB0aGUgV2ViUHJvY2VzcyBzaW5nbGV0b24uCisKKyAgICAgICAgKiBsb2Fk ZXIvRW1wdHlDbGllbnRzLmNwcDoKKyAgICAgICAgKiBsb2FkZXIvRW1wdHlGcmFtZUxvYWRlckNs aWVudC5oOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oOgorICAgICAgICAq IHBhZ2UvRnJhbWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWU6OnNlc3Npb25JRCBjb25z dCk6CisKIDIwMTktMDktMTcgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAg ICAgICBVbnJldmlld2VkLCByZXZlcnQgY2hhbmdlIHRoYXQgQWxleCBtaXN0YWtlbmx5IGNvbW1p dHRlZCBhdCB0aGUgc2FtZSB0aW1lIGFzIHIyNTAwMDYgYW5kIGJyb2tlIHRoZSBidWlsZC4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKaW5kZXggNmUyYjg1NTdiNDc5Yjk2YTY5Y2NkYzRkMDJmODA4ZGNiZTRhNjk5Ni4uNTY5YzMy MjY2NjAzOTk3NmVjMTFhNTlkZmYzNjE2MzdlNTBiZGZhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwy MyBAQAorMjAxOS0wOS0xOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAg ICAgIERyb3AgRnJhbWVMb2FkZXJDbGllbnQ6OnNlc3Npb25JRCgpCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDE5MTYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEcm9wIEZyYW1lTG9hZGVyQ2xpZW50Ojpz ZXNzaW9uSUQoKS4gVGhlIEZyYW1lIGNhbiBnZXQgdGhlIHNlc3Npb25JRCBmcm9tIGl0cyBwYWdl IChXaGljaCBpcworICAgICAgICB3aGF0IHRoZSBGcmFtZUxvYWRlckNsaWVudDo6c2Vzc2lvbklE KCkgZW5kZWQgdXAgZG9pbmcpIGFuZCBvdGhlciBjYWxsIHNpdGVzIGF0IFdlYktpdDIgbGF5ZXIK KyAgICAgICAgY2FuIGdldCB0aGUgc2Vzc2lvbklEIGZyb20gdGhlIFdlYlByb2Nlc3Mgc2luZ2xl dG9uLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViTG9hZGVyU3RyYXRlZ3k6OnNjaGVkdWxlTG9hZCk6Cisg ICAgICAgICogV2ViUHJvY2Vzcy9TdG9yYWdlL1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9u LmNwcDoKKyAgICAgICAgKFdlYktpdDo6U2VydmljZVdvcmtlckZyYW1lTG9hZGVyQ2xpZW50OjpT ZXJ2aWNlV29ya2VyRnJhbWVMb2FkZXJDbGllbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJTV0Nv bnRleHRNYW5hZ2VyQ29ubmVjdGlvbjo6aW5zdGFsbFNlcnZpY2VXb3JrZXIpOgorICAgICAgICAq IFdlYlByb2Nlc3MvU3RvcmFnZS9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5oOgorICAg ICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3Bw OgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGll bnQuaDoKKwogMjAxOS0wOS0xNyAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29ueS5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBXaW5DYWlybyBidWlsZCBmaXggZm9sbG93aW5nIHIy NDk5ODUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKaW5kZXggZGIzZTJhZWYwZGY3NGI5YTg0 MWY3ZmZhNDFhYTJjOGZlMTE3MThjNy4uN2ZkOGQ2OWY0ODViYjlmNTU4OTYwNWFlYjdiNzY3YzA3 ZWMwNmMxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisy MDE5LTA5LTE4ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgRHJv cCBGcmFtZUxvYWRlckNsaWVudDo6c2Vzc2lvbklEKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMTkxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIERyb3AgRnJhbWVMb2FkZXJDbGllbnQ6OnNlc3Npb25J RCgpLiBUaGUgRnJhbWUgY2FuIGdldCB0aGUgc2Vzc2lvbklEIGZyb20gaXRzIHBhZ2UgKFdoaWNo IGlzCisgICAgICAgIHdoYXQgdGhlIEZyYW1lTG9hZGVyQ2xpZW50OjpzZXNzaW9uSUQoKSBlbmRl ZCB1cCBkb2luZykgYW5kIG90aGVyIGNhbGwgc2l0ZXMgYXQgV2ViS2l0MiBsYXllcgorICAgICAg ICBjYW4gZ2V0IHRoZSBzZXNzaW9uSUQgZnJvbSB0aGUgV2ViUHJvY2VzcyBzaW5nbGV0b24uCisK KyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oOgorICAgICAg ICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tOgorCiAyMDE5LTA5LTE3 ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgU3RvcCBjYWxsaW5n IFBhZ2U6OnNldFNlc3Npb25JRCgpIGZyb20gV2ViS2l0MgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1w dHlDbGllbnRzLmNwcAppbmRleCAyZjY2Mzg1ODc0MDA1OTcwNGE3ZmU0ZjI2MmY0NTkxNjM1ZDk4 ODYwLi40YWY5Nzg3YjExNmFlMGEwMDkyZDY3ZGVmOTM5YzRkZTIyZjg3Mjc5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmNwcApAQCAtNDY1LDExICs0NjUsNiBAQCB2b2lkIEVt cHR5Q2hyb21lQ2xpZW50OjpzaG93U2hhcmVTaGVldChTaGFyZURhdGFXaXRoUGFyc2VkVVJMJiwg Q29tcGxldGlvbkhhbmRsZQogewogfQogCi1QQUw6OlNlc3Npb25JRCBFbXB0eUZyYW1lTG9hZGVy Q2xpZW50OjpzZXNzaW9uSUQoKSBjb25zdAotewotICAgIHJldHVybiBQQUw6OlNlc3Npb25JRDo6 ZGVmYXVsdFNlc3Npb25JRCgpOwotfQotCiB2b2lkIEVtcHR5RnJhbWVMb2FkZXJDbGllbnQ6OmRp c3BhdGNoRGVjaWRlUG9saWN5Rm9yTmV3V2luZG93QWN0aW9uKGNvbnN0IE5hdmlnYXRpb25BY3Rp b24mLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBGb3JtU3RhdGUqLCBjb25zdCBTdHJpbmcmLCBQ b2xpY3lDaGVja0lkZW50aWZpZXIsIEZyYW1lUG9saWN5RnVuY3Rpb24mJikKIHsKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUZyYW1lTG9hZGVyQ2xpZW50LmggYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlGcmFtZUxvYWRlckNsaWVudC5oCmluZGV4IDViNDgx MmFhMWIxNTc2OGM5NzFlZDgwOTFhMTU1MWEyZmI4ZDc4NDUuLjJmNmQyMjUyZTFkMTg3MjAzZjk1 NDllNjVlMmU5OWNkYmZkNjA4MzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9F bXB0eUZyYW1lTG9hZGVyQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5 RnJhbWVMb2FkZXJDbGllbnQuaApAQCAtNDIsNyArNDIsNiBAQCBjbGFzcyBXRUJDT1JFX0VYUE9S VCBFbXB0eUZyYW1lTG9hZGVyQ2xpZW50IDogcHVibGljIEZyYW1lTG9hZGVyQ2xpZW50IHsKIAog ICAgIE9wdGlvbmFsPEZyYW1lSWRlbnRpZmllcj4gZnJhbWVJRCgpIGNvbnN0IG92ZXJyaWRlIHsg cmV0dXJuIFdURjo6bnVsbG9wdDsgfQogICAgIE9wdGlvbmFsPFBhZ2VJZGVudGlmaWVyPiBwYWdl SUQoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBXVEY6Om51bGxvcHQ7IH0KLSAgICBQQUw6OlNl c3Npb25JRCBzZXNzaW9uSUQoKSBjb25zdCBvdmVycmlkZTsKIAogICAgIGJvb2wgaGFzV2ViVmll dygpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIHRydWU7IH0gLy8gbWFpbmx5IGZvciBhc3NlcnRpb25z CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5o IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgKaW5kZXggZmU2Y2U0 YmU2YjUzNjBkNjYzZjI3MmNmOTY5YjQ3MDBmY2VjY2U5ZS4uN2Y2ODAxOWUwZDk2ZDg2YzZjYzI0 NzNlZDQzZTM3MmQ1NWY3YjM2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZGVyQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVy Q2xpZW50LmgKQEAgLTEzMCw3ICsxMzAsNiBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIE9wdGlv bmFsPFBhZ2VJZGVudGlmaWVyPiBwYWdlSUQoKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBPcHRp b25hbDxGcmFtZUlkZW50aWZpZXI+IGZyYW1lSUQoKSBjb25zdCA9IDA7Ci0gICAgdmlydHVhbCBQ QUw6OlNlc3Npb25JRCBzZXNzaW9uSUQoKSBjb25zdCA9IDA7CiAKICNpZiBQTEFURk9STShJT1Nf RkFNSUxZKQogICAgIC8vIFJldHVybnMgdHJ1ZSBpZiB0aGUgY2xpZW50IGZvcmNlZCB0aGUgbGF5 b3V0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAppbmRleCA0NDFhMDRhMjRhOWViMmU2OTRjMzA3YTllMzIx YTM0ZDFiN2Y1MjRkLi5lZmFhMzlkZTEwMDczMWI5NDk3NzVlYzkyODMzMjU2NDM3NGNkNWY2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0ZyYW1lLmNwcApAQCAtMTAxNSw3ICsxMDE1LDggQEAgdm9pZCBGcmFtZTo6c2Vs Zk9ubHlEZXJlZigpCiAKIFBBTDo6U2Vzc2lvbklEIEZyYW1lOjpzZXNzaW9uSUQoKSBjb25zdAog ewotICAgIHJldHVybiBtX2xvYWRlci0+Y2xpZW50KCkuc2Vzc2lvbklEKCk7CisgICAgYXV0byog cGFnZSA9IHRoaXMtPnBhZ2UoKTsKKyAgICByZXR1cm4gcGFnZSA/IHBhZ2UtPnNlc3Npb25JRCgp IDogUEFMOjpTZXNzaW9uSUQ6OmRlZmF1bHRTZXNzaW9uSUQoKTsKIH0KIAogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsv V2ViTG9hZGVyU3RyYXRlZ3kuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsv V2ViTG9hZGVyU3RyYXRlZ3kuY3BwCmluZGV4IDJjZjliNDJiODVkZmEyYzBjY2UyYzllNWFjODFl ZTBkZTc1YjgyYWIuLjMyMWMyNzM5MjQwOWQxNGIwMTlmZWQ2Y2FiZWY3YWMxMTMxZDBiZDAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0 ZWd5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJT dHJhdGVneS5jcHAKQEAgLTE2OCw3ICsxNjgsNyBAQCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5Ojpz Y2hlZHVsZUxvYWQoUmVzb3VyY2VMb2FkZXImIHJlc291cmNlTG9hZGVyLCBDYWNoZWRSZXNvdQog ICAgIHRyYWNraW5nUGFyYW1ldGVycy5wYWdlSUQgPSBmcmFtZUxvYWRlckNsaWVudC5wYWdlSUQo KS52YWx1ZU9yKFBhZ2VJZGVudGlmaWVyIHsgfSk7CiAgICAgdHJhY2tpbmdQYXJhbWV0ZXJzLmZy YW1lSUQgPSBmcmFtZUxvYWRlckNsaWVudC5mcmFtZUlEKCkudmFsdWVPcihGcmFtZUlkZW50aWZp ZXIgeyB9KTsKICAgICB0cmFja2luZ1BhcmFtZXRlcnMucmVzb3VyY2VJRCA9IGlkZW50aWZpZXI7 Ci0gICAgYXV0byBzZXNzaW9uSUQgPSBmcmFtZUxvYWRlckNsaWVudC5zZXNzaW9uSUQoKTsKKyAg ICBhdXRvIHNlc3Npb25JRCA9IFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnNlc3Npb25JRCgpOwog CiAjaWYgRU5BQkxFKFdFQl9BUkNISVZFKSB8fCBFTkFCTEUoTUhUTUwpCiAgICAgLy8gSWYgdGhl IERvY3VtZW50TG9hZGVyIHNjaGVkdWxlcyB0aGlzIGFzIGFuIGFyY2hpdmUgcmVzb3VyY2UgbG9h ZCwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9yYWdlL1dlYlNXQ29u dGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9y YWdlL1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcAppbmRleCBkM2U5NzJjMTVjYzA5 ZWY3MzkzOGVlZmUzMTQzMzdhMWYxYTc1YmRiLi41MDkwMDJiN2Y4MWUxMGMwYjM3MGZlZjgzYWJi YmI0OWM5MmY2MWUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvU3RvcmFn ZS9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwCkBAIC03 Miw5ICs3Miw4IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogc3RhdGljIGNvbnN0IFNlY29u ZHMgYXN5bmNXb3JrZXJUZXJtaW5hdGlvblRpbWVvdXQgeyAxMF9zIH07CiBzdGF0aWMgY29uc3Qg U2Vjb25kcyBzeW5jV29ya2VyVGVybWluYXRpb25UaW1lb3V0IHsgMTAwX21zIH07IC8vIE9ubHkg dXNlZCBieSBsYXlvdXQgdGVzdHMuCiAKLVNlcnZpY2VXb3JrZXJGcmFtZUxvYWRlckNsaWVudDo6 U2VydmljZVdvcmtlckZyYW1lTG9hZGVyQ2xpZW50KFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0 aW9uJiBjb25uZWN0aW9uLCBTZXNzaW9uSUQgc2Vzc2lvbklELCBXZWJQYWdlUHJveHlJZGVudGlm aWVyIHdlYlBhZ2VQcm94eUlELCBQYWdlSWRlbnRpZmllciBwYWdlSUQsIEZyYW1lSWRlbnRpZmll ciBmcmFtZUlELCBjb25zdCBTdHJpbmcmIHVzZXJBZ2VudCkKK1NlcnZpY2VXb3JrZXJGcmFtZUxv YWRlckNsaWVudDo6U2VydmljZVdvcmtlckZyYW1lTG9hZGVyQ2xpZW50KFdlYlNXQ29udGV4dE1h bmFnZXJDb25uZWN0aW9uJiBjb25uZWN0aW9uLCBXZWJQYWdlUHJveHlJZGVudGlmaWVyIHdlYlBh Z2VQcm94eUlELCBQYWdlSWRlbnRpZmllciBwYWdlSUQsIEZyYW1lSWRlbnRpZmllciBmcmFtZUlE LCBjb25zdCBTdHJpbmcmIHVzZXJBZ2VudCkKICAgICA6IG1fY29ubmVjdGlvbihjb25uZWN0aW9u KQotICAgICwgbV9zZXNzaW9uSUQoc2Vzc2lvbklEKQogICAgICwgbV93ZWJQYWdlUHJveHlJRCh3 ZWJQYWdlUHJveHlJRCkKICAgICAsIG1fcGFnZUlEKHBhZ2VJRCkKICAgICAsIG1fZnJhbWVJRChm cmFtZUlEKQpAQCAtMTM5LDcgKzEzOCw3IEBAIHZvaWQgV2ViU1dDb250ZXh0TWFuYWdlckNvbm5l Y3Rpb246Omluc3RhbGxTZXJ2aWNlV29ya2VyKGNvbnN0IFNlcnZpY2VXb3JrZXJDb250CiAgICAg Ly8gRklYTUU6IFRoaXMgbWV0aG9kIHNob3VsZCBiZSBtb3ZlZCBkaXJlY3RseSB0byBXZWJDb3Jl OjpTV0NvbnRleHRNYW5hZ2VyOjpDb25uZWN0aW9uCiAgICAgLy8gSWYgaXQgd2VyZW4ndCBmb3Ig U2VydmljZVdvcmtlckZyYW1lTG9hZGVyQ2xpZW50J3MgZGVwZW5kZW5jZSBvbiBXZWJEb2N1bWVu dExvYWRlciwgdGhpcyBjb3VsZCBhbHJlYWR5IGhhcHBlbi4KICAgICAvLyBGSVhNRTogV2VpcmQg dG8gcGFzcyBtX3ByZXZpb3VzU2VydmljZVdvcmtlcklEIGFzIGEgRnJhbWVJZGVudGlmaWVyLgot ICAgIGF1dG8gZnJhbWVMb2FkZXJDbGllbnQgPSBtYWtlVW5pcXVlPFNlcnZpY2VXb3JrZXJGcmFt ZUxvYWRlckNsaWVudD4oKnRoaXMsIHNlc3Npb25JRCwgbV93ZWJQYWdlUHJveHlJRCwgbV9wYWdl SUQsIGZyYW1lSWRlbnRpZmllckZyb21JRCgrK21fcHJldmlvdXNTZXJ2aWNlV29ya2VySUQpLCBl ZmZlY3RpdmVVc2VyQWdlbnQpOworICAgIGF1dG8gZnJhbWVMb2FkZXJDbGllbnQgPSBtYWtlVW5p cXVlPFNlcnZpY2VXb3JrZXJGcmFtZUxvYWRlckNsaWVudD4oKnRoaXMsIG1fd2ViUGFnZVByb3h5 SUQsIG1fcGFnZUlELCBmcmFtZUlkZW50aWZpZXJGcm9tSUQoKyttX3ByZXZpb3VzU2VydmljZVdv cmtlcklEKSwgZWZmZWN0aXZlVXNlckFnZW50KTsKICAgICBwYWdlQ29uZmlndXJhdGlvbi5sb2Fk ZXJDbGllbnRGb3JNYWluRnJhbWUgPSBmcmFtZUxvYWRlckNsaWVudC5nZXQoKTsKICAgICBtX2xv YWRlcnMuYWRkKFdURk1vdmUoZnJhbWVMb2FkZXJDbGllbnQpKTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rp b24uaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9yYWdlL1dlYlNXQ29udGV4dE1hbmFn ZXJDb25uZWN0aW9uLmgKaW5kZXggN2FiOGVlMmQwMGQzMzdlYTk3ZjMxNGUwMTYwYTU3NGFmMmQy ODA4OC4uNzc1MDRkMWE5YjdiMjY4N2Q4NjQyNWQyZmQ1MTQ0ZWMyNDM3NmVmNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dDb250ZXh0TWFuYWdlckNv bm5lY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvU3RvcmFnZS9XZWJTV0Nv bnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5oCkBAIC0xMTksNyArMTE5LDcgQEAgcHJpdmF0ZToKIAog Y2xhc3MgU2VydmljZVdvcmtlckZyYW1lTG9hZGVyQ2xpZW50IGZpbmFsIDogcHVibGljIFdlYkNv cmU6OkVtcHR5RnJhbWVMb2FkZXJDbGllbnQgewogcHVibGljOgotICAgIFNlcnZpY2VXb3JrZXJG cmFtZUxvYWRlckNsaWVudChXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbiYsIFBBTDo6U2Vz c2lvbklELCBXZWJQYWdlUHJveHlJZGVudGlmaWVyLCBXZWJDb3JlOjpQYWdlSWRlbnRpZmllciwg V2ViQ29yZTo6RnJhbWVJZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIHVzZXJBZ2VudCk7CisgICAg U2VydmljZVdvcmtlckZyYW1lTG9hZGVyQ2xpZW50KFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0 aW9uJiwgV2ViUGFnZVByb3h5SWRlbnRpZmllciwgV2ViQ29yZTo6UGFnZUlkZW50aWZpZXIsIFdl YkNvcmU6OkZyYW1lSWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiB1c2VyQWdlbnQpOwogCiAgICAg dm9pZCBzZXRVc2VyQWdlbnQoU3RyaW5nJiYgdXNlckFnZW50KSB7IG1fdXNlckFnZW50ID0gV1RG TW92ZSh1c2VyQWdlbnQpOyB9CiAgICAgCkBAIC0xMzUsMTEgKzEzNSw5IEBAIHByaXZhdGU6CiAg ICAgYm9vbCBzaG91bGRVc2VDcmVkZW50aWFsU3RvcmFnZShXZWJDb3JlOjpEb2N1bWVudExvYWRl ciosIHVuc2lnbmVkIGxvbmcpIGZpbmFsIHsgcmV0dXJuIHRydWU7IH0KICAgICBib29sIGlzU2Vy dmljZVdvcmtlckZyYW1lTG9hZGVyQ2xpZW50KCkgY29uc3QgZmluYWwgeyByZXR1cm4gdHJ1ZTsg fQogCi0gICAgUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklEKCkgY29uc3QgZmluYWwgeyByZXR1cm4g bV9zZXNzaW9uSUQ7IH0KICAgICBTdHJpbmcgdXNlckFnZW50KGNvbnN0IFVSTCYpIGZpbmFsIHsg cmV0dXJuIG1fdXNlckFnZW50OyB9CiAKICAgICBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlv biYgbV9jb25uZWN0aW9uOwotICAgIFBBTDo6U2Vzc2lvbklEIG1fc2Vzc2lvbklEOwogICAgIFdl YlBhZ2VQcm94eUlkZW50aWZpZXIgbV93ZWJQYWdlUHJveHlJRDsKICAgICBXZWJDb3JlOjpQYWdl SWRlbnRpZmllciBtX3BhZ2VJRDsKICAgICBXZWJDb3JlOjpGcmFtZUlkZW50aWZpZXIgbV9mcmFt ZUlEOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJD b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKaW5kZXggYzU0ZjdkZjkxZjJkNWY0 NWUwZTA3ZjA5MWVjMWIwOWE1YzU5MWU0Ny4uODk0NzE5OGU3Mjk4OGViNWE0MjkyMjNhNTM3ZWY2 Njg0YjI5OGU1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVT dXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCkBAIC0xMzYsMTYg KzEzNiw2IEBAIE9wdGlvbmFsPEZyYW1lSWRlbnRpZmllcj4gV2ViRnJhbWVMb2FkZXJDbGllbnQ6 OmZyYW1lSUQoKSBjb25zdAogICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiB9CiAKLVBBTDo6U2Vz c2lvbklEIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpzZXNzaW9uSUQoKSBjb25zdAotewotICAgIFdl YlBhZ2UqIHBhZ2UgPSBtX2ZyYW1lID8gbV9mcmFtZS0+cGFnZSgpIDogbnVsbHB0cjsKLSAgICBp ZiAoIXBhZ2UgfHwgIXBhZ2UtPmNvcmVQYWdlKCkpIHsKLSAgICAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7Ci0gICAgICAgIHJldHVybiBQQUw6OlNlc3Npb25JRDo6ZGVmYXVsdFNlc3Npb25JRCgp OwotICAgIH0KLSAgICByZXR1cm4gcGFnZS0+c2Vzc2lvbklEKCk7Ci19Ci0KICNpZiBFTkFCTEUo UkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNTKQogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6c2V0 SGFzRnJhbWVTcGVjaWZpY1N0b3JhZ2VBY2Nlc3MoRnJhbWVTcGVjaWZpY1N0b3JhZ2VBY2Nlc3NJ ZGVudGlmaWVyJiYgZnJhbWVTcGVjaWZpY1N0b3JhZ2VBY2Nlc3NJZGVudGlmaWVyICkKIHsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFt ZUxvYWRlckNsaWVudC5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKaW5kZXggNWFiMzFlNTEyOTllMzliZjI4MWJhZmU1YWFl M2NmY2NmODEzNWVhZS4uMDQ2OGI2YmEwZGZkZTgyMzQ2ZjFlMDI1ZWQzNjliYjU2MjA4ZDQyMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZy YW1lTG9hZGVyQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVT dXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKQEAgLTU2LDcgKzU2LDYgQEAgcHVibGljOgog ICAgIE9wdGlvbmFsPFdlYlBhZ2VQcm94eUlkZW50aWZpZXI+IHdlYlBhZ2VQcm94eUlEKCkgY29u c3Q7CiAgICAgT3B0aW9uYWw8V2ViQ29yZTo6UGFnZUlkZW50aWZpZXI+IHBhZ2VJRCgpIGNvbnN0 IGZpbmFsOwogICAgIE9wdGlvbmFsPFdlYkNvcmU6OkZyYW1lSWRlbnRpZmllcj4gZnJhbWVJRCgp IGNvbnN0IGZpbmFsOwotICAgIFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCgpIGNvbnN0IGZpbmFs OwogCiAjaWYgRU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykKICAgICBib29sIGhhc0Zy YW1lU3BlY2lmaWNTdG9yYWdlQWNjZXNzKCkgZmluYWwgeyByZXR1cm4gISFtX2ZyYW1lU3BlY2lm aWNTdG9yYWdlQWNjZXNzSWRlbnRpZmllcjsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExl Z2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaCBiL1NvdXJjZS9X ZWJLaXRMZWdhY3kvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKaW5k ZXggZDYwNjMwZmUwY2FhZGY0M2E4Yjc0NDlkMmQ1NDkwZWRiMDhlNmFjNy4uNTM0YmJiODk4YmIz OTBhYjQ1YzUzNDdjYTEzZThkOGQxMTAzMWNmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExl Z2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5o CkBAIC02NSw3ICs2NSw2IEBAIHByaXZhdGU6CiAKICAgICBPcHRpb25hbDxXZWJDb3JlOjpQYWdl SWRlbnRpZmllcj4gcGFnZUlEKCkgY29uc3QgZmluYWw7CiAgICAgT3B0aW9uYWw8V2ViQ29yZTo6 RnJhbWVJZGVudGlmaWVyPiBmcmFtZUlEKCkgY29uc3QgZmluYWw7Ci0gICAgUEFMOjpTZXNzaW9u SUQgc2Vzc2lvbklEKCkgY29uc3QgZmluYWw7CiAKICAgICB2b2lkIG1ha2VSZXByZXNlbnRhdGlv bihXZWJDb3JlOjpEb2N1bWVudExvYWRlciopIGZpbmFsOwogICAgIGJvb2wgaGFzSFRNTFZpZXco KSBjb25zdCBmaW5hbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYkNv cmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tIGIvU291cmNlL1dlYktpdExlZ2FjeS9t YWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KaW5kZXggMjQxNDBjZGUz ZWM5M2IyMDc1OWZkNjMwMmQxYTMwOTUyZTE5MmIyNy4uMTM3NjYxMjZlYWRhYjFmMjZkMDNjMGEw ODIxYmY2YWIwMGEyYTA3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2Vi Q29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KKysrIGIvU291cmNlL1dlYktpdExl Z2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KQEAgLTIxOSwx MiArMjE5LDYgQEAgT3B0aW9uYWw8RnJhbWVJZGVudGlmaWVyPiBXZWJGcmFtZUxvYWRlckNsaWVu dDo6ZnJhbWVJRCgpIGNvbnN0CiAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIH0KIAotUEFMOjpT ZXNzaW9uSUQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnNlc3Npb25JRCgpIGNvbnN0Ci17Ci0gICAg YXV0byogY29yZUZyYW1lID0gY29yZShtX3dlYkZyYW1lLmdldCgpKTsKLSAgICByZXR1cm4gY29y ZUZyYW1lICYmIGNvcmVGcmFtZS0+cGFnZSgpID8gY29yZUZyYW1lLT5wYWdlKCktPnNlc3Npb25J RCgpIDogUEFMOjpTZXNzaW9uSUQ6OmRlZmF1bHRTZXNzaW9uSUQoKTsKLX0KLQogdm9pZCBXZWJG cmFtZUxvYWRlckNsaWVudDo6ZnJhbWVMb2FkZXJEZXN0cm95ZWQoKQogewogICAgIFttX3dlYkZy YW1lLmdldCgpIF9jbGVhckNvcmVGcmFtZV07Cg== 379041 2019-09-18 09:14:14 -0700 2019-09-18 10:14:20 -0700 Patch bug-201916-20190918091413.patch text/plain 14979 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMDM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjI0Y2MyYTMxMTYzZTMy Njc1MmM5OTNkNzdiOTY5YzBiYjYyZGM0MC4uOGNhODQ5MzdlZTU5ZWFkZmM0MGExMDhhMDAxNGUy OTk3NmUyY2EzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE5LTA5LTE4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgRHJvcCBGcmFtZUxvYWRlckNs aWVudDo6c2Vzc2lvbklEKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwMTkxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIERyb3AgRnJhbWVMb2FkZXJDbGllbnQ6OnNlc3Npb25JRCgpLiBUaGUgRnJhbWUg Y2FuIGdldCB0aGUgc2Vzc2lvbklEIGZyb20gaXRzIHBhZ2UgKFdoaWNoIGlzCisgICAgICAgIHdo YXQgdGhlIEZyYW1lTG9hZGVyQ2xpZW50OjpzZXNzaW9uSUQoKSBlbmRlZCB1cCBkb2luZykgYW5k IG90aGVyIGNhbGwgc2l0ZXMgYXQgV2ViS2l0MiBsYXllcgorICAgICAgICBjYW4gZ2V0IHRoZSBz ZXNzaW9uSUQgZnJvbSB0aGUgV2ViUHJvY2VzcyBzaW5nbGV0b24uCisKKyAgICAgICAgKiBsb2Fk ZXIvRW1wdHlDbGllbnRzLmNwcDoKKyAgICAgICAgKiBsb2FkZXIvRW1wdHlGcmFtZUxvYWRlckNs aWVudC5oOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oOgorICAgICAgICAq IHBhZ2UvRnJhbWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWU6OnNlc3Npb25JRCBjb25z dCk6CisKIDIwMTktMDktMTggIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTEZDXSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVkSGVpZ2h0KiBm dW5jdGlvbnMgbmVlZCBjb250YWluaW5nQmxvY2tIZWlnaHQgb25seS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggOWM2 ZWU3ZWEyYTQxOWYwMmRiOWMwNDE3MDRlNDg2YjU2OWRiOTljZS4uMzM2MDNlOTNkZmRhOTYzZDgy ZDg0MjRmNzg2YTA1YzYwMTIxNmM1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxOS0w OS0xOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIERyb3AgRnJh bWVMb2FkZXJDbGllbnQ6OnNlc3Npb25JRCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDE5MTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBEcm9wIEZyYW1lTG9hZGVyQ2xpZW50OjpzZXNzaW9uSUQoKS4g VGhlIEZyYW1lIGNhbiBnZXQgdGhlIHNlc3Npb25JRCBmcm9tIGl0cyBwYWdlIChXaGljaCBpcwor ICAgICAgICB3aGF0IHRoZSBGcmFtZUxvYWRlckNsaWVudDo6c2Vzc2lvbklEKCkgZW5kZWQgdXAg ZG9pbmcpIGFuZCBvdGhlciBjYWxsIHNpdGVzIGF0IFdlYktpdDIgbGF5ZXIKKyAgICAgICAgY2Fu IGdldCB0aGUgc2Vzc2lvbklEIGZyb20gdGhlIFdlYlByb2Nlc3Mgc2luZ2xldG9uLgorCisgICAg ICAgICogV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViTG9hZGVyU3RyYXRlZ3k6OnNjaGVkdWxlTG9hZCk6CisgICAgICAgICogV2Vi UHJvY2Vzcy9TdG9yYWdlL1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6U2VydmljZVdvcmtlckZyYW1lTG9hZGVyQ2xpZW50OjpTZXJ2aWNlV29ya2Vy RnJhbWVMb2FkZXJDbGllbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJTV0NvbnRleHRNYW5hZ2Vy Q29ubmVjdGlvbjo6aW5zdGFsbFNlcnZpY2VXb3JrZXIpOgorICAgICAgICAqIFdlYlByb2Nlc3Mv U3RvcmFnZS9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5oOgorICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaDoKKwogMjAx OS0wOS0xOCAgQ2FybG9zIEFsYmVydG8gTG9wZXogUGVyZXogIDxjbG9wZXpAaWdhbGlhLmNvbT4K IAogICAgICAgICBbR1RLXVtXUEVdIGJ1YmJsZXdyYXAgc2FuZGJveCBzaG91bGQgYmUgZGlzYWJs ZWQgd2hlbiBydW5uaW5nIGluc2lkZSBkb2NrZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRM ZWdhY3kvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwpp bmRleCBkYjNlMmFlZjBkZjc0YjlhODQxZjdmZmE0MWFhMmM4ZmUxMTcxOGM3Li43ZmQ4ZDY5ZjQ4 NWJiOWY1NTg5NjA1YWViN2I3NjdjMDdlYzA2YzEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 TGVnYWN5L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTktMDktMTggIENocmlzIER1bWV6ICA8Y2R1bWV6QGFw cGxlLmNvbT4KKworICAgICAgICBEcm9wIEZyYW1lTG9hZGVyQ2xpZW50OjpzZXNzaW9uSUQoKQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxOTE2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRHJvcCBGcmFt ZUxvYWRlckNsaWVudDo6c2Vzc2lvbklEKCkuIFRoZSBGcmFtZSBjYW4gZ2V0IHRoZSBzZXNzaW9u SUQgZnJvbSBpdHMgcGFnZSAoV2hpY2ggaXMKKyAgICAgICAgd2hhdCB0aGUgRnJhbWVMb2FkZXJD bGllbnQ6OnNlc3Npb25JRCgpIGVuZGVkIHVwIGRvaW5nKSBhbmQgb3RoZXIgY2FsbCBzaXRlcyBh dCBXZWJLaXQyIGxheWVyCisgICAgICAgIGNhbiBnZXQgdGhlIHNlc3Npb25JRCBmcm9tIHRoZSBX ZWJQcm9jZXNzIHNpbmdsZXRvbi4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1l TG9hZGVyQ2xpZW50Lmg6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJD bGllbnQubW06CisKIDIwMTktMDktMTcgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4K IAogICAgICAgICBTdG9wIGNhbGxpbmcgUGFnZTo6c2V0U2Vzc2lvbklEKCkgZnJvbSBXZWJLaXQy CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuY3BwCmluZGV4IDJmNjYzODU4NzQwMDU5 NzA0YTdmZTRmMjYyZjQ1OTE2MzVkOTg4NjAuLjRhZjk3ODdiMTE2YWUwYTAwOTJkNjdkZWY5Mzlj NGRlMjJmODcyNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVu dHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuY3BwCkBAIC00 NjUsMTEgKzQ2NSw2IEBAIHZvaWQgRW1wdHlDaHJvbWVDbGllbnQ6OnNob3dTaGFyZVNoZWV0KFNo YXJlRGF0YVdpdGhQYXJzZWRVUkwmLCBDb21wbGV0aW9uSGFuZGxlCiB7CiB9CiAKLVBBTDo6U2Vz c2lvbklEIEVtcHR5RnJhbWVMb2FkZXJDbGllbnQ6OnNlc3Npb25JRCgpIGNvbnN0Ci17Ci0gICAg cmV0dXJuIFBBTDo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCk7Ci19Ci0KIHZvaWQgRW1w dHlGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rp b24oY29uc3QgTmF2aWdhdGlvbkFjdGlvbiYsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIEZvcm1T dGF0ZSosIGNvbnN0IFN0cmluZyYsIFBvbGljeUNoZWNrSWRlbnRpZmllciwgRnJhbWVQb2xpY3lG dW5jdGlvbiYmKQogewogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5 RnJhbWVMb2FkZXJDbGllbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUZyYW1lTG9h ZGVyQ2xpZW50LmgKaW5kZXggNWI0ODEyYWExYjE1NzY4Yzk3MWVkODA5MWExNTUxYTJmYjhkNzg0 NS4uMmY2ZDIyNTJlMWQxODcyMDNmOTU0OWU2NWUyZTk5Y2RiZmQ2MDgzMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5RnJhbWVMb2FkZXJDbGllbnQuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlGcmFtZUxvYWRlckNsaWVudC5oCkBAIC00Miw3ICs0Miw2 IEBAIGNsYXNzIFdFQkNPUkVfRVhQT1JUIEVtcHR5RnJhbWVMb2FkZXJDbGllbnQgOiBwdWJsaWMg RnJhbWVMb2FkZXJDbGllbnQgewogCiAgICAgT3B0aW9uYWw8RnJhbWVJZGVudGlmaWVyPiBmcmFt ZUlEKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gV1RGOjpudWxsb3B0OyB9CiAgICAgT3B0aW9u YWw8UGFnZUlkZW50aWZpZXI+IHBhZ2VJRCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIFdURjo6 bnVsbG9wdDsgfQotICAgIFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCgpIGNvbnN0IG92ZXJyaWRl OwogCiAgICAgYm9vbCBoYXNXZWJWaWV3KCkgY29uc3QgZmluYWwgeyByZXR1cm4gdHJ1ZTsgfSAv LyBtYWlubHkgZm9yIGFzc2VydGlvbnMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2Fk ZXJDbGllbnQuaAppbmRleCBmZTZjZTRiZTZiNTM2MGQ2NjNmMjcyY2Y5NjliNDcwMGZjZWNjZTll Li43ZjY4MDE5ZTBkOTZkODZjNmNjMjQ3M2VkNDNlMzcyZDU1ZjdiMzY3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaApAQCAtMTMwLDcgKzEzMCw2IEBAIHB1Ymxp YzoKIAogICAgIHZpcnR1YWwgT3B0aW9uYWw8UGFnZUlkZW50aWZpZXI+IHBhZ2VJRCgpIGNvbnN0 ID0gMDsKICAgICB2aXJ0dWFsIE9wdGlvbmFsPEZyYW1lSWRlbnRpZmllcj4gZnJhbWVJRCgpIGNv bnN0ID0gMDsKLSAgICB2aXJ0dWFsIFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCgpIGNvbnN0ID0g MDsKIAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgLy8gUmV0dXJucyB0cnVlIGlmIHRo ZSBjbGllbnQgZm9yY2VkIHRoZSBsYXlvdXQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL0ZyYW1lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCmluZGV4IDQ0MWEw NGEyNGE5ZWIyZTY5NGMzMDdhOWUzMjFhMzRkMWI3ZjUyNGQuLmVmYWEzOWRlMTAwNzMxYjk0OTc3 NWVjOTI4MzMyNTY0Mzc0Y2Q1ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCkBAIC0xMDE1LDcgKzEw MTUsOCBAQCB2b2lkIEZyYW1lOjpzZWxmT25seURlcmVmKCkKIAogUEFMOjpTZXNzaW9uSUQgRnJh bWU6OnNlc3Npb25JRCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fbG9hZGVyLT5jbGllbnQoKS5z ZXNzaW9uSUQoKTsKKyAgICBhdXRvKiBwYWdlID0gdGhpcy0+cGFnZSgpOworICAgIHJldHVybiBw YWdlID8gcGFnZS0+c2Vzc2lvbklEKCkgOiBQQUw6OlNlc3Npb25JRDo6ZGVmYXVsdFNlc3Npb25J RCgpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAKaW5kZXggMmNmOWI0 MmI4NWRmYTJjMGNjZTJjOWU1YWM4MWVlMGRlNzViODJhYi4uMzIxYzI3MzkyNDA5ZDE0YjAxOWZl ZDZjYWJlZjdhYzExMzFkMGJkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcApAQCAtMTY4LDcgKzE2OCw3IEBAIHZv aWQgV2ViTG9hZGVyU3RyYXRlZ3k6OnNjaGVkdWxlTG9hZChSZXNvdXJjZUxvYWRlciYgcmVzb3Vy Y2VMb2FkZXIsIENhY2hlZFJlc291CiAgICAgdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRCA9IGZy YW1lTG9hZGVyQ2xpZW50LnBhZ2VJRCgpLnZhbHVlT3IoUGFnZUlkZW50aWZpZXIgeyB9KTsKICAg ICB0cmFja2luZ1BhcmFtZXRlcnMuZnJhbWVJRCA9IGZyYW1lTG9hZGVyQ2xpZW50LmZyYW1lSUQo KS52YWx1ZU9yKEZyYW1lSWRlbnRpZmllciB7IH0pOwogICAgIHRyYWNraW5nUGFyYW1ldGVycy5y ZXNvdXJjZUlEID0gaWRlbnRpZmllcjsKLSAgICBhdXRvIHNlc3Npb25JRCA9IGZyYW1lTG9hZGVy Q2xpZW50LnNlc3Npb25JRCgpOworICAgIGF1dG8gc2Vzc2lvbklEID0gV2ViUHJvY2Vzczo6c2lu Z2xldG9uKCkuc2Vzc2lvbklEKCk7CiAKICNpZiBFTkFCTEUoV0VCX0FSQ0hJVkUpIHx8IEVOQUJM RShNSFRNTCkKICAgICAvLyBJZiB0aGUgRG9jdW1lbnRMb2FkZXIgc2NoZWR1bGVzIHRoaXMgYXMg YW4gYXJjaGl2ZSByZXNvdXJjZSBsb2FkLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1N0b3JhZ2UvV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwIGIvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24u Y3BwCmluZGV4IGQzZTk3MmMxNWNjMDllZjczOTM4ZWVmZTMxNDMzN2ExZjFhNzViZGIuLjUwOTAw MmI3ZjgxZTEwYzBiMzcwZmVmODNhYmJiYjQ5YzkyZjYxZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9TdG9yYWdlL1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvU3RvcmFnZS9XZWJTV0NvbnRleHRNYW5h Z2VyQ29ubmVjdGlvbi5jcHAKQEAgLTcyLDkgKzcyLDggQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNv cmU7CiBzdGF0aWMgY29uc3QgU2Vjb25kcyBhc3luY1dvcmtlclRlcm1pbmF0aW9uVGltZW91dCB7 IDEwX3MgfTsKIHN0YXRpYyBjb25zdCBTZWNvbmRzIHN5bmNXb3JrZXJUZXJtaW5hdGlvblRpbWVv dXQgeyAxMDBfbXMgfTsgLy8gT25seSB1c2VkIGJ5IGxheW91dCB0ZXN0cy4KIAotU2VydmljZVdv cmtlckZyYW1lTG9hZGVyQ2xpZW50OjpTZXJ2aWNlV29ya2VyRnJhbWVMb2FkZXJDbGllbnQoV2Vi U1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIFNlc3Npb25JRCBzZXNzaW9u SUQsIFdlYlBhZ2VQcm94eUlkZW50aWZpZXIgd2ViUGFnZVByb3h5SUQsIFBhZ2VJZGVudGlmaWVy IHBhZ2VJRCwgRnJhbWVJZGVudGlmaWVyIGZyYW1lSUQsIGNvbnN0IFN0cmluZyYgdXNlckFnZW50 KQorU2VydmljZVdvcmtlckZyYW1lTG9hZGVyQ2xpZW50OjpTZXJ2aWNlV29ya2VyRnJhbWVMb2Fk ZXJDbGllbnQoV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIFdlYlBh Z2VQcm94eUlkZW50aWZpZXIgd2ViUGFnZVByb3h5SUQsIFBhZ2VJZGVudGlmaWVyIHBhZ2VJRCwg RnJhbWVJZGVudGlmaWVyIGZyYW1lSUQsIGNvbnN0IFN0cmluZyYgdXNlckFnZW50KQogICAgIDog bV9jb25uZWN0aW9uKGNvbm5lY3Rpb24pCi0gICAgLCBtX3Nlc3Npb25JRChzZXNzaW9uSUQpCiAg ICAgLCBtX3dlYlBhZ2VQcm94eUlEKHdlYlBhZ2VQcm94eUlEKQogICAgICwgbV9wYWdlSUQocGFn ZUlEKQogICAgICwgbV9mcmFtZUlEKGZyYW1lSUQpCkBAIC0xMzksNyArMTM4LDcgQEAgdm9pZCBX ZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbjo6aW5zdGFsbFNlcnZpY2VXb3JrZXIoY29uc3Qg U2VydmljZVdvcmtlckNvbnQKICAgICAvLyBGSVhNRTogVGhpcyBtZXRob2Qgc2hvdWxkIGJlIG1v dmVkIGRpcmVjdGx5IHRvIFdlYkNvcmU6OlNXQ29udGV4dE1hbmFnZXI6OkNvbm5lY3Rpb24KICAg ICAvLyBJZiBpdCB3ZXJlbid0IGZvciBTZXJ2aWNlV29ya2VyRnJhbWVMb2FkZXJDbGllbnQncyBk ZXBlbmRlbmNlIG9uIFdlYkRvY3VtZW50TG9hZGVyLCB0aGlzIGNvdWxkIGFscmVhZHkgaGFwcGVu LgogICAgIC8vIEZJWE1FOiBXZWlyZCB0byBwYXNzIG1fcHJldmlvdXNTZXJ2aWNlV29ya2VySUQg YXMgYSBGcmFtZUlkZW50aWZpZXIuCi0gICAgYXV0byBmcmFtZUxvYWRlckNsaWVudCA9IG1ha2VV bmlxdWU8U2VydmljZVdvcmtlckZyYW1lTG9hZGVyQ2xpZW50PigqdGhpcywgc2Vzc2lvbklELCBt X3dlYlBhZ2VQcm94eUlELCBtX3BhZ2VJRCwgZnJhbWVJZGVudGlmaWVyRnJvbUlEKCsrbV9wcmV2 aW91c1NlcnZpY2VXb3JrZXJJRCksIGVmZmVjdGl2ZVVzZXJBZ2VudCk7CisgICAgYXV0byBmcmFt ZUxvYWRlckNsaWVudCA9IG1ha2VVbmlxdWU8U2VydmljZVdvcmtlckZyYW1lTG9hZGVyQ2xpZW50 PigqdGhpcywgbV93ZWJQYWdlUHJveHlJRCwgbV9wYWdlSUQsIGZyYW1lSWRlbnRpZmllckZyb21J RCgrK21fcHJldmlvdXNTZXJ2aWNlV29ya2VySUQpLCBlZmZlY3RpdmVVc2VyQWdlbnQpOwogICAg IHBhZ2VDb25maWd1cmF0aW9uLmxvYWRlckNsaWVudEZvck1haW5GcmFtZSA9IGZyYW1lTG9hZGVy Q2xpZW50LmdldCgpOwogICAgIG1fbG9hZGVycy5hZGQoV1RGTW92ZShmcmFtZUxvYWRlckNsaWVu dCkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvU3RvcmFnZS9XZWJT V0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0 b3JhZ2UvV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uaAppbmRleCA3YWI4ZWUyZDAwZDMz N2VhOTdmMzE0ZTAxNjBhNTc0YWYyZDI4MDg4Li43NzUwNGQxYTliN2IyNjg3ZDg2NDI1ZDJmZDUx NDRlYzI0Mzc2ZWY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvU3RvcmFn ZS9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9TdG9yYWdlL1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmgKQEAgLTExOSw3 ICsxMTksNyBAQCBwcml2YXRlOgogCiBjbGFzcyBTZXJ2aWNlV29ya2VyRnJhbWVMb2FkZXJDbGll bnQgZmluYWwgOiBwdWJsaWMgV2ViQ29yZTo6RW1wdHlGcmFtZUxvYWRlckNsaWVudCB7CiBwdWJs aWM6Ci0gICAgU2VydmljZVdvcmtlckZyYW1lTG9hZGVyQ2xpZW50KFdlYlNXQ29udGV4dE1hbmFn ZXJDb25uZWN0aW9uJiwgUEFMOjpTZXNzaW9uSUQsIFdlYlBhZ2VQcm94eUlkZW50aWZpZXIsIFdl YkNvcmU6OlBhZ2VJZGVudGlmaWVyLCBXZWJDb3JlOjpGcmFtZUlkZW50aWZpZXIsIGNvbnN0IFN0 cmluZyYgdXNlckFnZW50KTsKKyAgICBTZXJ2aWNlV29ya2VyRnJhbWVMb2FkZXJDbGllbnQoV2Vi U1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24mLCBXZWJQYWdlUHJveHlJZGVudGlmaWVyLCBXZWJD b3JlOjpQYWdlSWRlbnRpZmllciwgV2ViQ29yZTo6RnJhbWVJZGVudGlmaWVyLCBjb25zdCBTdHJp bmcmIHVzZXJBZ2VudCk7CiAKICAgICB2b2lkIHNldFVzZXJBZ2VudChTdHJpbmcmJiB1c2VyQWdl bnQpIHsgbV91c2VyQWdlbnQgPSBXVEZNb3ZlKHVzZXJBZ2VudCk7IH0KICAgICAKQEAgLTEzNSwx MSArMTM1LDkgQEAgcHJpdmF0ZToKICAgICBib29sIHNob3VsZFVzZUNyZWRlbnRpYWxTdG9yYWdl KFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyKiwgdW5zaWduZWQgbG9uZykgZmluYWwgeyByZXR1cm4g dHJ1ZTsgfQogICAgIGJvb2wgaXNTZXJ2aWNlV29ya2VyRnJhbWVMb2FkZXJDbGllbnQoKSBjb25z dCBmaW5hbCB7IHJldHVybiB0cnVlOyB9CiAKLSAgICBQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQo KSBjb25zdCBmaW5hbCB7IHJldHVybiBtX3Nlc3Npb25JRDsgfQogICAgIFN0cmluZyB1c2VyQWdl bnQoY29uc3QgVVJMJikgZmluYWwgeyByZXR1cm4gbV91c2VyQWdlbnQ7IH0KIAogICAgIFdlYlNX Q29udGV4dE1hbmFnZXJDb25uZWN0aW9uJiBtX2Nvbm5lY3Rpb247Ci0gICAgUEFMOjpTZXNzaW9u SUQgbV9zZXNzaW9uSUQ7CiAgICAgV2ViUGFnZVByb3h5SWRlbnRpZmllciBtX3dlYlBhZ2VQcm94 eUlEOwogICAgIFdlYkNvcmU6OlBhZ2VJZGVudGlmaWVyIG1fcGFnZUlEOwogICAgIFdlYkNvcmU6 OkZyYW1lSWRlbnRpZmllciBtX2ZyYW1lSUQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwIGIvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNw cAppbmRleCBjNTRmN2RmOTFmMmQ1ZjQ1ZTBlMDdmMDkxZWMxYjA5YTVjNTkxZTQ3Li44OTQ3MTk4 ZTcyOTg4ZWI1YTQyOTIyM2E1MzdlZjY2ODRiMjk4ZTU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRl ckNsaWVudC5jcHAKQEAgLTEzNiwxNiArMTM2LDYgQEAgT3B0aW9uYWw8RnJhbWVJZGVudGlmaWVy PiBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZnJhbWVJRCgpIGNvbnN0CiAgICAgcmV0dXJuIFdURjo6 bnVsbG9wdDsKIH0KIAotUEFMOjpTZXNzaW9uSUQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnNlc3Np b25JRCgpIGNvbnN0Ci17Ci0gICAgV2ViUGFnZSogcGFnZSA9IG1fZnJhbWUgPyBtX2ZyYW1lLT5w YWdlKCkgOiBudWxscHRyOwotICAgIGlmICghcGFnZSB8fCAhcGFnZS0+Y29yZVBhZ2UoKSkgewot ICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgcmV0dXJuIFBBTDo6U2Vzc2lv bklEOjpkZWZhdWx0U2Vzc2lvbklEKCk7Ci0gICAgfQotICAgIHJldHVybiBwYWdlLT5zZXNzaW9u SUQoKTsKLX0KLQogI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCiB2b2lkIFdl YkZyYW1lTG9hZGVyQ2xpZW50OjpzZXRIYXNGcmFtZVNwZWNpZmljU3RvcmFnZUFjY2VzcyhGcmFt ZVNwZWNpZmljU3RvcmFnZUFjY2Vzc0lkZW50aWZpZXImJiBmcmFtZVNwZWNpZmljU3RvcmFnZUFj Y2Vzc0lkZW50aWZpZXIgKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaAppbmRleCA1YWIz MWU1MTI5OWUzOWJmMjgxYmFmZTVhYWUzY2ZjY2Y4MTM1ZWFlLi4wNDY4YjZiYTBkZmRlODIzNDZm MWUwMjVlZDM2OWJiNTYyMDhkNDIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaApAQCAt NTYsNyArNTYsNiBAQCBwdWJsaWM6CiAgICAgT3B0aW9uYWw8V2ViUGFnZVByb3h5SWRlbnRpZmll cj4gd2ViUGFnZVByb3h5SUQoKSBjb25zdDsKICAgICBPcHRpb25hbDxXZWJDb3JlOjpQYWdlSWRl bnRpZmllcj4gcGFnZUlEKCkgY29uc3QgZmluYWw7CiAgICAgT3B0aW9uYWw8V2ViQ29yZTo6RnJh bWVJZGVudGlmaWVyPiBmcmFtZUlEKCkgY29uc3QgZmluYWw7Ci0gICAgUEFMOjpTZXNzaW9uSUQg c2Vzc2lvbklEKCkgY29uc3QgZmluYWw7CiAKICNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFU SVNUSUNTKQogICAgIGJvb2wgaGFzRnJhbWVTcGVjaWZpY1N0b3JhZ2VBY2Nlc3MoKSBmaW5hbCB7 IHJldHVybiAhIW1fZnJhbWVTcGVjaWZpY1N0b3JhZ2VBY2Nlc3NJZGVudGlmaWVyOyB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxv YWRlckNsaWVudC5oIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQvV2Vi RnJhbWVMb2FkZXJDbGllbnQuaAppbmRleCBkNjA2MzBmZTBjYWFkZjQzYThiNzQ0OWQyZDU0OTBl ZGIwOGU2YWM3Li41MzRiYmI4OThiYjM5MGFiNDVjNTM0N2NhMTNlOGQ4ZDExMDMxY2YxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxv YWRlckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYkNvcmVTdXBwb3J0 L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKQEAgLTY1LDcgKzY1LDYgQEAgcHJpdmF0ZToKIAogICAg IE9wdGlvbmFsPFdlYkNvcmU6OlBhZ2VJZGVudGlmaWVyPiBwYWdlSUQoKSBjb25zdCBmaW5hbDsK ICAgICBPcHRpb25hbDxXZWJDb3JlOjpGcmFtZUlkZW50aWZpZXI+IGZyYW1lSUQoKSBjb25zdCBm aW5hbDsKLSAgICBQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQoKSBjb25zdCBmaW5hbDsKIAogICAg IHZvaWQgbWFrZVJlcHJlc2VudGF0aW9uKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyKikgZmluYWw7 CiAgICAgYm9vbCBoYXNIVE1MVmlldygpIGNvbnN0IGZpbmFsOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdExlZ2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0g Yi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNs aWVudC5tbQppbmRleCAyNDE0MGNkZTNlYzkzYjIwNzU5ZmQ2MzAyZDFhMzA5NTJlMTkyYjI3Li4x Mzc2NjEyNmVhZGFiMWYyNmQwM2MwYTA4MjFiZjZhYjAwYTJhMDdkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5t bQorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxv YWRlckNsaWVudC5tbQpAQCAtMjE5LDEyICsyMTksNiBAQCBPcHRpb25hbDxGcmFtZUlkZW50aWZp ZXI+IFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpmcmFtZUlEKCkgY29uc3QKICAgICByZXR1cm4gV1RG OjpudWxsb3B0OwogfQogCi1QQUw6OlNlc3Npb25JRCBXZWJGcmFtZUxvYWRlckNsaWVudDo6c2Vz c2lvbklEKCkgY29uc3QKLXsKLSAgICBhdXRvKiBjb3JlRnJhbWUgPSBjb3JlKG1fd2ViRnJhbWUu Z2V0KCkpOwotICAgIHJldHVybiBjb3JlRnJhbWUgJiYgY29yZUZyYW1lLT5wYWdlKCkgPyBjb3Jl RnJhbWUtPnBhZ2UoKS0+c2Vzc2lvbklEKCkgOiBQQUw6OlNlc3Npb25JRDo6ZGVmYXVsdFNlc3Np b25JRCgpOwotfQotCiB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpmcmFtZUxvYWRlckRlc3Ry b3llZCgpCiB7CiAgICAgW21fd2ViRnJhbWUuZ2V0KCkgX2NsZWFyQ29yZUZyYW1lXTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9h ZGVyQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYkNvcmVTdXBwb3J0L1dl YkZyYW1lTG9hZGVyQ2xpZW50LmNwcAppbmRleCAyMzQ2ZWI5ZDFhMGFjYmNkNTRkMDI2Mzk3MjA3 MDAxZWE3YzAxY2VlLi4yOWI4NTQ3Y2ZhMzQ3MzY2YmYzZGU4YTA0N2VhY2EwNWNkMDcwNGI5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFt ZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViQ29yZVN1 cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCkBAIC0xMzMsMTIgKzEzMyw2IEBAIE9wdGlv bmFsPFdlYkNvcmU6OkZyYW1lSWRlbnRpZmllcj4gV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmZyYW1l SUQoKSBjb25zdAogICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiB9CiAKLVBBTDo6U2Vzc2lvbklE IFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpzZXNzaW9uSUQoKSBjb25zdAotewotICAgIGF1dG8qIGNv cmVGcmFtZSA9IGNvcmUobV93ZWJGcmFtZSk7Ci0gICAgcmV0dXJuIGNvcmVGcmFtZSAmJiBjb3Jl RnJhbWUtPnBhZ2UoKSA/IGNvcmVGcmFtZS0+cGFnZSgpLT5zZXNzaW9uSUQoKSA6IFBBTDo6U2Vz c2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCk7Ci19Ci0KIGJvb2wgV2ViRnJhbWVMb2FkZXJDbGll bnQ6Omhhc1dlYlZpZXcoKSBjb25zdAogewogICAgIHJldHVybiBtX3dlYkZyYW1lLT53ZWJWaWV3 KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJDb3JlU3VwcG9ydC9X ZWJGcmFtZUxvYWRlckNsaWVudC5oIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViQ29yZVN1 cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaAppbmRleCBjNzdlMjJlZDg5MjZjMDViNGE5ZDcz NzBlMDU3ZDRmYmUyMzM5Y2VhLi4xYTJkMmY4ZGVkY2IyNDdkNjhiNjYzNTM4YjM1NDUzNjVjMDIw MzE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJDb3JlU3VwcG9ydC9X ZWJGcmFtZUxvYWRlckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYkNv cmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKQEAgLTUzLDcgKzUzLDYgQEAgcHVibGlj OgogCiAgICAgT3B0aW9uYWw8V2ViQ29yZTo6UGFnZUlkZW50aWZpZXI+IHBhZ2VJRCgpIGNvbnN0 IGZpbmFsOwogICAgIE9wdGlvbmFsPFdlYkNvcmU6OkZyYW1lSWRlbnRpZmllcj4gZnJhbWVJRCgp IGNvbnN0IGZpbmFsOwotICAgIFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCgpIGNvbnN0IGZpbmFs OwogCiAgICAgYm9vbCBoYXNXZWJWaWV3KCkgY29uc3Qgb3ZlcnJpZGU7CiAK