237735 2022-03-10 14:55:10 -0800 Adjust when _setPrivacyProxyFailClosedForUnreachableNonMainHosts is called 2022-06-23 15:37:23 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 237829 1 achristensen achristensen bfulgham commit-queue ggaren webkit-bug-importer oldest_to_newest 1850259 0 achristensen 2022-03-10 14:55:10 -0800 Adjust when _setPrivacyProxyFailClosedForUnreachableNonMainHosts is called 1850262 1 454406 achristensen 2022-03-10 14:57:30 -0800 Created attachment 454406 Patch 1850263 2 achristensen 2022-03-10 14:57:34 -0800 <rdar://problem/89972004> 1850552 3 454406 ggaren 2022-03-11 10:09:01 -0800 Comment on attachment 454406 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=454406&action=review r=me > Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:346 > + || request.url().host() == parameters.topOrigin->host()) Is there a condition where (isMainFrameNavigation && parameters.topOrigin && request.url().host() != parameters.topOrigin->host())? If not, maybe we don't need to check isMainFrameNavigation. 1850660 4 achristensen 2022-03-11 18:31:58 -0800 Good point. I also need to modify web sockets. 1850662 5 achristensen 2022-03-11 18:54:32 -0800 parameters.topOrigin is sometimes null and sometimes contains an origin with an empty host. I'm going to stay on the safe side and keep the main frame main resource check. 1850668 6 454526 achristensen 2022-03-11 19:37:15 -0800 Created attachment 454526 Patch 1850669 7 454526 achristensen 2022-03-11 19:38:05 -0800 Comment on attachment 454526 Patch I verified that this does not re-introduce the original issue. Intuitively this should fix the perf regression, and I'll check it in and see if the bots agree. 1850672 8 ews-feeder 2022-03-11 21:02:35 -0800 Committed r291206 (248361@main): <https://commits.webkit.org/248361@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 454526. 1850877 9 commit-queue 2022-03-14 08:44:11 -0700 Re-opened since this is blocked by bug 237829 1852390 10 454998 achristensen 2022-03-17 11:30:00 -0700 Created attachment 454998 Patch 1852394 11 454998 ggaren 2022-03-17 11:48:19 -0700 Comment on attachment 454998 Patch r=me Not sure what was wrong with the previous patch, or how this fixes it. Can you add that note in the ChangeLog? 1852488 12 achristensen 2022-03-17 14:22:36 -0700 I'm under the impression that there was nothing wrong with the previous patch, but it was rolled out before the bots caught up to the fact that it fixed a performance regression. 1853495 13 achristensen 2022-03-21 20:28:21 -0700 http://trac.webkit.org/r291598 1853496 14 achristensen 2022-03-21 20:30:44 -0700 This was hopefully the final fix for rdar://88965550 1858610 15 achristensen 2022-04-05 15:03:35 -0700 Reverting yet again in https://bugs.webkit.org/show_bug.cgi?id=238842 1861340 16 achristensen 2022-04-13 17:17:41 -0700 Reopening to attach new patch. 1861341 17 457579 achristensen 2022-04-13 17:17:43 -0700 Created attachment 457579 Patch 1861342 18 457580 achristensen 2022-04-13 17:18:53 -0700 Created attachment 457580 Patch 1861348 19 achristensen 2022-04-13 17:52:29 -0700 r292846 1877938 20 bfulgham 2022-06-23 15:36:55 -0700 *** Bug 237296 has been marked as a duplicate of this bug. *** 454406 2022-03-10 14:57:30 -0800 2022-03-11 19:37:13 -0800 Patch bug-237735-20220310145729.patch text/plain 3477 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMDUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM0NTc1NDM2M2Y0NGMyNzYx NWFlZmZhZGI0YmVjZTZjMGEyMGM2YjEuLmUyYzU1YWY5Y2QwM2UxM2NkYjc5MjFiMDkzZjdhMzg3 NTYxZTk3NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjItMDMtMTAgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBBZGp1c3Qgd2hl biBfc2V0UHJpdmFjeVByb3h5RmFpbENsb3NlZEZvclVucmVhY2hhYmxlTm9uTWFpbkhvc3RzIGlz IGNhbGxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjM3NzM1CisgICAgICAgIDxyZGFyOi8vODk5NzIwMDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSXQgd2FzIG9yaWdpbmFsbHkgYmVpbmcgY2FsbGVk IGRpZmZlcmVudGx5IGJldHdlZW4gbWFpbiByZXNvdXJjZXMgYW5kIHN1YnJlc291cmNlcyBvbiB0 aGUgc2FtZSBkb21haW4sCisgICAgICAgIGNhdXNpbmcgdGhlbSB0byB1c2UgY29ubmVjdGlvbnMg d2l0aCBkaWZmZXJlbnQgcHJvcGVydGllcywgc28gd2UgY291bGRuJ3Qgc2hhcmUgY29ubmVjdGlv bnMgYW55IG1vcmUuCisgICAgICAgIFRoaXMgd2lsbCBtYWtlIGl0IHNvIHRoYXQgbW9yZSBjb25u ZWN0aW9ucyBhcmUgc2hhcmVkLCB3aGljaCBzaG91bGQgZml4IHRoZSBwZXJmb3JtYW5jZSByZWdy ZXNzaW9uIGZyb20KKyAgICAgICAgbm8gbG9uZ2VyIHNoYXJpbmcgY29ubmVjdGlvbnMgdG8gdGhl IHNhbWUgZG9tYWluLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0Rh dGFUYXNrQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtEYXRhVGFza0NvY29hOjpO ZXR3b3JrRGF0YVRhc2tDb2NvYSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0 d29ya1Nlc3Npb25Db2NvYS5tbToKKyAgICAgICAgKC1bV0tOZXR3b3JrU2Vzc2lvbkRlbGVnYXRl IFVSTFNlc3Npb246ZGF0YVRhc2s6ZGlkUmVjZWl2ZVJlc3BvbnNlOmNvbXBsZXRpb25IYW5kbGVy Ol0pOgorCiAyMDIyLTAzLTA5ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29t PgogCiAgICAgICAgIE1vdmUgUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OkJ1ZmZlci5pc1ZvbGF0 aWxlIGludG8gSW1hZ2VCdWZmZXJCYWNrZW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29hLm1tIGIvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5tbQppbmRleCAzNWQ3 N2JiMjJiMTBlMWMwNzVhZTExMDRlYWIxYWZmM2M0MjE0OWVjLi41MzRkODg0NTAxYjZlYzBmYzc0 YmQyNzU3ZWExOWQ0ODhjNWEyMWVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2EubW0KQEAgLTM0MCw4ICsz NDAsMTAgQEAgTmV0d29ya0RhdGFUYXNrQ29jb2E6Ok5ldHdvcmtEYXRhVGFza0NvY29hKE5ldHdv cmtTZXNzaW9uJiBzZXNzaW9uLCBOZXR3b3JrRGF0YVQKICAgICBSZXRhaW5QdHI8TlNVUkxSZXF1 ZXN0PiBuc1JlcXVlc3QgPSByZXF1ZXN0Lm5zVVJMUmVxdWVzdChXZWJDb3JlOjpIVFRQQm9keVVw ZGF0ZVBvbGljeTo6VXBkYXRlSFRUUEJvZHkpOwogICAgIFJldGFpblB0cjxOU011dGFibGVVUkxS ZXF1ZXN0PiBtdXRhYmxlUmVxdWVzdCA9IGFkb3B0TlMoW25zUmVxdWVzdC5nZXQoKSBtdXRhYmxl Q29weV0pOwogCi0gICAgaWYgKCFwYXJhbWV0ZXJzLmlzTWFpbkZyYW1lTmF2aWdhdGlvbgotICAg ICAgICAmJiBwYXJhbWV0ZXJzLmhhZE1haW5GcmFtZU1haW5SZXNvdXJjZVByaXZhdGVSZWxheWVk CisgICAgaWYgKChwYXJhbWV0ZXJzLmlzTWFpbkZyYW1lTmF2aWdhdGlvbgorICAgICAgICB8fCBw YXJhbWV0ZXJzLmhhZE1haW5GcmFtZU1haW5SZXNvdXJjZVByaXZhdGVSZWxheWVkIC8vIFRoaXMg bWVhbnMgaXQgZGlkIG5vdCBmYWlsLiBGSVhNRTogYWRqdXN0IG5hbWVzIHRvIHJlZmxlY3QgdGhp cy4KKyAgICAgICAgfHwgIXBhcmFtZXRlcnMudG9wT3JpZ2luCisgICAgICAgIHx8IHJlcXVlc3Qu dXJsKCkuaG9zdCgpID09IHBhcmFtZXRlcnMudG9wT3JpZ2luLT5ob3N0KCkpCiAgICAgICAgICYm IFttdXRhYmxlUmVxdWVzdCByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9zZXRQcml2YWN5 UHJveHlGYWlsQ2xvc2VkRm9yVW5yZWFjaGFibGVOb25NYWluSG9zdHM6KV0pCiAgICAgICAgIFtt dXRhYmxlUmVxdWVzdCBfc2V0UHJpdmFjeVByb3h5RmFpbENsb3NlZEZvclVucmVhY2hhYmxlTm9u TWFpbkhvc3RzOllFU107CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQppbmRleCBmMTIxZDVlZjg5OWMwNmI3 MTJiM2YyODU1YTkzMGZkYTYyMzc5OTcyLi43MGY0ZGZlNjVkZjNlNGQ0NTYyN2YxODY5M2M0N2E1 NmQzNTExOGQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29h L05ldHdvcmtTZXNzaW9uQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCkBAIC05MzEsNyArOTMxLDcgQEAgQUxMT1df REVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECiAKICAgICAgICAgTlNVUkxTZXNzaW9uVGFza1Ry YW5zYWN0aW9uTWV0cmljcyAqbWV0cmljcyA9IHRhc2tNZXRyaWNzLnRyYW5zYWN0aW9uTWV0cmlj cy5sYXN0T2JqZWN0OwogI2lmIEhBVkUoTkVUV09SS19DT05ORUNUSU9OX1BSSVZBQ1lfU1RBTkNF KQotICAgICAgICBhdXRvIHByaXZhdGVSZWxheWVkID0gbWV0cmljcy5fcHJpdmFjeVN0YW5jZSA9 PSBud19jb25uZWN0aW9uX3ByaXZhY3lfc3RhbmNlX2RpcmVjdCA/IFByaXZhdGVSZWxheWVkOjpO byA6IFByaXZhdGVSZWxheWVkOjpZZXM7CisgICAgICAgIGF1dG8gcHJpdmF0ZVJlbGF5ZWQgPSBt ZXRyaWNzLl9wcml2YWN5U3RhbmNlID09IG53X2Nvbm5lY3Rpb25fcHJpdmFjeV9zdGFuY2VfZmFp bGVkID8gUHJpdmF0ZVJlbGF5ZWQ6Ok5vIDogUHJpdmF0ZVJlbGF5ZWQ6OlllczsKICNlbHNlCiAg ICAgICAgIGF1dG8gcHJpdmF0ZVJlbGF5ZWQgPSBQcml2YXRlUmVsYXllZDo6Tm87CiAjZW5kaWYK 454526 2022-03-11 19:37:15 -0800 2022-03-17 11:29:58 -0700 Patch bug-237735-20220311193714.patch text/plain 4604 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMDUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM0NTc1NDM2M2Y0NGMyNzYx NWFlZmZhZGI0YmVjZTZjMGEyMGM2YjEuLmY2ODI2ZTg1NTU2MmE5NTQ0YThkODllZjQ2ZGZkNzBm M2MzNDBjN2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjItMDMtMTEgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBBZGp1c3Qgd2hl biBfc2V0UHJpdmFjeVByb3h5RmFpbENsb3NlZEZvclVucmVhY2hhYmxlTm9uTWFpbkhvc3RzIGlz IGNhbGxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjM3NzM1CisgICAgICAgIDxyZGFyOi8vODk5NzIwMDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg R2VvZmYgR2FyZW4uCisKKyAgICAgICAgSXQgd2FzIG9yaWdpbmFsbHkgYmVpbmcgY2FsbGVkIGRp ZmZlcmVudGx5IGJldHdlZW4gbWFpbiByZXNvdXJjZXMgYW5kIHN1YnJlc291cmNlcyBvbiB0aGUg c2FtZSBkb21haW4sCisgICAgICAgIGNhdXNpbmcgdGhlbSB0byB1c2UgY29ubmVjdGlvbnMgd2l0 aCBkaWZmZXJlbnQgcHJvcGVydGllcywgc28gd2UgY291bGRuJ3Qgc2hhcmUgY29ubmVjdGlvbnMg YW55IG1vcmUuCisgICAgICAgIFRoaXMgd2lsbCBtYWtlIGl0IHNvIHRoYXQgbW9yZSBjb25uZWN0 aW9ucyBhcmUgc2hhcmVkLCB3aGljaCBzaG91bGQgZml4IHRoZSBwZXJmb3JtYW5jZSByZWdyZXNz aW9uIGZyb20KKyAgICAgICAgbm8gbG9uZ2VyIHNoYXJpbmcgY29ubmVjdGlvbnMgdG8gdGhlIHNh bWUgZG9tYWluLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFU YXNrQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtEYXRhVGFza0NvY29hOjpOZXR3 b3JrRGF0YVRhc2tDb2NvYSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29y a1Nlc3Npb25Db2NvYS5tbToKKyAgICAgICAgKC1bV0tOZXR3b3JrU2Vzc2lvbkRlbGVnYXRlIFVS TFNlc3Npb246ZGF0YVRhc2s6ZGlkUmVjZWl2ZVJlc3BvbnNlOmNvbXBsZXRpb25IYW5kbGVyOl0p OgorCiAyMDIyLTAzLTA5ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgog CiAgICAgICAgIE1vdmUgUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OkJ1ZmZlci5pc1ZvbGF0aWxl IGludG8gSW1hZ2VCdWZmZXJCYWNrZW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29hLm1tIGIvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5tbQppbmRleCAzNWQ3N2Ji MjJiMTBlMWMwNzVhZTExMDRlYWIxYWZmM2M0MjE0OWVjLi45OWE1Y2Q1YWYwODE1M2EzNGU0ZDM5 N2VhMWFkZDMwMWNlNmZjZjQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2EubW0KQEAgLTM0MCwxMCArMzQw LDEzIEBAIE5ldHdvcmtEYXRhVGFza0NvY29hOjpOZXR3b3JrRGF0YVRhc2tDb2NvYShOZXR3b3Jr U2Vzc2lvbiYgc2Vzc2lvbiwgTmV0d29ya0RhdGFUCiAgICAgUmV0YWluUHRyPE5TVVJMUmVxdWVz dD4gbnNSZXF1ZXN0ID0gcmVxdWVzdC5uc1VSTFJlcXVlc3QoV2ViQ29yZTo6SFRUUEJvZHlVcGRh dGVQb2xpY3k6OlVwZGF0ZUhUVFBCb2R5KTsKICAgICBSZXRhaW5QdHI8TlNNdXRhYmxlVVJMUmVx dWVzdD4gbXV0YWJsZVJlcXVlc3QgPSBhZG9wdE5TKFtuc1JlcXVlc3QuZ2V0KCkgbXV0YWJsZUNv cHldKTsKIAotICAgIGlmICghcGFyYW1ldGVycy5pc01haW5GcmFtZU5hdmlnYXRpb24KLSAgICAg ICAgJiYgcGFyYW1ldGVycy5oYWRNYWluRnJhbWVNYWluUmVzb3VyY2VQcml2YXRlUmVsYXllZAot ICAgICAgICAmJiBbbXV0YWJsZVJlcXVlc3QgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihf c2V0UHJpdmFjeVByb3h5RmFpbENsb3NlZEZvclVucmVhY2hhYmxlTm9uTWFpbkhvc3RzOildKQot ICAgICAgICBbbXV0YWJsZVJlcXVlc3QgX3NldFByaXZhY3lQcm94eUZhaWxDbG9zZWRGb3JVbnJl YWNoYWJsZU5vbk1haW5Ib3N0czpZRVNdOworICAgIGlmIChwYXJhbWV0ZXJzLmlzTWFpbkZyYW1l TmF2aWdhdGlvbgorICAgICAgICB8fCBwYXJhbWV0ZXJzLmhhZE1haW5GcmFtZU1haW5SZXNvdXJj ZVByaXZhdGVSZWxheWVkIC8vIFRoaXMgbWVhbnMgaXQgZGlkIG5vdCBmYWlsLiBGSVhNRTogYWRq dXN0IG5hbWVzIHRvIHJlZmxlY3QgdGhpcy4KKyAgICAgICAgfHwgIXBhcmFtZXRlcnMudG9wT3Jp Z2luCisgICAgICAgIHx8IHJlcXVlc3QudXJsKCkuaG9zdCgpID09IHBhcmFtZXRlcnMudG9wT3Jp Z2luLT5ob3N0KCkpIHsKKyAgICAgICAgaWYgKFttdXRhYmxlUmVxdWVzdCByZXNwb25kc1RvU2Vs ZWN0b3I6QHNlbGVjdG9yKF9zZXRQcml2YWN5UHJveHlGYWlsQ2xvc2VkRm9yVW5yZWFjaGFibGVO b25NYWluSG9zdHM6KV0pCisgICAgICAgICAgICBbbXV0YWJsZVJlcXVlc3QgX3NldFByaXZhY3lQ cm94eUZhaWxDbG9zZWRGb3JVbnJlYWNoYWJsZU5vbk1haW5Ib3N0czpZRVNdOworICAgIH0KIAog I2lmIEVOQUJMRShBUFBfUFJJVkFDWV9SRVBPUlQpCiAgICAgbXV0YWJsZVJlcXVlc3QuZ2V0KCku YXR0cmlidXRpb24gPSByZXF1ZXN0LmlzQXBwSW5pdGlhdGVkKCkgPyBOU1VSTFJlcXVlc3RBdHRy aWJ1dGlvbkRldmVsb3BlciA6IE5TVVJMUmVxdWVzdEF0dHJpYnV0aW9uVXNlcjsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2Nv YS5tbSBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25D b2NvYS5tbQppbmRleCBmMTIxZDVlZjg5OWMwNmI3MTJiM2YyODU1YTkzMGZkYTYyMzc5OTcyLi4x NjRhMmYyYjkxYWE2YzI1ZDE1MmJlOThjNmJlZGRiNzg0YzcxMzJhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KKysr IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29h Lm1tCkBAIC05MzEsNyArOTMxLDcgQEAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5E CiAKICAgICAgICAgTlNVUkxTZXNzaW9uVGFza1RyYW5zYWN0aW9uTWV0cmljcyAqbWV0cmljcyA9 IHRhc2tNZXRyaWNzLnRyYW5zYWN0aW9uTWV0cmljcy5sYXN0T2JqZWN0OwogI2lmIEhBVkUoTkVU V09SS19DT05ORUNUSU9OX1BSSVZBQ1lfU1RBTkNFKQotICAgICAgICBhdXRvIHByaXZhdGVSZWxh eWVkID0gbWV0cmljcy5fcHJpdmFjeVN0YW5jZSA9PSBud19jb25uZWN0aW9uX3ByaXZhY3lfc3Rh bmNlX2RpcmVjdCA/IFByaXZhdGVSZWxheWVkOjpObyA6IFByaXZhdGVSZWxheWVkOjpZZXM7Cisg ICAgICAgIGF1dG8gcHJpdmF0ZVJlbGF5ZWQgPSBtZXRyaWNzLl9wcml2YWN5U3RhbmNlID09IG53 X2Nvbm5lY3Rpb25fcHJpdmFjeV9zdGFuY2VfZmFpbGVkID8gUHJpdmF0ZVJlbGF5ZWQ6Ok5vIDog UHJpdmF0ZVJlbGF5ZWQ6OlllczsKICNlbHNlCiAgICAgICAgIGF1dG8gcHJpdmF0ZVJlbGF5ZWQg PSBQcml2YXRlUmVsYXllZDo6Tm87CiAjZW5kaWYKQEAgLTE3MjEsNyArMTcyMSw3IEBAIHN0ZDo6 dW5pcXVlX3B0cjxXZWJTb2NrZXRUYXNrPiBOZXR3b3JrU2Vzc2lvbkNvY29hOjpjcmVhdGVXZWJT b2NrZXRUYXNrKFdlYlBhZ2VQCiAgICAgLy8gUmVkdWNlIHRoYXQgdG8gb25lIGlmIHRoZSBwcm90 b2NvbCBpcyBudWxsLCB0aGUgcmVxdWVzdCBpc24ndCBhcHAgaW5pdGlhdGVkLAogICAgIC8vIG9y IHRoZSBtYWluIGZyYW1lIG1haW4gcmVzb3VyY2Ugd2FzIHByaXZhdGUgcmVsYXllZCwgdGhlbiBz ZXQgYWxsIHByb3BlcnRpZXMKICAgICAvLyBvbiB0aGUgb25lIGNvcHkuCi0gICAgaWYgKGhhZE1h aW5GcmFtZU1haW5SZXNvdXJjZVByaXZhdGVSZWxheWVkKSB7CisgICAgaWYgKGhhZE1haW5GcmFt ZU1haW5SZXNvdXJjZVByaXZhdGVSZWxheWVkIHx8IHJlcXVlc3QudXJsKCkuaG9zdCgpID09IGNs aWVudE9yaWdpbi50b3BPcmlnaW4uaG9zdCkgewogICAgICAgICBSZXRhaW5QdHI8TlNNdXRhYmxl VVJMUmVxdWVzdD4gbXV0YWJsZVJlcXVlc3QgPSBhZG9wdE5TKFtuc1JlcXVlc3QuZ2V0KCkgbXV0 YWJsZUNvcHldKTsKICAgICAgICAgaWYgKFttdXRhYmxlUmVxdWVzdCByZXNwb25kc1RvU2VsZWN0 b3I6QHNlbGVjdG9yKF9zZXRQcml2YWN5UHJveHlGYWlsQ2xvc2VkRm9yVW5yZWFjaGFibGVOb25N YWluSG9zdHM6KV0pCiAgICAgICAgICAgICBbbXV0YWJsZVJlcXVlc3QgX3NldFByaXZhY3lQcm94 eUZhaWxDbG9zZWRGb3JVbnJlYWNoYWJsZU5vbk1haW5Ib3N0czpZRVNdOwo= 454998 2022-03-17 11:30:00 -0700 2022-04-13 17:17:39 -0700 Patch bug-237735-20220317112959.patch text/plain 4633 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMzA0Cndhcm5pbmc6IHVuYWJsZSB0byBhY2Nlc3MgJy9V c2Vycy9hbGV4Y2hyaXN0ZW5zZW4vLmNvbmZpZy9naXQvYXR0cmlidXRlcyc6IFBlcm1pc3Npb24g ZGVuaWVkCndhcm5pbmc6IHVuYWJsZSB0byBhY2Nlc3MgJy9Vc2Vycy9hbGV4Y2hyaXN0ZW5zZW4v LmNvbmZpZy9naXQvYXR0cmlidXRlcyc6IFBlcm1pc3Npb24gZGVuaWVkCndhcm5pbmc6IHVuYWJs ZSB0byBhY2Nlc3MgJy9Vc2Vycy9hbGV4Y2hyaXN0ZW5zZW4vLmNvbmZpZy9naXQvYXR0cmlidXRl cyc6IFBlcm1pc3Npb24gZGVuaWVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDgxOTU1ZTFkYWM1NzJhMTM0MDY2YmIy Y2FhMDhhM2UzYjZjMTFjNmIuLjgyYjg0Y2JhMGE1M2U1MjMzYmEyMjQ4OTg5ZmUzY2FkN2Q0OTJh Y2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjItMDMtMTcgIEFsZXggQ2hyaXN0ZW5z ZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBBZGp1c3Qgd2hlbiBfc2V0 UHJpdmFjeVByb3h5RmFpbENsb3NlZEZvclVucmVhY2hhYmxlTm9uTWFpbkhvc3RzIGlzIGNhbGxl ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NzM1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBOZXR3 b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5tbToKKyAgICAgICAgKFdlYktp dDo6TmV0d29ya0RhdGFUYXNrQ29jb2E6Ok5ldHdvcmtEYXRhVGFza0NvY29hKToKKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tOgorICAgICAgICAo LVtXS05ldHdvcmtTZXNzaW9uRGVsZWdhdGUgVVJMU2Vzc2lvbjpkYXRhVGFzazpkaWRSZWNlaXZl UmVzcG9uc2U6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtT ZXNzaW9uQ29jb2E6OmNyZWF0ZVdlYlNvY2tldFRhc2spOgorCiAyMDIyLTAzLTE1ICBBZGl0eWEg S2VlcnRoaSAgPGFrZWVydGhpQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBJbmRlZmluaXRl IGhhbmcgd2hlbiBwcmludGluZyB1c2luZyBhIFVJUHJpbnRQYWdlUmVuZGVyZXIKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29j b2EubW0gYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFz a0NvY29hLm1tCmluZGV4IGUxZmFiOGU5ZDhhZTIxZWIwZDdmOTg5ZTJhZDVlMzNiZTYzNmI0MzMu Ljk5YTVjZDVhZjA4MTUzYTM0ZTRkMzk3ZWExYWRkMzAxY2U2ZmNmNDIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2EubW0K KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tD b2NvYS5tbQpAQCAtMzQwLDYgKzM0MCwxNCBAQCBOZXR3b3JrRGF0YVRhc2tDb2NvYTo6TmV0d29y a0RhdGFUYXNrQ29jb2EoTmV0d29ya1Nlc3Npb24mIHNlc3Npb24sIE5ldHdvcmtEYXRhVAogICAg IFJldGFpblB0cjxOU1VSTFJlcXVlc3Q+IG5zUmVxdWVzdCA9IHJlcXVlc3QubnNVUkxSZXF1ZXN0 KFdlYkNvcmU6OkhUVFBCb2R5VXBkYXRlUG9saWN5OjpVcGRhdGVIVFRQQm9keSk7CiAgICAgUmV0 YWluUHRyPE5TTXV0YWJsZVVSTFJlcXVlc3Q+IG11dGFibGVSZXF1ZXN0ID0gYWRvcHROUyhbbnNS ZXF1ZXN0LmdldCgpIG11dGFibGVDb3B5XSk7CiAKKyAgICBpZiAocGFyYW1ldGVycy5pc01haW5G cmFtZU5hdmlnYXRpb24KKyAgICAgICAgfHwgcGFyYW1ldGVycy5oYWRNYWluRnJhbWVNYWluUmVz b3VyY2VQcml2YXRlUmVsYXllZCAvLyBUaGlzIG1lYW5zIGl0IGRpZCBub3QgZmFpbC4gRklYTUU6 IGFkanVzdCBuYW1lcyB0byByZWZsZWN0IHRoaXMuCisgICAgICAgIHx8ICFwYXJhbWV0ZXJzLnRv cE9yaWdpbgorICAgICAgICB8fCByZXF1ZXN0LnVybCgpLmhvc3QoKSA9PSBwYXJhbWV0ZXJzLnRv cE9yaWdpbi0+aG9zdCgpKSB7CisgICAgICAgIGlmIChbbXV0YWJsZVJlcXVlc3QgcmVzcG9uZHNU b1NlbGVjdG9yOkBzZWxlY3Rvcihfc2V0UHJpdmFjeVByb3h5RmFpbENsb3NlZEZvclVucmVhY2hh YmxlTm9uTWFpbkhvc3RzOildKQorICAgICAgICAgICAgW211dGFibGVSZXF1ZXN0IF9zZXRQcml2 YWN5UHJveHlGYWlsQ2xvc2VkRm9yVW5yZWFjaGFibGVOb25NYWluSG9zdHM6WUVTXTsKKyAgICB9 CisKICNpZiBFTkFCTEUoQVBQX1BSSVZBQ1lfUkVQT1JUKQogICAgIG11dGFibGVSZXF1ZXN0Lmdl dCgpLmF0dHJpYnV0aW9uID0gcmVxdWVzdC5pc0FwcEluaXRpYXRlZCgpID8gTlNVUkxSZXF1ZXN0 QXR0cmlidXRpb25EZXZlbG9wZXIgOiBOU1VSTFJlcXVlc3RBdHRyaWJ1dGlvblVzZXI7CiAjZW5k aWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29y a1Nlc3Npb25Db2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0 d29ya1Nlc3Npb25Db2NvYS5tbQppbmRleCA1ZGQxYmM4YTkzNmFkODE0NjQ5MjE4ZDliNDA5MjFi MDdiZDZiZjNiLi4xNjRhMmYyYjkxYWE2YzI1ZDE1MmJlOThjNmJlZGRiNzg0YzcxMzJhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9u Q29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3Jr U2Vzc2lvbkNvY29hLm1tCkBAIC05MzEsNyArOTMxLDcgQEAgQUxMT1dfREVQUkVDQVRFRF9ERUNM QVJBVElPTlNfRU5ECiAKICAgICAgICAgTlNVUkxTZXNzaW9uVGFza1RyYW5zYWN0aW9uTWV0cmlj cyAqbWV0cmljcyA9IHRhc2tNZXRyaWNzLnRyYW5zYWN0aW9uTWV0cmljcy5sYXN0T2JqZWN0Owog I2lmIEhBVkUoTkVUV09SS19DT05ORUNUSU9OX1BSSVZBQ1lfU1RBTkNFKQotICAgICAgICBhdXRv IHByaXZhdGVSZWxheWVkID0gbWV0cmljcy5fcHJpdmFjeVN0YW5jZSA9PSBud19jb25uZWN0aW9u X3ByaXZhY3lfc3RhbmNlX2RpcmVjdCA/IFByaXZhdGVSZWxheWVkOjpObyA6IFByaXZhdGVSZWxh eWVkOjpZZXM7CisgICAgICAgIGF1dG8gcHJpdmF0ZVJlbGF5ZWQgPSBtZXRyaWNzLl9wcml2YWN5 U3RhbmNlID09IG53X2Nvbm5lY3Rpb25fcHJpdmFjeV9zdGFuY2VfZmFpbGVkID8gUHJpdmF0ZVJl bGF5ZWQ6Ok5vIDogUHJpdmF0ZVJlbGF5ZWQ6OlllczsKICNlbHNlCiAgICAgICAgIGF1dG8gcHJp dmF0ZVJlbGF5ZWQgPSBQcml2YXRlUmVsYXllZDo6Tm87CiAjZW5kaWYKQEAgLTE3MTcsNiArMTcx NywxNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8V2ViU29ja2V0VGFzaz4gTmV0d29ya1Nlc3Npb25Db2Nv YTo6Y3JlYXRlV2ViU29ja2V0VGFzayhXZWJQYWdlUAogICAgIGFwcFByaXZhY3lSZXBvcnRUZXN0 aW5nRGF0YSgpLmRpZExvYWRBcHBJbml0aWF0ZWRSZXF1ZXN0KG5zUmVxdWVzdC5nZXQoKS5hdHRy aWJ1dGlvbiA9PSBOU1VSTFJlcXVlc3RBdHRyaWJ1dGlvbkRldmVsb3Blcik7CiAjZW5kaWYKIAor ICAgIC8vIEZJWE1FOiBUaGlzIGZ1bmN0aW9uIGNhbiBtYWtlIHVwIHRvIDMgY29waWVzIG9mIGEg cmVxdWVzdC4KKyAgICAvLyBSZWR1Y2UgdGhhdCB0byBvbmUgaWYgdGhlIHByb3RvY29sIGlzIG51 bGwsIHRoZSByZXF1ZXN0IGlzbid0IGFwcCBpbml0aWF0ZWQsCisgICAgLy8gb3IgdGhlIG1haW4g ZnJhbWUgbWFpbiByZXNvdXJjZSB3YXMgcHJpdmF0ZSByZWxheWVkLCB0aGVuIHNldCBhbGwgcHJv cGVydGllcworICAgIC8vIG9uIHRoZSBvbmUgY29weS4KKyAgICBpZiAoaGFkTWFpbkZyYW1lTWFp blJlc291cmNlUHJpdmF0ZVJlbGF5ZWQgfHwgcmVxdWVzdC51cmwoKS5ob3N0KCkgPT0gY2xpZW50 T3JpZ2luLnRvcE9yaWdpbi5ob3N0KSB7CisgICAgICAgIFJldGFpblB0cjxOU011dGFibGVVUkxS ZXF1ZXN0PiBtdXRhYmxlUmVxdWVzdCA9IGFkb3B0TlMoW25zUmVxdWVzdC5nZXQoKSBtdXRhYmxl Q29weV0pOworICAgICAgICBpZiAoW211dGFibGVSZXF1ZXN0IHJlc3BvbmRzVG9TZWxlY3RvcjpA c2VsZWN0b3IoX3NldFByaXZhY3lQcm94eUZhaWxDbG9zZWRGb3JVbnJlYWNoYWJsZU5vbk1haW5I b3N0czopXSkKKyAgICAgICAgICAgIFttdXRhYmxlUmVxdWVzdCBfc2V0UHJpdmFjeVByb3h5RmFp bENsb3NlZEZvclVucmVhY2hhYmxlTm9uTWFpbkhvc3RzOllFU107CisgICAgICAgIG5zUmVxdWVz dCA9IFdURk1vdmUobXV0YWJsZVJlcXVlc3QpOworICAgIH0KKwogICAgIGF1dG8mIHNlc3Npb25T ZXQgPSBzZXNzaW9uU2V0Rm9yUGFnZSh3ZWJQYWdlUHJveHlJRCk7CiAgICAgUmV0YWluUHRyPE5T VVJMU2Vzc2lvbldlYlNvY2tldFRhc2s+IHRhc2sgPSBbc2Vzc2lvblNldC5zZXNzaW9uV2l0aENy ZWRlbnRpYWxTdG9yYWdlLnNlc3Npb24gd2ViU29ja2V0VGFza1dpdGhSZXF1ZXN0Om5zUmVxdWVz dC5nZXQoKV07CiAgICAgCg== 457579 2022-04-13 17:17:43 -0700 2022-04-13 17:18:51 -0700 Patch bug-237735-20220413171742.patch text/plain 4561 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyOTI4NDQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDIyLTA0LTEzICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRqdXN0IHdoZW4g X3NldFByaXZhY3lQcm94eUZhaWxDbG9zZWRGb3JVbnJlYWNoYWJsZU5vbk1haW5Ib3N0cyBpcyBj YWxsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz NzczNQorCisgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmIEdhcmVuLgorCisgICAgICAgIFRoaXMg aXMgcmVjb21taXR0aW5nIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvcjI5MTU5OCBidXQgbGVhdmlu ZyB0aGUgZGVmaW5pdGlvbiBvZiBQcml2YXRlUmVsYXllZDo6WWVzIGFuZCA6Ok5vCisgICAgICAg IGJhc2VkIG9uIHdoZXRoZXIgbWV0cmljcy5fcHJpdmFjeVN0YW5jZSA9PSBud19jb25uZWN0aW9u X3ByaXZhY3lfc3RhbmNlX2RpcmVjdCBpbnN0ZWFkIG9mIG53X2Nvbm5lY3Rpb25fcHJpdmFjeV9z dGFuY2VfZmFpbGVkLgorICAgICAgICBJdCBoYXMgZmxpcCBmbG9wcGVkIHNldmVyYWwgdGltZXMg aW4gdGhlIHZhcmlvdXMgcmVsYXRlZCBjb21taXRzLCBidXQgaXQgbmVlZHMgdG8gYmUgbndfY29u bmVjdGlvbl9wcml2YWN5X3N0YW5jZV9kaXJlY3QuCisgICAgICAgIEkgbWFudWFsbHkgdmVyaWZp ZWQgdGhhdCB0aGlzIGZpeGVzIDxyZGFyOi8vODg5NjU1NTA+IHdpdGhvdXQgcmVpbnRyb2R1Y2lu ZyA8cmRhcjovLzkwNjc3OTU1Pi4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NvY29hL05l dHdvcmtEYXRhVGFza0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrRGF0YVRhc2tD b2NvYTo6TmV0d29ya0RhdGFUYXNrQ29jb2EpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2Nv Y29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW06CisgICAgICAgICgtW1dLTmV0d29ya1Nlc3Npb25E ZWxlZ2F0ZSBVUkxTZXNzaW9uOmRhdGFUYXNrOmRpZFJlY2VpdmVSZXNwb25zZTpjb21wbGV0aW9u SGFuZGxlcjpdKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Nlc3Npb25Db2NvYTo6Y3JlYXRl V2ViU29ja2V0VGFzayk6CisKIDIwMjItMDQtMTMgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxl LmNvbT4KIAogICAgICAgICBXZWJDb250ZW50IGNyYXNoZXMgd2l0aCBTSUdURVJNX1RJTUVPVVQg b24gbWFjT1MKSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29y a0RhdGFUYXNrQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5tbQkocmV2aXNpb24gMjkyODQ0KQorKysg U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5t bQkod29ya2luZyBjb3B5KQpAQCAtMzQwLDYgKzM0MCwxNCBAQCBOZXR3b3JrRGF0YVRhc2tDb2Nv YTo6TmV0d29ya0RhdGFUYXNrQ29jCiAgICAgUmV0YWluUHRyPE5TVVJMUmVxdWVzdD4gbnNSZXF1 ZXN0ID0gcmVxdWVzdC5uc1VSTFJlcXVlc3QoV2ViQ29yZTo6SFRUUEJvZHlVcGRhdGVQb2xpY3k6 OlVwZGF0ZUhUVFBCb2R5KTsKICAgICBSZXRhaW5QdHI8TlNNdXRhYmxlVVJMUmVxdWVzdD4gbXV0 YWJsZVJlcXVlc3QgPSBhZG9wdE5TKFtuc1JlcXVlc3QuZ2V0KCkgbXV0YWJsZUNvcHldKTsKIAor ICAgIGlmIChwYXJhbWV0ZXJzLmlzTWFpbkZyYW1lTmF2aWdhdGlvbgorICAgICAgICB8fCBwYXJh bWV0ZXJzLmhhZE1haW5GcmFtZU1haW5SZXNvdXJjZVByaXZhdGVSZWxheWVkIC8vIFRoaXMgbWVh bnMgaXQgZGlkIG5vdCBmYWlsLiBGSVhNRTogYWRqdXN0IG5hbWVzIHRvIHJlZmxlY3QgdGhpcy4K KyAgICAgICAgfHwgIXBhcmFtZXRlcnMudG9wT3JpZ2luCisgICAgICAgIHx8IHJlcXVlc3QudXJs KCkuaG9zdCgpID09IHBhcmFtZXRlcnMudG9wT3JpZ2luLT5ob3N0KCkpIHsKKyAgICAgICAgaWYg KFttdXRhYmxlUmVxdWVzdCByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9zZXRQcml2YWN5 UHJveHlGYWlsQ2xvc2VkRm9yVW5yZWFjaGFibGVOb25NYWluSG9zdHM6KV0pCisgICAgICAgICAg ICBbbXV0YWJsZVJlcXVlc3QgX3NldFByaXZhY3lQcm94eUZhaWxDbG9zZWRGb3JVbnJlYWNoYWJs ZU5vbk1haW5Ib3N0czpZRVNdOworICAgIH0KKwogI2lmIEVOQUJMRShBUFBfUFJJVkFDWV9SRVBP UlQpCiAgICAgbXV0YWJsZVJlcXVlc3QuZ2V0KCkuYXR0cmlidXRpb24gPSByZXF1ZXN0LmlzQXBw SW5pdGlhdGVkKCkgPyBOU1VSTFJlcXVlc3RBdHRyaWJ1dGlvbkRldmVsb3BlciA6IE5TVVJMUmVx dWVzdEF0dHJpYnV0aW9uVXNlcjsKICNlbmRpZgpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQkocmV2 aXNpb24gMjkyODQ0KQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3 b3JrU2Vzc2lvbkNvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC05MzYsNyArOTM2LDcgQEAgLSAo dm9pZClVUkxTZXNzaW9uOihOU1VSTFNlc3Npb24gKilzZXNzaQogCiAgICAgICAgIE5TVVJMU2Vz c2lvblRhc2tUcmFuc2FjdGlvbk1ldHJpY3MgKm1ldHJpY3MgPSB0YXNrTWV0cmljcy50cmFuc2Fj dGlvbk1ldHJpY3MubGFzdE9iamVjdDsKICNpZiBIQVZFKE5FVFdPUktfQ09OTkVDVElPTl9QUklW QUNZX1NUQU5DRSkKLSAgICAgICAgYXV0byBwcml2YXRlUmVsYXllZCA9IG1ldHJpY3MuX3ByaXZh Y3lTdGFuY2UgPT0gbndfY29ubmVjdGlvbl9wcml2YWN5X3N0YW5jZV9mYWlsZWQgPyBQcml2YXRl UmVsYXllZDo6Tm8gOiBQcml2YXRlUmVsYXllZDo6WWVzOworICAgICAgICBhdXRvIHByaXZhdGVS ZWxheWVkID0gbWV0cmljcy5fcHJpdmFjeVN0YW5jZSA9PSBud19jb25uZWN0aW9uX3ByaXZhY3lf c3RhbmNlX2RpcmVjdCA/IFByaXZhdGVSZWxheWVkOjpObyA6IFByaXZhdGVSZWxheWVkOjpZZXM7 CiAjZWxzZQogICAgICAgICBhdXRvIHByaXZhdGVSZWxheWVkID0gUHJpdmF0ZVJlbGF5ZWQ6Ok5v OwogI2VuZGlmCkBAIC0xNzEzLDYgKzE3MTMsMTcgQEAgICAgICAgICBbcmVxdWVzdFdpdGhQcm90 b2NvbHMgYWRkVmFsdWU6IAogICAgIGFwcFByaXZhY3lSZXBvcnRUZXN0aW5nRGF0YSgpLmRpZExv YWRBcHBJbml0aWF0ZWRSZXF1ZXN0KG5zUmVxdWVzdC5nZXQoKS5hdHRyaWJ1dGlvbiA9PSBOU1VS TFJlcXVlc3RBdHRyaWJ1dGlvbkRldmVsb3Blcik7CiAjZW5kaWYKIAorICAgIC8vIEZJWE1FOiBU aGlzIGZ1bmN0aW9uIGNhbiBtYWtlIHVwIHRvIDMgY29waWVzIG9mIGEgcmVxdWVzdC4KKyAgICAv LyBSZWR1Y2UgdGhhdCB0byBvbmUgaWYgdGhlIHByb3RvY29sIGlzIG51bGwsIHRoZSByZXF1ZXN0 IGlzbid0IGFwcCBpbml0aWF0ZWQsCisgICAgLy8gb3IgdGhlIG1haW4gZnJhbWUgbWFpbiByZXNv dXJjZSB3YXMgcHJpdmF0ZSByZWxheWVkLCB0aGVuIHNldCBhbGwgcHJvcGVydGllcworICAgIC8v IG9uIHRoZSBvbmUgY29weS4KKyAgICBpZiAoaGFkTWFpbkZyYW1lTWFpblJlc291cmNlUHJpdmF0 ZVJlbGF5ZWQgfHwgcmVxdWVzdC51cmwoKS5ob3N0KCkgPT0gY2xpZW50T3JpZ2luLnRvcE9yaWdp bi5ob3N0KSB7CisgICAgICAgIFJldGFpblB0cjxOU011dGFibGVVUkxSZXF1ZXN0PiBtdXRhYmxl UmVxdWVzdCA9IGFkb3B0TlMoW25zUmVxdWVzdC5nZXQoKSBtdXRhYmxlQ29weV0pOworICAgICAg ICBpZiAoW211dGFibGVSZXF1ZXN0IHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3NldFBy aXZhY3lQcm94eUZhaWxDbG9zZWRGb3JVbnJlYWNoYWJsZU5vbk1haW5Ib3N0czopXSkKKyAgICAg ICAgICAgIFttdXRhYmxlUmVxdWVzdCBfc2V0UHJpdmFjeVByb3h5RmFpbENsb3NlZEZvclVucmVh Y2hhYmxlTm9uTWFpbkhvc3RzOllFU107CisgICAgICAgIG5zUmVxdWVzdCA9IFdURk1vdmUobXV0 YWJsZVJlcXVlc3QpOworICAgIH0KKwogICAgIGF1dG8mIHNlc3Npb25TZXQgPSBzZXNzaW9uU2V0 Rm9yUGFnZSh3ZWJQYWdlUHJveHlJRCk7CiAgICAgUmV0YWluUHRyPE5TVVJMU2Vzc2lvbldlYlNv Y2tldFRhc2s+IHRhc2sgPSBbc2Vzc2lvblNldC5zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdl LnNlc3Npb24gd2ViU29ja2V0VGFza1dpdGhSZXF1ZXN0Om5zUmVxdWVzdC5nZXQoKV07CiAgICAg Cg== 457580 2022-04-13 17:18:53 -0700 2022-04-13 17:21:10 -0700 Patch bug-237735-20220413171852.patch text/plain 4493 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyOTI4NDQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDIyLTA0LTEzICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRqdXN0IHdoZW4g X3NldFByaXZhY3lQcm94eUZhaWxDbG9zZWRGb3JVbnJlYWNoYWJsZU5vbk1haW5Ib3N0cyBpcyBj YWxsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz NzczNQorCisgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmIEdhcmVuLgorCisgICAgICAgIFRoaXMg aXMgcmVjb21taXR0aW5nIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvcjI5MTU5OCBidXQgbGVhdmlu ZyB0aGUgZGVmaW5pdGlvbiBvZiBQcml2YXRlUmVsYXllZDo6WWVzIGFuZCA6Ok5vCisgICAgICAg IGJhc2VkIG9uIHdoZXRoZXIgbWV0cmljcy5fcHJpdmFjeVN0YW5jZSA9PSBud19jb25uZWN0aW9u X3ByaXZhY3lfc3RhbmNlX2RpcmVjdCBpbnN0ZWFkIG9mIG53X2Nvbm5lY3Rpb25fcHJpdmFjeV9z dGFuY2VfZmFpbGVkLgorICAgICAgICBJdCBoYXMgZmxpcCBmbG9wcGVkIHNldmVyYWwgdGltZXMg aW4gdGhlIHZhcmlvdXMgcmVsYXRlZCBjb21taXRzLCBidXQgaXQgbmVlZHMgdG8gYmUgbndfY29u bmVjdGlvbl9wcml2YWN5X3N0YW5jZV9kaXJlY3QuCisgICAgICAgIEkgbWFudWFsbHkgdmVyaWZp ZWQgdGhhdCB0aGlzIGZpeGVzIDxyZGFyOi8vODg5NjU1NTA+IHdpdGhvdXQgcmVpbnRyb2R1Y2lu ZyA8cmRhcjovLzkwNjc3OTU1Pi4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NvY29hL05l dHdvcmtEYXRhVGFza0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrRGF0YVRhc2tD b2NvYTo6TmV0d29ya0RhdGFUYXNrQ29jb2EpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2Nv Y29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW06CisgICAgICAgICgtW1dLTmV0d29ya1Nlc3Npb25E ZWxlZ2F0ZSBVUkxTZXNzaW9uOmRhdGFUYXNrOmRpZFJlY2VpdmVSZXNwb25zZTpjb21wbGV0aW9u SGFuZGxlcjpdKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Nlc3Npb25Db2NvYTo6Y3JlYXRl V2ViU29ja2V0VGFzayk6CisKIDIwMjItMDQtMTMgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxl LmNvbT4KIAogICAgICAgICBXZWJDb250ZW50IGNyYXNoZXMgd2l0aCBTSUdURVJNX1RJTUVPVVQg b24gbWFjT1MKSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29y a0RhdGFUYXNrQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5tbQkocmV2aXNpb24gMjkyODQ0KQorKysg U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5t bQkod29ya2luZyBjb3B5KQpAQCAtMzQwLDYgKzM0MCwxNCBAQCBOZXR3b3JrRGF0YVRhc2tDb2Nv YTo6TmV0d29ya0RhdGFUYXNrQ29jCiAgICAgUmV0YWluUHRyPE5TVVJMUmVxdWVzdD4gbnNSZXF1 ZXN0ID0gcmVxdWVzdC5uc1VSTFJlcXVlc3QoV2ViQ29yZTo6SFRUUEJvZHlVcGRhdGVQb2xpY3k6 OlVwZGF0ZUhUVFBCb2R5KTsKICAgICBSZXRhaW5QdHI8TlNNdXRhYmxlVVJMUmVxdWVzdD4gbXV0 YWJsZVJlcXVlc3QgPSBhZG9wdE5TKFtuc1JlcXVlc3QuZ2V0KCkgbXV0YWJsZUNvcHldKTsKIAor ICAgIGlmIChwYXJhbWV0ZXJzLmlzTWFpbkZyYW1lTmF2aWdhdGlvbgorICAgICAgICB8fCBwYXJh bWV0ZXJzLmhhZE1haW5GcmFtZU1haW5SZXNvdXJjZVByaXZhdGVSZWxheWVkCisgICAgICAgIHx8 ICFwYXJhbWV0ZXJzLnRvcE9yaWdpbgorICAgICAgICB8fCByZXF1ZXN0LnVybCgpLmhvc3QoKSA9 PSBwYXJhbWV0ZXJzLnRvcE9yaWdpbi0+aG9zdCgpKSB7CisgICAgICAgIGlmIChbbXV0YWJsZVJl cXVlc3QgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfc2V0UHJpdmFjeVByb3h5RmFpbENs b3NlZEZvclVucmVhY2hhYmxlTm9uTWFpbkhvc3RzOildKQorICAgICAgICAgICAgW211dGFibGVS ZXF1ZXN0IF9zZXRQcml2YWN5UHJveHlGYWlsQ2xvc2VkRm9yVW5yZWFjaGFibGVOb25NYWluSG9z dHM6WUVTXTsKKyAgICB9CisKICNpZiBFTkFCTEUoQVBQX1BSSVZBQ1lfUkVQT1JUKQogICAgIG11 dGFibGVSZXF1ZXN0LmdldCgpLmF0dHJpYnV0aW9uID0gcmVxdWVzdC5pc0FwcEluaXRpYXRlZCgp ID8gTlNVUkxSZXF1ZXN0QXR0cmlidXRpb25EZXZlbG9wZXIgOiBOU1VSTFJlcXVlc3RBdHRyaWJ1 dGlvblVzZXI7CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29j b2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0JKHJldmlzaW9uIDI5Mjg0 NCkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25D b2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtOTM2LDcgKzkzNiw3IEBAIC0gKHZvaWQpVVJMU2Vz c2lvbjooTlNVUkxTZXNzaW9uICopc2Vzc2kKIAogICAgICAgICBOU1VSTFNlc3Npb25UYXNrVHJh bnNhY3Rpb25NZXRyaWNzICptZXRyaWNzID0gdGFza01ldHJpY3MudHJhbnNhY3Rpb25NZXRyaWNz Lmxhc3RPYmplY3Q7CiAjaWYgSEFWRShORVRXT1JLX0NPTk5FQ1RJT05fUFJJVkFDWV9TVEFOQ0Up Ci0gICAgICAgIGF1dG8gcHJpdmF0ZVJlbGF5ZWQgPSBtZXRyaWNzLl9wcml2YWN5U3RhbmNlID09 IG53X2Nvbm5lY3Rpb25fcHJpdmFjeV9zdGFuY2VfZmFpbGVkID8gUHJpdmF0ZVJlbGF5ZWQ6Ok5v IDogUHJpdmF0ZVJlbGF5ZWQ6OlllczsKKyAgICAgICAgYXV0byBwcml2YXRlUmVsYXllZCA9IG1l dHJpY3MuX3ByaXZhY3lTdGFuY2UgPT0gbndfY29ubmVjdGlvbl9wcml2YWN5X3N0YW5jZV9kaXJl Y3QgPyBQcml2YXRlUmVsYXllZDo6Tm8gOiBQcml2YXRlUmVsYXllZDo6WWVzOwogI2Vsc2UKICAg ICAgICAgYXV0byBwcml2YXRlUmVsYXllZCA9IFByaXZhdGVSZWxheWVkOjpObzsKICNlbmRpZgpA QCAtMTcxMyw2ICsxNzEzLDE3IEBAICAgICAgICAgW3JlcXVlc3RXaXRoUHJvdG9jb2xzIGFkZFZh bHVlOiAKICAgICBhcHBQcml2YWN5UmVwb3J0VGVzdGluZ0RhdGEoKS5kaWRMb2FkQXBwSW5pdGlh dGVkUmVxdWVzdChuc1JlcXVlc3QuZ2V0KCkuYXR0cmlidXRpb24gPT0gTlNVUkxSZXF1ZXN0QXR0 cmlidXRpb25EZXZlbG9wZXIpOwogI2VuZGlmCiAKKyAgICAvLyBGSVhNRTogVGhpcyBmdW5jdGlv biBjYW4gbWFrZSB1cCB0byAzIGNvcGllcyBvZiBhIHJlcXVlc3QuCisgICAgLy8gUmVkdWNlIHRo YXQgdG8gb25lIGlmIHRoZSBwcm90b2NvbCBpcyBudWxsLCB0aGUgcmVxdWVzdCBpc24ndCBhcHAg aW5pdGlhdGVkLAorICAgIC8vIG9yIHRoZSBtYWluIGZyYW1lIG1haW4gcmVzb3VyY2Ugd2FzIHBy aXZhdGUgcmVsYXllZCwgdGhlbiBzZXQgYWxsIHByb3BlcnRpZXMKKyAgICAvLyBvbiB0aGUgb25l IGNvcHkuCisgICAgaWYgKGhhZE1haW5GcmFtZU1haW5SZXNvdXJjZVByaXZhdGVSZWxheWVkIHx8 IHJlcXVlc3QudXJsKCkuaG9zdCgpID09IGNsaWVudE9yaWdpbi50b3BPcmlnaW4uaG9zdCkgewor ICAgICAgICBSZXRhaW5QdHI8TlNNdXRhYmxlVVJMUmVxdWVzdD4gbXV0YWJsZVJlcXVlc3QgPSBh ZG9wdE5TKFtuc1JlcXVlc3QuZ2V0KCkgbXV0YWJsZUNvcHldKTsKKyAgICAgICAgaWYgKFttdXRh YmxlUmVxdWVzdCByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9zZXRQcml2YWN5UHJveHlG YWlsQ2xvc2VkRm9yVW5yZWFjaGFibGVOb25NYWluSG9zdHM6KV0pCisgICAgICAgICAgICBbbXV0 YWJsZVJlcXVlc3QgX3NldFByaXZhY3lQcm94eUZhaWxDbG9zZWRGb3JVbnJlYWNoYWJsZU5vbk1h aW5Ib3N0czpZRVNdOworICAgICAgICBuc1JlcXVlc3QgPSBXVEZNb3ZlKG11dGFibGVSZXF1ZXN0 KTsKKyAgICB9CisKICAgICBhdXRvJiBzZXNzaW9uU2V0ID0gc2Vzc2lvblNldEZvclBhZ2Uod2Vi UGFnZVByb3h5SUQpOwogICAgIFJldGFpblB0cjxOU1VSTFNlc3Npb25XZWJTb2NrZXRUYXNrPiB0 YXNrID0gW3Nlc3Npb25TZXQuc2Vzc2lvbldpdGhDcmVkZW50aWFsU3RvcmFnZS5zZXNzaW9uIHdl YlNvY2tldFRhc2tXaXRoUmVxdWVzdDpuc1JlcXVlc3QuZ2V0KCldOwogICAgIAo=