213580 2020-06-24 17:16:45 -0700 Content sometimes missing in nested scrollers with border-radius 2020-06-26 13:16:38 -0700 1 1 1 Unclassified WebKit Compositing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser changseok esprehn+autocc ews-watchlist fred.wang glenn kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1665917 0 simon.fraser 2020-06-24 17:16:45 -0700 Content sometimes missing in nested scrollers with border-radius 1665922 1 402698 simon.fraser 2020-06-24 17:19:20 -0700 Created attachment 402698 Patch 1665923 2 simon.fraser 2020-06-24 17:19:23 -0700 <rdar://problem/64460373> 1665988 3 402716 simon.fraser 2020-06-24 22:16:01 -0700 Created attachment 402716 Patch 1666217 4 402809 simon.fraser 2020-06-25 14:20:43 -0700 Created attachment 402809 Patch 1666506 5 402879 simon.fraser 2020-06-26 10:14:53 -0700 Created attachment 402879 Patch 1666573 6 ews-feeder 2020-06-26 13:16:38 -0700 Committed r263578: <https://trac.webkit.org/changeset/263578> All reviewed patches have been landed. Closing bug and clearing flags on attachment 402879. 402698 2020-06-24 17:19:20 -0700 2020-06-24 22:15:59 -0700 Patch bug-213580-20200624171919.patch text/plain 7822 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2ZmOTg1NDgzNjcyNzQ0 MTdjMmNkNWJlMTQyOTczYzE5ZDM4ZTA5Ny4uZjI2OWU3Y2QyOWZjMDQyNGY4YTU5YTk4NDUxZWZi Y2NkYzgzODdlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA2LTI0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENvbnRlbnQgc29t ZXRpbWVzIG1pc3NpbmcgaW4gbmVzdGVkIHNjcm9sbGVycyB3aXRoIGJvcmRlci1yYWRpdXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzU4MAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNjQ0NjAzNzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBSZW5kZXJMYXllcjo6Y2xpcFRvUmVjdCgp IGhhcyBhIHNwZWNpYWwgY2FzZSBmb3IgY2xpcHMgaW52b2x2aW5nIGJvcmRlci1yYWRpdXMsCisg ICAgICAgIGludm9sdmluZyBhbiBhbmNlc3RvciB0cmVlIHdhbGsgd2hpY2ggYXBwbGllcyB0aGUg cm91bmRlZCBjbGlwcy4KKworICAgICAgICBJZiB0aG9zZSBhbmNlc3RvcnMgYXJlIGNvbXBvc2l0 ZWQsIHdlJ2xsIGRvIHRoZSBjbGlwcGluZyB2aWEgY29tcG9zaXRpbmcsIHNvIHdlCisgICAgICAg IGRvbid0IHdhbnQgdGhpcyBzb2Z0d2FyZSBjbGlwOyBpdCB3aWxsIGNhdXNlIGNvbnRlbnQgaW5z aWRlIG9mIGNvbXBvc2l0ZWQgb3ZlcmZsb3c6c2Nyb2xsCisgICAgICAgIHRvIGdldCBpbmNvcnJl Y3RseSBjbGlwcGVkIG91dCBzb21ldGltZXMuCisKKyAgICAgICAgRml4IGJ5IHRlc3Rpbmcgd2hl dGhlciB0aGUgbGF5ZXIgaXMgYSBjbGlwcGluZyBib3VuZGFyeSwgYXMgd2UgZG8gZHVyaW5nIHRo ZQorICAgICAgICBjb21wdXRhdGlvbiBvZiBjbGlwIHJlY3RzLgorCisgICAgICAgIFRlc3Q6IGNv bXBvc2l0aW5nL2NsaXBwaW5nL25lc3RlZC1vdmVyZmxvdy13aXRoLWJvcmRlci1yYWRpdXMuaHRt bAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckxheWVyOjpjbGlwVG9SZWN0KToKKwogMjAyMC0wNi0yNCAgU2ltb24gRnJhc2Vy ICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjYwMjc2 KTogU2Nyb2xsaW5nIHRocm91Z2ggc2hlbHZlcyBvbiBtdXNpYy5hcHBsZS5jb20gaXMgbm90IHNt b290aApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggNmIxOWJj Mzg3ZWE4ZDg4ZmExMDNlODNiZWYzNTA5MDc1ZGY5NTc5ZS4uY2MyOTFlNzRjOTMwMjhmYTE4NmQy ZGZkNzFhZjJhNjg2OGM3YTg2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXIuY3BwCkBAIC00MTkyLDcgKzQxOTIsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpjbGlwVG9SZWN0 KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgTGF5ZXJQYWludGluZ0luZm8mCiAgICAg ICAgIC8vIGFueSBsYXllcnMgd2l0aCBvdmVyZmxvdy4gVGhlIGNvbmRpdGlvbiBmb3IgYmVpbmcg YWJsZSB0byBhcHBseSB0aGVzZSBjbGlwcyBpcyB0aGF0IHRoZSBvdmVyZmxvdyBvYmplY3QgYmUg aW4gb3VyCiAgICAgICAgIC8vIGNvbnRhaW5pbmcgYmxvY2sgY2hhaW4gc28gd2UgY2hlY2sgdGhh dCBhbHNvLgogICAgICAgICBmb3IgKFJlbmRlckxheWVyKiBsYXllciA9IHJ1bGUgPT0gSW5jbHVk ZVNlbGZGb3JCb3JkZXJSYWRpdXMgPyB0aGlzIDogcGFyZW50KCk7IGxheWVyOyBsYXllciA9IGxh eWVyLT5wYXJlbnQoKSkgewotICAgICAgICAgICAgaWYgKGxheWVyLT5yZW5kZXJlcigpLmhhc092 ZXJmbG93Q2xpcCgpICYmIGxheWVyLT5yZW5kZXJlcigpLnN0eWxlKCkuaGFzQm9yZGVyUmFkaXVz KCkgJiYgYW5jZXN0b3JMYXllcklzSW5Db250YWluaW5nQmxvY2tDaGFpbigqbGF5ZXIpKSB7Cisg ICAgICAgICAgICBpZiAobGF5ZXItPnJlbmRlcmVyKCkuaGFzT3ZlcmZsb3dDbGlwKCkgJiYgbGF5 ZXItPnJlbmRlcmVyKCkuc3R5bGUoKS5oYXNCb3JkZXJSYWRpdXMoKSAmJiBhbmNlc3RvckxheWVy SXNJbkNvbnRhaW5pbmdCbG9ja0NoYWluKCpsYXllcikgJiYgIWxheWVyLT5jbGlwQ3Jvc3Nlc1Bh aW50aW5nQm91bmRhcnkoKSkgewogICAgICAgICAgICAgICAgIExheW91dFJlY3QgYWRqdXN0ZWRD bGlwUmVjdCA9IExheW91dFJlY3QodG9MYXlvdXRQb2ludChsYXllci0+b2Zmc2V0RnJvbUFuY2Vz dG9yKHBhaW50aW5nSW5mby5yb290TGF5ZXIsIEFkanVzdEZvckNvbHVtbnMpKSwgbGF5ZXItPnNp emUoKSk7CiAgICAgICAgICAgICAgICAgYWRqdXN0ZWRDbGlwUmVjdC5tb3ZlKHBhaW50aW5nSW5m by5zdWJwaXhlbE9mZnNldCk7CiAgICAgICAgICAgICAgICAgRmxvYXRSb3VuZGVkUmVjdCByb3Vu ZGVkUmVjdCA9IGxheWVyLT5yZW5kZXJlcigpLnN0eWxlKCkuZ2V0Um91bmRlZElubmVyQm9yZGVy Rm9yKGFkanVzdGVkQ2xpcFJlY3QpLnBpeGVsU25hcHBlZFJvdW5kZWRSZWN0Rm9yUGFpbnRpbmco ZGV2aWNlU2NhbGVGYWN0b3IpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDUzOTZhZGJkNDhmNjA1ZDM0MmQ1MDg2NTZkM2Qz YzBiZDg0MGNmMzkuLmZmNzc3Njc3YzU2NWI3MDFmYzkwMGZmZjY0ZDhkNzQ2NTQ5NTdhYmIgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMC0wNi0yNCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJh c2VyQGFwcGxlLmNvbT4KKworICAgICAgICBDb250ZW50IHNvbWV0aW1lcyBtaXNzaW5nIGluIG5l c3RlZCBzY3JvbGxlcnMgd2l0aCBib3JkZXItcmFkaXVzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM1ODAKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGNvbXBvc2l0aW5nL2NsaXBwaW5nL25lc3RlZC1v dmVyZmxvdy13aXRoLWJvcmRlci1yYWRpdXMtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAg ICogY29tcG9zaXRpbmcvY2xpcHBpbmcvbmVzdGVkLW92ZXJmbG93LXdpdGgtYm9yZGVyLXJhZGl1 cy5odG1sOiBBZGRlZC4KKwogMjAyMC0wNi0yNCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2Vy QGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjYwMjc2KTogU2Nyb2xsaW5nIHRo cm91Z2ggc2hlbHZlcyBvbiBtdXNpYy5hcHBsZS5jb20gaXMgbm90IHNtb290aApkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvY2xpcHBpbmcvbmVzdGVkLW92ZXJmbG93LXdpdGgt Ym9yZGVyLXJhZGl1cy1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvY2xp cHBpbmcvbmVzdGVkLW92ZXJmbG93LXdpdGgtYm9yZGVyLXJhZGl1cy1leHBlY3RlZC5odG1sCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLjczYjk2OGFhZGNjN2ExN2NiNGJjY2UzZjdiZjFkZTVlZWYyYTI3MTgKLS0tIC9k ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9jbGlwcGluZy9uZXN0ZWQtb3Zl cmZsb3ctd2l0aC1ib3JkZXItcmFkaXVzLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSw2MSBAQAor PCFET0NUWVBFIGh0bWw+IDwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgaW50ZXJuYWw6QXN5bmNP dmVyZmxvd1Njcm9sbGluZ0VuYWJsZWQ9dHJ1ZSBdIC0tPgorPCFET0NUWVBFIGh0bWw+Cis8aHRt bD4KKzxoZWFkPgorICAgIDxzdHlsZT4KKyAgICAgICAgI2NvbnRhaW5lciB7CisgICAgICAgICAg ICB3aWR0aDogMjAwcHg7CisgICAgICAgICAgICBoZWlnaHQ6IDIwMHB4OworICAgICAgICAgICAg bWFyZ2luOiAyMHB4OworICAgICAgICAgICAgb3ZlcmZsb3cteTogc2Nyb2xsOworICAgICAgICAg ICAgYm9yZGVyLXJhZGl1czogMTBweDsKKyAgICAgICAgICAgIGJvcmRlcjogMXB4IHNvbGlkIGJs YWNrOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICAuZmlsbGVyIHsKKyAgICAgICAgICAg IGhlaWdodDogMTAwJTsKKyAgICAgICAgICAgIHdpZHRoOiAxMHB4OworICAgICAgICAgICAgYmFj a2dyb3VuZC1jb2xvcjogc2lsdmVyOworICAgICAgICB9CisKKyAgICAgICAgLmxhc3QgeworICAg ICAgICAgICAgd2lkdGg6IDEwMCU7CisgICAgICAgICAgICBoZWlnaHQ6IDEwMHB4OworICAgICAg ICAgICAgb3ZlcmZsb3c6IHNjcm9sbDsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgLmJv eCB7CisgICAgICAgICAgICB3aWR0aDogODAlOworICAgICAgICAgICAgaGVpZ2h0OiA4MHB4Owor ICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CisgICAgICAgIH0KKyAgICAgICAg CisgICAgICAgIC5vYnNjdXJlciB7CisgICAgICAgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7Cisg ICAgICAgICAgICB3aWR0aDogMTBweDsKKyAgICAgICAgICAgIGhlaWdodDogMTBweDsKKyAgICAg ICAgICAgIGJhY2tncm91bmQtY29sb3I6IGdyYXk7CisgICAgICAgIH0KKyAgICA8L3N0eWxlPgor ICAgIDxzY3JpcHQ+CisgICAgICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCdsb2FkJywgKCkg PT4geworICAgICAgICAgICAgc2V0VGltZW91dCgoKSA9PiB7CisgICAgICAgICAgICAgICAgY29u dGFpbmVyLnNjcm9sbFRvKDAsIDEwMDApOworICAgICAgICAgICAgfSwgMCk7CisgICAgICAgIH0s IGZhbHNlKTsKKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorICAgIDxkaXYgaWQ9Y29u dGFpbmVyPgorICAgICAgICA8ZGl2IGNsYXNzPSJmaWxsZXIiPjwvZGl2PgorICAgICAgICA8ZGl2 IGNsYXNzPWxhc3Q+CisgICAgICAgICAgICA8ZGl2IGNsYXNzPSJib3giPjwvZGl2PgorICAgICAg ICA8L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0ib2JzY3VyZXIiIHN0eWxlPSJsZWZ0OiAyNXB4 OyB0b3A6IDExOHB4OyI+PC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9Im9ic2N1cmVyIiBzdHls ZT0ibGVmdDogMTYwcHg7IHRvcDogMTE4cHg7Ij48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0i b2JzY3VyZXIiIHN0eWxlPSJsZWZ0OiAyNXB4OyB0b3A6IDE5NnB4OyI+PC9kaXY+CisgICAgICAg IDxkaXYgY2xhc3M9Im9ic2N1cmVyIiBzdHlsZT0ibGVmdDogMTYwcHg7IHRvcDogMTk2cHg7Ij48 L2Rpdj4KKyAgICA8L2Rpdj4KKyAgICA8cD5Zb3Ugc2hvdWxkIHNlZSBhIGdyZWVuIGJveCBpbiB0 aGUgc2Nyb2xsZXIuPC9wPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvY29tcG9zaXRpbmcvY2xpcHBpbmcvbmVzdGVkLW92ZXJmbG93LXdpdGgtYm9yZGVyLXJhZGl1 cy5odG1sIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvY2xpcHBpbmcvbmVzdGVkLW92ZXJmbG93 LXdpdGgtYm9yZGVyLXJhZGl1cy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmI1NDUzYjRiMjY3N2ZiMmQwZmQy M2FiNTg0YTI2YmUxYjllZGFiNzUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jb21w b3NpdGluZy9jbGlwcGluZy9uZXN0ZWQtb3ZlcmZsb3ctd2l0aC1ib3JkZXItcmFkaXVzLmh0bWwK QEAgLTAsMCArMSw2NyBAQAorPCFET0NUWVBFIGh0bWw+IDwhLS0gd2Via2l0LXRlc3QtcnVubmVy IFsgaW50ZXJuYWw6QXN5bmNPdmVyZmxvd1Njcm9sbGluZ0VuYWJsZWQ9dHJ1ZSBdIC0tPgorPCFE T0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDxzdHlsZT4KKyAgICAgICAgI2NvbnRh aW5lciB7CisgICAgICAgICAgICB3aWR0aDogMjAwcHg7CisgICAgICAgICAgICBoZWlnaHQ6IDIw MHB4OworICAgICAgICAgICAgbWFyZ2luOiAyMHB4OworICAgICAgICAgICAgb3ZlcmZsb3cteTog c2Nyb2xsOworICAgICAgICAgICAgYm9yZGVyLXJhZGl1czogMTBweDsKKyAgICAgICAgICAgIGJv cmRlcjogMXB4IHNvbGlkIGJsYWNrOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICAuZmls bGVyIHsKKyAgICAgICAgICAgIGhlaWdodDogMTAwJTsKKyAgICAgICAgICAgIHdpZHRoOiAxMHB4 OworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogc2lsdmVyOworICAgICAgICB9CisKKyAg ICAgICAgLmxhc3QgeworICAgICAgICAgICAgd2lkdGg6IDEwMCU7CisgICAgICAgICAgICBoZWln aHQ6IDEwMHB4OworICAgICAgICAgICAgb3ZlcmZsb3c6IHNjcm9sbDsKKyAgICAgICAgICAgIGJv cmRlci1yYWRpdXM6IDJweDsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgLmJveCB7Cisg ICAgICAgICAgICB3aWR0aDogODAlOworICAgICAgICAgICAgaGVpZ2h0OiA4MHB4OworICAgICAg ICAgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CisgICAgICAgIH0KKworICAgICAgICAub2Jz Y3VyZXIgeworICAgICAgICAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICAgICAgICAgd2lk dGg6IDEwcHg7CisgICAgICAgICAgICBoZWlnaHQ6IDEwcHg7CisgICAgICAgICAgICBiYWNrZ3Jv dW5kLWNvbG9yOiBncmF5OworICAgICAgICB9CisgICAgPC9zdHlsZT4KKyAgICA8c2NyaXB0Pgor ICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgICAgICAgICB0ZXN0UnVubmVyLndh aXRVbnRpbERvbmUoKTsKKworICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcignbG9hZCcs ICgpID0+IHsKKyAgICAgICAgICAgIHNldFRpbWVvdXQoKCkgPT4geworICAgICAgICAgICAgICAg IGNvbnRhaW5lci5zY3JvbGxUbygwLCAxMDAwKTsKKyAgICAgICAgICAgICAgICBpZiAod2luZG93 LnRlc3RSdW5uZXIpCisgICAgICAgICAgICAgICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgp OworICAgICAgICAgICAgfSwgMTAwKTsKKyAgICAgICAgfSwgZmFsc2UpOworICAgIDwvc2NyaXB0 PgorPC9oZWFkPgorPGJvZHk+CisgICAgPGRpdiBpZD1jb250YWluZXI+CisgICAgICAgIDxkaXYg Y2xhc3M9ImZpbGxlciI+PC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9bGFzdD4KKyAgICAgICAg ICAgIDxkaXYgY2xhc3M9ImJveCI+PC9kaXY+CisgICAgICAgIDwvZGl2PgorICAgICAgICA8ZGl2 IGNsYXNzPSJvYnNjdXJlciIgc3R5bGU9ImxlZnQ6IDI1cHg7IHRvcDogMTE4cHg7Ij48L2Rpdj4K KyAgICAgICAgPGRpdiBjbGFzcz0ib2JzY3VyZXIiIHN0eWxlPSJsZWZ0OiAxNjBweDsgdG9wOiAx MThweDsiPjwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJvYnNjdXJlciIgc3R5bGU9ImxlZnQ6 IDI1cHg7IHRvcDogMTk2cHg7Ij48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0ib2JzY3VyZXIi IHN0eWxlPSJsZWZ0OiAxNjBweDsgdG9wOiAxOTZweDsiPjwvZGl2PgorICAgIDwvZGl2PgorICAg IDxwPllvdSBzaG91bGQgc2VlIGEgZ3JlZW4gYm94IGluIHRoZSBzY3JvbGxlci48L3A+Cis8L2Jv ZHk+Cis8L2h0bWw+Cg== 402716 2020-06-24 22:16:01 -0700 2020-06-25 14:20:41 -0700 Patch bug-213580-20200624221600.patch text/plain 11421 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2ZmOTg1NDgzNjcyNzQ0 MTdjMmNkNWJlMTQyOTczYzE5ZDM4ZTA5Ny4uODE0YWU1ZDJmNjA3MGI1N2ExM2RiN2JhYjFkYjQ4 ODAzYTZiMGRhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTA2LTI0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENvbnRlbnQgc29t ZXRpbWVzIG1pc3NpbmcgaW4gbmVzdGVkIHNjcm9sbGVycyB3aXRoIGJvcmRlci1yYWRpdXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzU4MAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNjQ0NjAzNzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBSZW5kZXJMYXllcjo6Y2xpcFRvUmVjdCgp IGhhcyBhIHNwZWNpYWwgY2FzZSBmb3IgY2xpcHMgaW52b2x2aW5nIGJvcmRlci1yYWRpdXMsCisg ICAgICAgIGludm9sdmluZyBhbiBhbmNlc3RvciB0cmVlIHdhbGsgd2hpY2ggYXBwbGllcyB0aGUg cm91bmRlZCBjbGlwcy4KKworICAgICAgICBJZiB0aG9zZSBhbmNlc3RvcnMgYXJlIGNvbXBvc2l0 ZWQsIHdlJ2xsIGRvIHRoZSBjbGlwcGluZyB2aWEgY29tcG9zaXRpbmcsIHNvIHdlCisgICAgICAg IGRvbid0IHdhbnQgdGhpcyBzb2Z0d2FyZSBjbGlwOyBpdCB3aWxsIGNhdXNlIGNvbnRlbnQgaW5z aWRlIG9mIGNvbXBvc2l0ZWQgb3ZlcmZsb3c6c2Nyb2xsCisgICAgICAgIHRvIGdldCBpbmNvcnJl Y3RseSBjbGlwcGVkIG91dCBzb21ldGltZXMuCisKKyAgICAgICAgRml4IGJ5IHRlc3Rpbmcgd2hl dGhlciB0aGUgbGF5ZXIgcGFpbnRzIHRoZSBib3JkZXItcmFkaXVzIChyYXRoZXIgdGhhbiByZWx5 aW5nIG9uIGNvbXBvc2l0aW5nCisgICAgICAgIGZvciB0aGUgYm9yZGVyLXJhZGl1cyBjbGlwKS4K KworICAgICAgICBUZXN0OiBjb21wb3NpdGluZy9jbGlwcGluZy9uZXN0ZWQtb3ZlcmZsb3ctd2l0 aC1ib3JkZXItcmFkaXVzLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y2xpcFRvUmVjdCk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y2FsY3VsYXRlQ2xpcFJlY3RzIGNvbnN0KToKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaDoKKwogMjAyMC0wNi0yNCAgU2ltb24gRnJhc2Vy ICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjYwMjc2 KTogU2Nyb2xsaW5nIHRocm91Z2ggc2hlbHZlcyBvbiBtdXNpYy5hcHBsZS5jb20gaXMgbm90IHNt b290aApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggNmIxOWJj Mzg3ZWE4ZDg4ZmExMDNlODNiZWYzNTA5MDc1ZGY5NTc5ZS4uMjg0OTFlNWY1MjQwNzY3NmRkODJi NTBjNGQwOWM0N2FmYTZjZTk1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXIuY3BwCkBAIC00MTkyLDcgKzQxOTIsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpjbGlwVG9SZWN0 KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgTGF5ZXJQYWludGluZ0luZm8mCiAgICAg ICAgIC8vIGFueSBsYXllcnMgd2l0aCBvdmVyZmxvdy4gVGhlIGNvbmRpdGlvbiBmb3IgYmVpbmcg YWJsZSB0byBhcHBseSB0aGVzZSBjbGlwcyBpcyB0aGF0IHRoZSBvdmVyZmxvdyBvYmplY3QgYmUg aW4gb3VyCiAgICAgICAgIC8vIGNvbnRhaW5pbmcgYmxvY2sgY2hhaW4gc28gd2UgY2hlY2sgdGhh dCBhbHNvLgogICAgICAgICBmb3IgKFJlbmRlckxheWVyKiBsYXllciA9IHJ1bGUgPT0gSW5jbHVk ZVNlbGZGb3JCb3JkZXJSYWRpdXMgPyB0aGlzIDogcGFyZW50KCk7IGxheWVyOyBsYXllciA9IGxh eWVyLT5wYXJlbnQoKSkgewotICAgICAgICAgICAgaWYgKGxheWVyLT5yZW5kZXJlcigpLmhhc092 ZXJmbG93Q2xpcCgpICYmIGxheWVyLT5yZW5kZXJlcigpLnN0eWxlKCkuaGFzQm9yZGVyUmFkaXVz KCkgJiYgYW5jZXN0b3JMYXllcklzSW5Db250YWluaW5nQmxvY2tDaGFpbigqbGF5ZXIpKSB7Cisg ICAgICAgICAgICBpZiAobGF5ZXItPnJlbmRlcmVyKCkuaGFzT3ZlcmZsb3dDbGlwKCkgJiYgbGF5 ZXItPnJlbmRlcmVyKCkuc3R5bGUoKS5oYXNCb3JkZXJSYWRpdXMoKSAmJiBhbmNlc3RvckxheWVy SXNJbkNvbnRhaW5pbmdCbG9ja0NoYWluKCpsYXllcikgJiYgbGF5ZXItPnBhaW50c1dpdGhCb3Jk ZXJSYWRpdXMocGFpbnRpbmdJbmZvLnBhaW50QmVoYXZpb3IpKSB7CiAgICAgICAgICAgICAgICAg TGF5b3V0UmVjdCBhZGp1c3RlZENsaXBSZWN0ID0gTGF5b3V0UmVjdCh0b0xheW91dFBvaW50KGxh eWVyLT5vZmZzZXRGcm9tQW5jZXN0b3IocGFpbnRpbmdJbmZvLnJvb3RMYXllciwgQWRqdXN0Rm9y Q29sdW1ucykpLCBsYXllci0+c2l6ZSgpKTsKICAgICAgICAgICAgICAgICBhZGp1c3RlZENsaXBS ZWN0Lm1vdmUocGFpbnRpbmdJbmZvLnN1YnBpeGVsT2Zmc2V0KTsKICAgICAgICAgICAgICAgICBG bG9hdFJvdW5kZWRSZWN0IHJvdW5kZWRSZWN0ID0gbGF5ZXItPnJlbmRlcmVyKCkuc3R5bGUoKS5n ZXRSb3VuZGVkSW5uZXJCb3JkZXJGb3IoYWRqdXN0ZWRDbGlwUmVjdCkucGl4ZWxTbmFwcGVkUm91 bmRlZFJlY3RGb3JQYWludGluZyhkZXZpY2VTY2FsZUZhY3Rvcik7CkBAIC02MzUwLDYgKzYzNTAs MTggQEAgYm9vbCBSZW5kZXJMYXllcjo6c2hvdWxkQXBwbHlDbGlwUGF0aChPcHRpb25TZXQ8UGFp bnRCZWhhdmlvcj4gcGFpbnRCZWhhdmlvciwgT3AKICAgICByZXR1cm4gcGFpbnRGbGFncy5jb250 YWlucyhQYWludExheWVyUGFpbnRpbmdDb21wb3NpdGluZ0NsaXBQYXRoUGhhc2UpOwogfQogCiti b29sIFJlbmRlckxheWVyOjpwYWludHNXaXRoQm9yZGVyUmFkaXVzKE9wdGlvblNldDxQYWludEJl aGF2aW9yPiBwYWludEJlaGF2aW9yKSBjb25zdAoreworICAgIGlmICghcmVuZGVyZXIoKS5oYXNP dmVyZmxvd0NsaXAoKSB8fCAhcmVuZGVyZXIoKS5zdHlsZSgpLmhhc0JvcmRlclJhZGl1cygpKQor ICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBib29sIHBhaW50c1RvV2luZG93ID0gIWlzQ29t cG9zaXRlZCgpIHx8IGJhY2tpbmcoKS0+cGFpbnRzSW50b1dpbmRvdygpOworICAgIGlmIChwYWlu dHNUb1dpbmRvdyB8fCAocGFpbnRCZWhhdmlvciAmIFBhaW50QmVoYXZpb3I6OkZsYXR0ZW5Db21w b3NpdGluZ0xheWVycykpCisgICAgICAgIHJldHVybiB0cnVlOworCisgICAgcmV0dXJuICFiYWNr aW5nKCktPmhhc0NsaXBwaW5nTGF5ZXIoKTsKK30KKwogYm9vbCBSZW5kZXJMYXllcjo6c2Nyb2xs aW5nTWF5UmV2ZWFsQmFja2dyb3VuZCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHNjcm9sbHNPdmVy ZmxvdygpIHx8IHVzZXNDb21wb3NpdGVkU2Nyb2xsaW5nKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllci5oCmluZGV4IDMzNzE2MjMzMzg4ZGU5YzM2ZTFhZjViOWFkNWI5ZWQwMTdi NTMzZmUuLjJkYmUwYTNlOWZmMTVkNGU4N2M5Y2EzOGY4Nzg4MzhjMDMxY2Q0NWMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCkBAIC04ODEsNiArODgxLDggQEAgcHVibGlj OgogICAgIGJvb2wgc2hvdWxkUGFpbnRNYXNrKE9wdGlvblNldDxQYWludEJlaGF2aW9yPiwgT3B0 aW9uU2V0PFBhaW50TGF5ZXJGbGFnPikgY29uc3Q7CiAgICAgYm9vbCBzaG91bGRBcHBseUNsaXBQ YXRoKE9wdGlvblNldDxQYWludEJlaGF2aW9yPiwgT3B0aW9uU2V0PFBhaW50TGF5ZXJGbGFnPikg Y29uc3Q7CiAKKyAgICBib29sIHBhaW50c1dpdGhCb3JkZXJSYWRpdXMoT3B0aW9uU2V0PFBhaW50 QmVoYXZpb3I+KSBjb25zdDsKKwogICAgIC8vIFJldHVybnMgdHJ1ZSBpZiBiYWNrZ3JvdW5kIHBo YXNlIGlzIHBhaW50ZWQgb3BhcXVlIGluIHRoZSBnaXZlbiByZWN0LgogICAgIC8vIFRoZSBxdWVy eSByZWN0IGlzIGdpdmVuIGluIGxvY2FsIGNvb3JkaW5hdGVzLgogICAgIGJvb2wgYmFja2dyb3Vu ZElzS25vd25Ub0JlT3BhcXVlSW5SZWN0KGNvbnN0IExheW91dFJlY3QmKSBjb25zdDsKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl eCA1Mzk2YWRiZDQ4ZjYwNWQzNDJkNTA4NjU2ZDNkM2MwYmQ4NDBjZjM5Li43ZGM3NWE0ZTQ4OGJh MTM0OTI1Y2VjNmY0ZTQyYmUxZjBkNDRjNDc5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAt MDYtMjQgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAg Q29udGVudCBzb21ldGltZXMgbWlzc2luZyBpbiBuZXN0ZWQgc2Nyb2xsZXJzIHdpdGggYm9yZGVy LXJhZGl1cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjEzNTgwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NDQ2MDM3Mz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGNvbXBvc2l0aW5nL2NsaXBwaW5n L25lc3RlZC1vdmVyZmxvdy13aXRoLWJvcmRlci1yYWRpdXMtZXhwZWN0ZWQuaHRtbDogQWRkZWQu CisgICAgICAgICogY29tcG9zaXRpbmcvY2xpcHBpbmcvbmVzdGVkLW92ZXJmbG93LXdpdGgtYm9y ZGVyLXJhZGl1cy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBjb21wb3NpdGluZy9oaWRwaS1jb21w b3NpdGluZy1sYXllci13aXRoLXRpbGUtbGF5ZXJzLW9uLXN1YnBpeGVsLXBvc2l0aW9uLWV4cGVj dGVkLmh0bWw6CisgICAgICAgICogY29tcG9zaXRpbmcvaGlkcGktY29tcG9zaXRpbmctbGF5ZXIt d2l0aC10aWxlLWxheWVycy1vbi1zdWJwaXhlbC1wb3NpdGlvbi5odG1sOiBUd2VhayB0aGUgY29s b3JzIGFuZCByYWRpaSB0byBtYWtlIGZhaWx1cmVzIG9uIHRoaXMgdGVzdCBtb3JlIG9idmlvdXMu CisKIDIwMjAtMDYtMjQgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAK ICAgICAgICAgUkVHUkVTU0lPTiAocjI2MDI3Nik6IFNjcm9sbGluZyB0aHJvdWdoIHNoZWx2ZXMg b24gbXVzaWMuYXBwbGUuY29tIGlzIG5vdCBzbW9vdGgKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2NvbXBvc2l0aW5nL2NsaXBwaW5nL25lc3RlZC1vdmVyZmxvdy13aXRoLWJvcmRlci1yYWRpdXMt ZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2NsaXBwaW5nL25lc3RlZC1v dmVyZmxvdy13aXRoLWJvcmRlci1yYWRpdXMtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43M2I5 NjhhYWRjYzdhMTdjYjRiY2NlM2Y3YmYxZGU1ZWVmMmEyNzE4Ci0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvY2xpcHBpbmcvbmVzdGVkLW92ZXJmbG93LXdpdGgtYm9y ZGVyLXJhZGl1cy1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsNjEgQEAKKzwhRE9DVFlQRSBodG1s PiA8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIGludGVybmFsOkFzeW5jT3ZlcmZsb3dTY3JvbGxp bmdFbmFibGVkPXRydWUgXSAtLT4KKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKyAg ICA8c3R5bGU+CisgICAgICAgICNjb250YWluZXIgeworICAgICAgICAgICAgd2lkdGg6IDIwMHB4 OworICAgICAgICAgICAgaGVpZ2h0OiAyMDBweDsKKyAgICAgICAgICAgIG1hcmdpbjogMjBweDsK KyAgICAgICAgICAgIG92ZXJmbG93LXk6IHNjcm9sbDsKKyAgICAgICAgICAgIGJvcmRlci1yYWRp dXM6IDEwcHg7CisgICAgICAgICAgICBib3JkZXI6IDFweCBzb2xpZCBibGFjazsKKyAgICAgICAg fQorICAgICAgICAKKyAgICAgICAgLmZpbGxlciB7CisgICAgICAgICAgICBoZWlnaHQ6IDEwMCU7 CisgICAgICAgICAgICB3aWR0aDogMTBweDsKKyAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6 IHNpbHZlcjsKKyAgICAgICAgfQorCisgICAgICAgIC5sYXN0IHsKKyAgICAgICAgICAgIHdpZHRo OiAxMDAlOworICAgICAgICAgICAgaGVpZ2h0OiAxMDBweDsKKyAgICAgICAgICAgIG92ZXJmbG93 OiBzY3JvbGw7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIC5ib3ggeworICAgICAgICAg ICAgd2lkdGg6IDgwJTsKKyAgICAgICAgICAgIGhlaWdodDogODBweDsKKyAgICAgICAgICAgIGJh Y2tncm91bmQtY29sb3I6IGdyZWVuOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICAub2Jz Y3VyZXIgeworICAgICAgICAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICAgICAgICAgd2lk dGg6IDEwcHg7CisgICAgICAgICAgICBoZWlnaHQ6IDEwcHg7CisgICAgICAgICAgICBiYWNrZ3Jv dW5kLWNvbG9yOiBncmF5OworICAgICAgICB9CisgICAgPC9zdHlsZT4KKyAgICA8c2NyaXB0Pgor ICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcignbG9hZCcsICgpID0+IHsKKyAgICAgICAg ICAgIHNldFRpbWVvdXQoKCkgPT4geworICAgICAgICAgICAgICAgIGNvbnRhaW5lci5zY3JvbGxU bygwLCAxMDAwKTsKKyAgICAgICAgICAgIH0sIDApOworICAgICAgICB9LCBmYWxzZSk7CisgICAg PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8ZGl2IGlkPWNvbnRhaW5lcj4KKyAgICAg ICAgPGRpdiBjbGFzcz0iZmlsbGVyIj48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz1sYXN0Pgor ICAgICAgICAgICAgPGRpdiBjbGFzcz0iYm94Ij48L2Rpdj4KKyAgICAgICAgPC9kaXY+CisgICAg ICAgIDxkaXYgY2xhc3M9Im9ic2N1cmVyIiBzdHlsZT0ibGVmdDogMjVweDsgdG9wOiAxMThweDsi PjwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJvYnNjdXJlciIgc3R5bGU9ImxlZnQ6IDE2MHB4 OyB0b3A6IDExOHB4OyI+PC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9Im9ic2N1cmVyIiBzdHls ZT0ibGVmdDogMjVweDsgdG9wOiAxOTZweDsiPjwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJv YnNjdXJlciIgc3R5bGU9ImxlZnQ6IDE2MHB4OyB0b3A6IDE5NnB4OyI+PC9kaXY+CisgICAgPC9k aXY+CisgICAgPHA+WW91IHNob3VsZCBzZWUgYSBncmVlbiBib3ggaW4gdGhlIHNjcm9sbGVyLjwv cD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5n L2NsaXBwaW5nL25lc3RlZC1vdmVyZmxvdy13aXRoLWJvcmRlci1yYWRpdXMuaHRtbCBiL0xheW91 dFRlc3RzL2NvbXBvc2l0aW5nL2NsaXBwaW5nL25lc3RlZC1vdmVyZmxvdy13aXRoLWJvcmRlci1y YWRpdXMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iNTQ1M2I0YjI2NzdmYjJkMGZkMjNhYjU4NGEyNmJlMWI5 ZWRhYjc1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvY2xpcHBp bmcvbmVzdGVkLW92ZXJmbG93LXdpdGgtYm9yZGVyLXJhZGl1cy5odG1sCkBAIC0wLDAgKzEsNjcg QEAKKzwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIGludGVybmFsOkFz eW5jT3ZlcmZsb3dTY3JvbGxpbmdFbmFibGVkPXRydWUgXSAtLT4KKzwhRE9DVFlQRSBodG1sPgor PGh0bWw+Cis8aGVhZD4KKyAgICA8c3R5bGU+CisgICAgICAgICNjb250YWluZXIgeworICAgICAg ICAgICAgd2lkdGg6IDIwMHB4OworICAgICAgICAgICAgaGVpZ2h0OiAyMDBweDsKKyAgICAgICAg ICAgIG1hcmdpbjogMjBweDsKKyAgICAgICAgICAgIG92ZXJmbG93LXk6IHNjcm9sbDsKKyAgICAg ICAgICAgIGJvcmRlci1yYWRpdXM6IDEwcHg7CisgICAgICAgICAgICBib3JkZXI6IDFweCBzb2xp ZCBibGFjazsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgLmZpbGxlciB7CisgICAgICAg ICAgICBoZWlnaHQ6IDEwMCU7CisgICAgICAgICAgICB3aWR0aDogMTBweDsKKyAgICAgICAgICAg IGJhY2tncm91bmQtY29sb3I6IHNpbHZlcjsKKyAgICAgICAgfQorCisgICAgICAgIC5sYXN0IHsK KyAgICAgICAgICAgIHdpZHRoOiAxMDAlOworICAgICAgICAgICAgaGVpZ2h0OiAxMDBweDsKKyAg ICAgICAgICAgIG92ZXJmbG93OiBzY3JvbGw7CisgICAgICAgICAgICBib3JkZXItcmFkaXVzOiAy cHg7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIC5ib3ggeworICAgICAgICAgICAgd2lk dGg6IDgwJTsKKyAgICAgICAgICAgIGhlaWdodDogODBweDsKKyAgICAgICAgICAgIGJhY2tncm91 bmQtY29sb3I6IGdyZWVuOworICAgICAgICB9CisKKyAgICAgICAgLm9ic2N1cmVyIHsKKyAgICAg ICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICAgICAgICAgIHdpZHRoOiAxMHB4OworICAg ICAgICAgICAgaGVpZ2h0OiAxMHB4OworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogZ3Jh eTsKKyAgICAgICAgfQorICAgIDwvc3R5bGU+CisgICAgPHNjcmlwdD4KKyAgICAgICAgaWYgKHdp bmRvdy50ZXN0UnVubmVyKQorICAgICAgICAgICAgdGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7 CisKKyAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCAoKSA9PiB7CisgICAg ICAgICAgICBzZXRUaW1lb3V0KCgpID0+IHsKKyAgICAgICAgICAgICAgICBjb250YWluZXIuc2Ny b2xsVG8oMCwgMTAwMCk7CisgICAgICAgICAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQor ICAgICAgICAgICAgICAgICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKKyAgICAgICAgICAg IH0sIDEwMCk7CisgICAgICAgIH0sIGZhbHNlKTsKKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxi b2R5PgorICAgIDxkaXYgaWQ9Y29udGFpbmVyPgorICAgICAgICA8ZGl2IGNsYXNzPSJmaWxsZXIi PjwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPWxhc3Q+CisgICAgICAgICAgICA8ZGl2IGNsYXNz PSJib3giPjwvZGl2PgorICAgICAgICA8L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0ib2JzY3Vy ZXIiIHN0eWxlPSJsZWZ0OiAyNXB4OyB0b3A6IDExOHB4OyI+PC9kaXY+CisgICAgICAgIDxkaXYg Y2xhc3M9Im9ic2N1cmVyIiBzdHlsZT0ibGVmdDogMTYwcHg7IHRvcDogMTE4cHg7Ij48L2Rpdj4K KyAgICAgICAgPGRpdiBjbGFzcz0ib2JzY3VyZXIiIHN0eWxlPSJsZWZ0OiAyNXB4OyB0b3A6IDE5 NnB4OyI+PC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9Im9ic2N1cmVyIiBzdHlsZT0ibGVmdDog MTYwcHg7IHRvcDogMTk2cHg7Ij48L2Rpdj4KKyAgICA8L2Rpdj4KKyAgICA8cD5Zb3Ugc2hvdWxk IHNlZSBhIGdyZWVuIGJveCBpbiB0aGUgc2Nyb2xsZXIuPC9wPgorPC9ib2R5PgorPC9odG1sPgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvaGlkcGktY29tcG9zaXRpbmctbGF5 ZXItd2l0aC10aWxlLWxheWVycy1vbi1zdWJwaXhlbC1wb3NpdGlvbi1leHBlY3RlZC5odG1sIGIv TGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvaGlkcGktY29tcG9zaXRpbmctbGF5ZXItd2l0aC10aWxl LWxheWVycy1vbi1zdWJwaXhlbC1wb3NpdGlvbi1leHBlY3RlZC5odG1sCmluZGV4IDJjMTFjNTZj NzgyMmY1MzMwNzU4NDcxYThjYjllMTM0NDQ4NjFjY2UuLmViZTBjMDJhNTNiMWViYWUyNDMzYTEx ZGNlNGNiZDYxYjEzYzRiNDkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2hp ZHBpLWNvbXBvc2l0aW5nLWxheWVyLXdpdGgtdGlsZS1sYXllcnMtb24tc3VicGl4ZWwtcG9zaXRp b24tZXhwZWN0ZWQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9oaWRwaS1jb21w b3NpdGluZy1sYXllci13aXRoLXRpbGUtbGF5ZXJzLW9uLXN1YnBpeGVsLXBvc2l0aW9uLWV4cGVj dGVkLmh0bWwKQEAgLTEwLDcgKzEwLDcgQEAKICAgfQogCiAgIC5pbm5lciB7Ci0gICAgLXdlYmtp dC1ib3JkZXItcmFkaXVzOiAxcHg7CisgICAgYm9yZGVyLXJhZGl1czogMjBweDsKICAgICBvdmVy ZmxvdzogaGlkZGVuOwogICAgIHdpZHRoOiAyMTAwcHg7IAogICB9CkBAIC0xOCw3ICsxOCw3IEBA CiAgIC5sYXJnZWJveCB7CiAgICAgd2lkdGg6IDYwMHB4OyAKICAgICBoZWlnaHQ6IDEwMHB4OyAJ Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogcmVkOyAKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVl bjsgCiAgIH0KIDwvc3R5bGU+CiA8L2hlYWQ+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21w b3NpdGluZy9oaWRwaS1jb21wb3NpdGluZy1sYXllci13aXRoLXRpbGUtbGF5ZXJzLW9uLXN1YnBp eGVsLXBvc2l0aW9uLmh0bWwgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9oaWRwaS1jb21wb3Np dGluZy1sYXllci13aXRoLXRpbGUtbGF5ZXJzLW9uLXN1YnBpeGVsLXBvc2l0aW9uLmh0bWwKaW5k ZXggZTY1YTI0ZWEyYzY0MDNkZWZiZTIwZGIxODU5ZWQxYzUxYzI4MTQyNC4uYjZjZjQ5Yzg2ZjBj NjZkYjlhMjQyMWQ2NDYwZThiYTgxM2U4NjYxZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvY29t cG9zaXRpbmcvaGlkcGktY29tcG9zaXRpbmctbGF5ZXItd2l0aC10aWxlLWxheWVycy1vbi1zdWJw aXhlbC1wb3NpdGlvbi5odG1sCisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2hpZHBpLWNv bXBvc2l0aW5nLWxheWVyLXdpdGgtdGlsZS1sYXllcnMtb24tc3VicGl4ZWwtcG9zaXRpb24uaHRt bApAQCAtMTAsMTYgKzEwLDE2IEBACiAgIH0KIAogICAuaW5uZXIgewotICAgIC13ZWJraXQtYm9y ZGVyLXJhZGl1czogMXB4OworICAgIGJvcmRlci1yYWRpdXM6IDIwcHg7CiAgICAgb3ZlcmZsb3c6 IGhpZGRlbjsKICAgICB3aWR0aDogMjEwMHB4OyAKLSAgICAtd2Via2l0LXRyYW5zZm9ybTogdHJh bnNsYXRlWigwKTsKKyAgICB0cmFuc2Zvcm06IHRyYW5zbGF0ZVooMCk7CiAgIH0KICAgCiAgIC5s YXJnZWJveCB7CiAgICAgd2lkdGg6IDYwMHB4OyAKICAgICBoZWlnaHQ6IDEwMHB4OyAKLSAgICBi YWNrZ3JvdW5kLWNvbG9yOiByZWQ7IAorICAgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOyAKICAg fQogPC9zdHlsZT4KIDwvaGVhZD4K 402809 2020-06-25 14:20:43 -0700 2020-06-26 10:14:51 -0700 Patch bug-213580-20200625142042.patch text/plain 19374 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2ZmOTg1NDgzNjcyNzQ0 MTdjMmNkNWJlMTQyOTczYzE5ZDM4ZTA5Ny4uZGNlMjQzMTAyMGJhMTkxMDUwYmJlNGIwNDgxNTA1 MGM3ZjEyMGQ2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA2LTI0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENvbnRlbnQgc29t ZXRpbWVzIG1pc3NpbmcgaW4gbmVzdGVkIHNjcm9sbGVycyB3aXRoIGJvcmRlci1yYWRpdXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzU4MAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNjQ0NjAzNzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBSZW5kZXJMYXllcjo6Y2xpcFRvUmVjdCgp IGhhcyBhIHNwZWNpYWwgY2FzZSBmb3IgY2xpcHMgaW52b2x2aW5nIGJvcmRlci1yYWRpdXMsCisg ICAgICAgIGludm9sdmluZyBhbiBhbmNlc3RvciB0cmVlIHdhbGsgd2hpY2ggYXBwbGllcyB0aGUg cm91bmRlZCBjbGlwcy4KKworICAgICAgICBXaGVuIGluc2lkZSBjb21wb3NpdGVkIG92ZXJmbG93 LCBkb24ndCBpbmNsdWRlIHRoZSBib3JkZXItcmFkaXVzIGZyb20gdGhlIHNjcm9sbGVyIHNpbmNl CisgICAgICAgIHRoYXQgZG9lcyBpdHMgb3duIGNsaXBwaW5nLgorCisgICAgICAgIFRlc3Q6IGNv bXBvc2l0aW5nL2NsaXBwaW5nL25lc3RlZC1vdmVyZmxvdy13aXRoLWJvcmRlci1yYWRpdXMuaHRt bAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckxheWVyOjpjbGlwVG9SZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxh eWVyOjpjYWxjdWxhdGVDbGlwUmVjdHMgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJMYXllci5oOgorCiAyMDIwLTA2LTI0ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBw bGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyNjAyNzYpOiBTY3JvbGxpbmcgdGhyb3Vn aCBzaGVsdmVzIG9uIG11c2ljLmFwcGxlLmNvbSBpcyBub3Qgc21vb3RoCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAppbmRleCA2YjE5YmMzODdlYThkODhmYTEwM2U4M2Jl ZjM1MDkwNzVkZjk1NzllLi5mNDZkMThkZmE2Zjk3YWM4ODUxNDQ4MTE2Yzg4NDE1YTNlNmI1ODgx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTQxNzAsNyAr NDE3MCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50T3ZlcmxheVNjcm9sbGJhcnMoR3JhcGhp Y3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBMYXlvdXRSCiAgICAgbV9jb250YWluc0RpcnR5T3Zl cmxheVNjcm9sbGJhcnMgPSBmYWxzZTsKIH0KIAotdm9pZCBSZW5kZXJMYXllcjo6Y2xpcFRvUmVj dChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IExheWVyUGFpbnRpbmdJbmZvJiBwYWlu dGluZ0luZm8sIGNvbnN0IENsaXBSZWN0JiBjbGlwUmVjdCwgQm9yZGVyUmFkaXVzQ2xpcHBpbmdS dWxlIHJ1bGUpCit2b2lkIFJlbmRlckxheWVyOjpjbGlwVG9SZWN0KEdyYXBoaWNzQ29udGV4dCYg Y29udGV4dCwgY29uc3QgTGF5ZXJQYWludGluZ0luZm8mIHBhaW50aW5nSW5mbywgT3B0aW9uU2V0 PFBhaW50QmVoYXZpb3I+IHBhaW50QmVoYXZpb3IsIGNvbnN0IENsaXBSZWN0JiBjbGlwUmVjdCwg Qm9yZGVyUmFkaXVzQ2xpcHBpbmdSdWxlIHJ1bGUpCiB7CiAgICAgZmxvYXQgZGV2aWNlU2NhbGVG YWN0b3IgPSByZW5kZXJlcigpLmRvY3VtZW50KCkuZGV2aWNlU2NhbGVGYWN0b3IoKTsKICAgICBi b29sIG5lZWRzQ2xpcHBpbmcgPSAhY2xpcFJlY3QuaXNJbmZpbml0ZSgpICYmIGNsaXBSZWN0LnJl Y3QoKSAhPSBwYWludGluZ0luZm8ucGFpbnREaXJ0eVJlY3Q7CkBAIC00MTkyLDYgKzQxOTIsOSBA QCB2b2lkIFJlbmRlckxheWVyOjpjbGlwVG9SZWN0KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwg Y29uc3QgTGF5ZXJQYWludGluZ0luZm8mCiAgICAgICAgIC8vIGFueSBsYXllcnMgd2l0aCBvdmVy Zmxvdy4gVGhlIGNvbmRpdGlvbiBmb3IgYmVpbmcgYWJsZSB0byBhcHBseSB0aGVzZSBjbGlwcyBp cyB0aGF0IHRoZSBvdmVyZmxvdyBvYmplY3QgYmUgaW4gb3VyCiAgICAgICAgIC8vIGNvbnRhaW5p bmcgYmxvY2sgY2hhaW4gc28gd2UgY2hlY2sgdGhhdCBhbHNvLgogICAgICAgICBmb3IgKFJlbmRl ckxheWVyKiBsYXllciA9IHJ1bGUgPT0gSW5jbHVkZVNlbGZGb3JCb3JkZXJSYWRpdXMgPyB0aGlz IDogcGFyZW50KCk7IGxheWVyOyBsYXllciA9IGxheWVyLT5wYXJlbnQoKSkgeworICAgICAgICAg ICAgaWYgKHBhaW50QmVoYXZpb3IuY29udGFpbnMoUGFpbnRCZWhhdmlvcjo6Q29tcG9zaXRlZE92 ZXJmbG93U2Nyb2xsQ29udGVudCkgJiYgbGF5ZXItPnVzZXNDb21wb3NpdGVkU2Nyb2xsaW5nKCkp CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIAogICAgICAgICAgICAgaWYgKGxheWVy LT5yZW5kZXJlcigpLmhhc092ZXJmbG93Q2xpcCgpICYmIGxheWVyLT5yZW5kZXJlcigpLnN0eWxl KCkuaGFzQm9yZGVyUmFkaXVzKCkgJiYgYW5jZXN0b3JMYXllcklzSW5Db250YWluaW5nQmxvY2tD aGFpbigqbGF5ZXIpKSB7CiAgICAgICAgICAgICAgICAgTGF5b3V0UmVjdCBhZGp1c3RlZENsaXBS ZWN0ID0gTGF5b3V0UmVjdCh0b0xheW91dFBvaW50KGxheWVyLT5vZmZzZXRGcm9tQW5jZXN0b3Io cGFpbnRpbmdJbmZvLnJvb3RMYXllciwgQWRqdXN0Rm9yQ29sdW1ucykpLCBsYXllci0+c2l6ZSgp KTsKICAgICAgICAgICAgICAgICBhZGp1c3RlZENsaXBSZWN0Lm1vdmUocGFpbnRpbmdJbmZvLnN1 YnBpeGVsT2Zmc2V0KTsKQEAgLTQzNDAsOCArNDM0MywxMiBAQCB2b2lkIFJlbmRlckxheWVyOjpw YWludExheWVyV2l0aEVmZmVjdHMoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBMYXll clBhaQogICAgICAgICAgICAgY2xpcFJlY3QgPSBiYWNrZ3JvdW5kQ2xpcFJlY3QoY2xpcFJlY3Rz Q29udGV4dCk7CiAgICAgICAgICAgICBjbGlwUmVjdC5pbnRlcnNlY3QocGFpbnRpbmdJbmZvLnBh aW50RGlydHlSZWN0KTsKICAgICAgICAgCisgICAgICAgICAgICBPcHRpb25TZXQ8UGFpbnRCZWhh dmlvcj4gcGFpbnRCZWhhdmlvciA9IFBhaW50QmVoYXZpb3I6Ok5vcm1hbDsKKyAgICAgICAgICAg IGlmIChwYWludEZsYWdzLmNvbnRhaW5zKFBhaW50TGF5ZXJQYWludGluZ092ZXJmbG93Q29udGVu dHMpKQorICAgICAgICAgICAgICAgIHBhaW50QmVoYXZpb3IuYWRkKFBhaW50QmVoYXZpb3I6OkNv bXBvc2l0ZWRPdmVyZmxvd1Njcm9sbENvbnRlbnQpOworCiAgICAgICAgICAgICAvLyBQdXNoIHRo ZSBwYXJlbnQgY29vcmRpbmF0ZSBzcGFjZSdzIGNsaXAuCi0gICAgICAgICAgICBwYXJlbnQoKS0+ Y2xpcFRvUmVjdChjb250ZXh0LCBwYWludGluZ0luZm8sIGNsaXBSZWN0KTsKKyAgICAgICAgICAg IHBhcmVudCgpLT5jbGlwVG9SZWN0KGNvbnRleHQsIHBhaW50aW5nSW5mbywgcGFpbnRCZWhhdmlv ciwgY2xpcFJlY3QpOwogICAgICAgICB9CiAKICAgICAgICAgcGFpbnRMYXllckJ5QXBwbHlpbmdU cmFuc2Zvcm0oY29udGV4dCwgcGFpbnRpbmdJbmZvLCBwYWludEZsYWdzKTsKQEAgLTQ1MTcsMTEg KzQ1MjQsMTEgQEAgR3JhcGhpY3NDb250ZXh0KiBSZW5kZXJMYXllcjo6c2V0dXBGaWx0ZXJzKEdy YXBoaWNzQ29udGV4dCYgZGVzdGluYXRpb25Db250ZXh0LAogICAgIHJldHVybiBmaWx0ZXJDb250 ZXh0OwogfQogCi12b2lkIFJlbmRlckxheWVyOjphcHBseUZpbHRlcnMoR3JhcGhpY3NDb250ZXh0 JiBvcmlnaW5hbENvbnRleHQsIGNvbnN0IExheWVyUGFpbnRpbmdJbmZvJiBwYWludGluZ0luZm8s IGNvbnN0IExheWVyRnJhZ21lbnRzJiBsYXllckZyYWdtZW50cykKK3ZvaWQgUmVuZGVyTGF5ZXI6 OmFwcGx5RmlsdGVycyhHcmFwaGljc0NvbnRleHQmIG9yaWdpbmFsQ29udGV4dCwgY29uc3QgTGF5 ZXJQYWludGluZ0luZm8mIHBhaW50aW5nSW5mbywgT3B0aW9uU2V0PFBhaW50QmVoYXZpb3I+IGJl aGF2aW9yLCBjb25zdCBMYXllckZyYWdtZW50cyYgbGF5ZXJGcmFnbWVudHMpCiB7CiAgICAgLy8g RklYTUU6IEhhbmRsZSBtb3JlIHRoYW4gb25lIGZyYWdtZW50LgogICAgIENsaXBSZWN0IGJhY2tn cm91bmRSZWN0ID0gbGF5ZXJGcmFnbWVudHMuaXNFbXB0eSgpID8gQ2xpcFJlY3QoKSA6IGxheWVy RnJhZ21lbnRzWzBdLmJhY2tncm91bmRSZWN0OwotICAgIGNsaXBUb1JlY3Qob3JpZ2luYWxDb250 ZXh0LCBwYWludGluZ0luZm8sIGJhY2tncm91bmRSZWN0KTsKKyAgICBjbGlwVG9SZWN0KG9yaWdp bmFsQ29udGV4dCwgcGFpbnRpbmdJbmZvLCBiZWhhdmlvciwgYmFja2dyb3VuZFJlY3QpOwogICAg IG1fZmlsdGVycy0+YXBwbHlGaWx0ZXJFZmZlY3Qob3JpZ2luYWxDb250ZXh0KTsKICAgICByZXN0 b3JlQ2xpcChvcmlnaW5hbENvbnRleHQsIHBhaW50aW5nSW5mbywgYmFja2dyb3VuZFJlY3QpOwog fQpAQCAtNDY5NCw3ICs0NzAxLDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6cGFpbnRMYXllckNvbnRl bnRzKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgTGF5ZXJQYWludGkKICAgICAgICAg ICAgICAgICAoaXNQYWludGluZ092ZXJmbG93Q29udGVudHMpID8gSWdub3JlT3ZlcmZsb3dDbGlw IDogUmVzcGVjdE92ZXJmbG93Q2xpcCwgb2Zmc2V0RnJvbVJvb3QpOwogICAgICAgICAgICAgdXBk YXRlUGFpbnRpbmdJbmZvRm9yRnJhZ21lbnRzKGxheWVyRnJhZ21lbnRzLCBwYWludGluZ0luZm8s IGxvY2FsUGFpbnRGbGFncywgc2hvdWxkUGFpbnRDb250ZW50LCBvZmZzZXRGcm9tUm9vdCk7CiAK LSAgICAgICAgICAgIGFwcGx5RmlsdGVycyhjb250ZXh0LCBwYWludGluZ0luZm8sIGxheWVyRnJh Z21lbnRzKTsKKyAgICAgICAgICAgIGFwcGx5RmlsdGVycyhjb250ZXh0LCBwYWludGluZ0luZm8s IHBhaW50QmVoYXZpb3IsIGxheWVyRnJhZ21lbnRzKTsKICAgICAgICAgfQogICAgIH0KICAgICAK QEAgLTQ5ODcsNyArNDk5NCwxMSBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludFRyYW5zZm9ybWVk TGF5ZXJJbnRvRnJhZ21lbnRzKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgYwogICAgICAgICAg ICAgY2xpcFJlY3QuaW50ZXJzZWN0KHBhcmVudENsaXBSZWN0KTsKICAgICAgICAgfQogCi0gICAg ICAgIHBhcmVudCgpLT5jbGlwVG9SZWN0KGNvbnRleHQsIHBhaW50aW5nSW5mbywgY2xpcFJlY3Qp OworICAgICAgICBPcHRpb25TZXQ8UGFpbnRCZWhhdmlvcj4gcGFpbnRCZWhhdmlvciA9IFBhaW50 QmVoYXZpb3I6Ok5vcm1hbDsKKyAgICAgICAgaWYgKHBhaW50RmxhZ3MuY29udGFpbnMoUGFpbnRM YXllclBhaW50aW5nT3ZlcmZsb3dDb250ZW50cykpCisgICAgICAgICAgICBwYWludEJlaGF2aW9y LmFkZChQYWludEJlaGF2aW9yOjpDb21wb3NpdGVkT3ZlcmZsb3dTY3JvbGxDb250ZW50KTsKKwor ICAgICAgICBwYXJlbnQoKS0+Y2xpcFRvUmVjdChjb250ZXh0LCBwYWludGluZ0luZm8sIHBhaW50 QmVoYXZpb3IsIGNsaXBSZWN0KTsKICAgICAgICAgcGFpbnRMYXllckJ5QXBwbHlpbmdUcmFuc2Zv cm0oY29udGV4dCwgcGFpbnRpbmdJbmZvLCBwYWludEZsYWdzLCBmcmFnbWVudC5wYWdpbmF0aW9u T2Zmc2V0KTsKICAgICAgICAgcGFyZW50KCktPnJlc3RvcmVDbGlwKGNvbnRleHQsIHBhaW50aW5n SW5mbywgY2xpcFJlY3QpOwogICAgIH0KQEAgLTUwMDgsNyArNTAxOSw3IEBAIHZvaWQgUmVuZGVy TGF5ZXI6OnBhaW50QmFja2dyb3VuZEZvckZyYWdtZW50cyhjb25zdCBMYXllckZyYWdtZW50cyYg bGF5ZXJGcmFnbWVuCiAgICAgICAgIGlmIChsb2NhbFBhaW50aW5nSW5mby5jbGlwVG9EaXJ0eVJl Y3QpIHsKICAgICAgICAgICAgIC8vIFBhaW50IG91ciBiYWNrZ3JvdW5kIGZpcnN0LCBiZWZvcmUg cGFpbnRpbmcgYW55IGNoaWxkIGxheWVycy4KICAgICAgICAgICAgIC8vIEVzdGFibGlzaCB0aGUg Y2xpcCB1c2VkIHRvIHBhaW50IG91ciBiYWNrZ3JvdW5kLgotICAgICAgICAgICAgY2xpcFRvUmVj dChjb250ZXh0LCBsb2NhbFBhaW50aW5nSW5mbywgZnJhZ21lbnQuYmFja2dyb3VuZFJlY3QsIERv Tm90SW5jbHVkZVNlbGZGb3JCb3JkZXJSYWRpdXMpOyAvLyBCYWNrZ3JvdW5kIHBhaW50aW5nIHdp bGwgaGFuZGxlIGNsaXBwaW5nIHRvIHNlbGYuCisgICAgICAgICAgICBjbGlwVG9SZWN0KGNvbnRl eHQsIGxvY2FsUGFpbnRpbmdJbmZvLCBwYWludEJlaGF2aW9yLCBmcmFnbWVudC5iYWNrZ3JvdW5k UmVjdCwgRG9Ob3RJbmNsdWRlU2VsZkZvckJvcmRlclJhZGl1cyk7IC8vIEJhY2tncm91bmQgcGFp bnRpbmcgd2lsbCBoYW5kbGUgY2xpcHBpbmcgdG8gc2VsZi4KICAgICAgICAgfQogICAgICAgICAK ICAgICAgICAgLy8gUGFpbnQgdGhlIGJhY2tncm91bmQuCkBAIC01MDYxLDcgKzUwNzIsNyBAQCB2 b2lkIFJlbmRlckxheWVyOjpwYWludEZvcmVncm91bmRGb3JGcmFnbWVudHMoY29uc3QgTGF5ZXJG cmFnbWVudHMmIGxheWVyRnJhZ21lbgogICAgIENsaXBSZWN0IGNsaXBwZWRSZWN0OwogICAgIGlm IChzaG91bGRDbGlwKSB7CiAgICAgICAgIGNsaXBwZWRSZWN0ID0gbGF5ZXJGcmFnbWVudHNbMF0u Zm9yZWdyb3VuZFJlY3Q7Ci0gICAgICAgIGNsaXBUb1JlY3QoY29udGV4dCwgbG9jYWxQYWludGlu Z0luZm8sIGNsaXBwZWRSZWN0KTsKKyAgICAgICAgY2xpcFRvUmVjdChjb250ZXh0LCBsb2NhbFBh aW50aW5nSW5mbywgbG9jYWxQYWludEJlaGF2aW9yLCBjbGlwcGVkUmVjdCk7CiAgICAgfQogICAg IAogICAgIC8vIFdlIGhhdmUgdG8gbG9vcCB0aHJvdWdoIGV2ZXJ5IGZyYWdtZW50IG11bHRpcGxl IHRpbWVzLCBzaW5jZSB3ZSBoYXZlIHRvIHJlcGFpbnQgaW4gZWFjaCBzcGVjaWZpYyBwaGFzZSBp biBvcmRlciBmb3IKQEAgLTUwOTQsNyArNTEwNSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50 Rm9yZWdyb3VuZEZvckZyYWdtZW50c1dpdGhQaGFzZShQYWludFBoYXNlIHBoYXNlLCBjb25zdCBM CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgCiAgICAgICAgIGlmIChzaG91bGRDbGlw KQotICAgICAgICAgICAgY2xpcFRvUmVjdChjb250ZXh0LCBsb2NhbFBhaW50aW5nSW5mbywgZnJh Z21lbnQuZm9yZWdyb3VuZFJlY3QpOworICAgICAgICAgICAgY2xpcFRvUmVjdChjb250ZXh0LCBs b2NhbFBhaW50aW5nSW5mbywgcGFpbnRCZWhhdmlvciwgZnJhZ21lbnQuZm9yZWdyb3VuZFJlY3Qp OwogICAgIAogICAgICAgICBQYWludEluZm8gcGFpbnRJbmZvKGNvbnRleHQsIGZyYWdtZW50LmZv cmVncm91bmRSZWN0LnJlY3QoKSwgcGhhc2UsIHBhaW50QmVoYXZpb3IsIHN1YnRyZWVQYWludFJv b3RGb3JSZW5kZXJlciwgbnVsbHB0ciwgbnVsbHB0ciwgJmxvY2FsUGFpbnRpbmdJbmZvLnJvb3RM YXllci0+cmVuZGVyZXIoKSwgdGhpcywgbG9jYWxQYWludGluZ0luZm8ucmVxdWlyZVNlY3VyaXR5 T3JpZ2luQWNjZXNzRm9yV2lkZ2V0cyk7CiAgICAgICAgIGlmIChwaGFzZSA9PSBQYWludFBoYXNl OjpGb3JlZ3JvdW5kKQpAQCAtNTExNSw3ICs1MTI2LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6cGFp bnRPdXRsaW5lRm9yRnJhZ21lbnRzKGNvbnN0IExheWVyRnJhZ21lbnRzJiBsYXllckZyYWdtZW50 cywKICAgICAKICAgICAgICAgLy8gUGFpbnQgb3VyIG93biBvdXRsaW5lCiAgICAgICAgIFBhaW50 SW5mbyBwYWludEluZm8oY29udGV4dCwgZnJhZ21lbnQuYmFja2dyb3VuZFJlY3QucmVjdCgpLCBQ YWludFBoYXNlOjpTZWxmT3V0bGluZSwgcGFpbnRCZWhhdmlvciwgc3VidHJlZVBhaW50Um9vdEZv clJlbmRlcmVyLCBudWxscHRyLCBudWxscHRyLCAmbG9jYWxQYWludGluZ0luZm8ucm9vdExheWVy LT5yZW5kZXJlcigpLCB0aGlzKTsKLSAgICAgICAgY2xpcFRvUmVjdChjb250ZXh0LCBsb2NhbFBh aW50aW5nSW5mbywgZnJhZ21lbnQuYmFja2dyb3VuZFJlY3QsIERvTm90SW5jbHVkZVNlbGZGb3JC b3JkZXJSYWRpdXMpOworICAgICAgICBjbGlwVG9SZWN0KGNvbnRleHQsIGxvY2FsUGFpbnRpbmdJ bmZvLCBwYWludEJlaGF2aW9yLCBmcmFnbWVudC5iYWNrZ3JvdW5kUmVjdCwgRG9Ob3RJbmNsdWRl U2VsZkZvckJvcmRlclJhZGl1cyk7CiAgICAgICAgIHJlbmRlcmVyKCkucGFpbnQocGFpbnRJbmZv LCB0b0xheW91dFBvaW50KGZyYWdtZW50LmxheWVyQm91bmRzLmxvY2F0aW9uKCkgLSByZW5kZXJC b3hMb2NhdGlvbigpICsgbG9jYWxQYWludGluZ0luZm8uc3VicGl4ZWxPZmZzZXQpKTsKICAgICAg ICAgcmVzdG9yZUNsaXAoY29udGV4dCwgbG9jYWxQYWludGluZ0luZm8sIGZyYWdtZW50LmJhY2tn cm91bmRSZWN0KTsKICAgICB9CkBAIC01MTI5LDcgKzUxNDAsNyBAQCB2b2lkIFJlbmRlckxheWVy OjpwYWludE1hc2tGb3JGcmFnbWVudHMoY29uc3QgTGF5ZXJGcmFnbWVudHMmIGxheWVyRnJhZ21l bnRzLCBHcgogICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgaWYgKGxvY2FsUGFpbnRp bmdJbmZvLmNsaXBUb0RpcnR5UmVjdCkKLSAgICAgICAgICAgIGNsaXBUb1JlY3QoY29udGV4dCwg bG9jYWxQYWludGluZ0luZm8sIGZyYWdtZW50LmJhY2tncm91bmRSZWN0LCBEb05vdEluY2x1ZGVT ZWxmRm9yQm9yZGVyUmFkaXVzKTsgLy8gTWFzayBwYWludGluZyB3aWxsIGhhbmRsZSBjbGlwcGlu ZyB0byBzZWxmLgorICAgICAgICAgICAgY2xpcFRvUmVjdChjb250ZXh0LCBsb2NhbFBhaW50aW5n SW5mbywgcGFpbnRCZWhhdmlvciwgZnJhZ21lbnQuYmFja2dyb3VuZFJlY3QsIERvTm90SW5jbHVk ZVNlbGZGb3JCb3JkZXJSYWRpdXMpOyAvLyBNYXNrIHBhaW50aW5nIHdpbGwgaGFuZGxlIGNsaXBw aW5nIHRvIHNlbGYuCiAgICAgICAgIAogICAgICAgICAvLyBQYWludCB0aGUgbWFzay4KICAgICAg ICAgLy8gRklYTUU6IEV2ZW50dWFsbHkgd2Ugd2lsbCBjb2xsZWN0IHRoZSByZWdpb24gZnJvbSB0 aGUgZnJhZ21lbnQgaXRzZWxmIGluc3RlYWQgb2YganVzdCBmcm9tIHRoZSBwYWludCBpbmZvLgpA QCAtNTE0OCw3ICs1MTU5LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6cGFpbnRDaGlsZENsaXBwaW5n TWFza0ZvckZyYWdtZW50cyhjb25zdCBMYXllckZyYWdtZW50cyYgbGF5ZXIKICAgICAgICAgICAg IGNvbnRpbnVlOwogCiAgICAgICAgIGlmIChsb2NhbFBhaW50aW5nSW5mby5jbGlwVG9EaXJ0eVJl Y3QpCi0gICAgICAgICAgICBjbGlwVG9SZWN0KGNvbnRleHQsIGxvY2FsUGFpbnRpbmdJbmZvLCBm cmFnbWVudC5mb3JlZ3JvdW5kUmVjdCwgSW5jbHVkZVNlbGZGb3JCb3JkZXJSYWRpdXMpOyAvLyBD aGlsZCBjbGlwcGluZyBtYXNrIHBhaW50aW5nIHdpbGwgaGFuZGxlIGNsaXBwaW5nIHRvIHNlbGYu CisgICAgICAgICAgICBjbGlwVG9SZWN0KGNvbnRleHQsIGxvY2FsUGFpbnRpbmdJbmZvLCBwYWlu dEJlaGF2aW9yLCBmcmFnbWVudC5mb3JlZ3JvdW5kUmVjdCwgSW5jbHVkZVNlbGZGb3JCb3JkZXJS YWRpdXMpOyAvLyBDaGlsZCBjbGlwcGluZyBtYXNrIHBhaW50aW5nIHdpbGwgaGFuZGxlIGNsaXBw aW5nIHRvIHNlbGYuCiAKICAgICAgICAgLy8gUGFpbnQgdGhlIGNsaXBwZWQgbWFzay4KICAgICAg ICAgUGFpbnRJbmZvIHBhaW50SW5mbyhjb250ZXh0LCBmcmFnbWVudC5iYWNrZ3JvdW5kUmVjdC5y ZWN0KCksIFBhaW50UGhhc2U6OkNsaXBwaW5nTWFzaywgcGFpbnRCZWhhdmlvciwgc3VidHJlZVBh aW50Um9vdEZvclJlbmRlcmVyLCBudWxscHRyLCBudWxscHRyLCAmbG9jYWxQYWludGluZ0luZm8u cm9vdExheWVyLT5yZW5kZXJlcigpLCB0aGlzKTsKQEAgLTUxNjQsNyArNTE3NSw3IEBAIHZvaWQg UmVuZGVyTGF5ZXI6OnBhaW50T3ZlcmZsb3dDb250cm9sc0ZvckZyYWdtZW50cyhjb25zdCBMYXll ckZyYWdtZW50cyYgbGF5ZXJGCiAgICAgZm9yIChjb25zdCBhdXRvJiBmcmFnbWVudCA6IGxheWVy RnJhZ21lbnRzKSB7CiAgICAgICAgIGlmIChmcmFnbWVudC5iYWNrZ3JvdW5kUmVjdC5pc0VtcHR5 KCkpCiAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgY2xpcFRvUmVjdChjb250ZXh0LCBs b2NhbFBhaW50aW5nSW5mbywgZnJhZ21lbnQuYmFja2dyb3VuZFJlY3QpOworICAgICAgICBjbGlw VG9SZWN0KGNvbnRleHQsIGxvY2FsUGFpbnRpbmdJbmZvLCB7IH0sIGZyYWdtZW50LmJhY2tncm91 bmRSZWN0KTsKICAgICAgICAgcGFpbnRPdmVyZmxvd0NvbnRyb2xzKGNvbnRleHQsIHJvdW5kZWRJ bnRQb2ludCh0b0xheW91dFBvaW50KGZyYWdtZW50LmxheWVyQm91bmRzLmxvY2F0aW9uKCkgLSBy ZW5kZXJCb3hMb2NhdGlvbigpICsgbG9jYWxQYWludGluZ0luZm8uc3VicGl4ZWxPZmZzZXQpKSwK ICAgICAgICAgICAgIHNuYXBwZWRJbnRSZWN0KGZyYWdtZW50LmJhY2tncm91bmRSZWN0LnJlY3Qo KSksIHRydWUpOwogICAgICAgICByZXN0b3JlQ2xpcChjb250ZXh0LCBsb2NhbFBhaW50aW5nSW5m bywgZnJhZ21lbnQuYmFja2dyb3VuZFJlY3QpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXIuaAppbmRleCAzMzcxNjIzMzM4OGRlOWMzNmUxYWY1YjlhZDViOWVkMDE3YjUzM2ZlLi44 ZTQyODQ0YTVmNTdhMzU0ZjY3MWU5YTNmMTM2NjY2MTk4MTM5OWVlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaApAQCAtMTAwMSw3ICsxMDAxLDcgQEAgcHJpdmF0ZToKIAog ICAgIExheW91dFJlY3QgY2xpcFJlY3RSZWxhdGl2ZVRvQW5jZXN0b3IoUmVuZGVyTGF5ZXIqIGFu Y2VzdG9yLCBMYXlvdXRTaXplIG9mZnNldEZyb21BbmNlc3RvciwgY29uc3QgTGF5b3V0UmVjdCYg Y29uc3RyYWluaW5nUmVjdCkgY29uc3Q7CiAKLSAgICB2b2lkIGNsaXBUb1JlY3QoR3JhcGhpY3ND b250ZXh0JiwgY29uc3QgTGF5ZXJQYWludGluZ0luZm8mLCBjb25zdCBDbGlwUmVjdCYsIEJvcmRl clJhZGl1c0NsaXBwaW5nUnVsZSA9IEluY2x1ZGVTZWxmRm9yQm9yZGVyUmFkaXVzKTsKKyAgICB2 b2lkIGNsaXBUb1JlY3QoR3JhcGhpY3NDb250ZXh0JiwgY29uc3QgTGF5ZXJQYWludGluZ0luZm8m LCBPcHRpb25TZXQ8UGFpbnRCZWhhdmlvcj4sIGNvbnN0IENsaXBSZWN0JiwgQm9yZGVyUmFkaXVz Q2xpcHBpbmdSdWxlID0gSW5jbHVkZVNlbGZGb3JCb3JkZXJSYWRpdXMpOwogICAgIHZvaWQgcmVz dG9yZUNsaXAoR3JhcGhpY3NDb250ZXh0JiwgY29uc3QgTGF5ZXJQYWludGluZ0luZm8mLCBjb25z dCBDbGlwUmVjdCYpOwogCiAgICAgYm9vbCBzaG91bGRSZXBhaW50QWZ0ZXJMYXlvdXQoKSBjb25z dDsKQEAgLTEwNTMsNyArMTA1Myw3IEBAIHByaXZhdGU6CiAKICAgICBSZW5kZXJMYXllckZpbHRl cnMqIGZpbHRlcnNGb3JQYWludGluZyhHcmFwaGljc0NvbnRleHQmLCBPcHRpb25TZXQ8UGFpbnRM YXllckZsYWc+KSBjb25zdDsKICAgICBHcmFwaGljc0NvbnRleHQqIHNldHVwRmlsdGVycyhHcmFw aGljc0NvbnRleHQmIGRlc3RpbmF0aW9uQ29udGV4dCwgTGF5ZXJQYWludGluZ0luZm8mLCBPcHRp b25TZXQ8UGFpbnRMYXllckZsYWc+LCBjb25zdCBMYXlvdXRTaXplJiBvZmZzZXRGcm9tUm9vdCwg T3B0aW9uYWw8TGF5b3V0UmVjdD4mIHJvb3RSZWxhdGl2ZUJvdW5kcyk7Ci0gICAgdm9pZCBhcHBs eUZpbHRlcnMoR3JhcGhpY3NDb250ZXh0JiBvcmlnaW5hbENvbnRleHQsIGNvbnN0IExheWVyUGFp bnRpbmdJbmZvJiwgY29uc3QgTGF5ZXJGcmFnbWVudHMmKTsKKyAgICB2b2lkIGFwcGx5RmlsdGVy cyhHcmFwaGljc0NvbnRleHQmIG9yaWdpbmFsQ29udGV4dCwgY29uc3QgTGF5ZXJQYWludGluZ0lu Zm8mLCBPcHRpb25TZXQ8UGFpbnRCZWhhdmlvcj4sIGNvbnN0IExheWVyRnJhZ21lbnRzJik7CiAK ICAgICB2b2lkIHBhaW50TGF5ZXIoR3JhcGhpY3NDb250ZXh0JiwgY29uc3QgTGF5ZXJQYWludGlu Z0luZm8mLCBPcHRpb25TZXQ8UGFpbnRMYXllckZsYWc+KTsKICAgICB2b2lkIHBhaW50TGF5ZXJX aXRoRWZmZWN0cyhHcmFwaGljc0NvbnRleHQmLCBjb25zdCBMYXllclBhaW50aW5nSW5mbyYsIE9w dGlvblNldDxQYWludExheWVyRmxhZz4pOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDUzOTZhZGJkNDhmNjA1ZDM0MmQ1MDg2 NTZkM2QzYzBiZDg0MGNmMzkuLjdkYzc1YTRlNDg4YmExMzQ5MjVjZWM2ZjRlNDJiZTFmMGQ0NGM0 NzkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMC0wNi0yNCAgU2ltb24gRnJhc2VyICA8c2lt b24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBDb250ZW50IHNvbWV0aW1lcyBtaXNzaW5n IGluIG5lc3RlZCBzY3JvbGxlcnMgd2l0aCBib3JkZXItcmFkaXVzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM1ODAKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzY0NDYwMzczPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogY29tcG9zaXRpbmcvY2xpcHBpbmcvbmVzdGVkLW92ZXJmbG93LXdpdGgtYm9y ZGVyLXJhZGl1cy1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBjb21wb3NpdGluZy9j bGlwcGluZy9uZXN0ZWQtb3ZlcmZsb3ctd2l0aC1ib3JkZXItcmFkaXVzLmh0bWw6IEFkZGVkLgor ICAgICAgICAqIGNvbXBvc2l0aW5nL2hpZHBpLWNvbXBvc2l0aW5nLWxheWVyLXdpdGgtdGlsZS1s YXllcnMtb24tc3VicGl4ZWwtcG9zaXRpb24tZXhwZWN0ZWQuaHRtbDoKKyAgICAgICAgKiBjb21w b3NpdGluZy9oaWRwaS1jb21wb3NpdGluZy1sYXllci13aXRoLXRpbGUtbGF5ZXJzLW9uLXN1YnBp eGVsLXBvc2l0aW9uLmh0bWw6IFR3ZWFrIHRoZSBjb2xvcnMgYW5kIHJhZGlpIHRvIG1ha2UgZmFp bHVyZXMgb24gdGhpcyB0ZXN0IG1vcmUgb2J2aW91cy4KKwogMjAyMC0wNi0yNCAgU2ltb24gRnJh c2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjYw Mjc2KTogU2Nyb2xsaW5nIHRocm91Z2ggc2hlbHZlcyBvbiBtdXNpYy5hcHBsZS5jb20gaXMgbm90 IHNtb290aApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvY2xpcHBpbmcvbmVz dGVkLW92ZXJmbG93LXdpdGgtYm9yZGVyLXJhZGl1cy1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVz dHMvY29tcG9zaXRpbmcvY2xpcHBpbmcvbmVzdGVkLW92ZXJmbG93LXdpdGgtYm9yZGVyLXJhZGl1 cy1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjczYjk2OGFhZGNjN2ExN2NiNGJjY2UzZjdiZjFk ZTVlZWYyYTI3MTgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9j bGlwcGluZy9uZXN0ZWQtb3ZlcmZsb3ctd2l0aC1ib3JkZXItcmFkaXVzLWV4cGVjdGVkLmh0bWwK QEAgLTAsMCArMSw2MSBAQAorPCFET0NUWVBFIGh0bWw+IDwhLS0gd2Via2l0LXRlc3QtcnVubmVy IFsgaW50ZXJuYWw6QXN5bmNPdmVyZmxvd1Njcm9sbGluZ0VuYWJsZWQ9dHJ1ZSBdIC0tPgorPCFE T0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDxzdHlsZT4KKyAgICAgICAgI2NvbnRh aW5lciB7CisgICAgICAgICAgICB3aWR0aDogMjAwcHg7CisgICAgICAgICAgICBoZWlnaHQ6IDIw MHB4OworICAgICAgICAgICAgbWFyZ2luOiAyMHB4OworICAgICAgICAgICAgb3ZlcmZsb3cteTog c2Nyb2xsOworICAgICAgICAgICAgYm9yZGVyLXJhZGl1czogMTBweDsKKyAgICAgICAgICAgIGJv cmRlcjogMXB4IHNvbGlkIGJsYWNrOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICAuZmls bGVyIHsKKyAgICAgICAgICAgIGhlaWdodDogMTAwJTsKKyAgICAgICAgICAgIHdpZHRoOiAxMHB4 OworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogc2lsdmVyOworICAgICAgICB9CisKKyAg ICAgICAgLmxhc3QgeworICAgICAgICAgICAgd2lkdGg6IDEwMCU7CisgICAgICAgICAgICBoZWln aHQ6IDEwMHB4OworICAgICAgICAgICAgb3ZlcmZsb3c6IHNjcm9sbDsKKyAgICAgICAgfQorICAg ICAgICAKKyAgICAgICAgLmJveCB7CisgICAgICAgICAgICB3aWR0aDogODAlOworICAgICAgICAg ICAgaGVpZ2h0OiA4MHB4OworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47Cisg ICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIC5vYnNjdXJlciB7CisgICAgICAgICAgICBwb3Np dGlvbjogYWJzb2x1dGU7CisgICAgICAgICAgICB3aWR0aDogMTBweDsKKyAgICAgICAgICAgIGhl aWdodDogMTBweDsKKyAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IGdyYXk7CisgICAgICAg IH0KKyAgICA8L3N0eWxlPgorICAgIDxzY3JpcHQ+CisgICAgICAgIHdpbmRvdy5hZGRFdmVudExp c3RlbmVyKCdsb2FkJywgKCkgPT4geworICAgICAgICAgICAgc2V0VGltZW91dCgoKSA9PiB7Cisg ICAgICAgICAgICAgICAgY29udGFpbmVyLnNjcm9sbFRvKDAsIDEwMDApOworICAgICAgICAgICAg fSwgMCk7CisgICAgICAgIH0sIGZhbHNlKTsKKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5 PgorICAgIDxkaXYgaWQ9Y29udGFpbmVyPgorICAgICAgICA8ZGl2IGNsYXNzPSJmaWxsZXIiPjwv ZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPWxhc3Q+CisgICAgICAgICAgICA8ZGl2IGNsYXNzPSJi b3giPjwvZGl2PgorICAgICAgICA8L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0ib2JzY3VyZXIi IHN0eWxlPSJsZWZ0OiAyNXB4OyB0b3A6IDExOHB4OyI+PC9kaXY+CisgICAgICAgIDxkaXYgY2xh c3M9Im9ic2N1cmVyIiBzdHlsZT0ibGVmdDogMTYwcHg7IHRvcDogMTE4cHg7Ij48L2Rpdj4KKyAg ICAgICAgPGRpdiBjbGFzcz0ib2JzY3VyZXIiIHN0eWxlPSJsZWZ0OiAyNXB4OyB0b3A6IDE5NnB4 OyI+PC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9Im9ic2N1cmVyIiBzdHlsZT0ibGVmdDogMTYw cHg7IHRvcDogMTk2cHg7Ij48L2Rpdj4KKyAgICA8L2Rpdj4KKyAgICA8cD5Zb3Ugc2hvdWxkIHNl ZSBhIGdyZWVuIGJveCBpbiB0aGUgc2Nyb2xsZXIuPC9wPgorPC9ib2R5PgorPC9odG1sPgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvY2xpcHBpbmcvbmVzdGVkLW92ZXJmbG93 LXdpdGgtYm9yZGVyLXJhZGl1cy5odG1sIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvY2xpcHBp bmcvbmVzdGVkLW92ZXJmbG93LXdpdGgtYm9yZGVyLXJhZGl1cy5odG1sCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjA4 MzAwMjBiN2MxZjczZWQ4OGRjOTc5Mzc3ODRhY2E0MjYyYWM5NGUKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9jbGlwcGluZy9uZXN0ZWQtb3ZlcmZsb3ctd2l0aC1i b3JkZXItcmFkaXVzLmh0bWwKQEAgLTAsMCArMSw2NyBAQAorPCFET0NUWVBFIGh0bWw+IDwhLS0g d2Via2l0LXRlc3QtcnVubmVyIFsgaW50ZXJuYWw6QXN5bmNPdmVyZmxvd1Njcm9sbGluZ0VuYWJs ZWQ9dHJ1ZSBdIC0tPgorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDxzdHls ZT4KKyAgICAgICAgI2NvbnRhaW5lciB7CisgICAgICAgICAgICB3aWR0aDogMjAwcHg7CisgICAg ICAgICAgICBoZWlnaHQ6IDIwMHB4OworICAgICAgICAgICAgbWFyZ2luOiAyMHB4OworICAgICAg ICAgICAgb3ZlcmZsb3cteTogc2Nyb2xsOworICAgICAgICAgICAgYm9yZGVyLXJhZGl1czogMTBw eDsKKyAgICAgICAgICAgIGJvcmRlcjogMXB4IHNvbGlkIGJsYWNrOworICAgICAgICB9CisgICAg ICAgIAorICAgICAgICAuZmlsbGVyIHsKKyAgICAgICAgICAgIGhlaWdodDogMTAwJTsKKyAgICAg ICAgICAgIHdpZHRoOiAxMHB4OworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogc2lsdmVy OworICAgICAgICB9CisKKyAgICAgICAgLmxhc3QgeworICAgICAgICAgICAgd2lkdGg6IDEwMCU7 CisgICAgICAgICAgICBoZWlnaHQ6IDEwMHB4OworICAgICAgICAgICAgb3ZlcmZsb3c6IHNjcm9s bDsKKyAgICAgICAgICAgIGJvcmRlci1yYWRpdXM6IDJweDsKKyAgICAgICAgfQorICAgICAgICAK KyAgICAgICAgLmJveCB7CisgICAgICAgICAgICB3aWR0aDogODAlOworICAgICAgICAgICAgaGVp Z2h0OiA4MHB4OworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CisgICAgICAg IH0KKworICAgICAgICAub2JzY3VyZXIgeworICAgICAgICAgICAgcG9zaXRpb246IGFic29sdXRl OworICAgICAgICAgICAgd2lkdGg6IDEwcHg7CisgICAgICAgICAgICBoZWlnaHQ6IDEwcHg7Cisg ICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmF5OworICAgICAgICB9CisgICAgPC9zdHls ZT4KKyAgICA8c2NyaXB0PgorICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgICAg ICAgICB0ZXN0UnVubmVyLndhaXRVbnRpbERvbmUoKTsKKworICAgICAgICB3aW5kb3cuYWRkRXZl bnRMaXN0ZW5lcignbG9hZCcsICgpID0+IHsKKyAgICAgICAgICAgIHNldFRpbWVvdXQoKCkgPT4g eworICAgICAgICAgICAgICAgIGNvbnRhaW5lci5zY3JvbGxUbygwLCAxMDAwKTsKKyAgICAgICAg ICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgICAgICAgICAgICAgICAgIHRlc3RS dW5uZXIubm90aWZ5RG9uZSgpOworICAgICAgICAgICAgfSwgMCk7CisgICAgICAgIH0sIGZhbHNl KTsKKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorICAgIDxkaXYgaWQ9Y29udGFpbmVy PgorICAgICAgICA8ZGl2IGNsYXNzPSJmaWxsZXIiPjwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNz PWxhc3Q+CisgICAgICAgICAgICA8ZGl2IGNsYXNzPSJib3giPjwvZGl2PgorICAgICAgICA8L2Rp dj4KKyAgICAgICAgPGRpdiBjbGFzcz0ib2JzY3VyZXIiIHN0eWxlPSJsZWZ0OiAyNXB4OyB0b3A6 IDExOHB4OyI+PC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9Im9ic2N1cmVyIiBzdHlsZT0ibGVm dDogMTYwcHg7IHRvcDogMTE4cHg7Ij48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0ib2JzY3Vy ZXIiIHN0eWxlPSJsZWZ0OiAyNXB4OyB0b3A6IDE5NnB4OyI+PC9kaXY+CisgICAgICAgIDxkaXYg Y2xhc3M9Im9ic2N1cmVyIiBzdHlsZT0ibGVmdDogMTYwcHg7IHRvcDogMTk2cHg7Ij48L2Rpdj4K KyAgICA8L2Rpdj4KKyAgICA8cD5Zb3Ugc2hvdWxkIHNlZSBhIGdyZWVuIGJveCBpbiB0aGUgc2Ny b2xsZXIuPC9wPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29t cG9zaXRpbmcvaGlkcGktY29tcG9zaXRpbmctbGF5ZXItd2l0aC10aWxlLWxheWVycy1vbi1zdWJw aXhlbC1wb3NpdGlvbi1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvaGlk cGktY29tcG9zaXRpbmctbGF5ZXItd2l0aC10aWxlLWxheWVycy1vbi1zdWJwaXhlbC1wb3NpdGlv bi1leHBlY3RlZC5odG1sCmluZGV4IDJjMTFjNTZjNzgyMmY1MzMwNzU4NDcxYThjYjllMTM0NDQ4 NjFjY2UuLmViZTBjMDJhNTNiMWViYWUyNDMzYTExZGNlNGNiZDYxYjEzYzRiNDkgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2hpZHBpLWNvbXBvc2l0aW5nLWxheWVyLXdpdGgt dGlsZS1sYXllcnMtb24tc3VicGl4ZWwtcG9zaXRpb24tZXhwZWN0ZWQuaHRtbAorKysgYi9MYXlv dXRUZXN0cy9jb21wb3NpdGluZy9oaWRwaS1jb21wb3NpdGluZy1sYXllci13aXRoLXRpbGUtbGF5 ZXJzLW9uLXN1YnBpeGVsLXBvc2l0aW9uLWV4cGVjdGVkLmh0bWwKQEAgLTEwLDcgKzEwLDcgQEAK ICAgfQogCiAgIC5pbm5lciB7Ci0gICAgLXdlYmtpdC1ib3JkZXItcmFkaXVzOiAxcHg7CisgICAg Ym9yZGVyLXJhZGl1czogMjBweDsKICAgICBvdmVyZmxvdzogaGlkZGVuOwogICAgIHdpZHRoOiAy MTAwcHg7IAogICB9CkBAIC0xOCw3ICsxOCw3IEBACiAgIC5sYXJnZWJveCB7CiAgICAgd2lkdGg6 IDYwMHB4OyAKICAgICBoZWlnaHQ6IDEwMHB4OyAJCi0gICAgYmFja2dyb3VuZC1jb2xvcjogcmVk OyAKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsgCiAgIH0KIDwvc3R5bGU+CiA8L2hlYWQ+ CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9oaWRwaS1jb21wb3NpdGluZy1s YXllci13aXRoLXRpbGUtbGF5ZXJzLW9uLXN1YnBpeGVsLXBvc2l0aW9uLmh0bWwgYi9MYXlvdXRU ZXN0cy9jb21wb3NpdGluZy9oaWRwaS1jb21wb3NpdGluZy1sYXllci13aXRoLXRpbGUtbGF5ZXJz LW9uLXN1YnBpeGVsLXBvc2l0aW9uLmh0bWwKaW5kZXggZTY1YTI0ZWEyYzY0MDNkZWZiZTIwZGIx ODU5ZWQxYzUxYzI4MTQyNC4uYjZjZjQ5Yzg2ZjBjNjZkYjlhMjQyMWQ2NDYwZThiYTgxM2U4NjYx ZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvaGlkcGktY29tcG9zaXRpbmct bGF5ZXItd2l0aC10aWxlLWxheWVycy1vbi1zdWJwaXhlbC1wb3NpdGlvbi5odG1sCisrKyBiL0xh eW91dFRlc3RzL2NvbXBvc2l0aW5nL2hpZHBpLWNvbXBvc2l0aW5nLWxheWVyLXdpdGgtdGlsZS1s YXllcnMtb24tc3VicGl4ZWwtcG9zaXRpb24uaHRtbApAQCAtMTAsMTYgKzEwLDE2IEBACiAgIH0K IAogICAuaW5uZXIgewotICAgIC13ZWJraXQtYm9yZGVyLXJhZGl1czogMXB4OworICAgIGJvcmRl ci1yYWRpdXM6IDIwcHg7CiAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKICAgICB3aWR0aDogMjEwMHB4 OyAKLSAgICAtd2Via2l0LXRyYW5zZm9ybTogdHJhbnNsYXRlWigwKTsKKyAgICB0cmFuc2Zvcm06 IHRyYW5zbGF0ZVooMCk7CiAgIH0KICAgCiAgIC5sYXJnZWJveCB7CiAgICAgd2lkdGg6IDYwMHB4 OyAKICAgICBoZWlnaHQ6IDEwMHB4OyAKLSAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZWQ7IAorICAg IGJhY2tncm91bmQtY29sb3I6IGdyZWVuOyAKICAgfQogPC9zdHlsZT4KIDwvaGVhZD4K 402879 2020-06-26 10:14:53 -0700 2020-06-26 13:16:38 -0700 Patch bug-213580-20200626101452.patch text/plain 19717 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTIzNmYwM2E0MmI1YWYx OTRiYWNkYjQzYWQyYTBiYjMxYTJjOTJiZS4uMTNjZDJlMjNmYzE4YjczNjYwMzQ4MmM2YmViZGY0 NTZkM2E5MGY3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA2LTI2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENvbnRlbnQgc29t ZXRpbWVzIG1pc3NpbmcgaW4gbmVzdGVkIHNjcm9sbGVycyB3aXRoIGJvcmRlci1yYWRpdXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzU4MAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNjQ0NjAzNzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBSZW5kZXJMYXllcjo6Y2xpcFRvUmVjdCgp IGhhcyBhIHNwZWNpYWwgY2FzZSBmb3IgY2xpcHMgaW52b2x2aW5nIGJvcmRlci1yYWRpdXMsCisg ICAgICAgIGludm9sdmluZyBhbiBhbmNlc3RvciB0cmVlIHdhbGsgd2hpY2ggYXBwbGllcyB0aGUg cm91bmRlZCBjbGlwcy4KKworICAgICAgICBXaGVuIGluc2lkZSBjb21wb3NpdGVkIG92ZXJmbG93 LCBkb24ndCBpbmNsdWRlIHRoZSBib3JkZXItcmFkaXVzIGZyb20gdGhlIHNjcm9sbGVyIHNpbmNl CisgICAgICAgIHRoYXQgZG9lcyBpdHMgb3duIGNsaXBwaW5nLgorCisgICAgICAgIFRlc3Q6IGNv bXBvc2l0aW5nL2NsaXBwaW5nL25lc3RlZC1vdmVyZmxvdy13aXRoLWJvcmRlci1yYWRpdXMuaHRt bAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckxheWVyOjpjbGlwVG9SZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxh eWVyOjpjYWxjdWxhdGVDbGlwUmVjdHMgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJMYXllci5oOgorCiAyMDIwLTA2LTI2ICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29t PgogCiAgICAgICAgIFRleHQgbWFuaXB1bGF0aW9uIHNob3VsZCBvYnNlcnZlIGFkamFjZW50IGVs ZW1lbnRzIHdpdGggbmV3IHJlbmRlcmVyIHRvZ2V0aGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmNwcAppbmRleCA4OWMwY2Q5NDZjNzQ1NjY2MjQxNTA3NmI0MGM1ZDI3ZGQx YjYyZTg3Li42NmMyYjkwNTUxMDNlOWQwY2IxMWE3NjMzZGFjOGVjMDAwZWZjZjk4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTQxNzAsNyArNDE3MCw3IEBA IHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50T3ZlcmxheVNjcm9sbGJhcnMoR3JhcGhpY3NDb250ZXh0 JiBjb250ZXh0LCBjb25zdCBMYXlvdXRSCiAgICAgbV9jb250YWluc0RpcnR5T3ZlcmxheVNjcm9s bGJhcnMgPSBmYWxzZTsKIH0KIAotdm9pZCBSZW5kZXJMYXllcjo6Y2xpcFRvUmVjdChHcmFwaGlj c0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IExheWVyUGFpbnRpbmdJbmZvJiBwYWludGluZ0luZm8s IGNvbnN0IENsaXBSZWN0JiBjbGlwUmVjdCwgQm9yZGVyUmFkaXVzQ2xpcHBpbmdSdWxlIHJ1bGUp Cit2b2lkIFJlbmRlckxheWVyOjpjbGlwVG9SZWN0KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwg Y29uc3QgTGF5ZXJQYWludGluZ0luZm8mIHBhaW50aW5nSW5mbywgT3B0aW9uU2V0PFBhaW50QmVo YXZpb3I+IHBhaW50QmVoYXZpb3IsIGNvbnN0IENsaXBSZWN0JiBjbGlwUmVjdCwgQm9yZGVyUmFk aXVzQ2xpcHBpbmdSdWxlIHJ1bGUpCiB7CiAgICAgZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3IgPSBy ZW5kZXJlcigpLmRvY3VtZW50KCkuZGV2aWNlU2NhbGVGYWN0b3IoKTsKICAgICBib29sIG5lZWRz Q2xpcHBpbmcgPSAhY2xpcFJlY3QuaXNJbmZpbml0ZSgpICYmIGNsaXBSZWN0LnJlY3QoKSAhPSBw YWludGluZ0luZm8ucGFpbnREaXJ0eVJlY3Q7CkBAIC00MTkyLDYgKzQxOTIsOSBAQCB2b2lkIFJl bmRlckxheWVyOjpjbGlwVG9SZWN0KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgTGF5 ZXJQYWludGluZ0luZm8mCiAgICAgICAgIC8vIGFueSBsYXllcnMgd2l0aCBvdmVyZmxvdy4gVGhl IGNvbmRpdGlvbiBmb3IgYmVpbmcgYWJsZSB0byBhcHBseSB0aGVzZSBjbGlwcyBpcyB0aGF0IHRo ZSBvdmVyZmxvdyBvYmplY3QgYmUgaW4gb3VyCiAgICAgICAgIC8vIGNvbnRhaW5pbmcgYmxvY2sg Y2hhaW4gc28gd2UgY2hlY2sgdGhhdCBhbHNvLgogICAgICAgICBmb3IgKFJlbmRlckxheWVyKiBs YXllciA9IHJ1bGUgPT0gSW5jbHVkZVNlbGZGb3JCb3JkZXJSYWRpdXMgPyB0aGlzIDogcGFyZW50 KCk7IGxheWVyOyBsYXllciA9IGxheWVyLT5wYXJlbnQoKSkgeworICAgICAgICAgICAgaWYgKHBh aW50QmVoYXZpb3IuY29udGFpbnMoUGFpbnRCZWhhdmlvcjo6Q29tcG9zaXRlZE92ZXJmbG93U2Ny b2xsQ29udGVudCkgJiYgbGF5ZXItPnVzZXNDb21wb3NpdGVkU2Nyb2xsaW5nKCkpCisgICAgICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgIAogICAgICAgICAgICAgaWYgKGxheWVyLT5yZW5kZXJl cigpLmhhc092ZXJmbG93Q2xpcCgpICYmIGxheWVyLT5yZW5kZXJlcigpLnN0eWxlKCkuaGFzQm9y ZGVyUmFkaXVzKCkgJiYgYW5jZXN0b3JMYXllcklzSW5Db250YWluaW5nQmxvY2tDaGFpbigqbGF5 ZXIpKSB7CiAgICAgICAgICAgICAgICAgTGF5b3V0UmVjdCBhZGp1c3RlZENsaXBSZWN0ID0gTGF5 b3V0UmVjdCh0b0xheW91dFBvaW50KGxheWVyLT5vZmZzZXRGcm9tQW5jZXN0b3IocGFpbnRpbmdJ bmZvLnJvb3RMYXllciwgQWRqdXN0Rm9yQ29sdW1ucykpLCBsYXllci0+c2l6ZSgpKTsKICAgICAg ICAgICAgICAgICBhZGp1c3RlZENsaXBSZWN0Lm1vdmUocGFpbnRpbmdJbmZvLnN1YnBpeGVsT2Zm c2V0KTsKQEAgLTQzNDAsOCArNDM0MywxMiBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludExheWVy V2l0aEVmZmVjdHMoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBMYXllclBhaQogICAg ICAgICAgICAgY2xpcFJlY3QgPSBiYWNrZ3JvdW5kQ2xpcFJlY3QoY2xpcFJlY3RzQ29udGV4dCk7 CiAgICAgICAgICAgICBjbGlwUmVjdC5pbnRlcnNlY3QocGFpbnRpbmdJbmZvLnBhaW50RGlydHlS ZWN0KTsKICAgICAgICAgCisgICAgICAgICAgICBPcHRpb25TZXQ8UGFpbnRCZWhhdmlvcj4gcGFp bnRCZWhhdmlvciA9IFBhaW50QmVoYXZpb3I6Ok5vcm1hbDsKKyAgICAgICAgICAgIGlmIChwYWlu dEZsYWdzLmNvbnRhaW5zKFBhaW50TGF5ZXJGbGFnOjpQYWludGluZ092ZXJmbG93Q29udGVudHMp KQorICAgICAgICAgICAgICAgIHBhaW50QmVoYXZpb3IuYWRkKFBhaW50QmVoYXZpb3I6OkNvbXBv c2l0ZWRPdmVyZmxvd1Njcm9sbENvbnRlbnQpOworCiAgICAgICAgICAgICAvLyBQdXNoIHRoZSBw YXJlbnQgY29vcmRpbmF0ZSBzcGFjZSdzIGNsaXAuCi0gICAgICAgICAgICBwYXJlbnQoKS0+Y2xp cFRvUmVjdChjb250ZXh0LCBwYWludGluZ0luZm8sIGNsaXBSZWN0KTsKKyAgICAgICAgICAgIHBh cmVudCgpLT5jbGlwVG9SZWN0KGNvbnRleHQsIHBhaW50aW5nSW5mbywgcGFpbnRCZWhhdmlvciwg Y2xpcFJlY3QpOwogICAgICAgICB9CiAKICAgICAgICAgcGFpbnRMYXllckJ5QXBwbHlpbmdUcmFu c2Zvcm0oY29udGV4dCwgcGFpbnRpbmdJbmZvLCBwYWludEZsYWdzKTsKQEAgLTQ1MTcsMTEgKzQ1 MjQsMTEgQEAgR3JhcGhpY3NDb250ZXh0KiBSZW5kZXJMYXllcjo6c2V0dXBGaWx0ZXJzKEdyYXBo aWNzQ29udGV4dCYgZGVzdGluYXRpb25Db250ZXh0LAogICAgIHJldHVybiBmaWx0ZXJDb250ZXh0 OwogfQogCi12b2lkIFJlbmRlckxheWVyOjphcHBseUZpbHRlcnMoR3JhcGhpY3NDb250ZXh0JiBv cmlnaW5hbENvbnRleHQsIGNvbnN0IExheWVyUGFpbnRpbmdJbmZvJiBwYWludGluZ0luZm8sIGNv bnN0IExheWVyRnJhZ21lbnRzJiBsYXllckZyYWdtZW50cykKK3ZvaWQgUmVuZGVyTGF5ZXI6OmFw cGx5RmlsdGVycyhHcmFwaGljc0NvbnRleHQmIG9yaWdpbmFsQ29udGV4dCwgY29uc3QgTGF5ZXJQ YWludGluZ0luZm8mIHBhaW50aW5nSW5mbywgT3B0aW9uU2V0PFBhaW50QmVoYXZpb3I+IGJlaGF2 aW9yLCBjb25zdCBMYXllckZyYWdtZW50cyYgbGF5ZXJGcmFnbWVudHMpCiB7CiAgICAgLy8gRklY TUU6IEhhbmRsZSBtb3JlIHRoYW4gb25lIGZyYWdtZW50LgogICAgIENsaXBSZWN0IGJhY2tncm91 bmRSZWN0ID0gbGF5ZXJGcmFnbWVudHMuaXNFbXB0eSgpID8gQ2xpcFJlY3QoKSA6IGxheWVyRnJh Z21lbnRzWzBdLmJhY2tncm91bmRSZWN0OwotICAgIGNsaXBUb1JlY3Qob3JpZ2luYWxDb250ZXh0 LCBwYWludGluZ0luZm8sIGJhY2tncm91bmRSZWN0KTsKKyAgICBjbGlwVG9SZWN0KG9yaWdpbmFs Q29udGV4dCwgcGFpbnRpbmdJbmZvLCBiZWhhdmlvciwgYmFja2dyb3VuZFJlY3QpOwogICAgIG1f ZmlsdGVycy0+YXBwbHlGaWx0ZXJFZmZlY3Qob3JpZ2luYWxDb250ZXh0KTsKICAgICByZXN0b3Jl Q2xpcChvcmlnaW5hbENvbnRleHQsIHBhaW50aW5nSW5mbywgYmFja2dyb3VuZFJlY3QpOwogfQpA QCAtNDY5NSw3ICs0NzAyLDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6cGFpbnRMYXllckNvbnRlbnRz KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgTGF5ZXJQYWludGkKICAgICAgICAgICAg ICAgICAoaXNQYWludGluZ092ZXJmbG93Q29udGVudHMpID8gSWdub3JlT3ZlcmZsb3dDbGlwIDog UmVzcGVjdE92ZXJmbG93Q2xpcCwgb2Zmc2V0RnJvbVJvb3QpOwogICAgICAgICAgICAgdXBkYXRl UGFpbnRpbmdJbmZvRm9yRnJhZ21lbnRzKGxheWVyRnJhZ21lbnRzLCBwYWludGluZ0luZm8sIGxv Y2FsUGFpbnRGbGFncywgc2hvdWxkUGFpbnRDb250ZW50LCBvZmZzZXRGcm9tUm9vdCk7CiAKLSAg ICAgICAgICAgIGFwcGx5RmlsdGVycyhjb250ZXh0LCBwYWludGluZ0luZm8sIGxheWVyRnJhZ21l bnRzKTsKKyAgICAgICAgICAgIGFwcGx5RmlsdGVycyhjb250ZXh0LCBwYWludGluZ0luZm8sIHBh aW50QmVoYXZpb3IsIGxheWVyRnJhZ21lbnRzKTsKICAgICAgICAgfQogICAgIH0KICAgICAKQEAg LTQ5NzUsNyArNDk4MiwxMSBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludFRyYW5zZm9ybWVkTGF5 ZXJJbnRvRnJhZ21lbnRzKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgYwogICAgICAgICAgICAg Y2xpcFJlY3QuaW50ZXJzZWN0KHBhcmVudENsaXBSZWN0KTsKICAgICAgICAgfQogCi0gICAgICAg IHBhcmVudCgpLT5jbGlwVG9SZWN0KGNvbnRleHQsIHBhaW50aW5nSW5mbywgY2xpcFJlY3QpOwor ICAgICAgICBPcHRpb25TZXQ8UGFpbnRCZWhhdmlvcj4gcGFpbnRCZWhhdmlvciA9IFBhaW50QmVo YXZpb3I6Ok5vcm1hbDsKKyAgICAgICAgaWYgKHBhaW50RmxhZ3MuY29udGFpbnMoUGFpbnRMYXll ckZsYWc6OlBhaW50aW5nT3ZlcmZsb3dDb250ZW50cykpCisgICAgICAgICAgICBwYWludEJlaGF2 aW9yLmFkZChQYWludEJlaGF2aW9yOjpDb21wb3NpdGVkT3ZlcmZsb3dTY3JvbGxDb250ZW50KTsK KworICAgICAgICBwYXJlbnQoKS0+Y2xpcFRvUmVjdChjb250ZXh0LCBwYWludGluZ0luZm8sIHBh aW50QmVoYXZpb3IsIGNsaXBSZWN0KTsKICAgICAgICAgcGFpbnRMYXllckJ5QXBwbHlpbmdUcmFu c2Zvcm0oY29udGV4dCwgcGFpbnRpbmdJbmZvLCBwYWludEZsYWdzLCBmcmFnbWVudC5wYWdpbmF0 aW9uT2Zmc2V0KTsKICAgICAgICAgcGFyZW50KCktPnJlc3RvcmVDbGlwKGNvbnRleHQsIHBhaW50 aW5nSW5mbywgY2xpcFJlY3QpOwogICAgIH0KQEAgLTQ5OTYsNyArNTAwNyw3IEBAIHZvaWQgUmVu ZGVyTGF5ZXI6OnBhaW50QmFja2dyb3VuZEZvckZyYWdtZW50cyhjb25zdCBMYXllckZyYWdtZW50 cyYgbGF5ZXJGcmFnbWVuCiAgICAgICAgIGlmIChsb2NhbFBhaW50aW5nSW5mby5jbGlwVG9EaXJ0 eVJlY3QpIHsKICAgICAgICAgICAgIC8vIFBhaW50IG91ciBiYWNrZ3JvdW5kIGZpcnN0LCBiZWZv cmUgcGFpbnRpbmcgYW55IGNoaWxkIGxheWVycy4KICAgICAgICAgICAgIC8vIEVzdGFibGlzaCB0 aGUgY2xpcCB1c2VkIHRvIHBhaW50IG91ciBiYWNrZ3JvdW5kLgotICAgICAgICAgICAgY2xpcFRv UmVjdChjb250ZXh0LCBsb2NhbFBhaW50aW5nSW5mbywgZnJhZ21lbnQuYmFja2dyb3VuZFJlY3Qs IERvTm90SW5jbHVkZVNlbGZGb3JCb3JkZXJSYWRpdXMpOyAvLyBCYWNrZ3JvdW5kIHBhaW50aW5n IHdpbGwgaGFuZGxlIGNsaXBwaW5nIHRvIHNlbGYuCisgICAgICAgICAgICBjbGlwVG9SZWN0KGNv bnRleHQsIGxvY2FsUGFpbnRpbmdJbmZvLCBwYWludEJlaGF2aW9yLCBmcmFnbWVudC5iYWNrZ3Jv dW5kUmVjdCwgRG9Ob3RJbmNsdWRlU2VsZkZvckJvcmRlclJhZGl1cyk7IC8vIEJhY2tncm91bmQg cGFpbnRpbmcgd2lsbCBoYW5kbGUgY2xpcHBpbmcgdG8gc2VsZi4KICAgICAgICAgfQogICAgICAg ICAKICAgICAgICAgLy8gUGFpbnQgdGhlIGJhY2tncm91bmQuCkBAIC01MDQ5LDcgKzUwNjAsNyBA QCB2b2lkIFJlbmRlckxheWVyOjpwYWludEZvcmVncm91bmRGb3JGcmFnbWVudHMoY29uc3QgTGF5 ZXJGcmFnbWVudHMmIGxheWVyRnJhZ21lbgogICAgIENsaXBSZWN0IGNsaXBwZWRSZWN0OwogICAg IGlmIChzaG91bGRDbGlwKSB7CiAgICAgICAgIGNsaXBwZWRSZWN0ID0gbGF5ZXJGcmFnbWVudHNb MF0uZm9yZWdyb3VuZFJlY3Q7Ci0gICAgICAgIGNsaXBUb1JlY3QoY29udGV4dCwgbG9jYWxQYWlu dGluZ0luZm8sIGNsaXBwZWRSZWN0KTsKKyAgICAgICAgY2xpcFRvUmVjdChjb250ZXh0LCBsb2Nh bFBhaW50aW5nSW5mbywgbG9jYWxQYWludEJlaGF2aW9yLCBjbGlwcGVkUmVjdCk7CiAgICAgfQog ICAgIAogICAgIC8vIFdlIGhhdmUgdG8gbG9vcCB0aHJvdWdoIGV2ZXJ5IGZyYWdtZW50IG11bHRp cGxlIHRpbWVzLCBzaW5jZSB3ZSBoYXZlIHRvIHJlcGFpbnQgaW4gZWFjaCBzcGVjaWZpYyBwaGFz ZSBpbiBvcmRlciBmb3IKQEAgLTUwODIsNyArNTA5Myw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBh aW50Rm9yZWdyb3VuZEZvckZyYWdtZW50c1dpdGhQaGFzZShQYWludFBoYXNlIHBoYXNlLCBjb25z dCBMCiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgCiAgICAgICAgIGlmIChzaG91bGRD bGlwKQotICAgICAgICAgICAgY2xpcFRvUmVjdChjb250ZXh0LCBsb2NhbFBhaW50aW5nSW5mbywg ZnJhZ21lbnQuZm9yZWdyb3VuZFJlY3QpOworICAgICAgICAgICAgY2xpcFRvUmVjdChjb250ZXh0 LCBsb2NhbFBhaW50aW5nSW5mbywgcGFpbnRCZWhhdmlvciwgZnJhZ21lbnQuZm9yZWdyb3VuZFJl Y3QpOwogICAgIAogICAgICAgICBQYWludEluZm8gcGFpbnRJbmZvKGNvbnRleHQsIGZyYWdtZW50 LmZvcmVncm91bmRSZWN0LnJlY3QoKSwgcGhhc2UsIHBhaW50QmVoYXZpb3IsIHN1YnRyZWVQYWlu dFJvb3RGb3JSZW5kZXJlciwgbnVsbHB0ciwgbnVsbHB0ciwgJmxvY2FsUGFpbnRpbmdJbmZvLnJv b3RMYXllci0+cmVuZGVyZXIoKSwgdGhpcywgbG9jYWxQYWludGluZ0luZm8ucmVxdWlyZVNlY3Vy aXR5T3JpZ2luQWNjZXNzRm9yV2lkZ2V0cyk7CiAgICAgICAgIGlmIChwaGFzZSA9PSBQYWludFBo YXNlOjpGb3JlZ3JvdW5kKQpAQCAtNTEwMyw3ICs1MTE0LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6 cGFpbnRPdXRsaW5lRm9yRnJhZ21lbnRzKGNvbnN0IExheWVyRnJhZ21lbnRzJiBsYXllckZyYWdt ZW50cywKICAgICAKICAgICAgICAgLy8gUGFpbnQgb3VyIG93biBvdXRsaW5lCiAgICAgICAgIFBh aW50SW5mbyBwYWludEluZm8oY29udGV4dCwgZnJhZ21lbnQuYmFja2dyb3VuZFJlY3QucmVjdCgp LCBQYWludFBoYXNlOjpTZWxmT3V0bGluZSwgcGFpbnRCZWhhdmlvciwgc3VidHJlZVBhaW50Um9v dEZvclJlbmRlcmVyLCBudWxscHRyLCBudWxscHRyLCAmbG9jYWxQYWludGluZ0luZm8ucm9vdExh eWVyLT5yZW5kZXJlcigpLCB0aGlzKTsKLSAgICAgICAgY2xpcFRvUmVjdChjb250ZXh0LCBsb2Nh bFBhaW50aW5nSW5mbywgZnJhZ21lbnQuYmFja2dyb3VuZFJlY3QsIERvTm90SW5jbHVkZVNlbGZG b3JCb3JkZXJSYWRpdXMpOworICAgICAgICBjbGlwVG9SZWN0KGNvbnRleHQsIGxvY2FsUGFpbnRp bmdJbmZvLCBwYWludEJlaGF2aW9yLCBmcmFnbWVudC5iYWNrZ3JvdW5kUmVjdCwgRG9Ob3RJbmNs dWRlU2VsZkZvckJvcmRlclJhZGl1cyk7CiAgICAgICAgIHJlbmRlcmVyKCkucGFpbnQocGFpbnRJ bmZvLCB0b0xheW91dFBvaW50KGZyYWdtZW50LmxheWVyQm91bmRzLmxvY2F0aW9uKCkgLSByZW5k ZXJCb3hMb2NhdGlvbigpICsgbG9jYWxQYWludGluZ0luZm8uc3VicGl4ZWxPZmZzZXQpKTsKICAg ICAgICAgcmVzdG9yZUNsaXAoY29udGV4dCwgbG9jYWxQYWludGluZ0luZm8sIGZyYWdtZW50LmJh Y2tncm91bmRSZWN0KTsKICAgICB9CkBAIC01MTE3LDcgKzUxMjgsNyBAQCB2b2lkIFJlbmRlckxh eWVyOjpwYWludE1hc2tGb3JGcmFnbWVudHMoY29uc3QgTGF5ZXJGcmFnbWVudHMmIGxheWVyRnJh Z21lbnRzLCBHcgogICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgaWYgKGxvY2FsUGFp bnRpbmdJbmZvLmNsaXBUb0RpcnR5UmVjdCkKLSAgICAgICAgICAgIGNsaXBUb1JlY3QoY29udGV4 dCwgbG9jYWxQYWludGluZ0luZm8sIGZyYWdtZW50LmJhY2tncm91bmRSZWN0LCBEb05vdEluY2x1 ZGVTZWxmRm9yQm9yZGVyUmFkaXVzKTsgLy8gTWFzayBwYWludGluZyB3aWxsIGhhbmRsZSBjbGlw cGluZyB0byBzZWxmLgorICAgICAgICAgICAgY2xpcFRvUmVjdChjb250ZXh0LCBsb2NhbFBhaW50 aW5nSW5mbywgcGFpbnRCZWhhdmlvciwgZnJhZ21lbnQuYmFja2dyb3VuZFJlY3QsIERvTm90SW5j bHVkZVNlbGZGb3JCb3JkZXJSYWRpdXMpOyAvLyBNYXNrIHBhaW50aW5nIHdpbGwgaGFuZGxlIGNs aXBwaW5nIHRvIHNlbGYuCiAgICAgICAgIAogICAgICAgICAvLyBQYWludCB0aGUgbWFzay4KICAg ICAgICAgLy8gRklYTUU6IEV2ZW50dWFsbHkgd2Ugd2lsbCBjb2xsZWN0IHRoZSByZWdpb24gZnJv bSB0aGUgZnJhZ21lbnQgaXRzZWxmIGluc3RlYWQgb2YganVzdCBmcm9tIHRoZSBwYWludCBpbmZv LgpAQCAtNTEzNiw3ICs1MTQ3LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6cGFpbnRDaGlsZENsaXBw aW5nTWFza0ZvckZyYWdtZW50cyhjb25zdCBMYXllckZyYWdtZW50cyYgbGF5ZXIKICAgICAgICAg ICAgIGNvbnRpbnVlOwogCiAgICAgICAgIGlmIChsb2NhbFBhaW50aW5nSW5mby5jbGlwVG9EaXJ0 eVJlY3QpCi0gICAgICAgICAgICBjbGlwVG9SZWN0KGNvbnRleHQsIGxvY2FsUGFpbnRpbmdJbmZv LCBmcmFnbWVudC5mb3JlZ3JvdW5kUmVjdCwgSW5jbHVkZVNlbGZGb3JCb3JkZXJSYWRpdXMpOyAv LyBDaGlsZCBjbGlwcGluZyBtYXNrIHBhaW50aW5nIHdpbGwgaGFuZGxlIGNsaXBwaW5nIHRvIHNl bGYuCisgICAgICAgICAgICBjbGlwVG9SZWN0KGNvbnRleHQsIGxvY2FsUGFpbnRpbmdJbmZvLCBw YWludEJlaGF2aW9yLCBmcmFnbWVudC5mb3JlZ3JvdW5kUmVjdCwgSW5jbHVkZVNlbGZGb3JCb3Jk ZXJSYWRpdXMpOyAvLyBDaGlsZCBjbGlwcGluZyBtYXNrIHBhaW50aW5nIHdpbGwgaGFuZGxlIGNs aXBwaW5nIHRvIHNlbGYuCiAKICAgICAgICAgLy8gUGFpbnQgdGhlIGNsaXBwZWQgbWFzay4KICAg ICAgICAgUGFpbnRJbmZvIHBhaW50SW5mbyhjb250ZXh0LCBmcmFnbWVudC5iYWNrZ3JvdW5kUmVj dC5yZWN0KCksIFBhaW50UGhhc2U6OkNsaXBwaW5nTWFzaywgcGFpbnRCZWhhdmlvciwgc3VidHJl ZVBhaW50Um9vdEZvclJlbmRlcmVyLCBudWxscHRyLCBudWxscHRyLCAmbG9jYWxQYWludGluZ0lu Zm8ucm9vdExheWVyLT5yZW5kZXJlcigpLCB0aGlzKTsKQEAgLTUxNTIsNyArNTE2Myw3IEBAIHZv aWQgUmVuZGVyTGF5ZXI6OnBhaW50T3ZlcmZsb3dDb250cm9sc0ZvckZyYWdtZW50cyhjb25zdCBM YXllckZyYWdtZW50cyYgbGF5ZXJGCiAgICAgZm9yIChjb25zdCBhdXRvJiBmcmFnbWVudCA6IGxh eWVyRnJhZ21lbnRzKSB7CiAgICAgICAgIGlmIChmcmFnbWVudC5iYWNrZ3JvdW5kUmVjdC5pc0Vt cHR5KCkpCiAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgY2xpcFRvUmVjdChjb250ZXh0 LCBsb2NhbFBhaW50aW5nSW5mbywgZnJhZ21lbnQuYmFja2dyb3VuZFJlY3QpOworICAgICAgICBj bGlwVG9SZWN0KGNvbnRleHQsIGxvY2FsUGFpbnRpbmdJbmZvLCB7IH0sIGZyYWdtZW50LmJhY2tn cm91bmRSZWN0KTsKICAgICAgICAgcGFpbnRPdmVyZmxvd0NvbnRyb2xzKGNvbnRleHQsIHJvdW5k ZWRJbnRQb2ludCh0b0xheW91dFBvaW50KGZyYWdtZW50LmxheWVyQm91bmRzLmxvY2F0aW9uKCkg LSByZW5kZXJCb3hMb2NhdGlvbigpICsgbG9jYWxQYWludGluZ0luZm8uc3VicGl4ZWxPZmZzZXQp KSwKICAgICAgICAgICAgIHNuYXBwZWRJbnRSZWN0KGZyYWdtZW50LmJhY2tncm91bmRSZWN0LnJl Y3QoKSksIHRydWUpOwogICAgICAgICByZXN0b3JlQ2xpcChjb250ZXh0LCBsb2NhbFBhaW50aW5n SW5mbywgZnJhZ21lbnQuYmFja2dyb3VuZFJlY3QpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXIuaAppbmRleCA5NWQyMTlhNjNiNTExZmEwNDlhZDEzYTBmYzk0NjM5NjVmNmVlYTY2 Li4wM2ViNjFkZGIxMWJlODRiMGZhOTVhZjBiMTBhNWVkOTBmMDllM2E5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaApAQCAtMTAwMSw3ICsxMDAxLDcgQEAgcHJpdmF0ZToK IAogICAgIExheW91dFJlY3QgY2xpcFJlY3RSZWxhdGl2ZVRvQW5jZXN0b3IoUmVuZGVyTGF5ZXIq IGFuY2VzdG9yLCBMYXlvdXRTaXplIG9mZnNldEZyb21BbmNlc3RvciwgY29uc3QgTGF5b3V0UmVj dCYgY29uc3RyYWluaW5nUmVjdCkgY29uc3Q7CiAKLSAgICB2b2lkIGNsaXBUb1JlY3QoR3JhcGhp Y3NDb250ZXh0JiwgY29uc3QgTGF5ZXJQYWludGluZ0luZm8mLCBjb25zdCBDbGlwUmVjdCYsIEJv cmRlclJhZGl1c0NsaXBwaW5nUnVsZSA9IEluY2x1ZGVTZWxmRm9yQm9yZGVyUmFkaXVzKTsKKyAg ICB2b2lkIGNsaXBUb1JlY3QoR3JhcGhpY3NDb250ZXh0JiwgY29uc3QgTGF5ZXJQYWludGluZ0lu Zm8mLCBPcHRpb25TZXQ8UGFpbnRCZWhhdmlvcj4sIGNvbnN0IENsaXBSZWN0JiwgQm9yZGVyUmFk aXVzQ2xpcHBpbmdSdWxlID0gSW5jbHVkZVNlbGZGb3JCb3JkZXJSYWRpdXMpOwogICAgIHZvaWQg cmVzdG9yZUNsaXAoR3JhcGhpY3NDb250ZXh0JiwgY29uc3QgTGF5ZXJQYWludGluZ0luZm8mLCBj b25zdCBDbGlwUmVjdCYpOwogCiAgICAgYm9vbCBzaG91bGRSZXBhaW50QWZ0ZXJMYXlvdXQoKSBj b25zdDsKQEAgLTEwNTMsNyArMTA1Myw3IEBAIHByaXZhdGU6CiAKICAgICBSZW5kZXJMYXllckZp bHRlcnMqIGZpbHRlcnNGb3JQYWludGluZyhHcmFwaGljc0NvbnRleHQmLCBPcHRpb25TZXQ8UGFp bnRMYXllckZsYWc+KSBjb25zdDsKICAgICBHcmFwaGljc0NvbnRleHQqIHNldHVwRmlsdGVycyhH cmFwaGljc0NvbnRleHQmIGRlc3RpbmF0aW9uQ29udGV4dCwgTGF5ZXJQYWludGluZ0luZm8mLCBP cHRpb25TZXQ8UGFpbnRMYXllckZsYWc+LCBjb25zdCBMYXlvdXRTaXplJiBvZmZzZXRGcm9tUm9v dCwgT3B0aW9uYWw8TGF5b3V0UmVjdD4mIHJvb3RSZWxhdGl2ZUJvdW5kcyk7Ci0gICAgdm9pZCBh cHBseUZpbHRlcnMoR3JhcGhpY3NDb250ZXh0JiBvcmlnaW5hbENvbnRleHQsIGNvbnN0IExheWVy UGFpbnRpbmdJbmZvJiwgY29uc3QgTGF5ZXJGcmFnbWVudHMmKTsKKyAgICB2b2lkIGFwcGx5Rmls dGVycyhHcmFwaGljc0NvbnRleHQmIG9yaWdpbmFsQ29udGV4dCwgY29uc3QgTGF5ZXJQYWludGlu Z0luZm8mLCBPcHRpb25TZXQ8UGFpbnRCZWhhdmlvcj4sIGNvbnN0IExheWVyRnJhZ21lbnRzJik7 CiAKICAgICB2b2lkIHBhaW50TGF5ZXIoR3JhcGhpY3NDb250ZXh0JiwgY29uc3QgTGF5ZXJQYWlu dGluZ0luZm8mLCBPcHRpb25TZXQ8UGFpbnRMYXllckZsYWc+KTsKICAgICB2b2lkIHBhaW50TGF5 ZXJXaXRoRWZmZWN0cyhHcmFwaGljc0NvbnRleHQmLCBjb25zdCBMYXllclBhaW50aW5nSW5mbyYs IE9wdGlvblNldDxQYWludExheWVyRmxhZz4pOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDI2MmQ4YjViMWMxOGE2Yjk1MzQ4 NjUzYjcwZWNkYjJhYjZhOGRiNzkuLmRjMzU4ZWM3YmM0MjYzNDkzMDk0NjNmMDc3NGIyNWYwYWY4 M2Y4MWEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMC0wNi0yNiAgU2ltb24gRnJhc2VyICA8 c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBDb250ZW50IHNvbWV0aW1lcyBtaXNz aW5nIGluIG5lc3RlZCBzY3JvbGxlcnMgd2l0aCBib3JkZXItcmFkaXVzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM1ODAKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzY0NDYwMzczPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogY29tcG9zaXRpbmcvY2xpcHBpbmcvbmVzdGVkLW92ZXJmbG93LXdpdGgt Ym9yZGVyLXJhZGl1cy1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBjb21wb3NpdGlu Zy9jbGlwcGluZy9uZXN0ZWQtb3ZlcmZsb3ctd2l0aC1ib3JkZXItcmFkaXVzLmh0bWw6IEFkZGVk LgorICAgICAgICAqIGNvbXBvc2l0aW5nL2hpZHBpLWNvbXBvc2l0aW5nLWxheWVyLXdpdGgtdGls ZS1sYXllcnMtb24tc3VicGl4ZWwtcG9zaXRpb24tZXhwZWN0ZWQuaHRtbDoKKyAgICAgICAgKiBj b21wb3NpdGluZy9oaWRwaS1jb21wb3NpdGluZy1sYXllci13aXRoLXRpbGUtbGF5ZXJzLW9uLXN1 YnBpeGVsLXBvc2l0aW9uLmh0bWw6IFR3ZWFrIHRoZSBjb2xvcnMgYW5kIHJhZGlpIHRvIG1ha2Ug ZmFpbHVyZXMgb24gdGhpcyB0ZXN0IG1vcmUgb2J2aW91cy4KKwogMjAyMC0wNi0yNiAgS2FybCBS YWNrbGVyICA8cmFja2xlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIGV4cGVjdGF0aW9u IGZvciBodHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS91cGdyYWRlLWlu c2VjdXJlLXJlcXVlc3RzL3VwZ3JhZGUtaW5zZWN1cmUtZmV0Y2gtaW4tbWFpbi1mcmFtZS5odG1s IGFuZCBodHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS91cGdyYWRlLWlu c2VjdXJlLXJlcXVlc3RzL3VwZ3JhZGUtaW5zZWN1cmUtZmV0Y2gtaW4td29ya2VyLmh0bWwgYXMg dGhleSBhcmUgcGFzc2luZy4gCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9j bGlwcGluZy9uZXN0ZWQtb3ZlcmZsb3ctd2l0aC1ib3JkZXItcmFkaXVzLWV4cGVjdGVkLmh0bWwg Yi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9jbGlwcGluZy9uZXN0ZWQtb3ZlcmZsb3ctd2l0aC1i b3JkZXItcmFkaXVzLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYTc0NzZiM2U1OWFkZGYzOWUy OTcyYWQyMTQ5OWViY2ZhMGQxN2VjOQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Nv bXBvc2l0aW5nL2NsaXBwaW5nL25lc3RlZC1vdmVyZmxvdy13aXRoLWJvcmRlci1yYWRpdXMtZXhw ZWN0ZWQuaHRtbApAQCAtMCwwICsxLDY2IEBACis8IURPQ1RZUEUgaHRtbD4gPCEtLSB3ZWJraXQt dGVzdC1ydW5uZXIgWyBpbnRlcm5hbDpBc3luY092ZXJmbG93U2Nyb2xsaW5nRW5hYmxlZD10cnVl IF0gLS0+Cis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+CisgICAgPHN0eWxlPgorICAg ICAgICAjY29udGFpbmVyIHsKKyAgICAgICAgICAgIHdpZHRoOiAyMDBweDsKKyAgICAgICAgICAg IGhlaWdodDogMjAwcHg7CisgICAgICAgICAgICBtYXJnaW46IDIwcHg7CisgICAgICAgICAgICBv dmVyZmxvdy15OiBzY3JvbGw7CisgICAgICAgICAgICBib3JkZXItcmFkaXVzOiAxMHB4OworICAg ICAgICAgICAgYm9yZGVyOiAxcHggc29saWQgYmxhY2s7CisgICAgICAgIH0KKyAgICAgICAgCisg ICAgICAgIC5maWxsZXIgeworICAgICAgICAgICAgaGVpZ2h0OiAxMDAlOworICAgICAgICAgICAg d2lkdGg6IDEwcHg7CisgICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBzaWx2ZXI7CisgICAg ICAgIH0KKworICAgICAgICAubGFzdCB7CisgICAgICAgICAgICB3aWR0aDogMTAwJTsKKyAgICAg ICAgICAgIGhlaWdodDogMTAwcHg7CisgICAgICAgICAgICBvdmVyZmxvdzogc2Nyb2xsOworICAg ICAgICB9CisgICAgICAgIAorICAgICAgICAuYm94IHsKKyAgICAgICAgICAgIHdpZHRoOiA4MCU7 CisgICAgICAgICAgICBoZWlnaHQ6IDgwcHg7CisgICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9y OiBncmVlbjsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgLm9ic2N1cmVyIHsKKyAgICAg ICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICAgICAgICAgIHdpZHRoOiAxMHB4OworICAg ICAgICAgICAgaGVpZ2h0OiAxMHB4OworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogZ3Jh eTsKKyAgICAgICAgfQorICAgIDwvc3R5bGU+CisgICAgPHNjcmlwdD4KKyAgICAgICAgaWYgKHdp bmRvdy50ZXN0UnVubmVyKQorICAgICAgICAgICAgdGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7 CisKKyAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCAoKSA9PiB7CisgICAg ICAgICAgICBzZXRUaW1lb3V0KCgpID0+IHsKKyAgICAgICAgICAgICAgICBjb250YWluZXIuc2Ny b2xsVG8oMCwgMTAwMCk7CisgICAgICAgICAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQor ICAgICAgICAgICAgICAgICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKKyAgICAgICAgICAg IH0sIDApOworICAgICAgICB9LCBmYWxzZSk7CisgICAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9k eT4KKyAgICA8ZGl2IGlkPWNvbnRhaW5lcj4KKyAgICAgICAgPGRpdiBjbGFzcz0iZmlsbGVyIj48 L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz1sYXN0PgorICAgICAgICAgICAgPGRpdiBjbGFzcz0i Ym94Ij48L2Rpdj4KKyAgICAgICAgPC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9Im9ic2N1cmVy IiBzdHlsZT0ibGVmdDogMjVweDsgdG9wOiAxMThweDsiPjwvZGl2PgorICAgICAgICA8ZGl2IGNs YXNzPSJvYnNjdXJlciIgc3R5bGU9ImxlZnQ6IDE2MHB4OyB0b3A6IDExOHB4OyI+PC9kaXY+Cisg ICAgICAgIDxkaXYgY2xhc3M9Im9ic2N1cmVyIiBzdHlsZT0ibGVmdDogMjVweDsgdG9wOiAxOTZw eDsiPjwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJvYnNjdXJlciIgc3R5bGU9ImxlZnQ6IDE2 MHB4OyB0b3A6IDE5NnB4OyI+PC9kaXY+CisgICAgPC9kaXY+CisgICAgPHA+WW91IHNob3VsZCBz ZWUgYSBncmVlbiBib3ggaW4gdGhlIHNjcm9sbGVyLjwvcD4KKzwvYm9keT4KKzwvaHRtbD4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2NsaXBwaW5nL25lc3RlZC1vdmVyZmxv dy13aXRoLWJvcmRlci1yYWRpdXMuaHRtbCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2NsaXBw aW5nL25lc3RlZC1vdmVyZmxvdy13aXRoLWJvcmRlci1yYWRpdXMuaHRtbApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4w ODMwMDIwYjdjMWY3M2VkODhkYzk3OTM3Nzg0YWNhNDI2MmFjOTRlCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvY2xpcHBpbmcvbmVzdGVkLW92ZXJmbG93LXdpdGgt Ym9yZGVyLXJhZGl1cy5odG1sCkBAIC0wLDAgKzEsNjcgQEAKKzwhRE9DVFlQRSBodG1sPiA8IS0t IHdlYmtpdC10ZXN0LXJ1bm5lciBbIGludGVybmFsOkFzeW5jT3ZlcmZsb3dTY3JvbGxpbmdFbmFi bGVkPXRydWUgXSAtLT4KKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKyAgICA8c3R5 bGU+CisgICAgICAgICNjb250YWluZXIgeworICAgICAgICAgICAgd2lkdGg6IDIwMHB4OworICAg ICAgICAgICAgaGVpZ2h0OiAyMDBweDsKKyAgICAgICAgICAgIG1hcmdpbjogMjBweDsKKyAgICAg ICAgICAgIG92ZXJmbG93LXk6IHNjcm9sbDsKKyAgICAgICAgICAgIGJvcmRlci1yYWRpdXM6IDEw cHg7CisgICAgICAgICAgICBib3JkZXI6IDFweCBzb2xpZCBibGFjazsKKyAgICAgICAgfQorICAg ICAgICAKKyAgICAgICAgLmZpbGxlciB7CisgICAgICAgICAgICBoZWlnaHQ6IDEwMCU7CisgICAg ICAgICAgICB3aWR0aDogMTBweDsKKyAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IHNpbHZl cjsKKyAgICAgICAgfQorCisgICAgICAgIC5sYXN0IHsKKyAgICAgICAgICAgIHdpZHRoOiAxMDAl OworICAgICAgICAgICAgaGVpZ2h0OiAxMDBweDsKKyAgICAgICAgICAgIG92ZXJmbG93OiBzY3Jv bGw7CisgICAgICAgICAgICBib3JkZXItcmFkaXVzOiAycHg7CisgICAgICAgIH0KKyAgICAgICAg CisgICAgICAgIC5ib3ggeworICAgICAgICAgICAgd2lkdGg6IDgwJTsKKyAgICAgICAgICAgIGhl aWdodDogODBweDsKKyAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICAgICAg ICB9CisKKyAgICAgICAgLm9ic2N1cmVyIHsKKyAgICAgICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0 ZTsKKyAgICAgICAgICAgIHdpZHRoOiAxMHB4OworICAgICAgICAgICAgaGVpZ2h0OiAxMHB4Owor ICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JheTsKKyAgICAgICAgfQorICAgIDwvc3R5 bGU+CisgICAgPHNjcmlwdD4KKyAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAg ICAgICAgdGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7CisKKyAgICAgICAgd2luZG93LmFkZEV2 ZW50TGlzdGVuZXIoJ2xvYWQnLCAoKSA9PiB7CisgICAgICAgICAgICBzZXRUaW1lb3V0KCgpID0+ IHsKKyAgICAgICAgICAgICAgICBjb250YWluZXIuc2Nyb2xsVG8oMCwgMTAwMCk7CisgICAgICAg ICAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICAgICAgICAgICAgICB0ZXN0 UnVubmVyLm5vdGlmeURvbmUoKTsKKyAgICAgICAgICAgIH0sIDApOworICAgICAgICB9LCBmYWxz ZSk7CisgICAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8ZGl2IGlkPWNvbnRhaW5l cj4KKyAgICAgICAgPGRpdiBjbGFzcz0iZmlsbGVyIj48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFz cz1sYXN0PgorICAgICAgICAgICAgPGRpdiBjbGFzcz0iYm94Ij48L2Rpdj4KKyAgICAgICAgPC9k aXY+CisgICAgICAgIDxkaXYgY2xhc3M9Im9ic2N1cmVyIiBzdHlsZT0ibGVmdDogMjVweDsgdG9w OiAxMThweDsiPjwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJvYnNjdXJlciIgc3R5bGU9Imxl ZnQ6IDE2MHB4OyB0b3A6IDExOHB4OyI+PC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9Im9ic2N1 cmVyIiBzdHlsZT0ibGVmdDogMjVweDsgdG9wOiAxOTZweDsiPjwvZGl2PgorICAgICAgICA8ZGl2 IGNsYXNzPSJvYnNjdXJlciIgc3R5bGU9ImxlZnQ6IDE2MHB4OyB0b3A6IDE5NnB4OyI+PC9kaXY+ CisgICAgPC9kaXY+CisgICAgPHA+WW91IHNob3VsZCBzZWUgYSBncmVlbiBib3ggaW4gdGhlIHNj cm9sbGVyLjwvcD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Nv bXBvc2l0aW5nL2hpZHBpLWNvbXBvc2l0aW5nLWxheWVyLXdpdGgtdGlsZS1sYXllcnMtb24tc3Vi cGl4ZWwtcG9zaXRpb24tZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2hp ZHBpLWNvbXBvc2l0aW5nLWxheWVyLXdpdGgtdGlsZS1sYXllcnMtb24tc3VicGl4ZWwtcG9zaXRp b24tZXhwZWN0ZWQuaHRtbAppbmRleCAyYzExYzU2Yzc4MjJmNTMzMDc1ODQ3MWE4Y2I5ZTEzNDQ0 ODYxY2NlLi5lYmUwYzAyYTUzYjFlYmFlMjQzM2ExMWRjZTRjYmQ2MWIxM2M0YjQ5IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9oaWRwaS1jb21wb3NpdGluZy1sYXllci13aXRo LXRpbGUtbGF5ZXJzLW9uLXN1YnBpeGVsLXBvc2l0aW9uLWV4cGVjdGVkLmh0bWwKKysrIGIvTGF5 b3V0VGVzdHMvY29tcG9zaXRpbmcvaGlkcGktY29tcG9zaXRpbmctbGF5ZXItd2l0aC10aWxlLWxh eWVycy1vbi1zdWJwaXhlbC1wb3NpdGlvbi1leHBlY3RlZC5odG1sCkBAIC0xMCw3ICsxMCw3IEBA CiAgIH0KIAogICAuaW5uZXIgewotICAgIC13ZWJraXQtYm9yZGVyLXJhZGl1czogMXB4OworICAg IGJvcmRlci1yYWRpdXM6IDIwcHg7CiAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKICAgICB3aWR0aDog MjEwMHB4OyAKICAgfQpAQCAtMTgsNyArMTgsNyBAQAogICAubGFyZ2Vib3ggewogICAgIHdpZHRo OiA2MDBweDsgCiAgICAgaGVpZ2h0OiAxMDBweDsgCQotICAgIGJhY2tncm91bmQtY29sb3I6IHJl ZDsgCisgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47IAogICB9CiA8L3N0eWxlPgogPC9oZWFk PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvaGlkcGktY29tcG9zaXRpbmct bGF5ZXItd2l0aC10aWxlLWxheWVycy1vbi1zdWJwaXhlbC1wb3NpdGlvbi5odG1sIGIvTGF5b3V0 VGVzdHMvY29tcG9zaXRpbmcvaGlkcGktY29tcG9zaXRpbmctbGF5ZXItd2l0aC10aWxlLWxheWVy cy1vbi1zdWJwaXhlbC1wb3NpdGlvbi5odG1sCmluZGV4IGU2NWEyNGVhMmM2NDAzZGVmYmUyMGRi MTg1OWVkMWM1MWMyODE0MjQuLmI2Y2Y0OWM4NmYwYzY2ZGI5YTI0MjFkNjQ2MGU4YmE4MTNlODY2 MWQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2hpZHBpLWNvbXBvc2l0aW5n LWxheWVyLXdpdGgtdGlsZS1sYXllcnMtb24tc3VicGl4ZWwtcG9zaXRpb24uaHRtbAorKysgYi9M YXlvdXRUZXN0cy9jb21wb3NpdGluZy9oaWRwaS1jb21wb3NpdGluZy1sYXllci13aXRoLXRpbGUt bGF5ZXJzLW9uLXN1YnBpeGVsLXBvc2l0aW9uLmh0bWwKQEAgLTEwLDE2ICsxMCwxNiBAQAogICB9 CiAKICAgLmlubmVyIHsKLSAgICAtd2Via2l0LWJvcmRlci1yYWRpdXM6IDFweDsKKyAgICBib3Jk ZXItcmFkaXVzOiAyMHB4OwogICAgIG92ZXJmbG93OiBoaWRkZW47CiAgICAgd2lkdGg6IDIxMDBw eDsgCi0gICAgLXdlYmtpdC10cmFuc2Zvcm06IHRyYW5zbGF0ZVooMCk7CisgICAgdHJhbnNmb3Jt OiB0cmFuc2xhdGVaKDApOwogICB9CiAgIAogICAubGFyZ2Vib3ggewogICAgIHdpZHRoOiA2MDBw eDsgCiAgICAgaGVpZ2h0OiAxMDBweDsgCi0gICAgYmFja2dyb3VuZC1jb2xvcjogcmVkOyAKKyAg ICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsgCiAgIH0KIDwvc3R5bGU+CiA8L2hlYWQ+Cg==