211199 2020-04-29 12:43:48 -0700 border-radius fails to clip iframe contents 2022-06-28 20:44:29 -0700 1 1 1 Unclassified WebKit Compositing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=242097 InRadar P2 Normal --- 1 simon.fraser simon.fraser esprehn+autocc ews-watchlist fred.wang glenn kondapallykalyan pdr sergio simon.fraser tsavell webkit-bug-importer zalan oldest_to_newest 1647108 0 simon.fraser 2020-04-29 12:43:48 -0700 border-radius fails to clip iframe contents 1647111 1 397989 simon.fraser 2020-04-29 12:51:35 -0700 Created attachment 397989 Patch 1647112 2 simon.fraser 2020-04-29 12:51:38 -0700 <rdar://problem/61945671> 1647192 3 398004 simon.fraser 2020-04-29 16:01:16 -0700 Created attachment 398004 Patch 1647224 4 ap 2020-04-29 17:53:59 -0700 Is this related to bug 210666 or bug 159045 in any way? 1647255 5 simon.fraser 2020-04-29 19:43:00 -0700 It should fix both. 1647371 6 simon.fraser 2020-04-30 08:15:38 -0700 https://trac.webkit.org/changeset/260950/webkit 1647373 7 simon.fraser 2020-04-30 08:15:58 -0700 *** Bug 210666 has been marked as a duplicate of this bug. *** 1647431 8 tsavell 2020-04-30 11:23:41 -0700 The new test compositing/iframes/border-radius-composited-frame.html added in https://trac.webkit.org/changeset/260950/webkit is flaky on iOS History: https://results.webkit.org/?suite=layout-tests&test=compositing%2Fiframes%2Fborder-radius-composited-frame.html Diff: https://build.webkit.org/results/Apple%20iOS%2013%20Simulator%20Release%20WK2%20(Tests)/r260952%20(4102)/compositing/iframes/border-radius-composited-frame-diffs.html 1647610 9 tsavell 2020-04-30 15:50:28 -0700 Tracking this new test failure in https://bugs.webkit.org/show_bug.cgi?id=211261 397989 2020-04-29 12:51:35 -0700 2020-04-29 13:30:50 -0700 Patch bug-211199-20200429125134.patch text/plain 16908 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwODYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzc0MTcwMDFjMDE5ODdm Y2EyOTE0NTdlZDlmZWEzOTYzMWRhMmIwYi4uNzU4NmRhNjk2ZmIyNGNiZTJkOWNhODAyODQwMmMx OTdhMjc0NzhmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDIwLTA0LTI5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIGJvcmRlci1yYWRp dXMgZmFpbHMgdG8gY2xpcCBpZnJhbWUgY29udGVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMTE5OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v NjE5NDU2NzE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgaWZyYW1lcyBuZWVkIHRvIHVzZSB0aGUgc2FtZSBjb21wb3NpdGVkIGNsaXBwaW5nIHN0cmF0 ZWd5IHRoYXQgd2UgdXNlIGZvciBvdGhlcgorICAgICAgICByZXBsYWNlZCBlbGVtZW50cyB3aXRo IGNvbXBvc2l0ZWQgY29udGVudHMsIGxpa2UgdmlkZW8gYW5kIFdlYkdMLiBUbyBhY2hpZXZlIHRo aXMsCisgICAgICAgIGNoYW5nZSBHcmFwaGljc0xheWVyIHRvIGFsbG93IGNoaWxkIEdyYXBoaWNz TGF5ZXJzIHRvIGJlIHBhcmVudGVkIGluIHRoZSBjb250ZW50cworICAgICAgICBjbGlwcGluZyBs YXllciwganVzdCBsaWtlIGNvbnRlbnQgbGF5ZXJzIGFyZS4gKFdlIGRvbid0IHdhbnQgdG8gZG8g dGhpcyB1bmNvbmRpdGlvbmFsbHksCisgICAgICAgIGJlY2F1c2UgaXQgd2lsbCBjaGFuZ2UgYmVo YXZpb3IgZm9yIHZpZGVvIHdpdGggY29udHJvbHMuKQorCisgICAgICAgIEFkZCBHcmFwaGljc0xh eWVyOjpjb250ZW50c1JlY3RDbGlwc0Rlc2NlbmRhbnRzKCksIGFuZCB1c2VkIGl0IHRvIHJ1biBj b2RlIHRoYXQKKyAgICAgICAgY3JlYXRlcyB0aGUgY29udGVudHMgY2xpcHBpbmcgKGFuZCBvcHRp b25hbCBzaGFwZSkgbGF5ZXJzIGV2ZW4gd2hlbiBubyBjb250ZW50cworICAgICAgICBsYXllciBp cyBwcmVzZW50LiBGaXggdXAgdGhlIHN1YmxheWVyIGxpc3QgYnVpbGRpbmcgdG8gcGFyZW50IGxh eWVycyBmcm9tCisgICAgICAgIGNoaWxkcmVuIGluIHRoZSBjb250ZW50cyBjbGlwcGluZyBsYXll ci4KKworICAgICAgICBUZXN0czogY29tcG9zaXRpbmcvaWZyYW1lcy9ib3JkZXItcmFkaXVzLWNv bXBvc2l0ZWQtZnJhbWUuaHRtbAorICAgICAgICAgICAgICAgY29tcG9zaXRpbmcvaWZyYW1lcy9i b3JkZXItdW5ldmVuLXJhZGl1cy1jb21wb3NpdGVkLWZyYW1lLmh0bWwKKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3Jh cGhpY3NMYXllcjo6R3JhcGhpY3NMYXllcik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv R3JhcGhpY3NMYXllci5oOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllcjo6Y29udGVu dHNSZWN0Q2xpcHNEZXNjZW5kYW50cyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGlj c0xheWVyOjpzZXRDb250ZW50c1JlY3RDbGlwc0Rlc2NlbmRhbnRzKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 R3JhcGhpY3NMYXllckNBOjpzZXRDb250ZW50c1JlY3RDbGlwc0Rlc2NlbmRhbnRzKToKKyAgICAg ICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6dXBkYXRlU3VibGF5ZXJMaXN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6dXBkYXRlQ29udGVudHNSZWN0cyk6CisgICAg ICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ0E6OmNyZWF0ZVRyYW5zZm9ybUFuaW1hdGlvbnNG cm9tS2V5ZnJhbWVzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xh eWVyQ0EuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlQ29uZmlndXJhdGlvbik6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmlzQ29tcG9zaXRlZFN1YmZyYW1lUmVu ZGVyZXIpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaDoKKwog MjAyMC0wNC0yOCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAg ICAgICBTaW1wbGlmeSBjb250ZW50cyBjbGlwcGluZyBsYXllciBnZW9tZXRyeQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmNwcAppbmRleCAw Mjg1YjE0Y2Q5NTMxYTAwZWVlMjliMTc2Yzc5Y2YwZjBjMTdmMjQ0Li5hZjg3YzE4MjdjYmQ0NDM2 NmI0NzM2NTZiZTI1MzFlM2FkMDkxM2RkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmNwcApAQCAtMTM1LDYgKzEzNSw3IEBAIEdyYXBo aWNzTGF5ZXI6OkdyYXBoaWNzTGF5ZXIoVHlwZSB0eXBlLCBHcmFwaGljc0xheWVyQ2xpZW50JiBs YXllckNsaWVudCkKICAgICAsIG1fbWFza3NUb0JvdW5kcyhmYWxzZSkKICAgICAsIG1fZHJhd3ND b250ZW50KGZhbHNlKQogICAgICwgbV9jb250ZW50c1Zpc2libGUodHJ1ZSkKKyAgICAsIG1fY29u dGVudHNSZWN0Q2xpcHNEZXNjZW5kYW50cyhmYWxzZSkKICAgICAsIG1fYWNjZWxlcmF0ZXNEcmF3 aW5nKGZhbHNlKQogICAgICwgbV91c2VzRGlzcGxheUxpc3REcmF3aW5nKGZhbHNlKQogICAgICwg bV9hcHBsaWVzUGFnZVNjYWxlKGZhbHNlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvR3JhcGhpY3NMYXllci5oCmluZGV4IGYwYWRlYWU2NDNiMjAzYzQ1ZTMzNDQwNGQ4 ZGM0YTI5YzkwM2U2MTkuLjNiYjUwNTExZmVmMWU4NjQ3NGNjMGQ3MzFjOWFkMzZjZTNmNDVkZjcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5 ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVy LmgKQEAgLTQ1MSw2ICs0NTEsMTAgQEAgcHVibGljOgogICAgIC8vIFNldCBhIHJvdW5kZWQgcmVj dCB0aGF0IHdpbGwgYmUgdXNlZCB0byBjbGlwIHRoZSBsYXllciBjb250ZW50cy4KICAgICBGbG9h dFJvdW5kZWRSZWN0IGNvbnRlbnRzQ2xpcHBpbmdSZWN0KCkgY29uc3QgeyByZXR1cm4gbV9jb250 ZW50c0NsaXBwaW5nUmVjdDsgfQogICAgIHZpcnR1YWwgdm9pZCBzZXRDb250ZW50c0NsaXBwaW5n UmVjdChjb25zdCBGbG9hdFJvdW5kZWRSZWN0JiByb3VuZGVkUmVjdCkgeyBtX2NvbnRlbnRzQ2xp cHBpbmdSZWN0ID0gcm91bmRlZFJlY3Q7IH0KKyAgICAKKyAgICAvLyBJZiB0cnVlLCBjb250ZW50 c0NsaXBwaW5nUmVjdCBpcyB1c2VkIHRvIGNsaXAgY2hpbGQgR3JhcGhpY3NMYXllcnMuCisgICAg Ym9vbCBjb250ZW50c1JlY3RDbGlwc0Rlc2NlbmRhbnRzKCkgY29uc3QgeyByZXR1cm4gbV9jb250 ZW50c1JlY3RDbGlwc0Rlc2NlbmRhbnRzOyB9CisgICAgdmlydHVhbCB2b2lkIHNldENvbnRlbnRz UmVjdENsaXBzRGVzY2VuZGFudHMoYm9vbCBiKSB7IG1fY29udGVudHNSZWN0Q2xpcHNEZXNjZW5k YW50cyA9IGI7IH0KIAogICAgIC8vIFNldCBhIHJvdW5kZWQgcmVjdCB0aGF0IGlzIHVzZWQgdG8g Y2xpcCB0aGlzIGxheWVyIGFuZCBpdHMgZGVzY2VuZGFudHMgKGltcGxpZXMgc2V0dGluZyBtYXNr c1RvQm91bmRzKS4KICAgICAvLyBSZXR1cm5zIGZhbHNlIGlmIHRoZSBwbGF0Zm9ybSBjYW4ndCBz dXBwb3J0IHRoaXMgcm91bmRlZCBjbGlwLCBhbmQgd2Ugc2hvdWxkIGZhbGwgYmFjayB0byBwYWlu dGluZyBhIG1hc2suCkBAIC03MTEsNiArNzE1LDcgQEAgcHJvdGVjdGVkOgogICAgIGJvb2wgbV9t YXNrc1RvQm91bmRzIDogMTsKICAgICBib29sIG1fZHJhd3NDb250ZW50IDogMTsKICAgICBib29s IG1fY29udGVudHNWaXNpYmxlIDogMTsKKyAgICBib29sIG1fY29udGVudHNSZWN0Q2xpcHNEZXNj ZW5kYW50cyA6IDE7CiAgICAgYm9vbCBtX2FjY2VsZXJhdGVzRHJhd2luZyA6IDE7CiAgICAgYm9v bCBtX3VzZXNEaXNwbGF5TGlzdERyYXdpbmcgOiAxOwogICAgIGJvb2wgbV9hcHBsaWVzUGFnZVNj YWxlIDogMTsgLy8gU2V0IGZvciB0aGUgbGF5ZXIgd2hpY2ggaGFzIHRoZSBwYWdlIHNjYWxlIGFw cGxpZWQgdG8gaXQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcAppbmRleCAwNjBlNzYyOTRhNDI4MjY3MmZlMWZkNzNi NzU5MGE1YzA2ODgxMTVhLi4wNjgzYTNmOTgwN2I3MGQyNjFjYjRlMzZlMmQxNzE5MDJlYTk5NjIz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGlj c0xheWVyQ0EuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dy YXBoaWNzTGF5ZXJDQS5jcHAKQEAgLTk2Nyw2ICs5NjcsMTUgQEAgdm9pZCBHcmFwaGljc0xheWVy Q0E6OnNldENvbnRlbnRzQ2xpcHBpbmdSZWN0KGNvbnN0IEZsb2F0Um91bmRlZFJlY3QmIHJlY3Qp CiAgICAgbm90ZUxheWVyUHJvcGVydHlDaGFuZ2VkKENvbnRlbnRzUmVjdHNDaGFuZ2VkKTsKIH0K IAordm9pZCBHcmFwaGljc0xheWVyQ0E6OnNldENvbnRlbnRzUmVjdENsaXBzRGVzY2VuZGFudHMo Ym9vbCBjb250ZW50c1JlY3RDbGlwc0Rlc2NlbmRhbnRzKQoreworICAgIGlmIChjb250ZW50c1Jl Y3RDbGlwc0Rlc2NlbmRhbnRzID09IG1fY29udGVudHNSZWN0Q2xpcHNEZXNjZW5kYW50cykKKyAg ICAgICAgcmV0dXJuOworCisgICAgR3JhcGhpY3NMYXllcjo6c2V0Q29udGVudHNSZWN0Q2xpcHNE ZXNjZW5kYW50cyhjb250ZW50c1JlY3RDbGlwc0Rlc2NlbmRhbnRzKTsKKyAgICBub3RlTGF5ZXJQ cm9wZXJ0eUNoYW5nZWQoQ2hpbGRyZW5DaGFuZ2VkIHwgQ29udGVudHNSZWN0c0NoYW5nZWQpOwor fQorCiBib29sIEdyYXBoaWNzTGF5ZXJDQTo6c2V0TWFza3NUb0JvdW5kc1JlY3QoY29uc3QgRmxv YXRSb3VuZGVkUmVjdCYgcm91bmRlZFJlY3QpCiB7CiAgICAgaWYgKHJvdW5kZWRSZWN0ID09IG1f bWFza3NUb0JvdW5kc1JlY3QpCkBAIC0yMDE5LDE5ICsyMDI4LDMxIEBAIHZvaWQgR3JhcGhpY3NM YXllckNBOjp1cGRhdGVTdWJsYXllckxpc3QoYm9vbCBtYXhMYXllckRlcHRoUmVhY2hlZCkKICNl bmRpZgogICAgIH07CiAKKyAgICBhdXRvIGJ1aWxkQ2hpbGRMYXllckxpc3QgPSBbJl0oUGxhdGZv cm1DQUxheWVyTGlzdCYgbGlzdCkgeworICAgICAgICBhcHBlbmRMYXllcnNGcm9tQ2hpbGRyZW4o bGlzdCk7CisgICAgICAgIGFwcGVuZERlYnVnTGF5ZXJzKGxpc3QpOworICAgIH07CisKICAgICBQ bGF0Zm9ybUNBTGF5ZXJMaXN0IHByaW1hcnlMYXllckNoaWxkcmVuOwogICAgIGFwcGVuZEN1c3Rv bUFuZENsaXBwaW5nTGF5ZXJzKHByaW1hcnlMYXllckNoaWxkcmVuKTsKIAorICAgIGJvb2wgY2xp cHBpbmdMYXllckhvc3RzQ2hpbGRyZW4gPSBtX2NvbnRlbnRzUmVjdENsaXBzRGVzY2VuZGFudHMg JiYgbV9jb250ZW50c0NsaXBwaW5nTGF5ZXI7CisgICAgaWYgKGNsaXBwaW5nTGF5ZXJIb3N0c0No aWxkcmVuKSB7CisgICAgICAgIFBsYXRmb3JtQ0FMYXllckxpc3QgY2xpcHBpbmdDaGlsZHJlbjsK KyAgICAgICAgYnVpbGRDaGlsZExheWVyTGlzdChjbGlwcGluZ0NoaWxkcmVuKTsKKyAgICAgICAg bV9jb250ZW50c0NsaXBwaW5nTGF5ZXItPnNldFN1YmxheWVycyhjbGlwcGluZ0NoaWxkcmVuKTsK KyAgICB9CisKICAgICBpZiAobV9zdHJ1Y3R1cmFsTGF5ZXIpIHsKICAgICAgICAgUGxhdGZvcm1D QUxheWVyTGlzdCBsYXllckxpc3Q7CiAgICAgICAgIGFwcGVuZFN0cnVjdHVyYWxMYXllckNoaWxk cmVuKGxheWVyTGlzdCk7Ci0gICAgICAgIGFwcGVuZExheWVyc0Zyb21DaGlsZHJlbihsYXllckxp c3QpOwotICAgICAgICBhcHBlbmREZWJ1Z0xheWVycyhsYXllckxpc3QpOworCisgICAgICAgIGlm ICghY2xpcHBpbmdMYXllckhvc3RzQ2hpbGRyZW4pCisgICAgICAgICAgICBidWlsZENoaWxkTGF5 ZXJMaXN0KGxheWVyTGlzdCk7CisKICAgICAgICAgbV9zdHJ1Y3R1cmFsTGF5ZXItPnNldFN1Ymxh eWVycyhsYXllckxpc3QpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIGFwcGVuZExheWVyc0Zyb21D aGlsZHJlbihwcmltYXJ5TGF5ZXJDaGlsZHJlbik7Ci0gICAgICAgIGFwcGVuZERlYnVnTGF5ZXJz KHByaW1hcnlMYXllckNoaWxkcmVuKTsKLSAgICB9CisgICAgfSBlbHNlIGlmICghY2xpcHBpbmdM YXllckhvc3RzQ2hpbGRyZW4pCisgICAgICAgIGJ1aWxkQ2hpbGRMYXllckxpc3QocHJpbWFyeUxh eWVyQ2hpbGRyZW4pOwogCiAgICAgbV9sYXllci0+c2V0U3VibGF5ZXJzKHByaW1hcnlMYXllckNo aWxkcmVuKTsKIH0KQEAgLTI2NzcsNyArMjY5OCw3IEBAIHZvaWQgR3JhcGhpY3NMYXllckNBOjp1 cGRhdGVDbGlwcGluZ1N0cmF0ZWd5KFBsYXRmb3JtQ0FMYXllciYgY2xpcHBpbmdMYXllciwgUmVm CiAKIHZvaWQgR3JhcGhpY3NMYXllckNBOjp1cGRhdGVDb250ZW50c1JlY3RzKCkKIHsKLSAgICBp ZiAoIW1fY29udGVudHNMYXllcikKKyAgICBpZiAoIW1fY29udGVudHNMYXllciAmJiAhbV9jb250 ZW50c1JlY3RDbGlwc0Rlc2NlbmRhbnRzKQogICAgICAgICByZXR1cm47CiAKICAgICBhdXRvIGNv bnRlbnRCb3VuZHMgPSBGbG9hdFJlY3QgeyB7IH0sIG1fY29udGVudHNSZWN0LnNpemUoKSB9OwpA QCAtMjcwMCwxMyArMjcyMSwxNCBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6dXBkYXRlQ29udGVu dHNSZWN0cygpCiAgICAgICAgIAogICAgICAgICB1cGRhdGVDbGlwcGluZ1N0cmF0ZWd5KCptX2Nv bnRlbnRzQ2xpcHBpbmdMYXllciwgbV9jb250ZW50c1NoYXBlTWFza0xheWVyLCBtX2NvbnRlbnRz Q2xpcHBpbmdSZWN0KTsKIAotICAgICAgICBpZiAoZ2FpbmVkT3JMb3N0Q2xpcHBpbmdMYXllcikg eworICAgICAgICBpZiAobV9jb250ZW50c0xheWVyICYmIGdhaW5lZE9yTG9zdENsaXBwaW5nTGF5 ZXIpIHsKICAgICAgICAgICAgIG1fY29udGVudHNMYXllci0+cmVtb3ZlRnJvbVN1cGVybGF5ZXIo KTsKICAgICAgICAgICAgIG1fY29udGVudHNDbGlwcGluZ0xheWVyLT5hcHBlbmRTdWJsYXllcigq bV9jb250ZW50c0xheWVyKTsKICAgICAgICAgfQogICAgIH0gZWxzZSB7CiAgICAgICAgIGlmICht X2NvbnRlbnRzQ2xpcHBpbmdMYXllcikgewotICAgICAgICAgICAgbV9jb250ZW50c0xheWVyLT5y ZW1vdmVGcm9tU3VwZXJsYXllcigpOworICAgICAgICAgICAgaWYgKG1fY29udGVudHNMYXllcikK KyAgICAgICAgICAgICAgICBtX2NvbnRlbnRzTGF5ZXItPnJlbW92ZUZyb21TdXBlcmxheWVyKCk7 CiAKICAgICAgICAgICAgIG1fY29udGVudHNDbGlwcGluZ0xheWVyLT5yZW1vdmVGcm9tU3VwZXJs YXllcigpOwogICAgICAgICAgICAgbV9jb250ZW50c0NsaXBwaW5nTGF5ZXItPnNldE93bmVyKG51 bGxwdHIpOwpAQCAtMjcyNCw4ICsyNzQ2LDEwIEBAIHZvaWQgR3JhcGhpY3NMYXllckNBOjp1cGRh dGVDb250ZW50c1JlY3RzKCkKICAgICBpZiAoZ2FpbmVkT3JMb3N0Q2xpcHBpbmdMYXllcikKICAg ICAgICAgbm90ZVN1YmxheWVyc0NoYW5nZWQoRG9udFNjaGVkdWxlRmx1c2gpOwogCi0gICAgbV9j b250ZW50c0xheWVyLT5zZXRQb3NpdGlvbihtX2NvbnRlbnRzUmVjdC5sb2NhdGlvbigpKTsKLSAg ICBtX2NvbnRlbnRzTGF5ZXItPnNldEJvdW5kcyhjb250ZW50Qm91bmRzKTsKKyAgICBpZiAobV9j b250ZW50c0xheWVyKSB7CisgICAgICAgIG1fY29udGVudHNMYXllci0+c2V0UG9zaXRpb24obV9j b250ZW50c1JlY3QubG9jYXRpb24oKSk7CisgICAgICAgIG1fY29udGVudHNMYXllci0+c2V0Qm91 bmRzKGNvbnRlbnRCb3VuZHMpOworICAgIH0KIAogICAgIGlmIChtX2xheWVyQ2xvbmVzKSB7CiAg ICAgICAgIGZvciAoYXV0byYgbGF5ZXIgOiBtX2xheWVyQ2xvbmVzLT5jb250ZW50c0xheWVyQ2xv bmVzLnZhbHVlcygpKSB7CkBAIC0zNjE1LDcgKzM2MzksMTMgQEAgdm9pZCBHcmFwaGljc0xheWVy Q0E6OnJlc3VtZUFuaW1hdGlvbnMoKQogCiBQbGF0Zm9ybUNBTGF5ZXIqIEdyYXBoaWNzTGF5ZXJD QTo6aG9zdExheWVyRm9yU3VibGF5ZXJzKCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV9zdHJ1Y3R1 cmFsTGF5ZXIuZ2V0KCkgPyBtX3N0cnVjdHVyYWxMYXllci5nZXQoKSA6IG1fbGF5ZXIuZ2V0KCk7 IAorICAgIGlmIChjb250ZW50c1JlY3RDbGlwc0Rlc2NlbmRhbnRzKCkgJiYgbV9jb250ZW50c0Ns aXBwaW5nTGF5ZXIpCisgICAgICAgIHJldHVybiBtX2NvbnRlbnRzQ2xpcHBpbmdMYXllci5nZXQo KTsKKworICAgIGlmIChtX3N0cnVjdHVyYWxMYXllcikKKyAgICAgICAgcmV0dXJuIG1fc3RydWN0 dXJhbExheWVyLmdldCgpOworCisgICAgcmV0dXJuIG1fbGF5ZXIuZ2V0KCk7CiB9CiAKIFBsYXRm b3JtQ0FMYXllciogR3JhcGhpY3NMYXllckNBOjpsYXllckZvclN1cGVybGF5ZXIoKSBjb25zdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NM YXllckNBLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xh eWVyQ0EuaAppbmRleCA3MjQzNDVlYWRiODEyZjVhYjk2YWE2MTkyNGYzMzY3NmRiZTk0NTNjLi4w ZDBjNDZjOGViNDhkNmJhZTQ3NTg1Y2NlZjk1YTcwNjNiNGIwYjI3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuaApAQCAt MTIwLDYgKzEyMCw3IEBAIHB1YmxpYzoKICAgICAKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNl dENvbnRlbnRzUmVjdChjb25zdCBGbG9hdFJlY3QmKSBvdmVycmlkZTsKICAgICBXRUJDT1JFX0VY UE9SVCB2b2lkIHNldENvbnRlbnRzQ2xpcHBpbmdSZWN0KGNvbnN0IEZsb2F0Um91bmRlZFJlY3Qm KSBvdmVycmlkZTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldENvbnRlbnRzUmVjdENsaXBz RGVzY2VuZGFudHMoYm9vbCkgb3ZlcnJpZGU7CiAgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBzZXRN YXNrc1RvQm91bmRzUmVjdChjb25zdCBGbG9hdFJvdW5kZWRSZWN0Jikgb3ZlcnJpZGU7CiAKICAg ICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldFNoYXBlTGF5ZXJQYXRoKGNvbnN0IFBhdGgmKSBvdmVy cmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJh Y2tpbmcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5j cHAKaW5kZXggMDE4MzAxMTg3MzA5NjhjZTg3MWM3MDgyMjkxNDE2YzM3NjhkODZlNy4uZDJjM2Q5 MTkwN2RjMjc1YmZiY2I2NmI4ODVkZGJjYjY1N2MyYmZjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKQEAgLTk2Nyw2ICs5NjcsMTEgQEAg Ym9vbCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUNvbmZpZ3VyYXRpb24oY29uc3QgUmVuZGVy TGF5ZXIqIGNvbXBvc2l0aW5nQW5jZXMKICAgICAgICAgbGF5ZXJDb25maWdDaGFuZ2VkID0gdHJ1 ZTsKICAgICB9CiAKKyAgICBpZiAoUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjppc0NvbXBvc2l0ZWRT dWJmcmFtZVJlbmRlcmVyKHJlbmRlcmVyKCkpKSB7CisgICAgICAgIG1fZ3JhcGhpY3NMYXllci0+ c2V0Q29udGVudHNSZWN0Q2xpcHNEZXNjZW5kYW50cyh0cnVlKTsKKyAgICAgICAgdXBkYXRlQ29u dGVudHNSZWN0cygpOworICAgIH0KKwogICAgIGlmIChpczxSZW5kZXJJbWFnZT4ocmVuZGVyZXIo KSkgJiYgZG93bmNhc3Q8UmVuZGVySW1hZ2U+KHJlbmRlcmVyKCkpLmlzRWRpdGFibGVJbWFnZSgp KSB7CiAgICAgICAgIGF1dG8gZWxlbWVudCA9IHJlbmRlcmVyKCkuZWxlbWVudCgpOwogICAgICAg ICBpZiAoaXM8SFRNTEltYWdlRWxlbWVudD4oZWxlbWVudCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggYmYwNTEyZmFh ZmVkOTY4NzI4ZjI4ODRiOTY0MDMwYzU5MWM2MzE0Yi4uMTAyZTI5ZjJiY2Q0YTg0ZDgxYjljZDg2 M2E3NTc1ZjUwOWZiMWE0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyQ29tcG9zaXRvci5jcHAKQEAgLTI4MjMsNiArMjgyMywxNCBAQCBTY3JvbGxpbmdO b2RlSUQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjphc3luY1Njcm9sbGFibGVDb250YWluZXJOb2Rl SUQoY29uc3QgUmVuZAogICAgIHJldHVybiBjb250YWluZXJTY3JvbGxpbmdOb2RlSUQ7CiB9CiAK K2Jvb2wgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjppc0NvbXBvc2l0ZWRTdWJmcmFtZVJlbmRlcmVy KGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyZXIpCit7CisgICAgaWYgKCFpczxSZW5kZXJXaWRn ZXQ+KHJlbmRlcmVyKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgcmV0dXJuIGRvd25j YXN0PFJlbmRlcldpZGdldD4ocmVuZGVyZXIpLnJlcXVpcmVzQWNjZWxlcmF0ZWRDb21wb3NpdGlu ZygpOworfQorCiAvLyBSZXR1cm4gdHJ1ZSBpZiB0aGUgZ2l2ZW4gbGF5ZXIgaXMgYSBzdGFja2lu ZyBjb250ZXh0IGFuZCBoYXMgY29tcG9zaXRpbmcgY2hpbGQKIC8vIGxheWVycyB0aGF0IGl0IG5l ZWRzIHRvIGNsaXAuIEluIHRoaXMgY2FzZSB3ZSBpbnNlcnQgYSBjbGlwcGluZyBHcmFwaGljc0xh eWVyCiAvLyBpbnRvIHRoZSBoaWVyYXJjaHkgYmV0d2VlbiB0aGlzIGxheWVyIGFuZCBpdHMgY2hp bGRyZW4gaW4gdGhlIHotb3JkZXIgaGllcmFyY2h5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCmluZGV4IDIwMDExM2FlMjcxNDBkZWMwMmY1 ZmRjN2U2ZWJiMmUzYmU2MDk1ZGEuLjdiMmJiYjVmZDFjOWE2NWJiMDQ3ZWU1NzI1MjllNDkzOTNj Y2MyY2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNv bXBvc2l0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmgKQEAgLTI5NSw2ICsyOTUsNyBAQCBwdWJsaWM6CiAgICAgLy8gdG8ga25vdyBpZiB0 aGVyZSBpcyBub24tYWZmaW5lIGNvbnRlbnQsIGUuZy4gZm9yIGRyYXdpbmcgaW50byBhbiBpbWFn ZS4KICAgICBib29sIGhhczNEQ29udGVudCgpIGNvbnN0OwogICAgIAorICAgIHN0YXRpYyBib29s IGlzQ29tcG9zaXRlZFN1YmZyYW1lUmVuZGVyZXIoY29uc3QgUmVuZGVyT2JqZWN0Jik7CiAgICAg c3RhdGljIFJlbmRlckxheWVyQ29tcG9zaXRvciogZnJhbWVDb250ZW50c0NvbXBvc2l0b3IoUmVu ZGVyV2lkZ2V0Jik7CiAgICAgLy8gUmV0dXJuIHRydWUgaWYgdGhlIGxheWVycyBjaGFuZ2VkLgog ICAgIGJvb2wgcGFyZW50RnJhbWVDb250ZW50TGF5ZXJzKFJlbmRlcldpZGdldCYpOwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4 IDg3NTZhYTBkMmZkYmVlY2Y5NmNkMzk4YjViN2Y3ZDkyNzdiMGRiMGIuLjE2NWY3OWNkZWJjZDdi MDUwZDgzZTUyMDkwYzY0ZDhjMTg3N2E3NjEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMC0w NC0yOSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBi b3JkZXItcmFkaXVzIGZhaWxzIHRvIGNsaXAgaWZyYW1lIGNvbnRlbnRzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTExOTkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGNvbXBvc2l0aW5nL2lmcmFtZXMv Ym9yZGVyLXJhZGl1cy1jb21wb3NpdGVkLWZyYW1lLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAg ICAgICAqIGNvbXBvc2l0aW5nL2lmcmFtZXMvYm9yZGVyLXJhZGl1cy1jb21wb3NpdGVkLWZyYW1l Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIGNvbXBvc2l0aW5nL2lmcmFtZXMvYm9yZGVyLXVuZXZl bi1yYWRpdXMtY29tcG9zaXRlZC1mcmFtZS1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAg KiBjb21wb3NpdGluZy9pZnJhbWVzL2JvcmRlci11bmV2ZW4tcmFkaXVzLWNvbXBvc2l0ZWQtZnJh bWUuaHRtbDogQWRkZWQuCisKIDIwMjAtMDQtMjkgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNl ckBhcHBsZS5jb20+CiAKICAgICAgICAgU2ltcGxpZnkgY29udGVudHMgY2xpcHBpbmcgbGF5ZXIg Z2VvbWV0cnkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2lmcmFtZXMvYm9y ZGVyLXJhZGl1cy1jb21wb3NpdGVkLWZyYW1lLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9j b21wb3NpdGluZy9pZnJhbWVzL2JvcmRlci1yYWRpdXMtY29tcG9zaXRlZC1mcmFtZS1leHBlY3Rl ZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLjM2MWU0NTFjNjBmMzljZTFkMTI5ODFkMThiMTE3MzBhYWY4YTQ4 YzgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9pZnJhbWVzL2Jv cmRlci1yYWRpdXMtY29tcG9zaXRlZC1mcmFtZS1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMzIg QEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKyAgICA8c3R5bGU+CisgICAgICAg IC53cmFwcGVyIHsKKyAgICAgICAgICAgIGhlaWdodDogNDAwcHg7CisgICAgICAgICAgICB3aWR0 aDogNDAwcHg7CisgICAgICAgICAgICBib3JkZXI6IDEwcHggc29saWQgYmxhY2s7CisgICAgICAg ICAgICBib3gtc2l6aW5nOiBib3JkZXItYm94OworICAgICAgICAgICAgYm9yZGVyLXJhZGl1czog NTAlOworICAgICAgICAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKKyAgICAgICAgICAgIHRyYW5zZm9y bTogdHJhbnNsYXRlWigwKTsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgLmNvbXBvc2l0 ZWQgeworICAgICAgICAgICAgdHJhbnNmb3JtOiB0cmFuc2xhdGVaKDApOworICAgICAgICB9Cisg ICAgICAgIAorICAgICAgICAuYm94IHsKKyAgICAgICAgICAgIHdpZHRoOiAxMDAlOworICAgICAg ICAgICAgaGVpZ2h0OiAxMDAlOworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogc2lsdmVy OworICAgICAgICB9CisgICAgPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorICAgIDxkaXYgY2xh c3M9IndyYXBwZXIiPgorICAgICAgICA8ZGl2IGNsYXNzPSJjb21wb3NpdGVkIGJveCI+YXNkCisg ICAgICAgIDwvZGl2PgorICAgIDwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvaWZyYW1lcy9ib3JkZXItcmFkaXVzLWNvbXBvc2l0ZWQt ZnJhbWUuaHRtbCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2lmcmFtZXMvYm9yZGVyLXJhZGl1 cy1jb21wb3NpdGVkLWZyYW1lLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZmJkNzRkMzcwNzU5MmE0MjRjODJi MWJjODg5ZDk2ODhlNGI1NjdiYwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBv c2l0aW5nL2lmcmFtZXMvYm9yZGVyLXJhZGl1cy1jb21wb3NpdGVkLWZyYW1lLmh0bWwKQEAgLTAs MCArMSwyNSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDxzdHlsZT4K KyAgICAgICAgaWZyYW1lIHsKKyAgICAgICAgICAgIGhlaWdodDogNDAwcHg7CisgICAgICAgICAg ICB3aWR0aDogNDAwcHg7CisgICAgICAgICAgICBib3JkZXI6IDEwcHggc29saWQgYmxhY2s7Cisg ICAgICAgICAgICBib3gtc2l6aW5nOiBib3JkZXItYm94OworICAgICAgICAgICAgYm9yZGVyLXJh ZGl1czogNTAlOworICAgICAgICB9CisgICAgPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorICAg IDxpZnJhbWUgc3JjZG9jPSIKKwk8c3R5bGU+CisgICAgICAgIGJvZHkgeworICAgICAgICAgICAg YmFja2dyb3VuZC1jb2xvcjogc2lsdmVyOworICAgICAgICAgICAgbWFyZ2luOiAwOworCQkgICAg dHJhbnNmb3JtOiB0cmFuc2xhdGVaKDApOworICAgICAgICB9CisJPC9zdHlsZT4KKyAgICAiPjwv aWZyYW1lPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9z aXRpbmcvaWZyYW1lcy9ib3JkZXItdW5ldmVuLXJhZGl1cy1jb21wb3NpdGVkLWZyYW1lLWV4cGVj dGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9pZnJhbWVzL2JvcmRlci11bmV2ZW4t cmFkaXVzLWNvbXBvc2l0ZWQtZnJhbWUtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4yNWQ4ZjNj ZmUwZWExMDEzOGZkMjY2ZjIyYjY5ODRmNmVhYWNhMzMyCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvY29tcG9zaXRpbmcvaWZyYW1lcy9ib3JkZXItdW5ldmVuLXJhZGl1cy1jb21wb3Np dGVkLWZyYW1lLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwzMiBAQAorPCFET0NUWVBFIGh0bWw+ Cis8aHRtbD4KKzxoZWFkPgorICAgIDxzdHlsZT4KKyAgICAgICAgLndyYXBwZXIgeworICAgICAg ICAgICAgaGVpZ2h0OiA0MDBweDsKKyAgICAgICAgICAgIHdpZHRoOiA0MDBweDsKKyAgICAgICAg ICAgIGJvcmRlcjogMTBweCBzb2xpZCBibGFjazsKKyAgICAgICAgICAgIGJveC1zaXppbmc6IGJv cmRlci1ib3g7CisgICAgICAgICAgICBib3JkZXItcmFkaXVzOiA1MCUgMzAlOworICAgICAgICAg ICAgb3ZlcmZsb3c6IGhpZGRlbjsKKyAgICAgICAgICAgIHRyYW5zZm9ybTogdHJhbnNsYXRlWigw KTsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgLmNvbXBvc2l0ZWQgeworICAgICAgICAg ICAgdHJhbnNmb3JtOiB0cmFuc2xhdGVaKDApOworICAgICAgICB9CisgICAgICAgIAorICAgICAg ICAuYm94IHsKKyAgICAgICAgICAgIHdpZHRoOiAxMDAlOworICAgICAgICAgICAgaGVpZ2h0OiAx MDAlOworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogc2lsdmVyOworICAgICAgICB9Cisg ICAgPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorICAgIDxkaXYgY2xhc3M9IndyYXBwZXIiPgor ICAgICAgICA8ZGl2IGNsYXNzPSJjb21wb3NpdGVkIGJveCI+YXNkCisgICAgICAgIDwvZGl2Pgor ICAgIDwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29t cG9zaXRpbmcvaWZyYW1lcy9ib3JkZXItdW5ldmVuLXJhZGl1cy1jb21wb3NpdGVkLWZyYW1lLmh0 bWwgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9pZnJhbWVzL2JvcmRlci11bmV2ZW4tcmFkaXVz LWNvbXBvc2l0ZWQtZnJhbWUuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lOTM5YWQyMTRjNTkxNzhhMmUwNzk0 NDlkZTY0Y2Q0YWI2MTE3MGMyCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY29tcG9z aXRpbmcvaWZyYW1lcy9ib3JkZXItdW5ldmVuLXJhZGl1cy1jb21wb3NpdGVkLWZyYW1lLmh0bWwK QEAgLTAsMCArMSwyNSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDxz dHlsZT4KKyAgICAgICAgaWZyYW1lIHsKKyAgICAgICAgICAgIGhlaWdodDogNDAwcHg7CisgICAg ICAgICAgICB3aWR0aDogNDAwcHg7CisgICAgICAgICAgICBib3JkZXI6IDEwcHggc29saWQgYmxh Y2s7CisgICAgICAgICAgICBib3gtc2l6aW5nOiBib3JkZXItYm94OworICAgICAgICAgICAgYm9y ZGVyLXJhZGl1czogNTAlIDMwJTsKKyAgICAgICAgfQorICAgIDwvc3R5bGU+Cis8L2hlYWQ+Cis8 Ym9keT4KKyAgICA8aWZyYW1lIHNyY2RvYz0iCisJPHN0eWxlPgorICAgICAgICBib2R5IHsKKyAg ICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IHNpbHZlcjsKKyAgICAgICAgICAgIG1hcmdpbjog MDsKKwkJICAgIHRyYW5zZm9ybTogdHJhbnNsYXRlWigwKTsKKyAgICAgICAgfQorCTwvc3R5bGU+ CisgICAgIj48L2lmcmFtZT4KKzwvYm9keT4KKzwvaHRtbD4K 398004 2020-04-29 16:01:16 -0700 2020-04-29 16:01:16 -0700 Patch bug-211199-20200429160115.patch text/plain 16914 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwOTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2U0N2IyNGY4M2M2NTM2 ZjU0YzgxZTBlNTMwNzdlZWVmNzNiM2I5Mi4uMTlhZWNjNDY0ZGE0MzkxMzBlNTM1ZDMyNmM1ZWIx N2ViMTMwZDUyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDIwLTA0LTI5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIGJvcmRlci1yYWRp dXMgZmFpbHMgdG8gY2xpcCBpZnJhbWUgY29udGVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMTE5OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v NjE5NDU2NzE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgWmFsYW4gQnVqdGFzLgorCisgICAgICAg IGlmcmFtZXMgbmVlZCB0byB1c2UgdGhlIHNhbWUgY29tcG9zaXRlZCBjbGlwcGluZyBzdHJhdGVn eSB0aGF0IHdlIHVzZSBmb3Igb3RoZXIKKyAgICAgICAgcmVwbGFjZWQgZWxlbWVudHMgd2l0aCBj b21wb3NpdGVkIGNvbnRlbnRzLCBsaWtlIHZpZGVvIGFuZCBXZWJHTC4gVG8gYWNoaWV2ZSB0aGlz LAorICAgICAgICBjaGFuZ2UgR3JhcGhpY3NMYXllciB0byBhbGxvdyBjaGlsZCBHcmFwaGljc0xh eWVycyB0byBiZSBwYXJlbnRlZCBpbiB0aGUgY29udGVudHMKKyAgICAgICAgY2xpcHBpbmcgbGF5 ZXIsIGp1c3QgbGlrZSBjb250ZW50IGxheWVycyBhcmUuIChXZSBkb24ndCB3YW50IHRvIGRvIHRo aXMgdW5jb25kaXRpb25hbGx5LAorICAgICAgICBiZWNhdXNlIGl0IHdpbGwgY2hhbmdlIGJlaGF2 aW9yIGZvciB2aWRlbyB3aXRoIGNvbnRyb2xzLikKKworICAgICAgICBBZGQgR3JhcGhpY3NMYXll cjo6Y29udGVudHNSZWN0Q2xpcHNEZXNjZW5kYW50cygpLCBhbmQgdXNlZCBpdCB0byBydW4gY29k ZSB0aGF0CisgICAgICAgIGNyZWF0ZXMgdGhlIGNvbnRlbnRzIGNsaXBwaW5nIChhbmQgb3B0aW9u YWwgc2hhcGUpIGxheWVycyBldmVuIHdoZW4gbm8gY29udGVudHMKKyAgICAgICAgbGF5ZXIgaXMg cHJlc2VudC4gRml4IHVwIHRoZSBzdWJsYXllciBsaXN0IGJ1aWxkaW5nIHRvIHBhcmVudCBsYXll cnMgZnJvbQorICAgICAgICBjaGlsZHJlbiBpbiB0aGUgY29udGVudHMgY2xpcHBpbmcgbGF5ZXIu CisKKyAgICAgICAgVGVzdHM6IGNvbXBvc2l0aW5nL2lmcmFtZXMvYm9yZGVyLXJhZGl1cy1jb21w b3NpdGVkLWZyYW1lLmh0bWwKKyAgICAgICAgICAgICAgIGNvbXBvc2l0aW5nL2lmcmFtZXMvYm9y ZGVyLXVuZXZlbi1yYWRpdXMtY29tcG9zaXRlZC1mcmFtZS5odG1sCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBo aWNzTGF5ZXI6OkdyYXBoaWNzTGF5ZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dy YXBoaWNzTGF5ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI6OmNvbnRlbnRz UmVjdENsaXBzRGVzY2VuZGFudHMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NM YXllcjo6c2V0Q29udGVudHNSZWN0Q2xpcHNEZXNjZW5kYW50cyk6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzTGF5ZXJDQTo6c2V0Q29udGVudHNSZWN0Q2xpcHNEZXNjZW5kYW50cyk6CisgICAgICAg IChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ0E6OnVwZGF0ZVN1YmxheWVyTGlzdCk6CisgICAgICAg IChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ0E6OnVwZGF0ZUNvbnRlbnRzUmVjdHMpOgorICAgICAg ICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNBOjpjcmVhdGVUcmFuc2Zvcm1BbmltYXRpb25zRnJv bUtleWZyYW1lcyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXll ckNBLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUNvbmZpZ3VyYXRpb24pOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjppc0NvbXBvc2l0ZWRTdWJmcmFtZVJlbmRl cmVyKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmg6CisKIDIw MjAtMDQtMjkgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAg ICAgU2ltcGxpZnkgY29udGVudHMgY2xpcHBpbmcgbGF5ZXIgZ2VvbWV0cnkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5jcHAKaW5kZXggMDI4 NWIxNGNkOTUzMWEwMGVlZTI5YjE3NmM3OWNmMGYwYzE3ZjI0NC4uYWY4N2MxODI3Y2JkNDQzNjZi NDczNjU2YmUyNTMxZTNhZDA5MTNkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5jcHAKQEAgLTEzNSw2ICsxMzUsNyBAQCBHcmFwaGlj c0xheWVyOjpHcmFwaGljc0xheWVyKFR5cGUgdHlwZSwgR3JhcGhpY3NMYXllckNsaWVudCYgbGF5 ZXJDbGllbnQpCiAgICAgLCBtX21hc2tzVG9Cb3VuZHMoZmFsc2UpCiAgICAgLCBtX2RyYXdzQ29u dGVudChmYWxzZSkKICAgICAsIG1fY29udGVudHNWaXNpYmxlKHRydWUpCisgICAgLCBtX2NvbnRl bnRzUmVjdENsaXBzRGVzY2VuZGFudHMoZmFsc2UpCiAgICAgLCBtX2FjY2VsZXJhdGVzRHJhd2lu ZyhmYWxzZSkKICAgICAsIG1fdXNlc0Rpc3BsYXlMaXN0RHJhd2luZyhmYWxzZSkKICAgICAsIG1f YXBwbGllc1BhZ2VTY2FsZShmYWxzZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0dyYXBoaWNzTGF5ZXIuaAppbmRleCBmMGFkZWFlNjQzYjIwM2M0NWUzMzQ0MDRkOGRj NGEyOWM5MDNlNjE5Li4zYmI1MDUxMWZlZjFlODY0NzRjYzBkNzMxYzlhZDM2Y2UzZjQ1ZGY3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVy LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5o CkBAIC00NTEsNiArNDUxLDEwIEBAIHB1YmxpYzoKICAgICAvLyBTZXQgYSByb3VuZGVkIHJlY3Qg dGhhdCB3aWxsIGJlIHVzZWQgdG8gY2xpcCB0aGUgbGF5ZXIgY29udGVudHMuCiAgICAgRmxvYXRS b3VuZGVkUmVjdCBjb250ZW50c0NsaXBwaW5nUmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVu dHNDbGlwcGluZ1JlY3Q7IH0KICAgICB2aXJ0dWFsIHZvaWQgc2V0Q29udGVudHNDbGlwcGluZ1Jl Y3QoY29uc3QgRmxvYXRSb3VuZGVkUmVjdCYgcm91bmRlZFJlY3QpIHsgbV9jb250ZW50c0NsaXBw aW5nUmVjdCA9IHJvdW5kZWRSZWN0OyB9CisgICAgCisgICAgLy8gSWYgdHJ1ZSwgY29udGVudHND bGlwcGluZ1JlY3QgaXMgdXNlZCB0byBjbGlwIGNoaWxkIEdyYXBoaWNzTGF5ZXJzLgorICAgIGJv b2wgY29udGVudHNSZWN0Q2xpcHNEZXNjZW5kYW50cygpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVu dHNSZWN0Q2xpcHNEZXNjZW5kYW50czsgfQorICAgIHZpcnR1YWwgdm9pZCBzZXRDb250ZW50c1Jl Y3RDbGlwc0Rlc2NlbmRhbnRzKGJvb2wgYikgeyBtX2NvbnRlbnRzUmVjdENsaXBzRGVzY2VuZGFu dHMgPSBiOyB9CiAKICAgICAvLyBTZXQgYSByb3VuZGVkIHJlY3QgdGhhdCBpcyB1c2VkIHRvIGNs aXAgdGhpcyBsYXllciBhbmQgaXRzIGRlc2NlbmRhbnRzIChpbXBsaWVzIHNldHRpbmcgbWFza3NU b0JvdW5kcykuCiAgICAgLy8gUmV0dXJucyBmYWxzZSBpZiB0aGUgcGxhdGZvcm0gY2FuJ3Qgc3Vw cG9ydCB0aGlzIHJvdW5kZWQgY2xpcCwgYW5kIHdlIHNob3VsZCBmYWxsIGJhY2sgdG8gcGFpbnRp bmcgYSBtYXNrLgpAQCAtNzExLDYgKzcxNSw3IEBAIHByb3RlY3RlZDoKICAgICBib29sIG1fbWFz a3NUb0JvdW5kcyA6IDE7CiAgICAgYm9vbCBtX2RyYXdzQ29udGVudCA6IDE7CiAgICAgYm9vbCBt X2NvbnRlbnRzVmlzaWJsZSA6IDE7CisgICAgYm9vbCBtX2NvbnRlbnRzUmVjdENsaXBzRGVzY2Vu ZGFudHMgOiAxOwogICAgIGJvb2wgbV9hY2NlbGVyYXRlc0RyYXdpbmcgOiAxOwogICAgIGJvb2wg bV91c2VzRGlzcGxheUxpc3REcmF3aW5nIDogMTsKICAgICBib29sIG1fYXBwbGllc1BhZ2VTY2Fs ZSA6IDE7IC8vIFNldCBmb3IgdGhlIGxheWVyIHdoaWNoIGhhcyB0aGUgcGFnZSBzY2FsZSBhcHBs aWVkIHRvIGl0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2EvR3JhcGhpY3NMYXllckNBLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHAKaW5kZXggMDYwZTc2Mjk0YTQyODI2NzJmZTFmZDczYjc1 OTBhNWMwNjg4MTE1YS4uMDY4M2EzZjk4MDdiNzBkMjYxY2I0ZTM2ZTJkMTcxOTAyZWE5OTYyMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NM YXllckNBLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFw aGljc0xheWVyQ0EuY3BwCkBAIC05NjcsNiArOTY3LDE1IEBAIHZvaWQgR3JhcGhpY3NMYXllckNB OjpzZXRDb250ZW50c0NsaXBwaW5nUmVjdChjb25zdCBGbG9hdFJvdW5kZWRSZWN0JiByZWN0KQog ICAgIG5vdGVMYXllclByb3BlcnR5Q2hhbmdlZChDb250ZW50c1JlY3RzQ2hhbmdlZCk7CiB9CiAK K3ZvaWQgR3JhcGhpY3NMYXllckNBOjpzZXRDb250ZW50c1JlY3RDbGlwc0Rlc2NlbmRhbnRzKGJv b2wgY29udGVudHNSZWN0Q2xpcHNEZXNjZW5kYW50cykKK3sKKyAgICBpZiAoY29udGVudHNSZWN0 Q2xpcHNEZXNjZW5kYW50cyA9PSBtX2NvbnRlbnRzUmVjdENsaXBzRGVzY2VuZGFudHMpCisgICAg ICAgIHJldHVybjsKKworICAgIEdyYXBoaWNzTGF5ZXI6OnNldENvbnRlbnRzUmVjdENsaXBzRGVz Y2VuZGFudHMoY29udGVudHNSZWN0Q2xpcHNEZXNjZW5kYW50cyk7CisgICAgbm90ZUxheWVyUHJv cGVydHlDaGFuZ2VkKENoaWxkcmVuQ2hhbmdlZCB8IENvbnRlbnRzUmVjdHNDaGFuZ2VkKTsKK30K KwogYm9vbCBHcmFwaGljc0xheWVyQ0E6OnNldE1hc2tzVG9Cb3VuZHNSZWN0KGNvbnN0IEZsb2F0 Um91bmRlZFJlY3QmIHJvdW5kZWRSZWN0KQogewogICAgIGlmIChyb3VuZGVkUmVjdCA9PSBtX21h c2tzVG9Cb3VuZHNSZWN0KQpAQCAtMjAxOSwxOSArMjAyOCwzMSBAQCB2b2lkIEdyYXBoaWNzTGF5 ZXJDQTo6dXBkYXRlU3VibGF5ZXJMaXN0KGJvb2wgbWF4TGF5ZXJEZXB0aFJlYWNoZWQpCiAjZW5k aWYKICAgICB9OwogCisgICAgYXV0byBidWlsZENoaWxkTGF5ZXJMaXN0ID0gWyZdKFBsYXRmb3Jt Q0FMYXllckxpc3QmIGxpc3QpIHsKKyAgICAgICAgYXBwZW5kTGF5ZXJzRnJvbUNoaWxkcmVuKGxp c3QpOworICAgICAgICBhcHBlbmREZWJ1Z0xheWVycyhsaXN0KTsKKyAgICB9OworCiAgICAgUGxh dGZvcm1DQUxheWVyTGlzdCBwcmltYXJ5TGF5ZXJDaGlsZHJlbjsKICAgICBhcHBlbmRDdXN0b21B bmRDbGlwcGluZ0xheWVycyhwcmltYXJ5TGF5ZXJDaGlsZHJlbik7CiAKKyAgICBib29sIGNsaXBw aW5nTGF5ZXJIb3N0c0NoaWxkcmVuID0gbV9jb250ZW50c1JlY3RDbGlwc0Rlc2NlbmRhbnRzICYm IG1fY29udGVudHNDbGlwcGluZ0xheWVyOworICAgIGlmIChjbGlwcGluZ0xheWVySG9zdHNDaGls ZHJlbikgeworICAgICAgICBQbGF0Zm9ybUNBTGF5ZXJMaXN0IGNsaXBwaW5nQ2hpbGRyZW47Cisg ICAgICAgIGJ1aWxkQ2hpbGRMYXllckxpc3QoY2xpcHBpbmdDaGlsZHJlbik7CisgICAgICAgIG1f Y29udGVudHNDbGlwcGluZ0xheWVyLT5zZXRTdWJsYXllcnMoY2xpcHBpbmdDaGlsZHJlbik7Cisg ICAgfQorCiAgICAgaWYgKG1fc3RydWN0dXJhbExheWVyKSB7CiAgICAgICAgIFBsYXRmb3JtQ0FM YXllckxpc3QgbGF5ZXJMaXN0OwogICAgICAgICBhcHBlbmRTdHJ1Y3R1cmFsTGF5ZXJDaGlsZHJl bihsYXllckxpc3QpOwotICAgICAgICBhcHBlbmRMYXllcnNGcm9tQ2hpbGRyZW4obGF5ZXJMaXN0 KTsKLSAgICAgICAgYXBwZW5kRGVidWdMYXllcnMobGF5ZXJMaXN0KTsKKworICAgICAgICBpZiAo IWNsaXBwaW5nTGF5ZXJIb3N0c0NoaWxkcmVuKQorICAgICAgICAgICAgYnVpbGRDaGlsZExheWVy TGlzdChsYXllckxpc3QpOworCiAgICAgICAgIG1fc3RydWN0dXJhbExheWVyLT5zZXRTdWJsYXll cnMobGF5ZXJMaXN0KTsKLSAgICB9IGVsc2UgewotICAgICAgICBhcHBlbmRMYXllcnNGcm9tQ2hp bGRyZW4ocHJpbWFyeUxheWVyQ2hpbGRyZW4pOwotICAgICAgICBhcHBlbmREZWJ1Z0xheWVycyhw cmltYXJ5TGF5ZXJDaGlsZHJlbik7Ci0gICAgfQorICAgIH0gZWxzZSBpZiAoIWNsaXBwaW5nTGF5 ZXJIb3N0c0NoaWxkcmVuKQorICAgICAgICBidWlsZENoaWxkTGF5ZXJMaXN0KHByaW1hcnlMYXll ckNoaWxkcmVuKTsKIAogICAgIG1fbGF5ZXItPnNldFN1YmxheWVycyhwcmltYXJ5TGF5ZXJDaGls ZHJlbik7CiB9CkBAIC0yNjc3LDcgKzI2OTgsNyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6dXBk YXRlQ2xpcHBpbmdTdHJhdGVneShQbGF0Zm9ybUNBTGF5ZXImIGNsaXBwaW5nTGF5ZXIsIFJlZgog CiB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6dXBkYXRlQ29udGVudHNSZWN0cygpCiB7Ci0gICAgaWYg KCFtX2NvbnRlbnRzTGF5ZXIpCisgICAgaWYgKCFtX2NvbnRlbnRzTGF5ZXIgJiYgIW1fY29udGVu dHNSZWN0Q2xpcHNEZXNjZW5kYW50cykKICAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byBjb250 ZW50Qm91bmRzID0gRmxvYXRSZWN0IHsgeyB9LCBtX2NvbnRlbnRzUmVjdC5zaXplKCkgfTsKQEAg LTI3MDAsMTMgKzI3MjEsMTQgQEAgdm9pZCBHcmFwaGljc0xheWVyQ0E6OnVwZGF0ZUNvbnRlbnRz UmVjdHMoKQogICAgICAgICAKICAgICAgICAgdXBkYXRlQ2xpcHBpbmdTdHJhdGVneSgqbV9jb250 ZW50c0NsaXBwaW5nTGF5ZXIsIG1fY29udGVudHNTaGFwZU1hc2tMYXllciwgbV9jb250ZW50c0Ns aXBwaW5nUmVjdCk7CiAKLSAgICAgICAgaWYgKGdhaW5lZE9yTG9zdENsaXBwaW5nTGF5ZXIpIHsK KyAgICAgICAgaWYgKG1fY29udGVudHNMYXllciAmJiBnYWluZWRPckxvc3RDbGlwcGluZ0xheWVy KSB7CiAgICAgICAgICAgICBtX2NvbnRlbnRzTGF5ZXItPnJlbW92ZUZyb21TdXBlcmxheWVyKCk7 CiAgICAgICAgICAgICBtX2NvbnRlbnRzQ2xpcHBpbmdMYXllci0+YXBwZW5kU3VibGF5ZXIoKm1f Y29udGVudHNMYXllcik7CiAgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICBpZiAobV9j b250ZW50c0NsaXBwaW5nTGF5ZXIpIHsKLSAgICAgICAgICAgIG1fY29udGVudHNMYXllci0+cmVt b3ZlRnJvbVN1cGVybGF5ZXIoKTsKKyAgICAgICAgICAgIGlmIChtX2NvbnRlbnRzTGF5ZXIpCisg ICAgICAgICAgICAgICAgbV9jb250ZW50c0xheWVyLT5yZW1vdmVGcm9tU3VwZXJsYXllcigpOwog CiAgICAgICAgICAgICBtX2NvbnRlbnRzQ2xpcHBpbmdMYXllci0+cmVtb3ZlRnJvbVN1cGVybGF5 ZXIoKTsKICAgICAgICAgICAgIG1fY29udGVudHNDbGlwcGluZ0xheWVyLT5zZXRPd25lcihudWxs cHRyKTsKQEAgLTI3MjQsOCArMjc0NiwxMCBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6dXBkYXRl Q29udGVudHNSZWN0cygpCiAgICAgaWYgKGdhaW5lZE9yTG9zdENsaXBwaW5nTGF5ZXIpCiAgICAg ICAgIG5vdGVTdWJsYXllcnNDaGFuZ2VkKERvbnRTY2hlZHVsZUZsdXNoKTsKIAotICAgIG1fY29u dGVudHNMYXllci0+c2V0UG9zaXRpb24obV9jb250ZW50c1JlY3QubG9jYXRpb24oKSk7Ci0gICAg bV9jb250ZW50c0xheWVyLT5zZXRCb3VuZHMoY29udGVudEJvdW5kcyk7CisgICAgaWYgKG1fY29u dGVudHNMYXllcikgeworICAgICAgICBtX2NvbnRlbnRzTGF5ZXItPnNldFBvc2l0aW9uKG1fY29u dGVudHNSZWN0LmxvY2F0aW9uKCkpOworICAgICAgICBtX2NvbnRlbnRzTGF5ZXItPnNldEJvdW5k cyhjb250ZW50Qm91bmRzKTsKKyAgICB9CiAKICAgICBpZiAobV9sYXllckNsb25lcykgewogICAg ICAgICBmb3IgKGF1dG8mIGxheWVyIDogbV9sYXllckNsb25lcy0+Y29udGVudHNMYXllckNsb25l cy52YWx1ZXMoKSkgewpAQCAtMzYxNSw3ICszNjM5LDEzIEBAIHZvaWQgR3JhcGhpY3NMYXllckNB OjpyZXN1bWVBbmltYXRpb25zKCkKIAogUGxhdGZvcm1DQUxheWVyKiBHcmFwaGljc0xheWVyQ0E6 Omhvc3RMYXllckZvclN1YmxheWVycygpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fc3RydWN0dXJh bExheWVyLmdldCgpID8gbV9zdHJ1Y3R1cmFsTGF5ZXIuZ2V0KCkgOiBtX2xheWVyLmdldCgpOyAK KyAgICBpZiAoY29udGVudHNSZWN0Q2xpcHNEZXNjZW5kYW50cygpICYmIG1fY29udGVudHNDbGlw cGluZ0xheWVyKQorICAgICAgICByZXR1cm4gbV9jb250ZW50c0NsaXBwaW5nTGF5ZXIuZ2V0KCk7 CisKKyAgICBpZiAobV9zdHJ1Y3R1cmFsTGF5ZXIpCisgICAgICAgIHJldHVybiBtX3N0cnVjdHVy YWxMYXllci5nZXQoKTsKKworICAgIHJldHVybiBtX2xheWVyLmdldCgpOwogfQogCiBQbGF0Zm9y bUNBTGF5ZXIqIEdyYXBoaWNzTGF5ZXJDQTo6bGF5ZXJGb3JTdXBlcmxheWVyKCkgY29uc3QKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5 ZXJDQS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXll ckNBLmgKaW5kZXggNzI0MzQ1ZWFkYjgxMmY1YWI5NmFhNjE5MjRmMzM2NzZkYmU5NDUzYy4uMGQw YzQ2YzhlYjQ4ZDZiYWU0NzU4NWNjZWY5NWE3MDYzYjRiMGIyNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgKQEAgLTEy MCw2ICsxMjAsNyBAQCBwdWJsaWM6CiAgICAgCiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRD b250ZW50c1JlY3QoY29uc3QgRmxvYXRSZWN0Jikgb3ZlcnJpZGU7CiAgICAgV0VCQ09SRV9FWFBP UlQgdm9pZCBzZXRDb250ZW50c0NsaXBwaW5nUmVjdChjb25zdCBGbG9hdFJvdW5kZWRSZWN0Jikg b3ZlcnJpZGU7CisgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRDb250ZW50c1JlY3RDbGlwc0Rl c2NlbmRhbnRzKGJvb2wpIG92ZXJyaWRlOwogICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgc2V0TWFz a3NUb0JvdW5kc1JlY3QoY29uc3QgRmxvYXRSb3VuZGVkUmVjdCYpIG92ZXJyaWRlOwogCiAgICAg V0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRTaGFwZUxheWVyUGF0aChjb25zdCBQYXRoJikgb3ZlcnJp ZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNr aW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3Bw CmluZGV4IDAxODMwMTE4NzMwOTY4Y2U4NzFjNzA4MjI5MTQxNmMzNzY4ZDg2ZTcuLmQyYzNkOTE5 MDdkYzI3NWJmYmNiNjZiODg1ZGRiY2I2NTdjMmJmY2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCkBAIC05NjcsNiArOTY3LDExIEBAIGJv b2wgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVDb25maWd1cmF0aW9uKGNvbnN0IFJlbmRlckxh eWVyKiBjb21wb3NpdGluZ0FuY2VzCiAgICAgICAgIGxheWVyQ29uZmlnQ2hhbmdlZCA9IHRydWU7 CiAgICAgfQogCisgICAgaWYgKFJlbmRlckxheWVyQ29tcG9zaXRvcjo6aXNDb21wb3NpdGVkU3Vi ZnJhbWVSZW5kZXJlcihyZW5kZXJlcigpKSkgeworICAgICAgICBtX2dyYXBoaWNzTGF5ZXItPnNl dENvbnRlbnRzUmVjdENsaXBzRGVzY2VuZGFudHModHJ1ZSk7CisgICAgICAgIHVwZGF0ZUNvbnRl bnRzUmVjdHMoKTsKKyAgICB9CisKICAgICBpZiAoaXM8UmVuZGVySW1hZ2U+KHJlbmRlcmVyKCkp ICYmIGRvd25jYXN0PFJlbmRlckltYWdlPihyZW5kZXJlcigpKS5pc0VkaXRhYmxlSW1hZ2UoKSkg ewogICAgICAgICBhdXRvIGVsZW1lbnQgPSByZW5kZXJlcigpLmVsZW1lbnQoKTsKICAgICAgICAg aWYgKGlzPEhUTUxJbWFnZUVsZW1lbnQ+KGVsZW1lbnQpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCmluZGV4IGJmMDUxMmZhYWZl ZDk2ODcyOGYyODg0Yjk2NDAzMGM1OTFjNjMxNGIuLjEwMmUyOWYyYmNkNGE4NGQ4MWI5Y2Q4NjNh NzU3NWY1MDlmYjFhNDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC0yODIzLDYgKzI4MjMsMTQgQEAgU2Nyb2xsaW5nTm9k ZUlEIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6YXN5bmNTY3JvbGxhYmxlQ29udGFpbmVyTm9kZUlE KGNvbnN0IFJlbmQKICAgICByZXR1cm4gY29udGFpbmVyU2Nyb2xsaW5nTm9kZUlEOwogfQogCiti b29sIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6aXNDb21wb3NpdGVkU3ViZnJhbWVSZW5kZXJlcihj b25zdCBSZW5kZXJPYmplY3QmIHJlbmRlcmVyKQoreworICAgIGlmICghaXM8UmVuZGVyV2lkZ2V0 PihyZW5kZXJlcikpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHJldHVybiBkb3duY2Fz dDxSZW5kZXJXaWRnZXQ+KHJlbmRlcmVyKS5yZXF1aXJlc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmco KTsKK30KKwogLy8gUmV0dXJuIHRydWUgaWYgdGhlIGdpdmVuIGxheWVyIGlzIGEgc3RhY2tpbmcg Y29udGV4dCBhbmQgaGFzIGNvbXBvc2l0aW5nIGNoaWxkCiAvLyBsYXllcnMgdGhhdCBpdCBuZWVk cyB0byBjbGlwLiBJbiB0aGlzIGNhc2Ugd2UgaW5zZXJ0IGEgY2xpcHBpbmcgR3JhcGhpY3NMYXll cgogLy8gaW50byB0aGUgaGllcmFyY2h5IGJldHdlZW4gdGhpcyBsYXllciBhbmQgaXRzIGNoaWxk cmVuIGluIHRoZSB6LW9yZGVyIGhpZXJhcmNoeS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaAppbmRleCAyMDAxMTNhZTI3MTQwZGVjMDJmNWZk YzdlNmViYjJlM2JlNjA5NWRhLi43YjJiYmI1ZmQxYzlhNjViYjA0N2VlNTcyNTI5ZTQ5MzkzY2Nj MmNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9z aXRvci5oCkBAIC0yOTUsNiArMjk1LDcgQEAgcHVibGljOgogICAgIC8vIHRvIGtub3cgaWYgdGhl cmUgaXMgbm9uLWFmZmluZSBjb250ZW50LCBlLmcuIGZvciBkcmF3aW5nIGludG8gYW4gaW1hZ2Uu CiAgICAgYm9vbCBoYXMzRENvbnRlbnQoKSBjb25zdDsKICAgICAKKyAgICBzdGF0aWMgYm9vbCBp c0NvbXBvc2l0ZWRTdWJmcmFtZVJlbmRlcmVyKGNvbnN0IFJlbmRlck9iamVjdCYpOwogICAgIHN0 YXRpYyBSZW5kZXJMYXllckNvbXBvc2l0b3IqIGZyYW1lQ29udGVudHNDb21wb3NpdG9yKFJlbmRl cldpZGdldCYpOwogICAgIC8vIFJldHVybiB0cnVlIGlmIHRoZSBsYXllcnMgY2hhbmdlZC4KICAg ICBib29sIHBhcmVudEZyYW1lQ29udGVudExheWVycyhSZW5kZXJXaWRnZXQmKTsKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2 Zjc4MGQ1OTAzNWM3MWJkMzJiYzEwOWE0MjcyYzE5MDgyNDA5MjgwLi4xNDFjN2U2NmNlOTgyOGIx NjUwODM2MGIxYTA5ZGE5ODE2MWZiMDk0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDQt MjkgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgYm9y ZGVyLXJhZGl1cyBmYWlscyB0byBjbGlwIGlmcmFtZSBjb250ZW50cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExMTk5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgWmFsYW4gQnVqdGFzLgorCisgICAgICAgICogY29tcG9zaXRpbmcvaWZyYW1lcy9ib3Jk ZXItcmFkaXVzLWNvbXBvc2l0ZWQtZnJhbWUtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAg ICogY29tcG9zaXRpbmcvaWZyYW1lcy9ib3JkZXItcmFkaXVzLWNvbXBvc2l0ZWQtZnJhbWUuaHRt bDogQWRkZWQuCisgICAgICAgICogY29tcG9zaXRpbmcvaWZyYW1lcy9ib3JkZXItdW5ldmVuLXJh ZGl1cy1jb21wb3NpdGVkLWZyYW1lLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGNv bXBvc2l0aW5nL2lmcmFtZXMvYm9yZGVyLXVuZXZlbi1yYWRpdXMtY29tcG9zaXRlZC1mcmFtZS5o dG1sOiBBZGRlZC4KKwogMjAyMC0wNC0yOSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFw cGxlLmNvbT4KIAogICAgICAgICBTaW1wbGlmeSBjb250ZW50cyBjbGlwcGluZyBsYXllciBnZW9t ZXRyeQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvaWZyYW1lcy9ib3JkZXIt cmFkaXVzLWNvbXBvc2l0ZWQtZnJhbWUtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2NvbXBv c2l0aW5nL2lmcmFtZXMvYm9yZGVyLXJhZGl1cy1jb21wb3NpdGVkLWZyYW1lLWV4cGVjdGVkLmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uMzYxZTQ1MWM2MGYzOWNlMWQxMjk4MWQxOGIxMTczMGFhZjhhNDhjOAot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2lmcmFtZXMvYm9yZGVy LXJhZGl1cy1jb21wb3NpdGVkLWZyYW1lLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwzMiBAQAor PCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDxzdHlsZT4KKyAgICAgICAgLndy YXBwZXIgeworICAgICAgICAgICAgaGVpZ2h0OiA0MDBweDsKKyAgICAgICAgICAgIHdpZHRoOiA0 MDBweDsKKyAgICAgICAgICAgIGJvcmRlcjogMTBweCBzb2xpZCBibGFjazsKKyAgICAgICAgICAg IGJveC1zaXppbmc6IGJvcmRlci1ib3g7CisgICAgICAgICAgICBib3JkZXItcmFkaXVzOiA1MCU7 CisgICAgICAgICAgICBvdmVyZmxvdzogaGlkZGVuOworICAgICAgICAgICAgdHJhbnNmb3JtOiB0 cmFuc2xhdGVaKDApOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICAuY29tcG9zaXRlZCB7 CisgICAgICAgICAgICB0cmFuc2Zvcm06IHRyYW5zbGF0ZVooMCk7CisgICAgICAgIH0KKyAgICAg ICAgCisgICAgICAgIC5ib3ggeworICAgICAgICAgICAgd2lkdGg6IDEwMCU7CisgICAgICAgICAg ICBoZWlnaHQ6IDEwMCU7CisgICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBzaWx2ZXI7Cisg ICAgICAgIH0KKyAgICA8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+CisgICAgPGRpdiBjbGFzcz0i d3JhcHBlciI+CisgICAgICAgIDxkaXYgY2xhc3M9ImNvbXBvc2l0ZWQgYm94Ij5hc2QKKyAgICAg ICAgPC9kaXY+CisgICAgPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9jb21wb3NpdGluZy9pZnJhbWVzL2JvcmRlci1yYWRpdXMtY29tcG9zaXRlZC1mcmFt ZS5odG1sIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvaWZyYW1lcy9ib3JkZXItcmFkaXVzLWNv bXBvc2l0ZWQtZnJhbWUuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5mYmQ3NGQzNzA3NTkyYTQyNGM4MmIxYmM4 ODlkOTY4OGU0YjU2N2JjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRp bmcvaWZyYW1lcy9ib3JkZXItcmFkaXVzLWNvbXBvc2l0ZWQtZnJhbWUuaHRtbApAQCAtMCwwICsx LDI1IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+CisgICAgPHN0eWxlPgorICAg ICAgICBpZnJhbWUgeworICAgICAgICAgICAgaGVpZ2h0OiA0MDBweDsKKyAgICAgICAgICAgIHdp ZHRoOiA0MDBweDsKKyAgICAgICAgICAgIGJvcmRlcjogMTBweCBzb2xpZCBibGFjazsKKyAgICAg ICAgICAgIGJveC1zaXppbmc6IGJvcmRlci1ib3g7CisgICAgICAgICAgICBib3JkZXItcmFkaXVz OiA1MCU7CisgICAgICAgIH0KKyAgICA8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+CisgICAgPGlm cmFtZSBzcmNkb2M9IgorCTxzdHlsZT4KKyAgICAgICAgYm9keSB7CisgICAgICAgICAgICBiYWNr Z3JvdW5kLWNvbG9yOiBzaWx2ZXI7CisgICAgICAgICAgICBtYXJnaW46IDA7CisJCSAgICB0cmFu c2Zvcm06IHRyYW5zbGF0ZVooMCk7CisgICAgICAgIH0KKwk8L3N0eWxlPgorICAgICI+PC9pZnJh bWU+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGlu Zy9pZnJhbWVzL2JvcmRlci11bmV2ZW4tcmFkaXVzLWNvbXBvc2l0ZWQtZnJhbWUtZXhwZWN0ZWQu aHRtbCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2lmcmFtZXMvYm9yZGVyLXVuZXZlbi1yYWRp dXMtY29tcG9zaXRlZC1mcmFtZS1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjc0YWZkODMwNGJk MTI0MzNlYWQyYTQxZDI1MzUwZTQ1MzYxMmYyZjMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9jb21wb3NpdGluZy9pZnJhbWVzL2JvcmRlci11bmV2ZW4tcmFkaXVzLWNvbXBvc2l0ZWQt ZnJhbWUtZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDMyIEBACis8IURPQ1RZUEUgaHRtbD4KKzxo dG1sPgorPGhlYWQ+CisgICAgPHN0eWxlPgorICAgICAgICAud3JhcHBlciB7CisgICAgICAgICAg ICBoZWlnaHQ6IDQwMHB4OworICAgICAgICAgICAgd2lkdGg6IDQwMHB4OworICAgICAgICAgICAg Ym9yZGVyOiAxMHB4IHNvbGlkIGJsYWNrOworICAgICAgICAgICAgYm94LXNpemluZzogYm9yZGVy LWJveDsKKyAgICAgICAgICAgIGJvcmRlci10b3AtbGVmdC1yYWRpdXM6IDMwJTsKKyAgICAgICAg ICAgIG92ZXJmbG93OiBoaWRkZW47CisgICAgICAgICAgICB0cmFuc2Zvcm06IHRyYW5zbGF0ZVoo MCk7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIC5jb21wb3NpdGVkIHsKKyAgICAgICAg ICAgIHRyYW5zZm9ybTogdHJhbnNsYXRlWigwKTsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAg ICAgLmJveCB7CisgICAgICAgICAgICB3aWR0aDogMTAwJTsKKyAgICAgICAgICAgIGhlaWdodDog MTAwJTsKKyAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IHNpbHZlcjsKKyAgICAgICAgfQor ICAgIDwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8ZGl2IGNsYXNzPSJ3cmFwcGVyIj4K KyAgICAgICAgPGRpdiBjbGFzcz0iY29tcG9zaXRlZCBib3giPmFzZAorICAgICAgICA8L2Rpdj4K KyAgICA8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Nv bXBvc2l0aW5nL2lmcmFtZXMvYm9yZGVyLXVuZXZlbi1yYWRpdXMtY29tcG9zaXRlZC1mcmFtZS5o dG1sIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvaWZyYW1lcy9ib3JkZXItdW5ldmVuLXJhZGl1 cy1jb21wb3NpdGVkLWZyYW1lLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNTQ5NDk2ZTFmMmNkZmFlYzg0YTZi MTI5NjVjYmM3ZGQ5YmU4OGRjZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBv c2l0aW5nL2lmcmFtZXMvYm9yZGVyLXVuZXZlbi1yYWRpdXMtY29tcG9zaXRlZC1mcmFtZS5odG1s CkBAIC0wLDAgKzEsMjUgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKyAgICA8 c3R5bGU+CisgICAgICAgIGlmcmFtZSB7CisgICAgICAgICAgICBoZWlnaHQ6IDQwMHB4OworICAg ICAgICAgICAgd2lkdGg6IDQwMHB4OworICAgICAgICAgICAgYm9yZGVyOiAxMHB4IHNvbGlkIGJs YWNrOworICAgICAgICAgICAgYm94LXNpemluZzogYm9yZGVyLWJveDsKKyAgICAgICAgICAgIGJv cmRlci10b3AtbGVmdC1yYWRpdXM6IDMwJTsKKyAgICAgICAgfQorICAgIDwvc3R5bGU+Cis8L2hl YWQ+Cis8Ym9keT4KKyAgICA8aWZyYW1lIHNyY2RvYz0iCisJPHN0eWxlPgorICAgICAgICBib2R5 IHsKKyAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IHNpbHZlcjsKKyAgICAgICAgICAgIG1h cmdpbjogMDsKKwkJICAgIHRyYW5zZm9ybTogdHJhbnNsYXRlWigwKTsKKyAgICAgICAgfQorCTwv c3R5bGU+CisgICAgIj48L2lmcmFtZT4KKzwvYm9keT4KKzwvaHRtbD4K