227688 2021-07-05 12:26:34 -0700 [LFC][IFC] Add support for partially trimmed trailing whitespace 2021-07-07 18:36:17 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1774833 0 zalan 2021-07-05 12:26:34 -0700 visual trimming for pre-wrap 1774835 1 432894 zalan 2021-07-05 12:33:30 -0700 Created attachment 432894 Patch 1774990 2 432945 zalan 2021-07-06 10:35:13 -0700 Created attachment 432945 Patch 1775467 3 433079 zalan 2021-07-07 14:35:40 -0700 Created attachment 433079 Patch 1775568 4 ews-feeder 2021-07-07 18:35:51 -0700 Committed r279698 (239496@main): <https://commits.webkit.org/239496@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 433079. 1775569 5 webkit-bug-importer 2021-07-07 18:36:17 -0700 <rdar://problem/80299749> 432894 2021-07-05 12:33:30 -0700 2021-07-06 10:35:11 -0700 Patch bug-227688-20210705123329.patch text/plain 8770 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTJiYmU0ODdhNzZjMWVj ZTUxYzI1NDVjNjE1YjdmMzQ4NWI4NWU5Mi4uZjE4ZjQxYTJlYWYxNWNiNjUwMjhmM2VlOTJkMjk4 N2RkZDA1MGUzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA3LTA1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkZCBzdXBw b3J0IGZvciBwYXJ0aWFsbHkgdHJpbW1lZCB0cmFpbGluZyB3aGl0ZXNwYWNlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjc2ODgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGZpeGVzIHRo ZSBjYXNlIHdoZW4gYXMgYSByZXN1bHQgb2YgdGhlIHBhcnRpYWxseSB0cmltbWVkIG92ZXJmbG93 IGNvbnRlbnQsCisgICAgICAgIHdlIGRvbid0IG5lZWQgdG8gY29uZGl0aW9uYWxseSBoYW5nIHRo ZSB0cmFpbGluZyBlbmQgYW55bW9yZS4KKworICAgICAgICBodHRwczovL2RyYWZ0cy5jc3N3Zy5v cmcvY3NzLXRleHQtMy8jdmFsZGVmLXdoaXRlLXNwYWNlLXByZQorICAgICAgICAiSWYgd2hpdGUt c3BhY2UgaXMgc2V0IHRvIHByZS13cmFwLCB0aGUgVUEgbXVzdCAodW5jb25kaXRpb25hbGx5KQor ICAgICAgICAuLi4KKyAgICAgICAgSXQgbWF5IGFsc28gdmlzdWFsbHkgY29sbGFwc2UgdGhlIGNo YXJhY3RlciBhZHZhbmNlIHdpZHRocyBvZiBhbnkgdGhhdCB3b3VsZCBvdGhlcndpc2Ugb3ZlcmZs b3cuIgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l TGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OnZpc3VhbGx5Q29sbGFw c2VQcmVXcmFwT3ZlcmZsb3dDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGlu ZTo6UnVuOjpyZW1vdmVUcmFpbGluZ1doaXRlc3BhY2UpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpMaW5lOjpSdW46OnZpc3VhbGx5Q29sbGFwc2VUcmFpbGluZ1doaXRlc3BhY2UpOgorICAg ICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaDoKKwog MjAyMS0wNy0wNCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xG Q11bSUZDXSBBZGQgc3VwcG9ydCBmb3IgY29uZGl0aW9uYWxseSBoYW5naW5nIGdseXBoCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVMaW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUxpbmUuY3BwCmluZGV4IDRhMWQyOGU0YjNhZWFmN2UyNGY1Mjc3M2RiZTY1 MmY0NWQ5ZWI2ZGUuLmExOGRiNmI2YzVlZGJmM2Q3MGVmNWIwMzA0NWNkOGJhMDNhYWU4MDQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUxpbmUuY3BwCkBAIC0xNDQsMjIgKzE0NCwyMSBAQCB2b2lkIExp bmU6OnZpc3VhbGx5Q29sbGFwc2VQcmVXcmFwT3ZlcmZsb3dDb250ZW50KElubGluZUxheW91dFVu aXQgZXh0cmFIb3Jpem9udAogICAgICAgICByZXR1cm47CiAgICAgLy8gTGV0J3MganVzdCBmaW5k IHRoZSB0cmFpbGluZyBwcmUtd3JhcCB3aGl0ZXNwYWNlIGNvbnRlbnQgZm9yIG5vdyAoZS5nIGNo ZWNrIGlmIHRoZXJlIGFyZSBtdWx0aXBsZSB0cmFpbGluZyBydW5zIHdpdGgKICAgICAvLyBkaWZm ZXJlbnQgc2V0IG9mIHdoaXRlLXNwYWNlIHZhbHVlcyBhbmQgZGVjaWRlIGlmIHRoZSBpbi1iZXR3 ZWVuIHByZS13cmFwIGNvbnRlbnQgc2hvdWxkIGJlIGNvbGxhcHNlZCBhcyB3ZWxsLikKLSAgICBJ bmxpbmVMYXlvdXRVbml0IHRyaW1tZWRDb250ZW50V2lkdGggPSAwOworICAgIGF1dG8gdHJpbW1l ZENvbnRlbnRXaWR0aCA9IElubGluZUxheW91dFVuaXQgeyB9OwogICAgIGZvciAoYXV0byYgcnVu IDogV1RGOjptYWtlUmV2ZXJzZWRSYW5nZShtX3J1bnMpKSB7CiAgICAgICAgIGlmIChydW4uc3R5 bGUoKS53aGl0ZVNwYWNlKCkgIT0gV2hpdGVTcGFjZTo6UHJlV3JhcCkgewogICAgICAgICAgICAg Ly8gV2UgYXJlIG9ubHkgaW50ZXJlc3RlZCBpbiBwcmUtd3JhcCB0cmFpbGluZyBjb250ZW50Lgog ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KLSAgICAgICAgYXV0byBwcmVXcmFwVmlzdWFs bHlDb2xsYXBzaWJsZUlubGluZUl0ZW0gPSBydW4uaXNJbmxpbmVCb3hTdGFydCgpIHx8IHJ1bi5p c0lubGluZUJveEVuZCgpIHx8IHJ1bi5oYXNUcmFpbGluZ1doaXRlc3BhY2UoKTsKLSAgICAgICAg aWYgKCFwcmVXcmFwVmlzdWFsbHlDb2xsYXBzaWJsZUlubGluZUl0ZW0pCisgICAgICAgIGF1dG8g dmlzdWFsbHlDb2xsYXBzaWJsZUlubGluZUl0ZW0gPSBydW4uaXNJbmxpbmVCb3hTdGFydCgpIHx8 IHJ1bi5pc0lubGluZUJveEVuZCgpIHx8IHJ1bi5oYXNUcmFpbGluZ1doaXRlc3BhY2UoKTsKKyAg ICAgICAgaWYgKCF2aXN1YWxseUNvbGxhcHNpYmxlSW5saW5lSXRlbSkKICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICBBU1NFUlQoIXJ1bi5oYXNDb2xsYXBzaWJsZVRyYWlsaW5nV2hpdGVzcGFj ZSgpKTsKLSAgICAgICAgSW5saW5lTGF5b3V0VW5pdCB0cmltbWFibGVXaWR0aCA9IHsgfTsKKyAg ICAgICAgYXV0byB0cmltbWFibGVXaWR0aCA9IElubGluZUxheW91dFVuaXQgeyB9OwogICAgICAg ICBpZiAocnVuLmlzVGV4dCgpKSB7CiAgICAgICAgICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGFs d2F5cyBjb2xsYXBzZSB0aGUgcnVuIGF0IGEgZ2x5cGggYm91bmRhcnkgYXMgdGhlIHNwZWMgaW5k aWNhdGVzOiAiY29sbGFwc2UgdGhlIGNoYXJhY3RlciBhZHZhbmNlIHdpZHRocyBvZiBhbnkgdGhh dCB3b3VsZCBvdGhlcndpc2Ugb3ZlcmZsb3ciCiAgICAgICAgICAgICAvLyBhbmQgdGhlIHRyaW1t ZWQgd2lkdGggc2hvdWxkIGJlIGNhcHBlZCBhdCBzdGQ6Om1pbihydW4udHJhaWxpbmdXaGl0ZXNw YWNlV2lkdGgoKSwgb3ZlcmZsb3dXaWR0aCkgZm9yIHRleHQgcnVucy4gQm90aCBGRiBhbmQgQ2hy b21lIGFncmVlLgotICAgICAgICAgICAgdHJpbW1hYmxlV2lkdGggPSBydW4udHJhaWxpbmdXaGl0 ZXNwYWNlV2lkdGgoKTsKLSAgICAgICAgICAgIHJ1bi52aXN1YWxseUNvbGxhcHNlVHJhaWxpbmdX aGl0ZXNwYWNlKCk7CisgICAgICAgICAgICB0cmltbWFibGVXaWR0aCA9IHJ1bi52aXN1YWxseUNv bGxhcHNlVHJhaWxpbmdXaGl0ZXNwYWNlKG92ZXJmbG93V2lkdGgpOwogICAgICAgICB9IGVsc2Ug ewogICAgICAgICAgICAgdHJpbW1hYmxlV2lkdGggPSBydW4ubG9naWNhbFdpZHRoKCk7CiAgICAg ICAgICAgICBydW4uc2hyaW5rSG9yaXpvbnRhbGx5KHRyaW1tYWJsZVdpZHRoKTsKQEAgLTQ5Nywx MyArNDk2LDE5IEBAIHZvaWQgTGluZTo6UnVuOjpyZW1vdmVUcmFpbGluZ1doaXRlc3BhY2UoKQog ICAgIEFTU0VSVChtX3RleHRDb250ZW50LT5sZW5ndGgoKSk7CiAgICAgY29uc3RleHByIHNpemVf dCB0cmFpbGluZ1RyaW1tYWJsZUNvbnRlbnRMZW5ndGggPSAxOwogICAgIG1fdGV4dENvbnRlbnQt PnNocmluayh0cmFpbGluZ1RyaW1tYWJsZUNvbnRlbnRMZW5ndGgpOwotICAgIHZpc3VhbGx5Q29s bGFwc2VUcmFpbGluZ1doaXRlc3BhY2UoKTsKKyAgICB2aXN1YWxseUNvbGxhcHNlVHJhaWxpbmdX aGl0ZXNwYWNlKG1fdHJhaWxpbmdXaGl0ZXNwYWNlV2lkdGgpOwogfQogCi12b2lkIExpbmU6OlJ1 bjo6dmlzdWFsbHlDb2xsYXBzZVRyYWlsaW5nV2hpdGVzcGFjZSgpCitJbmxpbmVMYXlvdXRVbml0 IExpbmU6OlJ1bjo6dmlzdWFsbHlDb2xsYXBzZVRyYWlsaW5nV2hpdGVzcGFjZShJbmxpbmVMYXlv dXRVbml0IHRyeUNvbGxhcHNpbmdUaGlzTXVjaFNwYWNlKQogeworICAgIEFTU0VSVCh0cnlDb2xs YXBzaW5nVGhpc011Y2hTcGFjZSA+IDApOwogICAgIC8vIFRoaXMgaXMganVzdCBhIHZpc3VhbCBh ZGp1c3RtZW50LCB0aGUgdGV4dCBsZW5ndGggc2hvdWxkIHJlbWFpbiB0aGUgc2FtZS4KLSAgICBz aHJpbmtIb3Jpem9udGFsbHkobV90cmFpbGluZ1doaXRlc3BhY2VXaWR0aCk7CisgICAgYXV0byB0 cmltbWVkV2lkdGggPSBzdGQ6Om1pbih0cnlDb2xsYXBzaW5nVGhpc011Y2hTcGFjZSwgbV90cmFp bGluZ1doaXRlc3BhY2VXaWR0aCk7CisgICAgc2hyaW5rSG9yaXpvbnRhbGx5KHRyaW1tZWRXaWR0 aCk7CisgICAgbV90cmFpbGluZ1doaXRlc3BhY2VXaWR0aCAtPSB0cmltbWVkV2lkdGg7CisgICAg aWYgKG1fbG9naWNhbFdpZHRoKQorICAgICAgICByZXR1cm4gdHJpbW1lZFdpZHRoOworICAgIC8v IFRoaXMgaXMgbm93IGFuIGVtcHR5IHJ1bi4KICAgICBtX3RyYWlsaW5nV2hpdGVzcGFjZVdpZHRo ID0geyB9OwogICAgIG1fdHJhaWxpbmdXaGl0ZXNwYWNlVHlwZSA9IFRyYWlsaW5nV2hpdGVzcGFj ZTo6Tm9uZTsKIApAQCAtNTEyLDYgKzUxNyw3IEBAIHZvaWQgTGluZTo6UnVuOjp2aXN1YWxseUNv bGxhcHNlVHJhaWxpbmdXaGl0ZXNwYWNlKCkKICAgICAgICAgbV9leHBhbnNpb25PcHBvcnR1bml0 eUNvdW50LS07CiAgICAgfQogICAgIHNldEV4cGFuc2lvbkJlaGF2aW9yKEFsbG93TGVmdEV4cGFu c2lvbiB8IEFsbG93UmlnaHRFeHBhbnNpb24pOworICAgIHJldHVybiB0cmltbWVkV2lkdGg7CiB9 CiAKIHZvaWQgTGluZTo6UnVuOjpzZXRFeHBhbnNpb25CZWhhdmlvcihFeHBhbnNpb25CZWhhdmlv ciBleHBhbnNpb25CZWhhdmlvcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaAppbmRleCAyNGQ0ZDVj MTJiNDY1MDcyMWY5MjFiOTE2OTM2OTI0MDA3OGI4OGNiLi41MGZlYjBjZmQ2Yzc5OGM2YjUzZWQ4 MzFhYjM1YzU0MWQyZjIyM2IxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmgKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oCkBAIC0xMDksNyAr MTA5LDcgQEAgcHVibGljOgogICAgICAgICBib29sIGhhc0NvbGxhcHNlZFRyYWlsaW5nV2hpdGVz cGFjZSgpIGNvbnN0IHsgcmV0dXJuIG1fdHJhaWxpbmdXaGl0ZXNwYWNlVHlwZSA9PSBUcmFpbGlu Z1doaXRlc3BhY2U6OkNvbGxhcHNlZDsgfQogICAgICAgICBUcmFpbGluZ1doaXRlc3BhY2UgdHJh aWxpbmdXaGl0ZXNwYWNlVHlwZShjb25zdCBJbmxpbmVUZXh0SXRlbSYpIGNvbnN0OwogICAgICAg ICB2b2lkIHJlbW92ZVRyYWlsaW5nV2hpdGVzcGFjZSgpOwotICAgICAgICB2b2lkIHZpc3VhbGx5 Q29sbGFwc2VUcmFpbGluZ1doaXRlc3BhY2UoKTsKKyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCB2 aXN1YWxseUNvbGxhcHNlVHJhaWxpbmdXaGl0ZXNwYWNlKElubGluZUxheW91dFVuaXQgdHJ5Q29s bGFwc2luZ1RoaXNNdWNoU3BhY2UpOwogCiAgICAgICAgIGJvb2wgaGFzVHJhaWxpbmdMZXR0ZXJT cGFjaW5nKCkgY29uc3Q7CiAgICAgICAgIElubGluZUxheW91dFVuaXQgdHJhaWxpbmdMZXR0ZXJT cGFjaW5nKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOTljMzNjMDYzMTU5NTAxOWFiOGY1YTY4YzZkYmM2NTlk MzI4MmVlNy4uZjMzNGQ1MTkyNzZkZDg3NDU5NDE5ZjhiYmRiMDY1NDY4Yjk3Y2Q5OSAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDEyIEBACisyMDIxLTA3LTA1ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNv bT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkZCBzdXBwb3J0IGZvciBwYXJ0aWFsbHkgdHJpbW1l ZCB0cmFpbGluZyB3aGl0ZXNwYWNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMjc2ODgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6IFByb2dyZXNzaW9ucy4KKwogMjAyMS0w Ny0wNCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZD XSBBZGQgc3VwcG9ydCBmb3IgY29uZGl0aW9uYWxseSBoYW5naW5nIGdseXBoCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0 aW9ucwppbmRleCBjZTNiMjg5NzhlYWMzMzhjNzljZmE4ZGZiZGFmMTdmZTMwMWNhYTE0Li5mZTI5 NjYzMmMzNDYzZTBkOGYxNGRmNDIwOWNmZTk3ZDk1NDU4YjYxIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMK QEAgLTI2MTcsNyArMjYxNyw2IEBAIHdlYmtpdC5vcmcvYi8xOTUyNzUgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvd2hpdGUtc3BhY2UvdHJhCiB3ZWJraXQub3Jn L2IvMTk1Mjc1IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3do aXRlLXNwYWNlL3RhYi1zdG9wLXRocmVzaG9sZC0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg XQogd2Via2l0Lm9yZy9iLzE5NTI3NSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3MtdGV4dC93aGl0ZS1zcGFjZS9saW5lLWVkZ2Utd2hpdGUtc3BhY2UtY29sbGFwc2UtMDAx Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8xOTUyNzUgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvd2hpdGUtc3BhY2UvdHJhaWxpbmct aWRlb2dyYXBoaWMtc3BhY2UtMDAzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5v cmcvYi8xOTUyNzUgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQv d2hpdGUtc3BhY2Uvd2hpdGUtc3BhY2UtcHJlLXdyYXAtdHJhaWxpbmctc3BhY2VzLTAwMi5odG1s IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTk1Mjc1IGltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3doaXRlLXNwYWNlL3ByZS13cmFwLTAxNC5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTk1Mjc1IGltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3doaXRlLXNwYWNlL3RleHQtc3BhY2Ut dHJpbS10cmltLWlubmVyLTAwMS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv Yi8xOTUyNzUgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvd2hp dGUtc3BhY2UvdHJhaWxpbmctaWRlb2dyYXBoaWMtc3BhY2UtMDA0Lmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KQEAgLTQzNjAsNyArNDM1OSw2IEBAIHdlYmtpdC5vcmcvYi8yMTQyOTAgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvd2hpdGUtc3BhY2UvdHJhCiB3 ZWJraXQub3JnL2IvMjE0MjkwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz cy10ZXh0L3doaXRlLXNwYWNlL3RyYWlsaW5nLXNwYWNlLWFsaWduLXN0YXJ0LnRlbnRhdGl2ZS5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0MjkwIGltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3doaXRlLXNwYWNlL3doaXRlLXNwYWNl LXByZS0wNTEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDI5MCBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4dC93aGl0ZS1zcGFjZS93 aGl0ZS1zcGFjZS1wcmUtMDUyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcv Yi8yMTQyOTAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvd2hp dGUtc3BhY2Uvd2hpdGUtc3BhY2UtcHJlLXdyYXAtdHJhaWxpbmctc3BhY2VzLTAwMS5odG1sIFsg SW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0MjkwIGltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3dvcmQtYm91bmRhcnkvd29yZC1ib3VuZGFyeS0w MDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDI5MCBpbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4dC93b3JkLWJvdW5kYXJ5L3dvcmQt Ym91bmRhcnktMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQy OTAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvd29yZC1ib3Vu ZGFyeS93b3JkLWJvdW5kYXJ5LTAwMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg== 432945 2021-07-06 10:35:13 -0700 2021-07-07 14:35:38 -0700 Patch bug-227688-20210706103512.patch text/plain 9160 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGI1YmU2NGJlNjdlYjFm MDgwY2MzMjgwMDNhYjc5Yzg3ZTBhYzZjOC4uYWQ1OTVkNGI5OWNiY2MxZjBlY2EwMDE3MDQwNzU4 YmZkYjdmYWQ2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA3LTA2ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkZCBzdXBw b3J0IGZvciBwYXJ0aWFsbHkgdHJpbW1lZCB0cmFpbGluZyB3aGl0ZXNwYWNlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjc2ODgKKworICAgICAgICBS ZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICBUaGlzIHBhdGNoIGZpeGVzIHRo ZSBjYXNlIHdoZW4gYXMgYSByZXN1bHQgb2YgdGhlIHBhcnRpYWxseSB0cmltbWVkIG92ZXJmbG93 IGNvbnRlbnQsCisgICAgICAgIHdlIGRvbid0IG5lZWQgdG8gY29uZGl0aW9uYWxseSBoYW5nIHRo ZSB0cmFpbGluZyBlbmQgYW55bW9yZS4KKworICAgICAgICBodHRwczovL2RyYWZ0cy5jc3N3Zy5v cmcvY3NzLXRleHQtMy8jdmFsZGVmLXdoaXRlLXNwYWNlLXByZQorICAgICAgICAiSWYgd2hpdGUt c3BhY2UgaXMgc2V0IHRvIHByZS13cmFwLCB0aGUgVUEgbXVzdCAodW5jb25kaXRpb25hbGx5KQor ICAgICAgICAuLi4KKyAgICAgICAgSXQgbWF5IGFsc28gdmlzdWFsbHkgY29sbGFwc2UgdGhlIGNo YXJhY3RlciBhZHZhbmNlIHdpZHRocyBvZiBhbnkgdGhhdCB3b3VsZCBvdGhlcndpc2Ugb3ZlcmZs b3cuIgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l TGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OnZpc3VhbGx5Q29sbGFw c2VQcmVXcmFwT3ZlcmZsb3dDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGlu ZTo6UnVuOjpyZW1vdmVUcmFpbGluZ1doaXRlc3BhY2UpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpMaW5lOjpSdW46OnZpc3VhbGx5Q29sbGFwc2VUcmFpbGluZ1doaXRlc3BhY2UpOgorICAg ICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaDoKKwog MjAyMS0wNy0wNiAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAg U2V0IGtWVENvbXByZXNzaW9uUHJvcGVydHlLZXlfTWF4S2V5RnJhbWVJbnRlcnZhbCBpbiBWaWRl b1NhbXBsZUJ1ZmZlckNvbXByZXNzb3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAKaW5kZXgg NGExZDI4ZTRiM2FlYWY3ZTI0ZjUyNzczZGJlNjUyZjQ1ZDllYjZkZS4uZWJjMTM3NjczMzlhYTBi YmI1MDgzNGE3Zjc4NjA3MDE0ZTgxNjcwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAK QEAgLTE0NCwyMiArMTQ0LDIxIEBAIHZvaWQgTGluZTo6dmlzdWFsbHlDb2xsYXBzZVByZVdyYXBP dmVyZmxvd0NvbnRlbnQoSW5saW5lTGF5b3V0VW5pdCBleHRyYUhvcml6b250CiAgICAgICAgIHJl dHVybjsKICAgICAvLyBMZXQncyBqdXN0IGZpbmQgdGhlIHRyYWlsaW5nIHByZS13cmFwIHdoaXRl c3BhY2UgY29udGVudCBmb3Igbm93IChlLmcgY2hlY2sgaWYgdGhlcmUgYXJlIG11bHRpcGxlIHRy YWlsaW5nIHJ1bnMgd2l0aAogICAgIC8vIGRpZmZlcmVudCBzZXQgb2Ygd2hpdGUtc3BhY2UgdmFs dWVzIGFuZCBkZWNpZGUgaWYgdGhlIGluLWJldHdlZW4gcHJlLXdyYXAgY29udGVudCBzaG91bGQg YmUgY29sbGFwc2VkIGFzIHdlbGwuKQotICAgIElubGluZUxheW91dFVuaXQgdHJpbW1lZENvbnRl bnRXaWR0aCA9IDA7CisgICAgYXV0byB0cmltbWVkQ29udGVudFdpZHRoID0gSW5saW5lTGF5b3V0 VW5pdCB7IH07CiAgICAgZm9yIChhdXRvJiBydW4gOiBXVEY6Om1ha2VSZXZlcnNlZFJhbmdlKG1f cnVucykpIHsKICAgICAgICAgaWYgKHJ1bi5zdHlsZSgpLndoaXRlU3BhY2UoKSAhPSBXaGl0ZVNw YWNlOjpQcmVXcmFwKSB7CiAgICAgICAgICAgICAvLyBXZSBhcmUgb25seSBpbnRlcmVzdGVkIGlu IHByZS13cmFwIHRyYWlsaW5nIGNvbnRlbnQuCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg fQotICAgICAgICBhdXRvIHByZVdyYXBWaXN1YWxseUNvbGxhcHNpYmxlSW5saW5lSXRlbSA9IHJ1 bi5pc0lubGluZUJveFN0YXJ0KCkgfHwgcnVuLmlzSW5saW5lQm94RW5kKCkgfHwgcnVuLmhhc1Ry YWlsaW5nV2hpdGVzcGFjZSgpOwotICAgICAgICBpZiAoIXByZVdyYXBWaXN1YWxseUNvbGxhcHNp YmxlSW5saW5lSXRlbSkKKyAgICAgICAgYXV0byB2aXN1YWxseUNvbGxhcHNpYmxlSW5saW5lSXRl bSA9IHJ1bi5pc0lubGluZUJveFN0YXJ0KCkgfHwgcnVuLmlzSW5saW5lQm94RW5kKCkgfHwgcnVu Lmhhc1RyYWlsaW5nV2hpdGVzcGFjZSgpOworICAgICAgICBpZiAoIXZpc3VhbGx5Q29sbGFwc2li bGVJbmxpbmVJdGVtKQogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIEFTU0VSVCghcnVuLmhh c0NvbGxhcHNpYmxlVHJhaWxpbmdXaGl0ZXNwYWNlKCkpOwotICAgICAgICBJbmxpbmVMYXlvdXRV bml0IHRyaW1tYWJsZVdpZHRoID0geyB9OworICAgICAgICBhdXRvIHRyaW1tYWJsZVdpZHRoID0g SW5saW5lTGF5b3V0VW5pdCB7IH07CiAgICAgICAgIGlmIChydW4uaXNUZXh0KCkpIHsKICAgICAg ICAgICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgYWx3YXlzIGNvbGxhcHNlIHRoZSBydW4gYXQgYSBn bHlwaCBib3VuZGFyeSBhcyB0aGUgc3BlYyBpbmRpY2F0ZXM6ICJjb2xsYXBzZSB0aGUgY2hhcmFj dGVyIGFkdmFuY2Ugd2lkdGhzIG9mIGFueSB0aGF0IHdvdWxkIG90aGVyd2lzZSBvdmVyZmxvdyIK ICAgICAgICAgICAgIC8vIGFuZCB0aGUgdHJpbW1lZCB3aWR0aCBzaG91bGQgYmUgY2FwcGVkIGF0 IHN0ZDo6bWluKHJ1bi50cmFpbGluZ1doaXRlc3BhY2VXaWR0aCgpLCBvdmVyZmxvd1dpZHRoKSBm b3IgdGV4dCBydW5zLiBCb3RoIEZGIGFuZCBDaHJvbWUgYWdyZWUuCi0gICAgICAgICAgICB0cmlt bWFibGVXaWR0aCA9IHJ1bi50cmFpbGluZ1doaXRlc3BhY2VXaWR0aCgpOwotICAgICAgICAgICAg cnVuLnZpc3VhbGx5Q29sbGFwc2VUcmFpbGluZ1doaXRlc3BhY2UoKTsKKyAgICAgICAgICAgIHRy aW1tYWJsZVdpZHRoID0gcnVuLnZpc3VhbGx5Q29sbGFwc2VUcmFpbGluZ1doaXRlc3BhY2Uob3Zl cmZsb3dXaWR0aCk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICB0cmltbWFibGVXaWR0 aCA9IHJ1bi5sb2dpY2FsV2lkdGgoKTsKICAgICAgICAgICAgIHJ1bi5zaHJpbmtIb3Jpem9udGFs bHkodHJpbW1hYmxlV2lkdGgpOwpAQCAtNDk3LDIxICs0OTYsMjcgQEAgdm9pZCBMaW5lOjpSdW46 OnJlbW92ZVRyYWlsaW5nV2hpdGVzcGFjZSgpCiAgICAgQVNTRVJUKG1fdGV4dENvbnRlbnQtPmxl bmd0aCgpKTsKICAgICBjb25zdGV4cHIgc2l6ZV90IHRyYWlsaW5nVHJpbW1hYmxlQ29udGVudExl bmd0aCA9IDE7CiAgICAgbV90ZXh0Q29udGVudC0+c2hyaW5rKHRyYWlsaW5nVHJpbW1hYmxlQ29u dGVudExlbmd0aCk7Ci0gICAgdmlzdWFsbHlDb2xsYXBzZVRyYWlsaW5nV2hpdGVzcGFjZSgpOwor ICAgIHZpc3VhbGx5Q29sbGFwc2VUcmFpbGluZ1doaXRlc3BhY2UobV90cmFpbGluZ1doaXRlc3Bh Y2VXaWR0aCk7CiB9CiAKLXZvaWQgTGluZTo6UnVuOjp2aXN1YWxseUNvbGxhcHNlVHJhaWxpbmdX aGl0ZXNwYWNlKCkKK0lubGluZUxheW91dFVuaXQgTGluZTo6UnVuOjp2aXN1YWxseUNvbGxhcHNl VHJhaWxpbmdXaGl0ZXNwYWNlKElubGluZUxheW91dFVuaXQgdHJ5Q29sbGFwc2luZ1RoaXNNdWNo U3BhY2UpCiB7CisgICAgQVNTRVJUKGhhc1RyYWlsaW5nV2hpdGVzcGFjZSgpKTsKICAgICAvLyBU aGlzIGlzIGp1c3QgYSB2aXN1YWwgYWRqdXN0bWVudCwgdGhlIHRleHQgbGVuZ3RoIHNob3VsZCBy ZW1haW4gdGhlIHNhbWUuCi0gICAgc2hyaW5rSG9yaXpvbnRhbGx5KG1fdHJhaWxpbmdXaGl0ZXNw YWNlV2lkdGgpOwotICAgIG1fdHJhaWxpbmdXaGl0ZXNwYWNlV2lkdGggPSB7IH07Ci0gICAgbV90 cmFpbGluZ1doaXRlc3BhY2VUeXBlID0gVHJhaWxpbmdXaGl0ZXNwYWNlOjpOb25lOwotCi0gICAg aWYgKG1fd2hpdGVzcGFjZUlzRXhwYW5zaW9uT3Bwb3J0dW5pdHkpIHsKLSAgICAgICAgQVNTRVJU KG1fZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCk7Ci0gICAgICAgIG1fZXhwYW5zaW9uT3Bwb3J0 dW5pdHlDb3VudC0tOworICAgIGF1dG8gdHJpbW1lZFdpZHRoID0gc3RkOjptaW4odHJ5Q29sbGFw c2luZ1RoaXNNdWNoU3BhY2UsIG1fdHJhaWxpbmdXaGl0ZXNwYWNlV2lkdGgpOworICAgIHNocmlu a0hvcml6b250YWxseSh0cmltbWVkV2lkdGgpOworICAgIG1fdHJhaWxpbmdXaGl0ZXNwYWNlV2lk dGggLT0gdHJpbW1lZFdpZHRoOworICAgIGlmICghbV90cmFpbGluZ1doaXRlc3BhY2VXaWR0aCkg eworICAgICAgICAvLyBXZSB0cmltbWVkIHRoZSB0cmFpbGluZyB3aGl0ZXNwYWNlIGNvbXBsZXRl bHkuCisgICAgICAgIG1fdHJhaWxpbmdXaGl0ZXNwYWNlVHlwZSA9IFRyYWlsaW5nV2hpdGVzcGFj ZTo6Tm9uZTsKKworICAgICAgICBpZiAobV93aGl0ZXNwYWNlSXNFeHBhbnNpb25PcHBvcnR1bml0 eSkgeworICAgICAgICAgICAgQVNTRVJUKG1fZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCk7Cisg ICAgICAgICAgICBtX2V4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQtLTsKKyAgICAgICAgfQorICAg ICAgICBzZXRFeHBhbnNpb25CZWhhdmlvcihBbGxvd0xlZnRFeHBhbnNpb24gfCBBbGxvd1JpZ2h0 RXhwYW5zaW9uKTsKICAgICB9Ci0gICAgc2V0RXhwYW5zaW9uQmVoYXZpb3IoQWxsb3dMZWZ0RXhw YW5zaW9uIHwgQWxsb3dSaWdodEV4cGFuc2lvbik7CisgICAgcmV0dXJuIHRyaW1tZWRXaWR0aDsK IH0KIAogdm9pZCBMaW5lOjpSdW46OnNldEV4cGFuc2lvbkJlaGF2aW9yKEV4cGFuc2lvbkJlaGF2 aW9yIGV4cGFuc2lvbkJlaGF2aW9yKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oCmluZGV4IDI0ZDRk NWMxMmI0NjUwNzIxZjkyMWI5MTY5MzY5MjQwMDc4Yjg4Y2IuLjUwZmViMGNmZDZjNzk4YzZiNTNl ZDgzMWFiMzVjNTQxZDJmMjIzYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmgKQEAgLTEwOSw3 ICsxMDksNyBAQCBwdWJsaWM6CiAgICAgICAgIGJvb2wgaGFzQ29sbGFwc2VkVHJhaWxpbmdXaGl0 ZXNwYWNlKCkgY29uc3QgeyByZXR1cm4gbV90cmFpbGluZ1doaXRlc3BhY2VUeXBlID09IFRyYWls aW5nV2hpdGVzcGFjZTo6Q29sbGFwc2VkOyB9CiAgICAgICAgIFRyYWlsaW5nV2hpdGVzcGFjZSB0 cmFpbGluZ1doaXRlc3BhY2VUeXBlKGNvbnN0IElubGluZVRleHRJdGVtJikgY29uc3Q7CiAgICAg ICAgIHZvaWQgcmVtb3ZlVHJhaWxpbmdXaGl0ZXNwYWNlKCk7Ci0gICAgICAgIHZvaWQgdmlzdWFs bHlDb2xsYXBzZVRyYWlsaW5nV2hpdGVzcGFjZSgpOworICAgICAgICBJbmxpbmVMYXlvdXRVbml0 IHZpc3VhbGx5Q29sbGFwc2VUcmFpbGluZ1doaXRlc3BhY2UoSW5saW5lTGF5b3V0VW5pdCB0cnlD b2xsYXBzaW5nVGhpc011Y2hTcGFjZSk7CiAKICAgICAgICAgYm9vbCBoYXNUcmFpbGluZ0xldHRl clNwYWNpbmcoKSBjb25zdDsKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCB0cmFpbGluZ0xldHRl clNwYWNpbmcoKSBjb25zdDsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBhYmViMTE1NjE3YWFiMTI5NjViMzIzZmYyMDM3YjEy N2ZjYjNiYjI2Li5kZmU2Njk1NWQxNzcxNTMzNmZhZTgzN2M5M2FjOTdkZmQ0YzUwZmRkIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMDctMDYgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUu Y29tPgorCisgICAgICAgIFtMRkNdW0lGQ10gQWRkIHN1cHBvcnQgZm9yIHBhcnRpYWxseSB0cmlt bWVkIHRyYWlsaW5nIHdoaXRlc3BhY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIyNzY4OAorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZp c3RvLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczogUHJvZ3Jlc3Npb25zLgorCiAyMDIx LTA3LTA1ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAg IExpdmUgVGV4dCBzaG91bGQgbm90IGJlIHZpc2libGUgaW4gdmlkZW8gdGh1bWJuYWlsIGltYWdl cyBiZWhpbmQgIlNraXAgQWQiIGJ1dHRvbiBvbiBZb3VUdWJlCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRl eCAxOTY5NmVmODUzZDZhYzQ1NzYxZDljYjEwZmEyZDE2YWE2YjQwOTYyLi5kNTIzMTA1OGJiY2Jh YTEzYjc3OTg1NGJhYWYwNGZiYzAxYjY3N2I1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0 RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTI2MTcs NyArMjYxNyw2IEBAIHdlYmtpdC5vcmcvYi8xOTUyNzUgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLXRleHQvd2hpdGUtc3BhY2UvdHJhCiB3ZWJraXQub3JnL2IvMTk1Mjc1 IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3doaXRlLXNwYWNl L3RhYi1zdG9wLXRocmVzaG9sZC0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0 Lm9yZy9iLzE5NTI3NSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4 dC93aGl0ZS1zcGFjZS9saW5lLWVkZ2Utd2hpdGUtc3BhY2UtY29sbGFwc2UtMDAxLmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8xOTUyNzUgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvd2hpdGUtc3BhY2UvdHJhaWxpbmctaWRlb2dyYXBo aWMtc3BhY2UtMDAzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8xOTUy NzUgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvd2hpdGUtc3Bh Y2Uvd2hpdGUtc3BhY2UtcHJlLXdyYXAtdHJhaWxpbmctc3BhY2VzLTAwMi5odG1sIFsgSW1hZ2VP bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTk1Mjc1IGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3doaXRlLXNwYWNlL3ByZS13cmFwLTAxNC5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTk1Mjc1IGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3doaXRlLXNwYWNlL3RleHQtc3BhY2UtdHJpbS10cmlt LWlubmVyLTAwMS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8xOTUyNzUg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvd2hpdGUtc3BhY2Uv dHJhaWxpbmctaWRlb2dyYXBoaWMtc3BhY2UtMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K QEAgLTQzNTQsNyArNDM1Myw2IEBAIHdlYmtpdC5vcmcvYi8yMTQyOTAgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvd2hpdGUtc3BhY2UvdHJhCiB3ZWJraXQub3Jn L2IvMjE0MjkwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3do aXRlLXNwYWNlL3RyYWlsaW5nLXNwYWNlLWFsaWduLXN0YXJ0LnRlbnRhdGl2ZS5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0MjkwIGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3doaXRlLXNwYWNlL3doaXRlLXNwYWNlLXByZS0wNTEu aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDI5MCBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4dC93aGl0ZS1zcGFjZS93aGl0ZS1zcGFj ZS1wcmUtMDUyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQyOTAg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvd2hpdGUtc3BhY2Uv d2hpdGUtc3BhY2UtcHJlLXdyYXAtdHJhaWxpbmctc3BhY2VzLTAwMS5odG1sIFsgSW1hZ2VPbmx5 RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0MjkwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy10ZXh0L3dvcmQtYm91bmRhcnkvd29yZC1ib3VuZGFyeS0wMDEuaHRtbCBb IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDI5MCBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4dC93b3JkLWJvdW5kYXJ5L3dvcmQtYm91bmRhcnkt MDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQyOTAgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvd29yZC1ib3VuZGFyeS93b3Jk LWJvdW5kYXJ5LTAwMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg== 433079 2021-07-07 14:35:40 -0700 2021-07-07 18:35:52 -0700 Patch bug-227688-20210707143539.patch text/plain 10271 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGI1YmU2NGJlNjdlYjFm MDgwY2MzMjgwMDNhYjc5Yzg3ZTBhYzZjOC4uNmNjNmM2YzA5ZDk1NTE0OTU1ZDRhMjM0ZmJjYjQz N2FlZTAzY2FkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA3LTA3ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkZCBzdXBw b3J0IGZvciBwYXJ0aWFsbHkgdHJpbW1lZCB0cmFpbGluZyB3aGl0ZXNwYWNlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjc2ODgKKworICAgICAgICBS ZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICBUaGlzIHBhdGNoIGZpeGVzIHRo ZSBjYXNlIHdoZW4gYXMgYSByZXN1bHQgb2YgdGhlIHBhcnRpYWxseSB0cmltbWVkIG92ZXJmbG93 IGNvbnRlbnQsCisgICAgICAgIHdlIGRvbid0IG5lZWQgdG8gY29uZGl0aW9uYWxseSBoYW5nIHRo ZSB0cmFpbGluZyBlbmQgYW55bW9yZS4KKworICAgICAgICBodHRwczovL2RyYWZ0cy5jc3N3Zy5v cmcvY3NzLXRleHQtMy8jdmFsZGVmLXdoaXRlLXNwYWNlLXByZQorICAgICAgICAiSWYgd2hpdGUt c3BhY2UgaXMgc2V0IHRvIHByZS13cmFwLCB0aGUgVUEgbXVzdCAodW5jb25kaXRpb25hbGx5KQor ICAgICAgICAuLi4KKyAgICAgICAgSXQgbWF5IGFsc28gdmlzdWFsbHkgY29sbGFwc2UgdGhlIGNo YXJhY3RlciBhZHZhbmNlIHdpZHRocyBvZiBhbnkgdGhhdCB3b3VsZCBvdGhlcndpc2Ugb3ZlcmZs b3cuIgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l TGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OnZpc3VhbGx5Q29sbGFw c2VQcmVXcmFwT3ZlcmZsb3dDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGlu ZTo6UnVuOjpyZW1vdmVUcmFpbGluZ1doaXRlc3BhY2UpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpMaW5lOjpSdW46OnZpc3VhbGx5Q29sbGFwc2VUcmFpbGluZ1doaXRlc3BhY2UpOgorICAg ICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaDoKKwog MjAyMS0wNy0wNiAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAg U2V0IGtWVENvbXByZXNzaW9uUHJvcGVydHlLZXlfTWF4S2V5RnJhbWVJbnRlcnZhbCBpbiBWaWRl b1NhbXBsZUJ1ZmZlckNvbXByZXNzb3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAKaW5kZXgg NGExZDI4ZTRiM2FlYWY3ZTI0ZjUyNzczZGJlNjUyZjQ1ZDllYjZkZS4uZWJjMTM3NjczMzlhYTBi YmI1MDgzNGE3Zjc4NjA3MDE0ZTgxNjcwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAK QEAgLTE0NCwyMiArMTQ0LDIxIEBAIHZvaWQgTGluZTo6dmlzdWFsbHlDb2xsYXBzZVByZVdyYXBP dmVyZmxvd0NvbnRlbnQoSW5saW5lTGF5b3V0VW5pdCBleHRyYUhvcml6b250CiAgICAgICAgIHJl dHVybjsKICAgICAvLyBMZXQncyBqdXN0IGZpbmQgdGhlIHRyYWlsaW5nIHByZS13cmFwIHdoaXRl c3BhY2UgY29udGVudCBmb3Igbm93IChlLmcgY2hlY2sgaWYgdGhlcmUgYXJlIG11bHRpcGxlIHRy YWlsaW5nIHJ1bnMgd2l0aAogICAgIC8vIGRpZmZlcmVudCBzZXQgb2Ygd2hpdGUtc3BhY2UgdmFs dWVzIGFuZCBkZWNpZGUgaWYgdGhlIGluLWJldHdlZW4gcHJlLXdyYXAgY29udGVudCBzaG91bGQg YmUgY29sbGFwc2VkIGFzIHdlbGwuKQotICAgIElubGluZUxheW91dFVuaXQgdHJpbW1lZENvbnRl bnRXaWR0aCA9IDA7CisgICAgYXV0byB0cmltbWVkQ29udGVudFdpZHRoID0gSW5saW5lTGF5b3V0 VW5pdCB7IH07CiAgICAgZm9yIChhdXRvJiBydW4gOiBXVEY6Om1ha2VSZXZlcnNlZFJhbmdlKG1f cnVucykpIHsKICAgICAgICAgaWYgKHJ1bi5zdHlsZSgpLndoaXRlU3BhY2UoKSAhPSBXaGl0ZVNw YWNlOjpQcmVXcmFwKSB7CiAgICAgICAgICAgICAvLyBXZSBhcmUgb25seSBpbnRlcmVzdGVkIGlu IHByZS13cmFwIHRyYWlsaW5nIGNvbnRlbnQuCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg fQotICAgICAgICBhdXRvIHByZVdyYXBWaXN1YWxseUNvbGxhcHNpYmxlSW5saW5lSXRlbSA9IHJ1 bi5pc0lubGluZUJveFN0YXJ0KCkgfHwgcnVuLmlzSW5saW5lQm94RW5kKCkgfHwgcnVuLmhhc1Ry YWlsaW5nV2hpdGVzcGFjZSgpOwotICAgICAgICBpZiAoIXByZVdyYXBWaXN1YWxseUNvbGxhcHNp YmxlSW5saW5lSXRlbSkKKyAgICAgICAgYXV0byB2aXN1YWxseUNvbGxhcHNpYmxlSW5saW5lSXRl bSA9IHJ1bi5pc0lubGluZUJveFN0YXJ0KCkgfHwgcnVuLmlzSW5saW5lQm94RW5kKCkgfHwgcnVu Lmhhc1RyYWlsaW5nV2hpdGVzcGFjZSgpOworICAgICAgICBpZiAoIXZpc3VhbGx5Q29sbGFwc2li bGVJbmxpbmVJdGVtKQogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIEFTU0VSVCghcnVuLmhh c0NvbGxhcHNpYmxlVHJhaWxpbmdXaGl0ZXNwYWNlKCkpOwotICAgICAgICBJbmxpbmVMYXlvdXRV bml0IHRyaW1tYWJsZVdpZHRoID0geyB9OworICAgICAgICBhdXRvIHRyaW1tYWJsZVdpZHRoID0g SW5saW5lTGF5b3V0VW5pdCB7IH07CiAgICAgICAgIGlmIChydW4uaXNUZXh0KCkpIHsKICAgICAg ICAgICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgYWx3YXlzIGNvbGxhcHNlIHRoZSBydW4gYXQgYSBn bHlwaCBib3VuZGFyeSBhcyB0aGUgc3BlYyBpbmRpY2F0ZXM6ICJjb2xsYXBzZSB0aGUgY2hhcmFj dGVyIGFkdmFuY2Ugd2lkdGhzIG9mIGFueSB0aGF0IHdvdWxkIG90aGVyd2lzZSBvdmVyZmxvdyIK ICAgICAgICAgICAgIC8vIGFuZCB0aGUgdHJpbW1lZCB3aWR0aCBzaG91bGQgYmUgY2FwcGVkIGF0 IHN0ZDo6bWluKHJ1bi50cmFpbGluZ1doaXRlc3BhY2VXaWR0aCgpLCBvdmVyZmxvd1dpZHRoKSBm b3IgdGV4dCBydW5zLiBCb3RoIEZGIGFuZCBDaHJvbWUgYWdyZWUuCi0gICAgICAgICAgICB0cmlt bWFibGVXaWR0aCA9IHJ1bi50cmFpbGluZ1doaXRlc3BhY2VXaWR0aCgpOwotICAgICAgICAgICAg cnVuLnZpc3VhbGx5Q29sbGFwc2VUcmFpbGluZ1doaXRlc3BhY2UoKTsKKyAgICAgICAgICAgIHRy aW1tYWJsZVdpZHRoID0gcnVuLnZpc3VhbGx5Q29sbGFwc2VUcmFpbGluZ1doaXRlc3BhY2Uob3Zl cmZsb3dXaWR0aCk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICB0cmltbWFibGVXaWR0 aCA9IHJ1bi5sb2dpY2FsV2lkdGgoKTsKICAgICAgICAgICAgIHJ1bi5zaHJpbmtIb3Jpem9udGFs bHkodHJpbW1hYmxlV2lkdGgpOwpAQCAtNDk3LDIxICs0OTYsMjcgQEAgdm9pZCBMaW5lOjpSdW46 OnJlbW92ZVRyYWlsaW5nV2hpdGVzcGFjZSgpCiAgICAgQVNTRVJUKG1fdGV4dENvbnRlbnQtPmxl bmd0aCgpKTsKICAgICBjb25zdGV4cHIgc2l6ZV90IHRyYWlsaW5nVHJpbW1hYmxlQ29udGVudExl bmd0aCA9IDE7CiAgICAgbV90ZXh0Q29udGVudC0+c2hyaW5rKHRyYWlsaW5nVHJpbW1hYmxlQ29u dGVudExlbmd0aCk7Ci0gICAgdmlzdWFsbHlDb2xsYXBzZVRyYWlsaW5nV2hpdGVzcGFjZSgpOwor ICAgIHZpc3VhbGx5Q29sbGFwc2VUcmFpbGluZ1doaXRlc3BhY2UobV90cmFpbGluZ1doaXRlc3Bh Y2VXaWR0aCk7CiB9CiAKLXZvaWQgTGluZTo6UnVuOjp2aXN1YWxseUNvbGxhcHNlVHJhaWxpbmdX aGl0ZXNwYWNlKCkKK0lubGluZUxheW91dFVuaXQgTGluZTo6UnVuOjp2aXN1YWxseUNvbGxhcHNl VHJhaWxpbmdXaGl0ZXNwYWNlKElubGluZUxheW91dFVuaXQgdHJ5Q29sbGFwc2luZ1RoaXNNdWNo U3BhY2UpCiB7CisgICAgQVNTRVJUKGhhc1RyYWlsaW5nV2hpdGVzcGFjZSgpKTsKICAgICAvLyBU aGlzIGlzIGp1c3QgYSB2aXN1YWwgYWRqdXN0bWVudCwgdGhlIHRleHQgbGVuZ3RoIHNob3VsZCBy ZW1haW4gdGhlIHNhbWUuCi0gICAgc2hyaW5rSG9yaXpvbnRhbGx5KG1fdHJhaWxpbmdXaGl0ZXNw YWNlV2lkdGgpOwotICAgIG1fdHJhaWxpbmdXaGl0ZXNwYWNlV2lkdGggPSB7IH07Ci0gICAgbV90 cmFpbGluZ1doaXRlc3BhY2VUeXBlID0gVHJhaWxpbmdXaGl0ZXNwYWNlOjpOb25lOwotCi0gICAg aWYgKG1fd2hpdGVzcGFjZUlzRXhwYW5zaW9uT3Bwb3J0dW5pdHkpIHsKLSAgICAgICAgQVNTRVJU KG1fZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCk7Ci0gICAgICAgIG1fZXhwYW5zaW9uT3Bwb3J0 dW5pdHlDb3VudC0tOworICAgIGF1dG8gdHJpbW1lZFdpZHRoID0gc3RkOjptaW4odHJ5Q29sbGFw c2luZ1RoaXNNdWNoU3BhY2UsIG1fdHJhaWxpbmdXaGl0ZXNwYWNlV2lkdGgpOworICAgIHNocmlu a0hvcml6b250YWxseSh0cmltbWVkV2lkdGgpOworICAgIG1fdHJhaWxpbmdXaGl0ZXNwYWNlV2lk dGggLT0gdHJpbW1lZFdpZHRoOworICAgIGlmICghbV90cmFpbGluZ1doaXRlc3BhY2VXaWR0aCkg eworICAgICAgICAvLyBXZSB0cmltbWVkIHRoZSB0cmFpbGluZyB3aGl0ZXNwYWNlIGNvbXBsZXRl bHkuCisgICAgICAgIG1fdHJhaWxpbmdXaGl0ZXNwYWNlVHlwZSA9IFRyYWlsaW5nV2hpdGVzcGFj ZTo6Tm9uZTsKKworICAgICAgICBpZiAobV93aGl0ZXNwYWNlSXNFeHBhbnNpb25PcHBvcnR1bml0 eSkgeworICAgICAgICAgICAgQVNTRVJUKG1fZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCk7Cisg ICAgICAgICAgICBtX2V4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQtLTsKKyAgICAgICAgfQorICAg ICAgICBzZXRFeHBhbnNpb25CZWhhdmlvcihBbGxvd0xlZnRFeHBhbnNpb24gfCBBbGxvd1JpZ2h0 RXhwYW5zaW9uKTsKICAgICB9Ci0gICAgc2V0RXhwYW5zaW9uQmVoYXZpb3IoQWxsb3dMZWZ0RXhw YW5zaW9uIHwgQWxsb3dSaWdodEV4cGFuc2lvbik7CisgICAgcmV0dXJuIHRyaW1tZWRXaWR0aDsK IH0KIAogdm9pZCBMaW5lOjpSdW46OnNldEV4cGFuc2lvbkJlaGF2aW9yKEV4cGFuc2lvbkJlaGF2 aW9yIGV4cGFuc2lvbkJlaGF2aW9yKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oCmluZGV4IDI0ZDRk NWMxMmI0NjUwNzIxZjkyMWI5MTY5MzY5MjQwMDc4Yjg4Y2IuLjUwZmViMGNmZDZjNzk4YzZiNTNl ZDgzMWFiMzVjNTQxZDJmMjIzYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmgKQEAgLTEwOSw3 ICsxMDksNyBAQCBwdWJsaWM6CiAgICAgICAgIGJvb2wgaGFzQ29sbGFwc2VkVHJhaWxpbmdXaGl0 ZXNwYWNlKCkgY29uc3QgeyByZXR1cm4gbV90cmFpbGluZ1doaXRlc3BhY2VUeXBlID09IFRyYWls aW5nV2hpdGVzcGFjZTo6Q29sbGFwc2VkOyB9CiAgICAgICAgIFRyYWlsaW5nV2hpdGVzcGFjZSB0 cmFpbGluZ1doaXRlc3BhY2VUeXBlKGNvbnN0IElubGluZVRleHRJdGVtJikgY29uc3Q7CiAgICAg ICAgIHZvaWQgcmVtb3ZlVHJhaWxpbmdXaGl0ZXNwYWNlKCk7Ci0gICAgICAgIHZvaWQgdmlzdWFs bHlDb2xsYXBzZVRyYWlsaW5nV2hpdGVzcGFjZSgpOworICAgICAgICBJbmxpbmVMYXlvdXRVbml0 IHZpc3VhbGx5Q29sbGFwc2VUcmFpbGluZ1doaXRlc3BhY2UoSW5saW5lTGF5b3V0VW5pdCB0cnlD b2xsYXBzaW5nVGhpc011Y2hTcGFjZSk7CiAKICAgICAgICAgYm9vbCBoYXNUcmFpbGluZ0xldHRl clNwYWNpbmcoKSBjb25zdDsKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCB0cmFpbGluZ0xldHRl clNwYWNpbmcoKSBjb25zdDsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBhYmViMTE1NjE3YWFiMTI5NjViMzIzZmYyMDM3YjEy N2ZjYjNiYjI2Li4xYjE0YmJmOTQwNTEwYjRhMGUzNTU2OWI3MzBjMzgxYjlkNDAxNDdlIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMDctMDcgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUu Y29tPgorCisgICAgICAgIFtMRkNdW0lGQ10gQWRkIHN1cHBvcnQgZm9yIHBhcnRpYWxseSB0cmlt bWVkIHRyYWlsaW5nIHdoaXRlc3BhY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIyNzY4OAorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZp c3RvLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczogUHJvZ3Jlc3Npb25zLgorCiAyMDIx LTA3LTA1ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAg IExpdmUgVGV4dCBzaG91bGQgbm90IGJlIHZpc2libGUgaW4gdmlkZW8gdGh1bWJuYWlsIGltYWdl cyBiZWhpbmQgIlNraXAgQWQiIGJ1dHRvbiBvbiBZb3VUdWJlCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRl eCAxOTY5NmVmODUzZDZhYzQ1NzYxZDljYjEwZmEyZDE2YWE2YjQwOTYyLi5kNTIzMTA1OGJiY2Jh YTEzYjc3OTg1NGJhYWYwNGZiYzAxYjY3N2I1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0 RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTI2MTcs NyArMjYxNyw2IEBAIHdlYmtpdC5vcmcvYi8xOTUyNzUgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLXRleHQvd2hpdGUtc3BhY2UvdHJhCiB3ZWJraXQub3JnL2IvMTk1Mjc1 IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3doaXRlLXNwYWNl L3RhYi1zdG9wLXRocmVzaG9sZC0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0 Lm9yZy9iLzE5NTI3NSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4 dC93aGl0ZS1zcGFjZS9saW5lLWVkZ2Utd2hpdGUtc3BhY2UtY29sbGFwc2UtMDAxLmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8xOTUyNzUgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvd2hpdGUtc3BhY2UvdHJhaWxpbmctaWRlb2dyYXBo aWMtc3BhY2UtMDAzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8xOTUy NzUgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvd2hpdGUtc3Bh Y2Uvd2hpdGUtc3BhY2UtcHJlLXdyYXAtdHJhaWxpbmctc3BhY2VzLTAwMi5odG1sIFsgSW1hZ2VP bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTk1Mjc1IGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3doaXRlLXNwYWNlL3ByZS13cmFwLTAxNC5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTk1Mjc1IGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3doaXRlLXNwYWNlL3RleHQtc3BhY2UtdHJpbS10cmlt LWlubmVyLTAwMS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8xOTUyNzUg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvd2hpdGUtc3BhY2Uv dHJhaWxpbmctaWRlb2dyYXBoaWMtc3BhY2UtMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K QEAgLTQzNTQsNyArNDM1Myw2IEBAIHdlYmtpdC5vcmcvYi8yMTQyOTAgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvd2hpdGUtc3BhY2UvdHJhCiB3ZWJraXQub3Jn L2IvMjE0MjkwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3do aXRlLXNwYWNlL3RyYWlsaW5nLXNwYWNlLWFsaWduLXN0YXJ0LnRlbnRhdGl2ZS5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0MjkwIGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L3doaXRlLXNwYWNlL3doaXRlLXNwYWNlLXByZS0wNTEu aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDI5MCBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4dC93aGl0ZS1zcGFjZS93aGl0ZS1zcGFj ZS1wcmUtMDUyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQyOTAg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvd2hpdGUtc3BhY2Uv d2hpdGUtc3BhY2UtcHJlLXdyYXAtdHJhaWxpbmctc3BhY2VzLTAwMS5odG1sIFsgSW1hZ2VPbmx5 RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0MjkwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy10ZXh0L3dvcmQtYm91bmRhcnkvd29yZC1ib3VuZGFyeS0wMDEuaHRtbCBb IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDI5MCBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtdGV4dC93b3JkLWJvdW5kYXJ5L3dvcmQtYm91bmRhcnkt MDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQyOTAgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvd29yZC1ib3VuZGFyeS93b3Jk LWJvdW5kYXJ5LTAwMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9pb3MvZmFzdC90ZXh0L3doaXRlc3BhY2UvcHJlLXdyYXAtb3ZlcmZs b3ctc2VsZWN0aW9uLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9mYXN0 L3RleHQvd2hpdGVzcGFjZS9wcmUtd3JhcC1vdmVyZmxvdy1zZWxlY3Rpb24tZXhwZWN0ZWQudHh0 CmluZGV4IDBlZTRhOTIyZTM0YmIzMTYwMzJlZDQyMzExMzQ0MWFlMmNkM2I4MTguLjg2OTBjMjg0 OGM1NDc5MzRkZGQ4ODMwZWYxZWQ5ZDI1YTYxYjliMDQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L3BsYXRmb3JtL2lvcy9mYXN0L3RleHQvd2hpdGVzcGFjZS9wcmUtd3JhcC1vdmVyZmxvdy1zZWxl Y3Rpb24tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9mYXN0L3Rl eHQvd2hpdGVzcGFjZS9wcmUtd3JhcC1vdmVyZmxvdy1zZWxlY3Rpb24tZXhwZWN0ZWQudHh0CkBA IC0yMSw4ICsyMSw4IEBAIGxheWVyIGF0ICgwLDApIHNpemUgODAweDYwMAogICAgICAgUmVuZGVy QmxvY2sge0hSfSBhdCAoMCw5Mikgc2l6ZSA3ODR4MiBbYm9yZGVyOiAoMXB4IGluc2V0ICMwMDAw MDApXQogICAgICAgUmVuZGVyQmxvY2sge0hSfSBhdCAoMCwxOTgpIHNpemUgNzg0eDIgW2JvcmRl cjogKDFweCBpbnNldCAjMDAwMDAwKV0KICAgICAgIFJlbmRlckJsb2NrIHtQUkV9IGF0ICgwLDIx Mykgc2l6ZSAxMDh4NzggW2JvcmRlcjogKDRweCBzb2xpZCAjMDAwMEZGKV0KLSAgICAgICAgUmVu ZGVyVGV4dCB7I3RleHR9IGF0ICg0LDQpIHNpemUgOTR4NzAKLSAgICAgICAgICB0ZXh0IHJ1biBh dCAoNCw0KSB3aWR0aCA4NjogIlRoaXMgICB0ZXh0ICAgICAiCisgICAgICAgIFJlbmRlclRleHQg eyN0ZXh0fSBhdCAoNCw0KSBzaXplIDEwMHg3MAorICAgICAgICAgIHRleHQgcnVuIGF0ICg0LDQp IHdpZHRoIDEwMDogIlRoaXMgICB0ZXh0ICAgICAiCiAgICAgICAgICAgdGV4dCBydW4gYXQgKDQs MTgpIHdpZHRoIDcxOiAid2lsbCB3cmFwIgogICAgICAgICAgIHRleHQgcnVuIGF0ICg3NCwxOCkg d2lkdGggMTogIiAiCiAgICAgICAgICAgdGV4dCBydW4gYXQgKDQsMzIpIHdpZHRoIDk0OiAiYW5k ICAgZml0ICAgIgo=