231388 2021-10-07 13:24:42 -0700 [WebKitBot] Land local changes on production host 2021-10-07 14:22:48 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard webkit-bug-importer ysuzuki oldest_to_newest 1801753 0 jbedard 2021-10-07 13:24:42 -0700 There are some local changes WebKitBot has been running with that haven't been landed, we should land those changes. 1801754 1 webkit-bug-importer 2021-10-07 13:25:06 -0700 <rdar://problem/83996428> 1801756 2 440533 jbedard 2021-10-07 13:27:08 -0700 Created attachment 440533 Patch 1801757 3 440533 ysuzuki 2021-10-07 13:29:06 -0700 Comment on attachment 440533 Patch r=me 1801786 4 ews-feeder 2021-10-07 14:22:46 -0700 Committed r283743 (242665@main): <https://commits.webkit.org/242665@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440533. 440533 2021-10-07 13:27:08 -0700 2021-10-07 14:22:47 -0700 Patch bug-231388-20211007132707.patch text/plain 11071 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNzMyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjUyZTVmNzc5MDdhMWRkNWQwNjJhNDM5YzUyZTU0Y2Q3 YjJmYmRmOS4uNDZkYzc3ODE2YTU2NDdmMDZjODI4ZDYwZWQxYTgwYmNkZGZlNzY5YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIxLTEwLTA3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbV2ViS2l0Qm90XSBMYW5kIGxvY2FsIGNoYW5nZXMgb24gcHJvZHVjdGlvbiBob3N0 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzEzODgK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgzOTk2NDI4PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0Qm90L3NyYy9Db21taXQubWpzOiBB ZGQgU2xhY2sgSUQgaW50ZWdyYXRpb24uCisgICAgICAgICogV2ViS2l0Qm90L3NyYy9Db250cmli dXRvcnMubWpzOiBEaXR0by4KKyAgICAgICAgKiBXZWJLaXRCb3Qvc3JjL1V0aWxpdHkubWpzOgor ICAgICAgICAqIFdlYktpdEJvdC9zcmMvV2ViS2l0Qm90Lm1qczogQWRkICJoaSIgYW5kICJ5dCIg Y29tbWFuZHMuCisgICAgICAgICogV2ViS2l0Qm90L3NyYy9pbmRleC5tanM6IAorCiAyMDIxLTEw LTA3ICBCSiBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IFdlYkluc3BlY3RvckV4dGVuc2lvblRhYkNvbnRlbnRWaWV3IHNob3VsZCBub3QgcmVsb2FkIGl0 cyBpZnJhbWUgd2hlbiBkZXRhY2hlZApkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0Qm90L3NyYy9D b21taXQubWpzIGIvVG9vbHMvV2ViS2l0Qm90L3NyYy9Db21taXQubWpzCmluZGV4IDVjMWM3MGQ4 MTU3MDg1MzEzNmJkZmE4OGJmYTFlOWViZjMyY2Q1MGIuLjcxNzcxODExNDI2Y2UxNjllZGZkODJj ZGNiNmQyYjljZTkwMmZkNmEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdEJvdC9zcmMvQ29tbWl0 Lm1qcworKysgYi9Ub29scy9XZWJLaXRCb3Qvc3JjL0NvbW1pdC5tanMKQEAgLTc4LDggKzc4LDEy IEBAIGV4cG9ydCBkZWZhdWx0IGNsYXNzIENvbW1pdCB7CiAgICAgICAgICAgICB0aGlzLl9hdXRo b3IgPSB0aGlzLl9lbWFpbDsKICAgICAgICAgICAgIGlmICh0aGlzLl9lbWFpbCkgewogICAgICAg ICAgICAgICAgIGxldCBlbnRyeSA9IGNvbnRyaWJ1dG9ycy5xdWVyeVdpdGhFbWFpbCh0aGlzLl9l bWFpbCk7Ci0gICAgICAgICAgICAgICAgaWYgKGVudHJ5ICYmIGVudHJ5Lm5pY2tzICYmIGVudHJ5 Lm5pY2tzWzBdKQotICAgICAgICAgICAgICAgICAgICB0aGlzLl9hdXRob3IgPSBgJHtlbnRyeS5u YW1lfSAoQCR7ZW50cnkubmlja3NbMF19KWA7CisgICAgICAgICAgICAgICAgaWYgKGVudHJ5KSB7 CisgICAgICAgICAgICAgICAgICAgIGlmIChlbnRyeS5uaWNrcyAmJiBlbnRyeS5uaWNrc1swXSkK KyAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMuX2F1dGhvciA9IGAke2VudHJ5Lm5hbWV9IChA JHtlbnRyeS5uaWNrc1swXX0pYDsKKyAgICAgICAgICAgICAgICAgICAgaWYgKGVudHJ5LnNsYWNr SWQpCisgICAgICAgICAgICAgICAgICAgICAgICB0aGlzLl9hdXRob3JTbGFja0lkID0gZW50cnku c2xhY2tJZDsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAg ICAgICAgaWYgKHRoaXMuX3JldmVydCkgewpAQCAtMTA3LDEzICsxMTEsMTcgQEAgZXhwb3J0IGRl ZmF1bHQgY2xhc3MgQ29tbWl0IHsKICAgICBnZXQgcmFkYXIoKSB7IHJldHVybiB0aGlzLl9yYWRh cjsgfQogICAgIGdldCB0aXRsZSgpIHsgcmV0dXJuIHRoaXMuX3RpdGxlOyB9CiAgICAgZ2V0IGF1 dGhvcigpIHsgcmV0dXJuIHRoaXMuX2F1dGhvcjsgfQorICAgIGdldCBhdXRob3JTbGFja0lkKCkg eyByZXR1cm4gdGhpcy5fYXV0aG9yU2xhY2tJZDsgfQogICAgIGdldCB1cmwoKSB7IHJldHVybiB0 aGlzLl91cmw7IH0KIAogICAgIG1lc3NhZ2UoKQogICAgIHsKICAgICAgICAgbGV0IHJlc3VsdHMg PSBbXTsKICAgICAgICAgcmVzdWx0cy5wdXNoKGVzY2FwZUZvclNsYWNrVGV4dChgJHt0aGlzLl90 aXRsZX1gKSk7Ci0gICAgICAgIHJlc3VsdHMucHVzaChlc2NhcGVGb3JTbGFja1RleHQoYCR7dGhp cy5fdXJsfSBieSAke3RoaXMuX2F1dGhvcn1gKSk7CisgICAgICAgIGlmICghdGhpcy5fYXV0aG9y U2xhY2tJZCkKKyAgICAgICAgICAgIHJlc3VsdHMucHVzaChlc2NhcGVGb3JTbGFja1RleHQoYCR7 dGhpcy5fdXJsfSBieSAke3RoaXMuX2F1dGhvcn1gKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAg ICAgIHJlc3VsdHMucHVzaChgJHtlc2NhcGVGb3JTbGFja1RleHQodGhpcy5fdXJsKX0gYnkgPEAk e3RoaXMuX2F1dGhvclNsYWNrSWR9PmApOwogICAgICAgICBsZXQgdXJscyA9IFtdOwogICAgICAg ICBpZiAodGhpcy5fYnVnemlsbGEgIT09IG51bGwpCiAgICAgICAgICAgICB1cmxzLnB1c2goZXNj YXBlRm9yU2xhY2tUZXh0KGBodHRwczovL3dlYmtpdC5vcmcvYi8ke3RoaXMuX2J1Z3ppbGxhfWAp KTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdEJvdC9zcmMvQ29udHJpYnV0b3JzLm1qcyBiL1Rv b2xzL1dlYktpdEJvdC9zcmMvQ29udHJpYnV0b3JzLm1qcwppbmRleCAzMjczZTRiOWU1M2ZiZDll ODdlM2Y3YjNlMTIwZWE4OGRlYWRmMzFkLi4xYTJiY2ZmYWVhN2E4YjRmYzlkNTJlYTVhOTEwNWRm MmQ5M2ExZDI1IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRCb3Qvc3JjL0NvbnRyaWJ1dG9ycy5t anMKKysrIGIvVG9vbHMvV2ViS2l0Qm90L3NyYy9Db250cmlidXRvcnMubWpzCkBAIC00OSw0ICs0 OSwxMyBAQCBleHBvcnQgZGVmYXVsdCBjbGFzcyBDb250cmlidXRvcnMgewogICAgIHsKICAgICAg ICAgcmV0dXJuIHRoaXMuZW1haWxzLmdldChlbWFpbCk7CiAgICAgfQorCisgICAgcXVlcnlXaXRo U2xhY2tJZChzbGFja0lkKQorICAgIHsKKyAgICAgICAgZm9yIChsZXQgZW50cnkgb2YgdGhpcy5l bWFpbHMudmFsdWVzKCkpIHsKKyAgICAgICAgICAgIGlmIChlbnRyeS5zbGFja0lkID09PSBzbGFj a0lkKQorICAgICAgICAgICAgICAgIHJldHVybiBlbnRyeTsKKyAgICAgICAgfQorICAgICAgICBy ZXR1cm4gbnVsbDsKKyAgICB9CiB9CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRCb3Qvc3JjL1V0 aWxpdHkubWpzIGIvVG9vbHMvV2ViS2l0Qm90L3NyYy9VdGlsaXR5Lm1qcwppbmRleCA2NTQ0MmYz OTRiYzMzYjUyMDY3ZDhjMGM3NmRkOTVjYTk3ZjA5NWU0Li5hNjM3NzIwOGRjNmNmNzE4ZDY5MDE3 ODdjZTMwZGIzODI2Mjk1ODQ4IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRCb3Qvc3JjL1V0aWxp dHkubWpzCisrKyBiL1Rvb2xzL1dlYktpdEJvdC9zcmMvVXRpbGl0eS5tanMKQEAgLTMxLDExICsz MSw5IEBAIGV4cG9ydCBmdW5jdGlvbiBlc2NhcGVGb3JTbGFja1RleHQodGV4dCkKICAgICByZXR1 cm4gdGV4dC5yZXBsYWNlKCImIiwgIiZhbXA7IikucmVwbGFjZSgiPCIsICImbHQ7IikucmVwbGFj ZSgiPiIsICImZ3Q7Iik7CiB9CiAKLWNvbnN0IERFQlVHID0gZmFsc2U7Ci0KIGV4cG9ydCBmdW5j dGlvbiBkYXRhTG9nTG4obWVzc2FnZSkKIHsKLSAgICBpZiAoREVCVUcpCisgICAgaWYgKHByb2Nl c3MuZW52LkRFQlVHKQogICAgICAgICBjb25zb2xlLmxvZyhtZXNzYWdlKTsKIH0KIApkaWZmIC0t Z2l0IGEvVG9vbHMvV2ViS2l0Qm90L3NyYy9XZWJLaXRCb3QubWpzIGIvVG9vbHMvV2ViS2l0Qm90 L3NyYy9XZWJLaXRCb3QubWpzCmluZGV4IDY2NWMzNGI3ZDk5NDY4NGFlYmQ0YTViMDUwZWM0YTBk OGMwZWEwZTMuLmQ4Y2ExZjA2NjE5YjUzOTQ2NDBhZjkzOTY5ODlmYTNiZWNkMGJlNDkgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1dlYktpdEJvdC9zcmMvV2ViS2l0Qm90Lm1qcworKysgYi9Ub29scy9XZWJL aXRCb3Qvc3JjL1dlYktpdEJvdC5tanMKQEAgLTIzLDYgKzIzLDcgQEAKICAqIE9GIFRISVMgU09G VFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0Uu CiAgKi8KIAoraW1wb3J0IHtzdGF0fSBmcm9tICJmcyI7CiBpbXBvcnQgcGF0aCBmcm9tICJwYXRo IjsKIGltcG9ydCB1dGlsIGZyb20gInV0aWwiOwogaW1wb3J0IHtleGVjRmlsZSwgc3Bhd259IGZy b20gImNoaWxkX3Byb2Nlc3MiOwpAQCAtMzAsMTIgKzMxLDEyIEBAIGltcG9ydCBTbGFja1JUTUFQ SSBmcm9tICJAc2xhY2svcnRtLWFwaSI7CiBpbXBvcnQgQXN5bmNUYXNrUXVldWUgZnJvbSAiLi9B c3luY1Rhc2tRdWV1ZS5tanMiOwogaW1wb3J0IHtkYXRhTG9nTG4sIGVzY2FwZUZvclNsYWNrVGV4 dCwgaXNBU0NJSSwgcm9vdERpcmVjdG9yeU9mV2ViS2l0fSBmcm9tICIuL1V0aWxpdHkubWpzIjsK IAotY29uc3Qgd2Via2l0UGF0Y2hQYXRoID0gcGF0aC5yZXNvbHZlKHJvb3REaXJlY3RvcnlPZldl YktpdCgpLCAiVG9vbHMiLCAiU2NyaXB0cyIsICJ3ZWJraXQtcGF0Y2giKTsKIGNvbnN0IGRlZmF1 bHRUYXNrTGltaXQgPSAxMDsKIGNvbnN0IGRlZmF1bHRQdWxsUGVyaW9kID0gNjAgKiAxMDAwICog NjA7CiBjb25zdCBkZWZhdWx0VGltZW91dEZvclJldmVydCA9IDYwICogMTAwMCAqIDEwOwogCiBj b25zdCBleGVjRmlsZUFzeW5jID0gdXRpbC5wcm9taXNpZnkoZXhlY0ZpbGUpOworY29uc3Qgc3Rh dEFzeW5jID0gdXRpbC5wcm9taXNpZnkoc3RhdCk7CiAKIGZ1bmN0aW9uIHBhcnNlQnVnSWQoc3Ry aW5nKQogewpAQCAtMTczLDYgKzE3NCwxNyBAQCBlLmcuIFxgZHJ5LXJldmVydCAyNjAyMjAgRW5z dXJlIGl0IGlzIHdvcmtpbmcgYWZ0ZXIgcmVmYWN0b3JpbmdcYAogICAgICAgICAgICAgdXNhZ2U6 ICJgc3RhdHVzYCIsCiAgICAgICAgICAgICBvcGVyYXRpb246IHRoaXMuc3RhdHVzQ29tbWFuZC5i aW5kKHRoaXMpLAogICAgICAgICB9KTsKKyAgICAgICAgdGhpcy5fY29tbWFuZHMuc2V0KCJoaSIs IHsKKyAgICAgICAgICAgIGRlc2NyaXB0aW9uOiAiUmVzcG9uZHMgd2l0aCBoaS4iLAorICAgICAg ICAgICAgdXNhZ2U6ICJgaGlgIiwKKyAgICAgICAgICAgIG9wZXJhdGlvbjogdGhpcy5oaUNvbW1h bmQuYmluZCh0aGlzKSwKKyAgICAgICAgfSk7CisgICAgICAgIHRoaXMuX2NvbW1hbmRzLnNldCgi eXQ/IiwgeworICAgICAgICAgICAgZGVzY3JpcHRpb246ICJSZXNwb25kcyB3aXRoIHllcy4iLAor ICAgICAgICAgICAgdXNhZ2U6ICJgeXQ/YCIsCisgICAgICAgICAgICBvcGVyYXRpb246IHRoaXMu eW91VGhlcmVDb21tYW5kLmJpbmQodGhpcyksCisgICAgICAgIH0pOworCiAKICAgICAgICAgdGhp cy5fcnRtID0gbmV3IFNsYWNrUlRNQVBJLlJUTUNsaWVudChwcm9jZXNzLmVudi5TTEFDS19UT0tF Tik7CiAgICAgICAgIHRoaXMuX3J0bS5vbigibWVzc2FnZSIsIGFzeW5jIChldmVudCkgPT4gewpA QCAtMjMwLDkgKzI0Miw1NCBAQCBlLmcuIFxgZHJ5LXJldmVydCAyNjAyMjAgRW5zdXJlIGl0IGlz IHdvcmtpbmcgYWZ0ZXIgcmVmYWN0b3JpbmdcYAogICAgICAgICAgICAgICAgIH0pOwogICAgICAg ICAgICAgfSBjYXRjaCAoZXJyb3IpIHsKICAgICAgICAgICAgICAgICBjb25zb2xlLmVycm9yKGVy cm9yKTsKKyAgICAgICAgICAgICAgICBsZXQgc3RkZXJyID0gZXJyb3Iuc3RkZXJyOworICAgICAg ICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIlNUREVSUiAiLCBzdGRlcnIpOworICAgICAgICAgICAg ICAgIGlmICh0eXBlb2Ygc3RkZXJyID09PSAic3RyaW5nIikgeworICAgICAgICAgICAgICAgICAg ICB7CisgICAgICAgICAgICAgICAgICAgICAgICBsZXQgaW5kZXggPSBzdGRlcnIuaW5kZXhPZigi RmFpbGVkIHRvIGFwcGx5IHJldmVyc2UgZGlmZiBmb3IgcmV2aXNpb24iKTsKKyAgICAgICAgICAg ICAgICAgICAgICAgIGlmIChpbmRleCAhPT0gLTEpIHsKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICBsZXQgbGluZXMgPSBzdGRlcnIuc2xpY2UoaW5kZXgpLnNwbGl0KCJcbiIpOworICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGxpbmVzLnNoaWZ0KCk7CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbGV0IGZpbGVzID0gW107CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgZm9y IChsZXQgbGluZSBvZiBsaW5lcykgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0 cnkgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXdhaXQgc3RhdEFzeW5j KHBhdGguam9pbihwcm9jZXNzLmVudi53ZWJraXRXb3JraW5nRGlyZWN0b3J5LCBsaW5lKSk7Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmaWxlcy5wdXNoKGxpbmUpOworICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9IGNhdGNoIHsKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIC8vIFRIaXMgaXMgbm90IGEgZmlsZS4KKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB9CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGlmIChmaWxlcy5sZW5ndGggIT09IDApIHsKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgYXdhaXQgdGhpcy5fd2ViLmNoYXQucG9zdE1lc3NhZ2UoeworICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY2hhbm5lbDogZXZlbnQuY2hhbm5lbCwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRleHQ6IGA8QCR7ZXZlbnQudXNlcn0+IEZh aWxlZCB0byBjcmVhdGUgcmV2ZXJ0IHBhdGNoIGJlY2F1c2Ugb2YgdGhlIGZvbGxvd2luZyBjb25m bGljdHM6CitcYFxgXGAKKyR7ZXNjYXBlRm9yU2xhY2tUZXh0KGZpbGVzLmpvaW4oIlxuIikpfVxg XGBcYGAsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgICAgICAgICAgICAg fQorICAgICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICB9CisgICAg ICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGxldCBpbmRleCA9IHN0 ZGVyci5pbmRleE9mKCJZb3UgYXJlIG5vdCBhdXRob3JpemVkIHRvIGFjY2VzcyBidWciKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgIGlmIChpbmRleCAhPT0gLTEpIHsKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICBsZXQgbGluZSA9IHN0ZGVyci5zbGljZShpbmRleCkuc3BsaXQoIlxuIilb MF0udHJpbSgpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxldCBtYXRjaGVkID0gLyMo XGQrKS8ubWF0Y2gobGluZSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXdhaXQgdGhp cy5fd2ViLmNoYXQucG9zdE1lc3NhZ2UoeworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjaGFubmVsOiBldmVudC5jaGFubmVsLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB0ZXh0OiBgPEAke2V2ZW50LnVzZXJ9PiBGYWlsZWQgdG8gY3JlYXRlIHJldmVydCBwYXRjaC4g UGxlYXNlIGVuc3VyZSBjb21taXQtcXVldWVAd2Via2l0Lm9yZyBpcyBhdXRob3JpemVkIHRvIGFj Y2VzcyAke21hdGNoZWQgPyAoImJ1ZyAiICsgZXNjYXBlRm9yU2xhY2tUZXh0KG1hdGNoZWRbMV0p KSA6ICJ0aGUgYnVnIn0uYAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0pOworICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICAgICAgICAgIH0K KworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAg ICAgIGF3YWl0IHRoaXMuX3dlYi5jaGF0LnBvc3RNZXNzYWdlKHsKICAgICAgICAgICAgICAgICAg ICAgY2hhbm5lbDogZXZlbnQuY2hhbm5lbCwKLSAgICAgICAgICAgICAgICAgICAgdGV4dDogYDxA JHtldmVudC51c2VyfT4gRmFpbGVkIHRvIGNyZWF0ZSByZXZlcnQgcGF0Y2guYCwKKyAgICAgICAg ICAgICAgICAgICAgdGV4dDogYDxAJHtldmVudC51c2VyfT4gRmFpbGVkIHRvIGNyZWF0ZSByZXZl cnQgcGF0Y2guYCArIChzdGRlcnIgPyBgCitcYFxgXGAKKyR7ZXNjYXBlRm9yU2xhY2tUZXh0KHN0 ZGVycil9XGBcYFxgYCA6ICIiKSwKICAgICAgICAgICAgICAgICB9KTsKICAgICAgICAgICAgIH0K ICAgICAgICAgICAgIHJldHVybjsKQEAgLTMyNiw3ICszODMsMjMgQEAgVHlwZSBcYGhlbHAgQ09N TUFORFxgIGZvciBoZWxwIG9uIG15IGluZGl2aWR1YWwgY29tbWFuZHMuYCwKICAgICB7CiAgICAg ICAgIGF3YWl0IHRoaXMuX3dlYi5jaGF0LnBvc3RNZXNzYWdlKHsKICAgICAgICAgICAgIGNoYW5u ZWw6IGV2ZW50LmNoYW5uZWwsCi0gICAgICAgICAgICB0ZXh0OiBgPEAke2V2ZW50LnVzZXJ9PiAk e2VzY2FwZUZvclNsYWNrVGV4dCh0aGlzLl90YXNrUXVldWUubGVuZ3RoKX0gcmVxdWVzdHMgaW4g cXVldWUuYCwKKyAgICAgICAgICAgIHRleHQ6IGA8QCR7ZXZlbnQudXNlcn0+ICR7ZXNjYXBlRm9y U2xhY2tUZXh0KFN0cmluZyh0aGlzLl90YXNrUXVldWUubGVuZ3RoKSl9IHJlcXVlc3RzIGluIHF1 ZXVlLmAsCisgICAgICAgIH0pOworICAgIH0KKworICAgIGFzeW5jIGhpQ29tbWFuZChldmVudCwg Y29tbWFuZCwgYXJncykKKyAgICB7CisgICAgICAgIGF3YWl0IHRoaXMuX3dlYi5jaGF0LnBvc3RN ZXNzYWdlKHsKKyAgICAgICAgICAgIGNoYW5uZWw6IGV2ZW50LmNoYW5uZWwsCisgICAgICAgICAg ICB0ZXh0OiBgSGkgPEAke2V2ZW50LnVzZXJ9PiFgLAorICAgICAgICB9KTsKKyAgICB9CisKKyAg ICBhc3luYyB5b3VUaGVyZUNvbW1hbmQoZXZlbnQsIGNvbW1hbmQsIGFyZ3MpCisgICAgeworICAg ICAgICBhd2FpdCB0aGlzLl93ZWIuY2hhdC5wb3N0TWVzc2FnZSh7CisgICAgICAgICAgICBjaGFu bmVsOiBldmVudC5jaGFubmVsLAorICAgICAgICAgICAgdGV4dDogYDxAJHtldmVudC51c2VyfT4g eWVzYCwKICAgICAgICAgfSk7CiAgICAgfQogCkBAIC0zNjUsNyArNDM4LDcgQEAgVHlwZSBcYGhl bHAgQ09NTUFORFxgIGZvciBoZWxwIG9uIG15IGluZGl2aWR1YWwgY29tbWFuZHMuYCwKICAgICAg ICAgYXdhaXQgdGhpcy5leGVjSW5XZWJLaXREaXJlY3RvcnlTaW1wbGUoImdpdCIsIFsiY2xlYW4i LCAiLWRmIl0pOwogCiAgICAgICAgIGRhdGFMb2dMbigiMy4gUHVsbGluZyIpOwotICAgICAgICBh d2FpdCB0aGlzLmV4ZWNJbldlYktpdERpcmVjdG9yeVNpbXBsZSgiZ2l0IiwgWyJwdWxsIiwgIm9y aWdpbiIsICJtYXN0ZXIiXSk7CisgICAgICAgIGF3YWl0IHRoaXMuZXhlY0luV2ViS2l0RGlyZWN0 b3J5U2ltcGxlKCJnaXQiLCBbInB1bGwiXSk7CiAKICAgICAgICAgZGF0YUxvZ0xuKCI0LiBGZXRj aGluZyIpOwogICAgICAgICBhd2FpdCB0aGlzLmV4ZWNJbldlYktpdERpcmVjdG9yeVNpbXBsZSgi Z2l0IiwgWyJzdm4iLCAiZmV0Y2giXSk7CkBAIC0zODksNiArNDYyLDcgQEAgVHlwZSBcYGhlbHAg Q09NTUFORFxgIGZvciBoZWxwIG9uIG15IGluZGl2aWR1YWwgY29tbWFuZHMuYCwKICAgICAgICAg ZGF0YUxvZ0xuKCI1LiBDcmVhdGluZyByZXZlcnQgcGF0Y2ggIiwgcmV2aXNpb25zLCByZWFzb24p OwogICAgICAgICBsZXQgcmVzdWx0czsKICAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgIGNvbnN0 IHdlYmtpdFBhdGNoUGF0aCA9IHBhdGgucmVzb2x2ZSgiQm90V2ViS2l0IiwgIlRvb2xzIiwgIlNj cmlwdHMiLCAid2Via2l0LXBhdGNoIik7CiAgICAgICAgICAgICByZXN1bHRzID0gYXdhaXQgZXhl Y0ZpbGVBc3luYyh3ZWJraXRQYXRjaFBhdGgsIFsKICAgICAgICAgICAgICAgICAiY3JlYXRlLXJl dmVydCIsCiAgICAgICAgICAgICAgICAgIi0tZm9yY2UtY2xlYW4iLApAQCAtNDEyLDcgKzQ4Niw5 IEBAIFR5cGUgXGBoZWxwIENPTU1BTkRcYCBmb3IgaGVscCBvbiBteSBpbmRpdmlkdWFsIGNvbW1h bmRzLmAsCiAgICAgICAgICAgICB9KTsKICAgICAgICAgfSBjYXRjaCAoZXJyb3IpIHsKICAgICAg ICAgICAgIGRhdGFMb2dMbihlcnJvcik7Ci0gICAgICAgICAgICB0aHJvdyBuZXcgRXJyb3IoIlJl dmVydCBjb21tYW5kIGZhaWxlZCIpOworICAgICAgICAgICAgbGV0IG5ld0Vycm9yID0gbmV3IEVy cm9yKCJSZXZlcnQgY29tbWFuZCBmYWlsZWQiKTsKKyAgICAgICAgICAgIG5ld0Vycm9yLnN0ZGVy ciA9IGVycm9yLnN0ZGVycjsKKyAgICAgICAgICAgIHRocm93IG5ld0Vycm9yOwogICAgICAgICB9 CiAgICAgICAgIGxldCB7c3Rkb3V0LCBzdGRlcnJ9ID0gcmVzdWx0czsKICAgICAgICAgZGF0YUxv Z0xuKHN0ZG91dCk7CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRCb3Qvc3JjL2luZGV4Lm1qcyBi L1Rvb2xzL1dlYktpdEJvdC9zcmMvaW5kZXgubWpzCmluZGV4IGRiZjUzYTI4OWQ5YWExMGY1ODVk MTE5NWU3NTU4MmZhODliNTZkYTkuLjI5NzkxNmI2ZmIyZjVkY2ViNDc4MjRjNDM1YTJkMjllNTFh ZTAzMDUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdEJvdC9zcmMvaW5kZXgubWpzCisrKyBiL1Rv b2xzL1dlYktpdEJvdC9zcmMvaW5kZXgubWpzCkBAIC0yNSw3ICsyNSw2IEBACiAKIGltcG9ydCBk b3RlbnYgZnJvbSAiZG90ZW52IjsKIGltcG9ydCBzdG9yYWdlIGZyb20gIm5vZGUtcGVyc2lzdCI7 Ci1pbXBvcnQgV0tSIGZyb20gIi4vV0tSLm1qcyI7CiBpbXBvcnQgV2ViS2l0Qm90IGZyb20gIi4v V2ViS2l0Qm90Lm1qcyI7CiBpbXBvcnQgU2xhY2tXZWJBUEkgZnJvbSAiQHNsYWNrL3dlYi1hcGki OwogCkBAIC0zOSw3ICszOCw2IEBAIGFzeW5jIGZ1bmN0aW9uIG1haW4oKSB7CiAgICAgbGV0IHdl YkNsaWVudCA9IG5ldyBTbGFja1dlYkFQSS5XZWJDbGllbnQocHJvY2Vzcy5lbnYuU0xBQ0tfVE9L RU4pOwogICAgIGxldCBhdXRoID0gYXdhaXQgd2ViQ2xpZW50LmF1dGgudGVzdCgpOwogCi0gICAg V0tSLm1haW4od2ViQ2xpZW50LCBhdXRoKTsKICAgICBXZWJLaXRCb3QubWFpbih3ZWJDbGllbnQs IGF1dGgpOwogfQogCg==