213571 2020-06-24 12:40:16 -0700 No scrolling momentum with 'scroll-snap-type: x mandatory' if the scroller scrolls vertically 2021-03-23 01:52:18 -0700 1 1 1 Unclassified WebKit Scrolling Safari Technology Preview Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 218115 1 simon.fraser mrobinson mrobinson simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1665827 0 402673 simon.fraser 2020-06-24 12:40:16 -0700 Created attachment 402673 Testcase In the attached testcase, there is no vertical scrolling momentum in Safari. There is in Firefox. 1665828 1 webkit-bug-importer 2020-06-24 12:40:39 -0700 <rdar://problem/64715507> 1665829 2 webkit-bug-importer 2020-06-24 12:40:40 -0700 <rdar://problem/64715506> 1738129 3 simon.fraser 2021-03-10 10:56:08 -0800 Seen with https://slides.oddbird.net/csswg/f2f2102/#slide-26 1741685 4 423727 mrobinson 2021-03-19 07:04:04 -0700 Created attachment 423727 Patch 1741739 5 423727 simon.fraser 2021-03-19 09:27:23 -0700 Comment on attachment 423727 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423727&action=review > LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-momentum-in-non-snapping-axis.html:34 > + } catch (e) { > + console.log(e); Is this necessary? 1741798 6 423751 mrobinson 2021-03-19 11:21:21 -0700 Created attachment 423751 Patch 1741800 7 mrobinson 2021-03-19 11:23:06 -0700 (In reply to Simon Fraser (smfr) from comment #5) > > LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-momentum-in-non-snapping-axis.html:34 > > + } catch (e) { > > + console.log(e); > > Is this necessary? Unfortunately this is because Promises will otherwise eat exceptions and they won't be printed in test output. 1741805 8 423752 mrobinson 2021-03-19 11:25:42 -0700 Created attachment 423752 Patch 1742016 9 423816 mrobinson 2021-03-20 05:20:58 -0700 Created attachment 423816 Patch 1742719 10 ews-feeder 2021-03-23 01:52:16 -0700 Committed r274853: <https://commits.webkit.org/r274853> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423816. 402673 2020-06-24 12:40:16 -0700 2020-06-24 12:40:16 -0700 Testcase scroll-snapping-in-progress.html text/html 2190 simon.fraser PCFET0NUWVBFIGh0bWw+IDwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgaW50ZXJuYWw6QXN5bmNP dmVyZmxvd1Njcm9sbGluZ0VuYWJsZWQ9dHJ1ZSBdIC0tPgo8aHRtbD4KPGhlYWQ+CiAgICA8c3R5 bGU+CiAgICAgICAgLmNvbnRhaW5lciB7CiAgICAgICAgICAgIHdpZHRoOiAxNTBweDsKICAgICAg ICAgICAgaGVpZ2h0OiA0MDBweDsKICAgICAgICAgICAgYm9yZGVyOiAxcHggc29saWQgYmxhY2s7 CiAgICAgICAgICAgIHBhZGRpbmc6IDEwcHg7CiAgICAgICAgICAgIG1hcmdpbjogMjBweDsKICAg ICAgICAgICAgb3ZlcmZsb3cteDogc2Nyb2xsOwogICAgICAgICAgICBzY3JvbGwtc25hcC10eXBl OiB4IG1hbmRhdG9yeTsKICAgICAgICB9CiAgICAgICAgCiAgICAgICAgLmNvbnRlbnRzIHsKICAg ICAgICAgICAgd2lkdGg6IDIwMCU7CiAgICAgICAgfQogICAgICAgIAogICAgICAgIC5ib3ggewog ICAgICAgICAgICBtYXJnaW46IDIwcHg7CiAgICAgICAgICAgIHdpZHRoOiAxMDBweDsKICAgICAg ICAgICAgaGVpZ2h0OiAxMDBweDsKICAgICAgICAgICAgc2Nyb2xsLXNuYXAtYWxpZ246IHN0YXJ0 OwogICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBibHVlOwogICAgICAgIH0KICAgIDwvc3R5 bGU+CiAgICA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QuanMiPjwvc2Ny aXB0PgogICAgPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy91aS1oZWxwZXIuanMiPjwv c2NyaXB0PgogICAgPHNjcmlwdD4KICAgICAgICBqc1Rlc3RJc0FzeW5jID0gdHJ1ZTsKICAgICAg ICAKICAgICAgICBsZXQgY29udGFpbmVyID0gdW5kZWZpbmVkOwogICAgICAgIGFzeW5jIGZ1bmN0 aW9uIHJ1blRlc3QoKQogICAgICAgIHsKICAgICAgICAgICAgY29udGFpbmVyID0gZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoJ2NvbnRhaW5lcicpOwogICAgICAgICAgICBjb250YWluZXIuYWRkRXZl bnRMaXN0ZW5lcignc2Nyb2xsJywgKCkgPT4gewogICAgICAgICAgICAgICAgZGVidWcoJ0NvbnRh aW5lciBzY3JvbGxlZCB0byAnICsgY29udGFpbmVyLnNjcm9sbExlZnQpOwogICAgICAgICAgICAg ICAgc2hvdWxkQmVUcnVlKCJ3aW5kb3cuaW50ZXJuYWxzLmlzU2Nyb2xsU25hcEluUHJvZ3Jlc3Mo Y29udGFpbmVyKSIpOwogICAgICAgICAgICB9KTsKICAgICAgICAgICAgCiAgICAgICAgICAgIGRl YnVnKCJTY3JvbGwtc25hcCBvZmZzZXRzIGZvciAnY29udGFpbmVyJzogIiArIHdpbmRvdy5pbnRl cm5hbHMuc2Nyb2xsU25hcE9mZnNldHMoY29udGFpbmVyKSk7CgogICAgICAgICAgICBzaG91bGRC ZUZhbHNlKCJ3aW5kb3cuaW50ZXJuYWxzLmlzU2Nyb2xsU25hcEluUHJvZ3Jlc3MoY29udGFpbmVy KSIpOwoKICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIubW91c2VXaGVlbFNjcm9sbEF0KDEwMCwg MTAwKTsKCiAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOwogICAgICAgIH0KCiAgICAgICAgd2lu ZG93LmFkZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCAoKSA9PiB7CiAgICAgICAgICAgIGlmICh3aW5k b3cudGVzdFJ1bm5lcikKICAgICAgICAgICAgICAgIHNldFRpbWVvdXQocnVuVGVzdCwgMCk7CiAg ICAgICAgfSwgZmFsc2UpOwogICAgPC9zY3JpcHQ+CjwvaGVhZD4KPGJvZHk+CiAgICA8ZGl2IGlk PSJjb250YWluZXIiIGNsYXNzPSJjb250YWluZXIiPgogICAgICAgIDxkaXYgY2xhc3M9ImNvbnRl bnRzIj4KICAgICAgICAgICAgPGRpdiBjbGFzcz0iYm94Ij48L2Rpdj4KICAgICAgICAgICAgPGRp diBjbGFzcz0iYm94Ij48L2Rpdj4KICAgICAgICAgICAgPGRpdiBjbGFzcz0iYm94Ij48L2Rpdj4K ICAgICAgICAgICAgPGRpdiBjbGFzcz0iYm94Ij48L2Rpdj4KICAgICAgICAgICAgPGRpdiBjbGFz cz0iYm94Ij48L2Rpdj4KICAgICAgICAgICAgPGRpdiBjbGFzcz0iYm94Ij48L2Rpdj4KICAgICAg ICAgICAgPGRpdiBjbGFzcz0iYm94Ij48L2Rpdj4KICAgICAgICAgICAgPGRpdiBjbGFzcz0iYm94 Ij48L2Rpdj4KICAgICAgICAgICAgPGRpdiBjbGFzcz0iYm94Ij48L2Rpdj4KICAgICAgICAgICAg PGRpdiBjbGFzcz0iYm94Ij48L2Rpdj4KICAgICAgICAgICAgPGRpdiBjbGFzcz0iYm94Ij48L2Rp dj4KICAgICAgICAgICAgPGRpdiBjbGFzcz0iYm94Ij48L2Rpdj4KICAgICAgICA8L2Rpdj4KICAg IDwvZGl2Pgo8L2JvZHk+CjwvaHRtbD4K 423727 2021-03-19 07:04:04 -0700 2021-03-19 11:21:14 -0700 Patch bug-213571-20210319150402.patch text/plain 7412 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjBjZjA5MWEzYmI0ZmJl NGFjNWVlZjVkNzBhMTZmMzdjN2MxMTQ4My4uZTk5ZTFiY2FlYmQxZDcxZTk4MDAwYTQ1ZDUwNzUz NTM2NDYzNDAxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTAzLTE5ICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBObyBzY3JvbGxp bmcgbW9tZW50dW0gd2l0aCAnc2Nyb2xsLXNuYXAtdHlwZTogeCBtYW5kYXRvcnknIGlmIHRoZSBz Y3JvbGxlciBzY3JvbGxzIHZlcnRpY2FsbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxMzU3MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjQ3MTU1 MDc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hl biBoYW5kbGluZyBtb21lbnR1bSBzY3JvbGxpbmcgZm9yIHNjcm9sbCBjb250YWluZXJzIHRoYXQg c25hcCwgdXNlIHRoZQorICAgICAgICBwcmVkaWN0ZWQgbW9tZW50dW0gc2Nyb2xsIGRlc3RpbmF0 aW9uIGZvciBheGVzIHRoYXQgZG8gbm90IHNuYXAuIFVzaW5nCisgICAgICAgIHRoZSBpbml0aWFs IHNjcm9sbCBvZmZzZXQgaGVyZSB3YXMgY2F1c2luZyBtb21lbnR1bSBzY3JvbGxpbmcgaW4gdGhl c2UgYXhlcworICAgICAgICB0byBlbmQgcHJlbWF0dXJlbHkuCisKKyAgICAgICAgVGVzdDogdGls ZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtbW9tZW50dW0taW4t bm9uLXNuYXBwaW5nLWF4aXMuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsU25hcEFu aW1hdG9yU3RhdGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsU25hcEFuaW1hdG9yU3Rh dGU6OnRhcmdldE9mZnNldEZvclN0YXJ0T2Zmc2V0IGNvbnN0KTogVXNlIHRoZSBwcmVkaWN0ZWQK KyAgICAgICAgc2Nyb2xsIG9mZnNldC4gRXZlbiB0aG91Z2ggdGhlIHN0YXJ0T2Zmc2V0IHBhcmFt ZXRlciBpcyBubyBsb25nZXIgdXNlZCwgZG8gbm90IHJlbW92ZQorICAgICAgICBpdCBiZWNhdXNl IGl0IHdpbGwgYmUgdXNlZCBpbiB0aGUgZml4IGZvciBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjIzNDA2LgorCiAyMDIxLTAzLTE3ICBNYXJ0aW4gUm9iaW5zb24gIDxt cm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjcyMDE5KTogTW9t ZW50dW0gc2Nyb2xsaW5nIGluIHByb3hpbWl0eSBjc3Mtc2Nyb2xsLXNuYXAgc2Nyb2xsIGFyZWFz IGJyb2tlbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsU25hcEFu aW1hdG9yU3RhdGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsU25hcEFuaW1h dG9yU3RhdGUuY3BwCmluZGV4IGNiYWI2OWIyZWY2MDcyNWEwZGJiNWIzY2FlM2JkOTI3NmQ4MjJl ZjMuLmMyYWIwMmM3YThlNzM0ZWVhNzA2ZmFkZWRlMTViM2RiZGJhN2FmNjggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFNuYXBBbmltYXRvclN0YXRlLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZS5jcHAKQEAg LTkxLDEyICs5MSwxMiBAQCBGbG9hdFBvaW50IFNjcm9sbFNuYXBBbmltYXRvclN0YXRlOjpjdXJy ZW50QW5pbWF0ZWRTY3JvbGxPZmZzZXQoYm9vbCYgaXNBbmltYXRpbwogICAgIHJldHVybiBtX21v bWVudHVtQ2FsY3VsYXRvci0+c2Nyb2xsT2Zmc2V0QWZ0ZXJFbGFwc2VkVGltZShlbGFwc2VkVGlt ZSk7CiB9CiAKLWZsb2F0IFNjcm9sbFNuYXBBbmltYXRvclN0YXRlOjp0YXJnZXRPZmZzZXRGb3JT dGFydE9mZnNldChTY3JvbGxFdmVudEF4aXMgYXhpcywgZmxvYXQgbWF4U2Nyb2xsT2Zmc2V0LCBm bG9hdCBzdGFydE9mZnNldCwgZmxvYXQgcHJlZGljdGVkT2Zmc2V0LCBmbG9hdCBwYWdlU2NhbGUs IGZsb2F0IGluaXRpYWxEZWx0YSwgdW5zaWduZWQmIG91dEFjdGl2ZVNuYXBJbmRleCkgY29uc3QK K2Zsb2F0IFNjcm9sbFNuYXBBbmltYXRvclN0YXRlOjp0YXJnZXRPZmZzZXRGb3JTdGFydE9mZnNl dChTY3JvbGxFdmVudEF4aXMgYXhpcywgZmxvYXQgbWF4U2Nyb2xsT2Zmc2V0LCBmbG9hdCAvKiBz dGFydE9mZnNldCAqLywgZmxvYXQgcHJlZGljdGVkT2Zmc2V0LCBmbG9hdCBwYWdlU2NhbGUsIGZs b2F0IGluaXRpYWxEZWx0YSwgdW5zaWduZWQmIG91dEFjdGl2ZVNuYXBJbmRleCkgY29uc3QKIHsK ICAgICBjb25zdCBhdXRvJiBzbmFwT2Zmc2V0cyA9IG1fc25hcE9mZnNldHNJbmZvLm9mZnNldHNG b3JBeGlzKGF4aXMpOwogICAgIGlmIChzbmFwT2Zmc2V0cy5pc0VtcHR5KCkpIHsKICAgICAgICAg b3V0QWN0aXZlU25hcEluZGV4ID0gaW52YWxpZFNuYXBPZmZzZXRJbmRleDsKLSAgICAgICAgcmV0 dXJuIGNsYW1wVG88ZmxvYXQ+KHN0YXJ0T2Zmc2V0LCAwLCBtYXhTY3JvbGxPZmZzZXQpOworICAg ICAgICByZXR1cm4gY2xhbXBUbzxmbG9hdD4ocHJlZGljdGVkT2Zmc2V0LCAwLCBtYXhTY3JvbGxP ZmZzZXQpOwogICAgIH0KIAogICAgIGZsb2F0IHRhcmdldE9mZnNldCA9IG1fc25hcE9mZnNldHNJ bmZvLmNsb3Nlc3RTbmFwT2Zmc2V0KGF4aXMsIExheW91dFVuaXQocHJlZGljdGVkT2Zmc2V0IC8g cGFnZVNjYWxlKSwgaW5pdGlhbERlbHRhKS5maXJzdDsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAxMWFmMDYwMmI3ZGM0MGEy YmYxYmFlNDk5N2U4Y2Y4YzZmMjYxMzdhLi4xMWFmYmEyNzYxYTk1NDkzMzgwYTlkZWM1OTEwNDNl M2Y1OGY4ZDZlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDMtMTkgIE1hcnRpbiBSb2Jp bnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIE5vIHNjcm9sbGluZyBtb21l bnR1bSB3aXRoICdzY3JvbGwtc25hcC10eXBlOiB4IG1hbmRhdG9yeScgaWYgdGhlIHNjcm9sbGVy IHNjcm9sbHMgdmVydGljYWxseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjEzNTcxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NDcxNTUwNz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHRpbGVkLWRy YXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLW1vbWVudHVtLWluLW5vbi1z bmFwcGluZy1heGlzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogdGlsZWQtZHJhd2lu Zy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtbW9tZW50dW0taW4tbm9uLXNuYXBw aW5nLWF4aXMuaHRtbDogQWRkZWQuCisKIDIwMjEtMDMtMTcgIFBlbmcgTGl1ICA8cGVuZy5saXU2 QGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BVUF0gU29tZSBtZWRpYS1zb3VyY2UgdGVzdHMgZmFp bC90aW1lb3V0IHdoZW4gbWVkaWEgaW4gR1BVIFByb2Nlc3MgaXMgZW5hYmxlZApkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xs LXNuYXAtbW9tZW50dW0taW4tbm9uLXNuYXBwaW5nLWF4aXMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtbW9t ZW50dW0taW4tbm9uLXNuYXBwaW5nLWF4aXMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmFkMGU1 ZDIwNzY3NjIyZjY0YTVlMjdlZjMxOWUzZDM0YjIxYTNjODgKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy90aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9zY3JvbGwtc25hcC9zY3JvbGwtc25h cC1tb21lbnR1bS1pbi1ub24tc25hcHBpbmctYXhpcy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw1 IEBACitQQVNTIHNjcm9sbGluZyBtb21lbnR1bSB0aGUgc2FtZSBpbiBzbmFwcGluZyBhbmQgbm9u LXNuYXBwaW5nIGF4ZXMuCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1Qg Q09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxp bmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtbW9tZW50dW0taW4tbm9uLXNuYXBwaW5nLWF4aXMu aHRtbCBiL0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Nj cm9sbC1zbmFwLW1vbWVudHVtLWluLW5vbi1zbmFwcGluZy1heGlzLmh0bWwKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u M2Y1OTYxODliZjNhNDlhMjY5MDljMzE4ZTc1NzkzZGNmZWEwYmNmZAotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9s bC1zbmFwLW1vbWVudHVtLWluLW5vbi1zbmFwcGluZy1heGlzLmh0bWwKQEAgLTAsMCArMSw2OCBA QAorPCFET0NUWVBFIEhUTUw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPHN0eWxlPgor ICAgICAgICAgICAgLmNvbnRhaW5lciB7CisgICAgICAgICAgICAgICAgd2lkdGg6IDIwMHB4Owor ICAgICAgICAgICAgICAgIGhlaWdodDogMjAwcHg7CisgICAgICAgICAgICAgICAgb3ZlcmZsb3c6 IHNjcm9sbDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgICN2ZXJ0aWNhbC1zbmFwcGluZy1j b250YWluZXIgeyBzY3JvbGwtc25hcC10eXBlOiB5IHByb3hpbWl0eTsgfQorICAgICAgICAgICAg I2JpZGlyZWN0aW9uYWwtc25hcHBpbmctY29udGFpbmVyIHsgc2Nyb2xsLXNuYXAtdHlwZTogYm90 aCBwcm94aW1pdHk7IH0KKyAgICAgICAgICAgIC5ib3ggeworICAgICAgICAgICAgICAgIGhlaWdo dDogMTAwdmg7CisgICAgICAgICAgICAgICAgd2lkdGg6IDEwMHZ3OworICAgICAgICAgICAgICAg IGZsb2F0OiBsZWZ0OworICAgICAgICAgICAgICAgIHNjcm9sbC1zbmFwLWFsaWduOiBzdGFydDsK KyAgICAgICAgICAgIH0KKyAgICAgICAgPC9zdHlsZT4KKyAgICAgICAgPHNjcmlwdCBzcmM9Ii4u Ly4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LmpzIj48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdCBz cmM9Ii4uLy4uLy4uL3Jlc291cmNlcy91aS1oZWxwZXIuanMiPjwvc2NyaXB0PgorICAgICAgICA8 c2NyaXB0IHNyYz0icmVzb3VyY2VzL21haW5mcmFtZS1zY3JvbGwtc25hcC10ZXN0LmpzIj48L3Nj cmlwdD4KKyAgICAgICAgPHNjcmlwdD4KKyAgICAgICAgd2luZG93LmpzVGVzdElzQXN5bmMgPSB0 cnVlOworCisgICAgICAgIGFzeW5jIGZ1bmN0aW9uIHJ1blRlc3RzKCkKKyAgICAgICAgeworICAg ICAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgICAgICBjb25zdCBjb250YWluZXJOb3RTbmFwcGlu Z09uQXhpcyA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ2ZXJ0aWNhbC1zbmFwcGluZy1jb250 YWluZXIiKTsKKyAgICAgICAgICAgICAgICBhd2FpdCBkb1Njcm9sbEdsaWRlKGNvbnRhaW5lck5v dFNuYXBwaW5nT25BeGlzLCBIT1JJWk9OVEFMKTsKKyAgICAgICAgICAgICAgICBjb25zdCBjb250 YWluZXJTbmFwcGluZ09uQXhpcyA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJiaWRpcmVjdGlv bmFsLXNuYXBwaW5nLWNvbnRhaW5lciIpOworICAgICAgICAgICAgICAgIGF3YWl0IGRvU2Nyb2xs R2xpZGUoY29udGFpbmVyU25hcHBpbmdPbkF4aXMsIEhPUklaT05UQUwpOworICAgICAgICAgICAg ICAgIGV4cGVjdFRydWUoY29udGFpbmVyU25hcHBpbmdPbkF4aXMuc2Nyb2xsTGVmdCA9PSBjb250 YWluZXJOb3RTbmFwcGluZ09uQXhpcy5zY3JvbGxMZWZ0LCAic2Nyb2xsaW5nIG1vbWVudHVtIHRo ZSBzYW1lIGluIHNuYXBwaW5nIGFuZCBub24tc25hcHBpbmcgYXhlcy4iKTsKKyAgICAgICAgICAg IH0gY2F0Y2ggKGUpIHsKKyAgICAgICAgICAgICAgICBjb25zb2xlLmxvZyhlKTsKKyAgICAgICAg ICAgIH0gZmluYWxseSB7CisgICAgICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgICAg ICAgICB9CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiBvbkxvYWQoKQorICAgICAgICB7 CisgICAgICAgICAgICBpZiAod2luZG93LmV2ZW50U2VuZGVyKSB7CisgICAgICAgICAgICAgICAg aW50ZXJuYWxzLnNldFBsYXRmb3JtTW9tZW50dW1TY3JvbGxpbmdQcmVkaWN0aW9uRW5hYmxlZChm YWxzZSk7CisgICAgICAgICAgICAgICAgcnVuVGVzdHMoKTsKKyAgICAgICAgICAgIH0gZWxzZSB7 CisgICAgICAgICAgICAgICAgdmFyIG1lc3NhZ2VMb2NhdGlvbiA9IGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCdjb25zb2xlJyk7CisgICAgICAgICAgICAgICAgbWVzc2FnZUxvY2F0aW9uLmlubmVy SFRNTCA9ICI8cD5UbyBydW4gdGhpcyB0ZXN0IG1hbnVhbGx5LCBzY3JvbGwgdGhlIHBhZ2UgdmVy dGljYWxseS4gVGhlIHBhZ2Ugc2hvdWxkICIKKyAgICAgICAgICAgICAgICAgICAgKyAic25hcCBi ZXR3ZWVuIHVuaWZvcm0gY29sb3JzIHdoaWNoIGZpbGwgdGhlIHZpZXcuPHA+IjsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgfQorICAgICAgICA8L3NjcmlwdD4KKyAgICA8L2hlYWQ+CisgICAgPGJv ZHkgb25sb2FkPSJvbkxvYWQoKTsiPgorICAgICAgICA8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4K KyAgICAgICAgPGRpdiBpZD0idmVydGljYWwtc25hcHBpbmctY29udGFpbmVyIiBjbGFzcz0iY29u dGFpbmVyIj4KKyAgICAgICAgICAgIDxkaXYgc3R5bGU9IndpZHRoOiAyMDB2dyI+CisgICAgICAg ICAgICAgICAgPGRpdiBjbGFzcz0iYm94Ij48L2Rpdj4KKyAgICAgICAgICAgICAgICA8ZGl2IGNs YXNzPSJib3giPjwvZGl2PgorICAgICAgICAgICAgPC9kaXY+CisgICAgICAgIDwvZGl2PgorICAg ICAgICA8ZGl2IGlkPSJiaWRpcmVjdGlvbmFsLXNuYXBwaW5nLWNvbnRhaW5lciIgY2xhc3M9ImNv bnRhaW5lciI+CisgICAgICAgICAgICA8ZGl2IHN0eWxlPSJ3aWR0aDogMjAwdnciPgorICAgICAg ICAgICAgICAgIDxkaXYgY2xhc3M9ImJveCIgc3R5bGU9ImZsb2F0OiBsZWZ0Ij48L2Rpdj4KKyAg ICAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJib3giIHN0eWxlPSJmbG9hdDogbGVmdCI+PC9kaXY+ CisgICAgICAgICAgICA8L2Rpdj4KKyAgICAgICAgPC9kaXY+CisgICAgPC9ib2R5PgorPC9odG1s Pgo= 423751 2021-03-19 11:21:21 -0700 2021-03-19 11:25:37 -0700 Patch bug-213571-20210319192118.patch text/plain 13249 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjBjZjA5MWEzYmI0ZmJl NGFjNWVlZjVkNzBhMTZmMzdjN2MxMTQ4My4uYTQxNDU1MTIyZWE4ZTVlMTE1NDViMTUzNjdkNTky ODFjNzNiZTQzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDIxLTAzLTE5ICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBObyBzY3JvbGxp bmcgbW9tZW50dW0gd2l0aCAnc2Nyb2xsLXNuYXAtdHlwZTogeCBtYW5kYXRvcnknIGlmIHRoZSBz Y3JvbGxlciBzY3JvbGxzIHZlcnRpY2FsbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxMzU3MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjQ3MTU1 MDc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIFdoZW4g aGFuZGxpbmcgbW9tZW50dW0gc2Nyb2xsaW5nIGZvciBzY3JvbGwgY29udGFpbmVycyB0aGF0IHNu YXAsIHVzZSB0aGUKKyAgICAgICAgcHJlZGljdGVkIG1vbWVudHVtIHNjcm9sbCBkZXN0aW5hdGlv biBmb3IgYXhlcyB0aGF0IGRvIG5vdCBzbmFwLiBVc2luZworICAgICAgICB0aGUgaW5pdGlhbCBz Y3JvbGwgb2Zmc2V0IGhlcmUgd2FzIGNhdXNpbmcgbW9tZW50dW0gc2Nyb2xsaW5nIGluIHRoZXNl IGF4ZXMKKyAgICAgICAgdG8gZW5kIHByZW1hdHVyZWx5LgorCisgICAgICAgIFRlc3Q6IHRpbGVk LWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLW1vbWVudHVtLWluLW5v bi1zbmFwcGluZy1heGlzLmh0bWwKKworICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbFNuYXBBbmlt YXRvclN0YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFNuYXBBbmltYXRvclN0YXRl Ojp0YXJnZXRPZmZzZXRGb3JTdGFydE9mZnNldCBjb25zdCk6IFVzZSB0aGUgcHJlZGljdGVkCisg ICAgICAgIHNjcm9sbCBvZmZzZXQuIEV2ZW4gdGhvdWdoIHRoZSBzdGFydE9mZnNldCBwYXJhbWV0 ZXIgaXMgbm8gbG9uZ2VyIHVzZWQsIGRvIG5vdCByZW1vdmUKKyAgICAgICAgaXQgYmVjYXVzZSBp dCB3aWxsIGJlIHVzZWQgaW4gdGhlIGZpeCBmb3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMzQwNi4KKworMjAyMS0wMy0xOSAgTWFydGluIFJvYmluc29uICA8bXJv Ymluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgc2Nyb2xsLXNuYXAtc3RvcDogYWx3YXlzIG5v dCByZXNwZWN0ZWQgZHVyaW5nIG1vbWVudHVtIHNjcm9sbGluZworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzNDA2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIFRlc3Q6IHRpbGVkLWRyYXdpbmcvc2Nyb2xsaW5n L3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLXN0b3AtbW9tZW50dW0tc2Nyb2xsLmh0bWwKKworICAg ICAgICAqIHBsYXRmb3JtL1Njcm9sbFNuYXBBbmltYXRvclN0YXRlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlNjcm9sbFNuYXBBbmltYXRvclN0YXRlOjp0YXJnZXRPZmZzZXRGb3JTdGFydE9mZnNl dCBjb25zdCk6IEVuYWJsZSBkaXJlY3Rpb25hbCBzY3JvbGwKKyAgICAgICAgc25hcHBpbmcgd2hl biBoYW5kbGluZyBtb21lbnR1bSBzY3JvbGxpbmcuIFRoaXMgdHVybnMgb24gc2Nyb2xsLXNuYXAt c3RvcCBhcyB3ZWxsIGFzIGEgZmV3IG90aGVyCisgICAgICAgIGZlYXR1cmVzLgorCiAyMDIxLTAz LTE3ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBS RUdSRVNTSU9OIChyMjcyMDE5KTogTW9tZW50dW0gc2Nyb2xsaW5nIGluIHByb3hpbWl0eSBjc3Mt c2Nyb2xsLXNuYXAgc2Nyb2xsIGFyZWFzIGJyb2tlbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vU2Nyb2xsU25hcEFuaW1hdG9yU3RhdGUuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsU25hcEFuaW1hdG9yU3RhdGUuY3BwCmluZGV4IGNiYWI2OWIyZWY2MDcy NWEwZGJiNWIzY2FlM2JkOTI3NmQ4MjJlZjMuLmRhOTc5MmQwNzU4ZmQxYzU3NzJmN2Y2M2QxMjY5 MjdlYzAwNjU3MmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFNu YXBBbmltYXRvclN0YXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxT bmFwQW5pbWF0b3JTdGF0ZS5jcHAKQEAgLTk2LDEwICs5NiwxMCBAQCBmbG9hdCBTY3JvbGxTbmFw QW5pbWF0b3JTdGF0ZTo6dGFyZ2V0T2Zmc2V0Rm9yU3RhcnRPZmZzZXQoU2Nyb2xsRXZlbnRBeGlz IGF4aXMsCiAgICAgY29uc3QgYXV0byYgc25hcE9mZnNldHMgPSBtX3NuYXBPZmZzZXRzSW5mby5v ZmZzZXRzRm9yQXhpcyhheGlzKTsKICAgICBpZiAoc25hcE9mZnNldHMuaXNFbXB0eSgpKSB7CiAg ICAgICAgIG91dEFjdGl2ZVNuYXBJbmRleCA9IGludmFsaWRTbmFwT2Zmc2V0SW5kZXg7Ci0gICAg ICAgIHJldHVybiBjbGFtcFRvPGZsb2F0PihzdGFydE9mZnNldCwgMCwgbWF4U2Nyb2xsT2Zmc2V0 KTsKKyAgICAgICAgcmV0dXJuIGNsYW1wVG88ZmxvYXQ+KHByZWRpY3RlZE9mZnNldCwgMCwgbWF4 U2Nyb2xsT2Zmc2V0KTsKICAgICB9CiAKLSAgICBmbG9hdCB0YXJnZXRPZmZzZXQgPSBtX3NuYXBP ZmZzZXRzSW5mby5jbG9zZXN0U25hcE9mZnNldChheGlzLCBMYXlvdXRVbml0KHByZWRpY3RlZE9m ZnNldCAvIHBhZ2VTY2FsZSksIGluaXRpYWxEZWx0YSkuZmlyc3Q7CisgICAgZmxvYXQgdGFyZ2V0 T2Zmc2V0ID0gbV9zbmFwT2Zmc2V0c0luZm8uY2xvc2VzdFNuYXBPZmZzZXQoYXhpcywgTGF5b3V0 VW5pdChwcmVkaWN0ZWRPZmZzZXQgLyBwYWdlU2NhbGUpLCBpbml0aWFsRGVsdGEsIExheW91dFVu aXQoc3RhcnRPZmZzZXQgLyBwYWdlU2NhbGUpKS5maXJzdDsKICAgICBmbG9hdCBtaW5pbXVtVGFy Z2V0T2Zmc2V0ID0gc3RkOjptYXg8ZmxvYXQ+KDAsIHNuYXBPZmZzZXRzLmZpcnN0KCkub2Zmc2V0 KTsKICAgICBmbG9hdCBtYXhpbXVtVGFyZ2V0T2Zmc2V0ID0gc3RkOjptaW48ZmxvYXQ+KG1heFNj cm9sbE9mZnNldCwgc25hcE9mZnNldHMubGFzdCgpLm9mZnNldCk7CiAgICAgdGFyZ2V0T2Zmc2V0 ID0gY2xhbXBUbzxmbG9hdD4odGFyZ2V0T2Zmc2V0LCBtaW5pbXVtVGFyZ2V0T2Zmc2V0LCBtYXhp bXVtVGFyZ2V0T2Zmc2V0KTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAxMWFmMDYwMmI3ZGM0MGEyYmYxYmFlNDk5N2U4Y2Y4 YzZmMjYxMzdhLi40NGZhNzNhZDczY2EzYTI3ZGYyNGNiZDlmNTAwYmU0ODE4YThlZGYwIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMjQgQEAKKzIwMjEtMDMtMTkgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNv bkBpZ2FsaWEuY29tPgorCisgICAgICAgIE5vIHNjcm9sbGluZyBtb21lbnR1bSB3aXRoICdzY3Jv bGwtc25hcC10eXBlOiB4IG1hbmRhdG9yeScgaWYgdGhlIHNjcm9sbGVyIHNjcm9sbHMgdmVydGlj YWxseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEz NTcxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NDcxNTUwNz4KKworICAgICAgICBSZXZpZXdl ZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgKiB0aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9z Y3JvbGwtc25hcC9zY3JvbGwtc25hcC1tb21lbnR1bS1pbi1ub24tc25hcHBpbmctYXhpcy1leHBl Y3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHRpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9s bC1zbmFwL3Njcm9sbC1zbmFwLW1vbWVudHVtLWluLW5vbi1zbmFwcGluZy1heGlzLmh0bWw6IEFk ZGVkLgorCisyMDIxLTAzLTE5ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNv bT4KKworICAgICAgICBzY3JvbGwtc25hcC1zdG9wOiBhbHdheXMgbm90IHJlc3BlY3RlZCBkdXJp bmcgbW9tZW50dW0gc2Nyb2xsaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMjM0MDYKKworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIu CisKKyAgICAgICAgKiB0aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9zY3JvbGwtc25hcC9zY3JvbGwt c25hcC1zdG9wLW1vbWVudHVtLXNjcm9sbC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAq IHRpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLXN0b3AtbW9t ZW50dW0tc2Nyb2xsLmh0bWw6IEFkZGVkLgorCiAyMDIxLTAzLTE3ICBQZW5nIExpdSAgPHBlbmcu bGl1NkBhcHBsZS5jb20+CiAKICAgICAgICAgW0dQVVBdIFNvbWUgbWVkaWEtc291cmNlIHRlc3Rz IGZhaWwvdGltZW91dCB3aGVuIG1lZGlhIGluIEdQVSBQcm9jZXNzIGlzIGVuYWJsZWQKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Nj cm9sbC1zbmFwLW1vbWVudHVtLWluLW5vbi1zbmFwcGluZy1heGlzLWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFw LW1vbWVudHVtLWluLW5vbi1zbmFwcGluZy1heGlzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5h ZDBlNWQyMDc2NzYyMmY2NGE1ZTI3ZWYzMTllM2QzNGIyMWEzYzg4Ci0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xs LXNuYXAtbW9tZW50dW0taW4tbm9uLXNuYXBwaW5nLWF4aXMtZXhwZWN0ZWQudHh0CkBAIC0wLDAg KzEsNSBAQAorUEFTUyBzY3JvbGxpbmcgbW9tZW50dW0gdGhlIHNhbWUgaW4gc25hcHBpbmcgYW5k IG5vbi1zbmFwcGluZyBheGVzLgorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitU RVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Ny b2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLW1vbWVudHVtLWluLW5vbi1zbmFwcGluZy1h eGlzLmh0bWwgYi9MYXlvdXRUZXN0cy90aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9zY3JvbGwtc25h cC9zY3JvbGwtc25hcC1tb21lbnR1bS1pbi1ub24tc25hcHBpbmctYXhpcy5odG1sCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjNmNTk2MTg5YmYzYTQ5YTI2OTA5YzMxOGU3NTc5M2RjZmVhMGJjZmQKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy90aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9zY3JvbGwtc25hcC9z Y3JvbGwtc25hcC1tb21lbnR1bS1pbi1ub24tc25hcHBpbmctYXhpcy5odG1sCkBAIC0wLDAgKzEs NjggQEAKKzwhRE9DVFlQRSBIVE1MPgorPGh0bWw+CisgICAgPGhlYWQ+CisgICAgICAgIDxzdHls ZT4KKyAgICAgICAgICAgIC5jb250YWluZXIgeworICAgICAgICAgICAgICAgIHdpZHRoOiAyMDBw eDsKKyAgICAgICAgICAgICAgICBoZWlnaHQ6IDIwMHB4OworICAgICAgICAgICAgICAgIG92ZXJm bG93OiBzY3JvbGw7CisgICAgICAgICAgICB9CisgICAgICAgICAgICAjdmVydGljYWwtc25hcHBp bmctY29udGFpbmVyIHsgc2Nyb2xsLXNuYXAtdHlwZTogeSBwcm94aW1pdHk7IH0KKyAgICAgICAg ICAgICNiaWRpcmVjdGlvbmFsLXNuYXBwaW5nLWNvbnRhaW5lciB7IHNjcm9sbC1zbmFwLXR5cGU6 IGJvdGggcHJveGltaXR5OyB9CisgICAgICAgICAgICAuYm94IHsKKyAgICAgICAgICAgICAgICBo ZWlnaHQ6IDEwMHZoOworICAgICAgICAgICAgICAgIHdpZHRoOiAxMDB2dzsKKyAgICAgICAgICAg ICAgICBmbG9hdDogbGVmdDsKKyAgICAgICAgICAgICAgICBzY3JvbGwtc25hcC1hbGlnbjogc3Rh cnQ7CisgICAgICAgICAgICB9CisgICAgICAgIDwvc3R5bGU+CisgICAgICAgIDxzY3JpcHQgc3Jj PSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC5qcyI+PC9zY3JpcHQ+CisgICAgICAgIDxzY3Jp cHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvdWktaGVscGVyLmpzIj48L3NjcmlwdD4KKyAgICAg ICAgPHNjcmlwdCBzcmM9InJlc291cmNlcy9tYWluZnJhbWUtc2Nyb2xsLXNuYXAtdGVzdC5qcyI+ PC9zY3JpcHQ+CisgICAgICAgIDxzY3JpcHQ+CisgICAgICAgIHdpbmRvdy5qc1Rlc3RJc0FzeW5j ID0gdHJ1ZTsKKworICAgICAgICBhc3luYyBmdW5jdGlvbiBydW5UZXN0cygpCisgICAgICAgIHsK KyAgICAgICAgICAgIHRyeSB7CisgICAgICAgICAgICAgICAgY29uc3QgY29udGFpbmVyTm90U25h cHBpbmdPbkF4aXMgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidmVydGljYWwtc25hcHBpbmct Y29udGFpbmVyIik7CisgICAgICAgICAgICAgICAgYXdhaXQgZG9TY3JvbGxHbGlkZShjb250YWlu ZXJOb3RTbmFwcGluZ09uQXhpcywgSE9SSVpPTlRBTCk7CisgICAgICAgICAgICAgICAgY29uc3Qg Y29udGFpbmVyU25hcHBpbmdPbkF4aXMgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiYmlkaXJl Y3Rpb25hbC1zbmFwcGluZy1jb250YWluZXIiKTsKKyAgICAgICAgICAgICAgICBhd2FpdCBkb1Nj cm9sbEdsaWRlKGNvbnRhaW5lclNuYXBwaW5nT25BeGlzLCBIT1JJWk9OVEFMKTsKKyAgICAgICAg ICAgICAgICBleHBlY3RUcnVlKGNvbnRhaW5lclNuYXBwaW5nT25BeGlzLnNjcm9sbExlZnQgPT0g Y29udGFpbmVyTm90U25hcHBpbmdPbkF4aXMuc2Nyb2xsTGVmdCwgInNjcm9sbGluZyBtb21lbnR1 bSB0aGUgc2FtZSBpbiBzbmFwcGluZyBhbmQgbm9uLXNuYXBwaW5nIGF4ZXMuIik7CisgICAgICAg ICAgICB9IGNhdGNoIChlKSB7CisgICAgICAgICAgICAgICAgY29uc29sZS5sb2coZSk7CisgICAg ICAgICAgICB9IGZpbmFsbHkgeworICAgICAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAg ICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gb25Mb2FkKCkKKyAgICAg ICAgeworICAgICAgICAgICAgaWYgKHdpbmRvdy5ldmVudFNlbmRlcikgeworICAgICAgICAgICAg ICAgIGludGVybmFscy5zZXRQbGF0Zm9ybU1vbWVudHVtU2Nyb2xsaW5nUHJlZGljdGlvbkVuYWJs ZWQoZmFsc2UpOworICAgICAgICAgICAgICAgIHJ1blRlc3RzKCk7CisgICAgICAgICAgICB9IGVs c2UgeworICAgICAgICAgICAgICAgIHZhciBtZXNzYWdlTG9jYXRpb24gPSBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgnY29uc29sZScpOworICAgICAgICAgICAgICAgIG1lc3NhZ2VMb2NhdGlvbi5p bm5lckhUTUwgPSAiPHA+VG8gcnVuIHRoaXMgdGVzdCBtYW51YWxseSwgc2Nyb2xsIHRoZSBwYWdl IHZlcnRpY2FsbHkuIFRoZSBwYWdlIHNob3VsZCAiCisgICAgICAgICAgICAgICAgICAgICsgInNu YXAgYmV0d2VlbiB1bmlmb3JtIGNvbG9ycyB3aGljaCBmaWxsIHRoZSB2aWV3LjxwPiI7CisgICAg ICAgICAgICB9CisgICAgICAgIH0KKyAgICAgICAgPC9zY3JpcHQ+CisgICAgPC9oZWFkPgorICAg IDxib2R5IG9ubG9hZD0ib25Mb2FkKCk7Ij4KKyAgICAgICAgPGRpdiBpZD0iY29uc29sZSI+PC9k aXY+CisgICAgICAgIDxkaXYgaWQ9InZlcnRpY2FsLXNuYXBwaW5nLWNvbnRhaW5lciIgY2xhc3M9 ImNvbnRhaW5lciI+CisgICAgICAgICAgICA8ZGl2IHN0eWxlPSJ3aWR0aDogMjAwdnciPgorICAg ICAgICAgICAgICAgIDxkaXYgY2xhc3M9ImJveCI+PC9kaXY+CisgICAgICAgICAgICAgICAgPGRp diBjbGFzcz0iYm94Ij48L2Rpdj4KKyAgICAgICAgICAgIDwvZGl2PgorICAgICAgICA8L2Rpdj4K KyAgICAgICAgPGRpdiBpZD0iYmlkaXJlY3Rpb25hbC1zbmFwcGluZy1jb250YWluZXIiIGNsYXNz PSJjb250YWluZXIiPgorICAgICAgICAgICAgPGRpdiBzdHlsZT0id2lkdGg6IDIwMHZ3Ij4KKyAg ICAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJib3giIHN0eWxlPSJmbG9hdDogbGVmdCI+PC9kaXY+ CisgICAgICAgICAgICAgICAgPGRpdiBjbGFzcz0iYm94IiBzdHlsZT0iZmxvYXQ6IGxlZnQiPjwv ZGl2PgorICAgICAgICAgICAgPC9kaXY+CisgICAgICAgIDwvZGl2PgorICAgIDwvYm9keT4KKzwv aHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Nj cm9sbC1zbmFwL3Njcm9sbC1zbmFwLXN0b3AtbW9tZW50dW0tc2Nyb2xsLWV4cGVjdGVkLnR4dCBi L0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1z bmFwLXN0b3AtbW9tZW50dW0tc2Nyb2xsLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zMTg2OTQy NzMyYzNhNWMzZGY5MjMyNzE3YmZlNjQxMGY3NzQ4YTQ4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAt c3RvcC1tb21lbnR1bS1zY3JvbGwtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNiBAQAorUEFTUyBk aWQgbm90IGdsaWRlIHBhc3QgZmlyc3Qgc2Nyb2xsIHNuYXAgc3RvcC4KK1BBU1MgZGlkIG5vdCBn bGlkZSBwYXN0IHNlY29uZCBzY3JvbGwgc25hcCBzdG9wLgorUEFTUyBzdWNjZXNzZnVsbHlQYXJz ZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3Rp bGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLXN0b3AtbW9tZW50 dW0tc2Nyb2xsLmh0bWwgYi9MYXlvdXRUZXN0cy90aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9zY3Jv bGwtc25hcC9zY3JvbGwtc25hcC1zdG9wLW1vbWVudHVtLXNjcm9sbC5odG1sCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LmFkYzBiMGVkNDgwZmM3Yzg2MjZiYjQ2ZWViYzljM2VjYWNiZTRhNzAKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy90aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9zY3JvbGwtc25hcC9zY3Jv bGwtc25hcC1zdG9wLW1vbWVudHVtLXNjcm9sbC5odG1sCkBAIC0wLDAgKzEsOTggQEAKKzwhRE9D VFlQRSBIVE1MPgorPGh0bWw+CisgICAgPGhlYWQ+CisgICAgICAgIDxzdHlsZT4KKyAgICAgICAg ICAgIGh0bWwgeworICAgICAgICAgICAgICAgIHNjcm9sbC1zbmFwLXR5cGU6IHkgbWFuZGF0b3J5 OworICAgICAgICAgICAgfQorICAgICAgICAgICAgLnZlcnRpY2FsR2FsbGVyeSB7CisgICAgICAg ICAgICAgICAgd2lkdGg6IDEwMHZ3OworICAgICAgICAgICAgICAgIGhlaWdodDogNjAwdmg7Cisg ICAgICAgICAgICAgICAgbWFyZ2luOiAwOworICAgICAgICAgICAgICAgIHBhZGRpbmc6IDA7Cisg ICAgICAgICAgICB9CisgICAgICAgICAgICAuY29sb3JCb3ggeworICAgICAgICAgICAgICAgIGhl aWdodDogMjAwcHg7CisgICAgICAgICAgICAgICAgd2lkdGg6IDEwMHZ3OworICAgICAgICAgICAg ICAgIGZsb2F0OiBsZWZ0OworICAgICAgICAgICAgICAgIHNjcm9sbC1zbmFwLWFsaWduOiBzdGFy dDsKKyAgICAgICAgICAgICAgICBzY3JvbGwtc25hcC1zdG9wOiBhbHdheXM7CisgICAgICAgICAg ICB9CisgICAgICAgICAgICAuY29sb3IwIHsgYmFja2dyb3VuZC1jb2xvcjogcmVkOyB9CisgICAg ICAgICAgICAuY29sb3IxIHsgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47IH0KKyAgICAgICAgICAg IC5jb2xvcjIgeyBiYWNrZ3JvdW5kLWNvbG9yOiBibHVlOyB9CisgICAgICAgICAgICAuY29sb3Iz IHsgYmFja2dyb3VuZC1jb2xvcjogYXF1YTsgfQorICAgICAgICAgICAgLmNvbG9yNCB7IGJhY2tn cm91bmQtY29sb3I6IHllbGxvdzsgfQorICAgICAgICAgICAgLmNvbG9yNSB7IGJhY2tncm91bmQt Y29sb3I6IGZ1Y2hzaWE7IH0KKyAgICAgICAgPC9zdHlsZT4KKyAgICAgICAgPHNjcmlwdCBzcmM9 Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LmpzIj48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlw dCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy91aS1oZWxwZXIuanMiPjwvc2NyaXB0PgorICAgICAg ICA8c2NyaXB0IHNyYz0icmVzb3VyY2VzL21haW5mcmFtZS1zY3JvbGwtc25hcC10ZXN0LmpzIj48 L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdD4KKyAgICAgICAgd2luZG93LmpzVGVzdElzQXN5bmMg PSB0cnVlOworCisgICAgICAgIGFzeW5jIGZ1bmN0aW9uIHJ1blRlc3RzKCkKKyAgICAgICAgewor ICAgICAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgICAgICBsZXQgc2Nyb2xsTW90aW9uc0Zvckxh cmdlU2Nyb2xsR2xpZGUgPSBbCisgICAgICAgICAgICAgICAgICAgIFstMSwgLTEsICdiZWdhbics ICdub25lJ10sCisgICAgICAgICAgICAgICAgICAgIFstMSwgLTEsICdjaGFuZ2VkJywgJ25vbmUn XSwKKyAgICAgICAgICAgICAgICAgICAgWy0xLCAtMSwgJ2NoYW5nZWQnLCAnbm9uZSddLAorICAg ICAgICAgICAgICAgICAgICBbLTEsIC0xLCAnY2hhbmdlZCcsICdub25lJ10sCisgICAgICAgICAg ICAgICAgICAgIFstMSwgLTEsICdjaGFuZ2VkJywgJ25vbmUnXSwKKyAgICAgICAgICAgICAgICAg ICAgWy0xLCAtMSwgJ2NoYW5nZWQnLCAnbm9uZSddLAorICAgICAgICAgICAgICAgICAgICBbLTEs IC0xLCAnY2hhbmdlZCcsICdub25lJ10sCisgICAgICAgICAgICAgICAgICAgIFstMSwgLTEsICdj aGFuZ2VkJywgJ25vbmUnXSwKKyAgICAgICAgICAgICAgICAgICAgWy0xLCAtMSwgJ2NoYW5nZWQn LCAnbm9uZSddLAorICAgICAgICAgICAgICAgICAgICBbLTEsIC0xLCAnY2hhbmdlZCcsICdub25l J10sCisgICAgICAgICAgICAgICAgICAgIFstMSwgLTEsICdjaGFuZ2VkJywgJ25vbmUnXSwKKyAg ICAgICAgICAgICAgICAgICAgWy0xLCAtMSwgJ2NoYW5nZWQnLCAnbm9uZSddLAorICAgICAgICAg ICAgICAgICAgICBbLTEsIC0xLCAnY2hhbmdlZCcsICdub25lJ10sCisgICAgICAgICAgICAgICAg ICAgIFswLCAwLCAnZW5kZWQnLCAnbm9uZSddLAorICAgICAgICAgICAgICAgICAgICBbLTEsIC0x LCAnbm9uZScsICdiZWdpbiddLAorICAgICAgICAgICAgICAgICAgICBbLTEsIC0xLCAnbm9uZScs ICdjb250aW51ZSddLAorICAgICAgICAgICAgICAgICAgICBbMCwgMCwgJ25vbmUnLCAnZW5kJ10s CisgICAgICAgICAgICAgICAgXTsKKworICAgICAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLmRl bGF5Rm9yKDApOworICAgICAgICAgICAgICAgIGF3YWl0IGRvU2Nyb2xsR2xpZGUoZG9jdW1lbnQu c2Nyb2xsaW5nRWxlbWVudCwgVkVSVElDQUwpOworICAgICAgICAgICAgICAgIGV4cGVjdFRydWUo ZG9jdW1lbnQuc2Nyb2xsaW5nRWxlbWVudC5zY3JvbGxUb3AgPT0gMjAwLCAiZGlkIG5vdCBnbGlk ZSBwYXN0IGZpcnN0IHNjcm9sbCBzbmFwIHN0b3AuIik7CisKKyAgICAgICAgICAgICAgICBhd2Fp dCBVSUhlbHBlci5kZWxheUZvcigwKTsKKyAgICAgICAgICAgICAgICBhd2FpdCBkb1Njcm9sbEds aWRlKGRvY3VtZW50LnNjcm9sbGluZ0VsZW1lbnQsIFZFUlRJQ0FMKTsKKyAgICAgICAgICAgICAg ICBleHBlY3RUcnVlKGRvY3VtZW50LnNjcm9sbGluZ0VsZW1lbnQuc2Nyb2xsVG9wID09IDQwMCwg ImRpZCBub3QgZ2xpZGUgcGFzdCBzZWNvbmQgc2Nyb2xsIHNuYXAgc3RvcC4iKTsKKyAgICAgICAg ICAgIH0gY2F0Y2ggKGUpIHsKKyAgICAgICAgICAgICAgICBjb25zb2xlLmxvZyhlKTsKKyAgICAg ICAgICAgIH0gZmluYWxseSB7CisgICAgICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAg ICAgICAgICB9CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiBvbkxvYWQoKQorICAgICAg ICB7CisgICAgICAgICAgICBpZiAod2luZG93LmV2ZW50U2VuZGVyKSB7CisgICAgICAgICAgICAg ICAgaW50ZXJuYWxzLnNldFBsYXRmb3JtTW9tZW50dW1TY3JvbGxpbmdQcmVkaWN0aW9uRW5hYmxl ZChmYWxzZSk7CisgICAgICAgICAgICAgICAgcnVuVGVzdHMoKTsKKyAgICAgICAgICAgIH0gZWxz ZSB7CisgICAgICAgICAgICAgICAgdmFyIG1lc3NhZ2VMb2NhdGlvbiA9IGRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCdjb25zb2xlJyk7CisgICAgICAgICAgICAgICAgbWVzc2FnZUxvY2F0aW9uLmlu bmVySFRNTCA9ICI8cD5UbyBydW4gdGhpcyB0ZXN0IG1hbnVhbGx5IGRvIGEgZmFzdCB2ZXJ0aWNh bCBtb21lbnR1bSBzY3JvbGwuICIKKyAgICAgICAgICAgICAgICAgICAgKyAiU2Nyb2xpbmcgc2hv dWxkIHNuYXAgdG8gZWFjaCBibG9jaywgcmVnYXJkbGVzcyBvZiBob3cgZmFzdCB0aGUgc2Nyb2xs IGlzLjxwPiI7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgICAgPC9zY3JpcHQ+Cisg ICAgPC9oZWFkPgorICAgIDxib2R5IG9ubG9hZD0ib25Mb2FkKCk7IiBjbGFzcz0idmVydGljYWxH YWxsZXJ5Ij4KKyAgICAgICAgPGRpdiBjbGFzcz0iY29sb3IwIGNvbG9yQm94Ij48ZGl2IGlkPSJj b25zb2xlIj48L2Rpdj48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0iY29sb3IxIGNvbG9yQm94 Ij48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0iY29sb3IyIGNvbG9yQm94Ij48L2Rpdj4KKyAg ICAgICAgPGRpdiBjbGFzcz0iY29sb3IzIGNvbG9yQm94Ij48L2Rpdj4KKyAgICAgICAgPGRpdiBj bGFzcz0iY29sb3I0IGNvbG9yQm94Ij48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0iY29sb3I1 IGNvbG9yQm94Ij48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0iY29sb3IwIGNvbG9yQm94Ij48 L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0iY29sb3IxIGNvbG9yQm94Ij48L2Rpdj4KKyAgICAg ICAgPGRpdiBjbGFzcz0iY29sb3IyIGNvbG9yQm94Ij48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFz cz0iY29sb3IzIGNvbG9yQm94Ij48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0iY29sb3I0IGNv bG9yQm94Ij48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0iY29sb3I1IGNvbG9yQm94Ij48L2Rp dj4KKyAgICA8L2JvZHk+Cis8L2h0bWw+Cg== 423752 2021-03-19 11:25:42 -0700 2021-03-20 05:20:46 -0700 Patch bug-213571-20210319192540.patch text/plain 6788 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NzI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmRjNDI1NjczMGFjY2Y0 MmNlZjIyYzExYzRjOTRmOTU2YjdkNGM1MC4uZDY3ZmI1MTU2NjllZjE0YmZlOGI0ODgzNzQ1MzIz YzU5OTE1MWY0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTAzLTE5ICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBObyBzY3JvbGxp bmcgbW9tZW50dW0gd2l0aCAnc2Nyb2xsLXNuYXAtdHlwZTogeCBtYW5kYXRvcnknIGlmIHRoZSBz Y3JvbGxlciBzY3JvbGxzIHZlcnRpY2FsbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxMzU3MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjQ3MTU1 MDc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIFdoZW4g aGFuZGxpbmcgbW9tZW50dW0gc2Nyb2xsaW5nIGZvciBzY3JvbGwgY29udGFpbmVycyB0aGF0IHNu YXAsIHVzZSB0aGUKKyAgICAgICAgcHJlZGljdGVkIG1vbWVudHVtIHNjcm9sbCBkZXN0aW5hdGlv biBmb3IgYXhlcyB0aGF0IGRvIG5vdCBzbmFwLiBVc2luZworICAgICAgICB0aGUgaW5pdGlhbCBz Y3JvbGwgb2Zmc2V0IGhlcmUgd2FzIGNhdXNpbmcgbW9tZW50dW0gc2Nyb2xsaW5nIGluIHRoZXNl IGF4ZXMKKyAgICAgICAgdG8gZW5kIHByZW1hdHVyZWx5LgorCisgICAgICAgIFRlc3Q6IHRpbGVk LWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLW1vbWVudHVtLWluLW5v bi1zbmFwcGluZy1heGlzLmh0bWwKKworICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbFNuYXBBbmlt YXRvclN0YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFNuYXBBbmltYXRvclN0YXRl Ojp0YXJnZXRPZmZzZXRGb3JTdGFydE9mZnNldCBjb25zdCk6IFVzZSB0aGUgcHJlZGljdGVkCisg ICAgICAgIHNjcm9sbCBvZmZzZXQuIEV2ZW4gdGhvdWdoIHRoZSBzdGFydE9mZnNldCBwYXJhbWV0 ZXIgaXMgbm8gbG9uZ2VyIHVzZWQsIGRvIG5vdCByZW1vdmUKKyAgICAgICAgaXQgYmVjYXVzZSBp dCB3aWxsIGJlIHVzZWQgaW4gdGhlIGZpeCBmb3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMzQwNi4KKwogMjAyMS0wMy0xOSAgQ2hhbmdTZW9rIE9oICA8Y2hhbmdz ZW9rQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQW5pbWF0ZWQgQVZJRiBzdXBwb3J0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZS5jcHAKaW5k ZXggNTdmMjk5YWQ0NWYwZmExNDMzZjY5NmM3YWU3MTcwYmIzYTgxNWMxYS4uZGE5NzkyZDA3NThm ZDFjNTc3MmY3ZjYzZDEyNjkyN2VjMDA2NTcyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsU25hcEFuaW1hdG9yU3RhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL1Njcm9sbFNuYXBBbmltYXRvclN0YXRlLmNwcApAQCAtOTYsNyArOTYsNyBAQCBm bG9hdCBTY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZTo6dGFyZ2V0T2Zmc2V0Rm9yU3RhcnRPZmZzZXQo U2Nyb2xsRXZlbnRBeGlzIGF4aXMsCiAgICAgY29uc3QgYXV0byYgc25hcE9mZnNldHMgPSBtX3Nu YXBPZmZzZXRzSW5mby5vZmZzZXRzRm9yQXhpcyhheGlzKTsKICAgICBpZiAoc25hcE9mZnNldHMu aXNFbXB0eSgpKSB7CiAgICAgICAgIG91dEFjdGl2ZVNuYXBJbmRleCA9IGludmFsaWRTbmFwT2Zm c2V0SW5kZXg7Ci0gICAgICAgIHJldHVybiBjbGFtcFRvPGZsb2F0PihzdGFydE9mZnNldCwgMCwg bWF4U2Nyb2xsT2Zmc2V0KTsKKyAgICAgICAgcmV0dXJuIGNsYW1wVG88ZmxvYXQ+KHByZWRpY3Rl ZE9mZnNldCwgMCwgbWF4U2Nyb2xsT2Zmc2V0KTsKICAgICB9CiAKICAgICBmbG9hdCB0YXJnZXRP ZmZzZXQgPSBtX3NuYXBPZmZzZXRzSW5mby5jbG9zZXN0U25hcE9mZnNldChheGlzLCBMYXlvdXRV bml0KHByZWRpY3RlZE9mZnNldCAvIHBhZ2VTY2FsZSksIGluaXRpYWxEZWx0YSwgTGF5b3V0VW5p dChzdGFydE9mZnNldCAvIHBhZ2VTY2FsZSkpLmZpcnN0OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGJiYmI1ZGNlYzVlNWYw ZTQ1MjQwM2FlOTNlNDMzMGVhMGY5ZTI1NmIuLjQwN2I3ODZkYjk3YTI1MGI2NTRlZjAyMjZkNzFi NjgxZDJhYjM2N2IgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wMy0xOSAgTWFydGluIFJv Ymluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgTm8gc2Nyb2xsaW5nIG1v bWVudHVtIHdpdGggJ3Njcm9sbC1zbmFwLXR5cGU6IHggbWFuZGF0b3J5JyBpZiB0aGUgc2Nyb2xs ZXIgc2Nyb2xscyB2ZXJ0aWNhbGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTM1NzEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY0NzE1NTA3Pgor CisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAgICAgICAqIHRpbGVkLWRy YXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLW1vbWVudHVtLWluLW5vbi1z bmFwcGluZy1heGlzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogdGlsZWQtZHJhd2lu Zy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtbW9tZW50dW0taW4tbm9uLXNuYXBw aW5nLWF4aXMuaHRtbDogQWRkZWQuCisKIDIwMjEtMDMtMTkgIENoYW5nU2VvayBPaCAgPGNoYW5n c2Vva0B3ZWJraXQub3JnPgogCiAgICAgICAgIEFuaW1hdGVkIEFWSUYgc3VwcG9ydApkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Ny b2xsLXNuYXAtbW9tZW50dW0taW4tbm9uLXNuYXBwaW5nLWF4aXMtZXhwZWN0ZWQudHh0IGIvTGF5 b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAt bW9tZW50dW0taW4tbm9uLXNuYXBwaW5nLWF4aXMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmFk MGU1ZDIwNzY3NjIyZjY0YTVlMjdlZjMxOWUzZDM0YjIxYTNjODgKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy90aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9zY3JvbGwtc25hcC9zY3JvbGwt c25hcC1tb21lbnR1bS1pbi1ub24tc25hcHBpbmctYXhpcy1leHBlY3RlZC50eHQKQEAgLTAsMCAr MSw1IEBACitQQVNTIHNjcm9sbGluZyBtb21lbnR1bSB0aGUgc2FtZSBpbiBzbmFwcGluZyBhbmQg bm9uLXNuYXBwaW5nIGF4ZXMuCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RF U1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3Jv bGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtbW9tZW50dW0taW4tbm9uLXNuYXBwaW5nLWF4 aXMuaHRtbCBiL0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFw L3Njcm9sbC1zbmFwLW1vbWVudHVtLWluLW5vbi1zbmFwcGluZy1heGlzLmh0bWwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uM2Y1OTYxODliZjNhNDlhMjY5MDljMzE4ZTc1NzkzZGNmZWEwYmNmZAotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Nj cm9sbC1zbmFwLW1vbWVudHVtLWluLW5vbi1zbmFwcGluZy1heGlzLmh0bWwKQEAgLTAsMCArMSw2 OCBAQAorPCFET0NUWVBFIEhUTUw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPHN0eWxl PgorICAgICAgICAgICAgLmNvbnRhaW5lciB7CisgICAgICAgICAgICAgICAgd2lkdGg6IDIwMHB4 OworICAgICAgICAgICAgICAgIGhlaWdodDogMjAwcHg7CisgICAgICAgICAgICAgICAgb3ZlcmZs b3c6IHNjcm9sbDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgICN2ZXJ0aWNhbC1zbmFwcGlu Zy1jb250YWluZXIgeyBzY3JvbGwtc25hcC10eXBlOiB5IHByb3hpbWl0eTsgfQorICAgICAgICAg ICAgI2JpZGlyZWN0aW9uYWwtc25hcHBpbmctY29udGFpbmVyIHsgc2Nyb2xsLXNuYXAtdHlwZTog Ym90aCBwcm94aW1pdHk7IH0KKyAgICAgICAgICAgIC5ib3ggeworICAgICAgICAgICAgICAgIGhl aWdodDogMTAwdmg7CisgICAgICAgICAgICAgICAgd2lkdGg6IDEwMHZ3OworICAgICAgICAgICAg ICAgIGZsb2F0OiBsZWZ0OworICAgICAgICAgICAgICAgIHNjcm9sbC1zbmFwLWFsaWduOiBzdGFy dDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgPC9zdHlsZT4KKyAgICAgICAgPHNjcmlwdCBzcmM9 Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LmpzIj48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlw dCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy91aS1oZWxwZXIuanMiPjwvc2NyaXB0PgorICAgICAg ICA8c2NyaXB0IHNyYz0icmVzb3VyY2VzL21haW5mcmFtZS1zY3JvbGwtc25hcC10ZXN0LmpzIj48 L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdD4KKyAgICAgICAgd2luZG93LmpzVGVzdElzQXN5bmMg PSB0cnVlOworCisgICAgICAgIGFzeW5jIGZ1bmN0aW9uIHJ1blRlc3RzKCkKKyAgICAgICAgewor ICAgICAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgICAgICBjb25zdCBjb250YWluZXJOb3RTbmFw cGluZ09uQXhpcyA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ2ZXJ0aWNhbC1zbmFwcGluZy1j b250YWluZXIiKTsKKyAgICAgICAgICAgICAgICBhd2FpdCBkb1Njcm9sbEdsaWRlKGNvbnRhaW5l ck5vdFNuYXBwaW5nT25BeGlzLCBIT1JJWk9OVEFMKTsKKyAgICAgICAgICAgICAgICBjb25zdCBj b250YWluZXJTbmFwcGluZ09uQXhpcyA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJiaWRpcmVj dGlvbmFsLXNuYXBwaW5nLWNvbnRhaW5lciIpOworICAgICAgICAgICAgICAgIGF3YWl0IGRvU2Ny b2xsR2xpZGUoY29udGFpbmVyU25hcHBpbmdPbkF4aXMsIEhPUklaT05UQUwpOworICAgICAgICAg ICAgICAgIGV4cGVjdFRydWUoY29udGFpbmVyU25hcHBpbmdPbkF4aXMuc2Nyb2xsTGVmdCA9PSBj b250YWluZXJOb3RTbmFwcGluZ09uQXhpcy5zY3JvbGxMZWZ0LCAic2Nyb2xsaW5nIG1vbWVudHVt IHRoZSBzYW1lIGluIHNuYXBwaW5nIGFuZCBub24tc25hcHBpbmcgYXhlcy4iKTsKKyAgICAgICAg ICAgIH0gY2F0Y2ggKGUpIHsKKyAgICAgICAgICAgICAgICBjb25zb2xlLmxvZyhlKTsKKyAgICAg ICAgICAgIH0gZmluYWxseSB7CisgICAgICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAg ICAgICAgICB9CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiBvbkxvYWQoKQorICAgICAg ICB7CisgICAgICAgICAgICBpZiAod2luZG93LmV2ZW50U2VuZGVyKSB7CisgICAgICAgICAgICAg ICAgaW50ZXJuYWxzLnNldFBsYXRmb3JtTW9tZW50dW1TY3JvbGxpbmdQcmVkaWN0aW9uRW5hYmxl ZChmYWxzZSk7CisgICAgICAgICAgICAgICAgcnVuVGVzdHMoKTsKKyAgICAgICAgICAgIH0gZWxz ZSB7CisgICAgICAgICAgICAgICAgdmFyIG1lc3NhZ2VMb2NhdGlvbiA9IGRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCdjb25zb2xlJyk7CisgICAgICAgICAgICAgICAgbWVzc2FnZUxvY2F0aW9uLmlu bmVySFRNTCA9ICI8cD5UbyBydW4gdGhpcyB0ZXN0IG1hbnVhbGx5LCBzY3JvbGwgdGhlIHBhZ2Ug dmVydGljYWxseS4gVGhlIHBhZ2Ugc2hvdWxkICIKKyAgICAgICAgICAgICAgICAgICAgKyAic25h cCBiZXR3ZWVuIHVuaWZvcm0gY29sb3JzIHdoaWNoIGZpbGwgdGhlIHZpZXcuPHA+IjsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICA8L3NjcmlwdD4KKyAgICA8L2hlYWQ+CisgICAg PGJvZHkgb25sb2FkPSJvbkxvYWQoKTsiPgorICAgICAgICA8ZGl2IGlkPSJjb25zb2xlIj48L2Rp dj4KKyAgICAgICAgPGRpdiBpZD0idmVydGljYWwtc25hcHBpbmctY29udGFpbmVyIiBjbGFzcz0i Y29udGFpbmVyIj4KKyAgICAgICAgICAgIDxkaXYgc3R5bGU9IndpZHRoOiAyMDB2dyI+CisgICAg ICAgICAgICAgICAgPGRpdiBjbGFzcz0iYm94Ij48L2Rpdj4KKyAgICAgICAgICAgICAgICA8ZGl2 IGNsYXNzPSJib3giPjwvZGl2PgorICAgICAgICAgICAgPC9kaXY+CisgICAgICAgIDwvZGl2Pgor ICAgICAgICA8ZGl2IGlkPSJiaWRpcmVjdGlvbmFsLXNuYXBwaW5nLWNvbnRhaW5lciIgY2xhc3M9 ImNvbnRhaW5lciI+CisgICAgICAgICAgICA8ZGl2IHN0eWxlPSJ3aWR0aDogMjAwdnciPgorICAg ICAgICAgICAgICAgIDxkaXYgY2xhc3M9ImJveCIgc3R5bGU9ImZsb2F0OiBsZWZ0Ij48L2Rpdj4K KyAgICAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJib3giIHN0eWxlPSJmbG9hdDogbGVmdCI+PC9k aXY+CisgICAgICAgICAgICA8L2Rpdj4KKyAgICAgICAgPC9kaXY+CisgICAgPC9ib2R5PgorPC9o dG1sPgo= 423816 2021-03-20 05:20:58 -0700 2021-03-23 01:52:17 -0700 Patch bug-213571-20210320132056.patch text/plain 6820 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NzUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWQ5MjI2OTk4MWQ3OWQy YjFmZjcwMjhmZGUyOGEwMGU3YzQ0MzdmMi4uNDMxOTIyZGI0MGFjMzUzYzY4OWE1OWNlMDUyMjEy MTRiYjllNzVmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTAzLTE5ICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBObyBzY3JvbGxp bmcgbW9tZW50dW0gd2l0aCAnc2Nyb2xsLXNuYXAtdHlwZTogeCBtYW5kYXRvcnknIGlmIHRoZSBz Y3JvbGxlciBzY3JvbGxzIHZlcnRpY2FsbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxMzU3MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjQ3MTU1 MDc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIFdoZW4g aGFuZGxpbmcgbW9tZW50dW0gc2Nyb2xsaW5nIGZvciBzY3JvbGwgY29udGFpbmVycyB0aGF0IHNu YXAsIHVzZSB0aGUKKyAgICAgICAgcHJlZGljdGVkIG1vbWVudHVtIHNjcm9sbCBkZXN0aW5hdGlv biBmb3IgYXhlcyB0aGF0IGRvIG5vdCBzbmFwLiBVc2luZworICAgICAgICB0aGUgaW5pdGlhbCBz Y3JvbGwgb2Zmc2V0IGhlcmUgd2FzIGNhdXNpbmcgbW9tZW50dW0gc2Nyb2xsaW5nIGluIHRoZXNl IGF4ZXMKKyAgICAgICAgdG8gZW5kIHByZW1hdHVyZWx5LgorCisgICAgICAgIFRlc3Q6IHRpbGVk LWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLW1vbWVudHVtLWluLW5v bi1zbmFwcGluZy1heGlzLmh0bWwKKworICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbFNuYXBBbmlt YXRvclN0YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFNuYXBBbmltYXRvclN0YXRl Ojp0YXJnZXRPZmZzZXRGb3JTdGFydE9mZnNldCBjb25zdCk6IFVzZSB0aGUgcHJlZGljdGVkCisg ICAgICAgIHNjcm9sbCBvZmZzZXQuIEV2ZW4gdGhvdWdoIHRoZSBzdGFydE9mZnNldCBwYXJhbWV0 ZXIgaXMgbm8gbG9uZ2VyIHVzZWQsIGRvIG5vdCByZW1vdmUKKyAgICAgICAgaXQgYmVjYXVzZSBp dCB3aWxsIGJlIHVzZWQgaW4gdGhlIGZpeCBmb3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMzQwNi4KKwogMjAyMS0wMy0xOSAgRGVhbiBKYWNrc29uICA8ZGlub0Bh cHBsZS5jb20+CiAKICAgICAgICAgTGluayBhZ2FpbnN0IHRoZSBBTkdMRSBTaGFyZWQgTGlicmFy eQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsU25hcEFuaW1hdG9y U3RhdGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsU25hcEFuaW1hdG9yU3Rh dGUuY3BwCmluZGV4IDU3ZjI5OWFkNDVmMGZhMTQzM2Y2OTZjN2FlNzE3MGJiM2E4MTVjMWEuLmRh OTc5MmQwNzU4ZmQxYzU3NzJmN2Y2M2QxMjY5MjdlYzAwNjU3MmUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFNuYXBBbmltYXRvclN0YXRlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZS5jcHAKQEAgLTk2LDcg Kzk2LDcgQEAgZmxvYXQgU2Nyb2xsU25hcEFuaW1hdG9yU3RhdGU6OnRhcmdldE9mZnNldEZvclN0 YXJ0T2Zmc2V0KFNjcm9sbEV2ZW50QXhpcyBheGlzLAogICAgIGNvbnN0IGF1dG8mIHNuYXBPZmZz ZXRzID0gbV9zbmFwT2Zmc2V0c0luZm8ub2Zmc2V0c0ZvckF4aXMoYXhpcyk7CiAgICAgaWYgKHNu YXBPZmZzZXRzLmlzRW1wdHkoKSkgewogICAgICAgICBvdXRBY3RpdmVTbmFwSW5kZXggPSBpbnZh bGlkU25hcE9mZnNldEluZGV4OwotICAgICAgICByZXR1cm4gY2xhbXBUbzxmbG9hdD4oc3RhcnRP ZmZzZXQsIDAsIG1heFNjcm9sbE9mZnNldCk7CisgICAgICAgIHJldHVybiBjbGFtcFRvPGZsb2F0 PihwcmVkaWN0ZWRPZmZzZXQsIDAsIG1heFNjcm9sbE9mZnNldCk7CiAgICAgfQogCiAgICAgZmxv YXQgdGFyZ2V0T2Zmc2V0ID0gbV9zbmFwT2Zmc2V0c0luZm8uY2xvc2VzdFNuYXBPZmZzZXQoYXhp cywgTGF5b3V0VW5pdChwcmVkaWN0ZWRPZmZzZXQgLyBwYWdlU2NhbGUpLCBpbml0aWFsRGVsdGEs IExheW91dFVuaXQoc3RhcnRPZmZzZXQgLyBwYWdlU2NhbGUpKS5maXJzdDsKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1Njdi YTQ4MzYwYWQ3MTIyYmRkNGQ4NTJkYTIyYWQ1YWUwMmI0ZTBlLi5hNjhjMTVkNDUxNTdhNjZmOWQ3 NDliOGI1N2FmMzVjY2YwN2QwODdhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDMtMTkg IE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIE5vIHNj cm9sbGluZyBtb21lbnR1bSB3aXRoICdzY3JvbGwtc25hcC10eXBlOiB4IG1hbmRhdG9yeScgaWYg dGhlIHNjcm9sbGVyIHNjcm9sbHMgdmVydGljYWxseQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzNTcxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82 NDcxNTUwNz4KKworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAg KiB0aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9zY3JvbGwtc25hcC9zY3JvbGwtc25hcC1tb21lbnR1 bS1pbi1ub24tc25hcHBpbmctYXhpcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHRp bGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLW1vbWVudHVtLWlu LW5vbi1zbmFwcGluZy1heGlzLmh0bWw6IEFkZGVkLgorCiAyMDIxLTAzLTE5ICBDaHJpcyBEdW1l eiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgUmVzeW5jIHdlYmF1ZGlvIHdlYi1wbGF0 Zm9ybS10ZXN0cyBmcm9tIHVwc3RyZWFtCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy90aWxlZC1k cmF3aW5nL3Njcm9sbGluZy9zY3JvbGwtc25hcC9zY3JvbGwtc25hcC1tb21lbnR1bS1pbi1ub24t c25hcHBpbmctYXhpcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy90aWxlZC1kcmF3aW5nL3Nj cm9sbGluZy9zY3JvbGwtc25hcC9zY3JvbGwtc25hcC1tb21lbnR1bS1pbi1ub24tc25hcHBpbmct YXhpcy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYWQwZTVkMjA3Njc2MjJmNjRhNWUyN2VmMzE5 ZTNkMzRiMjFhM2M4OAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3RpbGVkLWRyYXdp bmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLW1vbWVudHVtLWluLW5vbi1zbmFw cGluZy1heGlzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDUgQEAKK1BBU1Mgc2Nyb2xsaW5nIG1v bWVudHVtIHRoZSBzYW1lIGluIHNuYXBwaW5nIGFuZCBub24tc25hcHBpbmcgYXhlcy4KK1BBU1Mg c3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy90aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9zY3JvbGwtc25hcC9zY3JvbGwt c25hcC1tb21lbnR1bS1pbi1ub24tc25hcHBpbmctYXhpcy5odG1sIGIvTGF5b3V0VGVzdHMvdGls ZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtbW9tZW50dW0taW4t bm9uLXNuYXBwaW5nLWF4aXMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zZjU5NjE4OWJmM2E0OWEyNjkwOWMz MThlNzU3OTNkY2ZlYTBiY2ZkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvdGlsZWQt ZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtbW9tZW50dW0taW4tbm9u LXNuYXBwaW5nLWF4aXMuaHRtbApAQCAtMCwwICsxLDY4IEBACis8IURPQ1RZUEUgSFRNTD4KKzxo dG1sPgorICAgIDxoZWFkPgorICAgICAgICA8c3R5bGU+CisgICAgICAgICAgICAuY29udGFpbmVy IHsKKyAgICAgICAgICAgICAgICB3aWR0aDogMjAwcHg7CisgICAgICAgICAgICAgICAgaGVpZ2h0 OiAyMDBweDsKKyAgICAgICAgICAgICAgICBvdmVyZmxvdzogc2Nyb2xsOworICAgICAgICAgICAg fQorICAgICAgICAgICAgI3ZlcnRpY2FsLXNuYXBwaW5nLWNvbnRhaW5lciB7IHNjcm9sbC1zbmFw LXR5cGU6IHkgcHJveGltaXR5OyB9CisgICAgICAgICAgICAjYmlkaXJlY3Rpb25hbC1zbmFwcGlu Zy1jb250YWluZXIgeyBzY3JvbGwtc25hcC10eXBlOiBib3RoIHByb3hpbWl0eTsgfQorICAgICAg ICAgICAgLmJveCB7CisgICAgICAgICAgICAgICAgaGVpZ2h0OiAxMDB2aDsKKyAgICAgICAgICAg ICAgICB3aWR0aDogMTAwdnc7CisgICAgICAgICAgICAgICAgZmxvYXQ6IGxlZnQ7CisgICAgICAg ICAgICAgICAgc2Nyb2xsLXNuYXAtYWxpZ246IHN0YXJ0OworICAgICAgICAgICAgfQorICAgICAg ICA8L3N0eWxlPgorICAgICAgICA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRl c3QuanMiPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2Vz L3VpLWhlbHBlci5qcyI+PC9zY3JpcHQ+CisgICAgICAgIDxzY3JpcHQgc3JjPSJyZXNvdXJjZXMv bWFpbmZyYW1lLXNjcm9sbC1zbmFwLXRlc3QuanMiPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0 PgorICAgICAgICB3aW5kb3cuanNUZXN0SXNBc3luYyA9IHRydWU7CisKKyAgICAgICAgYXN5bmMg ZnVuY3Rpb24gcnVuVGVzdHMoKQorICAgICAgICB7CisgICAgICAgICAgICB0cnkgeworICAgICAg ICAgICAgICAgIGNvbnN0IGNvbnRhaW5lck5vdFNuYXBwaW5nT25BeGlzID0gZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoInZlcnRpY2FsLXNuYXBwaW5nLWNvbnRhaW5lciIpOworICAgICAgICAgICAg ICAgIGF3YWl0IGRvU2Nyb2xsR2xpZGUoY29udGFpbmVyTm90U25hcHBpbmdPbkF4aXMsIEhPUkla T05UQUwpOworICAgICAgICAgICAgICAgIGNvbnN0IGNvbnRhaW5lclNuYXBwaW5nT25BeGlzID0g ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImJpZGlyZWN0aW9uYWwtc25hcHBpbmctY29udGFpbmVy Iik7CisgICAgICAgICAgICAgICAgYXdhaXQgZG9TY3JvbGxHbGlkZShjb250YWluZXJTbmFwcGlu Z09uQXhpcywgSE9SSVpPTlRBTCk7CisgICAgICAgICAgICAgICAgZXhwZWN0VHJ1ZShjb250YWlu ZXJTbmFwcGluZ09uQXhpcy5zY3JvbGxMZWZ0ID09IGNvbnRhaW5lck5vdFNuYXBwaW5nT25BeGlz LnNjcm9sbExlZnQsICJzY3JvbGxpbmcgbW9tZW50dW0gdGhlIHNhbWUgaW4gc25hcHBpbmcgYW5k IG5vbi1zbmFwcGluZyBheGVzLiIpOworICAgICAgICAgICAgfSBjYXRjaCAoZSkgeworICAgICAg ICAgICAgICAgIGNvbnNvbGUubG9nKGUpOworICAgICAgICAgICAgfSBmaW5hbGx5IHsKKyAgICAg ICAgICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorCisg ICAgICAgIGZ1bmN0aW9uIG9uTG9hZCgpCisgICAgICAgIHsKKyAgICAgICAgICAgIGlmICh3aW5k b3cuZXZlbnRTZW5kZXIpIHsKKyAgICAgICAgICAgICAgICBpbnRlcm5hbHMuc2V0UGxhdGZvcm1N b21lbnR1bVNjcm9sbGluZ1ByZWRpY3Rpb25FbmFibGVkKGZhbHNlKTsKKyAgICAgICAgICAgICAg ICBydW5UZXN0cygpOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICB2YXIg bWVzc2FnZUxvY2F0aW9uID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2NvbnNvbGUnKTsKKyAg ICAgICAgICAgICAgICBtZXNzYWdlTG9jYXRpb24uaW5uZXJIVE1MID0gIjxwPlRvIHJ1biB0aGlz IHRlc3QgbWFudWFsbHksIHNjcm9sbCB0aGUgcGFnZSB2ZXJ0aWNhbGx5LiBUaGUgcGFnZSBzaG91 bGQgIgorICAgICAgICAgICAgICAgICAgICArICJzbmFwIGJldHdlZW4gdW5pZm9ybSBjb2xvcnMg d2hpY2ggZmlsbCB0aGUgdmlldy48cD4iOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAg ICAgIDwvc2NyaXB0PgorICAgIDwvaGVhZD4KKyAgICA8Ym9keSBvbmxvYWQ9Im9uTG9hZCgpOyI+ CisgICAgICAgIDxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorICAgICAgICA8ZGl2IGlkPSJ2ZXJ0 aWNhbC1zbmFwcGluZy1jb250YWluZXIiIGNsYXNzPSJjb250YWluZXIiPgorICAgICAgICAgICAg PGRpdiBzdHlsZT0id2lkdGg6IDIwMHZ3Ij4KKyAgICAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJi b3giPjwvZGl2PgorICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9ImJveCI+PC9kaXY+CisgICAg ICAgICAgICA8L2Rpdj4KKyAgICAgICAgPC9kaXY+CisgICAgICAgIDxkaXYgaWQ9ImJpZGlyZWN0 aW9uYWwtc25hcHBpbmctY29udGFpbmVyIiBjbGFzcz0iY29udGFpbmVyIj4KKyAgICAgICAgICAg IDxkaXYgc3R5bGU9IndpZHRoOiAyMDB2dyI+CisgICAgICAgICAgICAgICAgPGRpdiBjbGFzcz0i Ym94IiBzdHlsZT0iZmxvYXQ6IGxlZnQiPjwvZGl2PgorICAgICAgICAgICAgICAgIDxkaXYgY2xh c3M9ImJveCIgc3R5bGU9ImZsb2F0OiBsZWZ0Ij48L2Rpdj4KKyAgICAgICAgICAgIDwvZGl2Pgor ICAgICAgICA8L2Rpdj4KKyAgICA8L2JvZHk+Cis8L2h0bWw+Cg==