224001 2021-03-31 09:09:13 -0700 ServiceWorkerContextData should not be saved both on ServiceWorkerThread & ServiceWorkerGlobalScope 2021-03-31 12:06:21 -0700 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez beidson ews-watchlist ggaren hi joepeck simon.fraser webkit-bug-importer youennf ysuzuki oldest_to_newest 1745637 0 cdumez 2021-03-31 09:09:13 -0700 ServiceWorkerContextData should not be saved both on ServiceWorkerThread & ServiceWorkerGlobalScope. ServiceWorkerContextData contains script sources and may use a large amount of memory. 1745641 1 424775 cdumez 2021-03-31 09:13:27 -0700 Created attachment 424775 Patch 1745654 2 424775 ggaren 2021-03-31 09:34:39 -0700 Comment on attachment 424775 Patch r=me 1745677 3 ews-feeder 2021-03-31 10:15:48 -0700 Committed r275288: <https://commits.webkit.org/r275288> All reviewed patches have been landed. Closing bug and clearing flags on attachment 424775. 1745678 4 webkit-bug-importer 2021-03-31 10:16:15 -0700 <rdar://problem/76058632> 424775 2021-03-31 09:13:27 -0700 2021-03-31 12:06:21 -0700 Patch bug-224001-20210331091325.patch text/plain 22917 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1Mjc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTA3ZGE2YWQwOTFmYjYx NTQwYWFhYzUzZjY3OWEzYWQ1MTE5NmUzYi4uMTE4NmM3ZWNiODQ2NGYwMzEzYTYwNTY4ZTZjMTU0 YzU0MmIwMTFjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDIxLTAzLTMxICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgU2VydmljZVdvcmtlckNvbnRl eHREYXRhIHNob3VsZCBub3QgYmUgc2F2ZWQgYm90aCBvbiBTZXJ2aWNlV29ya2VyVGhyZWFkICYg U2VydmljZVdvcmtlckdsb2JhbFNjb3BlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjQwMDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBTZXJ2aWNlV29ya2VyQ29udGV4dERhdGEgc2hvdWxkIG5vdCBiZSBz YXZlZCBib3RoIG9uIFNlcnZpY2VXb3JrZXJUaHJlYWQgJiBTZXJ2aWNlV29ya2VyR2xvYmFsU2Nv cGUuCisgICAgICAgIFNlcnZpY2VXb3JrZXJDb250ZXh0RGF0YSBjb250YWlucyBzY3JpcHQgc291 cmNlcyBhbmQgbWF5IHVzZSBhIGxhcmdlIGFtb3VudCBvZiBtZW1vcnkuCisKKyAgICAgICAgVG8g YWRkcmVzcyB0aGUgaXNzdWUsIHdlIG5vdyBjbGVhciBTZXJ2aWNlV29ya2VyVGhyZWFkJ3MgY29u dGV4dCBkYXRhIG9uY2UgdGhlIFNlcnZpY2VXb3JrZXJHbG9iYWxTY29wZQorICAgICAgICBoYXMg YmVlbiBjb25zdHJ1Y3RlZC4KKworICAgICAgICAqIGluc3BlY3Rvci9hZ2VudHMvd29ya2VyL1Nl cnZpY2VXb3JrZXJBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZXJ2aWNlV29ya2VyQWdl bnQ6OmdldEluaXRpYWxpemF0aW9uSW5mbyk6CisgICAgICAgICogd29ya2Vycy9zZXJ2aWNlL1Nl cnZpY2VXb3JrZXJHbG9iYWxTY29wZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZXJ2aWNlV29y a2VyR2xvYmFsU2NvcGU6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpTZXJ2aWNlV29ya2Vy R2xvYmFsU2NvcGU6OlNlcnZpY2VXb3JrZXJHbG9iYWxTY29wZSk6CisgICAgICAgICogd29ya2Vy cy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJHbG9iYWxTY29wZS5oOgorICAgICAgICAqIHdvcmtlcnMv c2VydmljZS9jb250ZXh0L1NXQ29udGV4dE1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U1dDb250ZXh0TWFuYWdlcjo6cmVnaXN0ZXJTZXJ2aWNlV29ya2VyVGhyZWFkRm9ySW5zdGFsbCk6 CisgICAgICAgICogd29ya2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlclRocmVhZC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpTZXJ2aWNlV29ya2VyVGhyZWFkOjpTZXJ2aWNlV29ya2Vy VGhyZWFkKToKKyAgICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJUaHJlYWQ6OmNyZWF0ZVdv cmtlckdsb2JhbFNjb3BlKToKKyAgICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJUaHJlYWQ6 OmhlYXJ0QmVhdFRpbWVyRmlyZWQpOgorICAgICAgICAoV2ViQ29yZTo6U2VydmljZVdvcmtlclRo cmVhZDo6ZmluaXNoZWRGaXJpbmdJbnN0YWxsRXZlbnQpOgorICAgICAgICAqIHdvcmtlcnMvc2Vy dmljZS9jb250ZXh0L1NlcnZpY2VXb3JrZXJUaHJlYWQuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNl cnZpY2VXb3JrZXJUaHJlYWQ6OmlkZW50aWZpZXIgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 U2VydmljZVdvcmtlclRocmVhZDo6am9iRGF0YUlkZW50aWZpZXIgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6U2VydmljZVdvcmtlclRocmVhZDo6Y29udGV4dERhdGEgY29uc3QpOiBEZWxldGVk LgorICAgICAgICAqIHdvcmtlcnMvc2VydmljZS9jb250ZXh0L1NlcnZpY2VXb3JrZXJUaHJlYWRQ cm94eS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZXJ2aWNlV29ya2VyVGhyZWFkUHJveHk6OlNl cnZpY2VXb3JrZXJUaHJlYWRQcm94eSk6CisgICAgICAgICogd29ya2Vycy9zZXJ2aWNlL2NvbnRl eHQvU2VydmljZVdvcmtlclRocmVhZFByb3h5Lmg6CisKIDIwMjEtMDMtMzEgIEFudHRpIEtvaXZp c3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSA6aXMoKSBpbnN0ZWFkIG9mIDpt YXRjaGVzKCkgb24gVUEgc3R5bGVzaGVldApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAwZGNkNTBhMmM1MDQ4YzRjOTQ1 NmY4OGMzMzFmOTQ3NDFjMDM5NzI0Li43M2QwMGUyYmMxNmYwYjRjNDJiMzdhNmUyMTBiYmFmNjdl ODc3MTc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAzLTMxICBDaHJpcyBEdW1l eiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgU2VydmljZVdvcmtlckNvbnRleHREYXRh IHNob3VsZCBub3QgYmUgc2F2ZWQgYm90aCBvbiBTZXJ2aWNlV29ya2VyVGhyZWFkICYgU2Vydmlj ZVdvcmtlckdsb2JhbFNjb3BlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMjQwMDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFdlYlByb2Nlc3MvU3RvcmFnZS9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVj dGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9u OjppbnN0YWxsU2VydmljZVdvcmtlcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9TdG9yYWdlL1dl YlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmg6CisKIDIwMjEtMDMtMzAgIFdlbnNvbiBIc2ll aCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gRmFsbCBiYWNrIHRv IGNvbnRleHQgbWVudSBwcmVzZW50YXRpb24gYWZ0ZXIgbG9uZyBwcmVzc2luZyBpbWFnZSBvdmVy bGF5IHRleHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvd29y a2VyL1NlcnZpY2VXb3JrZXJBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdl bnRzL3dvcmtlci9TZXJ2aWNlV29ya2VyQWdlbnQuY3BwCmluZGV4IDRhM2U3ZTk3ODFmZjZhMWNm NzM4NzdjNTVlMGM5NjkzMDQwZDdjM2QuLjNmNTI0OTFkYTBhYzVkOWY3OWI1NDRmN2M1ZmM5NDAw YjRiYTcyNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvd29y a2VyL1NlcnZpY2VXb3JrZXJBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2FnZW50cy93b3JrZXIvU2VydmljZVdvcmtlckFnZW50LmNwcApAQCAtNTksOCArNTksOCBAQCBQ cm90b2NvbDo6RXJyb3JTdHJpbmdPcjxSZWY8UHJvdG9jb2w6OlNlcnZpY2VXb3JrZXI6OkNvbmZp Z3VyYXRpb24+PiBTZXJ2aWNlV29yawogICAgIHJldHVybiBQcm90b2NvbDo6U2VydmljZVdvcmtl cjo6Q29uZmlndXJhdGlvbjo6Y3JlYXRlKCkKICAgICAgICAgLnNldFRhcmdldElkKG1fc2Vydmlj ZVdvcmtlckdsb2JhbFNjb3BlLmlkZW50aWZpZXIoKSkKICAgICAgICAgLnNldFNlY3VyaXR5T3Jp Z2luKG1fc2VydmljZVdvcmtlckdsb2JhbFNjb3BlLnNlY3VyaXR5T3JpZ2luKCktPnRvUmF3U3Ry aW5nKCkpCi0gICAgICAgIC5zZXRVcmwobV9zZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUudGhyZWFk KCkuY29udGV4dERhdGEoKS5zY3JpcHRVUkwuc3RyaW5nKCkpCi0gICAgICAgIC5zZXRDb250ZW50 KHNjcmlwdEJ1ZmZlclRvU3RyaW5nKG1fc2VydmljZVdvcmtlckdsb2JhbFNjb3BlLnRocmVhZCgp LmNvbnRleHREYXRhKCkuc2NyaXB0KSkKKyAgICAgICAgLnNldFVybChtX3NlcnZpY2VXb3JrZXJH bG9iYWxTY29wZS5jb250ZXh0RGF0YSgpLnNjcmlwdFVSTC5zdHJpbmcoKSkKKyAgICAgICAgLnNl dENvbnRlbnQoc2NyaXB0QnVmZmVyVG9TdHJpbmcobV9zZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUu Y29udGV4dERhdGEoKS5zY3JpcHQpKQogICAgICAgICAucmVsZWFzZSgpOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckdsb2JhbFNj b3BlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VyR2xv YmFsU2NvcGUuY3BwCmluZGV4IDhkNzNmZjM1NWJhMTBiOGIxMjUwMWE5Njk1M2JmNGY0MDgxNTVh M2IuLmEyZTYyOTFlNGI3MDQ1MDY4N2Q0ZWY5MTAxYzI1YTIwNDc5MGE5YzggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VyR2xv YmFsU2NvcGUuY3BwCkBAIC00NCwxNiArNDQsMTYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBX VEZfTUFLRV9JU09fQUxMT0NBVEVEX0lNUEwoU2VydmljZVdvcmtlckdsb2JhbFNjb3BlKTsKIAot UmVmPFNlcnZpY2VXb3JrZXJHbG9iYWxTY29wZT4gU2VydmljZVdvcmtlckdsb2JhbFNjb3BlOjpj cmVhdGUoY29uc3QgU2VydmljZVdvcmtlckNvbnRleHREYXRhJiBkYXRhLCBjb25zdCBXb3JrZXJQ YXJhbWV0ZXJzJiBwYXJhbXMsIFJlZjxTZWN1cml0eU9yaWdpbj4mJiBvcmlnaW4sIFNlcnZpY2VX b3JrZXJUaHJlYWQmIHRocmVhZCwgUmVmPFNlY3VyaXR5T3JpZ2luPiYmIHRvcE9yaWdpbiwgSURC Q2xpZW50OjpJREJDb25uZWN0aW9uUHJveHkqIGNvbm5lY3Rpb25Qcm94eSwgU29ja2V0UHJvdmlk ZXIqIHNvY2tldFByb3ZpZGVyKQorUmVmPFNlcnZpY2VXb3JrZXJHbG9iYWxTY29wZT4gU2Vydmlj ZVdvcmtlckdsb2JhbFNjb3BlOjpjcmVhdGUoU2VydmljZVdvcmtlckNvbnRleHREYXRhJiYgZGF0 YSwgY29uc3QgV29ya2VyUGFyYW1ldGVycyYgcGFyYW1zLCBSZWY8U2VjdXJpdHlPcmlnaW4+JiYg b3JpZ2luLCBTZXJ2aWNlV29ya2VyVGhyZWFkJiB0aHJlYWQsIFJlZjxTZWN1cml0eU9yaWdpbj4m JiB0b3BPcmlnaW4sIElEQkNsaWVudDo6SURCQ29ubmVjdGlvblByb3h5KiBjb25uZWN0aW9uUHJv eHksIFNvY2tldFByb3ZpZGVyKiBzb2NrZXRQcm92aWRlcikKIHsKLSAgICBhdXRvIHNjb3BlID0g YWRvcHRSZWYoKm5ldyBTZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUgeyBkYXRhLCBwYXJhbXMsIFdU Rk1vdmUob3JpZ2luKSwgdGhyZWFkLCBXVEZNb3ZlKHRvcE9yaWdpbiksIGNvbm5lY3Rpb25Qcm94 eSwgc29ja2V0UHJvdmlkZXIgfSk7CisgICAgYXV0byBzY29wZSA9IGFkb3B0UmVmKCpuZXcgU2Vy dmljZVdvcmtlckdsb2JhbFNjb3BlIHsgV1RGTW92ZShkYXRhKSwgcGFyYW1zLCBXVEZNb3ZlKG9y aWdpbiksIHRocmVhZCwgV1RGTW92ZSh0b3BPcmlnaW4pLCBjb25uZWN0aW9uUHJveHksIHNvY2tl dFByb3ZpZGVyIH0pOwogICAgIHNjb3BlLT5hcHBseUNvbnRlbnRTZWN1cml0eVBvbGljeVJlc3Bv bnNlSGVhZGVycyhwYXJhbXMuY29udGVudFNlY3VyaXR5UG9saWN5UmVzcG9uc2VIZWFkZXJzKTsK ICAgICByZXR1cm4gc2NvcGU7CiB9CiAKLVNlcnZpY2VXb3JrZXJHbG9iYWxTY29wZTo6U2Vydmlj ZVdvcmtlckdsb2JhbFNjb3BlKGNvbnN0IFNlcnZpY2VXb3JrZXJDb250ZXh0RGF0YSYgZGF0YSwg Y29uc3QgV29ya2VyUGFyYW1ldGVycyYgcGFyYW1zLCBSZWY8U2VjdXJpdHlPcmlnaW4+JiYgb3Jp Z2luLCBTZXJ2aWNlV29ya2VyVGhyZWFkJiB0aHJlYWQsIFJlZjxTZWN1cml0eU9yaWdpbj4mJiB0 b3BPcmlnaW4sIElEQkNsaWVudDo6SURCQ29ubmVjdGlvblByb3h5KiBjb25uZWN0aW9uUHJveHks IFNvY2tldFByb3ZpZGVyKiBzb2NrZXRQcm92aWRlcikKK1NlcnZpY2VXb3JrZXJHbG9iYWxTY29w ZTo6U2VydmljZVdvcmtlckdsb2JhbFNjb3BlKFNlcnZpY2VXb3JrZXJDb250ZXh0RGF0YSYmIGRh dGEsIGNvbnN0IFdvcmtlclBhcmFtZXRlcnMmIHBhcmFtcywgUmVmPFNlY3VyaXR5T3JpZ2luPiYm IG9yaWdpbiwgU2VydmljZVdvcmtlclRocmVhZCYgdGhyZWFkLCBSZWY8U2VjdXJpdHlPcmlnaW4+ JiYgdG9wT3JpZ2luLCBJREJDbGllbnQ6OklEQkNvbm5lY3Rpb25Qcm94eSogY29ubmVjdGlvblBy b3h5LCBTb2NrZXRQcm92aWRlciogc29ja2V0UHJvdmlkZXIpCiAgICAgOiBXb3JrZXJHbG9iYWxT Y29wZShXb3JrZXJUaHJlYWRUeXBlOjpTZXJ2aWNlV29ya2VyLCBwYXJhbXMsIFdURk1vdmUob3Jp Z2luKSwgdGhyZWFkLCBXVEZNb3ZlKHRvcE9yaWdpbiksIGNvbm5lY3Rpb25Qcm94eSwgc29ja2V0 UHJvdmlkZXIpCi0gICAgLCBtX2NvbnRleHREYXRhKGNyb3NzVGhyZWFkQ29weShkYXRhKSkKKyAg ICAsIG1fY29udGV4dERhdGEoV1RGTW92ZShkYXRhKSkKICAgICAsIG1fcmVnaXN0cmF0aW9uKFNl cnZpY2VXb3JrZXJSZWdpc3RyYXRpb246OmdldE9yQ3JlYXRlKCp0aGlzLCBuYXZpZ2F0b3IoKS5z ZXJ2aWNlV29ya2VyKCksIFdURk1vdmUobV9jb250ZXh0RGF0YS5yZWdpc3RyYXRpb24pKSkKICAg ICAsIG1fY2xpZW50cyhTZXJ2aWNlV29ya2VyQ2xpZW50czo6Y3JlYXRlKCkpCiB7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckdsb2JhbFNj b3BlLmggYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckdsb2Jh bFNjb3BlLmgKaW5kZXggY2UwN2JmOTA0MmExMGY1ZmMyZDQ1NmY5ODU5ZmI5ZjZlNTFjNTk4My4u MWVjZjExNWU1YjVmMDMzZDZlNDY4ZmZhNDVhZjE4MzBjZGIwNTY2YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJHbG9iYWxTY29wZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VyR2xvYmFsU2Nv cGUuaApAQCAtNDQsNyArNDQsNyBAQCBjbGFzcyBTZXJ2aWNlV29ya2VyVGhyZWFkOwogY2xhc3Mg U2VydmljZVdvcmtlckdsb2JhbFNjb3BlIGZpbmFsIDogcHVibGljIFdvcmtlckdsb2JhbFNjb3Bl IHsKICAgICBXVEZfTUFLRV9JU09fQUxMT0NBVEVEKFNlcnZpY2VXb3JrZXJHbG9iYWxTY29wZSk7 CiBwdWJsaWM6Ci0gICAgc3RhdGljIFJlZjxTZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGU+IGNyZWF0 ZShjb25zdCBTZXJ2aWNlV29ya2VyQ29udGV4dERhdGEmLCBjb25zdCBXb3JrZXJQYXJhbWV0ZXJz JiwgUmVmPFNlY3VyaXR5T3JpZ2luPiYmLCBTZXJ2aWNlV29ya2VyVGhyZWFkJiwgUmVmPFNlY3Vy aXR5T3JpZ2luPiYmIHRvcE9yaWdpbiwgSURCQ2xpZW50OjpJREJDb25uZWN0aW9uUHJveHkqLCBT b2NrZXRQcm92aWRlciopOworICAgIHN0YXRpYyBSZWY8U2VydmljZVdvcmtlckdsb2JhbFNjb3Bl PiBjcmVhdGUoU2VydmljZVdvcmtlckNvbnRleHREYXRhJiYsIGNvbnN0IFdvcmtlclBhcmFtZXRl cnMmLCBSZWY8U2VjdXJpdHlPcmlnaW4+JiYsIFNlcnZpY2VXb3JrZXJUaHJlYWQmLCBSZWY8U2Vj dXJpdHlPcmlnaW4+JiYgdG9wT3JpZ2luLCBJREJDbGllbnQ6OklEQkNvbm5lY3Rpb25Qcm94eSos IFNvY2tldFByb3ZpZGVyKik7CiAKICAgICB+U2VydmljZVdvcmtlckdsb2JhbFNjb3BlKCk7CiAK QEAgLTY4LDEyICs2OCwxMyBAQCBwdWJsaWM6CiAgICAgY29uc3QgU2VydmljZVdvcmtlckNvbnRl eHREYXRhOjpJbXBvcnRlZFNjcmlwdCogc2NyaXB0UmVzb3VyY2UoY29uc3QgVVJMJikgY29uc3Q7 CiAgICAgdm9pZCBzZXRTY3JpcHRSZXNvdXJjZShjb25zdCBVUkwmLCBTZXJ2aWNlV29ya2VyQ29u dGV4dERhdGE6OkltcG9ydGVkU2NyaXB0JiYpOwogCisgICAgY29uc3QgU2VydmljZVdvcmtlckNv bnRleHREYXRhJiBjb250ZXh0RGF0YSgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGV4dERhdGE7IH0K ICAgICBjb25zdCBDZXJ0aWZpY2F0ZUluZm8mIGNlcnRpZmljYXRlSW5mbygpIGNvbnN0IHsgcmV0 dXJuIG1fY29udGV4dERhdGEuY2VydGlmaWNhdGVJbmZvOyB9CiAKICAgICBGZXRjaE9wdGlvbnM6 OkRlc3RpbmF0aW9uIGRlc3RpbmF0aW9uKCkgY29uc3QgZmluYWwgeyByZXR1cm4gRmV0Y2hPcHRp b25zOjpEZXN0aW5hdGlvbjo6U2VydmljZXdvcmtlcjsgfQogICAgIAogcHJpdmF0ZToKLSAgICBT ZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUoY29uc3QgU2VydmljZVdvcmtlckNvbnRleHREYXRhJiwg Y29uc3QgV29ya2VyUGFyYW1ldGVycyYsIFJlZjxTZWN1cml0eU9yaWdpbj4mJiwgU2VydmljZVdv cmtlclRocmVhZCYsIFJlZjxTZWN1cml0eU9yaWdpbj4mJiB0b3BPcmlnaW4sIElEQkNsaWVudDo6 SURCQ29ubmVjdGlvblByb3h5KiwgU29ja2V0UHJvdmlkZXIqKTsKKyAgICBTZXJ2aWNlV29ya2Vy R2xvYmFsU2NvcGUoU2VydmljZVdvcmtlckNvbnRleHREYXRhJiYsIGNvbnN0IFdvcmtlclBhcmFt ZXRlcnMmLCBSZWY8U2VjdXJpdHlPcmlnaW4+JiYsIFNlcnZpY2VXb3JrZXJUaHJlYWQmLCBSZWY8 U2VjdXJpdHlPcmlnaW4+JiYgdG9wT3JpZ2luLCBJREJDbGllbnQ6OklEQkNvbm5lY3Rpb25Qcm94 eSosIFNvY2tldFByb3ZpZGVyKik7CiAKICAgICBib29sIGhhc1BlbmRpbmdFdmVudHMoKSBjb25z dCB7IHJldHVybiAhbV9leHRlbmRlZEV2ZW50cy5pc0VtcHR5KCk7IH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL2NvbnRleHQvU1dDb250ZXh0TWFuYWdlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TV0NvbnRleHRNYW5h Z2VyLmNwcAppbmRleCAxOWVlZGVhN2E1MDM3ZDk0MTBiOGExYWM2NzQyODlkZTI4NWVhOTBiLi42 ZGE5YmE4M2YxMmY3NTI5NjU2YTFiYjNlYmU4MzYyYTljZjUwYmJmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TV0NvbnRleHRNYW5hZ2VyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TV0NvbnRleHRNYW5h Z2VyLmNwcApAQCAtNTUsNyArNTUsNyBAQCBhdXRvIFNXQ29udGV4dE1hbmFnZXI6OmNvbm5lY3Rp b24oKSBjb25zdCAtPiBDb25uZWN0aW9uKgogdm9pZCBTV0NvbnRleHRNYW5hZ2VyOjpyZWdpc3Rl clNlcnZpY2VXb3JrZXJUaHJlYWRGb3JJbnN0YWxsKFJlZjxTZXJ2aWNlV29ya2VyVGhyZWFkUHJv eHk+JiYgc2VydmljZVdvcmtlclRocmVhZFByb3h5KQogewogICAgIGF1dG8gc2VydmljZVdvcmtl cklkZW50aWZpZXIgPSBzZXJ2aWNlV29ya2VyVGhyZWFkUHJveHktPmlkZW50aWZpZXIoKTsKLSAg ICBhdXRvIGpvYkRhdGFJZGVudGlmaWVyID0gc2VydmljZVdvcmtlclRocmVhZFByb3h5LT50aHJl YWQoKS5jb250ZXh0RGF0YSgpLmpvYkRhdGFJZGVudGlmaWVyOworICAgIGF1dG8gam9iRGF0YUlk ZW50aWZpZXIgPSBzZXJ2aWNlV29ya2VyVGhyZWFkUHJveHktPnRocmVhZCgpLmpvYkRhdGFJZGVu dGlmaWVyKCk7CiAgICAgYXV0byogdGhyZWFkUHJveHkgPSBzZXJ2aWNlV29ya2VyVGhyZWFkUHJv eHkucHRyKCk7CiAgICAgYXV0byByZXN1bHQgPSBtX3dvcmtlck1hcC5hZGQoc2VydmljZVdvcmtl cklkZW50aWZpZXIsIFdURk1vdmUoc2VydmljZVdvcmtlclRocmVhZFByb3h5KSk7CiAgICAgQVNT RVJUX1VOVVNFRChyZXN1bHQsIHJlc3VsdC5pc05ld0VudHJ5KTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9jb250ZXh0L1NlcnZpY2VXb3JrZXJUaHJlYWQuY3Bw IGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlclRo cmVhZC5jcHAKaW5kZXggYTY4NGM3MjBmNjgzZjNkMTBmM2EwOWQ0MjUyNzRlNmVlYmUyNjgxYS4u Mjg4MTIyOGE4MjRkNGRmNDg5MTBiZjliYzc5ZTAwOTYwZWE1M2I5YiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlclRocmVhZC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdv cmtlclRocmVhZC5jcHAKQEAgLTczLDkgKzczLDExIEBAIHByaXZhdGU6CiAvLyBGSVhNRTogVXNl IGEgdmFsaWQgV29ya2VyT2JqZWN0UHJveHkKIC8vIEZJWE1FOiBVc2UgdmFsaWQgcnVudGltZSBm bGFncwogCi1TZXJ2aWNlV29ya2VyVGhyZWFkOjpTZXJ2aWNlV29ya2VyVGhyZWFkKGNvbnN0IFNl cnZpY2VXb3JrZXJDb250ZXh0RGF0YSYgZGF0YSwgU3RyaW5nJiYgdXNlckFnZW50LCBjb25zdCBT ZXR0aW5nczo6VmFsdWVzJiBzZXR0aW5nc1ZhbHVlcywgV29ya2VyTG9hZGVyUHJveHkmIGxvYWRl clByb3h5LCBXb3JrZXJEZWJ1Z2dlclByb3h5JiBkZWJ1Z2dlclByb3h5LCBJREJDbGllbnQ6OklE QkNvbm5lY3Rpb25Qcm94eSogaWRiQ29ubmVjdGlvblByb3h5LCBTb2NrZXRQcm92aWRlciogc29j a2V0UHJvdmlkZXIpCitTZXJ2aWNlV29ya2VyVGhyZWFkOjpTZXJ2aWNlV29ya2VyVGhyZWFkKFNl cnZpY2VXb3JrZXJDb250ZXh0RGF0YSYmIGRhdGEsIFN0cmluZyYmIHVzZXJBZ2VudCwgY29uc3Qg U2V0dGluZ3M6OlZhbHVlcyYgc2V0dGluZ3NWYWx1ZXMsIFdvcmtlckxvYWRlclByb3h5JiBsb2Fk ZXJQcm94eSwgV29ya2VyRGVidWdnZXJQcm94eSYgZGVidWdnZXJQcm94eSwgSURCQ2xpZW50OjpJ REJDb25uZWN0aW9uUHJveHkqIGlkYkNvbm5lY3Rpb25Qcm94eSwgU29ja2V0UHJvdmlkZXIqIHNv Y2tldFByb3ZpZGVyKQogICAgIDogV29ya2VyVGhyZWFkKHsgZGF0YS5zY3JpcHRVUkwsIGVtcHR5 U3RyaW5nKCksICJzZXJ2aWNld29ya2VyOiIgKyBJbnNwZWN0b3I6OklkZW50aWZpZXJzRmFjdG9y eTo6Y3JlYXRlSWRlbnRpZmllcigpLCBXVEZNb3ZlKHVzZXJBZ2VudCksIHBsYXRmb3JtU3RyYXRl Z2llcygpLT5sb2FkZXJTdHJhdGVneSgpLT5pc09uTGluZSgpLCBkYXRhLmNvbnRlbnRTZWN1cml0 eVBvbGljeSwgZmFsc2UsIE1vbm90b25pY1RpbWU6Om5vdygpLCB7IH0sIGRhdGEud29ya2VyVHlw ZSwgRmV0Y2hSZXF1ZXN0Q3JlZGVudGlhbHM6Ok9taXQsIHNldHRpbmdzVmFsdWVzIH0sIHNjcmlw dEJ1ZmZlclRvU3RyaW5nKGRhdGEuc2NyaXB0KSwgbG9hZGVyUHJveHksIGRlYnVnZ2VyUHJveHks IER1bW15U2VydmljZVdvcmtlclRocmVhZFByb3h5OjpzaGFyZWQoKSwgV29ya2VyVGhyZWFkU3Rh cnRNb2RlOjpOb3JtYWwsIGRhdGEucmVnaXN0cmF0aW9uLmtleS50b3BPcmlnaW4oKS5zZWN1cml0 eU9yaWdpbigpLmdldCgpLCBpZGJDb25uZWN0aW9uUHJveHksIHNvY2tldFByb3ZpZGVyLCBKU0M6 OlJ1bnRpbWVGbGFnczo6Y3JlYXRlQWxsRW5hYmxlZCgpKQotICAgICwgbV9kYXRhKGRhdGEuaXNv bGF0ZWRDb3B5KCkpCisgICAgLCBtX3NlcnZpY2VXb3JrZXJJZGVudGlmaWVyKGRhdGEuc2Vydmlj ZVdvcmtlcklkZW50aWZpZXIpCisgICAgLCBtX2pvYkRhdGFJZGVudGlmaWVyKGRhdGEuam9iRGF0 YUlkZW50aWZpZXIpCisgICAgLCBtX2RhdGEoY3Jvc3NUaHJlYWRDb3B5KGRhdGEpKQogICAgICwg bV93b3JrZXJPYmplY3RQcm94eShEdW1teVNlcnZpY2VXb3JrZXJUaHJlYWRQcm94eTo6c2hhcmVk KCkpCiAgICAgLCBtX2hlYXJ0QmVhdFRpbWVvdXQoU1dDb250ZXh0TWFuYWdlcjo6c2luZ2xldG9u KCkuY29ubmVjdGlvbigpLT5zaG91bGRVc2VTaG9ydFRpbWVvdXQoKSA/IGhlYXJ0QmVhdFRpbWVv dXRGb3JUZXN0IDogaGVhcnRCZWF0VGltZW91dCkKICAgICAsIG1faGVhcnRCZWF0VGltZXIgeyAq dGhpcywgJlNlcnZpY2VXb3JrZXJUaHJlYWQ6OmhlYXJ0QmVhdFRpbWVyRmlyZWQgfQpAQCAtODgs NyArOTAsOCBAQCBTZXJ2aWNlV29ya2VyVGhyZWFkOjp+U2VydmljZVdvcmtlclRocmVhZCgpID0g ZGVmYXVsdDsKIAogUmVmPFdvcmtlckdsb2JhbFNjb3BlPiBTZXJ2aWNlV29ya2VyVGhyZWFkOjpj cmVhdGVXb3JrZXJHbG9iYWxTY29wZShjb25zdCBXb3JrZXJQYXJhbWV0ZXJzJiBwYXJhbXMsIFJl ZjxTZWN1cml0eU9yaWdpbj4mJiBvcmlnaW4sIFJlZjxTZWN1cml0eU9yaWdpbj4mJiB0b3BPcmln aW4pCiB7Ci0gICAgcmV0dXJuIFNlcnZpY2VXb3JrZXJHbG9iYWxTY29wZTo6Y3JlYXRlKG1fZGF0 YSwgcGFyYW1zLCBXVEZNb3ZlKG9yaWdpbiksICp0aGlzLCBXVEZNb3ZlKHRvcE9yaWdpbiksIGlk YkNvbm5lY3Rpb25Qcm94eSgpLCBzb2NrZXRQcm92aWRlcigpKTsKKyAgICBSRUxFQVNFX0FTU0VS VChtX2RhdGEpOworICAgIHJldHVybiBTZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGU6OmNyZWF0ZSgq c3RkOjpleGNoYW5nZShtX2RhdGEsIFdURjo6bnVsbG9wdCksIHBhcmFtcywgV1RGTW92ZShvcmln aW4pLCAqdGhpcywgV1RGTW92ZSh0b3BPcmlnaW4pLCBpZGJDb25uZWN0aW9uUHJveHkoKSwgc29j a2V0UHJvdmlkZXIoKSk7CiB9CiAKIHZvaWQgU2VydmljZVdvcmtlclRocmVhZDo6cnVuRXZlbnRM b29wKCkKQEAgLTI1NywxMCArMjYwLDEwIEBAIHZvaWQgU2VydmljZVdvcmtlclRocmVhZDo6aGVh cnRCZWF0VGltZXJGaXJlZCgpCiAgICAgICAgIGNvbm5lY3Rpb24tPmRpZEZhaWxIZWFydEJlYXRD aGVjayhpZGVudGlmaWVyKCkpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIFN0YXRlOjpTdGFy dGluZzoKLSAgICAgICAgY29ubmVjdGlvbi0+c2VydmljZVdvcmtlckZhaWxlZFRvU3RhcnQobV9k YXRhLmpvYkRhdGFJZGVudGlmaWVyLCBpZGVudGlmaWVyKCksICJTZXJ2aWNlIFdvcmtlciBzY3Jp cHQgZXhlY3V0aW9uIHRpbWVkIG91dCJfcyk7CisgICAgICAgIGNvbm5lY3Rpb24tPnNlcnZpY2VX b3JrZXJGYWlsZWRUb1N0YXJ0KG1fam9iRGF0YUlkZW50aWZpZXIsIGlkZW50aWZpZXIoKSwgIlNl cnZpY2UgV29ya2VyIHNjcmlwdCBleGVjdXRpb24gdGltZWQgb3V0Il9zKTsKICAgICAgICAgYnJl YWs7CiAgICAgY2FzZSBTdGF0ZTo6SW5zdGFsbGluZzoKLSAgICAgICAgY29ubmVjdGlvbi0+ZGlk RmluaXNoSW5zdGFsbChtX2RhdGEuam9iRGF0YUlkZW50aWZpZXIsIGlkZW50aWZpZXIoKSwgZmFs c2UpOworICAgICAgICBjb25uZWN0aW9uLT5kaWRGaW5pc2hJbnN0YWxsKG1fam9iRGF0YUlkZW50 aWZpZXIsIGlkZW50aWZpZXIoKSwgZmFsc2UpOwogICAgICAgICBicmVhazsKICAgICB9CiB9CkBA IC0yNzYsNyArMjc5LDcgQEAgdm9pZCBTZXJ2aWNlV29ya2VyVGhyZWFkOjpmaW5pc2hlZEZpcmlu Z0luc3RhbGxFdmVudChib29sIGhhc1JlamVjdGVkQW55UHJvbWlzZSkKICAgICBtX3N0YXRlID0g U3RhdGU6OklkbGU7CiAKICAgICBpZiAoYXV0byogY29ubmVjdGlvbiA9IFNXQ29udGV4dE1hbmFn ZXI6OnNpbmdsZXRvbigpLmNvbm5lY3Rpb24oKSkKLSAgICAgICAgY29ubmVjdGlvbi0+ZGlkRmlu aXNoSW5zdGFsbChtX2RhdGEuam9iRGF0YUlkZW50aWZpZXIsIGlkZW50aWZpZXIoKSwgIWhhc1Jl amVjdGVkQW55UHJvbWlzZSk7CisgICAgICAgIGNvbm5lY3Rpb24tPmRpZEZpbmlzaEluc3RhbGwo bV9qb2JEYXRhSWRlbnRpZmllciwgaWRlbnRpZmllcigpLCAhaGFzUmVqZWN0ZWRBbnlQcm9taXNl KTsKIH0KIAogdm9pZCBTZXJ2aWNlV29ya2VyVGhyZWFkOjp3aWxsUG9zdFRhc2tUb0ZpcmVBY3Rp dmF0ZUV2ZW50KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9j b250ZXh0L1NlcnZpY2VXb3JrZXJUaHJlYWQuaCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2Vy dmljZS9jb250ZXh0L1NlcnZpY2VXb3JrZXJUaHJlYWQuaAppbmRleCA5NTU3MjRhMzc5NzVhN2E4 MTkxODEwZTBmYzAwYzQ1M2JkOTVhYTM3Li4zN2M0YjdhMjIwYzFiODZmNTBjNzY5N2I0ZDdlOTMz ZDM4YjE3M2M4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29u dGV4dC9TZXJ2aWNlV29ya2VyVGhyZWFkLmgKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9z ZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlclRocmVhZC5oCkBAIC02Nyw5ICs2Nyw4IEBAIHB1 YmxpYzoKICAgICB2b2lkIHF1ZXVlVGFza1RvRmlyZUluc3RhbGxFdmVudCgpOwogICAgIHZvaWQg cXVldWVUYXNrVG9GaXJlQWN0aXZhdGVFdmVudCgpOwogCi0gICAgY29uc3QgU2VydmljZVdvcmtl ckNvbnRleHREYXRhJiBjb250ZXh0RGF0YSgpIGNvbnN0IHsgcmV0dXJuIG1fZGF0YTsgfQotCi0g ICAgU2VydmljZVdvcmtlcklkZW50aWZpZXIgaWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1f ZGF0YS5zZXJ2aWNlV29ya2VySWRlbnRpZmllcjsgfQorICAgIFNlcnZpY2VXb3JrZXJJZGVudGlm aWVyIGlkZW50aWZpZXIoKSBjb25zdCB7IHJldHVybiBtX3NlcnZpY2VXb3JrZXJJZGVudGlmaWVy OyB9CisgICAgT3B0aW9uYWw8U2VydmljZVdvcmtlckpvYkRhdGFJZGVudGlmaWVyPiBqb2JEYXRh SWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1fam9iRGF0YUlkZW50aWZpZXI7IH0KICAgICBi b29sIGRvZXNIYW5kbGVGZXRjaCgpIGNvbnN0IHsgcmV0dXJuIG1fZG9lc0hhbmRsZUZldGNoOyB9 CiAKICAgICB2b2lkIHN0YXJ0RmV0Y2hFdmVudE1vbml0b3JpbmcoKTsKQEAgLTgwLDcgKzc5LDcg QEAgcHJvdGVjdGVkOgogICAgIHZvaWQgcnVuRXZlbnRMb29wKCkgb3ZlcnJpZGU7CiAKIHByaXZh dGU6Ci0gICAgV0VCQ09SRV9FWFBPUlQgU2VydmljZVdvcmtlclRocmVhZChjb25zdCBTZXJ2aWNl V29ya2VyQ29udGV4dERhdGEmLCBTdHJpbmcmJiB1c2VyQWdlbnQsIGNvbnN0IFNldHRpbmdzOjpW YWx1ZXMmLCBXb3JrZXJMb2FkZXJQcm94eSYsIFdvcmtlckRlYnVnZ2VyUHJveHkmLCBJREJDbGll bnQ6OklEQkNvbm5lY3Rpb25Qcm94eSosIFNvY2tldFByb3ZpZGVyKik7CisgICAgV0VCQ09SRV9F WFBPUlQgU2VydmljZVdvcmtlclRocmVhZChTZXJ2aWNlV29ya2VyQ29udGV4dERhdGEmJiwgU3Ry aW5nJiYgdXNlckFnZW50LCBjb25zdCBTZXR0aW5nczo6VmFsdWVzJiwgV29ya2VyTG9hZGVyUHJv eHkmLCBXb3JrZXJEZWJ1Z2dlclByb3h5JiwgSURCQ2xpZW50OjpJREJDb25uZWN0aW9uUHJveHkq LCBTb2NrZXRQcm92aWRlciopOwogCiAgICAgYm9vbCBpc1NlcnZpY2VXb3JrZXJUaHJlYWQoKSBj b25zdCBmaW5hbCB7IHJldHVybiB0cnVlOyB9CiAgICAgdm9pZCBmaW5pc2hlZEV2YWx1YXRpbmdT Y3JpcHQoKSBmaW5hbDsKQEAgLTk0LDcgKzkzLDkgQEAgcHJpdmF0ZToKICAgICB2b2lkIGhlYXJ0 QmVhdFRpbWVyRmlyZWQoKTsKICAgICB2b2lkIGluc3RhbGxFdmVudFRpbWVyRmlyZWQoKTsKIAot ICAgIFNlcnZpY2VXb3JrZXJDb250ZXh0RGF0YSBtX2RhdGE7CisgICAgU2VydmljZVdvcmtlcklk ZW50aWZpZXIgbV9zZXJ2aWNlV29ya2VySWRlbnRpZmllcjsKKyAgICBPcHRpb25hbDxTZXJ2aWNl V29ya2VySm9iRGF0YUlkZW50aWZpZXI+IG1fam9iRGF0YUlkZW50aWZpZXI7CisgICAgT3B0aW9u YWw8U2VydmljZVdvcmtlckNvbnRleHREYXRhPiBtX2RhdGE7IC8vIEJlY29tZXMgV1RGOjpudWxs b3B0IGFmdGVyIHRoZSBTZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUgaGFzIGJlZW4gY3JlYXRlZC4K ICAgICBXb3JrZXJPYmplY3RQcm94eSYgbV93b3JrZXJPYmplY3RQcm94eTsKICAgICBib29sIG1f ZG9lc0hhbmRsZUZldGNoIHsgZmFsc2UgfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv d29ya2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlclRocmVhZFByb3h5LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9jb250ZXh0L1NlcnZpY2VXb3JrZXJUaHJlYWRQ cm94eS5jcHAKaW5kZXggNzc0MzNjYzljNmZlYWU1NjM3OTMwYWE2ZDliMmYzMGUxMWJlZTg2NS4u OTBkN2ZmNjUzOWUyY2MxNTljZTIyYmQ0OTZjZjg3MDViYzIxNGRkYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlclRocmVhZFBy b3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2 aWNlV29ya2VyVGhyZWFkUHJveHkuY3BwCkBAIC05MiwxMCArOTIsMTMgQEAgc3RhdGljIEhhc2hT ZXQ8U2VydmljZVdvcmtlclRocmVhZFByb3h5Kj4mIGFsbFNlcnZpY2VXb3JrZXJUaHJlYWRQcm94 aWVzKCkKICAgICByZXR1cm4gc2V0OwogfQogCi1TZXJ2aWNlV29ya2VyVGhyZWFkUHJveHk6OlNl cnZpY2VXb3JrZXJUaHJlYWRQcm94eShQYWdlQ29uZmlndXJhdGlvbiYmIHBhZ2VDb25maWd1cmF0 aW9uLCBjb25zdCBTZXJ2aWNlV29ya2VyQ29udGV4dERhdGEmIGRhdGEsIFN0cmluZyYmIHVzZXJB Z2VudCwgQ2FjaGVTdG9yYWdlUHJvdmlkZXImIGNhY2hlU3RvcmFnZVByb3ZpZGVyLCBTdG9yYWdl QmxvY2tpbmdQb2xpY3kgc3RvcmFnZUJsb2NraW5nUG9saWN5KQorU2VydmljZVdvcmtlclRocmVh ZFByb3h5OjpTZXJ2aWNlV29ya2VyVGhyZWFkUHJveHkoUGFnZUNvbmZpZ3VyYXRpb24mJiBwYWdl Q29uZmlndXJhdGlvbiwgU2VydmljZVdvcmtlckNvbnRleHREYXRhJiYgZGF0YSwgU3RyaW5nJiYg dXNlckFnZW50LCBDYWNoZVN0b3JhZ2VQcm92aWRlciYgY2FjaGVTdG9yYWdlUHJvdmlkZXIsIFN0 b3JhZ2VCbG9ja2luZ1BvbGljeSBzdG9yYWdlQmxvY2tpbmdQb2xpY3kpCiAgICAgOiBtX3BhZ2Uo Y3JlYXRlUGFnZUZvclNlcnZpY2VXb3JrZXIoV1RGTW92ZShwYWdlQ29uZmlndXJhdGlvbiksIGRh dGEsIHN0b3JhZ2VCbG9ja2luZ1BvbGljeSkpCiAgICAgLCBtX2RvY3VtZW50KCptX3BhZ2UtPm1h aW5GcmFtZSgpLmRvY3VtZW50KCkpCi0gICAgLCBtX3NlcnZpY2VXb3JrZXJUaHJlYWQoU2Vydmlj ZVdvcmtlclRocmVhZDo6Y3JlYXRlKGRhdGEsIFdURk1vdmUodXNlckFnZW50KSwgbV9kb2N1bWVu dC0+c2V0dGluZ3NWYWx1ZXMoKSwgKnRoaXMsICp0aGlzLCBpZGJDb25uZWN0aW9uUHJveHkobV9k b2N1bWVudCksIG1fZG9jdW1lbnQtPnNvY2tldFByb3ZpZGVyKCkpKQorI2lmIEVOQUJMRShSRU1P VEVfSU5TUEVDVE9SKQorICAgICwgbV9yZW1vdGVEZWJ1Z2dhYmxlKG1ha2VVbmlxdWU8U2Vydmlj ZVdvcmtlckRlYnVnZ2FibGU+KCp0aGlzLCBkYXRhKSkKKyNlbmRpZgorICAgICwgbV9zZXJ2aWNl V29ya2VyVGhyZWFkKFNlcnZpY2VXb3JrZXJUaHJlYWQ6OmNyZWF0ZShXVEZNb3ZlKGRhdGEpLCBX VEZNb3ZlKHVzZXJBZ2VudCksIG1fZG9jdW1lbnQtPnNldHRpbmdzVmFsdWVzKCksICp0aGlzLCAq dGhpcywgaWRiQ29ubmVjdGlvblByb3h5KG1fZG9jdW1lbnQpLCBtX2RvY3VtZW50LT5zb2NrZXRQ cm92aWRlcigpKSkKICAgICAsIG1fY2FjaGVTdG9yYWdlUHJvdmlkZXIoY2FjaGVTdG9yYWdlUHJv dmlkZXIpCiAgICAgLCBtX2luc3BlY3RvclByb3h5KCp0aGlzKQogewpAQCAtMTA5LDcgKzExMiw2 IEBAIFNlcnZpY2VXb3JrZXJUaHJlYWRQcm94eTo6U2VydmljZVdvcmtlclRocmVhZFByb3h5KFBh Z2VDb25maWd1cmF0aW9uJiYgcGFnZUNvbmZpCiAgICAgYWxsU2VydmljZVdvcmtlclRocmVhZFBy b3hpZXMoKS5hZGQodGhpcyk7CiAKICNpZiBFTkFCTEUoUkVNT1RFX0lOU1BFQ1RPUikKLSAgICBt X3JlbW90ZURlYnVnZ2FibGUgPSBtYWtlVW5pcXVlPFNlcnZpY2VXb3JrZXJEZWJ1Z2dhYmxlPigq dGhpcywgZGF0YSk7CiAgICAgbV9yZW1vdGVEZWJ1Z2dhYmxlLT5zZXRSZW1vdGVEZWJ1Z2dpbmdB bGxvd2VkKHRydWUpOwogICAgIG1fcmVtb3RlRGVidWdnYWJsZS0+aW5pdCgpOwogI2VuZGlmCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2aWNl V29ya2VyVGhyZWFkUHJveHkuaCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9jb250 ZXh0L1NlcnZpY2VXb3JrZXJUaHJlYWRQcm94eS5oCmluZGV4IDZiNzUwMzMzY2NkNTk5NzRiZjRm OTg2M2I2ZTY0MDQ0ZjQxZGVkZmEuLjdlYzdiOGU0ZWYxZDhhYTFiNWM1Y2ZkOTUxNzMwNzk1ODVi OGJlODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9jb250ZXh0 L1NlcnZpY2VXb3JrZXJUaHJlYWRQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMv c2VydmljZS9jb250ZXh0L1NlcnZpY2VXb3JrZXJUaHJlYWRQcm94eS5oCkBAIC04Miw3ICs4Miw3 IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldExhc3ROYXZpZ2F0aW9uV2Fz QXBwQm91bmQoYm9vbCk7CiAKIHByaXZhdGU6Ci0gICAgV0VCQ09SRV9FWFBPUlQgU2VydmljZVdv cmtlclRocmVhZFByb3h5KFBhZ2VDb25maWd1cmF0aW9uJiYsIGNvbnN0IFNlcnZpY2VXb3JrZXJD b250ZXh0RGF0YSYsIFN0cmluZyYmIHVzZXJBZ2VudCwgQ2FjaGVTdG9yYWdlUHJvdmlkZXImLCBT dG9yYWdlQmxvY2tpbmdQb2xpY3kpOworICAgIFdFQkNPUkVfRVhQT1JUIFNlcnZpY2VXb3JrZXJU aHJlYWRQcm94eShQYWdlQ29uZmlndXJhdGlvbiYmLCBTZXJ2aWNlV29ya2VyQ29udGV4dERhdGEm JiwgU3RyaW5nJiYgdXNlckFnZW50LCBDYWNoZVN0b3JhZ2VQcm92aWRlciYsIFN0b3JhZ2VCbG9j a2luZ1BvbGljeSk7CiAKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgdm9pZCBuZXR3b3JrU3Rh dGVDaGFuZ2VkKGJvb2wgaXNPbkxpbmUpOwogCkBAIC05OCwxNSArOTgsMTUgQEAgcHJpdmF0ZToK IAogICAgIFVuaXF1ZVJlZjxQYWdlPiBtX3BhZ2U7CiAgICAgUmVmPERvY3VtZW50PiBtX2RvY3Vt ZW50OworI2lmIEVOQUJMRShSRU1PVEVfSU5TUEVDVE9SKQorICAgIHN0ZDo6dW5pcXVlX3B0cjxT ZXJ2aWNlV29ya2VyRGVidWdnYWJsZT4gbV9yZW1vdGVEZWJ1Z2dhYmxlOworI2VuZGlmCiAgICAg UmVmPFNlcnZpY2VXb3JrZXJUaHJlYWQ+IG1fc2VydmljZVdvcmtlclRocmVhZDsKICAgICBDYWNo ZVN0b3JhZ2VQcm92aWRlciYgbV9jYWNoZVN0b3JhZ2VQcm92aWRlcjsKICAgICBSZWZQdHI8Q2Fj aGVTdG9yYWdlQ29ubmVjdGlvbj4gbV9jYWNoZVN0b3JhZ2VDb25uZWN0aW9uOwogICAgIGJvb2wg bV9pc1Rlcm1pbmF0aW5nT3JUZXJtaW5hdGVkIHsgZmFsc2UgfTsKIAogICAgIFNlcnZpY2VXb3Jr ZXJJbnNwZWN0b3JQcm94eSBtX2luc3BlY3RvclByb3h5OwotI2lmIEVOQUJMRShSRU1PVEVfSU5T UEVDVE9SKQotICAgIHN0ZDo6dW5pcXVlX3B0cjxTZXJ2aWNlV29ya2VyRGVidWdnYWJsZT4gbV9y ZW1vdGVEZWJ1Z2dhYmxlOwotI2VuZGlmCiAgICAgSGFzaE1hcDxzdGQ6OnBhaXI8U1dTZXJ2ZXJD b25uZWN0aW9uSWRlbnRpZmllciwgRmV0Y2hJZGVudGlmaWVyPiwgUmVmPFNlcnZpY2VXb3JrZXJG ZXRjaDo6Q2xpZW50Pj4gbV9vbmdvaW5nRmV0Y2hUYXNrczsKIH07CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9yYWdlL1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0 aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9yYWdlL1dlYlNXQ29udGV4dE1h bmFnZXJDb25uZWN0aW9uLmNwcAppbmRleCAxZTAxYTVkNGU3YTdiODMxNGEyMzE0YWE4N2Y0ZGQy ZGQzMmViMTA0Li45MGEyZDhjZmM2MGZkYWE1N2MzYTc4OTA5MjRhNGI4NWZlMWQzMTc0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvU3RvcmFnZS9XZWJTV0NvbnRleHRNYW5h Z2VyQ29ubmVjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2Uv V2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwCkBAIC0xMzUsNyArMTM1LDcgQEAgdm9p ZCBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbjo6dXBkYXRlUHJlZmVyZW5jZXNTdG9yZShj b25zdCBXZWJQcmVmZXJlbmNlc1MKICAgICBzZXRTaG91bGRVc2VTaG9ydFRpbWVvdXQoc3RvcmUu Z2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpzaG91bGRVc2VTZXJ2aWNlV29y a2VyU2hvcnRUaW1lb3V0S2V5KCkpKTsKIH0KIAotdm9pZCBXZWJTV0NvbnRleHRNYW5hZ2VyQ29u bmVjdGlvbjo6aW5zdGFsbFNlcnZpY2VXb3JrZXIoY29uc3QgU2VydmljZVdvcmtlckNvbnRleHRE YXRhJiBkYXRhLCBTdHJpbmcmJiB1c2VyQWdlbnQpCit2b2lkIFdlYlNXQ29udGV4dE1hbmFnZXJD b25uZWN0aW9uOjppbnN0YWxsU2VydmljZVdvcmtlcihTZXJ2aWNlV29ya2VyQ29udGV4dERhdGEm JiBkYXRhLCBTdHJpbmcmJiB1c2VyQWdlbnQpCiB7CiAgICAgYXV0byBwYWdlQ29uZmlndXJhdGlv biA9IHBhZ2VDb25maWd1cmF0aW9uV2l0aEVtcHR5Q2xpZW50cyhXZWJQcm9jZXNzOjpzaW5nbGV0 b24oKS5zZXNzaW9uSUQoKSk7CiAKQEAgLTE1MiwxMCArMTUyLDExIEBAIHZvaWQgV2ViU1dDb250 ZXh0TWFuYWdlckNvbm5lY3Rpb246Omluc3RhbGxTZXJ2aWNlV29ya2VyKGNvbnN0IFNlcnZpY2VX b3JrZXJDb250CiAKICAgICBwYWdlQ29uZmlndXJhdGlvbi5sb2FkZXJDbGllbnRGb3JNYWluRnJh bWUgPSBtYWtlVW5pcXVlUmVmPFNlcnZpY2VXb3JrZXJGcmFtZUxvYWRlckNsaWVudD4obV93ZWJQ YWdlUHJveHlJRCwgbV9wYWdlSUQsIEZyYW1lSWRlbnRpZmllcjo6Z2VuZXJhdGUoKSwgZWZmZWN0 aXZlVXNlckFnZW50KTsKIAotICAgIGF1dG8gc2VydmljZVdvcmtlclRocmVhZFByb3h5ID0gU2Vy dmljZVdvcmtlclRocmVhZFByb3h5OjpjcmVhdGUoV1RGTW92ZShwYWdlQ29uZmlndXJhdGlvbiks IGRhdGEsIFdURk1vdmUoZWZmZWN0aXZlVXNlckFnZW50KSwgV2ViUHJvY2Vzczo6c2luZ2xldG9u KCkuY2FjaGVTdG9yYWdlUHJvdmlkZXIoKSwgbV9zdG9yYWdlQmxvY2tpbmdQb2xpY3kpOworICAg IGF1dG8gc2VydmljZVdvcmtlcklkZW50aWZpZXIgPSBkYXRhLnNlcnZpY2VXb3JrZXJJZGVudGlm aWVyOworICAgIGF1dG8gc2VydmljZVdvcmtlclRocmVhZFByb3h5ID0gU2VydmljZVdvcmtlclRo cmVhZFByb3h5OjpjcmVhdGUoV1RGTW92ZShwYWdlQ29uZmlndXJhdGlvbiksIFdURk1vdmUoZGF0 YSksIFdURk1vdmUoZWZmZWN0aXZlVXNlckFnZW50KSwgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCku Y2FjaGVTdG9yYWdlUHJvdmlkZXIoKSwgbV9zdG9yYWdlQmxvY2tpbmdQb2xpY3kpOwogICAgIFNX Q29udGV4dE1hbmFnZXI6OnNpbmdsZXRvbigpLnJlZ2lzdGVyU2VydmljZVdvcmtlclRocmVhZEZv ckluc3RhbGwoV1RGTW92ZShzZXJ2aWNlV29ya2VyVGhyZWFkUHJveHkpKTsKIAotICAgIFJFTEVB U0VfTE9HKFNlcnZpY2VXb3JrZXIsICJDcmVhdGVkIHNlcnZpY2Ugd29ya2VyICUiIFBSSXU2NCAi IGluIHByb2Nlc3MgUElEICVpIiwgZGF0YS5zZXJ2aWNlV29ya2VySWRlbnRpZmllci50b1VJbnQ2 NCgpLCBnZXRDdXJyZW50UHJvY2Vzc0lEKCkpOworICAgIFJFTEVBU0VfTE9HKFNlcnZpY2VXb3Jr ZXIsICJDcmVhdGVkIHNlcnZpY2Ugd29ya2VyICUiIFBSSXU2NCAiIGluIHByb2Nlc3MgUElEICVp Iiwgc2VydmljZVdvcmtlcklkZW50aWZpZXIudG9VSW50NjQoKSwgZ2V0Q3VycmVudFByb2Nlc3NJ RCgpKTsKIH0KIAogdm9pZCBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbjo6c2V0VXNlckFn ZW50KFN0cmluZyYmIHVzZXJBZ2VudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9TdG9yYWdlL1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmggYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvU3RvcmFnZS9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5oCmlu ZGV4IDI1NzY0YTk2M2E2YTc2NmRmNmVhYzliYzQ2NGQ0NjgxNjAwMDBlNWQuLjljYTRjMWYxNzI0 OTRlYTRjOWMyNjZjMWNjMDVmZDhiZTI0ZGE3ZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9TdG9yYWdlL1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmgKKysrIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dDb250ZXh0TWFuYWdlckNvbm5l Y3Rpb24uaApAQCAtODIsNyArODIsNyBAQCBwcml2YXRlOgogICAgIC8vIElQQyBtZXNzYWdlcy4K ICAgICB2b2lkIHNlcnZpY2VXb3JrZXJTdGFydGVkKE9wdGlvbmFsPFdlYkNvcmU6OlNlcnZpY2VX b3JrZXJKb2JEYXRhSWRlbnRpZmllcj4sIFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJJZGVudGlmaWVy LCBib29sIGRvZXNIYW5kbGVGZXRjaCkgZmluYWw7CiAgICAgdm9pZCBzZXJ2aWNlV29ya2VyRmFp bGVkVG9TdGFydChPcHRpb25hbDxXZWJDb3JlOjpTZXJ2aWNlV29ya2VySm9iRGF0YUlkZW50aWZp ZXI+LCBXZWJDb3JlOjpTZXJ2aWNlV29ya2VySWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBleGNl cHRpb25NZXNzYWdlKSBmaW5hbDsKLSAgICB2b2lkIGluc3RhbGxTZXJ2aWNlV29ya2VyKGNvbnN0 IFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJDb250ZXh0RGF0YSYsIFN0cmluZyYmIHVzZXJBZ2VudCk7 CisgICAgdm9pZCBpbnN0YWxsU2VydmljZVdvcmtlcihXZWJDb3JlOjpTZXJ2aWNlV29ya2VyQ29u dGV4dERhdGEmJiwgU3RyaW5nJiYgdXNlckFnZW50KTsKICAgICB2b2lkIHN0YXJ0RmV0Y2goV2Vi Q29yZTo6U1dTZXJ2ZXJDb25uZWN0aW9uSWRlbnRpZmllciwgV2ViQ29yZTo6U2VydmljZVdvcmtl cklkZW50aWZpZXIsIFdlYkNvcmU6OkZldGNoSWRlbnRpZmllciwgV2ViQ29yZTo6UmVzb3VyY2VS ZXF1ZXN0JiYsIFdlYkNvcmU6OkZldGNoT3B0aW9ucyYmLCBJUEM6OkZvcm1EYXRhUmVmZXJlbmNl JiYsIFN0cmluZyYmIHJlZmVycmVyKTsKICAgICB2b2lkIGNhbmNlbEZldGNoKFdlYkNvcmU6OlNX U2VydmVyQ29ubmVjdGlvbklkZW50aWZpZXIsIFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJJZGVudGlm aWVyLCBXZWJDb3JlOjpGZXRjaElkZW50aWZpZXIpOwogICAgIHZvaWQgY29udGludWVEaWRSZWNl aXZlRmV0Y2hSZXNwb25zZShXZWJDb3JlOjpTV1NlcnZlckNvbm5lY3Rpb25JZGVudGlmaWVyLCBX ZWJDb3JlOjpTZXJ2aWNlV29ya2VySWRlbnRpZmllciwgV2ViQ29yZTo6RmV0Y2hJZGVudGlmaWVy KTsK