231342 2021-10-06 17:07:31 -0700 Cascade layer styles should be lower priority than unlayered styles 2021-10-14 00:26:27 -0700 1 1 1 Unclassified WebKit CSS Safari Technology Preview Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 220779 1 simon.fraser koivisto clopez ews-watchlist simon.fraser webkit-bug-importer youennf oldest_to_newest 1801433 0 simon.fraser 2021-10-06 17:07:31 -0700 Per CSS WG resolution: https://github.com/w3c/csswg-drafts/issues/6284#issuecomment-937262197 1801551 1 440490 koivisto 2021-10-07 02:25:13 -0700 Created attachment 440490 Patch 1801552 2 ews-watchlist 2021-10-07 02:26:36 -0700 This patch modifies the imported WPT tests. Please ensure that any changes on the tests (not coming from a WPT import) are exported to WPT. Please see https://trac.webkit.org/wiki/WPTExportProcess 1801640 3 ews-feeder 2021-10-07 10:19:03 -0700 Committed r283718 (242643@main): <https://commits.webkit.org/242643@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440490. 1801641 4 webkit-bug-importer 2021-10-07 10:20:21 -0700 <rdar://problem/83987470> 440490 2021-10-07 02:25:13 -0700 2021-10-07 10:19:04 -0700 Patch bug-231342-20211007122512.patch text/plain 21270 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzQzYjI3NjI2YzhjMmNj YmE2Njc1MDBiYTc4MWZiMmRjNjJhMDI1Yy4uNjRkMzRjM2I5YmE2YjkxNmQ0M2EzNzk0ZDlhOTg3 NGZkYTYxM2YwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTEwLTA3ICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBDYXNjYWRlIGxheWVyIHN0 eWxlcyBzaG91bGQgYmUgbG93ZXIgcHJpb3JpdHkgdGhhbiB1bmxheWVyZWQgc3R5bGVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzEzNDIKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgdGhlIGlt cGxlbWVudGF0aW9uIHRvIG1hdGNoIHRoZSByZXNvbHV0aW9uIGZvciBodHRwczovL2dpdGh1Yi5j b20vdzNjL2Nzc3dnLWRyYWZ0cy9pc3N1ZXMvNjI4NC4KKworICAgICAgICAqIHN0eWxlL0VsZW1l bnRSdWxlQ29sbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpFbGVtZW50UnVs ZUNvbGxlY3Rvcjo6YWRkTWF0Y2hlZFJ1bGUpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OmNv bXBhcmVSdWxlcyk6CisgICAgICAgICogc3R5bGUvRWxlbWVudFJ1bGVDb2xsZWN0b3IuaDoKKyAg ICAgICAgKiBzdHlsZS9SdWxlU2V0Lmg6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UnVsZVNl dDo6Y2FzY2FkZUxheWVyUHJpb3JpdHlGb3JJZGVudGlmaWVyIGNvbnN0KToKKyAgICAgICAgKFdl YkNvcmU6OlN0eWxlOjpSdWxlU2V0OjpjYXNjYWRlTGF5ZXJQcmlvcml0eUZvciBjb25zdCk6CisK KyAgICAgICAgUmV0dXJuIHN0ZDo6bnVtZXJpY19saW1pdHM8dW5zaWduZWQ+OjptYXgoKSBmb3Ig dW5sYXllcmVkIHJ1bGVzLgorCisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UnVsZVNldDo6Y2Fz Y2FkZUxheWVyT3JkZXJGb3JJZGVudGlmaWVyIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdl YkNvcmU6OlN0eWxlOjpSdWxlU2V0OjpjYXNjYWRlTGF5ZXJPcmRlckZvciBjb25zdCk6IERlbGV0 ZWQuCisKKyAgICAgICAgQWxzbyB1cGRhdGUgbmFtaW5nIG9yZGVyLT5wcmlvcml0eSB0byBiZXR0 ZXIgbWF0Y2ggdGhlIHNwZWMgdGV4dC4KKworICAgICAgICAqIHN0eWxlL1J1bGVTZXRCdWlsZGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpSdWxlU2V0QnVpbGRlcjo6flJ1bGVTZXRC dWlsZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpSdWxlU2V0QnVpbGRlcjo6dXBkYXRl Q2FzY2FkZUxheWVyUHJpb3JpdGllcyk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UnVsZVNl dEJ1aWxkZXI6OmFkZE11dGF0aW5nUnVsZXNUb1Jlc29sdmVyKToKKyAgICAgICAgKFdlYkNvcmU6 OlN0eWxlOjpSdWxlU2V0QnVpbGRlcjo6dXBkYXRlQ2FzY2FkZUxheWVyT3JkZXIpOiBEZWxldGVk LgorICAgICAgICAqIHN0eWxlL1J1bGVTZXRCdWlsZGVyLmg6CisKIDIwMjEtMTAtMDUgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAo cjI4MzMzNSk6IE1vbWVudHVtIHNjcm9sbGluZyBpcyBubyBsb25nZXIgbG9ja2VkIHRvIGFuIGF4 aXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9y LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNwcAppbmRl eCBmMzVkNjk0ZjQ5ZDhlMzE1NWIzYTdjOTBiYzVhZTRkODc0ODBlMWYyLi5iM2YyZDk0MjFkNDJk NzdiMmYwZDI2ZWZhYjI1Yjk1MTBjNjg4MzhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9z dHlsZS9FbGVtZW50UnVsZUNvbGxlY3Rvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUv RWxlbWVudFJ1bGVDb2xsZWN0b3IuY3BwCkBAIC0xMTMsOCArMTEzLDggQEAgY29uc3QgVmVjdG9y PFJlZlB0cjxjb25zdCBTdHlsZVJ1bGU+PiYgRWxlbWVudFJ1bGVDb2xsZWN0b3I6Om1hdGNoZWRS dWxlTGlzdCgpIGMKIAogaW5saW5lIHZvaWQgRWxlbWVudFJ1bGVDb2xsZWN0b3I6OmFkZE1hdGNo ZWRSdWxlKGNvbnN0IFJ1bGVEYXRhJiBydWxlRGF0YSwgdW5zaWduZWQgc3BlY2lmaWNpdHksIGNv bnN0IE1hdGNoUmVxdWVzdCYgbWF0Y2hSZXF1ZXN0KQogewotICAgIGF1dG8gY2FzY2FkZUxheWVy T3JkZXIgPSBtYXRjaFJlcXVlc3QucnVsZVNldCA/IG1hdGNoUmVxdWVzdC5ydWxlU2V0LT5jYXNj YWRlTGF5ZXJPcmRlckZvcihydWxlRGF0YSkgOiAwOwotICAgIG1fbWF0Y2hlZFJ1bGVzLmFwcGVu ZCh7ICZydWxlRGF0YSwgc3BlY2lmaWNpdHksIG1hdGNoUmVxdWVzdC5zdHlsZVNjb3BlT3JkaW5h bCwgY2FzY2FkZUxheWVyT3JkZXIgfSk7CisgICAgYXV0byBjYXNjYWRlTGF5ZXJQcmlvcml0eSA9 IG1hdGNoUmVxdWVzdC5ydWxlU2V0ID8gbWF0Y2hSZXF1ZXN0LnJ1bGVTZXQtPmNhc2NhZGVMYXll clByaW9yaXR5Rm9yKHJ1bGVEYXRhKSA6IFJ1bGVTZXQ6OmNhc2NhZGVMYXllclByaW9yaXR5Rm9y VW5sYXllcmVkOworICAgIG1fbWF0Y2hlZFJ1bGVzLmFwcGVuZCh7ICZydWxlRGF0YSwgc3BlY2lm aWNpdHksIG1hdGNoUmVxdWVzdC5zdHlsZVNjb3BlT3JkaW5hbCwgY2FzY2FkZUxheWVyUHJpb3Jp dHkgfSk7CiB9CiAKIHZvaWQgRWxlbWVudFJ1bGVDb2xsZWN0b3I6OmNsZWFyTWF0Y2hlZFJ1bGVz KCkKQEAgLTU0Niw4ICs1NDYsOCBAQCBzdGF0aWMgaW5saW5lIGJvb2wgY29tcGFyZVJ1bGVzKE1h dGNoZWRSdWxlIHIxLCBNYXRjaGVkUnVsZSByMikKICAgICBpZiAocjEuc3R5bGVTY29wZU9yZGlu YWwgIT0gcjIuc3R5bGVTY29wZU9yZGluYWwpCiAgICAgICAgIHJldHVybiByMS5zdHlsZVNjb3Bl T3JkaW5hbCA+IHIyLnN0eWxlU2NvcGVPcmRpbmFsOwogCi0gICAgaWYgKHIxLmNhc2NhZGVMYXll ck9yZGVyICE9IHIyLmNhc2NhZGVMYXllck9yZGVyKQotICAgICAgICByZXR1cm4gcjEuY2FzY2Fk ZUxheWVyT3JkZXIgPCByMi5jYXNjYWRlTGF5ZXJPcmRlcjsKKyAgICBpZiAocjEuY2FzY2FkZUxh eWVyUHJpb3JpdHkgIT0gcjIuY2FzY2FkZUxheWVyUHJpb3JpdHkpCisgICAgICAgIHJldHVybiBy MS5jYXNjYWRlTGF5ZXJQcmlvcml0eSA8IHIyLmNhc2NhZGVMYXllclByaW9yaXR5OwogCiAgICAg aWYgKHIxLnNwZWNpZmljaXR5ICE9IHIyLnNwZWNpZmljaXR5KQogICAgICAgICByZXR1cm4gcjEu c3BlY2lmaWNpdHkgPCByMi5zcGVjaWZpY2l0eTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3N0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9FbGVt ZW50UnVsZUNvbGxlY3Rvci5oCmluZGV4IDkwOTQwOTY4YzA0M2EzYzA4YmNiN2E2Njg5NzgxMDRm Mzg3YzZiZTkuLmJmNjBkNmNjY2NmNDRkOGYxMTI1NDE4ZTkyYjFiOGI0ZjQ3OTBhMTggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmgKKysrIGIv U291cmNlL1dlYkNvcmUvc3R5bGUvRWxlbWVudFJ1bGVDb2xsZWN0b3IuaApAQCAtNjIsNyArNjIs NyBAQCBzdHJ1Y3QgTWF0Y2hlZFJ1bGUgewogICAgIGNvbnN0IFJ1bGVEYXRhKiBydWxlRGF0YTsK ICAgICB1bnNpZ25lZCBzcGVjaWZpY2l0eTsKICAgICBTY29wZU9yZGluYWwgc3R5bGVTY29wZU9y ZGluYWw7Ci0gICAgdW5zaWduZWQgY2FzY2FkZUxheWVyT3JkZXI7CisgICAgdW5zaWduZWQgY2Fz Y2FkZUxheWVyUHJpb3JpdHk7CiB9OwogCiBzdHJ1Y3QgTWF0Y2hlZFByb3BlcnRpZXMgewpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvUnVsZVNldC5oIGIvU291cmNlL1dlYkNvcmUv c3R5bGUvUnVsZVNldC5oCmluZGV4IGMyODY5OGRlMTBkNzczNjBmODdiOTg3YjNlNGY0MmJmNDIx NzUzNjEuLmYwNGE3MjAzMDM3NjUyMWY4YjM1NjUxMDQxMGM2MmE1MDcwZjFkZjMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1J1bGVTZXQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9z dHlsZS9SdWxlU2V0LmgKQEAgLTEwMyw3ICsxMDMsOCBAQCBwdWJsaWM6CiAgICAgYm9vbCBoYXNT aGFkb3dQc2V1ZG9FbGVtZW50UnVsZXMoKSBjb25zdCB7IHJldHVybiAhbV9zaGFkb3dQc2V1ZG9F bGVtZW50UnVsZXMuaXNFbXB0eSgpOyB9CiAgICAgYm9vbCBoYXNIb3N0UHNldWRvQ2xhc3NSdWxl c01hdGNoaW5nSW5TaGFkb3dUcmVlKCkgY29uc3QgeyByZXR1cm4gbV9oYXNIb3N0UHNldWRvQ2xh c3NSdWxlc01hdGNoaW5nSW5TaGFkb3dUcmVlOyB9CiAKLSAgICB1bnNpZ25lZCBjYXNjYWRlTGF5 ZXJPcmRlckZvcihjb25zdCBSdWxlRGF0YSYpIGNvbnN0OworICAgIHN0YXRpYyBjb25zdGV4cHIg YXV0byBjYXNjYWRlTGF5ZXJQcmlvcml0eUZvclVubGF5ZXJlZCA9IHN0ZDo6bnVtZXJpY19saW1p dHM8dW5zaWduZWQ+OjptYXgoKTsKKyAgICB1bnNpZ25lZCBjYXNjYWRlTGF5ZXJQcmlvcml0eUZv cihjb25zdCBSdWxlRGF0YSYpIGNvbnN0OwogCiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBS dWxlU2V0QnVpbGRlcjsKQEAgLTEzMSwxMSArMTMyLDExIEBAIHByaXZhdGU6CiAgICAgc3RydWN0 IENhc2NhZGVMYXllciB7CiAgICAgICAgIENhc2NhZGVMYXllck5hbWUgcmVzb2x2ZWROYW1lOwog ICAgICAgICBDYXNjYWRlTGF5ZXJJZGVudGlmaWVyIHBhcmVudElkZW50aWZpZXI7Ci0gICAgICAg IHVuc2lnbmVkIG9yZGVyIHsgMCB9OworICAgICAgICB1bnNpZ25lZCBwcmlvcml0eSB7IDAgfTsK ICAgICB9OwogICAgIENhc2NhZGVMYXllciYgY2FzY2FkZUxheWVyRm9ySWRlbnRpZmllcihDYXNj YWRlTGF5ZXJJZGVudGlmaWVyIGlkZW50aWZpZXIpIHsgcmV0dXJuIG1fY2FzY2FkZUxheWVyc1tp ZGVudGlmaWVyIC0gMV07IH0KICAgICBjb25zdCBDYXNjYWRlTGF5ZXImIGNhc2NhZGVMYXllckZv cklkZW50aWZpZXIoQ2FzY2FkZUxheWVySWRlbnRpZmllciBpZGVudGlmaWVyKSBjb25zdCB7IHJl dHVybiBtX2Nhc2NhZGVMYXllcnNbaWRlbnRpZmllciAtIDFdOyB9Ci0gICAgdW5zaWduZWQgY2Fz Y2FkZUxheWVyT3JkZXJGb3JJZGVudGlmaWVyKENhc2NhZGVMYXllcklkZW50aWZpZXIpIGNvbnN0 OworICAgIHVuc2lnbmVkIGNhc2NhZGVMYXllclByaW9yaXR5Rm9ySWRlbnRpZmllcihDYXNjYWRl TGF5ZXJJZGVudGlmaWVyKSBjb25zdDsKIAogICAgIHN0cnVjdCBEeW5hbWljTWVkaWFRdWVyeVJ1 bGVzIHsKICAgICAgICAgVmVjdG9yPFJlZjxjb25zdCBNZWRpYVF1ZXJ5U2V0Pj4gbWVkaWFRdWVy eVNldHM7CkBAIC0xOTIsMTkgKzE5MywxOSBAQCBpbmxpbmUgY29uc3QgUnVsZVNldDo6UnVsZURh dGFWZWN0b3IqIFJ1bGVTZXQ6OnRhZ1J1bGVzKGNvbnN0IEF0b21TdHJpbmcmIGtleSwgYgogICAg IHJldHVybiB0YWdSdWxlcy0+Z2V0KGtleSk7CiB9CiAKLWlubGluZSB1bnNpZ25lZCBSdWxlU2V0 OjpjYXNjYWRlTGF5ZXJPcmRlckZvcklkZW50aWZpZXIoQ2FzY2FkZUxheWVySWRlbnRpZmllciBp ZGVudGlmaWVyKSBjb25zdAoraW5saW5lIHVuc2lnbmVkIFJ1bGVTZXQ6OmNhc2NhZGVMYXllclBy aW9yaXR5Rm9ySWRlbnRpZmllcihDYXNjYWRlTGF5ZXJJZGVudGlmaWVyIGlkZW50aWZpZXIpIGNv bnN0CiB7CiAgICAgaWYgKCFpZGVudGlmaWVyKQotICAgICAgICByZXR1cm4gMDsKLSAgICByZXR1 cm4gY2FzY2FkZUxheWVyRm9ySWRlbnRpZmllcihpZGVudGlmaWVyKS5vcmRlcjsKKyAgICAgICAg cmV0dXJuIGNhc2NhZGVMYXllclByaW9yaXR5Rm9yVW5sYXllcmVkOworICAgIHJldHVybiBjYXNj YWRlTGF5ZXJGb3JJZGVudGlmaWVyKGlkZW50aWZpZXIpLnByaW9yaXR5OwogfQogCi1pbmxpbmUg dW5zaWduZWQgUnVsZVNldDo6Y2FzY2FkZUxheWVyT3JkZXJGb3IoY29uc3QgUnVsZURhdGEmIHJ1 bGVEYXRhKSBjb25zdAoraW5saW5lIHVuc2lnbmVkIFJ1bGVTZXQ6OmNhc2NhZGVMYXllclByaW9y aXR5Rm9yKGNvbnN0IFJ1bGVEYXRhJiBydWxlRGF0YSkgY29uc3QKIHsKICAgICBpZiAobV9jYXNj YWRlTGF5ZXJJZGVudGlmaWVyRm9yUnVsZVBvc2l0aW9uLnNpemUoKSA8PSBydWxlRGF0YS5wb3Np dGlvbigpKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIGNhc2NhZGVMYXllclBy aW9yaXR5Rm9yVW5sYXllcmVkOwogICAgIGF1dG8gaWRlbnRpZmllciA9IG1fY2FzY2FkZUxheWVy SWRlbnRpZmllckZvclJ1bGVQb3NpdGlvbltydWxlRGF0YS5wb3NpdGlvbigpXTsKLSAgICByZXR1 cm4gY2FzY2FkZUxheWVyT3JkZXJGb3JJZGVudGlmaWVyKGlkZW50aWZpZXIpOworICAgIHJldHVy biBjYXNjYWRlTGF5ZXJQcmlvcml0eUZvcklkZW50aWZpZXIoaWRlbnRpZmllcik7CiB9CiAKIH0g Ly8gbmFtZXNwYWNlIFN0eWxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9SdWxl U2V0QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9SdWxlU2V0QnVpbGRlci5jcHAK aW5kZXggM2ZmMWMzNzY0OTg1MjIzNzY3MGFjY2IyNjY5YzNkYTFmNWUyNGMxYi4uYjVhZGNhNWEw Y2QyYjRhOGRiODRkYzY0MWE0MjQxMmQ3MTgxNTM3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvc3R5bGUvUnVsZVNldEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1J1 bGVTZXRCdWlsZGVyLmNwcApAQCAtNTAsNyArNTAsNyBAQCBSdWxlU2V0QnVpbGRlcjo6flJ1bGVT ZXRCdWlsZGVyKCkKICAgICBpZiAoIW1fcnVsZVNldCkKICAgICAgICAgcmV0dXJuOwogCi0gICAg dXBkYXRlQ2FzY2FkZUxheWVyT3JkZXIoKTsKKyAgICB1cGRhdGVDYXNjYWRlTGF5ZXJQcmlvcml0 aWVzKCk7CiAgICAgdXBkYXRlRHluYW1pY01lZGlhUXVlcmllcygpOwogICAgIGFkZE11dGF0aW5n UnVsZXNUb1Jlc29sdmVyKCk7CiAKQEAgLTIyMiw3ICsyMjIsNyBAQCB2b2lkIFJ1bGVTZXRCdWls ZGVyOjpwb3BDYXNjYWRlTGF5ZXIoY29uc3QgQ2FzY2FkZUxheWVyTmFtZSYgbmFtZSkKICAgICB9 CiB9CiAKLXZvaWQgUnVsZVNldEJ1aWxkZXI6OnVwZGF0ZUNhc2NhZGVMYXllck9yZGVyKCkKK3Zv aWQgUnVsZVNldEJ1aWxkZXI6OnVwZGF0ZUNhc2NhZGVMYXllclByaW9yaXRpZXMoKQogewogICAg IGlmIChtX2Nhc2NhZGVMYXllcklkZW50aWZpZXJNYXAuaXNFbXB0eSgpKQogICAgICAgICByZXR1 cm47CkBAIC0yNDQsMTYgKzI0NCwxNyBAQCB2b2lkIFJ1bGVTZXRCdWlsZGVyOjp1cGRhdGVDYXNj YWRlTGF5ZXJPcmRlcigpCiAgICAgICAgIHJldHVybiBhIDwgYjsKICAgICB9OwogCi0gICAgVmVj dG9yPFJ1bGVTZXQ6OkNhc2NhZGVMYXllcklkZW50aWZpZXI+IG9yZGVyVmVjdG9yOwogICAgIGF1 dG8gbGF5ZXJDb3VudCA9IG1fcnVsZVNldC0+bV9jYXNjYWRlTGF5ZXJzLnNpemUoKTsKLSAgICBv cmRlclZlY3Rvci5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KGxheWVyQ291bnQpOworCisgICAgVmVj dG9yPFJ1bGVTZXQ6OkNhc2NhZGVMYXllcklkZW50aWZpZXI+IGxheWVyc0luUHJpb3JpdHlPcmRl cjsKKyAgICBsYXllcnNJblByaW9yaXR5T3JkZXIucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShsYXll ckNvdW50KTsKICAgICBmb3IgKFJ1bGVTZXQ6OkNhc2NhZGVMYXllcklkZW50aWZpZXIgaWRlbnRp ZmllciA9IDE7IGlkZW50aWZpZXIgPD0gbGF5ZXJDb3VudDsgKytpZGVudGlmaWVyKQotICAgICAg ICBvcmRlclZlY3Rvci51bmNoZWNrZWRBcHBlbmQoaWRlbnRpZmllcik7CisgICAgICAgIGxheWVy c0luUHJpb3JpdHlPcmRlci51bmNoZWNrZWRBcHBlbmQoaWRlbnRpZmllcik7CiAKLSAgICBzdGQ6 OnNvcnQob3JkZXJWZWN0b3IuYmVnaW4oKSwgb3JkZXJWZWN0b3IuZW5kKCksIGNvbXBhcmUpOwor ICAgIHN0ZDo6c29ydChsYXllcnNJblByaW9yaXR5T3JkZXIuYmVnaW4oKSwgbGF5ZXJzSW5Qcmlv cml0eU9yZGVyLmVuZCgpLCBjb21wYXJlKTsKIAotICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkg PCBvcmRlclZlY3Rvci5zaXplKCk7ICsraSkKLSAgICAgICAgbV9ydWxlU2V0LT5jYXNjYWRlTGF5 ZXJGb3JJZGVudGlmaWVyKG9yZGVyVmVjdG9yW2ldKS5vcmRlciA9IGkgKyAxOworICAgIGZvciAo dW5zaWduZWQgcHJpb3JpdHkgPSAwOyBwcmlvcml0eSA8IGxheWVyQ291bnQ7ICsrcHJpb3JpdHkp CisgICAgICAgIG1fcnVsZVNldC0+Y2FzY2FkZUxheWVyRm9ySWRlbnRpZmllcihsYXllcnNJblBy aW9yaXR5T3JkZXJbcHJpb3JpdHldKS5wcmlvcml0eSA9IHByaW9yaXR5OwogfQogCiB2b2lkIFJ1 bGVTZXRCdWlsZGVyOjphZGRNdXRhdGluZ1J1bGVzVG9SZXNvbHZlcigpCkBAIC0yNjIsOSArMjYz LDkgQEAgdm9pZCBSdWxlU2V0QnVpbGRlcjo6YWRkTXV0YXRpbmdSdWxlc1RvUmVzb2x2ZXIoKQog ICAgICAgICByZXR1cm47CiAKICAgICBhdXRvIGNvbXBhcmVMYXllcnMgPSBbJl0oY29uc3QgYXV0 byYgYSwgY29uc3QgYXV0byYgYikgewotICAgICAgICBhdXRvIGFPcmRlciA9IG1fcnVsZVNldC0+ Y2FzY2FkZUxheWVyT3JkZXJGb3JJZGVudGlmaWVyKGEubGF5ZXJJZGVudGlmaWVyKTsKLSAgICAg ICAgYXV0byBiT3JkZXIgPSBtX3J1bGVTZXQtPmNhc2NhZGVMYXllck9yZGVyRm9ySWRlbnRpZmll cihiLmxheWVySWRlbnRpZmllcik7Ci0gICAgICAgIHJldHVybiBhT3JkZXIgPCBiT3JkZXI7Cisg ICAgICAgIGF1dG8gYVByaW9yaXR5ID0gbV9ydWxlU2V0LT5jYXNjYWRlTGF5ZXJQcmlvcml0eUZv cklkZW50aWZpZXIoYS5sYXllcklkZW50aWZpZXIpOworICAgICAgICBhdXRvIGJQcmlvcml0eSA9 IG1fcnVsZVNldC0+Y2FzY2FkZUxheWVyUHJpb3JpdHlGb3JJZGVudGlmaWVyKGIubGF5ZXJJZGVu dGlmaWVyKTsKKyAgICAgICAgcmV0dXJuIGFQcmlvcml0eSA8IGJQcmlvcml0eTsKICAgICB9Owog CiAgICAgLy8gVGhlIG9yZGVyIG1heSBjaGFuZ2Ugc28gd2UgbmVlZCB0byByZXByb2Nlc3MgcmVz b2x2ZXIgbXV0YXRpbmcgcnVsZXMgZnJvbSBlYXJsaWVyIHN0eWxlc2hlZXRzLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvUnVsZVNldEJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3Jl L3N0eWxlL1J1bGVTZXRCdWlsZGVyLmgKaW5kZXggMTAzZjJlYzdlMjBhMDQwZTczZjNkNzlkZTc4 NDBkNjk0YmUwODJjYS4uMjAwOTkwYjljZTEwZmZlMzE2NjRjMjg3MjRkYmMxODUyYjZhMWQ5NCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvUnVsZVNldEJ1aWxkZXIuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9zdHlsZS9SdWxlU2V0QnVpbGRlci5oCkBAIC00NCw3ICs0NCw3IEBAIHBy aXZhdGU6CiAgICAgdm9pZCByZWdpc3RlckxheWVycyhjb25zdCBWZWN0b3I8Q2FzY2FkZUxheWVy TmFtZT4mKTsKICAgICB2b2lkIHB1c2hDYXNjYWRlTGF5ZXIoY29uc3QgQ2FzY2FkZUxheWVyTmFt ZSYpOwogICAgIHZvaWQgcG9wQ2FzY2FkZUxheWVyKGNvbnN0IENhc2NhZGVMYXllck5hbWUmKTsK LSAgICB2b2lkIHVwZGF0ZUNhc2NhZGVMYXllck9yZGVyKCk7CisgICAgdm9pZCB1cGRhdGVDYXNj YWRlTGF5ZXJQcmlvcml0aWVzKCk7CiAgICAgdm9pZCBhZGRNdXRhdGluZ1J1bGVzVG9SZXNvbHZl cigpOwogICAgIHZvaWQgdXBkYXRlRHluYW1pY01lZGlhUXVlcmllcygpOwogCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL0NoYW5nZUxvZwppbmRleCA3YzRjZjdiNGE5ZTFhM2ZlZGU0YTFmMDU3MDczZmIwZWZl Yzg1ZWU2Li5iMGZhZThjY2VkOTI4YjVlY2RjNmUyMTM1YzFjOGU0ZTllNGYwMjEyIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAyMS0xMC0wNyAgQW50 dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CisKKyAgICAgICAgQ2FzY2FkZSBsYXllciBz dHlsZXMgc2hvdWxkIGJlIGxvd2VyIHByaW9yaXR5IHRoYW4gdW5sYXllcmVkIHN0eWxlcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxMzQyCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIGZyb20g dGhlIFdQVCByZXBvLgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2Fz Y2FkZS9sYXllci1iYXNpYy5odG1sOgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLWNhc2NhZGUvbGF5ZXItZm9udC1mYWNlLW92ZXJyaWRlLWV4cGVjdGVkLnR4dDoKKyAgICAg ICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jYXNjYWRlL2xheWVyLWZvbnQtZmFjZS1v dmVycmlkZS5odG1sOgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNhc2Nh ZGUvbGF5ZXItaW1wb3J0Lmh0bWw6CisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j c3MtY2FzY2FkZS9sYXllci1rZXlmcmFtZXMtb3ZlcnJpZGUtZXhwZWN0ZWQudHh0OgorICAgICAg ICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNhc2NhZGUvbGF5ZXIta2V5ZnJhbWVzLW92 ZXJyaWRlLmh0bWw6CisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2Fk ZS9sYXllci1zdHlsZXNoZWV0LXNoYXJpbmcuaHRtbDoKKwogMjAyMS0xMC0wNSAgTWFydGluIFJv Ymluc29uICA8bXJvYmluc29uQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW2Nzcy1wb3NpdGlvbi1z dGlja3ldIHNjcm9sbEludG9WaWV3IHNob3VsZCBub3QgdGFrZSBpbnRvIGFjY291bnQgc3RpY2t5 IHBvc2l0aW9uaW5nIG9mZnNldHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jYXNjYWRlL2xheWVyLWJhc2ljLmh0bWwgYi9M YXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2Fk ZS9sYXllci1iYXNpYy5odG1sCmluZGV4IGE3NzFlODUwYTUzMjU5NWI0YWRkMmFhOTMyNDBjNWUy OTkwY2YyZWQuLmY5MmUxNDJmOTE3NTkwNDliYWUwZjk5Njg2NmFmZjNjZmI5NGM3Y2EgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz cy1jYXNjYWRlL2xheWVyLWJhc2ljLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNhc2NhZGUvbGF5ZXItYmFzaWMuaHRtbApAQCAt MjYsOSArMjYsOSBAQCB2YXIgdGVzdENhc2VzID0gWwogICAgIHsKICAgICAgICAgdGl0bGU6ICdB MiBBbm9ueW1vdXMgbGF5ZXJzJywKICAgICAgICAgc3R5bGU6IGAKLSAgICAgICAgICAgIHRhcmdl dCB7IGNvbG9yOiByZWQ7IH0KKyAgICAgICAgICAgIHRhcmdldCB7IGNvbG9yOiBncmVlbjsgfQog ICAgICAgICAgICAgQGxheWVyIHsKLSAgICAgICAgICAgICAgICB0YXJnZXQgeyBjb2xvcjogZ3Jl ZW47IH0KKyAgICAgICAgICAgICAgICB0YXJnZXQgeyBjb2xvcjogcmVkOyB9CiAgICAgICAgICAg ICB9CiAgICAgICAgIGAsCiAgICAgfSwKQEAgLTM2LDkgKzM2LDkgQEAgdmFyIHRlc3RDYXNlcyA9 IFsKICAgICAgICAgdGl0bGU6ICdBMyBBbm9ueW1vdXMgbGF5ZXJzJywKICAgICAgICAgc3R5bGU6 IGAKICAgICAgICAgICAgIEBsYXllciB7Ci0gICAgICAgICAgICAgICAgdGFyZ2V0IHsgY29sb3I6 IGdyZWVuOyB9CisgICAgICAgICAgICAgICAgdGFyZ2V0IHsgY29sb3I6IHJlZDsgfQogICAgICAg ICAgICAgfQotICAgICAgICAgICAgdGFyZ2V0IHsgY29sb3I6IHJlZDsgfQorICAgICAgICAgICAg dGFyZ2V0IHsgY29sb3I6IGdyZWVuOyB9CiAgICAgICAgIGAsCiAgICAgfSwKICAgICB7CkBAIC02 MSw3ICs2MSw2IEBAIHZhciB0ZXN0Q2FzZXMgPSBbCiAgICAgICAgICAgICAgICAgICAgIHRhcmdl dCB7IGNvbG9yOiBncmVlbjsgfQogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KLSAg ICAgICAgICAgIHRhcmdldCB7IGNvbG9yOiByZWQ7IH0KICAgICAgICAgYCwKICAgICB9LAogICAg IHsKQEAgLTczLDcgKzcyLDYgQEAgdmFyIHRlc3RDYXNlcyA9IFsKICAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICAgICAgdGFyZ2V0IHsgY29sb3I6IHJlZDsgfQogICAgICAgICAgICAgfQot ICAgICAgICAgICAgdGFyZ2V0IHsgY29sb3I6IHJlZDsgfQogICAgICAgICBgLAogICAgIH0sCiAg ICAgewpAQCAtMTQzLDkgKzE0MSw5IEBAIHZhciB0ZXN0Q2FzZXMgPSBbCiAgICAgICAgIHRpdGxl OiAnQjIgTmFtZWQgbGF5ZXJzJywKICAgICAgICAgc3R5bGU6IGAKICAgICAgICAgICAgIEBsYXll ciBBIHsKLSAgICAgICAgICAgICAgICB0YXJnZXQgeyBjb2xvcjogZ3JlZW47IH0KKyAgICAgICAg ICAgICAgICB0YXJnZXQgeyBjb2xvcjogcmVkOyB9CiAgICAgICAgICAgICB9Ci0gICAgICAgICAg ICB0YXJnZXQgeyBjb2xvcjogcmVkOyB9CisgICAgICAgICAgICB0YXJnZXQgeyBjb2xvcjogZ3Jl ZW47IH0KICAgICAgICAgYCwKICAgICB9LAogICAgIHsKQEAgLTE1Nyw3ICsxNTUsNiBAQCB2YXIg dGVzdENhc2VzID0gWwogICAgICAgICAgICAgQGxheWVyIEEgewogICAgICAgICAgICAgICAgIHRh cmdldCB7IGNvbG9yOiBncmVlbjsgfQogICAgICAgICAgICAgfQotICAgICAgICAgICAgdGFyZ2V0 IHsgY29sb3I6IHJlZDsgfQogICAgICAgICBgLAogICAgIH0sCiAgICAgewpAQCAtNTA4LDExICs1 MDUsMTAgQEAgdmFyIHRlc3RDYXNlcyA9IFsKICAgICB9LAogXTsKIAotZm9yICh2YXIgaSA9IDA7 IGkgPCB0ZXN0Q2FzZXMubGVuZ3RoOyArK2kpIHsKLSAgICB2YXIgdGVzdENhc2UgPSB0ZXN0Q2Fz ZXNbaV07Ci0gICAgdmFyIGRvY3VtZW50U3R5bGUgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdz dHlsZScpOwotICAgIGRvY3VtZW50U3R5bGUuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4 dE5vZGUodGVzdENhc2VbJ3N0eWxlJ10pKTsKLSAgICBkb2N1bWVudC5oZWFkLmFwcGVuZENoaWxk KGRvY3VtZW50U3R5bGUpOworZm9yIChsZXQgdGVzdENhc2Ugb2YgdGVzdENhc2VzKSB7CisgICAg Y29uc3Qgc3R5bGVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnc3R5bGUnKTsKKyAg ICBzdHlsZUVsZW1lbnQudGV4dENvbnRlbnQgPSB0ZXN0Q2FzZVsnc3R5bGUnXTsKKyAgICBkb2N1 bWVudC5oZWFkLmFwcGVuZChzdHlsZUVsZW1lbnQpOwogCiAgICAgdGVzdChmdW5jdGlvbiAoKSB7 CiAgICAgICAgIHZhciB0YXJnZXRzID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvckFsbCgndGFyZ2V0 Jyk7CkBAIC01MjEsNyArNTE3LDcgQEAgZm9yICh2YXIgaSA9IDA7IGkgPCB0ZXN0Q2FzZXMubGVu Z3RoOyArK2kpIHsKICAgICAgICAgICAgICAgICAgICAgICB0ZXN0Q2FzZVsndGl0bGUnXSArICIs IHRhcmdldCAnIiArIHRhcmdldC5jbGFzc0xpc3RbMF0gKyAiJyIpOwogICAgIH0sIHRlc3RDYXNl Wyd0aXRsZSddKTsKIAotICAgIGRvY3VtZW50LmhlYWQucmVtb3ZlQ2hpbGQoZG9jdW1lbnRTdHls ZSkKKyAgICBzdHlsZUVsZW1lbnQucmVtb3ZlKCk7CiB9CiA8L3NjcmlwdD4KIDwvYm9keT4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1jYXNjYWRlL2xheWVyLWZvbnQtZmFjZS1vdmVycmlkZS1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9s YXllci1mb250LWZhY2Utb3ZlcnJpZGUtZXhwZWN0ZWQudHh0CmluZGV4IDMzYzE3YmRkNTdhZTU0 ZTlkNGRjYzgzZGZiYTIxMzI2ZTAyODQ5Y2QuLjA2YTFmZGIzZTM0ZjljZDY4NjAzMWUzNGFmZjI2 MzBiNmJhMjkwYjEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1jYXNjYWRlL2xheWVyLWZvbnQtZmFjZS1vdmVycmlkZS1leHBl Y3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLWNhc2NhZGUvbGF5ZXItZm9udC1mYWNlLW92ZXJyaWRlLWV4cGVjdGVkLnR4dApA QCAtMSw2ICsxLDYgQEAKIFRlc3QKIAotUEFTUyBAZm9udC1mYWNlIGxheWVyZWQgb3ZlcnJpZGVz IHVubGF5ZXJlZAorUEFTUyBAZm9udC1mYWNlIHVubGF5ZXJlZCBvdmVycmlkZXMgbGF5ZXJlZAog UEFTUyBAZm9udC1mYWNlIG92ZXJyaWRlIGJldHdlZW4gbGF5ZXJzCiBQQVNTIEBmb250LWZhY2Ug b3ZlcnJpZGUgdXBkYXRlIHdpdGggYXBwZW5kZWQgc2hlZXQgMQogUEFTUyBAZm9udC1mYWNlIG92 ZXJyaWRlIHVwZGF0ZSB3aXRoIGFwcGVuZGVkIHNoZWV0IDIKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jYXNjYWRlL2xheWVy LWZvbnQtZmFjZS1vdmVycmlkZS5odG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNhc2NhZGUvbGF5ZXItZm9udC1mYWNlLW92ZXJyaWRlLmh0 bWwKaW5kZXggNTlmZWU0NzllYzE4MDk3ODM5MzJkNGY3YWExMDg3Mzg0OGNkMTMxNC4uODI3NWIw ODE1YTI0MWZkZmNhYWM1N2FjYTRhYmEwNmIxNDRhZmU4ZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNhc2NhZGUvbGF5ZXIt Zm9udC1mYWNlLW92ZXJyaWRlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNhc2NhZGUvbGF5ZXItZm9udC1mYWNlLW92ZXJyaWRl Lmh0bWwKQEAgLTE4LDcgKzE4LDcgQEAKIAogY29uc3QgdGVzdENhc2VzID0gWwogICB7Ci0gICAg dGl0bGU6ICdAZm9udC1mYWNlIGxheWVyZWQgb3ZlcnJpZGVzIHVubGF5ZXJlZCcsCisgICAgdGl0 bGU6ICdAZm9udC1mYWNlIHVubGF5ZXJlZCBvdmVycmlkZXMgbGF5ZXJlZCcsCiAgICAgc3R5bGU6 IGAKICAgICAgICN0YXJnZXQgewogICAgICAgICBmb250LWZhbWlseTogY3VzdG9tLWZvbnQ7CkBA IC0yNywxMyArMjcsMTMgQEAgY29uc3QgdGVzdENhc2VzID0gWwogICAgICAgQGxheWVyIHsKICAg ICAgICAgQGZvbnQtZmFjZSB7CiAgICAgICAgICAgZm9udC1mYW1pbHk6IGN1c3RvbS1mb250Owot ICAgICAgICAgIHNyYzogdXJsKCcvZm9udHMvQWhlbS50dGYnKTsKKyAgICAgICAgICBzcmM6IHVy bCgnL2ZvbnRzL25vdG8vbm90by1zYW5zLXY4LWxhdGluLXJlZ3VsYXIud29mZicpIGZvcm1hdCgn d29mZicpOwogICAgICAgICB9CiAgICAgICB9CiAKICAgICAgIEBmb250LWZhY2UgewogICAgICAg ICBmb250LWZhbWlseTogY3VzdG9tLWZvbnQ7Ci0gICAgICAgIHNyYzogdXJsKCcvZm9udHMvbm90 by9ub3RvLXNhbnMtdjgtbGF0aW4tcmVndWxhci53b2ZmJykgZm9ybWF0KCd3b2ZmJyk7CisgICAg ICAgIHNyYzogdXJsKCcvZm9udHMvQWhlbS50dGYnKTsKICAgICAgIH0KICAgICBgCiAgIH0sCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3MtY2FzY2FkZS9sYXllci1pbXBvcnQuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jYXNjYWRlL2xheWVyLWltcG9ydC5odG1sCmlu ZGV4IDA0NjE4NWIwMzYwODY1YTg1YTAwMmU3ZWM2MTk1Mjk3NDFjYzgxOTUuLjkzNTY1OWFjMWEz ZWI3ZDNkMDE1MTM4ZTg2YjJkODEyMzhkMTExYzkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2lt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jYXNjYWRlL2xheWVyLWltcG9y dC5odG1sCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1jYXNjYWRlL2xheWVyLWltcG9ydC5odG1sCkBAIC01NywyNCArNTcsMjQgQEAgY29u c3QgdGVzdENhc2VzID0gWwogICAgIHsKICAgICAgICAgdGl0bGU6ICdBMSBMYXllciBydWxlcyB3 aXRoIGltcG9ydCcsCiAgICAgICAgIHN0eWxlOiBgCi0gICAgICAgICAgICBAaW1wb3J0IHVybChi YXNpYy1yZWQuY3NzKTsKKyAgICAgICAgICAgIEBpbXBvcnQgdXJsKGJhc2ljLWdyZWVuLmNzcyk7 CiAgICAgICAgICAgICBAbGF5ZXIgewotICAgICAgICAgICAgICAgIHRhcmdldCB7IGNvbG9yOiBn cmVlbjsgfQorICAgICAgICAgICAgICAgIHRhcmdldCB7IGNvbG9yOiByZWQ7IH0KICAgICAgICAg ICAgIH0KICAgICAgICAgYAogICAgIH0sCiAgICAgewogICAgICAgICB0aXRsZTogJ0EyIExheWVy IHJ1bGVzIHdpdGggaW1wb3J0JywKICAgICAgICAgc3R5bGU6IGAKLSAgICAgICAgICAgIEBpbXBv cnQgdXJsKGxheWVyLWdyZWVuLmNzcyk7Ci0gICAgICAgICAgICB0YXJnZXQgeyBjb2xvcjogcmVk OyB9CisgICAgICAgICAgICBAaW1wb3J0IHVybChsYXllci1yZWQuY3NzKTsKKyAgICAgICAgICAg IHRhcmdldCB7IGNvbG9yOiBncmVlbjsgfQogICAgICAgICBgCiAgICAgfSwKICAgICB7CiAgICAg ICAgIHRpdGxlOiAnQTMgTGF5ZXIgcnVsZXMgd2l0aCBpbXBvcnQnLAogICAgICAgICBzdHlsZTog YAotICAgICAgICAgICAgQGltcG9ydCB1cmwobGF5ZXItZ3JlZW4uY3NzKTsKLSAgICAgICAgICAg IEBpbXBvcnQgdXJsKGJhc2ljLXJlZC5jc3MpOworICAgICAgICAgICAgQGltcG9ydCB1cmwoYmFz aWMtZ3JlZW4uY3NzKTsKKyAgICAgICAgICAgIEBpbXBvcnQgdXJsKGxheWVyLXJlZC5jc3MpOwog ICAgICAgICBgCiAgICAgfSwKICAgICB7CkBAIC05Miw4ICs5Miw4IEBAIGNvbnN0IHRlc3RDYXNl cyA9IFsKICAgICB7CiAgICAgICAgIHRpdGxlOiAnQjEgQW5vbnltb3VzIGltcG9ydHMnLAogICAg ICAgICBzdHlsZTogYAotICAgICAgICAgICAgQGltcG9ydCB1cmwoYmFzaWMtZ3JlZW4uY3NzKSBs YXllcjsKLSAgICAgICAgICAgIHRhcmdldCB7IGNvbG9yOiByZWQ7IH0KKyAgICAgICAgICAgIEBp bXBvcnQgdXJsKGJhc2ljLXJlZC5jc3MpIGxheWVyOworICAgICAgICAgICAgdGFyZ2V0IHsgY29s b3I6IGdyZWVuOyB9CiAgICAgICAgIGAKICAgICB9LAogICAgIHsKQEAgLTEyMiw4ICsxMjIsOCBA QCBjb25zdCB0ZXN0Q2FzZXMgPSBbCiAgICAgewogICAgICAgICB0aXRsZTogJ0MxIE5hbWVkIGlt cG9ydHMnLAogICAgICAgICBzdHlsZTogYAotICAgICAgICAgICAgQGltcG9ydCB1cmwoYmFzaWMt Z3JlZW4uY3NzKSBsYXllcihBKTsKLSAgICAgICAgICAgIHRhcmdldCB7IGNvbG9yOiByZWQ7IH0K KyAgICAgICAgICAgIEBpbXBvcnQgdXJsKGJhc2ljLXJlZC5jc3MpIGxheWVyKEEpOworICAgICAg ICAgICAgdGFyZ2V0IHsgY29sb3I6IGdyZWVuOyB9CiAgICAgICAgIGAKICAgICB9LAogICAgIHsK QEAgLTI2MCwxOCArMjYwLDIwIEBAIGZvciAobGV0IHRlc3RDYXNlIG9mIHRlc3RDYXNlcykgewog ICAgICAgICBjb25zdCBzdHlsZVRleHQgPSB0ZXN0Q2FzZVsnc3R5bGUnXS5yZXBsYWNlQWxsKC91 cmxcKCguKz8pXCkvZywgKG1hdGNoLCBwMSkgPT4gewogICAgICAgICAgICAgcmV0dXJuIGB1cmwo ZGF0YTp0ZXh0L2NzcywkeyBlbmNvZGVVUkkoaW1wb3J0c1twMV0pIH0pYDsKICAgICAgICAgfSk7 Ci0gICAgICAgIHN0eWxlRWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9k ZShzdHlsZVRleHQpKTsKKyAgICAgICAgc3R5bGVFbGVtZW50LnRleHRDb250ZW50ID0gc3R5bGVU ZXh0OwogCiAgICAgICAgIGF3YWl0IG5ldyBQcm9taXNlKHJlc29sdmUgPT4gewogICAgICAgICAg ICAgc3R5bGVFbGVtZW50Lm9ubG9hZCA9IHJlc29sdmU7Ci0gICAgICAgICAgICBkb2N1bWVudC5o ZWFkLmFwcGVuZENoaWxkKHN0eWxlRWxlbWVudCk7CisgICAgICAgICAgICBkb2N1bWVudC5oZWFk LmFwcGVuZChzdHlsZUVsZW1lbnQpOwogICAgICAgICB9KTsKIAotICAgICAgICBjb25zdCB0YXJn ZXRzID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvckFsbCgndGFyZ2V0Jyk7Ci0gICAgICAgIGZvciAo dGFyZ2V0IG9mIHRhcmdldHMpCi0gICAgICAgICAgICBhc3NlcnRfZXF1YWxzKHdpbmRvdy5nZXRD b21wdXRlZFN0eWxlKHRhcmdldCkuY29sb3IsICdyZ2IoMCwgMTI4LCAwKScsIHRlc3RDYXNlWyd0 aXRsZSddICsgIiwgdGFyZ2V0ICciICsgdGFyZ2V0LmNsYXNzTGlzdFswXSArICInIik7Ci0KLSAg ICAgICBkb2N1bWVudC5oZWFkLnJlbW92ZUNoaWxkKHN0eWxlRWxlbWVudCk7CisgICAgICAgIHRy eSB7CisgICAgICAgICAgICBjb25zdCB0YXJnZXRzID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvckFs bCgndGFyZ2V0Jyk7CisgICAgICAgICAgICBmb3IgKHRhcmdldCBvZiB0YXJnZXRzKQorICAgICAg ICAgICAgICAgIGFzc2VydF9lcXVhbHMod2luZG93LmdldENvbXB1dGVkU3R5bGUodGFyZ2V0KS5j b2xvciwgJ3JnYigwLCAxMjgsIDApJywgdGVzdENhc2VbJ3RpdGxlJ10gKyAiLCB0YXJnZXQgJyIg KyB0YXJnZXQuY2xhc3NMaXN0WzBdICsgIiciKTsKKyAgICAgICAgfSBmaW5hbGx5IHsKKyAgICAg ICAgICAgIHN0eWxlRWxlbWVudC5yZW1vdmUoKTsKKyAgICAgICAgfQogICAgIH0sIHRlc3RDYXNl Wyd0aXRsZSddKTsKIH0KIDwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNhc2NhZGUvbGF5ZXIta2V5ZnJhbWVz LW92ZXJyaWRlLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1jYXNjYWRlL2xheWVyLWtleWZyYW1lcy1vdmVycmlkZS1leHBl Y3RlZC50eHQKaW5kZXggNjRiMWZiNWRjZDIzZTQ0N2Y4NmI0Y2NhNjdiNzI2NTY2NjQwNDY3OC4u MmI0MmRlMzk1M2E3MDdiNWZhNTVjYTU2ZWM0MWQzMjE4MDZhYmU4MiAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNhc2NhZGUv bGF5ZXIta2V5ZnJhbWVzLW92ZXJyaWRlLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9p bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9sYXllci1rZXlm cmFtZXMtb3ZlcnJpZGUtZXhwZWN0ZWQudHh0CkBAIC0xLDUgKzEsNSBAQAogCi1QQVNTIEBrZXlm cmFtZXMgbGF5ZXJlZCBvdmVycmlkZXMgdW5sYXllcmVkCitQQVNTIEBrZXlmcmFtZXMgdW5sYXll cmVkIG92ZXJyaWRlcyBsYXllcmVkCiBQQVNTIEBrZXlmcmFtZXMgb3ZlcnJpZGUgYmV0d2VlbiBs YXllcnMKIFBBU1MgQGtleWZyYW1lcyBvdmVycmlkZSB1cGRhdGUgd2l0aCBhcHBlbmRlZCBzaGVl dCAxCiBQQVNTIEBrZXlmcmFtZXMgb3ZlcnJpZGUgdXBkYXRlIHdpdGggYXBwZW5kZWQgc2hlZXQg MgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLWNhc2NhZGUvbGF5ZXIta2V5ZnJhbWVzLW92ZXJyaWRlLmh0bWwgYi9MYXlvdXRU ZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9sYXll ci1rZXlmcmFtZXMtb3ZlcnJpZGUuaHRtbAppbmRleCAxOTVlODBiOTdiNDdkZTNiZTgwYjEyOGFl OGRhZTFlNTYxODhjM2VmLi5mODk2MzAzMTgyNjU2NGQ0NzRiY2ExZmNiODE4ODM1ZDQxZDI4MGIy IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3MtY2FzY2FkZS9sYXllci1rZXlmcmFtZXMtb3ZlcnJpZGUuaHRtbAorKysgYi9MYXlv dXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9s YXllci1rZXlmcmFtZXMtb3ZlcnJpZGUuaHRtbApAQCAtMjMsNyArMjMsNyBAQAogCiBjb25zdCB0 ZXN0Q2FzZXMgPSBbCiAgIHsKLSAgICB0aXRsZTogJ0BrZXlmcmFtZXMgbGF5ZXJlZCBvdmVycmlk ZXMgdW5sYXllcmVkJywKKyAgICB0aXRsZTogJ0BrZXlmcmFtZXMgdW5sYXllcmVkIG92ZXJyaWRl cyBsYXllcmVkJywKICAgICBzdHlsZTogYAogICAgICAgI3RhcmdldCB7CiAgICAgICAgIGFuaW1h dGlvbjogYW5pbSAxcyBwYXVzZWQ7CkBAIC0zMSwxMiArMzEsMTIgQEAgY29uc3QgdGVzdENhc2Vz ID0gWwogCiAgICAgICBAbGF5ZXIgewogICAgICAgICBAa2V5ZnJhbWVzIGFuaW0gewotICAgICAg ICAgIGZyb20geyBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsgfQorICAgICAgICAgIGZyb20geyBi YWNrZ3JvdW5kLWNvbG9yOiByZWQ7IH0KICAgICAgICAgfQogICAgICAgfQogCiAgICAgICBAa2V5 ZnJhbWVzIGFuaW0gewotICAgICAgICBmcm9tIHsgYmFja2dyb3VuZC1jb2xvcjogcmVkOyB9Cisg ICAgICAgIGZyb20geyBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsgfQogICAgICAgfQogICAgIGAK ICAgfSwKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy1jYXNjYWRlL2xheWVyLXN0eWxlc2hlZXQtc2hhcmluZy5odG1sIGIvTGF5 b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNhc2NhZGUv bGF5ZXItc3R5bGVzaGVldC1zaGFyaW5nLmh0bWwKaW5kZXggMmI3ODE0NTIxYTRjNzNlNzhlZDEx OTk3M2E1Y2U5NGE0MWUzNWE5NS4uYzE3MmJhYWY4MTg1YjVkZGNmYjFmNzIzMTE4NmQ0MDA4MjI3 YzI5ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLWNhc2NhZGUvbGF5ZXItc3R5bGVzaGVldC1zaGFyaW5nLmh0bWwKKysrIGIv TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNhc2Nh ZGUvbGF5ZXItc3R5bGVzaGVldC1zaGFyaW5nLmh0bWwKQEAgLTEwLDcgKzEwLDYgQEAKICAgICBk aXNwbGF5OiBibG9jazsKICAgICB3aWR0aDogMTAwcHg7CiAgICAgaGVpZ2h0OiAxMDBweDsKLSAg ICBiYWNrZ3JvdW5kLWNvbG9yOiByZWQ7CiAgIH0KIDwvc3R5bGU+CiA8bGluayByZWw9c3R5bGVz aGVldCBocmVmPSJkYXRhOnRleHQvY3NzLEBsYXllcnt0YXJnZXR7YmFja2dyb3VuZC1jb2xvcjpn cmVlbn19Ij4K