179774 2017-11-16 09:10:14 -0800 Make sure service workers get terminated between tests 2017-11-16 18:33:19 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=179748 InRadar P2 Normal --- 1 cdumez cdumez achristensen beidson commit-queue ggaren webkit-bug-importer youennf oldest_to_newest 1372639 0 cdumez 2017-11-16 09:10:14 -0800 Make sure service workers get terminated between tests. 1372749 1 327093 cdumez 2017-11-16 12:07:06 -0800 Created attachment 327093 Patch 1372763 2 327093 beidson 2017-11-16 12:32:49 -0800 Comment on attachment 327093 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=327093&action=review > Source/WebCore/workers/service/server/SWServerJobQueue.cpp:52 > + clearRegistration(*registration); What is the intended side effect of clearRegistration? Is this what is called when a WebPage actually clears its service worker? If so, this patch would have the side effect of clearing *persistent* registrations too, and we don't want to do this between tests. 1372775 3 327099 cdumez 2017-11-16 13:18:50 -0800 Created attachment 327099 Patch 1372944 4 327099 commit-queue 2017-11-16 18:32:16 -0800 Comment on attachment 327099 Patch Clearing flags on attachment: 327099 Committed r224955: <https://trac.webkit.org/changeset/224955> 1372945 5 commit-queue 2017-11-16 18:32:17 -0800 All reviewed patches have been landed. Closing bug. 1372946 6 webkit-bug-importer 2017-11-16 18:33:19 -0800 <rdar://problem/35605947> 327093 2017-11-16 12:07:06 -0800 2017-11-16 13:18:49 -0800 Patch bug-179774-20171116120706.patch text/plain 3451 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0OTI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWRhMmZlYTFmOGVkYWE1 NjNjMzAzNWNiMWYwNGJlYzQzMGY3NTRlOC4uYzQ1MWE4YTNiYTI3ZDczY2VhZjk3ZjAzYmFjZTZk MGFmNWE2MjZkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE3LTExLTE2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBzdXJlIHNlcnZpY2Ug d29ya2VycyBnZXQgdGVybWluYXRlZCBiZXR3ZWVuIHRlc3RzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzk3NzQKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIHN1cmUgc2VydmljZSB3b3JrZXJzIGdl dCB0ZXJtaW5hdGVkIGJldHdlZW4gdGVzdHMuIFByZXZpb3VzbHksIHdlCisgICAgICAgIHdvdWxk IG1lcmVseSBjbGVhciBhbGwgcmVnaXN0cmF0aW9ucyBhbmQgam9iIHF1ZXVlcyBidXQgaXQgd291 bGQgbm90CisgICAgICAgIGNhdXNlIHRoZSByZWdpc3RyYXRpb25zJyBzZXJ2aWNlIHdvcmtlcnMg dG8gZ2V0IHRlcm1pbmF0ZWQuCisKKyAgICAgICAgKiB3b3JrZXJzL3NlcnZpY2UvY29udGV4dC9T ZXJ2aWNlV29ya2VyVGhyZWFkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJU aHJlYWQ6OnVwZGF0ZUV4dGVuZGVkRXZlbnRzU2V0KToKKyAgICAgICAgKiB3b3JrZXJzL3NlcnZp Y2Uvc2VydmVyL1NXU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNXU2VydmVyOjpjbGVh ckFsbCk6CisgICAgICAgICogd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlckpvYlF1ZXVl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNXU2VydmVySm9iUXVldWU6On5TV1NlcnZlckpvYlF1 ZXVlKToKKwogMjAxNy0xMS0xNiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAg ICAgICAgIERpc3BhdGNoaW5nIGFuIGV2ZW50IG9uIGEgU2VydmljZVdvcmtlciBtYXkgZmFpbCBv ciBjcmFzaCBkdWUgdG8gR0MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2Vy dmljZS9jb250ZXh0L1NlcnZpY2VXb3JrZXJUaHJlYWQuY3BwIGIvU291cmNlL1dlYkNvcmUvd29y a2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlclRocmVhZC5jcHAKaW5kZXggMWJlYWU5 ZmFiMTQ4MTYyYzYzZWE3NzI4OWYzZDVjOWYwZmY0YTUxZi4uOGFhZmYzMTE4OGM0MjY1YzFkNGEw NjliNzc5NzhiYjgwMGEzMDY5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9z ZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlclRocmVhZC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvd29ya2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlclRocmVhZC5jcHAKQEAgLTE3 NSw2ICsxNzUsOSBAQCB2b2lkIFNlcnZpY2VXb3JrZXJUaHJlYWQ6OnVwZGF0ZUV4dGVuZGVkRXZl bnRzU2V0KEV4dGVuZGFibGVFdmVudCogbmV3RXZlbnQpCiAgICAgICAgIG5ld0V2ZW50LT53aGVu QWxsRXh0ZW5kTGlmZXRpbWVQcm9taXNlc0FyZVNldHRsZWQoW3RoaXNdKGF1dG8mJikgewogICAg ICAgICAgICAgdXBkYXRlRXh0ZW5kZWRFdmVudHNTZXQoKTsKICAgICAgICAgfSk7CisgICAgICAg IC8vIENsZWFyIG91dCB0aGUgZXZlbnQncyB0YXJnZXQgYXMgaXQgaXMgdGhlIFdvcmtlckdsb2Jh bFNjb3BlIGFuZCB3ZSBkbyBub3Qgd2FudCB0byBrZWVwIGl0CisgICAgICAgIC8vIGFsaXZlIHVu bmVjZXNzYXJpbHkuCisgICAgICAgIG5ld0V2ZW50LT5zZXRUYXJnZXQobnVsbHB0cik7CiAgICAg fQogCiAgICAgYm9vbCBoYXNQZW5kaW5nRXZlbnRzID0gdGhpcy0+aGFzUGVuZGluZ0V2ZW50cygp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1Nl cnZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVy LmNwcAppbmRleCA0ZWMxOWMyYWE3MDc3ZGI4N2QxNzMzYTg4ODY3M2I3Yzk3ODg0NmEyLi5kZDE4 N2FjZTliMTgyOTU3NGZmMzc4NzU5ZmJkZmI0YjIyNGRmMjc3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyLmNwcApAQCAtMTMwLDkgKzEz MCw4IEBAIFZlY3RvcjxTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGF0YT4gU1dTZXJ2ZXI6Omdl dFJlZ2lzdHJhdGlvbnMoY29uc3QgU2VjdXJpdHlPCiB2b2lkIFNXU2VydmVyOjpjbGVhckFsbCgp CiB7CiAgICAgbV9qb2JRdWV1ZXMuY2xlYXIoKTsKLSAgICBtX3JlZ2lzdHJhdGlvbnMuY2xlYXIo KTsKKyAgICBBU1NFUlQobV9yZWdpc3RyYXRpb25zLmlzRW1wdHkoKSk7CiAgICAgbV9vcmlnaW5T dG9yZS0+Y2xlYXJBbGwoKTsKLSAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIHByb2JhYmx5IGFzayBz ZXJ2aWNlIHdvcmtlcnMgdG8gdGVybWluYXRlLgogfQogCiB2b2lkIFNXU2VydmVyOjpjbGVhcihj b25zdCBTZWN1cml0eU9yaWdpbiYgb3JpZ2luKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv d29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlckpvYlF1ZXVlLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJKb2JRdWV1ZS5jcHAKaW5kZXggOWZl ZmExMjdjODEyYWY0YWQ0YjU0NjRlZjBhMmVhZjI3OWFhYzE2YS4uMTI5NTI4OGFkYWM4MDA5MzNk ZTc1YmIzYjU2NmJhZGMwMDg1MzZiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vy cy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlckpvYlF1ZXVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVySm9iUXVldWUuY3BwCkBAIC00OCw2ICs0 OCw4IEBAIFNXU2VydmVySm9iUXVldWU6OlNXU2VydmVySm9iUXVldWUoU1dTZXJ2ZXImIHNlcnZl ciwgY29uc3QgU2VydmljZVdvcmtlclJlZ2lzdHJhCiAKIFNXU2VydmVySm9iUXVldWU6On5TV1Nl cnZlckpvYlF1ZXVlKCkKIHsKKyAgICBpZiAoYXV0byogcmVnaXN0cmF0aW9uID0gbV9zZXJ2ZXIu Z2V0UmVnaXN0cmF0aW9uKG1fcmVnaXN0cmF0aW9uS2V5KSkKKyAgICAgICAgY2xlYXJSZWdpc3Ry YXRpb24oKnJlZ2lzdHJhdGlvbik7CiB9CiAKIHZvaWQgU1dTZXJ2ZXJKb2JRdWV1ZTo6c2NyaXB0 RmV0Y2hGaW5pc2hlZChTV1NlcnZlcjo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbiwgY29uc3QgU2Vy dmljZVdvcmtlckZldGNoUmVzdWx0JiByZXN1bHQpCg== 327099 2017-11-16 13:18:50 -0800 2017-11-16 18:32:16 -0800 Patch bug-179774-20171116131850.patch text/plain 7063 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0OTM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzZhYmU5NTMyZGFkNGYx M2NjMzJkNDQyYTY2YWUxMWFhNGVlYTE2MS4uOWFhZDgyNTExY2U4NDQyZTlhNzZjNTk4YjBlOTk3 ZmYyNjlkYjU0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE3LTExLTE2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBzdXJlIHNlcnZpY2Ug d29ya2VycyBnZXQgdGVybWluYXRlZCBiZXR3ZWVuIHRlc3RzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzk3NzQKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIHN1cmUgc2VydmljZSB3b3JrZXJzIGdl dCB0ZXJtaW5hdGVkIGJldHdlZW4gdGVzdHMuIFByZXZpb3VzbHksIHdlCisgICAgICAgIHdvdWxk IG1lcmVseSBjbGVhciBhbGwgcmVnaXN0cmF0aW9ucyBhbmQgam9iIHF1ZXVlcyBidXQgaXQgd291 bGQgbm90CisgICAgICAgIGNhdXNlIHRoZSByZWdpc3RyYXRpb25zJyBzZXJ2aWNlIHdvcmtlcnMg dG8gZ2V0IHRlcm1pbmF0ZWQuCisKKyAgICAgICAgKiB3b3JrZXJzL3NlcnZpY2UvY29udGV4dC9T ZXJ2aWNlV29ya2VyVGhyZWFkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJU aHJlYWQ6OnVwZGF0ZUV4dGVuZGVkRXZlbnRzU2V0KToKKyAgICAgICAgKiB3b3JrZXJzL3NlcnZp Y2Uvc2VydmVyL1NXU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNXU2VydmVyOjpjbGVh ckFsbCk6CisgICAgICAgICogd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlckpvYlF1ZXVl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNXU2VydmVySm9iUXVldWU6OnNjcmlwdEZldGNoRmlu aXNoZWQpOgorICAgICAgICAoV2ViQ29yZTo6U1dTZXJ2ZXJKb2JRdWV1ZTo6c2NyaXB0Q29udGV4 dEZhaWxlZFRvU3RhcnQpOgorICAgICAgICAoV2ViQ29yZTo6U1dTZXJ2ZXJKb2JRdWV1ZTo6ZGlk RmluaXNoSW5zdGFsbCk6CisgICAgICAgIChXZWJDb3JlOjpTV1NlcnZlckpvYlF1ZXVlOjp0cnlD bGVhclJlZ2lzdHJhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpTV1NlcnZlckpvYlF1ZXVlOjpj bGVhclJlZ2lzdHJhdGlvbik6CisgICAgICAgICogd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1Nl cnZlckpvYlF1ZXVlLmg6CisKIDIwMTctMTEtMTYgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQGFw cGxlLmNvbT4KIAogICAgICAgICBDbGVhbiB1cCBLZXlmcmFtZUVmZmVjdApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlclRocmVh ZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2aWNlV29y a2VyVGhyZWFkLmNwcAppbmRleCAxYmVhZTlmYWIxNDgxNjJjNjNlYTc3Mjg5ZjNkNWM5ZjBmZjRh NTFmLi44YWFmZjMxMTg4YzQyNjVjMWQ0YTA2OWI3Nzk3OGJiODAwYTMwNjk3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2aWNlV29ya2VyVGhy ZWFkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2 aWNlV29ya2VyVGhyZWFkLmNwcApAQCAtMTc1LDYgKzE3NSw5IEBAIHZvaWQgU2VydmljZVdvcmtl clRocmVhZDo6dXBkYXRlRXh0ZW5kZWRFdmVudHNTZXQoRXh0ZW5kYWJsZUV2ZW50KiBuZXdFdmVu dCkKICAgICAgICAgbmV3RXZlbnQtPndoZW5BbGxFeHRlbmRMaWZldGltZVByb21pc2VzQXJlU2V0 dGxlZChbdGhpc10oYXV0byYmKSB7CiAgICAgICAgICAgICB1cGRhdGVFeHRlbmRlZEV2ZW50c1Nl dCgpOwogICAgICAgICB9KTsKKyAgICAgICAgLy8gQ2xlYXIgb3V0IHRoZSBldmVudCdzIHRhcmdl dCBhcyBpdCBpcyB0aGUgV29ya2VyR2xvYmFsU2NvcGUgYW5kIHdlIGRvIG5vdCB3YW50IHRvIGtl ZXAgaXQKKyAgICAgICAgLy8gYWxpdmUgdW5uZWNlc3NhcmlseS4KKyAgICAgICAgbmV3RXZlbnQt PnNldFRhcmdldChudWxscHRyKTsKICAgICB9CiAKICAgICBib29sIGhhc1BlbmRpbmdFdmVudHMg PSB0aGlzLT5oYXNQZW5kaW5nRXZlbnRzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93 b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtl cnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXIuY3BwCmluZGV4IDRlYzE5YzJhYTcwNzdkYjg3ZDE3 MzNhODg4NjczYjdjOTc4ODQ2YTIuLjE3MmExM2ViNTQ4ZTYxNWYyYmQ5ZTM2OTk2NDE0MWQ5NTcy YzAxYzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIv U1dTZXJ2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIv U1dTZXJ2ZXIuY3BwCkBAIC0xMzAsOSArMTMwLDkgQEAgVmVjdG9yPFNlcnZpY2VXb3JrZXJSZWdp c3RyYXRpb25EYXRhPiBTV1NlcnZlcjo6Z2V0UmVnaXN0cmF0aW9ucyhjb25zdCBTZWN1cml0eU8K IHZvaWQgU1dTZXJ2ZXI6OmNsZWFyQWxsKCkKIHsKICAgICBtX2pvYlF1ZXVlcy5jbGVhcigpOwot ICAgIG1fcmVnaXN0cmF0aW9ucy5jbGVhcigpOworICAgIHdoaWxlICghbV9yZWdpc3RyYXRpb25z LmlzRW1wdHkoKSkKKyAgICAgICAgU1dTZXJ2ZXJKb2JRdWV1ZTo6Y2xlYXJSZWdpc3RyYXRpb24o KnRoaXMsICptX3JlZ2lzdHJhdGlvbnMuYmVnaW4oKS0+dmFsdWUpOwogICAgIG1fb3JpZ2luU3Rv cmUtPmNsZWFyQWxsKCk7Ci0gICAgLy8gRklYTUU6IFdlIHNob3VsZCBwcm9iYWJseSBhc2sgc2Vy dmljZSB3b3JrZXJzIHRvIHRlcm1pbmF0ZS4KIH0KIAogdm9pZCBTV1NlcnZlcjo6Y2xlYXIoY29u c3QgU2VjdXJpdHlPcmlnaW4mIG9yaWdpbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dv cmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJKb2JRdWV1ZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVySm9iUXVldWUuY3BwCmluZGV4IDlmZWZh MTI3YzgxMmFmNGFkNGI1NDY0ZWYwYTJlYWYyNzlhYWMxNmEuLmMxMWY5Nzg4NTMxMTdkYzExZTNh MGE4YmQxZmVmZDc0YzNlYzM1ZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMv c2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJKb2JRdWV1ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv d29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlckpvYlF1ZXVlLmNwcApAQCAtNjYsNyArNjYs NyBAQCB2b2lkIFNXU2VydmVySm9iUXVldWU6OnNjcmlwdEZldGNoRmluaXNoZWQoU1dTZXJ2ZXI6 OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIGNvbgogCiAgICAgICAgIC8vIElmIG5ld2VzdFdvcmtl ciBpcyBudWxsLCBpbnZva2UgQ2xlYXIgUmVnaXN0cmF0aW9uIGFsZ29yaXRobSBwYXNzaW5nIHJl Z2lzdHJhdGlvbiBhcyBpdHMgYXJndW1lbnQuCiAgICAgICAgIGlmICghbmV3ZXN0V29ya2VyKQot ICAgICAgICAgICAgY2xlYXJSZWdpc3RyYXRpb24oKnJlZ2lzdHJhdGlvbik7CisgICAgICAgICAg ICBjbGVhclJlZ2lzdHJhdGlvbihtX3NlcnZlciwgKnJlZ2lzdHJhdGlvbik7CiAKICAgICAgICAg Ly8gSW52b2tlIEZpbmlzaCBKb2Igd2l0aCBqb2IgYW5kIGFib3J0IHRoZXNlIHN0ZXBzLgogICAg ICAgICBmaW5pc2hDdXJyZW50Sm9iKCk7CkBAIC05NSw3ICs5NSw3IEBAIHZvaWQgU1dTZXJ2ZXJK b2JRdWV1ZTo6c2NyaXB0Q29udGV4dEZhaWxlZFRvU3RhcnQoU2VydmljZVdvcmtlcklkZW50aWZp ZXIsIGNvbnN0CiAKICAgICAvLyBJZiBuZXdlc3RXb3JrZXIgaXMgbnVsbCwgaW52b2tlIENsZWFy IFJlZ2lzdHJhdGlvbiBhbGdvcml0aG0gcGFzc2luZyByZWdpc3RyYXRpb24gYXMgaXRzIGFyZ3Vt ZW50LgogICAgIGlmICghcmVnaXN0cmF0aW9uLT5nZXROZXdlc3RXb3JrZXIoKSkKLSAgICAgICAg Y2xlYXJSZWdpc3RyYXRpb24oKnJlZ2lzdHJhdGlvbik7CisgICAgICAgIGNsZWFyUmVnaXN0cmF0 aW9uKG1fc2VydmVyLCAqcmVnaXN0cmF0aW9uKTsKIAogICAgIC8vIEludm9rZSBGaW5pc2ggSm9i IHdpdGggam9iIGFuZCBhYm9ydCB0aGVzZSBzdGVwcy4KICAgICBmaW5pc2hDdXJyZW50Sm9iKCk7 CkBAIC0xNTksNyArMTU5LDcgQEAgdm9pZCBTV1NlcnZlckpvYlF1ZXVlOjpkaWRGaW5pc2hJbnN0 YWxsKFNlcnZpY2VXb3JrZXJJZGVudGlmaWVyIGlkZW50aWZpZXIsIGJvb2wKIAogICAgICAgICAv LyBJZiBuZXdlc3RXb3JrZXIgaXMgbnVsbCwgaW52b2tlIENsZWFyIFJlZ2lzdHJhdGlvbiBhbGdv cml0aG0gcGFzc2luZyByZWdpc3RyYXRpb24gYXMgaXRzIGFyZ3VtZW50LgogICAgICAgICBpZiAo IXJlZ2lzdHJhdGlvbi0+Z2V0TmV3ZXN0V29ya2VyKCkpCi0gICAgICAgICAgICBjbGVhclJlZ2lz dHJhdGlvbigqcmVnaXN0cmF0aW9uKTsKKyAgICAgICAgICAgIGNsZWFyUmVnaXN0cmF0aW9uKG1f c2VydmVyLCAqcmVnaXN0cmF0aW9uKTsKICAgICAgICAgLy8gSW52b2tlIEZpbmlzaCBKb2Igd2l0 aCBqb2IgYW5kIGFib3J0IHRoZXNlIHN0ZXBzLgogICAgICAgICBmaW5pc2hDdXJyZW50Sm9iKCk7 CiAgICAgICAgIHJldHVybjsKQEAgLTM0MSw3ICszNDEsNyBAQCB2b2lkIFNXU2VydmVySm9iUXVl dWU6OnRyeUNsZWFyUmVnaXN0cmF0aW9uKFNXU2VydmVyUmVnaXN0cmF0aW9uJiByZWdpc3RyYXRp b24pCiAgICAgaWYgKHJlZ2lzdHJhdGlvbi5hY3RpdmVXb3JrZXIoKSAmJiByZWdpc3RyYXRpb24u YWN0aXZlV29ya2VyKCktPmhhc1BlbmRpbmdFdmVudHMoKSkKICAgICAgICAgcmV0dXJuOwogCi0g ICAgY2xlYXJSZWdpc3RyYXRpb24ocmVnaXN0cmF0aW9uKTsKKyAgICBjbGVhclJlZ2lzdHJhdGlv bihtX3NlcnZlciwgcmVnaXN0cmF0aW9uKTsKIH0KIAogLy8gaHR0cHM6Ly93M2MuZ2l0aHViLmlv L1NlcnZpY2VXb3JrZXIvI2NsZWFyLXJlZ2lzdHJhdGlvbgpAQCAtMzU2LDE0ICszNTYsMTQgQEAg c3RhdGljIHZvaWQgY2xlYXJSZWdpc3RyYXRpb25Xb3JrZXIoU1dTZXJ2ZXJSZWdpc3RyYXRpb24m IHJlZ2lzdHJhdGlvbiwgU1dTZXJ2ZXIKIH0KIAogLy8gaHR0cHM6Ly93M2MuZ2l0aHViLmlvL1Nl cnZpY2VXb3JrZXIvI2NsZWFyLXJlZ2lzdHJhdGlvbgotdm9pZCBTV1NlcnZlckpvYlF1ZXVlOjpj bGVhclJlZ2lzdHJhdGlvbihTV1NlcnZlclJlZ2lzdHJhdGlvbiYgcmVnaXN0cmF0aW9uKQordm9p ZCBTV1NlcnZlckpvYlF1ZXVlOjpjbGVhclJlZ2lzdHJhdGlvbihTV1NlcnZlciYgc2VydmVyLCBT V1NlcnZlclJlZ2lzdHJhdGlvbiYgcmVnaXN0cmF0aW9uKQogewogICAgIGNsZWFyUmVnaXN0cmF0 aW9uV29ya2VyKHJlZ2lzdHJhdGlvbiwgcmVnaXN0cmF0aW9uLmluc3RhbGxpbmdXb3JrZXIoKSwg U2VydmljZVdvcmtlclJlZ2lzdHJhdGlvblN0YXRlOjpJbnN0YWxsaW5nKTsKICAgICBjbGVhclJl Z2lzdHJhdGlvbldvcmtlcihyZWdpc3RyYXRpb24sIHJlZ2lzdHJhdGlvbi53YWl0aW5nV29ya2Vy KCksIFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25TdGF0ZTo6V2FpdGluZyk7CiAgICAgY2xlYXJS ZWdpc3RyYXRpb25Xb3JrZXIocmVnaXN0cmF0aW9uLCByZWdpc3RyYXRpb24uYWN0aXZlV29ya2Vy KCksIFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25TdGF0ZTo6QWN0aXZlKTsKIAogICAgIC8vIFJl bW92ZSBzY29wZSB0byByZWdpc3RyYXRpb24gbWFwW3Njb3BlU3RyaW5nXS4KLSAgICBtX3NlcnZl ci5yZW1vdmVSZWdpc3RyYXRpb24ocmVnaXN0cmF0aW9uLmtleSgpKTsKKyAgICBzZXJ2ZXIucmVt b3ZlUmVnaXN0cmF0aW9uKHJlZ2lzdHJhdGlvbi5rZXkoKSk7CiB9CiAKIC8vIGh0dHBzOi8vdzNj LmdpdGh1Yi5pby9TZXJ2aWNlV29ya2VyLyN1cGRhdGUtYWxnb3JpdGhtCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVySm9iUXVldWUuaCBi L1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJKb2JRdWV1ZS5o CmluZGV4IDMxMGQxOGIzYjAxMzRmMjkxMjVhOWY4NjMwZWI0ODFlNGFiNWFkNDcuLmI1MzU5ZTA1 YjVkZGJhMTU5YTBiZjM5NmMzZTBlZjNjNGFlMDcwMWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJKb2JRdWV1ZS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJKb2JRdWV1ZS5oCkBAIC01 NCw2ICs1NCw4IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgdm9pZCBkaWRGaW5pc2hBY3RpdmF0aW9u KFNXU2VydmVyUmVnaXN0cmF0aW9uJiwgU2VydmljZVdvcmtlcklkZW50aWZpZXIpOwogICAgIHZv aWQgZGlkUmVzb2x2ZVJlZ2lzdHJhdGlvblByb21pc2UoKTsKIAorICAgIHN0YXRpYyB2b2lkIGNs ZWFyUmVnaXN0cmF0aW9uKFNXU2VydmVyJiwgU1dTZXJ2ZXJSZWdpc3RyYXRpb24mKTsKKwogcHJp dmF0ZToKICAgICB2b2lkIGpvYlRpbWVyRmlyZWQoKTsKICAgICB2b2lkIHJ1bk5leHRKb2JTeW5j aHJvbm91c2x5KCk7CkBAIC02NSw3ICs2Nyw2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBydW5VcGRh dGVKb2IoY29uc3QgU2VydmljZVdvcmtlckpvYkRhdGEmKTsKIAogICAgIHZvaWQgdHJ5Q2xlYXJS ZWdpc3RyYXRpb24oU1dTZXJ2ZXJSZWdpc3RyYXRpb24mKTsKLSAgICB2b2lkIGNsZWFyUmVnaXN0 cmF0aW9uKFNXU2VydmVyUmVnaXN0cmF0aW9uJik7CiAgICAgdm9pZCBpbnN0YWxsKFNXU2VydmVy UmVnaXN0cmF0aW9uJiwgU2VydmljZVdvcmtlcklkZW50aWZpZXIpOwogICAgIHN0YXRpYyB2b2lk IHRyeUFjdGl2YXRlKFNXU2VydmVyJiwgU1dTZXJ2ZXJSZWdpc3RyYXRpb24mKTsKICAgICBzdGF0 aWMgdm9pZCBhY3RpdmF0ZShTV1NlcnZlciYsIFNXU2VydmVyUmVnaXN0cmF0aW9uJik7Cg==