210605 2020-04-16 07:00:11 -0700 REGRESSION(r259480): Two new failing i18n tests 2020-04-16 21:58:12 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build PC Linux RESOLVED FIXED InRadar P2 Normal --- 1 mcatanzaro ross.kirsling clopez darin ews-watchlist keith_miller mark.lam mcatanzaro msaboff ross.kirsling saam tpopela tzagallo webkit-bug-importer oldest_to_newest 1642239 0 mcatanzaro 2020-04-16 07:00:11 -0700 Running stress/intl-datetimeformat.js.default stress/intl-datetimeformat.js.default: Exception: Error: expected Etc/UTC but got UTC stress/intl-datetimeformat.js.default: shouldBe@intl-datetimeformat.js:3:24 stress/intl-datetimeformat.js.default: global code@intl-datetimeformat.js:245:9 stress/intl-datetimeformat.js.default: ERROR: Unexpected exit code: 3 FAIL: stress/intl-datetimeformat.js.default Running stress/intl-datetimeformat.js.mini-mode stress/intl-datetimeformat.js.mini-mode: Exception: Error: expected Etc/UTC but got UTC stress/intl-datetimeformat.js.mini-mode: shouldBe@intl-datetimeformat.js:3:24 stress/intl-datetimeformat.js.mini-mode: global code@intl-datetimeformat.js:245:9 stress/intl-datetimeformat.js.mini-mode: ERROR: Unexpected exit code: 3 FAIL: stress/intl-datetimeformat.js.mini-mode And these two tests expect UTC to be named differently. These tests starting failing in our internal nightly CI on April 3 (sorry for delay), so it's surely due to r259480 "Move Intl tests from LayoutTests to JSTests." The failing check is: // Default time zone is a valid canonical time zone. shouldBe(Intl.DateTimeFormat('en', { timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone }).resolvedOptions().timeZone, Intl.DateTimeFormat().resolvedOptions().timeZone); TBH I'm not sure what to do about this one. Is it a code bug, or a test bug...? Surely we can work around the error by changing the timezone on the system, but nicer to not do that. 1642346 1 ross.kirsling 2020-04-16 11:10:45 -0700 Ah, this test was probably failing for Linux before, but it was easier to set more granular expectations on the LayoutTests side. I think this is a code bug -- the spec says the default time zone needs to be canonicalized too but we're only performing step 3 (https://tc39.es/ecma402/#sec-canonicalizetimezonename) for the non-default path. Will fix. 1642356 2 ross.kirsling 2020-04-16 11:25:13 -0700 *** Bug 210604 has been marked as a duplicate of this bug. *** 1642360 3 396676 ross.kirsling 2020-04-16 11:29:49 -0700 Created attachment 396676 Patch 1642375 4 396676 darin 2020-04-16 11:43:29 -0700 Comment on attachment 396676 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396676&action=review > Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp:134 > + if (canonical.isNull() || canonical == "Etc/UTC"_s || canonical == "Etc/GMT"_s) > + canonical = "UTC"_s; Nicer if we found a way to share code with the below instead of repeating twice. 1642394 5 396685 ross.kirsling 2020-04-16 12:16:30 -0700 Created attachment 396685 Patch for landing 1642400 6 mcatanzaro 2020-04-16 12:41:19 -0700 Thanks Ross! 1642404 7 396685 darin 2020-04-16 12:48:48 -0700 Comment on attachment 396685 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=396685&action=review > Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp:107 > +static ALWAYS_INLINE bool isUTCEquivalent(StringView timeZone) I think ALWAYS_INLINE is overkill here. Not incorrect, but not necessary. > Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp:109 > + return timeZone == "Etc/UTC"_s || timeZone == "Etc/GMT"_s; Using _s here makes the code a tiny bit larger and a tiny bit slower. I suggest just leaving it off. Alternatively we could overload operator== to take ASCIILiteral, but I don’t really want to do that. 1642564 8 396736 ross.kirsling 2020-04-16 21:17:28 -0700 Created attachment 396736 Patch for landing 1642566 9 ews-feeder 2020-04-16 21:17:50 -0700 ChangeLog entry in JSTests/ChangeLog contains OOPS!. 1642570 10 396738 ross.kirsling 2020-04-16 21:34:23 -0700 Created attachment 396738 Patch for landing 1642573 11 ews-feeder 2020-04-16 21:57:19 -0700 Committed r260237: <https://trac.webkit.org/changeset/260237> All reviewed patches have been landed. Closing bug and clearing flags on attachment 396738. 1642574 12 webkit-bug-importer 2020-04-16 21:58:12 -0700 <rdar://problem/61919754> 396676 2020-04-16 11:29:49 -0700 2020-04-16 12:16:28 -0700 Patch bug-210605-20200416112948.patch text/plain 6687 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz MzM1NWM3ZmUxOTdkMzdjNmYzZTQ4YzNiN2JkMjIyOWExY2YzODYxLi42MDAzMzM4NGQwMDQwOTMx Nzg3MGE1MGVlZTRmNzIyMzczNWMyNWE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAyMC0wNC0xNiAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjU5NDgwKTogVHdvIG5ldyBmYWlsaW5nIGkx OG4gdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxMDYwNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogcnVudGltZS9JbnRsRGF0ZVRpbWVGb3JtYXQuY3BwOgorICAgICAgICAoSlNDOjpkZWZhdWx0 VGltZVpvbmUpOgorICAgICAgICAoSlNDOjpjYW5vbmljYWxpemVUaW1lWm9uZU5hbWUpOgorICAg ICAgICBUaGUgZGVmYXVsdCB0aW1lIHpvbmUgbmVlZHMgdG8gYmUgY2Fub25pY2FsaXplZCB0b28u CisKIDIwMjAtMDQtMTUgIFJvc3MgS2lyc2xpbmcgIDxyb3NzLmtpcnNsaW5nQHNvbnkuY29tPgog CiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4IGZvciByMjYwMTYxLgpkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bERhdGVUaW1lRm9ybWF0LmNwcCBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxEYXRlVGltZUZvcm1hdC5jcHAKaW5kZXgg NGVlOWEwMzU5ZGU5OTc2ZjBmMjBiZDgwM2FkMzExMmQyZmFmMGRjNi4uYTg1NmRmNmY0MmJiNzJm ZjZiZDdhNGMxZGExNWUwOTI3YmM3ZWJiMyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvSW50bERhdGVUaW1lRm9ybWF0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9JbnRsRGF0ZVRpbWVGb3JtYXQuY3BwCkBAIC0xMDQsMTIgKzEwNCwxMiBA QCB2b2lkIEludGxEYXRlVGltZUZvcm1hdDo6c2V0Qm91bmRGb3JtYXQoVk0mIHZtLCBKU0JvdW5k RnVuY3Rpb24qIGZvcm1hdCkKICAgICBtX2JvdW5kRm9ybWF0LnNldCh2bSwgdGhpcywgZm9ybWF0 KTsKIH0KIAorLy8gaHR0cHM6Ly90YzM5LmVzL2VjbWE0MDIvI3NlYy1kZWZhdWx0dGltZXpvbmUK IHN0YXRpYyBTdHJpbmcgZGVmYXVsdFRpbWVab25lKCkKIHsKLSAgICAvLyA2LjQuMyBEZWZhdWx0 VGltZVpvbmUgKCkgKEVDTUEtNDAyIDIuMCkKLSAgICAvLyBUaGUgRGVmYXVsdFRpbWVab25lIGFi c3RyYWN0IG9wZXJhdGlvbiByZXR1cm5zIGEgU3RyaW5nIHZhbHVlIHJlcHJlc2VudGluZyB0aGUg dmFsaWQgKDYuNC4xKSBhbmQgY2Fub25pY2FsaXplZCAoNi40LjIpIHRpbWUgem9uZSBuYW1lIGZv ciB0aGUgaG9zdCBlbnZpcm9ubWVudOKAmXMgY3VycmVudCB0aW1lIHpvbmUuCi0KICAgICBVRXJy b3JDb2RlIHN0YXR1cyA9IFVfWkVST19FUlJPUjsKKyAgICBTdHJpbmcgY2Fub25pY2FsOworCiAg ICAgVmVjdG9yPFVDaGFyLCAzMj4gYnVmZmVyKDMyKTsKICAgICBhdXRvIGJ1ZmZlckxlbmd0aCA9 IHVjYWxfZ2V0RGVmYXVsdFRpbWVab25lKGJ1ZmZlci5kYXRhKCksIGJ1ZmZlci5zaXplKCksICZz dGF0dXMpOwogICAgIGlmIChzdGF0dXMgPT0gVV9CVUZGRVJfT1ZFUkZMT1dfRVJST1IpIHsKQEAg LTEyNywxMCArMTI3LDEzIEBAIHN0YXRpYyBTdHJpbmcgZGVmYXVsdFRpbWVab25lKCkKICAgICAg ICAgICAgIHVjYWxfZ2V0Q2Fub25pY2FsVGltZVpvbmVJRChidWZmZXIuZGF0YSgpLCBidWZmZXJM ZW5ndGgsIGNhbm9uaWNhbEJ1ZmZlci5kYXRhKCksIGNhbm9uaWNhbExlbmd0aCwgbnVsbHB0ciwg JnN0YXR1cyk7CiAgICAgICAgIH0KICAgICAgICAgaWYgKFVfU1VDQ0VTUyhzdGF0dXMpKQotICAg ICAgICAgICAgcmV0dXJuIFN0cmluZyhjYW5vbmljYWxCdWZmZXIuZGF0YSgpLCBjYW5vbmljYWxM ZW5ndGgpOworICAgICAgICAgICAgY2Fub25pY2FsID0gU3RyaW5nKGNhbm9uaWNhbEJ1ZmZlci5k YXRhKCksIGNhbm9uaWNhbExlbmd0aCk7CiAgICAgfQogCi0gICAgcmV0dXJuICJVVEMiX3M7Cisg ICAgaWYgKGNhbm9uaWNhbC5pc051bGwoKSB8fCBjYW5vbmljYWwgPT0gIkV0Yy9VVEMiX3MgfHwg Y2Fub25pY2FsID09ICJFdGMvR01UIl9zKQorICAgICAgICBjYW5vbmljYWwgPSAiVVRDIl9zOwor CisgICAgcmV0dXJuIGNhbm9uaWNhbDsKIH0KIAogc3RhdGljIFN0cmluZyBjYW5vbmljYWxpemVU aW1lWm9uZU5hbWUoY29uc3QgU3RyaW5nJiB0aW1lWm9uZU5hbWUpCkBAIC0xNzYsNyArMTc5LDcg QEAgc3RhdGljIFN0cmluZyBjYW5vbmljYWxpemVUaW1lWm9uZU5hbWUoY29uc3QgU3RyaW5nJiB0 aW1lWm9uZU5hbWUpCiAgICAgdWVudW1fY2xvc2UodGltZVpvbmVzKTsKIAogICAgIC8vIDMuIElm IGlhbmFUaW1lWm9uZSBpcyAiRXRjL1VUQyIgb3IgIkV0Yy9HTVQiLCB0aGVuIHJldHVybiAiVVRD Ii4KLSAgICBpZiAoY2Fub25pY2FsID09ICJFdGMvVVRDIiB8fCBjYW5vbmljYWwgPT0gIkV0Yy9H TVQiKQorICAgIGlmIChjYW5vbmljYWwgPT0gIkV0Yy9VVEMiX3MgfHwgY2Fub25pY2FsID09ICJF dGMvR01UIl9zKQogICAgICAgICBjYW5vbmljYWwgPSAiVVRDIl9zOwogCiAgICAgLy8gNC4gUmV0 dXJuIGlhbmFUaW1lWm9uZS4KZGlmZiAtLWdpdCBhL0pTVGVzdHMvQ2hhbmdlTG9nIGIvSlNUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggYTkyNGZkMjFhMGJkMThmNjNhZGVkYmJiMGIxYjI5NjAwYWYyZjEy Mi4uZmY5ZDQyYjU0OGJlM2JjYzBiZjhhYjkzMGY5NjI3ZjQ2Nzg3MWJiMyAxMDA2NDQKLS0tIGEv SlNUZXN0cy9DaGFuZ2VMb2cKKysrIGIvSlNUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBA QAorMjAyMC0wNC0xNiAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29ueS5jb20+CisK KyAgICAgICAgUkVHUkVTU0lPTihyMjU5NDgwKTogVHdvIG5ldyBmYWlsaW5nIGkxOG4gdGVzdHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDYwNQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3RyZXNz L2RhdGUtdG9Mb2NhbGVTdHJpbmcuanM6CisgICAgICAgIFRlc3RzIHNob3VsZG4ndCByZWx5IG9u IHN5c3RlbSBkZWZhdWx0IHRpbWUgem9uZS4KKwogMjAyMC0wNC0xNSAgUm9zcyBLaXJzbGluZyAg PHJvc3Mua2lyc2xpbmdAc29ueS5jb20+CiAKICAgICAgICAgW0VDTUEtNDAyXSBFeHRlbnNpb24g dmFsdWVzIHNob3VsZCBkZWZhdWx0IHRvIHRydWUsIGNhbm9uaWNhbGl6ZSB3aXRob3V0ICItdHJ1 ZSIKZGlmZiAtLWdpdCBhL0pTVGVzdHMvc3RyZXNzL2RhdGUtdG9Mb2NhbGVTdHJpbmcuanMgYi9K U1Rlc3RzL3N0cmVzcy9kYXRlLXRvTG9jYWxlU3RyaW5nLmpzCmluZGV4IDA1YTQzNjNlOThjNmNi Nzg0YTVmMGRlYmY4ZmJjODY1MTVkNTZmZTMuLjFlMGZkYTJkMDVmYWQ1OGM5NWJmOTNmM2RkYTk3 N2Q3MDU0YTQxMmMgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvc3RyZXNzL2RhdGUtdG9Mb2NhbGVTdHJp bmcuanMKKysrIGIvSlNUZXN0cy9zdHJlc3MvZGF0ZS10b0xvY2FsZVN0cmluZy5qcwpAQCAtNDYs OCArNDYsOCBAQCBzaG91bGRCZShuZXcgRGF0ZShOYU4pLnRvTG9jYWxlU3RyaW5nKCksICJJbnZh bGlkIERhdGUiKTsKIHNob3VsZFRocm93KCgpID0+IG5ldyBEYXRlKCkudG9Mb2NhbGVTdHJpbmco J2knKSwgUmFuZ2VFcnJvcik7CiBzaG91bGRCZShuZXcgRGF0ZSgwKS50b0xvY2FsZVN0cmluZygn emgtSGFucy1DTi11LW51LWhhbmlkZWMnLCB7IHRpbWVab25lOiAnVVRDJyB9KSwgJ+S4gOS5neS4 g+OAhy/kuIAv5LiAIOS4iuWNiOS4gOS6jDrjgIfjgIc644CH44CHJyk7CiBzaG91bGRCZShuZXcg RGF0ZSgwKS50b0xvY2FsZVN0cmluZygnemgtSGFucy1DTicsIHsgdGltZVpvbmU6ICdVVEMnLCBu dW1iZXJpbmdTeXN0ZW06ICdoYW5pZGVjJyB9KSwgJ+S4gOS5neS4g+OAhy/kuIAv5LiAIOS4iuWN iOS4gOS6jDrjgIfjgIc644CH44CHJyk7Ci1zaG91bGRCZShuZXcgRGF0ZSgwKS50b0xvY2FsZVN0 cmluZygnZW4tdS1jYS1jaGluZXNlJywgeyB5ZWFyOiAnbnVtZXJpYycgfSksICcxOTY5KGppLXlv dSknKTsKLXNob3VsZEJlKG5ldyBEYXRlKDApLnRvTG9jYWxlU3RyaW5nKCdlbicsIHsgeWVhcjog J251bWVyaWMnLCBjYWxlbmRhcjogJ2NoaW5lc2UnIH0pLCAnMTk2OShqaS15b3UpJyk7CitzaG91 bGRCZShuZXcgRGF0ZSgwKS50b0xvY2FsZVN0cmluZygnZW4tdS1jYS1jaGluZXNlJywgeyB0aW1l Wm9uZTogJ1VUQycsIHllYXI6ICdudW1lcmljJyB9KSwgJzE5NjkoamkteW91KScpOworc2hvdWxk QmUobmV3IERhdGUoMCkudG9Mb2NhbGVTdHJpbmcoJ2VuJywgeyB0aW1lWm9uZTogJ1VUQycsIHll YXI6ICdudW1lcmljJywgY2FsZW5kYXI6ICdjaGluZXNlJyB9KSwgJzE5NjkoamkteW91KScpOwog CiAvLyBEZWZhdWx0cyB0byBtZHksIGhtcwogc2hvdWxkQmUobmV3IERhdGUoMCkudG9Mb2NhbGVT dHJpbmcoJ2VuJywgeyB0aW1lWm9uZTogJ1VUQycgfSksICcxLzEvMTk3MCwgMTI6MDA6MDAgQU0n KTsKQEAgLTg1LDggKzg1LDggQEAgc2hvdWxkQmUobmV3IERhdGUoTmFOKS50b0xvY2FsZURhdGVT dHJpbmcoKSwgJ0ludmFsaWQgRGF0ZScpOwogc2hvdWxkVGhyb3coKCkgPT4gbmV3IERhdGUoKS50 b0xvY2FsZURhdGVTdHJpbmcoJ2knKSwgUmFuZ2VFcnJvcik7CiBzaG91bGRCZShuZXcgRGF0ZSgw KS50b0xvY2FsZURhdGVTdHJpbmcoJ3poLUhhbnMtQ04tdS1udS1oYW5pZGVjJywgeyB0aW1lWm9u ZTogJ1VUQycgfSksICfkuIDkuZ3kuIPjgIcv5LiAL+S4gCcpOwogc2hvdWxkQmUobmV3IERhdGUo MCkudG9Mb2NhbGVEYXRlU3RyaW5nKCd6aC1IYW5zLUNOJywgeyB0aW1lWm9uZTogJ1VUQycsIG51 bWJlcmluZ1N5c3RlbTogJ2hhbmlkZWMnIH0pLCAn5LiA5Lmd5LiD44CHL+S4gC/kuIAnKTsKLXNo b3VsZEJlKG5ldyBEYXRlKDApLnRvTG9jYWxlRGF0ZVN0cmluZygnZW4tdS1jYS1jaGluZXNlJywg eyB5ZWFyOiAnbnVtZXJpYycgfSksICcxOTY5KGppLXlvdSknKTsKLXNob3VsZEJlKG5ldyBEYXRl KDApLnRvTG9jYWxlRGF0ZVN0cmluZygnZW4nLCB7IHllYXI6ICdudW1lcmljJywgY2FsZW5kYXI6 ICdjaGluZXNlJyB9KSwgJzE5NjkoamkteW91KScpOworc2hvdWxkQmUobmV3IERhdGUoMCkudG9M b2NhbGVEYXRlU3RyaW5nKCdlbi11LWNhLWNoaW5lc2UnLCB7IHRpbWVab25lOiAnVVRDJywgeWVh cjogJ251bWVyaWMnIH0pLCAnMTk2OShqaS15b3UpJyk7CitzaG91bGRCZShuZXcgRGF0ZSgwKS50 b0xvY2FsZURhdGVTdHJpbmcoJ2VuJywgeyB0aW1lWm9uZTogJ1VUQycsIHllYXI6ICdudW1lcmlj JywgY2FsZW5kYXI6ICdjaGluZXNlJyB9KSwgJzE5NjkoamkteW91KScpOwogCiAvLyBEZWZhdWx0 cyB0byBtZHkKIHNob3VsZEJlKG5ldyBEYXRlKDApLnRvTG9jYWxlRGF0ZVN0cmluZygnZW4nLCB7 IHRpbWVab25lOiAnVVRDJyB9KSwgJzEvMS8xOTcwJyk7CkBAIC0xMjYsOCArMTI2LDggQEAgc2hv dWxkQmUobmV3IERhdGUoTmFOKS50b0xvY2FsZVRpbWVTdHJpbmcoKSwgJ0ludmFsaWQgRGF0ZScp Owogc2hvdWxkVGhyb3coKCkgPT4gbmV3IERhdGUoKS50b0xvY2FsZVRpbWVTdHJpbmcoJ2knKSwg UmFuZ2VFcnJvcik7CiBzaG91bGRCZShuZXcgRGF0ZSgwKS50b0xvY2FsZVRpbWVTdHJpbmcoJ3po LUhhbnMtQ04tdS1udS1oYW5pZGVjJywgeyB0aW1lWm9uZTogJ1VUQycgfSksICLkuIrljYjkuIDk uow644CH44CHOuOAh+OAhyIpOwogc2hvdWxkQmUobmV3IERhdGUoMCkudG9Mb2NhbGVUaW1lU3Ry aW5nKCd6aC1IYW5zLUNOJywgeyB0aW1lWm9uZTogJ1VUQycsIG51bWJlcmluZ1N5c3RlbTogJ2hh bmlkZWMnIH0pLCAi5LiK5Y2I5LiA5LqMOuOAh+OAhzrjgIfjgIciKTsKLXNob3VsZEJlKG5ldyBE YXRlKDApLnRvTG9jYWxlVGltZVN0cmluZygnZW4tdS1jYS1jaGluZXNlJywgeyB5ZWFyOiAnbnVt ZXJpYycgfSksICcxOTY5KGppLXlvdSksIDQ6MDA6MDAgUE0nKTsKLXNob3VsZEJlKG5ldyBEYXRl KDApLnRvTG9jYWxlVGltZVN0cmluZygnZW4nLCB7IHllYXI6ICdudW1lcmljJywgY2FsZW5kYXI6 ICdjaGluZXNlJyB9KSwgJzE5NjkoamkteW91KSwgNDowMDowMCBQTScpOworc2hvdWxkQmUobmV3 IERhdGUoMCkudG9Mb2NhbGVUaW1lU3RyaW5nKCdlbi11LWNhLWNoaW5lc2UnLCB7IHRpbWVab25l OiAnVVRDJywgeWVhcjogJ251bWVyaWMnIH0pLCAnMTk2OShqaS15b3UpLCAxMjowMDowMCBBTScp Oworc2hvdWxkQmUobmV3IERhdGUoMCkudG9Mb2NhbGVUaW1lU3RyaW5nKCdlbicsIHsgdGltZVpv bmU6ICdVVEMnLCB5ZWFyOiAnbnVtZXJpYycsIGNhbGVuZGFyOiAnY2hpbmVzZScgfSksICcxOTY5 KGppLXlvdSksIDEyOjAwOjAwIEFNJyk7CiAKIC8vIERlZmF1bHRzIHRvIGhtcwogc2hvdWxkQmUo bmV3IERhdGUoMCkudG9Mb2NhbGVUaW1lU3RyaW5nKCdlbicsIHsgdGltZVpvbmU6ICdVVEMnIH0p LCAiMTI6MDA6MDAgQU0iKTsK 396685 2020-04-16 12:16:30 -0700 2020-04-16 21:17:26 -0700 Patch for landing bug-210605-20200416121629.patch text/plain 6879 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz MzM1NWM3ZmUxOTdkMzdjNmYzZTQ4YzNiN2JkMjIyOWExY2YzODYxLi4yZGVjNzhmYWRjYzVjNjgw Zjc5Y2QxMjVmNmM4NTk2YTYwY2QwOWRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAyMC0wNC0xNiAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjU5NDgwKTogVHdvIG5ldyBmYWlsaW5nIGkx OG4gdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxMDYwNQorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgICog cnVudGltZS9JbnRsRGF0ZVRpbWVGb3JtYXQuY3BwOgorICAgICAgICAoSlNDOjppc1VUQ0VxdWl2 YWxlbnQpOiBBZGRlZC4KKyAgICAgICAgKEpTQzo6ZGVmYXVsdFRpbWVab25lKToKKyAgICAgICAg KEpTQzo6Y2Fub25pY2FsaXplVGltZVpvbmVOYW1lKToKKyAgICAgICAgVGhlIGRlZmF1bHQgdGlt ZSB6b25lIG5lZWRzIHRvIGJlIGNhbm9uaWNhbGl6ZWQgdG9vLgorCiAyMDIwLTA0LTE1ICBSb3Nz IEtpcnNsaW5nICA8cm9zcy5raXJzbGluZ0Bzb255LmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk IGJ1aWxkIGZpeCBmb3IgcjI2MDE2MS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0ludGxEYXRlVGltZUZvcm1hdC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9JbnRsRGF0ZVRpbWVGb3JtYXQuY3BwCmluZGV4IDRlZTlhMDM1OWRlOTk3NmYwZjIw YmQ4MDNhZDMxMTJkMmZhZjBkYzYuLjE3ZWQ0YjM2ZmM3OTYzOGE3Yzk2OGNjM2FiYjZhM2E5NGI4 NDAwZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxEYXRl VGltZUZvcm1hdC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bERh dGVUaW1lRm9ybWF0LmNwcApAQCAtMTA0LDEyICsxMDQsMTcgQEAgdm9pZCBJbnRsRGF0ZVRpbWVG b3JtYXQ6OnNldEJvdW5kRm9ybWF0KFZNJiB2bSwgSlNCb3VuZEZ1bmN0aW9uKiBmb3JtYXQpCiAg ICAgbV9ib3VuZEZvcm1hdC5zZXQodm0sIHRoaXMsIGZvcm1hdCk7CiB9CiAKLXN0YXRpYyBTdHJp bmcgZGVmYXVsdFRpbWVab25lKCkKK3N0YXRpYyBBTFdBWVNfSU5MSU5FIGJvb2wgaXNVVENFcXVp dmFsZW50KFN0cmluZ1ZpZXcgdGltZVpvbmUpCiB7Ci0gICAgLy8gNi40LjMgRGVmYXVsdFRpbWVa b25lICgpIChFQ01BLTQwMiAyLjApCi0gICAgLy8gVGhlIERlZmF1bHRUaW1lWm9uZSBhYnN0cmFj dCBvcGVyYXRpb24gcmV0dXJucyBhIFN0cmluZyB2YWx1ZSByZXByZXNlbnRpbmcgdGhlIHZhbGlk ICg2LjQuMSkgYW5kIGNhbm9uaWNhbGl6ZWQgKDYuNC4yKSB0aW1lIHpvbmUgbmFtZSBmb3IgdGhl IGhvc3QgZW52aXJvbm1lbnTigJlzIGN1cnJlbnQgdGltZSB6b25lLgorICAgIHJldHVybiB0aW1l Wm9uZSA9PSAiRXRjL1VUQyJfcyB8fCB0aW1lWm9uZSA9PSAiRXRjL0dNVCJfczsKK30KIAorLy8g aHR0cHM6Ly90YzM5LmVzL2VjbWE0MDIvI3NlYy1kZWZhdWx0dGltZXpvbmUKK3N0YXRpYyBTdHJp bmcgZGVmYXVsdFRpbWVab25lKCkKK3sKICAgICBVRXJyb3JDb2RlIHN0YXR1cyA9IFVfWkVST19F UlJPUjsKKyAgICBTdHJpbmcgY2Fub25pY2FsOworCiAgICAgVmVjdG9yPFVDaGFyLCAzMj4gYnVm ZmVyKDMyKTsKICAgICBhdXRvIGJ1ZmZlckxlbmd0aCA9IHVjYWxfZ2V0RGVmYXVsdFRpbWVab25l KGJ1ZmZlci5kYXRhKCksIGJ1ZmZlci5zaXplKCksICZzdGF0dXMpOwogICAgIGlmIChzdGF0dXMg PT0gVV9CVUZGRVJfT1ZFUkZMT1dfRVJST1IpIHsKQEAgLTEyNywxMCArMTMyLDEzIEBAIHN0YXRp YyBTdHJpbmcgZGVmYXVsdFRpbWVab25lKCkKICAgICAgICAgICAgIHVjYWxfZ2V0Q2Fub25pY2Fs VGltZVpvbmVJRChidWZmZXIuZGF0YSgpLCBidWZmZXJMZW5ndGgsIGNhbm9uaWNhbEJ1ZmZlci5k YXRhKCksIGNhbm9uaWNhbExlbmd0aCwgbnVsbHB0ciwgJnN0YXR1cyk7CiAgICAgICAgIH0KICAg ICAgICAgaWYgKFVfU1VDQ0VTUyhzdGF0dXMpKQotICAgICAgICAgICAgcmV0dXJuIFN0cmluZyhj YW5vbmljYWxCdWZmZXIuZGF0YSgpLCBjYW5vbmljYWxMZW5ndGgpOworICAgICAgICAgICAgY2Fu b25pY2FsID0gU3RyaW5nKGNhbm9uaWNhbEJ1ZmZlci5kYXRhKCksIGNhbm9uaWNhbExlbmd0aCk7 CiAgICAgfQogCi0gICAgcmV0dXJuICJVVEMiX3M7CisgICAgaWYgKGNhbm9uaWNhbC5pc051bGwo KSB8fCBpc1VUQ0VxdWl2YWxlbnQoY2Fub25pY2FsKSkKKyAgICAgICAgcmV0dXJuICJVVEMiX3M7 CisKKyAgICByZXR1cm4gY2Fub25pY2FsOwogfQogCiBzdGF0aWMgU3RyaW5nIGNhbm9uaWNhbGl6 ZVRpbWVab25lTmFtZShjb25zdCBTdHJpbmcmIHRpbWVab25lTmFtZSkKQEAgLTE3Niw4ICsxODQs OCBAQCBzdGF0aWMgU3RyaW5nIGNhbm9uaWNhbGl6ZVRpbWVab25lTmFtZShjb25zdCBTdHJpbmcm IHRpbWVab25lTmFtZSkKICAgICB1ZW51bV9jbG9zZSh0aW1lWm9uZXMpOwogCiAgICAgLy8gMy4g SWYgaWFuYVRpbWVab25lIGlzICJFdGMvVVRDIiBvciAiRXRjL0dNVCIsIHRoZW4gcmV0dXJuICJV VEMiLgotICAgIGlmIChjYW5vbmljYWwgPT0gIkV0Yy9VVEMiIHx8IGNhbm9uaWNhbCA9PSAiRXRj L0dNVCIpCi0gICAgICAgIGNhbm9uaWNhbCA9ICJVVEMiX3M7CisgICAgaWYgKGlzVVRDRXF1aXZh bGVudChjYW5vbmljYWwpKQorICAgICAgICByZXR1cm4gIlVUQyJfczsKIAogICAgIC8vIDQuIFJl dHVybiBpYW5hVGltZVpvbmUuCiAgICAgcmV0dXJuIGNhbm9uaWNhbDsKZGlmZiAtLWdpdCBhL0pT VGVzdHMvQ2hhbmdlTG9nIGIvSlNUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYTkyNGZkMjFhMGJkMThm NjNhZGVkYmJiMGIxYjI5NjAwYWYyZjEyMi4uNTM2YmEyMDY2ZjRlOTY1NDZlYmNlZDBkYWQyNzdk MzQ4NDBlMWFmMiAxMDA2NDQKLS0tIGEvSlNUZXN0cy9DaGFuZ2VMb2cKKysrIGIvSlNUZXN0cy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMC0wNC0xNiAgUm9zcyBLaXJzbGluZyAgPHJv c3Mua2lyc2xpbmdAc29ueS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjU5NDgwKTogVHdv IG5ldyBmYWlsaW5nIGkxOG4gdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxMDYwNQorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVy LgorCisgICAgICAgICogc3RyZXNzL2RhdGUtdG9Mb2NhbGVTdHJpbmcuanM6CisgICAgICAgIFRl c3RzIHNob3VsZG4ndCByZWx5IG9uIHN5c3RlbSBkZWZhdWx0IHRpbWUgem9uZS4KKwogMjAyMC0w NC0xNSAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29ueS5jb20+CiAKICAgICAgICAg W0VDTUEtNDAyXSBFeHRlbnNpb24gdmFsdWVzIHNob3VsZCBkZWZhdWx0IHRvIHRydWUsIGNhbm9u aWNhbGl6ZSB3aXRob3V0ICItdHJ1ZSIKZGlmZiAtLWdpdCBhL0pTVGVzdHMvc3RyZXNzL2RhdGUt dG9Mb2NhbGVTdHJpbmcuanMgYi9KU1Rlc3RzL3N0cmVzcy9kYXRlLXRvTG9jYWxlU3RyaW5nLmpz CmluZGV4IDA1YTQzNjNlOThjNmNiNzg0YTVmMGRlYmY4ZmJjODY1MTVkNTZmZTMuLjFlMGZkYTJk MDVmYWQ1OGM5NWJmOTNmM2RkYTk3N2Q3MDU0YTQxMmMgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvc3Ry ZXNzL2RhdGUtdG9Mb2NhbGVTdHJpbmcuanMKKysrIGIvSlNUZXN0cy9zdHJlc3MvZGF0ZS10b0xv Y2FsZVN0cmluZy5qcwpAQCAtNDYsOCArNDYsOCBAQCBzaG91bGRCZShuZXcgRGF0ZShOYU4pLnRv TG9jYWxlU3RyaW5nKCksICJJbnZhbGlkIERhdGUiKTsKIHNob3VsZFRocm93KCgpID0+IG5ldyBE YXRlKCkudG9Mb2NhbGVTdHJpbmcoJ2knKSwgUmFuZ2VFcnJvcik7CiBzaG91bGRCZShuZXcgRGF0 ZSgwKS50b0xvY2FsZVN0cmluZygnemgtSGFucy1DTi11LW51LWhhbmlkZWMnLCB7IHRpbWVab25l OiAnVVRDJyB9KSwgJ+S4gOS5neS4g+OAhy/kuIAv5LiAIOS4iuWNiOS4gOS6jDrjgIfjgIc644CH 44CHJyk7CiBzaG91bGRCZShuZXcgRGF0ZSgwKS50b0xvY2FsZVN0cmluZygnemgtSGFucy1DTics IHsgdGltZVpvbmU6ICdVVEMnLCBudW1iZXJpbmdTeXN0ZW06ICdoYW5pZGVjJyB9KSwgJ+S4gOS5 neS4g+OAhy/kuIAv5LiAIOS4iuWNiOS4gOS6jDrjgIfjgIc644CH44CHJyk7Ci1zaG91bGRCZShu ZXcgRGF0ZSgwKS50b0xvY2FsZVN0cmluZygnZW4tdS1jYS1jaGluZXNlJywgeyB5ZWFyOiAnbnVt ZXJpYycgfSksICcxOTY5KGppLXlvdSknKTsKLXNob3VsZEJlKG5ldyBEYXRlKDApLnRvTG9jYWxl U3RyaW5nKCdlbicsIHsgeWVhcjogJ251bWVyaWMnLCBjYWxlbmRhcjogJ2NoaW5lc2UnIH0pLCAn MTk2OShqaS15b3UpJyk7CitzaG91bGRCZShuZXcgRGF0ZSgwKS50b0xvY2FsZVN0cmluZygnZW4t dS1jYS1jaGluZXNlJywgeyB0aW1lWm9uZTogJ1VUQycsIHllYXI6ICdudW1lcmljJyB9KSwgJzE5 NjkoamkteW91KScpOworc2hvdWxkQmUobmV3IERhdGUoMCkudG9Mb2NhbGVTdHJpbmcoJ2VuJywg eyB0aW1lWm9uZTogJ1VUQycsIHllYXI6ICdudW1lcmljJywgY2FsZW5kYXI6ICdjaGluZXNlJyB9 KSwgJzE5NjkoamkteW91KScpOwogCiAvLyBEZWZhdWx0cyB0byBtZHksIGhtcwogc2hvdWxkQmUo bmV3IERhdGUoMCkudG9Mb2NhbGVTdHJpbmcoJ2VuJywgeyB0aW1lWm9uZTogJ1VUQycgfSksICcx LzEvMTk3MCwgMTI6MDA6MDAgQU0nKTsKQEAgLTg1LDggKzg1LDggQEAgc2hvdWxkQmUobmV3IERh dGUoTmFOKS50b0xvY2FsZURhdGVTdHJpbmcoKSwgJ0ludmFsaWQgRGF0ZScpOwogc2hvdWxkVGhy b3coKCkgPT4gbmV3IERhdGUoKS50b0xvY2FsZURhdGVTdHJpbmcoJ2knKSwgUmFuZ2VFcnJvcik7 CiBzaG91bGRCZShuZXcgRGF0ZSgwKS50b0xvY2FsZURhdGVTdHJpbmcoJ3poLUhhbnMtQ04tdS1u dS1oYW5pZGVjJywgeyB0aW1lWm9uZTogJ1VUQycgfSksICfkuIDkuZ3kuIPjgIcv5LiAL+S4gCcp Owogc2hvdWxkQmUobmV3IERhdGUoMCkudG9Mb2NhbGVEYXRlU3RyaW5nKCd6aC1IYW5zLUNOJywg eyB0aW1lWm9uZTogJ1VUQycsIG51bWJlcmluZ1N5c3RlbTogJ2hhbmlkZWMnIH0pLCAn5LiA5Lmd 5LiD44CHL+S4gC/kuIAnKTsKLXNob3VsZEJlKG5ldyBEYXRlKDApLnRvTG9jYWxlRGF0ZVN0cmlu ZygnZW4tdS1jYS1jaGluZXNlJywgeyB5ZWFyOiAnbnVtZXJpYycgfSksICcxOTY5KGppLXlvdSkn KTsKLXNob3VsZEJlKG5ldyBEYXRlKDApLnRvTG9jYWxlRGF0ZVN0cmluZygnZW4nLCB7IHllYXI6 ICdudW1lcmljJywgY2FsZW5kYXI6ICdjaGluZXNlJyB9KSwgJzE5NjkoamkteW91KScpOworc2hv dWxkQmUobmV3IERhdGUoMCkudG9Mb2NhbGVEYXRlU3RyaW5nKCdlbi11LWNhLWNoaW5lc2UnLCB7 IHRpbWVab25lOiAnVVRDJywgeWVhcjogJ251bWVyaWMnIH0pLCAnMTk2OShqaS15b3UpJyk7Citz aG91bGRCZShuZXcgRGF0ZSgwKS50b0xvY2FsZURhdGVTdHJpbmcoJ2VuJywgeyB0aW1lWm9uZTog J1VUQycsIHllYXI6ICdudW1lcmljJywgY2FsZW5kYXI6ICdjaGluZXNlJyB9KSwgJzE5Njkoamkt eW91KScpOwogCiAvLyBEZWZhdWx0cyB0byBtZHkKIHNob3VsZEJlKG5ldyBEYXRlKDApLnRvTG9j YWxlRGF0ZVN0cmluZygnZW4nLCB7IHRpbWVab25lOiAnVVRDJyB9KSwgJzEvMS8xOTcwJyk7CkBA IC0xMjYsOCArMTI2LDggQEAgc2hvdWxkQmUobmV3IERhdGUoTmFOKS50b0xvY2FsZVRpbWVTdHJp bmcoKSwgJ0ludmFsaWQgRGF0ZScpOwogc2hvdWxkVGhyb3coKCkgPT4gbmV3IERhdGUoKS50b0xv Y2FsZVRpbWVTdHJpbmcoJ2knKSwgUmFuZ2VFcnJvcik7CiBzaG91bGRCZShuZXcgRGF0ZSgwKS50 b0xvY2FsZVRpbWVTdHJpbmcoJ3poLUhhbnMtQ04tdS1udS1oYW5pZGVjJywgeyB0aW1lWm9uZTog J1VUQycgfSksICLkuIrljYjkuIDkuow644CH44CHOuOAh+OAhyIpOwogc2hvdWxkQmUobmV3IERh dGUoMCkudG9Mb2NhbGVUaW1lU3RyaW5nKCd6aC1IYW5zLUNOJywgeyB0aW1lWm9uZTogJ1VUQycs IG51bWJlcmluZ1N5c3RlbTogJ2hhbmlkZWMnIH0pLCAi5LiK5Y2I5LiA5LqMOuOAh+OAhzrjgIfj gIciKTsKLXNob3VsZEJlKG5ldyBEYXRlKDApLnRvTG9jYWxlVGltZVN0cmluZygnZW4tdS1jYS1j aGluZXNlJywgeyB5ZWFyOiAnbnVtZXJpYycgfSksICcxOTY5KGppLXlvdSksIDQ6MDA6MDAgUE0n KTsKLXNob3VsZEJlKG5ldyBEYXRlKDApLnRvTG9jYWxlVGltZVN0cmluZygnZW4nLCB7IHllYXI6 ICdudW1lcmljJywgY2FsZW5kYXI6ICdjaGluZXNlJyB9KSwgJzE5NjkoamkteW91KSwgNDowMDow MCBQTScpOworc2hvdWxkQmUobmV3IERhdGUoMCkudG9Mb2NhbGVUaW1lU3RyaW5nKCdlbi11LWNh LWNoaW5lc2UnLCB7IHRpbWVab25lOiAnVVRDJywgeWVhcjogJ251bWVyaWMnIH0pLCAnMTk2OShq aS15b3UpLCAxMjowMDowMCBBTScpOworc2hvdWxkQmUobmV3IERhdGUoMCkudG9Mb2NhbGVUaW1l U3RyaW5nKCdlbicsIHsgdGltZVpvbmU6ICdVVEMnLCB5ZWFyOiAnbnVtZXJpYycsIGNhbGVuZGFy OiAnY2hpbmVzZScgfSksICcxOTY5KGppLXlvdSksIDEyOjAwOjAwIEFNJyk7CiAKIC8vIERlZmF1 bHRzIHRvIGhtcwogc2hvdWxkQmUobmV3IERhdGUoMCkudG9Mb2NhbGVUaW1lU3RyaW5nKCdlbics IHsgdGltZVpvbmU6ICdVVEMnIH0pLCAiMTI6MDA6MDAgQU0iKTsK 396736 2020-04-16 21:17:28 -0700 2020-04-16 21:34:21 -0700 Patch for landing bug-210605-20200416211727.patch text/plain 8268 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMjM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 ZjUyOGJhZjM1OWU4Y2Y2MmY4ZDgzNGIwNTllZTJlNDg5MjcyY2M0Li40YzMzYjljZTA0YWE2Njgw MjQzYjg3NmIyNzM5MWNjNmI5YTY0MWNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAyMC0wNC0xNiAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjU5NDgwKTogVHdvIG5ldyBmYWlsaW5nIGkx OG4gdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxMDYwNQorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgICog cnVudGltZS9JbnRsRGF0ZVRpbWVGb3JtYXQuY3BwOgorICAgICAgICAoSlNDOjppc1VUQ0VxdWl2 YWxlbnQpOgorICAgICAgICAoSlNDOjpkZWZhdWx0VGltZVpvbmUpOgorICAgICAgICAoSlNDOjpj YW5vbmljYWxpemVUaW1lWm9uZU5hbWUpOgorICAgICAgICBUaGUgZGVmYXVsdCB0aW1lIHpvbmUg bmVlZHMgdG8gYmUgY2Fub25pY2FsaXplZCB0b28uCisKKyAgICAgICAgKiBydW50aW1lL0ludGxP YmplY3QuY3BwOgorICAgICAgICAoSlNDOjpjYW5vbmljYWxMYW5nVGFnKToKKyAgICAgICAgKEpT Qzo6cmVzb2x2ZUxvY2FsZSk6CisgICAgICAgIERlYWwgd2l0aCBzb21lIG9kZCAiIl9zIGNhc2Vz IGZyb20gbXkgcHJldmlvdXMgcGF0Y2guCisgICAgICAgIChEcml2ZS1ieSBmaXggaW5zcGlyZWQg YnkgRGFyaW4ncyBjb21tZW50cyBvbiB0aGlzIG9uZS4pCisKIDIwMjAtMDQtMTYgIFNlcmdpbyBW aWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBi dWlsZCBmaXggZm9yIG5vbiB1bmlmaWVkIGJ1aWxkcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0ludGxEYXRlVGltZUZvcm1hdC5jcHAgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9JbnRsRGF0ZVRpbWVGb3JtYXQuY3BwCmluZGV4IDRlZTlhMDM1OWRl OTk3NmYwZjIwYmQ4MDNhZDMxMTJkMmZhZjBkYzYuLjAwMzAyZmU0YjEzNWQxZDgzYTRjZGM4MWRi N2QxMzgyMTBmYzY3ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0ludGxEYXRlVGltZUZvcm1hdC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSW50bERhdGVUaW1lRm9ybWF0LmNwcApAQCAtMTA0LDEyICsxMDQsMTcgQEAgdm9pZCBJbnRs RGF0ZVRpbWVGb3JtYXQ6OnNldEJvdW5kRm9ybWF0KFZNJiB2bSwgSlNCb3VuZEZ1bmN0aW9uKiBm b3JtYXQpCiAgICAgbV9ib3VuZEZvcm1hdC5zZXQodm0sIHRoaXMsIGZvcm1hdCk7CiB9CiAKLXN0 YXRpYyBTdHJpbmcgZGVmYXVsdFRpbWVab25lKCkKK3N0YXRpYyBBTFdBWVNfSU5MSU5FIGJvb2wg aXNVVENFcXVpdmFsZW50KFN0cmluZ1ZpZXcgdGltZVpvbmUpCiB7Ci0gICAgLy8gNi40LjMgRGVm YXVsdFRpbWVab25lICgpIChFQ01BLTQwMiAyLjApCi0gICAgLy8gVGhlIERlZmF1bHRUaW1lWm9u ZSBhYnN0cmFjdCBvcGVyYXRpb24gcmV0dXJucyBhIFN0cmluZyB2YWx1ZSByZXByZXNlbnRpbmcg dGhlIHZhbGlkICg2LjQuMSkgYW5kIGNhbm9uaWNhbGl6ZWQgKDYuNC4yKSB0aW1lIHpvbmUgbmFt ZSBmb3IgdGhlIGhvc3QgZW52aXJvbm1lbnTigJlzIGN1cnJlbnQgdGltZSB6b25lLgorICAgIHJl dHVybiB0aW1lWm9uZSA9PSAiRXRjL1VUQyIgfHwgdGltZVpvbmUgPT0gIkV0Yy9HTVQiOworfQog CisvLyBodHRwczovL3RjMzkuZXMvZWNtYTQwMi8jc2VjLWRlZmF1bHR0aW1lem9uZQorc3RhdGlj IFN0cmluZyBkZWZhdWx0VGltZVpvbmUoKQorewogICAgIFVFcnJvckNvZGUgc3RhdHVzID0gVV9a RVJPX0VSUk9SOworICAgIFN0cmluZyBjYW5vbmljYWw7CisKICAgICBWZWN0b3I8VUNoYXIsIDMy PiBidWZmZXIoMzIpOwogICAgIGF1dG8gYnVmZmVyTGVuZ3RoID0gdWNhbF9nZXREZWZhdWx0VGlt ZVpvbmUoYnVmZmVyLmRhdGEoKSwgYnVmZmVyLnNpemUoKSwgJnN0YXR1cyk7CiAgICAgaWYgKHN0 YXR1cyA9PSBVX0JVRkZFUl9PVkVSRkxPV19FUlJPUikgewpAQCAtMTI3LDEwICsxMzIsMTMgQEAg c3RhdGljIFN0cmluZyBkZWZhdWx0VGltZVpvbmUoKQogICAgICAgICAgICAgdWNhbF9nZXRDYW5v bmljYWxUaW1lWm9uZUlEKGJ1ZmZlci5kYXRhKCksIGJ1ZmZlckxlbmd0aCwgY2Fub25pY2FsQnVm ZmVyLmRhdGEoKSwgY2Fub25pY2FsTGVuZ3RoLCBudWxscHRyLCAmc3RhdHVzKTsKICAgICAgICAg fQogICAgICAgICBpZiAoVV9TVUNDRVNTKHN0YXR1cykpCi0gICAgICAgICAgICByZXR1cm4gU3Ry aW5nKGNhbm9uaWNhbEJ1ZmZlci5kYXRhKCksIGNhbm9uaWNhbExlbmd0aCk7CisgICAgICAgICAg ICBjYW5vbmljYWwgPSBTdHJpbmcoY2Fub25pY2FsQnVmZmVyLmRhdGEoKSwgY2Fub25pY2FsTGVu Z3RoKTsKICAgICB9CiAKLSAgICByZXR1cm4gIlVUQyJfczsKKyAgICBpZiAoY2Fub25pY2FsLmlz TnVsbCgpIHx8IGlzVVRDRXF1aXZhbGVudChjYW5vbmljYWwpKQorICAgICAgICByZXR1cm4gIlVU QyJfczsKKworICAgIHJldHVybiBjYW5vbmljYWw7CiB9CiAKIHN0YXRpYyBTdHJpbmcgY2Fub25p Y2FsaXplVGltZVpvbmVOYW1lKGNvbnN0IFN0cmluZyYgdGltZVpvbmVOYW1lKQpAQCAtMTc2LDgg KzE4NCw4IEBAIHN0YXRpYyBTdHJpbmcgY2Fub25pY2FsaXplVGltZVpvbmVOYW1lKGNvbnN0IFN0 cmluZyYgdGltZVpvbmVOYW1lKQogICAgIHVlbnVtX2Nsb3NlKHRpbWVab25lcyk7CiAKICAgICAv LyAzLiBJZiBpYW5hVGltZVpvbmUgaXMgIkV0Yy9VVEMiIG9yICJFdGMvR01UIiwgdGhlbiByZXR1 cm4gIlVUQyIuCi0gICAgaWYgKGNhbm9uaWNhbCA9PSAiRXRjL1VUQyIgfHwgY2Fub25pY2FsID09 ICJFdGMvR01UIikKLSAgICAgICAgY2Fub25pY2FsID0gIlVUQyJfczsKKyAgICBpZiAoaXNVVENF cXVpdmFsZW50KGNhbm9uaWNhbCkpCisgICAgICAgIHJldHVybiAiVVRDIl9zOwogCiAgICAgLy8g NC4gUmV0dXJuIGlhbmFUaW1lWm9uZS4KICAgICByZXR1cm4gY2Fub25pY2FsOwpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bE9iamVjdC5jcHAgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9JbnRsT2JqZWN0LmNwcAppbmRleCAwMTVhMGExZjIwOTZl Y2RjZDJlODEyMDljNmI5NTk0MzUyMzFlODYxLi5mYjJiYjViNjkyY2NlYzAwZTFlNGFiNzY0MjQ1 N2UxMTFhNjIzMzUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9J bnRsT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9JbnRsT2Jq ZWN0LmNwcApAQCAtNTM2LDcgKzUzNiw3IEBAIHN0YXRpYyBTdHJpbmcgY2Fub25pY2FsTGFuZ1Rh Zyhjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFydHMpCiAgICAgICAgICAgICArK251bUV4dFBhcnRz OwogCiAgICAgICAgICAgICBhdXRvIGxvd2VyY2FzZSA9IGV4dFBhcnQuY29udmVydFRvQVNDSUlM b3dlcmNhc2UoKTsKLSAgICAgICAgICAgIGlmIChsb3dlcmNhc2UgIT0gInRydWUiX3MpCisgICAg ICAgICAgICBpZiAobG93ZXJjYXNlICE9ICJ0cnVlIikKICAgICAgICAgICAgICAgICBleHRlbnNp b24uYXBwZW5kKCctJywgbG93ZXJjYXNlKTsKICAgICAgICAgfQogCkBAIC04ODUsNyArODg1LDcg QEAgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4gcmVzb2x2ZUxvY2FsZShKU0dsb2JhbE9iamVjdCog Z2xvYmFsT2JqZWN0LCBjb25zdCBIYXNoU2UKICAgICAgICAgICAgICAgICAgICAgICAgIHZhbHVl ID0gcmVxdWVzdGVkVmFsdWU7CiAgICAgICAgICAgICAgICAgICAgICAgICBzdXBwb3J0ZWRFeHRl bnNpb25BZGRpdGlvbiA9IG1ha2VTdHJpbmcoJy0nLCBrZXksICctJywgdmFsdWUpOwogICAgICAg ICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgfSBlbHNlIGlmIChrZXlMb2NhbGVEYXRh LmNvbnRhaW5zKHN0YXRpY19jYXN0PFN0cmluZz4oInRydWUiX3MpKSkgeworICAgICAgICAgICAg ICAgIH0gZWxzZSBpZiAoa2V5TG9jYWxlRGF0YS5jb250YWlucygidHJ1ZSJfcykpIHsKICAgICAg ICAgICAgICAgICAgICAgdmFsdWUgPSAidHJ1ZSJfczsKICAgICAgICAgICAgICAgICAgICAgc3Vw cG9ydGVkRXh0ZW5zaW9uQWRkaXRpb24gPSBtYWtlU3RyaW5nKCctJywga2V5KTsKICAgICAgICAg ICAgICAgICB9CmRpZmYgLS1naXQgYS9KU1Rlc3RzL0NoYW5nZUxvZyBiL0pTVGVzdHMvQ2hhbmdl TG9nCmluZGV4IGQ1NGIxMjhjMjY2MTFlNTUwYWQ1NjgwOTFlZjViODQ1ODc0YzY4MWUuLmQ0NTM2 YmZmODQ3NmMxOTA0M2VlMzJhYzI5OTZkZjE2ZGVjYjE5YmUgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMv Q2hhbmdlTG9nCisrKyBiL0pTVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAt MDQtMTYgIFJvc3MgS2lyc2xpbmcgIDxyb3NzLmtpcnNsaW5nQHNvbnkuY29tPgorCisgICAgICAg IFJFR1JFU1NJT04ocjI1OTQ4MCk6IFR3byBuZXcgZmFpbGluZyBpMThuIHRlc3RzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTA2MDUKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHN0cmVzcy9kYXRlLXRv TG9jYWxlU3RyaW5nLmpzOgorICAgICAgICBUZXN0cyBzaG91bGRuJ3QgcmVseSBvbiBzeXN0ZW0g ZGVmYXVsdCB0aW1lIHpvbmUuCisKIDIwMjAtMDQtMTYgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtp QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByZWR1Y2UgIyBvZiBpdGVyYXRpb24g c2luY2UgdGhpcyB0ZXN0IGlzIHRpbWVkIG91dCBpbiBzbG93IGRldmljZXMKZGlmZiAtLWdpdCBh L0pTVGVzdHMvc3RyZXNzL2RhdGUtdG9Mb2NhbGVTdHJpbmcuanMgYi9KU1Rlc3RzL3N0cmVzcy9k YXRlLXRvTG9jYWxlU3RyaW5nLmpzCmluZGV4IDA1YTQzNjNlOThjNmNiNzg0YTVmMGRlYmY4ZmJj ODY1MTVkNTZmZTMuLjFlMGZkYTJkMDVmYWQ1OGM5NWJmOTNmM2RkYTk3N2Q3MDU0YTQxMmMgMTAw NjQ0Ci0tLSBhL0pTVGVzdHMvc3RyZXNzL2RhdGUtdG9Mb2NhbGVTdHJpbmcuanMKKysrIGIvSlNU ZXN0cy9zdHJlc3MvZGF0ZS10b0xvY2FsZVN0cmluZy5qcwpAQCAtNDYsOCArNDYsOCBAQCBzaG91 bGRCZShuZXcgRGF0ZShOYU4pLnRvTG9jYWxlU3RyaW5nKCksICJJbnZhbGlkIERhdGUiKTsKIHNo b3VsZFRocm93KCgpID0+IG5ldyBEYXRlKCkudG9Mb2NhbGVTdHJpbmcoJ2knKSwgUmFuZ2VFcnJv cik7CiBzaG91bGRCZShuZXcgRGF0ZSgwKS50b0xvY2FsZVN0cmluZygnemgtSGFucy1DTi11LW51 LWhhbmlkZWMnLCB7IHRpbWVab25lOiAnVVRDJyB9KSwgJ+S4gOS5neS4g+OAhy/kuIAv5LiAIOS4 iuWNiOS4gOS6jDrjgIfjgIc644CH44CHJyk7CiBzaG91bGRCZShuZXcgRGF0ZSgwKS50b0xvY2Fs ZVN0cmluZygnemgtSGFucy1DTicsIHsgdGltZVpvbmU6ICdVVEMnLCBudW1iZXJpbmdTeXN0ZW06 ICdoYW5pZGVjJyB9KSwgJ+S4gOS5neS4g+OAhy/kuIAv5LiAIOS4iuWNiOS4gOS6jDrjgIfjgIc6 44CH44CHJyk7Ci1zaG91bGRCZShuZXcgRGF0ZSgwKS50b0xvY2FsZVN0cmluZygnZW4tdS1jYS1j aGluZXNlJywgeyB5ZWFyOiAnbnVtZXJpYycgfSksICcxOTY5KGppLXlvdSknKTsKLXNob3VsZEJl KG5ldyBEYXRlKDApLnRvTG9jYWxlU3RyaW5nKCdlbicsIHsgeWVhcjogJ251bWVyaWMnLCBjYWxl bmRhcjogJ2NoaW5lc2UnIH0pLCAnMTk2OShqaS15b3UpJyk7CitzaG91bGRCZShuZXcgRGF0ZSgw KS50b0xvY2FsZVN0cmluZygnZW4tdS1jYS1jaGluZXNlJywgeyB0aW1lWm9uZTogJ1VUQycsIHll YXI6ICdudW1lcmljJyB9KSwgJzE5NjkoamkteW91KScpOworc2hvdWxkQmUobmV3IERhdGUoMCku dG9Mb2NhbGVTdHJpbmcoJ2VuJywgeyB0aW1lWm9uZTogJ1VUQycsIHllYXI6ICdudW1lcmljJywg Y2FsZW5kYXI6ICdjaGluZXNlJyB9KSwgJzE5NjkoamkteW91KScpOwogCiAvLyBEZWZhdWx0cyB0 byBtZHksIGhtcwogc2hvdWxkQmUobmV3IERhdGUoMCkudG9Mb2NhbGVTdHJpbmcoJ2VuJywgeyB0 aW1lWm9uZTogJ1VUQycgfSksICcxLzEvMTk3MCwgMTI6MDA6MDAgQU0nKTsKQEAgLTg1LDggKzg1 LDggQEAgc2hvdWxkQmUobmV3IERhdGUoTmFOKS50b0xvY2FsZURhdGVTdHJpbmcoKSwgJ0ludmFs aWQgRGF0ZScpOwogc2hvdWxkVGhyb3coKCkgPT4gbmV3IERhdGUoKS50b0xvY2FsZURhdGVTdHJp bmcoJ2knKSwgUmFuZ2VFcnJvcik7CiBzaG91bGRCZShuZXcgRGF0ZSgwKS50b0xvY2FsZURhdGVT dHJpbmcoJ3poLUhhbnMtQ04tdS1udS1oYW5pZGVjJywgeyB0aW1lWm9uZTogJ1VUQycgfSksICfk uIDkuZ3kuIPjgIcv5LiAL+S4gCcpOwogc2hvdWxkQmUobmV3IERhdGUoMCkudG9Mb2NhbGVEYXRl U3RyaW5nKCd6aC1IYW5zLUNOJywgeyB0aW1lWm9uZTogJ1VUQycsIG51bWJlcmluZ1N5c3RlbTog J2hhbmlkZWMnIH0pLCAn5LiA5Lmd5LiD44CHL+S4gC/kuIAnKTsKLXNob3VsZEJlKG5ldyBEYXRl KDApLnRvTG9jYWxlRGF0ZVN0cmluZygnZW4tdS1jYS1jaGluZXNlJywgeyB5ZWFyOiAnbnVtZXJp YycgfSksICcxOTY5KGppLXlvdSknKTsKLXNob3VsZEJlKG5ldyBEYXRlKDApLnRvTG9jYWxlRGF0 ZVN0cmluZygnZW4nLCB7IHllYXI6ICdudW1lcmljJywgY2FsZW5kYXI6ICdjaGluZXNlJyB9KSwg JzE5NjkoamkteW91KScpOworc2hvdWxkQmUobmV3IERhdGUoMCkudG9Mb2NhbGVEYXRlU3RyaW5n KCdlbi11LWNhLWNoaW5lc2UnLCB7IHRpbWVab25lOiAnVVRDJywgeWVhcjogJ251bWVyaWMnIH0p LCAnMTk2OShqaS15b3UpJyk7CitzaG91bGRCZShuZXcgRGF0ZSgwKS50b0xvY2FsZURhdGVTdHJp bmcoJ2VuJywgeyB0aW1lWm9uZTogJ1VUQycsIHllYXI6ICdudW1lcmljJywgY2FsZW5kYXI6ICdj aGluZXNlJyB9KSwgJzE5NjkoamkteW91KScpOwogCiAvLyBEZWZhdWx0cyB0byBtZHkKIHNob3Vs ZEJlKG5ldyBEYXRlKDApLnRvTG9jYWxlRGF0ZVN0cmluZygnZW4nLCB7IHRpbWVab25lOiAnVVRD JyB9KSwgJzEvMS8xOTcwJyk7CkBAIC0xMjYsOCArMTI2LDggQEAgc2hvdWxkQmUobmV3IERhdGUo TmFOKS50b0xvY2FsZVRpbWVTdHJpbmcoKSwgJ0ludmFsaWQgRGF0ZScpOwogc2hvdWxkVGhyb3co KCkgPT4gbmV3IERhdGUoKS50b0xvY2FsZVRpbWVTdHJpbmcoJ2knKSwgUmFuZ2VFcnJvcik7CiBz aG91bGRCZShuZXcgRGF0ZSgwKS50b0xvY2FsZVRpbWVTdHJpbmcoJ3poLUhhbnMtQ04tdS1udS1o YW5pZGVjJywgeyB0aW1lWm9uZTogJ1VUQycgfSksICLkuIrljYjkuIDkuow644CH44CHOuOAh+OA hyIpOwogc2hvdWxkQmUobmV3IERhdGUoMCkudG9Mb2NhbGVUaW1lU3RyaW5nKCd6aC1IYW5zLUNO JywgeyB0aW1lWm9uZTogJ1VUQycsIG51bWJlcmluZ1N5c3RlbTogJ2hhbmlkZWMnIH0pLCAi5LiK 5Y2I5LiA5LqMOuOAh+OAhzrjgIfjgIciKTsKLXNob3VsZEJlKG5ldyBEYXRlKDApLnRvTG9jYWxl VGltZVN0cmluZygnZW4tdS1jYS1jaGluZXNlJywgeyB5ZWFyOiAnbnVtZXJpYycgfSksICcxOTY5 KGppLXlvdSksIDQ6MDA6MDAgUE0nKTsKLXNob3VsZEJlKG5ldyBEYXRlKDApLnRvTG9jYWxlVGlt ZVN0cmluZygnZW4nLCB7IHllYXI6ICdudW1lcmljJywgY2FsZW5kYXI6ICdjaGluZXNlJyB9KSwg JzE5NjkoamkteW91KSwgNDowMDowMCBQTScpOworc2hvdWxkQmUobmV3IERhdGUoMCkudG9Mb2Nh bGVUaW1lU3RyaW5nKCdlbi11LWNhLWNoaW5lc2UnLCB7IHRpbWVab25lOiAnVVRDJywgeWVhcjog J251bWVyaWMnIH0pLCAnMTk2OShqaS15b3UpLCAxMjowMDowMCBBTScpOworc2hvdWxkQmUobmV3 IERhdGUoMCkudG9Mb2NhbGVUaW1lU3RyaW5nKCdlbicsIHsgdGltZVpvbmU6ICdVVEMnLCB5ZWFy OiAnbnVtZXJpYycsIGNhbGVuZGFyOiAnY2hpbmVzZScgfSksICcxOTY5KGppLXlvdSksIDEyOjAw OjAwIEFNJyk7CiAKIC8vIERlZmF1bHRzIHRvIGhtcwogc2hvdWxkQmUobmV3IERhdGUoMCkudG9M b2NhbGVUaW1lU3RyaW5nKCdlbicsIHsgdGltZVpvbmU6ICdVVEMnIH0pLCAiMTI6MDA6MDAgQU0i KTsK 396738 2020-04-16 21:34:23 -0700 2020-04-16 21:57:19 -0700 Patch for landing bug-210605-20200416213423.patch text/plain 8265 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMjM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 ZjUyOGJhZjM1OWU4Y2Y2MmY4ZDgzNGIwNTllZTJlNDg5MjcyY2M0Li40YzMzYjljZTA0YWE2Njgw MjQzYjg3NmIyNzM5MWNjNmI5YTY0MWNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAyMC0wNC0xNiAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjU5NDgwKTogVHdvIG5ldyBmYWlsaW5nIGkx OG4gdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxMDYwNQorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgICog cnVudGltZS9JbnRsRGF0ZVRpbWVGb3JtYXQuY3BwOgorICAgICAgICAoSlNDOjppc1VUQ0VxdWl2 YWxlbnQpOgorICAgICAgICAoSlNDOjpkZWZhdWx0VGltZVpvbmUpOgorICAgICAgICAoSlNDOjpj YW5vbmljYWxpemVUaW1lWm9uZU5hbWUpOgorICAgICAgICBUaGUgZGVmYXVsdCB0aW1lIHpvbmUg bmVlZHMgdG8gYmUgY2Fub25pY2FsaXplZCB0b28uCisKKyAgICAgICAgKiBydW50aW1lL0ludGxP YmplY3QuY3BwOgorICAgICAgICAoSlNDOjpjYW5vbmljYWxMYW5nVGFnKToKKyAgICAgICAgKEpT Qzo6cmVzb2x2ZUxvY2FsZSk6CisgICAgICAgIERlYWwgd2l0aCBzb21lIG9kZCAiIl9zIGNhc2Vz IGZyb20gbXkgcHJldmlvdXMgcGF0Y2guCisgICAgICAgIChEcml2ZS1ieSBmaXggaW5zcGlyZWQg YnkgRGFyaW4ncyBjb21tZW50cyBvbiB0aGlzIG9uZS4pCisKIDIwMjAtMDQtMTYgIFNlcmdpbyBW aWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBi dWlsZCBmaXggZm9yIG5vbiB1bmlmaWVkIGJ1aWxkcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0ludGxEYXRlVGltZUZvcm1hdC5jcHAgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9JbnRsRGF0ZVRpbWVGb3JtYXQuY3BwCmluZGV4IDRlZTlhMDM1OWRl OTk3NmYwZjIwYmQ4MDNhZDMxMTJkMmZhZjBkYzYuLjAwMzAyZmU0YjEzNWQxZDgzYTRjZGM4MWRi N2QxMzgyMTBmYzY3ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0ludGxEYXRlVGltZUZvcm1hdC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSW50bERhdGVUaW1lRm9ybWF0LmNwcApAQCAtMTA0LDEyICsxMDQsMTcgQEAgdm9pZCBJbnRs RGF0ZVRpbWVGb3JtYXQ6OnNldEJvdW5kRm9ybWF0KFZNJiB2bSwgSlNCb3VuZEZ1bmN0aW9uKiBm b3JtYXQpCiAgICAgbV9ib3VuZEZvcm1hdC5zZXQodm0sIHRoaXMsIGZvcm1hdCk7CiB9CiAKLXN0 YXRpYyBTdHJpbmcgZGVmYXVsdFRpbWVab25lKCkKK3N0YXRpYyBBTFdBWVNfSU5MSU5FIGJvb2wg aXNVVENFcXVpdmFsZW50KFN0cmluZ1ZpZXcgdGltZVpvbmUpCiB7Ci0gICAgLy8gNi40LjMgRGVm YXVsdFRpbWVab25lICgpIChFQ01BLTQwMiAyLjApCi0gICAgLy8gVGhlIERlZmF1bHRUaW1lWm9u ZSBhYnN0cmFjdCBvcGVyYXRpb24gcmV0dXJucyBhIFN0cmluZyB2YWx1ZSByZXByZXNlbnRpbmcg dGhlIHZhbGlkICg2LjQuMSkgYW5kIGNhbm9uaWNhbGl6ZWQgKDYuNC4yKSB0aW1lIHpvbmUgbmFt ZSBmb3IgdGhlIGhvc3QgZW52aXJvbm1lbnTigJlzIGN1cnJlbnQgdGltZSB6b25lLgorICAgIHJl dHVybiB0aW1lWm9uZSA9PSAiRXRjL1VUQyIgfHwgdGltZVpvbmUgPT0gIkV0Yy9HTVQiOworfQog CisvLyBodHRwczovL3RjMzkuZXMvZWNtYTQwMi8jc2VjLWRlZmF1bHR0aW1lem9uZQorc3RhdGlj IFN0cmluZyBkZWZhdWx0VGltZVpvbmUoKQorewogICAgIFVFcnJvckNvZGUgc3RhdHVzID0gVV9a RVJPX0VSUk9SOworICAgIFN0cmluZyBjYW5vbmljYWw7CisKICAgICBWZWN0b3I8VUNoYXIsIDMy PiBidWZmZXIoMzIpOwogICAgIGF1dG8gYnVmZmVyTGVuZ3RoID0gdWNhbF9nZXREZWZhdWx0VGlt ZVpvbmUoYnVmZmVyLmRhdGEoKSwgYnVmZmVyLnNpemUoKSwgJnN0YXR1cyk7CiAgICAgaWYgKHN0 YXR1cyA9PSBVX0JVRkZFUl9PVkVSRkxPV19FUlJPUikgewpAQCAtMTI3LDEwICsxMzIsMTMgQEAg c3RhdGljIFN0cmluZyBkZWZhdWx0VGltZVpvbmUoKQogICAgICAgICAgICAgdWNhbF9nZXRDYW5v bmljYWxUaW1lWm9uZUlEKGJ1ZmZlci5kYXRhKCksIGJ1ZmZlckxlbmd0aCwgY2Fub25pY2FsQnVm ZmVyLmRhdGEoKSwgY2Fub25pY2FsTGVuZ3RoLCBudWxscHRyLCAmc3RhdHVzKTsKICAgICAgICAg fQogICAgICAgICBpZiAoVV9TVUNDRVNTKHN0YXR1cykpCi0gICAgICAgICAgICByZXR1cm4gU3Ry aW5nKGNhbm9uaWNhbEJ1ZmZlci5kYXRhKCksIGNhbm9uaWNhbExlbmd0aCk7CisgICAgICAgICAg ICBjYW5vbmljYWwgPSBTdHJpbmcoY2Fub25pY2FsQnVmZmVyLmRhdGEoKSwgY2Fub25pY2FsTGVu Z3RoKTsKICAgICB9CiAKLSAgICByZXR1cm4gIlVUQyJfczsKKyAgICBpZiAoY2Fub25pY2FsLmlz TnVsbCgpIHx8IGlzVVRDRXF1aXZhbGVudChjYW5vbmljYWwpKQorICAgICAgICByZXR1cm4gIlVU QyJfczsKKworICAgIHJldHVybiBjYW5vbmljYWw7CiB9CiAKIHN0YXRpYyBTdHJpbmcgY2Fub25p Y2FsaXplVGltZVpvbmVOYW1lKGNvbnN0IFN0cmluZyYgdGltZVpvbmVOYW1lKQpAQCAtMTc2LDgg KzE4NCw4IEBAIHN0YXRpYyBTdHJpbmcgY2Fub25pY2FsaXplVGltZVpvbmVOYW1lKGNvbnN0IFN0 cmluZyYgdGltZVpvbmVOYW1lKQogICAgIHVlbnVtX2Nsb3NlKHRpbWVab25lcyk7CiAKICAgICAv LyAzLiBJZiBpYW5hVGltZVpvbmUgaXMgIkV0Yy9VVEMiIG9yICJFdGMvR01UIiwgdGhlbiByZXR1 cm4gIlVUQyIuCi0gICAgaWYgKGNhbm9uaWNhbCA9PSAiRXRjL1VUQyIgfHwgY2Fub25pY2FsID09 ICJFdGMvR01UIikKLSAgICAgICAgY2Fub25pY2FsID0gIlVUQyJfczsKKyAgICBpZiAoaXNVVENF cXVpdmFsZW50KGNhbm9uaWNhbCkpCisgICAgICAgIHJldHVybiAiVVRDIl9zOwogCiAgICAgLy8g NC4gUmV0dXJuIGlhbmFUaW1lWm9uZS4KICAgICByZXR1cm4gY2Fub25pY2FsOwpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bE9iamVjdC5jcHAgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9JbnRsT2JqZWN0LmNwcAppbmRleCAwMTVhMGExZjIwOTZl Y2RjZDJlODEyMDljNmI5NTk0MzUyMzFlODYxLi5mYjJiYjViNjkyY2NlYzAwZTFlNGFiNzY0MjQ1 N2UxMTFhNjIzMzUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9J bnRsT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9JbnRsT2Jq ZWN0LmNwcApAQCAtNTM2LDcgKzUzNiw3IEBAIHN0YXRpYyBTdHJpbmcgY2Fub25pY2FsTGFuZ1Rh Zyhjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFydHMpCiAgICAgICAgICAgICArK251bUV4dFBhcnRz OwogCiAgICAgICAgICAgICBhdXRvIGxvd2VyY2FzZSA9IGV4dFBhcnQuY29udmVydFRvQVNDSUlM b3dlcmNhc2UoKTsKLSAgICAgICAgICAgIGlmIChsb3dlcmNhc2UgIT0gInRydWUiX3MpCisgICAg ICAgICAgICBpZiAobG93ZXJjYXNlICE9ICJ0cnVlIikKICAgICAgICAgICAgICAgICBleHRlbnNp b24uYXBwZW5kKCctJywgbG93ZXJjYXNlKTsKICAgICAgICAgfQogCkBAIC04ODUsNyArODg1LDcg QEAgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4gcmVzb2x2ZUxvY2FsZShKU0dsb2JhbE9iamVjdCog Z2xvYmFsT2JqZWN0LCBjb25zdCBIYXNoU2UKICAgICAgICAgICAgICAgICAgICAgICAgIHZhbHVl ID0gcmVxdWVzdGVkVmFsdWU7CiAgICAgICAgICAgICAgICAgICAgICAgICBzdXBwb3J0ZWRFeHRl bnNpb25BZGRpdGlvbiA9IG1ha2VTdHJpbmcoJy0nLCBrZXksICctJywgdmFsdWUpOwogICAgICAg ICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgfSBlbHNlIGlmIChrZXlMb2NhbGVEYXRh LmNvbnRhaW5zKHN0YXRpY19jYXN0PFN0cmluZz4oInRydWUiX3MpKSkgeworICAgICAgICAgICAg ICAgIH0gZWxzZSBpZiAoa2V5TG9jYWxlRGF0YS5jb250YWlucygidHJ1ZSJfcykpIHsKICAgICAg ICAgICAgICAgICAgICAgdmFsdWUgPSAidHJ1ZSJfczsKICAgICAgICAgICAgICAgICAgICAgc3Vw cG9ydGVkRXh0ZW5zaW9uQWRkaXRpb24gPSBtYWtlU3RyaW5nKCctJywga2V5KTsKICAgICAgICAg ICAgICAgICB9CmRpZmYgLS1naXQgYS9KU1Rlc3RzL0NoYW5nZUxvZyBiL0pTVGVzdHMvQ2hhbmdl TG9nCmluZGV4IGQ1NGIxMjhjMjY2MTFlNTUwYWQ1NjgwOTFlZjViODQ1ODc0YzY4MWUuLjVjYTcw Y2QzOWQ3ZWU4YzQwMDc4NTE2NDAzYTg1YmY0NzczZjk1YzUgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMv Q2hhbmdlTG9nCisrKyBiL0pTVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAt MDQtMTYgIFJvc3MgS2lyc2xpbmcgIDxyb3NzLmtpcnNsaW5nQHNvbnkuY29tPgorCisgICAgICAg IFJFR1JFU1NJT04ocjI1OTQ4MCk6IFR3byBuZXcgZmFpbGluZyBpMThuIHRlc3RzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTA2MDUKKworICAgICAg ICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICAqIHN0cmVzcy9kYXRlLXRvTG9j YWxlU3RyaW5nLmpzOgorICAgICAgICBUZXN0cyBzaG91bGRuJ3QgcmVseSBvbiBzeXN0ZW0gZGVm YXVsdCB0aW1lIHpvbmUuCisKIDIwMjAtMDQtMTYgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFw cGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByZWR1Y2UgIyBvZiBpdGVyYXRpb24gc2lu Y2UgdGhpcyB0ZXN0IGlzIHRpbWVkIG91dCBpbiBzbG93IGRldmljZXMKZGlmZiAtLWdpdCBhL0pT VGVzdHMvc3RyZXNzL2RhdGUtdG9Mb2NhbGVTdHJpbmcuanMgYi9KU1Rlc3RzL3N0cmVzcy9kYXRl LXRvTG9jYWxlU3RyaW5nLmpzCmluZGV4IDA1YTQzNjNlOThjNmNiNzg0YTVmMGRlYmY4ZmJjODY1 MTVkNTZmZTMuLjFlMGZkYTJkMDVmYWQ1OGM5NWJmOTNmM2RkYTk3N2Q3MDU0YTQxMmMgMTAwNjQ0 Ci0tLSBhL0pTVGVzdHMvc3RyZXNzL2RhdGUtdG9Mb2NhbGVTdHJpbmcuanMKKysrIGIvSlNUZXN0 cy9zdHJlc3MvZGF0ZS10b0xvY2FsZVN0cmluZy5qcwpAQCAtNDYsOCArNDYsOCBAQCBzaG91bGRC ZShuZXcgRGF0ZShOYU4pLnRvTG9jYWxlU3RyaW5nKCksICJJbnZhbGlkIERhdGUiKTsKIHNob3Vs ZFRocm93KCgpID0+IG5ldyBEYXRlKCkudG9Mb2NhbGVTdHJpbmcoJ2knKSwgUmFuZ2VFcnJvcik7 CiBzaG91bGRCZShuZXcgRGF0ZSgwKS50b0xvY2FsZVN0cmluZygnemgtSGFucy1DTi11LW51LWhh bmlkZWMnLCB7IHRpbWVab25lOiAnVVRDJyB9KSwgJ+S4gOS5neS4g+OAhy/kuIAv5LiAIOS4iuWN iOS4gOS6jDrjgIfjgIc644CH44CHJyk7CiBzaG91bGRCZShuZXcgRGF0ZSgwKS50b0xvY2FsZVN0 cmluZygnemgtSGFucy1DTicsIHsgdGltZVpvbmU6ICdVVEMnLCBudW1iZXJpbmdTeXN0ZW06ICdo YW5pZGVjJyB9KSwgJ+S4gOS5neS4g+OAhy/kuIAv5LiAIOS4iuWNiOS4gOS6jDrjgIfjgIc644CH 44CHJyk7Ci1zaG91bGRCZShuZXcgRGF0ZSgwKS50b0xvY2FsZVN0cmluZygnZW4tdS1jYS1jaGlu ZXNlJywgeyB5ZWFyOiAnbnVtZXJpYycgfSksICcxOTY5KGppLXlvdSknKTsKLXNob3VsZEJlKG5l dyBEYXRlKDApLnRvTG9jYWxlU3RyaW5nKCdlbicsIHsgeWVhcjogJ251bWVyaWMnLCBjYWxlbmRh cjogJ2NoaW5lc2UnIH0pLCAnMTk2OShqaS15b3UpJyk7CitzaG91bGRCZShuZXcgRGF0ZSgwKS50 b0xvY2FsZVN0cmluZygnZW4tdS1jYS1jaGluZXNlJywgeyB0aW1lWm9uZTogJ1VUQycsIHllYXI6 ICdudW1lcmljJyB9KSwgJzE5NjkoamkteW91KScpOworc2hvdWxkQmUobmV3IERhdGUoMCkudG9M b2NhbGVTdHJpbmcoJ2VuJywgeyB0aW1lWm9uZTogJ1VUQycsIHllYXI6ICdudW1lcmljJywgY2Fs ZW5kYXI6ICdjaGluZXNlJyB9KSwgJzE5NjkoamkteW91KScpOwogCiAvLyBEZWZhdWx0cyB0byBt ZHksIGhtcwogc2hvdWxkQmUobmV3IERhdGUoMCkudG9Mb2NhbGVTdHJpbmcoJ2VuJywgeyB0aW1l Wm9uZTogJ1VUQycgfSksICcxLzEvMTk3MCwgMTI6MDA6MDAgQU0nKTsKQEAgLTg1LDggKzg1LDgg QEAgc2hvdWxkQmUobmV3IERhdGUoTmFOKS50b0xvY2FsZURhdGVTdHJpbmcoKSwgJ0ludmFsaWQg RGF0ZScpOwogc2hvdWxkVGhyb3coKCkgPT4gbmV3IERhdGUoKS50b0xvY2FsZURhdGVTdHJpbmco J2knKSwgUmFuZ2VFcnJvcik7CiBzaG91bGRCZShuZXcgRGF0ZSgwKS50b0xvY2FsZURhdGVTdHJp bmcoJ3poLUhhbnMtQ04tdS1udS1oYW5pZGVjJywgeyB0aW1lWm9uZTogJ1VUQycgfSksICfkuIDk uZ3kuIPjgIcv5LiAL+S4gCcpOwogc2hvdWxkQmUobmV3IERhdGUoMCkudG9Mb2NhbGVEYXRlU3Ry aW5nKCd6aC1IYW5zLUNOJywgeyB0aW1lWm9uZTogJ1VUQycsIG51bWJlcmluZ1N5c3RlbTogJ2hh bmlkZWMnIH0pLCAn5LiA5Lmd5LiD44CHL+S4gC/kuIAnKTsKLXNob3VsZEJlKG5ldyBEYXRlKDAp LnRvTG9jYWxlRGF0ZVN0cmluZygnZW4tdS1jYS1jaGluZXNlJywgeyB5ZWFyOiAnbnVtZXJpYycg fSksICcxOTY5KGppLXlvdSknKTsKLXNob3VsZEJlKG5ldyBEYXRlKDApLnRvTG9jYWxlRGF0ZVN0 cmluZygnZW4nLCB7IHllYXI6ICdudW1lcmljJywgY2FsZW5kYXI6ICdjaGluZXNlJyB9KSwgJzE5 NjkoamkteW91KScpOworc2hvdWxkQmUobmV3IERhdGUoMCkudG9Mb2NhbGVEYXRlU3RyaW5nKCdl bi11LWNhLWNoaW5lc2UnLCB7IHRpbWVab25lOiAnVVRDJywgeWVhcjogJ251bWVyaWMnIH0pLCAn MTk2OShqaS15b3UpJyk7CitzaG91bGRCZShuZXcgRGF0ZSgwKS50b0xvY2FsZURhdGVTdHJpbmco J2VuJywgeyB0aW1lWm9uZTogJ1VUQycsIHllYXI6ICdudW1lcmljJywgY2FsZW5kYXI6ICdjaGlu ZXNlJyB9KSwgJzE5NjkoamkteW91KScpOwogCiAvLyBEZWZhdWx0cyB0byBtZHkKIHNob3VsZEJl KG5ldyBEYXRlKDApLnRvTG9jYWxlRGF0ZVN0cmluZygnZW4nLCB7IHRpbWVab25lOiAnVVRDJyB9 KSwgJzEvMS8xOTcwJyk7CkBAIC0xMjYsOCArMTI2LDggQEAgc2hvdWxkQmUobmV3IERhdGUoTmFO KS50b0xvY2FsZVRpbWVTdHJpbmcoKSwgJ0ludmFsaWQgRGF0ZScpOwogc2hvdWxkVGhyb3coKCkg PT4gbmV3IERhdGUoKS50b0xvY2FsZVRpbWVTdHJpbmcoJ2knKSwgUmFuZ2VFcnJvcik7CiBzaG91 bGRCZShuZXcgRGF0ZSgwKS50b0xvY2FsZVRpbWVTdHJpbmcoJ3poLUhhbnMtQ04tdS1udS1oYW5p ZGVjJywgeyB0aW1lWm9uZTogJ1VUQycgfSksICLkuIrljYjkuIDkuow644CH44CHOuOAh+OAhyIp Owogc2hvdWxkQmUobmV3IERhdGUoMCkudG9Mb2NhbGVUaW1lU3RyaW5nKCd6aC1IYW5zLUNOJywg eyB0aW1lWm9uZTogJ1VUQycsIG51bWJlcmluZ1N5c3RlbTogJ2hhbmlkZWMnIH0pLCAi5LiK5Y2I 5LiA5LqMOuOAh+OAhzrjgIfjgIciKTsKLXNob3VsZEJlKG5ldyBEYXRlKDApLnRvTG9jYWxlVGlt ZVN0cmluZygnZW4tdS1jYS1jaGluZXNlJywgeyB5ZWFyOiAnbnVtZXJpYycgfSksICcxOTY5KGpp LXlvdSksIDQ6MDA6MDAgUE0nKTsKLXNob3VsZEJlKG5ldyBEYXRlKDApLnRvTG9jYWxlVGltZVN0 cmluZygnZW4nLCB7IHllYXI6ICdudW1lcmljJywgY2FsZW5kYXI6ICdjaGluZXNlJyB9KSwgJzE5 NjkoamkteW91KSwgNDowMDowMCBQTScpOworc2hvdWxkQmUobmV3IERhdGUoMCkudG9Mb2NhbGVU aW1lU3RyaW5nKCdlbi11LWNhLWNoaW5lc2UnLCB7IHRpbWVab25lOiAnVVRDJywgeWVhcjogJ251 bWVyaWMnIH0pLCAnMTk2OShqaS15b3UpLCAxMjowMDowMCBBTScpOworc2hvdWxkQmUobmV3IERh dGUoMCkudG9Mb2NhbGVUaW1lU3RyaW5nKCdlbicsIHsgdGltZVpvbmU6ICdVVEMnLCB5ZWFyOiAn bnVtZXJpYycsIGNhbGVuZGFyOiAnY2hpbmVzZScgfSksICcxOTY5KGppLXlvdSksIDEyOjAwOjAw IEFNJyk7CiAKIC8vIERlZmF1bHRzIHRvIGhtcwogc2hvdWxkQmUobmV3IERhdGUoMCkudG9Mb2Nh bGVUaW1lU3RyaW5nKCdlbicsIHsgdGltZVpvbmU6ICdVVEMnIH0pLCAiMTI6MDA6MDAgQU0iKTsK