238924 2022-04-06 22:51:37 -0700 Use the same callback mechanism for ServiceWorker openWindow and navigate in UIProcess 2022-04-07 09:12:15 -0700 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf cdumez webkit-bug-importer oldest_to_newest 1859149 0 youennf 2022-04-06 22:51:37 -0700 Use the same callback mechanism for ServiceWorker openWindow and navigate in UIProcess 1859151 1 456892 youennf 2022-04-06 22:56:26 -0700 Created attachment 456892 Patch 1859267 2 456892 cdumez 2022-04-07 08:24:38 -0700 Comment on attachment 456892 Patch r=me 1859278 3 ews-feeder 2022-04-07 09:11:50 -0700 Committed r292539 (249377@main): <https://commits.webkit.org/249377@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 456892. 1859279 4 webkit-bug-importer 2022-04-07 09:12:15 -0700 <rdar://problem/91419020> 456892 2022-04-06 22:56:26 -0700 2022-04-07 09:11:51 -0700 Patch bug-238924-20220407075624.patch text/plain 19028 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNDUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDE4MzRjNjkzZDhlNGFmN2Rh YjIwOWFhNjhiYjAwYWQ5MWE3MjJkNjIuLjYwNTY1YWVlMmQzMzg4MmE5YTdhZjIxMWRhZDI1MDJh MDZhZGYxYWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjItMDQtMDYgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIFVzZSB0aGUgc2FtZSBjYWxsYmFj ayBtZWNoYW5pc20gZm9yIFNlcnZpY2VXb3JrZXIgb3BlbldpbmRvdyBhbmQgbmF2aWdhdGUgaW4g VUlQcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMzg5MjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBSZXVzZSBXZWJGcmFtZVByb3h5IG5hdmlnYXRpb24gZGVsZWdhdGUgZm9yIG9wZW5XaW5kb3cg b25jZSB0aGUgbWFpbiBmcmFtZSBpcyBjcmVhdGVkLgorICAgICAgICBUaGlzIGVuc3VyZXMgd2Ug Z2V0IHRoZSBzYW1lIGJlaGF2aW9yIGZvciBib3RoIGNvZGUgcGF0aHMgYW5kIG1ha2VzIHN1cmUg b3BlbldpbmRvdyBkb2VzIG5vdCBoYW5nIGlmIGEgZGVsZWdhdGUgY2FuY2VscyB0aGUgbG9hZC4K KworICAgICAgICBDb3ZlcmVkIGJ5IEFQSSB0ZXN0LgorCisgICAgICAgICogVUlQcm9jZXNzL1dl YkZyYW1lUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZVByb3h5Ojp0cmFuc2Zl ck5hdmlnYXRpb25DYWxsYmFja1RvRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZVBy b3h5OjpzZXROYXZpZ2F0aW9uQ2FsbGJhY2spOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJGcmFt ZVByb3h5Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lUHJveHk6OnRyYW5zZmVyTmF2aWdh dGlvbkNhbGxiYWNrVG9GcmFtZSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFp bkZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpjYWxsTG9hZENvbXBsZXRp b25IYW5kbGVyc0lmTmVjZXNzYXJ5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5 Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpvcGVuV2luZG93RnJvbVNlcnZp Y2VXb3JrZXIpOgorCiAyMDIyLTA0LTA2ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNv bT4KIAogICAgICAgICBJbiBjYXNlIG9mIENPT1AtYmFzZWQgcHJvY2VzcyBzd2FwLCB3ZSBuZWVk IHRvIG1ha2Ugc3VyZSB0aGUgZG9jdW1lbnQgZ2V0cyBjb250cm9sbGVkIGJ5IGl0cyBtYXRjaGlu ZyBzZXJ2aWNlIHdvcmtlciByZWdpc3RyYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi RnJhbWVQcm94eS5jcHAKaW5kZXggNTg0M2M5ZWY0NzE1YzY2YTUwOWUxODRkYWI0ODg5MGVlMDE2 NDRmMy4uYWZmMTVlY2JjMGUwYWFlZmViZWVjYzRmZTE4MDc5ZWJhMTk3YzA3ZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKQEAgLTI4Miw2ICsyODIsMTcgQEAg dm9pZCBXZWJGcmFtZVByb3h5OjpzZXRVbnJlYWNoYWJsZVVSTChjb25zdCBVUkwmIHVucmVhY2hh YmxlVVJMKQogICAgIG1fZnJhbWVMb2FkU3RhdGUuc2V0VW5yZWFjaGFibGVVUkwodW5yZWFjaGFi bGVVUkwpOwogfQogCit2b2lkIFdlYkZyYW1lUHJveHk6OnRyYW5zZmVyTmF2aWdhdGlvbkNhbGxi YWNrVG9GcmFtZShXZWJGcmFtZVByb3h5JiBmcmFtZSkKK3sKKyAgICBmcmFtZS5zZXROYXZpZ2F0 aW9uQ2FsbGJhY2soV1RGTW92ZShtX25hdmlnYXRlQ2FsbGJhY2spKTsKK30KKwordm9pZCBXZWJG cmFtZVByb3h5OjpzZXROYXZpZ2F0aW9uQ2FsbGJhY2soQ29tcGxldGlvbkhhbmRsZXI8dm9pZChz dGQ6Om9wdGlvbmFsPFdlYkNvcmU6OlBhZ2VJZGVudGlmaWVyPik+JiYgbmF2aWdhdGVDYWxsYmFj aykKK3sKKyAgICBBU1NFUlQoIW1fbmF2aWdhdGVDYWxsYmFjayk7CisgICAgbV9uYXZpZ2F0ZUNh bGxiYWNrID0gV1RGTW92ZShuYXZpZ2F0ZUNhbGxiYWNrKTsKK30KKwogI2lmIEVOQUJMRShDT05U RU5UX0ZJTFRFUklORykKIGJvb2wgV2ViRnJhbWVQcm94eTo6ZGlkSGFuZGxlQ29udGVudEZpbHRl clVuYmxvY2tOYXZpZ2F0aW9uKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKIHsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuaCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuaAppbmRleCA2MDZlYzAyZGQ0OWYxNWU3 NzUzMmRiNTIzZWQyMTc4ZGRmMjQzOTVjLi5lNGZhNDNiOTA0OWRkZjg3YjRmNTIxM2RiYzgzZDMx YWEyN2UwY2VmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVBy b3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5oCkBAIC0x MzAsNyArMTMwLDggQEAgcHVibGljOgogICAgIHZvaWQgY29sbGFwc2VTZWxlY3Rpb24oKTsKICNl bmRpZgogCi0gICAgdm9pZCB0cmFuc2Zlck5hdmlnYXRpb25DYWxsYmFja1RvRnJhbWUoV2ViRnJh bWVQcm94eSYgZnJhbWUpIHsgZnJhbWUubV9uYXZpZ2F0ZUNhbGxiYWNrID0gV1RGTW92ZShtX25h dmlnYXRlQ2FsbGJhY2spOyB9CisgICAgdm9pZCB0cmFuc2Zlck5hdmlnYXRpb25DYWxsYmFja1Rv RnJhbWUoV2ViRnJhbWVQcm94eSYpOworICAgIHZvaWQgc2V0TmF2aWdhdGlvbkNhbGxiYWNrKENv bXBsZXRpb25IYW5kbGVyPHZvaWQoc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpQYWdlSWRlbnRpZmll cj4pPiYmKTsKIAogcHJpdmF0ZToKICAgICBXZWJGcmFtZVByb3h5KFdlYlBhZ2VQcm94eSYsIFdl YkNvcmU6OkZyYW1lSWRlbnRpZmllcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcAppbmRleCA5MDczNjk2YTI1ZGM5ZTkxNWIzMjVkN2Q2YzM5ZGYzMjkxZTNmOWUzLi4x YzgwNDM1NjZiNWYxYzBlODQwODM3NGEzM2M2MTc3YTZlNmZiYTEyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTQ2MTAsNiArNDYxMCw5IEBAIHZvaWQgV2Vi UGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUoRnJhbWVJZGVudGlmaWVyIGZyYW1lSUQpCiAK ICAgICBtX21haW5GcmFtZSA9IFdlYkZyYW1lUHJveHk6OmNyZWF0ZSgqdGhpcywgZnJhbWVJRCk7 CiAKKyAgICBpZiAobV9zZXJ2aWNlV29ya2VyT3BlbldpbmRvd0NvbXBsZXRpb25DYWxsYmFjaykK KyAgICAgICAgbV9tYWluRnJhbWUtPnNldE5hdmlnYXRpb25DYWxsYmFjayhXVEZNb3ZlKG1fc2Vy dmljZVdvcmtlck9wZW5XaW5kb3dDb21wbGV0aW9uQ2FsbGJhY2spKTsKKwogICAgIC8vIEFkZCB0 aGUgZnJhbWUgdG8gdGhlIHByb2Nlc3Mgd2lkZSBtYXAuCiAgICAgbV9wcm9jZXNzLT5mcmFtZUNy ZWF0ZWQoZnJhbWVJRCwgKm1fbWFpbkZyYW1lKTsKIH0KQEAgLTQ5NTYsNyArNDk1OSw3IEBAIHZv aWQgV2ViUGFnZVByb3h5OjpjYWxsTG9hZENvbXBsZXRpb25IYW5kbGVyc0lmTmVjZXNzYXJ5KGJv b2wgc3VjY2VzcykKICAgICAgICAgbV9zZXJ2aWNlV29ya2VyTGF1bmNoQ29tcGxldGlvbkhhbmRs ZXIoZmFsc2UpOwogCiAgICAgaWYgKG1fc2VydmljZVdvcmtlck9wZW5XaW5kb3dDb21wbGV0aW9u Q2FsbGJhY2spCi0gICAgICAgIG1fc2VydmljZVdvcmtlck9wZW5XaW5kb3dDb21wbGV0aW9uQ2Fs bGJhY2soc3VjY2Vzcyk7CisgICAgICAgIG1fc2VydmljZVdvcmtlck9wZW5XaW5kb3dDb21wbGV0 aW9uQ2FsbGJhY2soc3VjY2VzcyA/IHdlYlBhZ2VJRCgpIDogc3RkOjpvcHRpb25hbDxXZWJDb3Jl OjpQYWdlSWRlbnRpZmllcj4geyB9KTsKICNlbmRpZgogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oCmluZGV4IGFkNzdiYjY4YmY0Y2I2MTljZTA1ZDA4YmI4ZGFhNDBiMDgw MWJhMWUuLmUzOWVmODQ5Y2E4MmVjZDczOGVjMGM0MzdiNmE1MDQ2Njc2ZWEwODAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0yMDg3LDcgKzIwODcsNyBAQCBwdWJs aWM6CiAgICAgdm9pZCBpbnRlcmFjdGlvblJlZ2lvbnMoV2ViQ29yZTo6RmxvYXRSZWN0IHJlY3RJ bkNvbnRlbnRDb29yZGluYXRlcywgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChWZWN0b3I8V2ViQ29y ZTo6SW50ZXJhY3Rpb25SZWdpb24+KT4mJik7CiAKICNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIp Ci0gICAgdm9pZCBzZXRTZXJ2aWNlV29ya2VyT3BlbldpbmRvd0NvbXBsZXRpb25DYWxsYmFjayhD b21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmIGNvbXBsZXRpb25DYWxsYmFjaykKKyAgICB2 b2lkIHNldFNlcnZpY2VXb3JrZXJPcGVuV2luZG93Q29tcGxldGlvbkNhbGxiYWNrKENvbXBsZXRp b25IYW5kbGVyPHZvaWQoc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpQYWdlSWRlbnRpZmllcj4pPiYm IGNvbXBsZXRpb25DYWxsYmFjaykKICAgICB7CiAgICAgICAgIEFTU0VSVCghbV9zZXJ2aWNlV29y a2VyT3BlbldpbmRvd0NvbXBsZXRpb25DYWxsYmFjayk7CiAgICAgICAgIG1fc2VydmljZVdvcmtl ck9wZW5XaW5kb3dDb21wbGV0aW9uQ2FsbGJhY2sgPSBXVEZNb3ZlKGNvbXBsZXRpb25DYWxsYmFj ayk7CkBAIC0zMTM3LDcgKzMxMzcsNyBAQCBwcml2YXRlOgogI2lmIEVOQUJMRShTRVJWSUNFX1dP UktFUikKICAgICBib29sIG1faXNTZXJ2aWNlV29ya2VyUGFnZSB7IGZhbHNlIH07CiAgICAgQ29t cGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4gbV9zZXJ2aWNlV29ya2VyTGF1bmNoQ29tcGxldGlv bkhhbmRsZXI7Ci0gICAgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4gbV9zZXJ2aWNlV29y a2VyT3BlbldpbmRvd0NvbXBsZXRpb25DYWxsYmFjazsKKyAgICBDb21wbGV0aW9uSGFuZGxlcjx2 b2lkKHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6UGFnZUlkZW50aWZpZXI+KT4gbV9zZXJ2aWNlV29y a2VyT3BlbldpbmRvd0NvbXBsZXRpb25DYWxsYmFjazsKICNlbmRpZgogCiAgICAgUnVuTG9vcDo6 VGltZXI8V2ViUGFnZVByb3h5PiBtX3RyeUNsb3NlVGltZW91dFRpbWVyOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNw cAppbmRleCBiNzAwYzk5OWU0YjBlYWRkNTE3MjI2NTYxZDhkMzEwZmFkZDBiNWMwLi4yMTZjYzQ3 Y2QxMjdmMmRkZjliMWVmYmQ4OTM1ZGRiZTU0OTlkY2Y5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcApAQCAt MjEzNSwxOCArMjEzNSw4IEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6b3BlbldpbmRvd0Zyb21T ZXJ2aWNlV29ya2VyKGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nLCBjb25zCiAgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBhdXRvIGlubmVyQ2FsbGJhY2sgPSBbcGFnZUlE ID0gbmV3UGFnZS0+aWRlbnRpZmllcigpLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spXSAo Ym9vbCBzdWNjZXNzKSBtdXRhYmxlIHsKLSAgICAgICAgICAgIGF1dG8qIG5ld1BhZ2UgPSBXZWJQ cm9jZXNzUHJveHk6OndlYlBhZ2UocGFnZUlEKTsKLSAgICAgICAgICAgIGlmICghbmV3UGFnZSB8 fCAhc3VjY2VzcykgewotICAgICAgICAgICAgICAgIGNhbGxiYWNrKHN0ZDo6bnVsbG9wdCk7Ci0g ICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgfQotCi0gICAgICAgICAgICBjYWxs YmFjayhuZXdQYWdlLT53ZWJQYWdlSUQoKSk7Ci0gICAgICAgIH07Ci0KICNpZiBFTkFCTEUoU0VS VklDRV9XT1JLRVIpCi0gICAgICAgIG5ld1BhZ2UtPnNldFNlcnZpY2VXb3JrZXJPcGVuV2luZG93 Q29tcGxldGlvbkNhbGxiYWNrKFdURk1vdmUoaW5uZXJDYWxsYmFjaykpOworICAgICAgICBuZXdQ YWdlLT5zZXRTZXJ2aWNlV29ya2VyT3BlbldpbmRvd0NvbXBsZXRpb25DYWxsYmFjayhXVEZNb3Zl KGNhbGxiYWNrKSk7CiAjZW5kaWYKICAgICB9OwogCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VM b2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTJlZDQ3N2ViMzIzNTkwM2M3OTA2YWQ1YWQ5ODRl NzBiZGUyYWVkZi4uMzFmYzQzNTViYTJlZDM2OTA3MmJiMGE3OTQwZjVkMjQ1MzJkN2FmMyAxMDA2 NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE2IEBACisyMDIyLTA0LTA2ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKwor ICAgICAgICBVc2UgdGhlIHNhbWUgY2FsbGJhY2sgbWVjaGFuaXNtIGZvciBTZXJ2aWNlV29ya2Vy IG9wZW5XaW5kb3cgYW5kIG5hdmlnYXRlIGluIFVJUHJvY2VzcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4OTI0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dENvY29hL1NlcnZpY2VXb3JrZXJCYXNpYy5tbToKKyAgICAgICAgKC1bU2VydmljZVdvcmtlclBT T05OYXZpZ2F0aW9uRGVsZWdhdGUgd2ViVmlldzpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0 aW9uOmRlY2lzaW9uSGFuZGxlcjpdKToKKyAgICAgICAgKC1bU2VydmljZVdvcmtlclBTT05OYXZp Z2F0aW9uRGVsZWdhdGUgd2ViVmlldzpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uUmVzcG9uc2U6 ZGVjaXNpb25IYW5kbGVyOl0pOgorICAgICAgICAoLVtTZXJ2aWNlV29ya2VyT3BlbldpbmRvd1dl YnNpdGVEYXRhU3RvcmVEZWxlZ2F0ZSBpbml0V2l0aENvbmZpZ3VyYXRpb246XSk6CisgICAgICAg ICgtW1NlcnZpY2VXb3JrZXJPcGVuV2luZG93V2Vic2l0ZURhdGFTdG9yZURlbGVnYXRlIHdlYnNp dGVEYXRhU3RvcmU6b3BlbldpbmRvdzpmcm9tU2VydmljZVdvcmtlck9yaWdpbjpjb21wbGV0aW9u SGFuZGxlcjpdKToKKwogMjAyMi0wNC0wNiAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5j b20+CiAKICAgICAgICAgSW4gY2FzZSBvZiBDT09QLWJhc2VkIHByb2Nlc3Mgc3dhcCwgd2UgbmVl ZCB0byBtYWtlIHN1cmUgdGhlIGRvY3VtZW50IGdldHMgY29udHJvbGxlZCBieSBpdHMgbWF0Y2hp bmcgc2VydmljZSB3b3JrZXIgcmVnaXN0cmF0aW9uCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1NlcnZpY2VXb3JrZXJCYXNpYy5tbSBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU2VydmljZVdvcmtlckJhc2ljLm1tCmluZGV4 IDk2MmU4OTk5Mjk4NDdmMTRhYjlmNjM5ZGIwMWE1MGM4NGYxZDBiYjIuLmM4MTcyMTg0YTBhMWQ3 NTZjNGU4YTE3YWIxNGJiYTNlNjYwMjE3MjAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvU2VydmljZVdvcmtlckJhc2ljLm1tCisrKyBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU2VydmljZVdvcmtlckJhc2ljLm1tCkBAIC01 MSw2ICs1MSw3IEBACiAjaW1wb3J0IDxXZWJLaXQvX1dLUmVtb3RlT2JqZWN0SW50ZXJmYWNlLmg+ CiAjaW1wb3J0IDxXZWJLaXQvX1dLUmVtb3RlT2JqZWN0UmVnaXN0cnkuaD4KICNpbXBvcnQgPFdl YktpdC9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5oPgorI2ltcG9ydCA8V2ViS2l0 L19XS1dlYnNpdGVEYXRhU3RvcmVEZWxlZ2F0ZS5oPgogI2ltcG9ydCA8d3RmL0RlcXVlLmg+CiAj aW1wb3J0IDx3dGYvSGFzaE1hcC5oPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgpAQCAtMzA4 NCw2ICszMDg1LDEzIEBAIHN0YXRpYyBjb25zdGV4cHIgYXV0byBTZXJ2aWNlV29ya2VyV2luZG93 Q2xpZW50TmF2aWdhdGVNYWluID0KICIgICAgICAgIGFsZXJ0KGV2ZW50LmRhdGEpOyIKICIgICAg fTsiCiAifSIKKyIiCisiZnVuY3Rpb24gb3BlbldpbmRvd1RvVVJMKHVybCkgeyIKKyIgICAgd29y a2VyLnBvc3RNZXNzYWdlKHtvcGVuV2luZG93VG9VUkw6IHVybH0pOyIKKyIgICAgbmF2aWdhdG9y LnNlcnZpY2VXb3JrZXIub25tZXNzYWdlID0gKGV2ZW50KSA9PiB7IgorIiAgICAgICAgYWxlcnQo ZXZlbnQuZGF0YSk7IgorIiAgICB9OyIKKyJ9IgogIjwvc2NyaXB0PiJfczsKIAogc3RhdGljIGNv bnN0ZXhwciBhdXRvIFNlcnZpY2VXb3JrZXJXaW5kb3dDbGllbnROYXZpZ2F0ZUpTID0KQEAgLTMx MTEsOSArMzExOSwxOCBAQCBzdGF0aWMgY29uc3RleHByIGF1dG8gU2VydmljZVdvcmtlcldpbmRv d0NsaWVudE5hdmlnYXRlSlMgPQogIiAgICAgICBldmVudC5zb3VyY2UucG9zdE1lc3NhZ2UoY3Vy cmVudENsaWVudHMubGVuZ3RoICsgJyBjbGllbnQocyknKTsiCiAiICAgICAgIHJldHVybjsiCiAi ICAgfSIKKyIgICBpZiAoZXZlbnQuZGF0YSAmJiBldmVudC5kYXRhLm9wZW5XaW5kb3dUb1VSTCkg eyIKKyIgICAgICAgYXdhaXQgc2VsZi5jbGllbnRzLm9wZW5XaW5kb3coZXZlbnQuZGF0YS5vcGVu V2luZG93VG9VUkwpLnRoZW4oKGNsaWVudCkgPT4geyIKKyIgICAgICAgICAgIGV2ZW50LnNvdXJj ZS5wb3N0TWVzc2FnZShjbGllbnQgPyAnY2xpZW50JyA6ICdub25lJyk7IgorIiAgICAgICB9LCAo ZSkgPT4geyIKKyIgICAgICAgICAgIGV2ZW50LnNvdXJjZS5wb3N0TWVzc2FnZSgnZmFpbGVkJyk7 IgorIiAgICAgICB9KTsiCisiICAgICAgIHJldHVybjsiCisiICAgfSIKICJ9KTsiX3M7CiAKLQor c3RhdGljIGJvb2wgc2hvdWxkU2VydmljZVdvcmtlclBTT05OYXZpZ2F0aW9uRGVsZWdhdGVBbGxv d05hdmlnYXRpb24gPSB0cnVlOworc3RhdGljIGJvb2wgc2hvdWxkU2VydmljZVdvcmtlclBTT05O YXZpZ2F0aW9uRGVsZWdhdGVBbGxvd05hdmlnYXRpb25SZXNwb25zZSA9IHRydWU7CiBAaW50ZXJm YWNlIFNlcnZpY2VXb3JrZXJQU09OTmF2aWdhdGlvbkRlbGVnYXRlIDogTlNPYmplY3QgPFdLTmF2 aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZT4gewogICAgIEBwdWJsaWMgdm9pZCAoXmRlY2lkZVBvbGlj eUZvck5hdmlnYXRpb25BY3Rpb24pKFdLTmF2aWdhdGlvbkFjdGlvbiAqLCB2b2lkICheKShXS05h dmlnYXRpb25BY3Rpb25Qb2xpY3kpKTsKICAgICBAcHVibGljIHZvaWQgKF5kaWRTdGFydFByb3Zp c2lvbmFsTmF2aWdhdGlvbkhhbmRsZXIpKCk7CkBAIC0zMTMxLDEyICszMTQ4LDEyIEBAIHN0YXRp YyBjb25zdGV4cHIgYXV0byBTZXJ2aWNlV29ya2VyV2luZG93Q2xpZW50TmF2aWdhdGVKUyA9CiAK IC0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uQWN0aW9uOihXS05hdmlnYXRpb25BY3Rpb24gKiluYXZpZ2F0aW9uQWN0aW9uIGRlY2lz aW9uSGFuZGxlcjoodm9pZCAoXikoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5KSlkZWNpc2lvbkhh bmRsZXIKIHsKLSAgICBkZWNpc2lvbkhhbmRsZXIoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5QWxs b3cpOworICAgIGRlY2lzaW9uSGFuZGxlcihzaG91bGRTZXJ2aWNlV29ya2VyUFNPTk5hdmlnYXRp b25EZWxlZ2F0ZUFsbG93TmF2aWdhdGlvbiA/IFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeUFsbG93 IDogV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5Q2FuY2VsKTsKIH0KIAogLSAodm9pZCl3ZWJWaWV3 OihXS1dlYlZpZXcgKil3ZWJWaWV3IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25SZXNwb25zZToo V0tOYXZpZ2F0aW9uUmVzcG9uc2UgKiluYXZpZ2F0aW9uUmVzcG9uc2UgZGVjaXNpb25IYW5kbGVy Oih2b2lkICheKShXS05hdmlnYXRpb25SZXNwb25zZVBvbGljeSkpZGVjaXNpb25IYW5kbGVyCiB7 Ci0gICAgZGVjaXNpb25IYW5kbGVyKFdLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5QWxsb3cpOwor ICAgIGRlY2lzaW9uSGFuZGxlcihzaG91bGRTZXJ2aWNlV29ya2VyUFNPTk5hdmlnYXRpb25EZWxl Z2F0ZUFsbG93TmF2aWdhdGlvblJlc3BvbnNlID8gV0tOYXZpZ2F0aW9uUmVzcG9uc2VQb2xpY3lB bGxvdyA6IFdLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5Q2FuY2VsKTsKIH0KIAogQGVuZApAQCAt MzE2Niw2ICszMTgzLDggQEAgVEVTVChTZXJ2aWNlV29ya2VyLCBXaW5kb3dDbGllbnROYXZpZ2F0 ZSkKICAgICBUZXN0V2ViS2l0QVBJOjpIVFRQU2VydmVyIHNlcnZlcih7CiAgICAgICAgIHsgIi8i X3MsIHsgU2VydmljZVdvcmtlcldpbmRvd0NsaWVudE5hdmlnYXRlTWFpbiB9IH0sCiAgICAgICAg IHsgIi8/dGVzdCJfcywgeyBTZXJ2aWNlV29ya2VyV2luZG93Q2xpZW50TmF2aWdhdGVNYWluIH0g fSwKKyAgICAgICAgeyAiLz9mYWlsMSJfcywgeyBTZXJ2aWNlV29ya2VyV2luZG93Q2xpZW50TmF2 aWdhdGVNYWluIH0gfSwKKyAgICAgICAgeyAiLz9mYWlsMiJfcywgeyBTZXJ2aWNlV29ya2VyV2lu ZG93Q2xpZW50TmF2aWdhdGVNYWluIH0gfSwKICAgICAgICAgeyAiLz9zd2FwIl9zLCB7IHt7ICJD b250ZW50LVR5cGUiX3MsICJhcHBsaWNhdGlvbi9odG1sIl9zIH0sIHsgIkNyb3NzLU9yaWdpbi1P cGVuZXItUG9saWN5Il9zLCAic2FtZS1vcmlnaW4iX3MgfSB9LCBTZXJ2aWNlV29ya2VyV2luZG93 Q2xpZW50TmF2aWdhdGVNYWluIH0gfSwKICAgICAgICAgeyAiL3N3LmpzIl9zLCB7IHt7ICJDb250 ZW50LVR5cGUiX3MsICJhcHBsaWNhdGlvbi9qYXZhc2NyaXB0Il9zIH19LCBTZXJ2aWNlV29ya2Vy V2luZG93Q2xpZW50TmF2aWdhdGVKUyB9IH0KICAgICB9LCBUZXN0V2ViS2l0QVBJOjpIVFRQU2Vy dmVyOjpQcm90b2NvbDo6SHR0cCwgbnVsbHB0ciwgbnVsbHB0ciwgODA5MSk7CkBAIC0zMTk0LDYg KzMyMTMsMTkgQEAgVEVTVChTZXJ2aWNlV29ya2VyLCBXaW5kb3dDbGllbnROYXZpZ2F0ZSkKIAog ICAgIFt3ZWJWaWV3MSBldmFsdWF0ZUphdmFTY3JpcHQ6QCJjb3VudFNlcnZpY2VXb3JrZXJDbGll bnRzKCkiIGNvbXBsZXRpb25IYW5kbGVyOiBuaWxdOwogICAgIEVYUEVDVF9XS19TVFJFUShbd2Vi VmlldzEgX3Rlc3Rfd2FpdEZvckFsZXJ0XSwgIjEgY2xpZW50KHMpIik7CisKKyAgICBzaG91bGRT ZXJ2aWNlV29ya2VyUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZUFsbG93TmF2aWdhdGlvbiA9IGZhbHNl OworICAgIHNob3VsZFNlcnZpY2VXb3JrZXJQU09OTmF2aWdhdGlvbkRlbGVnYXRlQWxsb3dOYXZp Z2F0aW9uUmVzcG9uc2UgPSB0cnVlOworICAgIFt3ZWJWaWV3MSBldmFsdWF0ZUphdmFTY3JpcHQ6 W05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJuYXZpZ2F0ZU90aGVyQ2xpZW50VG9VUkwoJyVA P2ZhaWwxJykiLCBiYXNlVVJMXSBjb21wbGV0aW9uSGFuZGxlcjogbmlsXTsKKyAgICBFWFBFQ1Rf V0tfU1RSRVEoW3dlYlZpZXcxIF90ZXN0X3dhaXRGb3JBbGVydF0sICJub25lIik7CisKKyAgICBz aG91bGRTZXJ2aWNlV29ya2VyUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZUFsbG93TmF2aWdhdGlvbiA9 IHRydWU7CisgICAgc2hvdWxkU2VydmljZVdvcmtlclBTT05OYXZpZ2F0aW9uRGVsZWdhdGVBbGxv d05hdmlnYXRpb25SZXNwb25zZSA9IGZhbHNlOworICAgIFt3ZWJWaWV3MSBldmFsdWF0ZUphdmFT Y3JpcHQ6W05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJuYXZpZ2F0ZU90aGVyQ2xpZW50VG9V UkwoJyVAP2ZhaWwyJykiLCBiYXNlVVJMXSBjb21wbGV0aW9uSGFuZGxlcjogbmlsXTsKKyAgICBF WFBFQ1RfV0tfU1RSRVEoW3dlYlZpZXcxIF90ZXN0X3dhaXRGb3JBbGVydF0sICJub25lIik7CisK KyAgICBzaG91bGRTZXJ2aWNlV29ya2VyUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZUFsbG93TmF2aWdh dGlvbiA9IHRydWU7CisgICAgc2hvdWxkU2VydmljZVdvcmtlclBTT05OYXZpZ2F0aW9uRGVsZWdh dGVBbGxvd05hdmlnYXRpb25SZXNwb25zZSA9IHRydWU7CiB9CiAKIFRFU1QoU2VydmljZVdvcmtl ciwgV2luZG93Q2xpZW50TmF2aWdhdGVDcm9zc09yaWdpbikKQEAgLTMyMzEsMyArMzI2MywxMjEg QEAgVEVTVChTZXJ2aWNlV29ya2VyLCBXaW5kb3dDbGllbnROYXZpZ2F0ZUNyb3NzT3JpZ2luKQog ICAgIFt3ZWJWaWV3MSBldmFsdWF0ZUphdmFTY3JpcHQ6W05TU3RyaW5nIHN0cmluZ1dpdGhGb3Jt YXQ6QCJuYXZpZ2F0ZU90aGVyQ2xpZW50VG9VUkwoJyVAJykiLCBbW3NlcnZlcjIucmVxdWVzdCgp IFVSTF0gYWJzb2x1dGVTdHJpbmddXSBjb21wbGV0aW9uSGFuZGxlcjogbmlsXTsKICAgICBFWFBF Q1RfV0tfU1RSRVEoW3dlYlZpZXcxIF90ZXN0X3dhaXRGb3JBbGVydF0sICJub25lIik7CiB9CisK K0BpbnRlcmZhY2UgU2VydmljZVdvcmtlck9wZW5XaW5kb3dXZWJzaXRlRGF0YVN0b3JlRGVsZWdh dGU6IE5TT2JqZWN0IDxfV0tXZWJzaXRlRGF0YVN0b3JlRGVsZWdhdGU+IHsKK0Bwcml2YXRlCisg ICAgV0tXZWJWaWV3Q29uZmlndXJhdGlvbiogX2NvbmZpZ3VyYXRpb247CisgICAgUmV0YWluUHRy PFNlcnZpY2VXb3JrZXJQU09OTmF2aWdhdGlvbkRlbGVnYXRlPiBfbmF2aWdhdGlvbkRlbGVnYXRl OworICAgIFJldGFpblB0cjxUZXN0V0tXZWJWaWV3PiBfd2ViVmlldzsKK30KKy0gKGluc3RhbmNl dHlwZSlpbml0V2l0aENvbmZpZ3VyYXRpb246KFdLV2ViVmlld0NvbmZpZ3VyYXRpb24qKWNvbmZp Z3VyYXRpb247CitAZW5kCisKK0BpbXBsZW1lbnRhdGlvbiBTZXJ2aWNlV29ya2VyT3BlbldpbmRv d1dlYnNpdGVEYXRhU3RvcmVEZWxlZ2F0ZSB7IH0KKy0gKGluc3RhbmNldHlwZSlpbml0V2l0aENv bmZpZ3VyYXRpb246KFdLV2ViVmlld0NvbmZpZ3VyYXRpb24qKWNvbmZpZ3VyYXRpb24KK3sKKyAg ICBfY29uZmlndXJhdGlvbiA9IGNvbmZpZ3VyYXRpb247CisgICAgcmV0dXJuIHNlbGY7Cit9CisK Ky0gKHZvaWQpd2Vic2l0ZURhdGFTdG9yZTooV0tXZWJzaXRlRGF0YVN0b3JlICopZGF0YVN0b3Jl IG9wZW5XaW5kb3c6KE5TVVJMICopdXJsIGZyb21TZXJ2aWNlV29ya2VyT3JpZ2luOihXS1NlY3Vy aXR5T3JpZ2luICopc2VydmljZVdvcmtlck9yaWdpbiBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAo XikoV0tXZWJWaWV3ICpuZXdXZWJWaWV3KSljb21wbGV0aW9uSGFuZGxlcgoreworICAgIF9uYXZp Z2F0aW9uRGVsZWdhdGUgPSBhZG9wdE5TKFtbU2VydmljZVdvcmtlclBTT05OYXZpZ2F0aW9uRGVs ZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBfd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJW aWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgMzAwLCAzMDApIGNvbmZp Z3VyYXRpb246X2NvbmZpZ3VyYXRpb24gYWRkVG9XaW5kb3c6WUVTXSk7CisgICAgW193ZWJWaWV3 IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpfbmF2aWdhdGlvbkRlbGVnYXRlLmdldCgpXTsKKworICAg IFtfd2ViVmlldyBsb2FkUmVxdWVzdDpbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOnVybF1d OworICAgIGNvbXBsZXRpb25IYW5kbGVyKF93ZWJWaWV3LmdldCgpKTsKK30KKworQGVuZAorCitU RVNUKFNlcnZpY2VXb3JrZXIsIE9wZW5XaW5kb3dXZWJzaXRlRGF0YVN0b3JlRGVsZWdhdGUpCit7 CisgICAgW1dLV2Vic2l0ZURhdGFTdG9yZSBfYWxsb3dXZWJzaXRlRGF0YVJlY29yZHNGb3JBbGxP cmlnaW5zXTsKKworICAgIC8vIFN0YXJ0IHdpdGggYSBjbGVhbiBzbGF0ZSBkYXRhIHN0b3JlCisg ICAgW1tXS1dlYnNpdGVEYXRhU3RvcmUgZGVmYXVsdERhdGFTdG9yZV0gcmVtb3ZlRGF0YU9mVHlw ZXM6W1dLV2Vic2l0ZURhdGFTdG9yZSBhbGxXZWJzaXRlRGF0YVR5cGVzXSBtb2RpZmllZFNpbmNl OltOU0RhdGUgZGlzdGFudFBhc3RdIGNvbXBsZXRpb25IYW5kbGVyOl4oKSB7CisgICAgICAgIGRv bmUgPSB0cnVlOworICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7 CisgICAgZG9uZSA9IGZhbHNlOworCisgICAgYXV0byBjb25maWd1cmF0aW9uID0gYWRvcHROUyhb W1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKworICAgIGF1dG8gcHJlZmVy ZW5jZXMgPSBbY29uZmlndXJhdGlvbiBwcmVmZXJlbmNlc107CisgICAgZm9yIChfV0tJbnRlcm5h bERlYnVnRmVhdHVyZSAqZmVhdHVyZSBpbiBbV0tQcmVmZXJlbmNlcyBfaW50ZXJuYWxEZWJ1Z0Zl YXR1cmVzXSkgeworICAgICAgICBpZiAoW2ZlYXR1cmUua2V5IGlzRXF1YWxUb1N0cmluZzpAIlNl cnZpY2VXb3JrZXJzVXNlckdlc3R1cmVFbmFibGVkIl0pCisgICAgICAgICAgICBbcHJlZmVyZW5j ZXMgX3NldEVuYWJsZWQ6Tk8gZm9ySW50ZXJuYWxEZWJ1Z0ZlYXR1cmU6ZmVhdHVyZV07CisgICAg fQorCisgICAgYXV0byBkYXRhU3RvcmVEZWxlZ2F0ZSA9IGFkb3B0TlMoW1tTZXJ2aWNlV29ya2Vy T3BlbldpbmRvd1dlYnNpdGVEYXRhU3RvcmVEZWxlZ2F0ZSBhbGxvY10gaW5pdFdpdGhDb25maWd1 cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICBbW2NvbmZpZ3VyYXRpb24gd2Vic2l0 ZURhdGFTdG9yZV0gc2V0X2RlbGVnYXRlOmRhdGFTdG9yZURlbGVnYXRlLmdldCgpXTsKKworICAg IGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZy YW1lOk5TTWFrZVJlY3QoMCwgMCwgMzAwLCAzMDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlv bi5nZXQoKSBhZGRUb1dpbmRvdzpZRVNdKTsKKworICAgIFRlc3RXZWJLaXRBUEk6OkhUVFBTZXJ2 ZXIgc2VydmVyKHsKKyAgICAgICAgeyAiLyJfcywgeyBTZXJ2aWNlV29ya2VyV2luZG93Q2xpZW50 TmF2aWdhdGVNYWluIH0gfSwKKyAgICAgICAgeyAiL3N3LmpzIl9zLCB7IHt7ICJDb250ZW50LVR5 cGUiX3MsICJhcHBsaWNhdGlvbi9qYXZhc2NyaXB0Il9zIH19LCBTZXJ2aWNlV29ya2VyV2luZG93 Q2xpZW50TmF2aWdhdGVKUyB9IH0KKyAgICB9LCBUZXN0V2ViS2l0QVBJOjpIVFRQU2VydmVyOjpQ cm90b2NvbDo6SHR0cCwgbnVsbHB0ciwgbnVsbHB0ciwgODA5MSk7CisKKyAgICBbd2ViVmlldyBs b2FkUmVxdWVzdDpzZXJ2ZXIucmVxdWVzdCgpXTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoW3dlYlZp ZXcgX3Rlc3Rfd2FpdEZvckFsZXJ0XSwgInN1Y2Nlc3NmdWxseSByZWdpc3RlcmVkIik7CisKKyAg ICBzaG91bGRTZXJ2aWNlV29ya2VyUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZUFsbG93TmF2aWdhdGlv biA9IHRydWU7CisgICAgc2hvdWxkU2VydmljZVdvcmtlclBTT05OYXZpZ2F0aW9uRGVsZWdhdGVB bGxvd05hdmlnYXRpb25SZXNwb25zZSA9IHRydWU7CisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZh U2NyaXB0OltOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAib3BlbldpbmRvd1RvVVJMKCclQCcp IiwgW1tzZXJ2ZXIucmVxdWVzdCgpIFVSTF0gYWJzb2x1dGVTdHJpbmddXSBjb21wbGV0aW9uSGFu ZGxlcjogbmlsXTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoW3dlYlZpZXcgX3Rlc3Rfd2FpdEZvckFs ZXJ0XSwgImNsaWVudCIpOworCisgICAgc2hvdWxkU2VydmljZVdvcmtlclBTT05OYXZpZ2F0aW9u RGVsZWdhdGVBbGxvd05hdmlnYXRpb24gPSBmYWxzZTsKKyAgICBzaG91bGRTZXJ2aWNlV29ya2Vy UFNPTk5hdmlnYXRpb25EZWxlZ2F0ZUFsbG93TmF2aWdhdGlvblJlc3BvbnNlID0gdHJ1ZTsKKyAg ICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6W05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6 QCJvcGVuV2luZG93VG9VUkwoJyVAJykiLCBbW3NlcnZlci5yZXF1ZXN0KCkgVVJMXSBhYnNvbHV0 ZVN0cmluZ11dIGNvbXBsZXRpb25IYW5kbGVyOiBuaWxdOworICAgIEVYUEVDVF9XS19TVFJFUShb d2ViVmlldyBfdGVzdF93YWl0Rm9yQWxlcnRdLCAibm9uZSIpOworCisgICAgc2hvdWxkU2Vydmlj ZVdvcmtlclBTT05OYXZpZ2F0aW9uRGVsZWdhdGVBbGxvd05hdmlnYXRpb24gPSB0cnVlOworICAg IHNob3VsZFNlcnZpY2VXb3JrZXJQU09OTmF2aWdhdGlvbkRlbGVnYXRlQWxsb3dOYXZpZ2F0aW9u UmVzcG9uc2UgPSBmYWxzZTsKKyAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6W05TU3Ry aW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJvcGVuV2luZG93VG9VUkwoJyVAJykiLCBbW3NlcnZlci5y ZXF1ZXN0KCkgVVJMXSBhYnNvbHV0ZVN0cmluZ11dIGNvbXBsZXRpb25IYW5kbGVyOiBuaWxdOwor ICAgIEVYUEVDVF9XS19TVFJFUShbd2ViVmlldyBfdGVzdF93YWl0Rm9yQWxlcnRdLCAibm9uZSIp OworCisgICAgc2hvdWxkU2VydmljZVdvcmtlclBTT05OYXZpZ2F0aW9uRGVsZWdhdGVBbGxvd05h dmlnYXRpb24gPSB0cnVlOworICAgIHNob3VsZFNlcnZpY2VXb3JrZXJQU09OTmF2aWdhdGlvbkRl bGVnYXRlQWxsb3dOYXZpZ2F0aW9uUmVzcG9uc2UgPSB0cnVlOworfQorCitURVNUKFNlcnZpY2VX b3JrZXIsIE9wZW5XaW5kb3dDT09QKQoreworICAgIFtXS1dlYnNpdGVEYXRhU3RvcmUgX2FsbG93 V2Vic2l0ZURhdGFSZWNvcmRzRm9yQWxsT3JpZ2luc107CisKKyAgICAvLyBTdGFydCB3aXRoIGEg Y2xlYW4gc2xhdGUgZGF0YSBzdG9yZQorICAgIFtbV0tXZWJzaXRlRGF0YVN0b3JlIGRlZmF1bHRE YXRhU3RvcmVdIHJlbW92ZURhdGFPZlR5cGVzOltXS1dlYnNpdGVEYXRhU3RvcmUgYWxsV2Vic2l0 ZURhdGFUeXBlc10gbW9kaWZpZWRTaW5jZTpbTlNEYXRlIGRpc3RhbnRQYXN0XSBjb21wbGV0aW9u SGFuZGxlcjpeKCkgeworICAgICAgICBkb25lID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBUZXN0V2Vi S2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKworICAgIGF1dG8g Y29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBp bml0XSk7CisKKyAgICBhdXRvIHByZWZlcmVuY2VzID0gW2NvbmZpZ3VyYXRpb24gcHJlZmVyZW5j ZXNdOworICAgIGZvciAoX1dLSW50ZXJuYWxEZWJ1Z0ZlYXR1cmUgKmZlYXR1cmUgaW4gW1dLUHJl ZmVyZW5jZXMgX2ludGVybmFsRGVidWdGZWF0dXJlc10pIHsKKyAgICAgICAgaWYgKFtmZWF0dXJl LmtleSBpc0VxdWFsVG9TdHJpbmc6QCJTZXJ2aWNlV29ya2Vyc1VzZXJHZXN0dXJlRW5hYmxlZCJd KQorICAgICAgICAgICAgW3ByZWZlcmVuY2VzIF9zZXRFbmFibGVkOk5PIGZvckludGVybmFsRGVi dWdGZWF0dXJlOmZlYXR1cmVdOworICAgIH0KKworICAgIGF1dG8gZGF0YVN0b3JlRGVsZWdhdGUg PSBhZG9wdE5TKFtbU2VydmljZVdvcmtlck9wZW5XaW5kb3dXZWJzaXRlRGF0YVN0b3JlRGVsZWdh dGUgYWxsb2NdIGluaXRXaXRoQ29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpXSk7Cisg ICAgW1tjb25maWd1cmF0aW9uIHdlYnNpdGVEYXRhU3RvcmVdIHNldF9kZWxlZ2F0ZTpkYXRhU3Rv cmVEZWxlZ2F0ZS5nZXQoKV07CisKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbVGVzdFdL V2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDMwMCwgMzAwKSBj b25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCkgYWRkVG9XaW5kb3c6WUVTXSk7CisKKyAg ICBUZXN0V2ViS2l0QVBJOjpIVFRQU2VydmVyIHNlcnZlcih7CisgICAgICAgIHsgIi8iX3MsIHsg U2VydmljZVdvcmtlcldpbmRvd0NsaWVudE5hdmlnYXRlTWFpbiB9IH0sCisgICAgICAgIHsgIi9z dy5qcyJfcywgeyB7eyAiQ29udGVudC1UeXBlIl9zLCAiYXBwbGljYXRpb24vamF2YXNjcmlwdCJf cyB9fSwgU2VydmljZVdvcmtlcldpbmRvd0NsaWVudE5hdmlnYXRlSlMgfSB9LAorICAgICAgICB7 ICIvP3N3YXAiX3MsIHsge3sgIkNvbnRlbnQtVHlwZSJfcywgImFwcGxpY2F0aW9uL2h0bWwiX3Mg fSwgeyAiQ3Jvc3MtT3JpZ2luLU9wZW5lci1Qb2xpY3kiX3MsICJzYW1lLW9yaWdpbiJfcyB9IH0s IFNlcnZpY2VXb3JrZXJXaW5kb3dDbGllbnROYXZpZ2F0ZU1haW4gfSB9CisgICAgfSwgVGVzdFdl YktpdEFQSTo6SFRUUFNlcnZlcjo6UHJvdG9jb2w6Okh0dHAsIG51bGxwdHIsIG51bGxwdHIsIDgw OTEpOworCisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6c2VydmVyLnJlcXVlc3QoKV07CisgICAg RVhQRUNUX1dLX1NUUkVRKFt3ZWJWaWV3IF90ZXN0X3dhaXRGb3JBbGVydF0sICJzdWNjZXNzZnVs bHkgcmVnaXN0ZXJlZCIpOworCisgICAgc2hvdWxkU2VydmljZVdvcmtlclBTT05OYXZpZ2F0aW9u RGVsZWdhdGVBbGxvd05hdmlnYXRpb24gPSB0cnVlOworICAgIHNob3VsZFNlcnZpY2VXb3JrZXJQ U09OTmF2aWdhdGlvbkRlbGVnYXRlQWxsb3dOYXZpZ2F0aW9uUmVzcG9uc2UgPSB0cnVlOworICAg IFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpA Im9wZW5XaW5kb3dUb1VSTCgnJUA/c3dhcCcpIiwgW1tzZXJ2ZXIucmVxdWVzdCgpIFVSTF0gYWJz b2x1dGVTdHJpbmddXSBjb21wbGV0aW9uSGFuZGxlcjogbmlsXTsKKyAgICBFWFBFQ1RfV0tfU1RS RVEoW3dlYlZpZXcgX3Rlc3Rfd2FpdEZvckFsZXJ0XSwgImNsaWVudCIpOworfQo=