235987 2022-02-01 16:39:48 -0800 Replace WebCore::topOriginURL() to SecurityOrigin::toURL() 2022-02-01 19:33:37 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 235958 1 cdumez cdumez achristensen darin ggaren webkit-bug-importer youennf oldest_to_newest 1836228 0 cdumez 2022-02-01 16:39:48 -0800 Replace WebCore::topOriginURL() to SecurityOrigin::toURL() so that it can be reused by Shared Workers. 1836231 1 450588 cdumez 2022-02-01 16:42:19 -0800 Created attachment 450588 Patch 1836235 2 450589 cdumez 2022-02-01 16:47:01 -0800 Created attachment 450589 Patch 1836243 3 450589 ggaren 2022-02-01 16:53:39 -0800 Comment on attachment 450589 Patch r=me 1836292 4 ews-feeder 2022-02-01 18:46:57 -0800 Committed r288936 (246666@main): <https://commits.webkit.org/246666@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 450589. 1836293 5 webkit-bug-importer 2022-02-01 18:47:29 -0800 <rdar://problem/88359484> 450588 2022-02-01 16:42:19 -0800 2022-02-01 17:04:53 -0800 Patch bug-235987-20220201164218.patch text/plain 4834 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4OTI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmViYTMyMjJlM2VmZjFk MTI5NTRiNzA0YjFiNjJkMTA5NDk3OGU1Zi4uYzYxNmY1ZmY2MDEwYzMzZTczZjQ4ODMzOTQ3MDE3 ZDcxOTRlZjU3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAyLTAxICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVwbGFjZSBXZWJDb3JlOjp0 b3BPcmlnaW5VUkwoKSB0byBTZWN1cml0eU9yaWdpbjo6dG9VUkwoKQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1OTg3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBXZWJDb3JlOjp0b3BPcmln aW5VUkwoKSB0byBTZWN1cml0eU9yaWdpbjo6dG9VUkwoKSBzbyB0aGF0IGl0IGNhbiBiZSByZXVz ZWQgYnkgU2hhcmVkIFdvcmtlcnMuCisKKyAgICAgICAgKiBwYWdlL1NlY3VyaXR5T3JpZ2luLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luOjp0b1VSTCBjb25zdCk6CisgICAg ICAgICogcGFnZS9TZWN1cml0eU9yaWdpbi5oOgorICAgICAgICAqIHBhZ2UvU2VjdXJpdHlPcmln aW5EYXRhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YTo6dG9VUkwg Y29uc3QpOgorICAgICAgICAqIHBhZ2UvU2VjdXJpdHlPcmlnaW5EYXRhLmg6CisgICAgICAgICog d29ya2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlclRocmVhZFByb3h5LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJUaHJlYWRQcm94eTo6c2V0dXBQYWdlRm9yU2Vy dmljZVdvcmtlcik6CisgICAgICAgIChXZWJDb3JlOjp0b3BPcmlnaW5VUkwpOiBEZWxldGVkLgor CiAyMDIyLTAyLTAxICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBbV1BdIFJlbW92ZSBQb3N0U2NyaXB0IGNvbnZlcnNpb24gY29kZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL1NlY3VyaXR5T3JpZ2luLmNwcAppbmRleCA4NDMxZjRjNTIxMTY0ZmE3YTI4YmE3OTU5M2Y4 YTQ3NDdhYWI3NjU5Li4wY2I0OWFmN2M1NTAwZDE3ODQ0N2I5NTY2YTgzNjRhMTY0YTk4ZGU1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcApAQCAtNTQ2LDYgKzU0NiwxMSBA QCBTdHJpbmcgU2VjdXJpdHlPcmlnaW46OnRvUmF3U3RyaW5nKCkgY29uc3QKICAgICByZXR1cm4g bV9kYXRhLnRvU3RyaW5nKCk7CiB9CiAKK1VSTCBTZWN1cml0eU9yaWdpbjo6dG9VUkwoKSBjb25z dAoreworICAgIHJldHVybiBtX2RhdGEudG9VUkwoKTsKK30KKwogc3RhdGljIGlubGluZSBib29s IGFyZU9yaWdpbnNNYXRjaGluZyhjb25zdCBTZWN1cml0eU9yaWdpbiYgb3JpZ2luMSwgY29uc3Qg U2VjdXJpdHlPcmlnaW4mIG9yaWdpbjIpCiB7CiAgICAgQVNTRVJUKCZvcmlnaW4xICE9ICZvcmln aW4yKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uaCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uaAppbmRleCA2M2Q2MzQxNTlmNjQw M2JmNjM2YjZiMzQwNjRkMTlhZDE5YmMwYmRiLi5lMTU1ZWM2ZjI0YWVkMTg4MzBjMTgxZWQ3OWM0 Y2I0MDEwZDMxNmJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3Jp Z2luLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5oCkBAIC0xOTAs NiArMTkwLDggQEAgcHVibGljOgogICAgIC8vIGNvdWxkIG1ha2UgdGhlIHN0cmluZyByZXR1cm4g Im51bGwiLgogICAgIFdFQkNPUkVfRVhQT1JUIFN0cmluZyB0b1Jhd1N0cmluZygpIGNvbnN0Owog CisgICAgVVJMIHRvVVJMKCkgY29uc3Q7CisKICAgICAvLyBUaGlzIG1ldGhvZCBjaGVja3MgZm9y IGVxdWFsaXR5IGJldHdlZW4gU2VjdXJpdHlPcmlnaW5zLCBub3Qgd2hldGhlcgogICAgIC8vIG9u ZSBvcmlnaW4gY2FuIGFjY2VzcyBhbm90aGVyLiBJdCBpcyB1c2VkIGZvciBoYXNoIHRhYmxlIGtl eXMuCiAgICAgLy8gRm9yIGFjY2VzcyBjaGVja3MsIHVzZSBpc1NhbWVPcmlnaW5Eb21haW4oKS4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW5EYXRhLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW5EYXRhLmNwcAppbmRleCBlNDljZGNk MzYyYWU3ZGFiNWRjYTMxODYyYmE5NWU4ZmI3ZTdlZjllLi4xYWI3N2Y2ZWRmMzM4ZWVjY2I1N2Nj NDVjZTU0MmFjM2E5YzRjNDIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3Vy aXR5T3JpZ2luRGF0YS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdp bkRhdGEuY3BwCkBAIC00OSw2ICs0OSwxMSBAQCBTdHJpbmcgU2VjdXJpdHlPcmlnaW5EYXRhOjp0 b1N0cmluZygpIGNvbnN0CiAgICAgcmV0dXJuIG1ha2VTdHJpbmcocHJvdG9jb2wsICI6Ly8iLCBo b3N0LCAnOicsIHN0YXRpY19jYXN0PHVpbnQzMl90PigqcG9ydCkpOwogfQogCitVUkwgU2VjdXJp dHlPcmlnaW5EYXRhOjp0b1VSTCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIFVSTCB7IFVSTCgpLCB0 b1N0cmluZygpIH07Cit9CisKIFNlY3VyaXR5T3JpZ2luRGF0YSBTZWN1cml0eU9yaWdpbkRhdGE6 OmZyb21GcmFtZShGcmFtZSogZnJhbWUpCiB7CiAgICAgaWYgKCFmcmFtZSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW5EYXRhLmggYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1NlY3VyaXR5T3JpZ2luRGF0YS5oCmluZGV4IGZkZmM4NjQzZWFkZjA0NjgwMWExZWU4 MDk2YzE1ZTU3M2ZiMzZhNDUuLjM0YjkzZDY4YjI3NzNmZmUyNWY4MWNlNzYwNjA5NmZmYjBjYTI4 ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW5EYXRhLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbkRhdGEuaApAQCAtODcsNiAr ODcsOCBAQCBzdHJ1Y3QgU2VjdXJpdHlPcmlnaW5EYXRhIHsKICAgICAKICAgICBXRUJDT1JFX0VY UE9SVCBTdHJpbmcgdG9TdHJpbmcoKSBjb25zdDsKIAorICAgIFVSTCB0b1VSTCgpIGNvbnN0Owor CiAjaWYgIUxPR19ESVNBQkxFRAogICAgIFN0cmluZyBkZWJ1Z1N0cmluZygpIGNvbnN0IHsgcmV0 dXJuIHRvU3RyaW5nKCk7IH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29y a2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlclRocmVhZFByb3h5LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9jb250ZXh0L1NlcnZpY2VXb3JrZXJUaHJlYWRQcm94 eS5jcHAKaW5kZXggYzY2NjE0ZmEyYzk2MDAxMTY0NWU4YWM3NDVkNGY2ZDljODgzOTY0OC4uNDVj MWIxNDcxNjU1ZTFjYzg3Y2JhMWIyYTgxM2U4ZmVkYTljOWFhZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlclRocmVhZFByb3h5 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2aWNl V29ya2VyVGhyZWFkUHJveHkuY3BwCkBAIC01MSwxMSArNTEsNiBAQAogCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKLXN0YXRpYyBVUkwgdG9wT3JpZ2luVVJMKGNvbnN0IFNlY3VyaXR5T3JpZ2luJiBv cmlnaW4pCi17Ci0gICAgcmV0dXJuIFVSTCB7IFVSTCB7IH0sIG9yaWdpbi50b1Jhd1N0cmluZygp IH07Ci19Ci0KIHZvaWQgU2VydmljZVdvcmtlclRocmVhZFByb3h5OjpzZXR1cFBhZ2VGb3JTZXJ2 aWNlV29ya2VyKFBhZ2UmIHBhZ2UsIGNvbnN0IFNlcnZpY2VXb3JrZXJDb250ZXh0RGF0YSYgZGF0 YSkKIHsKICAgICBhdXRvJiBtYWluRnJhbWUgPSBwYWdlLm1haW5GcmFtZSgpOwpAQCAtNjgsOCAr NjMsOSBAQCB2b2lkIFNlcnZpY2VXb3JrZXJUaHJlYWRQcm94eTo6c2V0dXBQYWdlRm9yU2Vydmlj ZVdvcmtlcihQYWdlJiBwYWdlLCBjb25zdCBTZXJ2aQogICAgIGF1dG8gb3JpZ2luID0gZGF0YS5y ZWdpc3RyYXRpb24ua2V5LnRvcE9yaWdpbigpLnNlY3VyaXR5T3JpZ2luKCk7CiAgICAgb3JpZ2lu LT5zZXRTdG9yYWdlQmxvY2tpbmdQb2xpY3kocGFnZS5zZXR0aW5ncygpLnN0b3JhZ2VCbG9ja2lu Z1BvbGljeSgpKTsKIAotICAgIGRvY3VtZW50LT5zZXRTaXRlRm9yQ29va2llcyh0b3BPcmlnaW5V Ukwob3JpZ2luKSk7Ci0gICAgZG9jdW1lbnQtPnNldEZpcnN0UGFydHlGb3JDb29raWVzKHRvcE9y aWdpblVSTChvcmlnaW4pKTsKKyAgICBhdXRvIG9yaWdpblVSTCA9IG9yaWdpbi50b1VSTCgpOwor ICAgIGRvY3VtZW50LT5zZXRTaXRlRm9yQ29va2llcyhvcmlnaW5VUkwpOworICAgIGRvY3VtZW50 LT5zZXRGaXJzdFBhcnR5Rm9yQ29va2llcyhvcmlnaW5VUkwpOwogICAgIGRvY3VtZW50LT5zZXRE b21haW5Gb3JDYWNoZVBhcnRpdGlvbihvcmlnaW4tPmRvbWFpbkZvckNhY2hlUGFydGl0aW9uKCkp OwogCiAgICAgaWYgKGF1dG8gcG9saWN5ID0gcGFyc2VSZWZlcnJlclBvbGljeShkYXRhLnJlZmVy cmVyUG9saWN5LCBSZWZlcnJlclBvbGljeVNvdXJjZTo6SFRUUEhlYWRlcikpCg== 450589 2022-02-01 16:47:01 -0800 2022-02-01 19:33:37 -0800 Patch bug-235987-20220201164700.patch text/plain 4835 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4OTI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmViYTMyMjJlM2VmZjFk MTI5NTRiNzA0YjFiNjJkMTA5NDk3OGU1Zi4uYzYxNmY1ZmY2MDEwYzMzZTczZjQ4ODMzOTQ3MDE3 ZDcxOTRlZjU3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAyLTAxICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVwbGFjZSBXZWJDb3JlOjp0 b3BPcmlnaW5VUkwoKSB0byBTZWN1cml0eU9yaWdpbjo6dG9VUkwoKQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1OTg3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBXZWJDb3JlOjp0b3BPcmln aW5VUkwoKSB0byBTZWN1cml0eU9yaWdpbjo6dG9VUkwoKSBzbyB0aGF0IGl0IGNhbiBiZSByZXVz ZWQgYnkgU2hhcmVkIFdvcmtlcnMuCisKKyAgICAgICAgKiBwYWdlL1NlY3VyaXR5T3JpZ2luLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luOjp0b1VSTCBjb25zdCk6CisgICAg ICAgICogcGFnZS9TZWN1cml0eU9yaWdpbi5oOgorICAgICAgICAqIHBhZ2UvU2VjdXJpdHlPcmln aW5EYXRhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YTo6dG9VUkwg Y29uc3QpOgorICAgICAgICAqIHBhZ2UvU2VjdXJpdHlPcmlnaW5EYXRhLmg6CisgICAgICAgICog d29ya2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlclRocmVhZFByb3h5LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJUaHJlYWRQcm94eTo6c2V0dXBQYWdlRm9yU2Vy dmljZVdvcmtlcik6CisgICAgICAgIChXZWJDb3JlOjp0b3BPcmlnaW5VUkwpOiBEZWxldGVkLgor CiAyMDIyLTAyLTAxICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBbV1BdIFJlbW92ZSBQb3N0U2NyaXB0IGNvbnZlcnNpb24gY29kZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL1NlY3VyaXR5T3JpZ2luLmNwcAppbmRleCA4NDMxZjRjNTIxMTY0ZmE3YTI4YmE3OTU5M2Y4 YTQ3NDdhYWI3NjU5Li4wY2I0OWFmN2M1NTAwZDE3ODQ0N2I5NTY2YTgzNjRhMTY0YTk4ZGU1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcApAQCAtNTQ2LDYgKzU0NiwxMSBA QCBTdHJpbmcgU2VjdXJpdHlPcmlnaW46OnRvUmF3U3RyaW5nKCkgY29uc3QKICAgICByZXR1cm4g bV9kYXRhLnRvU3RyaW5nKCk7CiB9CiAKK1VSTCBTZWN1cml0eU9yaWdpbjo6dG9VUkwoKSBjb25z dAoreworICAgIHJldHVybiBtX2RhdGEudG9VUkwoKTsKK30KKwogc3RhdGljIGlubGluZSBib29s IGFyZU9yaWdpbnNNYXRjaGluZyhjb25zdCBTZWN1cml0eU9yaWdpbiYgb3JpZ2luMSwgY29uc3Qg U2VjdXJpdHlPcmlnaW4mIG9yaWdpbjIpCiB7CiAgICAgQVNTRVJUKCZvcmlnaW4xICE9ICZvcmln aW4yKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uaCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uaAppbmRleCA2M2Q2MzQxNTlmNjQw M2JmNjM2YjZiMzQwNjRkMTlhZDE5YmMwYmRiLi5lMTU1ZWM2ZjI0YWVkMTg4MzBjMTgxZWQ3OWM0 Y2I0MDEwZDMxNmJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3Jp Z2luLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5oCkBAIC0xOTAs NiArMTkwLDggQEAgcHVibGljOgogICAgIC8vIGNvdWxkIG1ha2UgdGhlIHN0cmluZyByZXR1cm4g Im51bGwiLgogICAgIFdFQkNPUkVfRVhQT1JUIFN0cmluZyB0b1Jhd1N0cmluZygpIGNvbnN0Owog CisgICAgVVJMIHRvVVJMKCkgY29uc3Q7CisKICAgICAvLyBUaGlzIG1ldGhvZCBjaGVja3MgZm9y IGVxdWFsaXR5IGJldHdlZW4gU2VjdXJpdHlPcmlnaW5zLCBub3Qgd2hldGhlcgogICAgIC8vIG9u ZSBvcmlnaW4gY2FuIGFjY2VzcyBhbm90aGVyLiBJdCBpcyB1c2VkIGZvciBoYXNoIHRhYmxlIGtl eXMuCiAgICAgLy8gRm9yIGFjY2VzcyBjaGVja3MsIHVzZSBpc1NhbWVPcmlnaW5Eb21haW4oKS4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW5EYXRhLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW5EYXRhLmNwcAppbmRleCBlNDljZGNk MzYyYWU3ZGFiNWRjYTMxODYyYmE5NWU4ZmI3ZTdlZjllLi4xYWI3N2Y2ZWRmMzM4ZWVjY2I1N2Nj NDVjZTU0MmFjM2E5YzRjNDIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3Vy aXR5T3JpZ2luRGF0YS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdp bkRhdGEuY3BwCkBAIC00OSw2ICs0OSwxMSBAQCBTdHJpbmcgU2VjdXJpdHlPcmlnaW5EYXRhOjp0 b1N0cmluZygpIGNvbnN0CiAgICAgcmV0dXJuIG1ha2VTdHJpbmcocHJvdG9jb2wsICI6Ly8iLCBo b3N0LCAnOicsIHN0YXRpY19jYXN0PHVpbnQzMl90PigqcG9ydCkpOwogfQogCitVUkwgU2VjdXJp dHlPcmlnaW5EYXRhOjp0b1VSTCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIFVSTCB7IFVSTCgpLCB0 b1N0cmluZygpIH07Cit9CisKIFNlY3VyaXR5T3JpZ2luRGF0YSBTZWN1cml0eU9yaWdpbkRhdGE6 OmZyb21GcmFtZShGcmFtZSogZnJhbWUpCiB7CiAgICAgaWYgKCFmcmFtZSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW5EYXRhLmggYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1NlY3VyaXR5T3JpZ2luRGF0YS5oCmluZGV4IGZkZmM4NjQzZWFkZjA0NjgwMWExZWU4 MDk2YzE1ZTU3M2ZiMzZhNDUuLjM0YjkzZDY4YjI3NzNmZmUyNWY4MWNlNzYwNjA5NmZmYjBjYTI4 ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW5EYXRhLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbkRhdGEuaApAQCAtODcsNiAr ODcsOCBAQCBzdHJ1Y3QgU2VjdXJpdHlPcmlnaW5EYXRhIHsKICAgICAKICAgICBXRUJDT1JFX0VY UE9SVCBTdHJpbmcgdG9TdHJpbmcoKSBjb25zdDsKIAorICAgIFVSTCB0b1VSTCgpIGNvbnN0Owor CiAjaWYgIUxPR19ESVNBQkxFRAogICAgIFN0cmluZyBkZWJ1Z1N0cmluZygpIGNvbnN0IHsgcmV0 dXJuIHRvU3RyaW5nKCk7IH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29y a2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlclRocmVhZFByb3h5LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9jb250ZXh0L1NlcnZpY2VXb3JrZXJUaHJlYWRQcm94 eS5jcHAKaW5kZXggYzY2NjE0ZmEyYzk2MDAxMTY0NWU4YWM3NDVkNGY2ZDljODgzOTY0OC4uZjI1 OWFlOTkzNDJlNTk2Zjc0OGY3OTNmYjdlNTAyZWNhMzZiYjFkYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlclRocmVhZFByb3h5 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2aWNl V29ya2VyVGhyZWFkUHJveHkuY3BwCkBAIC01MSwxMSArNTEsNiBAQAogCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKLXN0YXRpYyBVUkwgdG9wT3JpZ2luVVJMKGNvbnN0IFNlY3VyaXR5T3JpZ2luJiBv cmlnaW4pCi17Ci0gICAgcmV0dXJuIFVSTCB7IFVSTCB7IH0sIG9yaWdpbi50b1Jhd1N0cmluZygp IH07Ci19Ci0KIHZvaWQgU2VydmljZVdvcmtlclRocmVhZFByb3h5OjpzZXR1cFBhZ2VGb3JTZXJ2 aWNlV29ya2VyKFBhZ2UmIHBhZ2UsIGNvbnN0IFNlcnZpY2VXb3JrZXJDb250ZXh0RGF0YSYgZGF0 YSkKIHsKICAgICBhdXRvJiBtYWluRnJhbWUgPSBwYWdlLm1haW5GcmFtZSgpOwpAQCAtNjgsOCAr NjMsOSBAQCB2b2lkIFNlcnZpY2VXb3JrZXJUaHJlYWRQcm94eTo6c2V0dXBQYWdlRm9yU2Vydmlj ZVdvcmtlcihQYWdlJiBwYWdlLCBjb25zdCBTZXJ2aQogICAgIGF1dG8gb3JpZ2luID0gZGF0YS5y ZWdpc3RyYXRpb24ua2V5LnRvcE9yaWdpbigpLnNlY3VyaXR5T3JpZ2luKCk7CiAgICAgb3JpZ2lu LT5zZXRTdG9yYWdlQmxvY2tpbmdQb2xpY3kocGFnZS5zZXR0aW5ncygpLnN0b3JhZ2VCbG9ja2lu Z1BvbGljeSgpKTsKIAotICAgIGRvY3VtZW50LT5zZXRTaXRlRm9yQ29va2llcyh0b3BPcmlnaW5V Ukwob3JpZ2luKSk7Ci0gICAgZG9jdW1lbnQtPnNldEZpcnN0UGFydHlGb3JDb29raWVzKHRvcE9y aWdpblVSTChvcmlnaW4pKTsKKyAgICBhdXRvIG9yaWdpblVSTCA9IG9yaWdpbi0+dG9VUkwoKTsK KyAgICBkb2N1bWVudC0+c2V0U2l0ZUZvckNvb2tpZXMob3JpZ2luVVJMKTsKKyAgICBkb2N1bWVu dC0+c2V0Rmlyc3RQYXJ0eUZvckNvb2tpZXMob3JpZ2luVVJMKTsKICAgICBkb2N1bWVudC0+c2V0 RG9tYWluRm9yQ2FjaGVQYXJ0aXRpb24ob3JpZ2luLT5kb21haW5Gb3JDYWNoZVBhcnRpdGlvbigp KTsKIAogICAgIGlmIChhdXRvIHBvbGljeSA9IHBhcnNlUmVmZXJyZXJQb2xpY3koZGF0YS5yZWZl cnJlclBvbGljeSwgUmVmZXJyZXJQb2xpY3lTb3VyY2U6OkhUVFBIZWFkZXIpKQo=