226968 2021-06-14 06:12:00 -0700 Fix RTCDataChannelInit::decode 2021-06-17 05:40:31 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://github.com/web-platform-tests/wpt/pull/29361 InRadar P2 Normal --- 1 youennf youennf clopez eric.carlson ews-watchlist glenn hta jer.noble philipj sergio tommyw tsavell webkit-bug-importer youennf oldest_to_newest 1769362 0 youennf 2021-06-14 06:12:00 -0700 Fix RTCDataChannelInit::decode 1769369 1 431317 youennf 2021-06-14 06:21:47 -0700 Created attachment 431317 Patch 1769370 2 youennf 2021-06-14 06:22:15 -0700 Submitted web-platform-tests pull request: https://github.com/web-platform-tests/wpt/pull/29361 1769371 3 ews-watchlist 2021-06-14 06:22:32 -0700 This patch modifies the imported WPT tests. Please ensure that any changes on the tests (not coming from a WPT import) are exported to WPT. Please see https://trac.webkit.org/wiki/WPTExportProcess 1769378 4 431320 youennf 2021-06-14 07:03:07 -0700 Created attachment 431320 Patch 1769379 5 431321 youennf 2021-06-14 07:04:25 -0700 Created attachment 431321 Patch 1769478 6 ews-feeder 2021-06-14 11:41:02 -0700 Committed r278842 (238790@main): <https://commits.webkit.org/238790@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 431321. 1769479 7 webkit-bug-importer 2021-06-14 11:42:21 -0700 <rdar://problem/79300038> 1769593 8 tsavell 2021-06-14 16:21:55 -0700 the new test imported/w3c/web-platform-tests/webrtc-extensions/transfer-datachannel-service-worker.https.html from https://trac.webkit.org/changeset/278842/webkit is failing constantly History: https://results.webkit.org/?suite=layout-tests&test=imported%2Fw3c%2Fweb-platform-tests%2Fwebrtc-extensions%2Ftransfer-datachannel-service-worker.https.html 1769610 9 tsavell 2021-06-14 16:39:41 -0700 Reverted r278842 for reason: introduced a failing test Committed r278851 (238797@main): <https://commits.webkit.org/238797@main> 1769780 10 431433 youennf 2021-06-15 06:46:58 -0700 Created attachment 431433 Make test more reportive 1770112 11 431527 youennf 2021-06-16 01:37:50 -0700 Created attachment 431527 Patch 1770565 12 431644 youennf 2021-06-17 02:34:23 -0700 Created attachment 431644 Patch 1770596 13 ews-feeder 2021-06-17 05:38:24 -0700 Committed r278982 (238908@main): <https://commits.webkit.org/238908@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 431644. 431317 2021-06-14 06:21:47 -0700 2021-06-14 07:03:03 -0700 Patch bug-226968-20210614152146.patch text/plain 8135 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NjA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzNhNTM5MzUwMmM3M2Iw N2ZmYmUzNjhkOGZiOTgzNGY2NjFiZWU2MS4uMzJmODRmYjFjZjUwYmNkNmVjMDllZjRkZjUxMjU0 Yjc5MzQ3ZjMzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA2LTE0ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggUlRDRGF0YUNoYW5u ZWxJbml0OjpkZWNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyNjk2OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRlc3Q6IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjLWV4dGVu c2lvbnMvdHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIuaHR0cHMuaHRtbAorCisg ICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5uZWxIYW5kbGVyLmg6Cisg ICAgICAgIChXZWJDb3JlOjpSVENEYXRhQ2hhbm5lbEluaXQ6OmRlY29kZSk6CisgICAgICAgIE1h a2Ugc3VyZSB0byB1c2Ugb3B0aW9uYWxzIG9mIG9wdGlvbmFscy4KKwogMjAyMS0wNi0xMCAgWW91 ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgZ2V0RGlzcGxheU1lZGlh IEFQSSBkb2Vzbid0IHdvcmsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21l ZGlhc3RyZWFtL1JUQ0RhdGFDaGFubmVsSGFuZGxlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5uZWxIYW5kbGVyLmgKaW5kZXggMDU0NDI4ZDUwZGM2 MWFhYWQ1MTg4NzlkMjJjYmMyZjk3NzkxNTAzZS4uNmEzYWE4N2Q4OTMxYzRiODBjYTBkZWE3Mzgw NmI1NzBjODY3OGU1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz dHJlYW0vUlRDRGF0YUNoYW5uZWxIYW5kbGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5uZWxIYW5kbGVyLmgKQEAgLTYyLDE3ICs2MiwxNyBA QCB0ZW1wbGF0ZTxjbGFzcyBFbmNvZGVyPiB2b2lkIFJUQ0RhdGFDaGFubmVsSW5pdDo6ZW5jb2Rl KEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAKIHRlbXBsYXRlPGNsYXNzIERlY29kZXI+IHN0ZDo6 b3B0aW9uYWw8UlRDRGF0YUNoYW5uZWxJbml0PiBSVENEYXRhQ2hhbm5lbEluaXQ6OmRlY29kZShE ZWNvZGVyJiBkZWNvZGVyKQogewotICAgIHN0ZDo6b3B0aW9uYWw8Ym9vbD4gb3JkZXJlZDsKKyAg ICBzdGQ6Om9wdGlvbmFsPHN0ZDo6b3B0aW9uYWw8Ym9vbD4+IG9yZGVyZWQ7CiAgICAgZGVjb2Rl ciA+PiBvcmRlcmVkOwogICAgIGlmICghb3JkZXJlZCkKICAgICAgICAgcmV0dXJuIHsgfTsKIAot ICAgIHN0ZDo6b3B0aW9uYWw8dW5zaWduZWQgc2hvcnQ+IG1heFBhY2tldExpZmVUaW1lOworICAg IHN0ZDo6b3B0aW9uYWw8c3RkOjpvcHRpb25hbDx1bnNpZ25lZCBzaG9ydD4+IG1heFBhY2tldExp ZmVUaW1lOwogICAgIGRlY29kZXIgPj4gbWF4UGFja2V0TGlmZVRpbWU7CiAgICAgaWYgKCFtYXhQ YWNrZXRMaWZlVGltZSkKICAgICAgICAgcmV0dXJuIHsgfTsKIAotICAgIHN0ZDo6b3B0aW9uYWw8 dW5zaWduZWQgc2hvcnQ+IG1heFJldHJhbnNtaXRzOworICAgIHN0ZDo6b3B0aW9uYWw8c3RkOjpv cHRpb25hbDx1bnNpZ25lZCBzaG9ydD4+IG1heFJldHJhbnNtaXRzOwogICAgIGRlY29kZXIgPj4g bWF4UmV0cmFuc21pdHM7CiAgICAgaWYgKCFtYXhSZXRyYW5zbWl0cykKICAgICAgICAgcmV0dXJu IHsgfTsKQEAgLTgxLDEyICs4MSwxMiBAQCB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBzdGQ6Om9w dGlvbmFsPFJUQ0RhdGFDaGFubmVsSW5pdD4gUlRDRGF0YUNoYW5uZWxJbml0OjpkZQogICAgIGlm ICghZGVjb2Rlci5kZWNvZGUocHJvdG9jb2wpKQogICAgICAgICByZXR1cm4geyB9OwogCi0gICAg c3RkOjpvcHRpb25hbDxib29sPiBuZWdvdGlhdGVkOworICAgIHN0ZDo6b3B0aW9uYWw8c3RkOjpv cHRpb25hbDxib29sPj4gbmVnb3RpYXRlZDsKICAgICBkZWNvZGVyID4+IG5lZ290aWF0ZWQ7CiAg ICAgaWYgKCFuZWdvdGlhdGVkKQogICAgICAgICByZXR1cm4geyB9OwogCi0gICAgc3RkOjpvcHRp b25hbDx1bnNpZ25lZCBzaG9ydD4gaWQ7CisgICAgc3RkOjpvcHRpb25hbDxzdGQ6Om9wdGlvbmFs PHVuc2lnbmVkIHNob3J0Pj4gaWQ7CiAgICAgZGVjb2RlciA+PiBpZDsKICAgICBpZiAoIWlkKQog ICAgICAgICByZXR1cm4geyB9OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj L0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggZjI5 NTJjMTQ5ZjhkZTM1NTZiYTBiOGVkZWQ2ZjM0ODI4YWY4ZmNhYS4uMmE2OTUxZGQ3M2E0OGUxOWE2 YjQ5OWQ5NDU2ZDlkNGMxNDMxNjQ0ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv dzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTUgQEAKKzIwMjEtMDYtMTQgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUu Y29tPgorCisgICAgICAgIEZpeCBSVENEYXRhQ2hhbm5lbEluaXQ6OmRlY29kZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2OTY4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVz dHMvd2VicnRjLWV4dGVuc2lvbnMvdHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIu aHR0cHMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMv d2VicnRjLWV4dGVuc2lvbnMvdHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIuaHR0 cHMuaHRtbDogQWRkZWQuCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy1leHRl bnNpb25zL3RyYW5zZmVyLWRhdGFjaGFubmVsLXNlcnZpY2Utd29ya2VyLmpzOiBBZGRlZC4KKyAg ICAgICAgKG9ubWVzc2FnZSk6CisKIDIwMjEtMDYtMTQgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5A YXBwbGUuY29tPgogCiAgICAgICAgIE1vdmUgVHJhbnNmZXJhYmxlIFJUQ0RhdGFDaGFubmVsIHRl c3RzIHRvIFdQVApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy93ZWJydGMtZXh0ZW5zaW9ucy90cmFuc2Zlci1kYXRhY2hhbm5lbC1zZXJ2aWNl LXdvcmtlci5odHRwcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy1leHRlbnNpb25zL3RyYW5zZmVyLWRhdGFjaGFubmVsLXNl cnZpY2Utd29ya2VyLmh0dHBzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40OWJiMjk0MzExYTcz ZmUwZjRhNmFjNWMxZDkyMTJmNWNlZjRiMTkwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMtZXh0ZW5zaW9ucy90cmFu c2Zlci1kYXRhY2hhbm5lbC1zZXJ2aWNlLXdvcmtlci5odHRwcy1leHBlY3RlZC50eHQKQEAgLTAs MCArMSwzIEBACisKK1BBU1Mgb2ZmZXJlciBkYXRhIGNoYW5uZWwgaW4gc2VydmljZSB3b3JrZXIK KwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy93ZWJydGMtZXh0ZW5zaW9ucy90cmFuc2Zlci1kYXRhY2hhbm5lbC1zZXJ2aWNlLXdvcmtlci5o dHRwcy5odG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93 ZWJydGMtZXh0ZW5zaW9ucy90cmFuc2Zlci1kYXRhY2hhbm5lbC1zZXJ2aWNlLXdvcmtlci5odHRw cy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLmJhZGJkYWViNTRjZjRkY2FjYmNlY2EyODQ1YTBjMWJhMTU1ZmQ3 ZWIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL3dlYnJ0Yy1leHRlbnNpb25zL3RyYW5zZmVyLWRhdGFjaGFubmVsLXNlcnZpY2Ut d29ya2VyLmh0dHBzLmh0bWwKQEAgLTAsMCArMSw4MyBAQAorPCFkb2N0eXBlIGh0bWw+Cis8aHRt bD4KKyAgICA8aGVhZD4KKyAgICAgICAgPG1ldGEgY2hhcnNldD0idXRmLTgiPgorICAgICAgICA8 c2NyaXB0IHNyYz0iL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+CisgICAgICAg IDxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3NjcmlwdD4K KyAgICA8L2hlYWQ+CisgICAgPGJvZHk+CisgICAgICAgIDxzY3JpcHQgc3JjPSIuLi9zZXJ2aWNl LXdvcmtlcnMvc2VydmljZS13b3JrZXIvcmVzb3VyY2VzL3Rlc3QtaGVscGVycy5zdWIuanMiPjwv c2NyaXB0PgorICAgICAgICA8c2NyaXB0PgorYXN5bmMgZnVuY3Rpb24gY3JlYXRlQ29ubmVjdGlv bnModGVzdCwgZmlyc3RDb25uZWN0aW9uQ2FsbGJhY2ssIHNlY29uZENvbm5lY3Rpb25DYWxsYmFj aykKK3sKKyAgICBjb25zdCBwYzEgPSBuZXcgUlRDUGVlckNvbm5lY3Rpb24oKTsKKyAgICBjb25z dCBwYzIgPSBuZXcgUlRDUGVlckNvbm5lY3Rpb24oKTsKKworICAgIHRlc3QuYWRkX2NsZWFudXAo KCkgPT4gcGMxLmNsb3NlKCkpOworICAgIHRlc3QuYWRkX2NsZWFudXAoKCkgPT4gcGMyLmNsb3Nl KCkpOworCisgICAgcGMxLm9uaWNlY2FuZGlkYXRlID0gKGUpID0+IHBjMi5hZGRJY2VDYW5kaWRh dGUoZS5jYW5kaWRhdGUpOyAKKyAgICBwYzIub25pY2VjYW5kaWRhdGUgPSAoZSkgPT4gcGMxLmFk ZEljZUNhbmRpZGF0ZShlLmNhbmRpZGF0ZSk7IAorCisgICAgZmlyc3RDb25uZWN0aW9uQ2FsbGJh Y2socGMxKTsKKworICAgIGNvbnN0IG9mZmVyID0gYXdhaXQgcGMxLmNyZWF0ZU9mZmVyKCk7Cisg ICAgYXdhaXQgcGMxLnNldExvY2FsRGVzY3JpcHRpb24ob2ZmZXIpOworICAgIGF3YWl0IHBjMi5z ZXRSZW1vdGVEZXNjcmlwdGlvbihvZmZlcik7CisKKyAgICBzZWNvbmRDb25uZWN0aW9uQ2FsbGJh Y2socGMyKTsKKworICAgIGNvbnN0IGFuc3dlciA9IGF3YWl0IHBjMi5jcmVhdGVBbnN3ZXIoKTsK KyAgICBhd2FpdCBwYzIuc2V0TG9jYWxEZXNjcmlwdGlvbihhbnN3ZXIpOworICAgIGF3YWl0IHBj MS5zZXRSZW1vdGVEZXNjcmlwdGlvbihhbnN3ZXIpOworfQorCithc3luYyBmdW5jdGlvbiB3YWl0 Rm9yTWVzc2FnZShyZWNlaXZlciwgZGF0YSkKK3sKKyAgICB3aGlsZSAodHJ1ZSkgeworICAgICAg ICBjb25zdCByZWNlaXZlZCA9IGF3YWl0IG5ldyBQcm9taXNlKHJlc29sdmUgPT4gcmVjZWl2ZXIu b25tZXNzYWdlID0gKGV2ZW50KSA9PiByZXNvbHZlKGV2ZW50LmRhdGEpKTsKKyAgICAgICAgaWYg KGRhdGEgPT09IHJlY2VpdmVkKQorICAgICAgICAgICAgcmV0dXJuOworICAgIH0KK30KKworcHJv bWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9PiB7CisgICAgbGV0IGZyYW1lOworICAgIGNvbnN0IHNj b3BlID0gJ3Jlc291cmNlcy8nOworICAgIGNvbnN0IHNjcmlwdCA9ICd0cmFuc2Zlci1kYXRhY2hh bm5lbC1zZXJ2aWNlLXdvcmtlci5qcyc7CisKKyAgICBhd2FpdCBzZXJ2aWNlX3dvcmtlcl91bnJl Z2lzdGVyKHRlc3QsIHNjb3BlKTsKKyAgICBjb25zdCByZWdpc3RyYXRpb24gPSBhd2FpdCBuYXZp Z2F0b3Iuc2VydmljZVdvcmtlci5yZWdpc3RlcihzY3JpcHQsIHtzY29wZX0pOworICAgIHRlc3Qu YWRkX2NsZWFudXAoYXN5bmMgKCkgPT4geworICAgICAgICByZXR1cm4gc2VydmljZV93b3JrZXJf dW5yZWdpc3Rlcih0ZXN0LCBzY29wZSk7CisgICAgfSk7CisgICAgY29uc3Qgd29ya2VyID0gcmVn aXN0cmF0aW9uLmluc3RhbGxpbmc7CisKKyAgICBjb25zdCBtZXNzYWdlQ2hhbm5lbCA9IG5ldyBN ZXNzYWdlQ2hhbm5lbCgpOworCisgICAgbGV0IGxvY2FsQ2hhbm5lbDsKKyAgICBsZXQgcmVtb3Rl Q2hhbm5lbDsKKworICAgIGF3YWl0IG5ldyBQcm9taXNlKChyZXNvbHZlLCByZWplY3QpID0+IHsK KyAgICAgICAgY3JlYXRlQ29ubmVjdGlvbnModGVzdCwgKGZpcnN0Q29ubmVjdGlvbikgPT4gewor ICAgICAgICAgICAgbG9jYWxDaGFubmVsID0gZmlyc3RDb25uZWN0aW9uLmNyZWF0ZURhdGFDaGFu bmVsKCdzZW5kRGF0YUNoYW5uZWwnKTsKKyAgICAgICAgICAgIHdvcmtlci5wb3N0TWVzc2FnZSh7 Y2hhbm5lbDogbG9jYWxDaGFubmVsLCBwb3J0OiBtZXNzYWdlQ2hhbm5lbC5wb3J0Mn0sIFtsb2Nh bENoYW5uZWwsIG1lc3NhZ2VDaGFubmVsLnBvcnQyXSk7CisgICAgICAgIH0sIChzZWNvbmRDb25u ZWN0aW9uKSA9PiB7CisgICAgICAgICAgICBzZWNvbmRDb25uZWN0aW9uLm9uZGF0YWNoYW5uZWwg PSAoZXZlbnQpID0+IHsKKyAgICAgICAgICAgICAgICByZW1vdGVDaGFubmVsID0gZXZlbnQuY2hh bm5lbDsKKyAgICAgICAgICAgICAgICByZW1vdGVDaGFubmVsLm9ub3BlbiA9IHJlc29sdmU7Cisg ICAgICAgICAgICB9OworICAgICAgICB9KTsKKyAgICB9KTsKKworICAgIGNvbnN0IHByb21pc2Ug PSB3YWl0Rm9yTWVzc2FnZShtZXNzYWdlQ2hhbm5lbC5wb3J0MSwgIk9LIik7CisgICAgcmVtb3Rl Q2hhbm5lbC5zZW5kKCJPSyIpOworICAgIGF3YWl0IHByb21pc2U7CisKKyAgICBjb25zdCBkYXRh ID0gbmV3IFByb21pc2UocmVzb2x2ZSA9PiByZW1vdGVDaGFubmVsLm9ubWVzc2FnZSA9IChldmVu dCkgPT4gcmVzb2x2ZShldmVudC5kYXRhKSk7CisgICAgbWVzc2FnZUNoYW5uZWwucG9ydDEucG9z dE1lc3NhZ2Uoe21lc3NhZ2U6ICJPSzIifSk7CisgICAgYXNzZXJ0X2VxdWFscyhhd2FpdCBkYXRh LCAiT0syIik7Cit9LCAib2ZmZXJlciBkYXRhIGNoYW5uZWwgaW4gc2VydmljZSB3b3JrZXIiKTsK KyAgICAgICAgPC9zY3JpcHQ+CisgICAgPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMtZXh0ZW5zaW9u cy90cmFuc2Zlci1kYXRhY2hhbm5lbC1zZXJ2aWNlLXdvcmtlci5qcyBiL0xheW91dFRlc3RzL2lt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjLWV4dGVuc2lvbnMvdHJhbnNmZXIt ZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYzE5MTlkMGI5YTdiMWMx ZWY5OTFjZmQ2MDE4YTgyNjhlMjcxZWIxYQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjLWV4dGVuc2lvbnMvdHJhbnNm ZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIuanMKQEAgLTAsMCArMSwxNSBAQAorbGV0IGNo YW5uZWw7CitsZXQgcG9ydDsKK29ubWVzc2FnZSA9IChlKSA9PiB7CisgICAgaWYgKGUuZGF0YS5w b3J0KSB7CisgICAgICAgIHBvcnQgPSBlLmRhdGEucG9ydDsKKyAgICAgICAgcG9ydC5vbm1lc3Nh Z2UgPSAoZXZlbnQpID0+IGNoYW5uZWwuc2VuZChldmVudC5kYXRhLm1lc3NhZ2UpOworICAgIH0K KyAgICBpZiAoZS5kYXRhLmNoYW5uZWwpIHsKKyAgICAgICAgY2hhbm5lbCA9IGUuZGF0YS5jaGFu bmVsOworICAgICAgICBjaGFubmVsLm9ub3BlbiA9ICgpID0+IHBvcnQucG9zdE1lc3NhZ2UoIm9w ZW5lZCIpOworICAgICAgICBjaGFubmVsLm9uZXJyb3IgPSAoKSA9PiBwb3J0LnBvc3RNZXNzYWdl KCJlcnJvcmVkIik7CisgICAgICAgIGNoYW5uZWwub25jbG9zZSA9ICgpID0+IHBvcnQucG9zdE1l c3NhZ2UoImNsb3NlZCIpOworICAgICAgICBjaGFubmVsLm9ubWVzc2FnZSA9IChldmVudCkgPT4g cG9ydC5wb3N0TWVzc2FnZShldmVudC5kYXRhKTsKKyAgICB9Cit9Owo= 431320 2021-06-14 07:03:07 -0700 2021-06-14 07:04:21 -0700 Patch bug-226968-20210614160305.patch text/plain 9598 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NjA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzNhNTM5MzUwMmM3M2Iw N2ZmYmUzNjhkOGZiOTgzNGY2NjFiZWU2MS4uMzJmODRmYjFjZjUwYmNkNmVjMDllZjRkZjUxMjU0 Yjc5MzQ3ZjMzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA2LTE0ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggUlRDRGF0YUNoYW5u ZWxJbml0OjpkZWNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyNjk2OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRlc3Q6IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjLWV4dGVu c2lvbnMvdHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIuaHR0cHMuaHRtbAorCisg ICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5uZWxIYW5kbGVyLmg6Cisg ICAgICAgIChXZWJDb3JlOjpSVENEYXRhQ2hhbm5lbEluaXQ6OmRlY29kZSk6CisgICAgICAgIE1h a2Ugc3VyZSB0byB1c2Ugb3B0aW9uYWxzIG9mIG9wdGlvbmFscy4KKwogMjAyMS0wNi0xMCAgWW91 ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgZ2V0RGlzcGxheU1lZGlh IEFQSSBkb2Vzbid0IHdvcmsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21l ZGlhc3RyZWFtL1JUQ0RhdGFDaGFubmVsSGFuZGxlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5uZWxIYW5kbGVyLmgKaW5kZXggMDU0NDI4ZDUwZGM2 MWFhYWQ1MTg4NzlkMjJjYmMyZjk3NzkxNTAzZS4uNmEzYWE4N2Q4OTMxYzRiODBjYTBkZWE3Mzgw NmI1NzBjODY3OGU1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz dHJlYW0vUlRDRGF0YUNoYW5uZWxIYW5kbGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5uZWxIYW5kbGVyLmgKQEAgLTYyLDE3ICs2MiwxNyBA QCB0ZW1wbGF0ZTxjbGFzcyBFbmNvZGVyPiB2b2lkIFJUQ0RhdGFDaGFubmVsSW5pdDo6ZW5jb2Rl KEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAKIHRlbXBsYXRlPGNsYXNzIERlY29kZXI+IHN0ZDo6 b3B0aW9uYWw8UlRDRGF0YUNoYW5uZWxJbml0PiBSVENEYXRhQ2hhbm5lbEluaXQ6OmRlY29kZShE ZWNvZGVyJiBkZWNvZGVyKQogewotICAgIHN0ZDo6b3B0aW9uYWw8Ym9vbD4gb3JkZXJlZDsKKyAg ICBzdGQ6Om9wdGlvbmFsPHN0ZDo6b3B0aW9uYWw8Ym9vbD4+IG9yZGVyZWQ7CiAgICAgZGVjb2Rl ciA+PiBvcmRlcmVkOwogICAgIGlmICghb3JkZXJlZCkKICAgICAgICAgcmV0dXJuIHsgfTsKIAot ICAgIHN0ZDo6b3B0aW9uYWw8dW5zaWduZWQgc2hvcnQ+IG1heFBhY2tldExpZmVUaW1lOworICAg IHN0ZDo6b3B0aW9uYWw8c3RkOjpvcHRpb25hbDx1bnNpZ25lZCBzaG9ydD4+IG1heFBhY2tldExp ZmVUaW1lOwogICAgIGRlY29kZXIgPj4gbWF4UGFja2V0TGlmZVRpbWU7CiAgICAgaWYgKCFtYXhQ YWNrZXRMaWZlVGltZSkKICAgICAgICAgcmV0dXJuIHsgfTsKIAotICAgIHN0ZDo6b3B0aW9uYWw8 dW5zaWduZWQgc2hvcnQ+IG1heFJldHJhbnNtaXRzOworICAgIHN0ZDo6b3B0aW9uYWw8c3RkOjpv cHRpb25hbDx1bnNpZ25lZCBzaG9ydD4+IG1heFJldHJhbnNtaXRzOwogICAgIGRlY29kZXIgPj4g bWF4UmV0cmFuc21pdHM7CiAgICAgaWYgKCFtYXhSZXRyYW5zbWl0cykKICAgICAgICAgcmV0dXJu IHsgfTsKQEAgLTgxLDEyICs4MSwxMiBAQCB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBzdGQ6Om9w dGlvbmFsPFJUQ0RhdGFDaGFubmVsSW5pdD4gUlRDRGF0YUNoYW5uZWxJbml0OjpkZQogICAgIGlm ICghZGVjb2Rlci5kZWNvZGUocHJvdG9jb2wpKQogICAgICAgICByZXR1cm4geyB9OwogCi0gICAg c3RkOjpvcHRpb25hbDxib29sPiBuZWdvdGlhdGVkOworICAgIHN0ZDo6b3B0aW9uYWw8c3RkOjpv cHRpb25hbDxib29sPj4gbmVnb3RpYXRlZDsKICAgICBkZWNvZGVyID4+IG5lZ290aWF0ZWQ7CiAg ICAgaWYgKCFuZWdvdGlhdGVkKQogICAgICAgICByZXR1cm4geyB9OwogCi0gICAgc3RkOjpvcHRp b25hbDx1bnNpZ25lZCBzaG9ydD4gaWQ7CisgICAgc3RkOjpvcHRpb25hbDxzdGQ6Om9wdGlvbmFs PHVuc2lnbmVkIHNob3J0Pj4gaWQ7CiAgICAgZGVjb2RlciA+PiBpZDsKICAgICBpZiAoIWlkKQog ICAgICAgICByZXR1cm4geyB9OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDIyOTZiY2RmYjczY2I0YjNlZDFjMjYzNDkwNmZj NjYwMDFkMGYwYTEuLjcyNTE0YjNlNDg3ZDllNWU0MzEwZTc4ODZlZTRjMmU3ZTU4Y2ZhYTMgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0wNi0xNCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBh cHBsZS5jb20+CisKKyAgICAgICAgRml4IFJUQ0RhdGFDaGFubmVsSW5pdDo6ZGVjb2RlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY5NjgKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL21h Yy13azEvVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wNi0xNCAgWW91ZW5uIEZhYmxldCAgPHlv dWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgSW1wb3J0IFdQVCB3ZWJydGMtZXh0ZW5zaW9ucwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRl c3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggNjBiNzU5NmJlN2Q0MjhjZDAzZjc3OTAx MDY4ZDdmYzkzMzdjNzYzZC4uNGJmNzZmMGI4NzFjNzdmZjZmNWYzOWM4ZTBkOWMxNjVhNTY3MDJh MSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9M YXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEt MDYtMTQgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBS VENEYXRhQ2hhbm5lbEluaXQ6OmRlY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI2OTY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjLWV4dGVuc2lvbnMv dHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIuaHR0cHMtZXhwZWN0ZWQudHh0OiBB ZGRlZC4KKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjLWV4dGVuc2lvbnMvdHJh bnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIuaHR0cHMuaHRtbDogQWRkZWQuCisgICAg ICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy1leHRlbnNpb25zL3RyYW5zZmVyLWRhdGFj aGFubmVsLXNlcnZpY2Utd29ya2VyLmpzOiBBZGRlZC4KKyAgICAgICAgKG9ubWVzc2FnZSk6CisK IDIwMjEtMDYtMTQgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAg IE1vdmUgVHJhbnNmZXJhYmxlIFJUQ0RhdGFDaGFubmVsIHRlc3RzIHRvIFdQVApkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMtZXh0 ZW5zaW9ucy90cmFuc2Zlci1kYXRhY2hhbm5lbC1zZXJ2aWNlLXdvcmtlci5odHRwcy1leHBlY3Rl ZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0 Yy1leHRlbnNpb25zL3RyYW5zZmVyLWRhdGFjaGFubmVsLXNlcnZpY2Utd29ya2VyLmh0dHBzLWV4 cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40OWJiMjk0MzExYTczZmUwZjRhNmFjNWMxZDkyMTJmNWNl ZjRiMTkwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy93ZWJydGMtZXh0ZW5zaW9ucy90cmFuc2Zlci1kYXRhY2hhbm5lbC1zZXJ2 aWNlLXdvcmtlci5odHRwcy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwzIEBACisKK1BBU1Mgb2Zm ZXJlciBkYXRhIGNoYW5uZWwgaW4gc2VydmljZSB3b3JrZXIKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMtZXh0ZW5zaW9ucy90 cmFuc2Zlci1kYXRhY2hhbm5lbC1zZXJ2aWNlLXdvcmtlci5odHRwcy5odG1sIGIvTGF5b3V0VGVz dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMtZXh0ZW5zaW9ucy90cmFu c2Zlci1kYXRhY2hhbm5lbC1zZXJ2aWNlLXdvcmtlci5odHRwcy5odG1sCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjYy NWZlZTRmZTFlZjMzYmUwY2I1YjM1NzVjYzE3NTVjMGI1ZTZiNGMKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy1leHRl bnNpb25zL3RyYW5zZmVyLWRhdGFjaGFubmVsLXNlcnZpY2Utd29ya2VyLmh0dHBzLmh0bWwKQEAg LTAsMCArMSw4MyBAQAorPCFkb2N0eXBlIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAg ICAgPG1ldGEgY2hhcnNldD0idXRmLTgiPgorICAgICAgICA8c2NyaXB0IHNyYz0iL3Jlc291cmNl cy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+CisgICAgICAgIDxzY3JpcHQgc3JjPSIvcmVzb3Vy Y2VzL3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3NjcmlwdD4KKyAgICA8L2hlYWQ+CisgICAgPGJv ZHk+CisgICAgICAgIDxzY3JpcHQgc3JjPSIuLi9zZXJ2aWNlLXdvcmtlcnMvc2VydmljZS13b3Jr ZXIvcmVzb3VyY2VzL3Rlc3QtaGVscGVycy5zdWIuanMiPjwvc2NyaXB0PgorICAgICAgICA8c2Ny aXB0PgorYXN5bmMgZnVuY3Rpb24gY3JlYXRlQ29ubmVjdGlvbnModGVzdCwgZmlyc3RDb25uZWN0 aW9uQ2FsbGJhY2ssIHNlY29uZENvbm5lY3Rpb25DYWxsYmFjaykKK3sKKyAgICBjb25zdCBwYzEg PSBuZXcgUlRDUGVlckNvbm5lY3Rpb24oKTsKKyAgICBjb25zdCBwYzIgPSBuZXcgUlRDUGVlckNv bm5lY3Rpb24oKTsKKworICAgIHRlc3QuYWRkX2NsZWFudXAoKCkgPT4gcGMxLmNsb3NlKCkpOwor ICAgIHRlc3QuYWRkX2NsZWFudXAoKCkgPT4gcGMyLmNsb3NlKCkpOworCisgICAgcGMxLm9uaWNl Y2FuZGlkYXRlID0gKGUpID0+IHBjMi5hZGRJY2VDYW5kaWRhdGUoZS5jYW5kaWRhdGUpOworICAg IHBjMi5vbmljZWNhbmRpZGF0ZSA9IChlKSA9PiBwYzEuYWRkSWNlQ2FuZGlkYXRlKGUuY2FuZGlk YXRlKTsKKworICAgIGZpcnN0Q29ubmVjdGlvbkNhbGxiYWNrKHBjMSk7CisKKyAgICBjb25zdCBv ZmZlciA9IGF3YWl0IHBjMS5jcmVhdGVPZmZlcigpOworICAgIGF3YWl0IHBjMS5zZXRMb2NhbERl c2NyaXB0aW9uKG9mZmVyKTsKKyAgICBhd2FpdCBwYzIuc2V0UmVtb3RlRGVzY3JpcHRpb24ob2Zm ZXIpOworCisgICAgc2Vjb25kQ29ubmVjdGlvbkNhbGxiYWNrKHBjMik7CisKKyAgICBjb25zdCBh bnN3ZXIgPSBhd2FpdCBwYzIuY3JlYXRlQW5zd2VyKCk7CisgICAgYXdhaXQgcGMyLnNldExvY2Fs RGVzY3JpcHRpb24oYW5zd2VyKTsKKyAgICBhd2FpdCBwYzEuc2V0UmVtb3RlRGVzY3JpcHRpb24o YW5zd2VyKTsKK30KKworYXN5bmMgZnVuY3Rpb24gd2FpdEZvck1lc3NhZ2UocmVjZWl2ZXIsIGRh dGEpCit7CisgICAgd2hpbGUgKHRydWUpIHsKKyAgICAgICAgY29uc3QgcmVjZWl2ZWQgPSBhd2Fp dCBuZXcgUHJvbWlzZShyZXNvbHZlID0+IHJlY2VpdmVyLm9ubWVzc2FnZSA9IChldmVudCkgPT4g cmVzb2x2ZShldmVudC5kYXRhKSk7CisgICAgICAgIGlmIChkYXRhID09PSByZWNlaXZlZCkKKyAg ICAgICAgICAgIHJldHVybjsKKyAgICB9Cit9CisKK3Byb21pc2VfdGVzdChhc3luYyAodGVzdCkg PT4geworICAgIGxldCBmcmFtZTsKKyAgICBjb25zdCBzY29wZSA9ICdyZXNvdXJjZXMvJzsKKyAg ICBjb25zdCBzY3JpcHQgPSAndHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIuanMn OworCisgICAgYXdhaXQgc2VydmljZV93b3JrZXJfdW5yZWdpc3Rlcih0ZXN0LCBzY29wZSk7Cisg ICAgY29uc3QgcmVnaXN0cmF0aW9uID0gYXdhaXQgbmF2aWdhdG9yLnNlcnZpY2VXb3JrZXIucmVn aXN0ZXIoc2NyaXB0LCB7c2NvcGV9KTsKKyAgICB0ZXN0LmFkZF9jbGVhbnVwKGFzeW5jICgpID0+ IHsKKyAgICAgICAgcmV0dXJuIHNlcnZpY2Vfd29ya2VyX3VucmVnaXN0ZXIodGVzdCwgc2NvcGUp OworICAgIH0pOworICAgIGNvbnN0IHdvcmtlciA9IHJlZ2lzdHJhdGlvbi5pbnN0YWxsaW5nOwor CisgICAgY29uc3QgbWVzc2FnZUNoYW5uZWwgPSBuZXcgTWVzc2FnZUNoYW5uZWwoKTsKKworICAg IGxldCBsb2NhbENoYW5uZWw7CisgICAgbGV0IHJlbW90ZUNoYW5uZWw7CisKKyAgICBhd2FpdCBu ZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiB7CisgICAgICAgIGNyZWF0ZUNvbm5lY3Rp b25zKHRlc3QsIChmaXJzdENvbm5lY3Rpb24pID0+IHsKKyAgICAgICAgICAgIGxvY2FsQ2hhbm5l bCA9IGZpcnN0Q29ubmVjdGlvbi5jcmVhdGVEYXRhQ2hhbm5lbCgnc2VuZERhdGFDaGFubmVsJyk7 CisgICAgICAgICAgICB3b3JrZXIucG9zdE1lc3NhZ2Uoe2NoYW5uZWw6IGxvY2FsQ2hhbm5lbCwg cG9ydDogbWVzc2FnZUNoYW5uZWwucG9ydDJ9LCBbbG9jYWxDaGFubmVsLCBtZXNzYWdlQ2hhbm5l bC5wb3J0Ml0pOworICAgICAgICB9LCAoc2Vjb25kQ29ubmVjdGlvbikgPT4geworICAgICAgICAg ICAgc2Vjb25kQ29ubmVjdGlvbi5vbmRhdGFjaGFubmVsID0gKGV2ZW50KSA9PiB7CisgICAgICAg ICAgICAgICAgcmVtb3RlQ2hhbm5lbCA9IGV2ZW50LmNoYW5uZWw7CisgICAgICAgICAgICAgICAg cmVtb3RlQ2hhbm5lbC5vbm9wZW4gPSByZXNvbHZlOworICAgICAgICAgICAgfTsKKyAgICAgICAg fSk7CisgICAgfSk7CisKKyAgICBjb25zdCBwcm9taXNlID0gd2FpdEZvck1lc3NhZ2UobWVzc2Fn ZUNoYW5uZWwucG9ydDEsICJPSyIpOworICAgIHJlbW90ZUNoYW5uZWwuc2VuZCgiT0siKTsKKyAg ICBhd2FpdCBwcm9taXNlOworCisgICAgY29uc3QgZGF0YSA9IG5ldyBQcm9taXNlKHJlc29sdmUg PT4gcmVtb3RlQ2hhbm5lbC5vbm1lc3NhZ2UgPSAoZXZlbnQpID0+IHJlc29sdmUoZXZlbnQuZGF0 YSkpOworICAgIG1lc3NhZ2VDaGFubmVsLnBvcnQxLnBvc3RNZXNzYWdlKHttZXNzYWdlOiAiT0sy In0pOworICAgIGFzc2VydF9lcXVhbHMoYXdhaXQgZGF0YSwgIk9LMiIpOworfSwgIm9mZmVyZXIg ZGF0YSBjaGFubmVsIGluIHNlcnZpY2Ugd29ya2VyIik7CisgICAgICAgIDwvc2NyaXB0PgorICAg IDwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjLWV4dGVuc2lvbnMvdHJhbnNmZXItZGF0YWNoYW5uZWwt c2VydmljZS13b3JrZXIuanMgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL3dlYnJ0Yy1leHRlbnNpb25zL3RyYW5zZmVyLWRhdGFjaGFubmVsLXNlcnZpY2Utd29y a2VyLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLmMxOTE5ZDBiOWE3YjFjMWVmOTkxY2ZkNjAxOGE4MjY4ZTI3MWVi MWEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL3dlYnJ0Yy1leHRlbnNpb25zL3RyYW5zZmVyLWRhdGFjaGFubmVsLXNlcnZpY2Ut d29ya2VyLmpzCkBAIC0wLDAgKzEsMTUgQEAKK2xldCBjaGFubmVsOworbGV0IHBvcnQ7Citvbm1l c3NhZ2UgPSAoZSkgPT4geworICAgIGlmIChlLmRhdGEucG9ydCkgeworICAgICAgICBwb3J0ID0g ZS5kYXRhLnBvcnQ7CisgICAgICAgIHBvcnQub25tZXNzYWdlID0gKGV2ZW50KSA9PiBjaGFubmVs LnNlbmQoZXZlbnQuZGF0YS5tZXNzYWdlKTsKKyAgICB9CisgICAgaWYgKGUuZGF0YS5jaGFubmVs KSB7CisgICAgICAgIGNoYW5uZWwgPSBlLmRhdGEuY2hhbm5lbDsKKyAgICAgICAgY2hhbm5lbC5v bm9wZW4gPSAoKSA9PiBwb3J0LnBvc3RNZXNzYWdlKCJvcGVuZWQiKTsKKyAgICAgICAgY2hhbm5l bC5vbmVycm9yID0gKCkgPT4gcG9ydC5wb3N0TWVzc2FnZSgiZXJyb3JlZCIpOworICAgICAgICBj aGFubmVsLm9uY2xvc2UgPSAoKSA9PiBwb3J0LnBvc3RNZXNzYWdlKCJjbG9zZWQiKTsKKyAgICAg ICAgY2hhbm5lbC5vbm1lc3NhZ2UgPSAoZXZlbnQpID0+IHBvcnQucG9zdE1lc3NhZ2UoZXZlbnQu ZGF0YSk7CisgICAgfQorfTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13 azEvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azEvVGVzdEV4 cGVjdGF0aW9ucwppbmRleCA1YzFkNTljYTM0NmQyMjM3MWFlY2I5NTJlYmEwNmVmYjgzYzYxYmZl Li41NjhjZWMyYmU1ODZkNjU0OTI1OTViYTQzMmRmYzY0YTYxZGRjM2ZmIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vbWFjLXdrMS9UZXN0RXhwZWN0YXRpb25zCkBAIC0zNzYsNiArMzc2LDcg QEAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93b3JrbGV0cy9hbmltYXRpb24td29y a2xldC1zZXJ2aWNlLXdvcmtlci1pbnRlcmMKIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvd29ya2xldHMvYXVkaW8td29ya2xldC1zZXJ2aWNlLXdvcmtlci1pbnRlcmNlcHRpb24uaHR0 cHMuaHRtbCBbIFNraXAgXQogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93b3JrbGV0 cy9sYXlvdXQtd29ya2xldC1zZXJ2aWNlLXdvcmtlci1pbnRlcmNlcHRpb24uaHR0cHMuaHRtbCBb IFNraXAgXQogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93b3JrbGV0cy9wYWludC13 b3JrbGV0LXNlcnZpY2Utd29ya2VyLWludGVyY2VwdGlvbi5odHRwcy5odG1sIFsgU2tpcCBdCitp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy1leHRlbnNpb25zL3RyYW5zZmVy LWRhdGFjaGFubmVsLXNlcnZpY2Utd29ya2VyLmh0dHBzLmh0bWwgWyBTa2lwIF0KIAogIyBRdW90 YSBjaGVjayBtaXNzaW5nIGluIFdLMQogaHR0cC90ZXN0cy9JbmRleGVkREIvc3RvcmFnZS1saW1p dC5odHRwcy5odG1sIFsgU2tpcCBdCg== 431321 2021-06-14 07:04:25 -0700 2021-06-15 06:46:54 -0700 Patch bug-226968-20210614160424.patch text/plain 9598 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NjA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzNhNTM5MzUwMmM3M2Iw N2ZmYmUzNjhkOGZiOTgzNGY2NjFiZWU2MS4uMzJmODRmYjFjZjUwYmNkNmVjMDllZjRkZjUxMjU0 Yjc5MzQ3ZjMzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA2LTE0ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggUlRDRGF0YUNoYW5u ZWxJbml0OjpkZWNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyNjk2OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRlc3Q6IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjLWV4dGVu c2lvbnMvdHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIuaHR0cHMuaHRtbAorCisg ICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5uZWxIYW5kbGVyLmg6Cisg ICAgICAgIChXZWJDb3JlOjpSVENEYXRhQ2hhbm5lbEluaXQ6OmRlY29kZSk6CisgICAgICAgIE1h a2Ugc3VyZSB0byB1c2Ugb3B0aW9uYWxzIG9mIG9wdGlvbmFscy4KKwogMjAyMS0wNi0xMCAgWW91 ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgZ2V0RGlzcGxheU1lZGlh IEFQSSBkb2Vzbid0IHdvcmsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21l ZGlhc3RyZWFtL1JUQ0RhdGFDaGFubmVsSGFuZGxlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5uZWxIYW5kbGVyLmgKaW5kZXggMDU0NDI4ZDUwZGM2 MWFhYWQ1MTg4NzlkMjJjYmMyZjk3NzkxNTAzZS4uNmEzYWE4N2Q4OTMxYzRiODBjYTBkZWE3Mzgw NmI1NzBjODY3OGU1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz dHJlYW0vUlRDRGF0YUNoYW5uZWxIYW5kbGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5uZWxIYW5kbGVyLmgKQEAgLTYyLDE3ICs2MiwxNyBA QCB0ZW1wbGF0ZTxjbGFzcyBFbmNvZGVyPiB2b2lkIFJUQ0RhdGFDaGFubmVsSW5pdDo6ZW5jb2Rl KEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAKIHRlbXBsYXRlPGNsYXNzIERlY29kZXI+IHN0ZDo6 b3B0aW9uYWw8UlRDRGF0YUNoYW5uZWxJbml0PiBSVENEYXRhQ2hhbm5lbEluaXQ6OmRlY29kZShE ZWNvZGVyJiBkZWNvZGVyKQogewotICAgIHN0ZDo6b3B0aW9uYWw8Ym9vbD4gb3JkZXJlZDsKKyAg ICBzdGQ6Om9wdGlvbmFsPHN0ZDo6b3B0aW9uYWw8Ym9vbD4+IG9yZGVyZWQ7CiAgICAgZGVjb2Rl ciA+PiBvcmRlcmVkOwogICAgIGlmICghb3JkZXJlZCkKICAgICAgICAgcmV0dXJuIHsgfTsKIAot ICAgIHN0ZDo6b3B0aW9uYWw8dW5zaWduZWQgc2hvcnQ+IG1heFBhY2tldExpZmVUaW1lOworICAg IHN0ZDo6b3B0aW9uYWw8c3RkOjpvcHRpb25hbDx1bnNpZ25lZCBzaG9ydD4+IG1heFBhY2tldExp ZmVUaW1lOwogICAgIGRlY29kZXIgPj4gbWF4UGFja2V0TGlmZVRpbWU7CiAgICAgaWYgKCFtYXhQ YWNrZXRMaWZlVGltZSkKICAgICAgICAgcmV0dXJuIHsgfTsKIAotICAgIHN0ZDo6b3B0aW9uYWw8 dW5zaWduZWQgc2hvcnQ+IG1heFJldHJhbnNtaXRzOworICAgIHN0ZDo6b3B0aW9uYWw8c3RkOjpv cHRpb25hbDx1bnNpZ25lZCBzaG9ydD4+IG1heFJldHJhbnNtaXRzOwogICAgIGRlY29kZXIgPj4g bWF4UmV0cmFuc21pdHM7CiAgICAgaWYgKCFtYXhSZXRyYW5zbWl0cykKICAgICAgICAgcmV0dXJu IHsgfTsKQEAgLTgxLDEyICs4MSwxMiBAQCB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBzdGQ6Om9w dGlvbmFsPFJUQ0RhdGFDaGFubmVsSW5pdD4gUlRDRGF0YUNoYW5uZWxJbml0OjpkZQogICAgIGlm ICghZGVjb2Rlci5kZWNvZGUocHJvdG9jb2wpKQogICAgICAgICByZXR1cm4geyB9OwogCi0gICAg c3RkOjpvcHRpb25hbDxib29sPiBuZWdvdGlhdGVkOworICAgIHN0ZDo6b3B0aW9uYWw8c3RkOjpv cHRpb25hbDxib29sPj4gbmVnb3RpYXRlZDsKICAgICBkZWNvZGVyID4+IG5lZ290aWF0ZWQ7CiAg ICAgaWYgKCFuZWdvdGlhdGVkKQogICAgICAgICByZXR1cm4geyB9OwogCi0gICAgc3RkOjpvcHRp b25hbDx1bnNpZ25lZCBzaG9ydD4gaWQ7CisgICAgc3RkOjpvcHRpb25hbDxzdGQ6Om9wdGlvbmFs PHVuc2lnbmVkIHNob3J0Pj4gaWQ7CiAgICAgZGVjb2RlciA+PiBpZDsKICAgICBpZiAoIWlkKQog ICAgICAgICByZXR1cm4geyB9OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDIyOTZiY2RmYjczY2I0YjNlZDFjMjYzNDkwNmZj NjYwMDFkMGYwYTEuLjcyNTE0YjNlNDg3ZDllNWU0MzEwZTc4ODZlZTRjMmU3ZTU4Y2ZhYTMgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0wNi0xNCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBh cHBsZS5jb20+CisKKyAgICAgICAgRml4IFJUQ0RhdGFDaGFubmVsSW5pdDo6ZGVjb2RlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY5NjgKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL21h Yy13azEvVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wNi0xNCAgWW91ZW5uIEZhYmxldCAgPHlv dWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgSW1wb3J0IFdQVCB3ZWJydGMtZXh0ZW5zaW9ucwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRl c3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggNjBiNzU5NmJlN2Q0MjhjZDAzZjc3OTAx MDY4ZDdmYzkzMzdjNzYzZC4uNGJmNzZmMGI4NzFjNzdmZjZmNWYzOWM4ZTBkOWMxNjVhNTY3MDJh MSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9M YXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEt MDYtMTQgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBS VENEYXRhQ2hhbm5lbEluaXQ6OmRlY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI2OTY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjLWV4dGVuc2lvbnMv dHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIuaHR0cHMtZXhwZWN0ZWQudHh0OiBB ZGRlZC4KKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjLWV4dGVuc2lvbnMvdHJh bnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIuaHR0cHMuaHRtbDogQWRkZWQuCisgICAg ICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy1leHRlbnNpb25zL3RyYW5zZmVyLWRhdGFj aGFubmVsLXNlcnZpY2Utd29ya2VyLmpzOiBBZGRlZC4KKyAgICAgICAgKG9ubWVzc2FnZSk6CisK IDIwMjEtMDYtMTQgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAg IE1vdmUgVHJhbnNmZXJhYmxlIFJUQ0RhdGFDaGFubmVsIHRlc3RzIHRvIFdQVApkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMtZXh0 ZW5zaW9ucy90cmFuc2Zlci1kYXRhY2hhbm5lbC1zZXJ2aWNlLXdvcmtlci5odHRwcy1leHBlY3Rl ZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0 Yy1leHRlbnNpb25zL3RyYW5zZmVyLWRhdGFjaGFubmVsLXNlcnZpY2Utd29ya2VyLmh0dHBzLWV4 cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40OWJiMjk0MzExYTczZmUwZjRhNmFjNWMxZDkyMTJmNWNl ZjRiMTkwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy93ZWJydGMtZXh0ZW5zaW9ucy90cmFuc2Zlci1kYXRhY2hhbm5lbC1zZXJ2 aWNlLXdvcmtlci5odHRwcy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwzIEBACisKK1BBU1Mgb2Zm ZXJlciBkYXRhIGNoYW5uZWwgaW4gc2VydmljZSB3b3JrZXIKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMtZXh0ZW5zaW9ucy90 cmFuc2Zlci1kYXRhY2hhbm5lbC1zZXJ2aWNlLXdvcmtlci5odHRwcy5odG1sIGIvTGF5b3V0VGVz dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMtZXh0ZW5zaW9ucy90cmFu c2Zlci1kYXRhY2hhbm5lbC1zZXJ2aWNlLXdvcmtlci5odHRwcy5odG1sCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjYy NWZlZTRmZTFlZjMzYmUwY2I1YjM1NzVjYzE3NTVjMGI1ZTZiNGMKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy1leHRl bnNpb25zL3RyYW5zZmVyLWRhdGFjaGFubmVsLXNlcnZpY2Utd29ya2VyLmh0dHBzLmh0bWwKQEAg LTAsMCArMSw4MyBAQAorPCFkb2N0eXBlIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAg ICAgPG1ldGEgY2hhcnNldD0idXRmLTgiPgorICAgICAgICA8c2NyaXB0IHNyYz0iL3Jlc291cmNl cy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+CisgICAgICAgIDxzY3JpcHQgc3JjPSIvcmVzb3Vy Y2VzL3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3NjcmlwdD4KKyAgICA8L2hlYWQ+CisgICAgPGJv ZHk+CisgICAgICAgIDxzY3JpcHQgc3JjPSIuLi9zZXJ2aWNlLXdvcmtlcnMvc2VydmljZS13b3Jr ZXIvcmVzb3VyY2VzL3Rlc3QtaGVscGVycy5zdWIuanMiPjwvc2NyaXB0PgorICAgICAgICA8c2Ny aXB0PgorYXN5bmMgZnVuY3Rpb24gY3JlYXRlQ29ubmVjdGlvbnModGVzdCwgZmlyc3RDb25uZWN0 aW9uQ2FsbGJhY2ssIHNlY29uZENvbm5lY3Rpb25DYWxsYmFjaykKK3sKKyAgICBjb25zdCBwYzEg PSBuZXcgUlRDUGVlckNvbm5lY3Rpb24oKTsKKyAgICBjb25zdCBwYzIgPSBuZXcgUlRDUGVlckNv bm5lY3Rpb24oKTsKKworICAgIHRlc3QuYWRkX2NsZWFudXAoKCkgPT4gcGMxLmNsb3NlKCkpOwor ICAgIHRlc3QuYWRkX2NsZWFudXAoKCkgPT4gcGMyLmNsb3NlKCkpOworCisgICAgcGMxLm9uaWNl Y2FuZGlkYXRlID0gKGUpID0+IHBjMi5hZGRJY2VDYW5kaWRhdGUoZS5jYW5kaWRhdGUpOworICAg IHBjMi5vbmljZWNhbmRpZGF0ZSA9IChlKSA9PiBwYzEuYWRkSWNlQ2FuZGlkYXRlKGUuY2FuZGlk YXRlKTsKKworICAgIGZpcnN0Q29ubmVjdGlvbkNhbGxiYWNrKHBjMSk7CisKKyAgICBjb25zdCBv ZmZlciA9IGF3YWl0IHBjMS5jcmVhdGVPZmZlcigpOworICAgIGF3YWl0IHBjMS5zZXRMb2NhbERl c2NyaXB0aW9uKG9mZmVyKTsKKyAgICBhd2FpdCBwYzIuc2V0UmVtb3RlRGVzY3JpcHRpb24ob2Zm ZXIpOworCisgICAgc2Vjb25kQ29ubmVjdGlvbkNhbGxiYWNrKHBjMik7CisKKyAgICBjb25zdCBh bnN3ZXIgPSBhd2FpdCBwYzIuY3JlYXRlQW5zd2VyKCk7CisgICAgYXdhaXQgcGMyLnNldExvY2Fs RGVzY3JpcHRpb24oYW5zd2VyKTsKKyAgICBhd2FpdCBwYzEuc2V0UmVtb3RlRGVzY3JpcHRpb24o YW5zd2VyKTsKK30KKworYXN5bmMgZnVuY3Rpb24gd2FpdEZvck1lc3NhZ2UocmVjZWl2ZXIsIGRh dGEpCit7CisgICAgd2hpbGUgKHRydWUpIHsKKyAgICAgICAgY29uc3QgcmVjZWl2ZWQgPSBhd2Fp dCBuZXcgUHJvbWlzZShyZXNvbHZlID0+IHJlY2VpdmVyLm9ubWVzc2FnZSA9IChldmVudCkgPT4g cmVzb2x2ZShldmVudC5kYXRhKSk7CisgICAgICAgIGlmIChkYXRhID09PSByZWNlaXZlZCkKKyAg ICAgICAgICAgIHJldHVybjsKKyAgICB9Cit9CisKK3Byb21pc2VfdGVzdChhc3luYyAodGVzdCkg PT4geworICAgIGxldCBmcmFtZTsKKyAgICBjb25zdCBzY29wZSA9ICdyZXNvdXJjZXMvJzsKKyAg ICBjb25zdCBzY3JpcHQgPSAndHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIuanMn OworCisgICAgYXdhaXQgc2VydmljZV93b3JrZXJfdW5yZWdpc3Rlcih0ZXN0LCBzY29wZSk7Cisg ICAgY29uc3QgcmVnaXN0cmF0aW9uID0gYXdhaXQgbmF2aWdhdG9yLnNlcnZpY2VXb3JrZXIucmVn aXN0ZXIoc2NyaXB0LCB7c2NvcGV9KTsKKyAgICB0ZXN0LmFkZF9jbGVhbnVwKGFzeW5jICgpID0+ IHsKKyAgICAgICAgcmV0dXJuIHNlcnZpY2Vfd29ya2VyX3VucmVnaXN0ZXIodGVzdCwgc2NvcGUp OworICAgIH0pOworICAgIGNvbnN0IHdvcmtlciA9IHJlZ2lzdHJhdGlvbi5pbnN0YWxsaW5nOwor CisgICAgY29uc3QgbWVzc2FnZUNoYW5uZWwgPSBuZXcgTWVzc2FnZUNoYW5uZWwoKTsKKworICAg IGxldCBsb2NhbENoYW5uZWw7CisgICAgbGV0IHJlbW90ZUNoYW5uZWw7CisKKyAgICBhd2FpdCBu ZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiB7CisgICAgICAgIGNyZWF0ZUNvbm5lY3Rp b25zKHRlc3QsIChmaXJzdENvbm5lY3Rpb24pID0+IHsKKyAgICAgICAgICAgIGxvY2FsQ2hhbm5l bCA9IGZpcnN0Q29ubmVjdGlvbi5jcmVhdGVEYXRhQ2hhbm5lbCgnc2VuZERhdGFDaGFubmVsJyk7 CisgICAgICAgICAgICB3b3JrZXIucG9zdE1lc3NhZ2Uoe2NoYW5uZWw6IGxvY2FsQ2hhbm5lbCwg cG9ydDogbWVzc2FnZUNoYW5uZWwucG9ydDJ9LCBbbG9jYWxDaGFubmVsLCBtZXNzYWdlQ2hhbm5l bC5wb3J0Ml0pOworICAgICAgICB9LCAoc2Vjb25kQ29ubmVjdGlvbikgPT4geworICAgICAgICAg ICAgc2Vjb25kQ29ubmVjdGlvbi5vbmRhdGFjaGFubmVsID0gKGV2ZW50KSA9PiB7CisgICAgICAg ICAgICAgICAgcmVtb3RlQ2hhbm5lbCA9IGV2ZW50LmNoYW5uZWw7CisgICAgICAgICAgICAgICAg cmVtb3RlQ2hhbm5lbC5vbm9wZW4gPSByZXNvbHZlOworICAgICAgICAgICAgfTsKKyAgICAgICAg fSk7CisgICAgfSk7CisKKyAgICBjb25zdCBwcm9taXNlID0gd2FpdEZvck1lc3NhZ2UobWVzc2Fn ZUNoYW5uZWwucG9ydDEsICJPSyIpOworICAgIHJlbW90ZUNoYW5uZWwuc2VuZCgiT0siKTsKKyAg ICBhd2FpdCBwcm9taXNlOworCisgICAgY29uc3QgZGF0YSA9IG5ldyBQcm9taXNlKHJlc29sdmUg PT4gcmVtb3RlQ2hhbm5lbC5vbm1lc3NhZ2UgPSAoZXZlbnQpID0+IHJlc29sdmUoZXZlbnQuZGF0 YSkpOworICAgIG1lc3NhZ2VDaGFubmVsLnBvcnQxLnBvc3RNZXNzYWdlKHttZXNzYWdlOiAiT0sy In0pOworICAgIGFzc2VydF9lcXVhbHMoYXdhaXQgZGF0YSwgIk9LMiIpOworfSwgIm9mZmVyZXIg ZGF0YSBjaGFubmVsIGluIHNlcnZpY2Ugd29ya2VyIik7CisgICAgICAgIDwvc2NyaXB0PgorICAg IDwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvd2VicnRjLWV4dGVuc2lvbnMvdHJhbnNmZXItZGF0YWNoYW5uZWwt c2VydmljZS13b3JrZXIuanMgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL3dlYnJ0Yy1leHRlbnNpb25zL3RyYW5zZmVyLWRhdGFjaGFubmVsLXNlcnZpY2Utd29y a2VyLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLmMxOTE5ZDBiOWE3YjFjMWVmOTkxY2ZkNjAxOGE4MjY4ZTI3MWVi MWEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL3dlYnJ0Yy1leHRlbnNpb25zL3RyYW5zZmVyLWRhdGFjaGFubmVsLXNlcnZpY2Ut d29ya2VyLmpzCkBAIC0wLDAgKzEsMTUgQEAKK2xldCBjaGFubmVsOworbGV0IHBvcnQ7Citvbm1l c3NhZ2UgPSAoZSkgPT4geworICAgIGlmIChlLmRhdGEucG9ydCkgeworICAgICAgICBwb3J0ID0g ZS5kYXRhLnBvcnQ7CisgICAgICAgIHBvcnQub25tZXNzYWdlID0gKGV2ZW50KSA9PiBjaGFubmVs LnNlbmQoZXZlbnQuZGF0YS5tZXNzYWdlKTsKKyAgICB9CisgICAgaWYgKGUuZGF0YS5jaGFubmVs KSB7CisgICAgICAgIGNoYW5uZWwgPSBlLmRhdGEuY2hhbm5lbDsKKyAgICAgICAgY2hhbm5lbC5v bm9wZW4gPSAoKSA9PiBwb3J0LnBvc3RNZXNzYWdlKCJvcGVuZWQiKTsKKyAgICAgICAgY2hhbm5l bC5vbmVycm9yID0gKCkgPT4gcG9ydC5wb3N0TWVzc2FnZSgiZXJyb3JlZCIpOworICAgICAgICBj aGFubmVsLm9uY2xvc2UgPSAoKSA9PiBwb3J0LnBvc3RNZXNzYWdlKCJjbG9zZWQiKTsKKyAgICAg ICAgY2hhbm5lbC5vbm1lc3NhZ2UgPSAoZXZlbnQpID0+IHBvcnQucG9zdE1lc3NhZ2UoZXZlbnQu ZGF0YSk7CisgICAgfQorfTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13 azEvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azEvVGVzdEV4 cGVjdGF0aW9ucwppbmRleCA1YzFkNTljYTM0NmQyMjM3MWFlY2I5NTJlYmEwNmVmYjgzYzYxYmZl Li41NjhjZWMyYmU1ODZkNjU0OTI1OTViYTQzMmRmYzY0YTYxZGRjM2ZmIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vbWFjLXdrMS9UZXN0RXhwZWN0YXRpb25zCkBAIC0zNzYsNiArMzc2LDcg QEAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93b3JrbGV0cy9hbmltYXRpb24td29y a2xldC1zZXJ2aWNlLXdvcmtlci1pbnRlcmMKIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvd29ya2xldHMvYXVkaW8td29ya2xldC1zZXJ2aWNlLXdvcmtlci1pbnRlcmNlcHRpb24uaHR0 cHMuaHRtbCBbIFNraXAgXQogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93b3JrbGV0 cy9sYXlvdXQtd29ya2xldC1zZXJ2aWNlLXdvcmtlci1pbnRlcmNlcHRpb24uaHR0cHMuaHRtbCBb IFNraXAgXQogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93b3JrbGV0cy9wYWludC13 b3JrbGV0LXNlcnZpY2Utd29ya2VyLWludGVyY2VwdGlvbi5odHRwcy5odG1sIFsgU2tpcCBdCitp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy1leHRlbnNpb25zL3RyYW5zZmVy LWRhdGFjaGFubmVsLXNlcnZpY2Utd29ya2VyLmh0dHBzLmh0bWwgWyBTa2lwIF0KIAogIyBRdW90 YSBjaGVjayBtaXNzaW5nIGluIFdLMQogaHR0cC90ZXN0cy9JbmRleGVkREIvc3RvcmFnZS1saW1p dC5odHRwcy5odG1sIFsgU2tpcCBdCg== 431433 2021-06-15 06:46:58 -0700 2021-06-16 01:37:45 -0700 Make test more reportive bug-226968-20210615154657.patch text/plain 9109 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4ODYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzQ2ZmFkNTFiMmFiOTJh ODMyZTIxNzIzMGYzY2ZmOTI4NmViYmM1Yy4uOGE4ODQ3M2QxN2UwMWI1ZDg1ZjEzODRmMTY3ZmIw M2VjZDZlNzJhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA2LTE1ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggUlRDRGF0YUNoYW5u ZWxJbml0OjpkZWNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyNjk2OAorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KKworICAg ICAgICBUZXN0OiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy1leHRlbnNp b25zL3RyYW5zZmVyLWRhdGFjaGFubmVsLXNlcnZpY2Utd29ya2VyLmh0dHBzLmh0bWwKKworICAg ICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL1JUQ0RhdGFDaGFubmVsSGFuZGxlci5oOgorICAg ICAgICAoV2ViQ29yZTo6UlRDRGF0YUNoYW5uZWxJbml0OjpkZWNvZGUpOgorICAgICAgICBNYWtl IHN1cmUgdG8gdXNlIG9wdGlvbmFscyBvZiBvcHRpb25hbHMuCisKIDIwMjEtMDYtMTUgIFNhaWQg QWJvdS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CiAKICAgICAgICAgW0NHXSBDcmVhdGUgYSBz dWItaW1hZ2Ugd2hlbiBkcmF3aW5nIGFuIGltYWdlIG9ubHkgaWYgdGhlIGRlc3RpbmF0aW9uIGlt YWdlIHdpbGwgYmUgZW5sYXJnZWQsIHJvdGF0ZWQgb3Igc2hlYXJlZApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5uZWxIYW5kbGVyLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9SVENEYXRhQ2hhbm5lbEhhbmRs ZXIuaAppbmRleCAwNTQ0MjhkNTBkYzYxYWFhZDUxODg3OWQyMmNiYzJmOTc3OTE1MDNlLi42YTNh YTg3ZDg5MzFjNGI4MGNhMGRlYTczODA2YjU3MGM4Njc4ZTU4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9SVENEYXRhQ2hhbm5lbEhhbmRsZXIuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9SVENEYXRhQ2hhbm5lbEhhbmRs ZXIuaApAQCAtNjIsMTcgKzYyLDE3IEBAIHRlbXBsYXRlPGNsYXNzIEVuY29kZXI+IHZvaWQgUlRD RGF0YUNoYW5uZWxJbml0OjplbmNvZGUoRW5jb2RlciYgZW5jb2RlcikgY29uc3QKIAogdGVtcGxh dGU8Y2xhc3MgRGVjb2Rlcj4gc3RkOjpvcHRpb25hbDxSVENEYXRhQ2hhbm5lbEluaXQ+IFJUQ0Rh dGFDaGFubmVsSW5pdDo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIpCiB7Ci0gICAgc3RkOjpvcHRp b25hbDxib29sPiBvcmRlcmVkOworICAgIHN0ZDo6b3B0aW9uYWw8c3RkOjpvcHRpb25hbDxib29s Pj4gb3JkZXJlZDsKICAgICBkZWNvZGVyID4+IG9yZGVyZWQ7CiAgICAgaWYgKCFvcmRlcmVkKQog ICAgICAgICByZXR1cm4geyB9OwogCi0gICAgc3RkOjpvcHRpb25hbDx1bnNpZ25lZCBzaG9ydD4g bWF4UGFja2V0TGlmZVRpbWU7CisgICAgc3RkOjpvcHRpb25hbDxzdGQ6Om9wdGlvbmFsPHVuc2ln bmVkIHNob3J0Pj4gbWF4UGFja2V0TGlmZVRpbWU7CiAgICAgZGVjb2RlciA+PiBtYXhQYWNrZXRM aWZlVGltZTsKICAgICBpZiAoIW1heFBhY2tldExpZmVUaW1lKQogICAgICAgICByZXR1cm4geyB9 OwogCi0gICAgc3RkOjpvcHRpb25hbDx1bnNpZ25lZCBzaG9ydD4gbWF4UmV0cmFuc21pdHM7Cisg ICAgc3RkOjpvcHRpb25hbDxzdGQ6Om9wdGlvbmFsPHVuc2lnbmVkIHNob3J0Pj4gbWF4UmV0cmFu c21pdHM7CiAgICAgZGVjb2RlciA+PiBtYXhSZXRyYW5zbWl0czsKICAgICBpZiAoIW1heFJldHJh bnNtaXRzKQogICAgICAgICByZXR1cm4geyB9OwpAQCAtODEsMTIgKzgxLDEyIEBAIHRlbXBsYXRl PGNsYXNzIERlY29kZXI+IHN0ZDo6b3B0aW9uYWw8UlRDRGF0YUNoYW5uZWxJbml0PiBSVENEYXRh Q2hhbm5lbEluaXQ6OmRlCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwcm90b2NvbCkpCiAgICAg ICAgIHJldHVybiB7IH07CiAKLSAgICBzdGQ6Om9wdGlvbmFsPGJvb2w+IG5lZ290aWF0ZWQ7Cisg ICAgc3RkOjpvcHRpb25hbDxzdGQ6Om9wdGlvbmFsPGJvb2w+PiBuZWdvdGlhdGVkOwogICAgIGRl Y29kZXIgPj4gbmVnb3RpYXRlZDsKICAgICBpZiAoIW5lZ290aWF0ZWQpCiAgICAgICAgIHJldHVy biB7IH07CiAKLSAgICBzdGQ6Om9wdGlvbmFsPHVuc2lnbmVkIHNob3J0PiBpZDsKKyAgICBzdGQ6 Om9wdGlvbmFsPHN0ZDo6b3B0aW9uYWw8dW5zaWduZWQgc2hvcnQ+PiBpZDsKICAgICBkZWNvZGVy ID4+IGlkOwogICAgIGlmICghaWQpCiAgICAgICAgIHJldHVybiB7IH07CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZmM5NzIz NWFiYjJkZTgxNDI0MGRhNTJlN2QxNTc4Mjk1OTgyM2I0My4uMmY5ZjJiOWQ1NjUwMDg1YWJiNTM5 N2RiZDI3ZTY4OWYyZGYyOWM2NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisr KyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA2LTE1ICBZ b3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggUlRDRGF0YUNo YW5uZWxJbml0OjpkZWNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyNjk2OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzkzMDAwMzg+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgorCisgICAgICAgICogaHR0cC93cHQvd2Vi cnRjL3RyYW5zZmVyLWRhdGFjaGFubmVsLXNlcnZpY2Utd29ya2VyLmh0dHBzLWV4cGVjdGVkLnR4 dDogQWRkZWQuCisgICAgICAgICogaHR0cC93cHQvd2VicnRjL3RyYW5zZmVyLWRhdGFjaGFubmVs LXNlcnZpY2Utd29ya2VyLmh0dHBzLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGh0dHAvd3B0L3dl YnJ0Yy90cmFuc2Zlci1kYXRhY2hhbm5lbC1zZXJ2aWNlLXdvcmtlci5qczogQWRkZWQuCisgICAg ICAgIChvbm1lc3NhZ2UpOgorICAgICAgICAqIHBsYXRmb3JtL21hYy13azEvVGVzdEV4cGVjdGF0 aW9uczoKKwogMjAyMS0wNi0xNSAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQHdlYmtpdC5v cmc+CiAKICAgICAgICAgW2Nzcy1zY3JvbGwtc25hcF0gTmV3IHNuYXAgY29udGFpbmVycyBhbHdh eXMgc25hcCB0byB0aGUgZmlyc3Qgc2Nyb2xsIHBvc2l0aW9uCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9odHRwL3dwdC93ZWJydGMvdHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIu aHR0cHMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2VicnRjL3RyYW5zZmVy LWRhdGFjaGFubmVsLXNlcnZpY2Utd29ya2VyLmh0dHBzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li40OWJiMjk0MzExYTczZmUwZjRhNmFjNWMxZDkyMTJmNWNlZjRiMTkwCi0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2VicnRjL3RyYW5zZmVyLWRhdGFjaGFubmVsLXNl cnZpY2Utd29ya2VyLmh0dHBzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDMgQEAKKworUEFTUyBv ZmZlcmVyIGRhdGEgY2hhbm5lbCBpbiBzZXJ2aWNlIHdvcmtlcgorCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9odHRwL3dwdC93ZWJydGMvdHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3Jr ZXIuaHR0cHMuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYnJ0Yy90cmFuc2Zlci1kYXRh Y2hhbm5lbC1zZXJ2aWNlLXdvcmtlci5odHRwcy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmZkM2E4YWZjNTBj ZTRmYjRkZmYwYTVlYjM4YjNlODYxZjRiOTIwNDUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9odHRwL3dwdC93ZWJydGMvdHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIu aHR0cHMuaHRtbApAQCAtMCwwICsxLDkwIEBACis8IWRvY3R5cGUgaHRtbD4KKzxodG1sPgorICAg IDxoZWFkPgorICAgICAgICA8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+CisgICAgICAgIDxzY3JpcHQg c3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzLmpzIj48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlw dCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQuanMiPjwvc2NyaXB0PgorICAgIDwv aGVhZD4KKyAgICA8Ym9keT4KKyAgICAgICAgPHNjcmlwdCBzcmM9Ii9zZXJ2aWNlLXdvcmtlcnMv c2VydmljZS13b3JrZXIvcmVzb3VyY2VzL3Rlc3QtaGVscGVycy5zdWIuanMiPjwvc2NyaXB0Pgor ICAgICAgICA8c2NyaXB0PgorYXN5bmMgZnVuY3Rpb24gY3JlYXRlQ29ubmVjdGlvbnModGVzdCwg Zmlyc3RDb25uZWN0aW9uQ2FsbGJhY2ssIHNlY29uZENvbm5lY3Rpb25DYWxsYmFjaykKK3sKKyAg ICBjb25zdCBwYzEgPSBuZXcgUlRDUGVlckNvbm5lY3Rpb24oKTsKKyAgICBjb25zdCBwYzIgPSBu ZXcgUlRDUGVlckNvbm5lY3Rpb24oKTsKKworICAgIHRlc3QuYWRkX2NsZWFudXAoKCkgPT4gcGMx LmNsb3NlKCkpOworICAgIHRlc3QuYWRkX2NsZWFudXAoKCkgPT4gcGMyLmNsb3NlKCkpOworCisg ICAgcGMxLm9uaWNlY2FuZGlkYXRlID0gKGUpID0+IHBjMi5hZGRJY2VDYW5kaWRhdGUoZS5jYW5k aWRhdGUpOworICAgIHBjMi5vbmljZWNhbmRpZGF0ZSA9IChlKSA9PiBwYzEuYWRkSWNlQ2FuZGlk YXRlKGUuY2FuZGlkYXRlKTsKKworICAgIGZpcnN0Q29ubmVjdGlvbkNhbGxiYWNrKHBjMSk7CisK KyAgICBjb25zdCBvZmZlciA9IGF3YWl0IHBjMS5jcmVhdGVPZmZlcigpOworICAgIGF3YWl0IHBj MS5zZXRMb2NhbERlc2NyaXB0aW9uKG9mZmVyKTsKKyAgICBhd2FpdCBwYzIuc2V0UmVtb3RlRGVz Y3JpcHRpb24ob2ZmZXIpOworCisgICAgc2Vjb25kQ29ubmVjdGlvbkNhbGxiYWNrKHBjMik7CisK KyAgICBjb25zdCBhbnN3ZXIgPSBhd2FpdCBwYzIuY3JlYXRlQW5zd2VyKCk7CisgICAgYXdhaXQg cGMyLnNldExvY2FsRGVzY3JpcHRpb24oYW5zd2VyKTsKKyAgICBhd2FpdCBwYzEuc2V0UmVtb3Rl RGVzY3JpcHRpb24oYW5zd2VyKTsKK30KKworZnVuY3Rpb24gd2FpdEZvck1lc3NhZ2UocmVjZWl2 ZXIsIGRhdGEpCit7CisgICAgcmV0dXJuIG5ldyBQcm9taXNlKGFzeW5jIChyZXNvbHZlLCByZWpl Y3QpID0+IHsKKyAgICAgICAgc2V0VGltZW91dCgoKSA9PiByZWplY3QoIndhaXRGb3JNZXNzYWdl IGZvciAiICsgZGF0YSArICIgdGltZWQgb3V0IiksIDUwMDApOworICAgICAgICB3aGlsZSAodHJ1 ZSkgeworICAgICAgICAgICAgY29uc3QgcmVjZWl2ZWQgPSBhd2FpdCBuZXcgUHJvbWlzZShyZXNv bHZlID0+IHJlY2VpdmVyLm9ubWVzc2FnZSA9IChldmVudCkgPT4gcmVzb2x2ZShldmVudC5kYXRh KSk7CisgICAgICAgICAgICBpZiAoZGF0YSA9PT0gcmVjZWl2ZWQpCisgICAgICAgICAgICAgICAg cmVzb2x2ZSgpOworICAgICAgICB9CisgICAgfSk7Cit9CisKK3Byb21pc2VfdGVzdChhc3luYyAo dGVzdCkgPT4geworICAgIGxldCBmcmFtZTsKKyAgICBjb25zdCBzY29wZSA9ICdyZXNvdXJjZXMv JzsKKyAgICBjb25zdCBzY3JpcHQgPSAndHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3Jr ZXIuanMnOworCisgICAgYXdhaXQgc2VydmljZV93b3JrZXJfdW5yZWdpc3Rlcih0ZXN0LCBzY29w ZSk7CisgICAgY29uc3QgcmVnaXN0cmF0aW9uID0gYXdhaXQgbmF2aWdhdG9yLnNlcnZpY2VXb3Jr ZXIucmVnaXN0ZXIoc2NyaXB0LCB7c2NvcGV9KTsKKyAgICB0ZXN0LmFkZF9jbGVhbnVwKGFzeW5j ICgpID0+IHsKKyAgICAgICAgcmV0dXJuIHNlcnZpY2Vfd29ya2VyX3VucmVnaXN0ZXIodGVzdCwg c2NvcGUpOworICAgIH0pOworICAgIGNvbnN0IHdvcmtlciA9IHJlZ2lzdHJhdGlvbi5pbnN0YWxs aW5nOworCisgICAgY29uc3QgbWVzc2FnZUNoYW5uZWwgPSBuZXcgTWVzc2FnZUNoYW5uZWwoKTsK KworICAgIGxldCBsb2NhbENoYW5uZWw7CisgICAgbGV0IHJlbW90ZUNoYW5uZWw7CisKKyAgICBh d2FpdCBuZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiB7CisgICAgICAgIGNyZWF0ZUNv bm5lY3Rpb25zKHRlc3QsIChmaXJzdENvbm5lY3Rpb24pID0+IHsKKyAgICAgICAgICAgIGxvY2Fs Q2hhbm5lbCA9IGZpcnN0Q29ubmVjdGlvbi5jcmVhdGVEYXRhQ2hhbm5lbCgnc2VuZERhdGFDaGFu bmVsJyk7CisgICAgICAgICAgICB3b3JrZXIucG9zdE1lc3NhZ2Uoe2NoYW5uZWw6IGxvY2FsQ2hh bm5lbCwgcG9ydDogbWVzc2FnZUNoYW5uZWwucG9ydDJ9LCBbbG9jYWxDaGFubmVsLCBtZXNzYWdl Q2hhbm5lbC5wb3J0Ml0pOworICAgICAgICB9LCAoc2Vjb25kQ29ubmVjdGlvbikgPT4geworICAg ICAgICAgICAgc2Vjb25kQ29ubmVjdGlvbi5vbmRhdGFjaGFubmVsID0gKGV2ZW50KSA9PiB7Cisg ICAgICAgICAgICAgICAgcmVtb3RlQ2hhbm5lbCA9IGV2ZW50LmNoYW5uZWw7CisgICAgICAgICAg ICAgICAgcmVtb3RlQ2hhbm5lbC5vbm9wZW4gPSByZXNvbHZlOworICAgICAgICAgICAgfTsKKyAg ICAgICAgfSk7CisgICAgICAgIHNldFRpbWVvdXQoKCkgPT4gcmVqZWN0KCJjcmVhdGVDb25uZWN0 aW9ucyB0aW1lZCBvdXQiKSwgNTAwMCk7CisgICAgfSk7CisKKyAgICBjb25zdCBwcm9taXNlID0g d2FpdEZvck1lc3NhZ2UobWVzc2FnZUNoYW5uZWwucG9ydDEsICJPSyIpOworICAgIHJlbW90ZUNo YW5uZWwuc2VuZCgiT0siKTsKKyAgICBhd2FpdCBwcm9taXNlOworCisgICAgY29uc3QgZGF0YSA9 IG5ldyBQcm9taXNlKHJlc29sdmUgPT4geworICAgICAgICByZW1vdGVDaGFubmVsLm9ubWVzc2Fn ZSA9IChldmVudCkgPT4gcmVzb2x2ZShldmVudC5kYXRhKQorICAgICAgICBzZXRUaW1lb3V0KCgp ID0+IHJlamVjdCgib25tZXNzYWdlIHRpbWVkIG91dCIpLCA1MDAwKTsKKyAgICB9KTsKKyAgICBt ZXNzYWdlQ2hhbm5lbC5wb3J0MS5wb3N0TWVzc2FnZSh7bWVzc2FnZTogIk9LMiJ9KTsKKyAgICBh c3NlcnRfZXF1YWxzKGF3YWl0IGRhdGEsICJPSzIiKTsKK30sICJvZmZlcmVyIGRhdGEgY2hhbm5l bCBpbiBzZXJ2aWNlIHdvcmtlciIpOworICAgICAgICA8L3NjcmlwdD4KKyAgICA8L2JvZHk+Cis8 L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJydGMvdHJhbnNmZXIt ZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIuanMgYi9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJy dGMvdHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIuanMKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYzE5 MTlkMGI5YTdiMWMxZWY5OTFjZmQ2MDE4YTgyNjhlMjcxZWIxYQotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYnJ0Yy90cmFuc2Zlci1kYXRhY2hhbm5lbC1zZXJ2aWNl LXdvcmtlci5qcwpAQCAtMCwwICsxLDE1IEBACitsZXQgY2hhbm5lbDsKK2xldCBwb3J0Oworb25t ZXNzYWdlID0gKGUpID0+IHsKKyAgICBpZiAoZS5kYXRhLnBvcnQpIHsKKyAgICAgICAgcG9ydCA9 IGUuZGF0YS5wb3J0OworICAgICAgICBwb3J0Lm9ubWVzc2FnZSA9IChldmVudCkgPT4gY2hhbm5l bC5zZW5kKGV2ZW50LmRhdGEubWVzc2FnZSk7CisgICAgfQorICAgIGlmIChlLmRhdGEuY2hhbm5l bCkgeworICAgICAgICBjaGFubmVsID0gZS5kYXRhLmNoYW5uZWw7CisgICAgICAgIGNoYW5uZWwu b25vcGVuID0gKCkgPT4gcG9ydC5wb3N0TWVzc2FnZSgib3BlbmVkIik7CisgICAgICAgIGNoYW5u ZWwub25lcnJvciA9ICgpID0+IHBvcnQucG9zdE1lc3NhZ2UoImVycm9yZWQiKTsKKyAgICAgICAg Y2hhbm5lbC5vbmNsb3NlID0gKCkgPT4gcG9ydC5wb3N0TWVzc2FnZSgiY2xvc2VkIik7CisgICAg ICAgIGNoYW5uZWwub25tZXNzYWdlID0gKGV2ZW50KSA9PiBwb3J0LnBvc3RNZXNzYWdlKGV2ZW50 LmRhdGEpOworICAgIH0KK307CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMt d2sxL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RF eHBlY3RhdGlvbnMKaW5kZXggNzFjMWNkZDQ2MGRmNjMwYTM0ZmJmMWQ5YzgxOThlZTBlYWJjNjhi OC4uZTk5Mjc4YTljNDI3N2M5NWJkN2ExZDU1MGU2MWVlZjExYTM3NTRmZCAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMS9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL21hYy13azEvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMzc2LDYgKzM3Niw3 IEBAIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd29ya2xldHMvYW5pbWF0aW9uLXdv cmtsZXQtc2VydmljZS13b3JrZXItaW50ZXJjCiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL3dvcmtsZXRzL2F1ZGlvLXdvcmtsZXQtc2VydmljZS13b3JrZXItaW50ZXJjZXB0aW9uLmh0 dHBzLmh0bWwgWyBTa2lwIF0KIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd29ya2xl dHMvbGF5b3V0LXdvcmtsZXQtc2VydmljZS13b3JrZXItaW50ZXJjZXB0aW9uLmh0dHBzLmh0bWwg WyBTa2lwIF0KIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd29ya2xldHMvcGFpbnQt d29ya2xldC1zZXJ2aWNlLXdvcmtlci1pbnRlcmNlcHRpb24uaHR0cHMuaHRtbCBbIFNraXAgXQor aHR0cC93cHQvd2VicnRjL3RyYW5zZmVyLWRhdGFjaGFubmVsLXNlcnZpY2Utd29ya2VyLmh0dHBz Lmh0bWwgWyBTa2lwIF0KIAogIyBRdW90YSBjaGVjayBtaXNzaW5nIGluIFdLMQogaHR0cC90ZXN0 cy9JbmRleGVkREIvc3RvcmFnZS1saW1pdC5odHRwcy5odG1sIFsgU2tpcCBdCg== 431527 2021-06-16 01:37:50 -0700 2021-06-17 02:34:18 -0700 Patch bug-226968-20210616103748.patch text/plain 9161 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4ODYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzQ2ZmFkNTFiMmFiOTJh ODMyZTIxNzIzMGYzY2ZmOTI4NmViYmM1Yy4uOGE4ODQ3M2QxN2UwMWI1ZDg1ZjEzODRmMTY3ZmIw M2VjZDZlNzJhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA2LTE1ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggUlRDRGF0YUNoYW5u ZWxJbml0OjpkZWNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyNjk2OAorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KKworICAg ICAgICBUZXN0OiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy1leHRlbnNp b25zL3RyYW5zZmVyLWRhdGFjaGFubmVsLXNlcnZpY2Utd29ya2VyLmh0dHBzLmh0bWwKKworICAg ICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL1JUQ0RhdGFDaGFubmVsSGFuZGxlci5oOgorICAg ICAgICAoV2ViQ29yZTo6UlRDRGF0YUNoYW5uZWxJbml0OjpkZWNvZGUpOgorICAgICAgICBNYWtl IHN1cmUgdG8gdXNlIG9wdGlvbmFscyBvZiBvcHRpb25hbHMuCisKIDIwMjEtMDYtMTUgIFNhaWQg QWJvdS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CiAKICAgICAgICAgW0NHXSBDcmVhdGUgYSBz dWItaW1hZ2Ugd2hlbiBkcmF3aW5nIGFuIGltYWdlIG9ubHkgaWYgdGhlIGRlc3RpbmF0aW9uIGlt YWdlIHdpbGwgYmUgZW5sYXJnZWQsIHJvdGF0ZWQgb3Igc2hlYXJlZApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5uZWxIYW5kbGVyLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9SVENEYXRhQ2hhbm5lbEhhbmRs ZXIuaAppbmRleCAwNTQ0MjhkNTBkYzYxYWFhZDUxODg3OWQyMmNiYzJmOTc3OTE1MDNlLi42YTNh YTg3ZDg5MzFjNGI4MGNhMGRlYTczODA2YjU3MGM4Njc4ZTU4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9SVENEYXRhQ2hhbm5lbEhhbmRsZXIuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9SVENEYXRhQ2hhbm5lbEhhbmRs ZXIuaApAQCAtNjIsMTcgKzYyLDE3IEBAIHRlbXBsYXRlPGNsYXNzIEVuY29kZXI+IHZvaWQgUlRD RGF0YUNoYW5uZWxJbml0OjplbmNvZGUoRW5jb2RlciYgZW5jb2RlcikgY29uc3QKIAogdGVtcGxh dGU8Y2xhc3MgRGVjb2Rlcj4gc3RkOjpvcHRpb25hbDxSVENEYXRhQ2hhbm5lbEluaXQ+IFJUQ0Rh dGFDaGFubmVsSW5pdDo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIpCiB7Ci0gICAgc3RkOjpvcHRp b25hbDxib29sPiBvcmRlcmVkOworICAgIHN0ZDo6b3B0aW9uYWw8c3RkOjpvcHRpb25hbDxib29s Pj4gb3JkZXJlZDsKICAgICBkZWNvZGVyID4+IG9yZGVyZWQ7CiAgICAgaWYgKCFvcmRlcmVkKQog ICAgICAgICByZXR1cm4geyB9OwogCi0gICAgc3RkOjpvcHRpb25hbDx1bnNpZ25lZCBzaG9ydD4g bWF4UGFja2V0TGlmZVRpbWU7CisgICAgc3RkOjpvcHRpb25hbDxzdGQ6Om9wdGlvbmFsPHVuc2ln bmVkIHNob3J0Pj4gbWF4UGFja2V0TGlmZVRpbWU7CiAgICAgZGVjb2RlciA+PiBtYXhQYWNrZXRM aWZlVGltZTsKICAgICBpZiAoIW1heFBhY2tldExpZmVUaW1lKQogICAgICAgICByZXR1cm4geyB9 OwogCi0gICAgc3RkOjpvcHRpb25hbDx1bnNpZ25lZCBzaG9ydD4gbWF4UmV0cmFuc21pdHM7Cisg ICAgc3RkOjpvcHRpb25hbDxzdGQ6Om9wdGlvbmFsPHVuc2lnbmVkIHNob3J0Pj4gbWF4UmV0cmFu c21pdHM7CiAgICAgZGVjb2RlciA+PiBtYXhSZXRyYW5zbWl0czsKICAgICBpZiAoIW1heFJldHJh bnNtaXRzKQogICAgICAgICByZXR1cm4geyB9OwpAQCAtODEsMTIgKzgxLDEyIEBAIHRlbXBsYXRl PGNsYXNzIERlY29kZXI+IHN0ZDo6b3B0aW9uYWw8UlRDRGF0YUNoYW5uZWxJbml0PiBSVENEYXRh Q2hhbm5lbEluaXQ6OmRlCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwcm90b2NvbCkpCiAgICAg ICAgIHJldHVybiB7IH07CiAKLSAgICBzdGQ6Om9wdGlvbmFsPGJvb2w+IG5lZ290aWF0ZWQ7Cisg ICAgc3RkOjpvcHRpb25hbDxzdGQ6Om9wdGlvbmFsPGJvb2w+PiBuZWdvdGlhdGVkOwogICAgIGRl Y29kZXIgPj4gbmVnb3RpYXRlZDsKICAgICBpZiAoIW5lZ290aWF0ZWQpCiAgICAgICAgIHJldHVy biB7IH07CiAKLSAgICBzdGQ6Om9wdGlvbmFsPHVuc2lnbmVkIHNob3J0PiBpZDsKKyAgICBzdGQ6 Om9wdGlvbmFsPHN0ZDo6b3B0aW9uYWw8dW5zaWduZWQgc2hvcnQ+PiBpZDsKICAgICBkZWNvZGVy ID4+IGlkOwogICAgIGlmICghaWQpCiAgICAgICAgIHJldHVybiB7IH07CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZmM5NzIz NWFiYjJkZTgxNDI0MGRhNTJlN2QxNTc4Mjk1OTgyM2I0My4uMmY5ZjJiOWQ1NjUwMDg1YWJiNTM5 N2RiZDI3ZTY4OWYyZGYyOWM2NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisr KyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA2LTE1ICBZ b3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggUlRDRGF0YUNo YW5uZWxJbml0OjpkZWNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyNjk2OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzkzMDAwMzg+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgorCisgICAgICAgICogaHR0cC93cHQvd2Vi cnRjL3RyYW5zZmVyLWRhdGFjaGFubmVsLXNlcnZpY2Utd29ya2VyLmh0dHBzLWV4cGVjdGVkLnR4 dDogQWRkZWQuCisgICAgICAgICogaHR0cC93cHQvd2VicnRjL3RyYW5zZmVyLWRhdGFjaGFubmVs LXNlcnZpY2Utd29ya2VyLmh0dHBzLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGh0dHAvd3B0L3dl YnJ0Yy90cmFuc2Zlci1kYXRhY2hhbm5lbC1zZXJ2aWNlLXdvcmtlci5qczogQWRkZWQuCisgICAg ICAgIChvbm1lc3NhZ2UpOgorICAgICAgICAqIHBsYXRmb3JtL21hYy13azEvVGVzdEV4cGVjdGF0 aW9uczoKKwogMjAyMS0wNi0xNSAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQHdlYmtpdC5v cmc+CiAKICAgICAgICAgW2Nzcy1zY3JvbGwtc25hcF0gTmV3IHNuYXAgY29udGFpbmVycyBhbHdh eXMgc25hcCB0byB0aGUgZmlyc3Qgc2Nyb2xsIHBvc2l0aW9uCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9odHRwL3dwdC93ZWJydGMvdHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIu aHR0cHMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2VicnRjL3RyYW5zZmVy LWRhdGFjaGFubmVsLXNlcnZpY2Utd29ya2VyLmh0dHBzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li40OWJiMjk0MzExYTczZmUwZjRhNmFjNWMxZDkyMTJmNWNlZjRiMTkwCi0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2VicnRjL3RyYW5zZmVyLWRhdGFjaGFubmVsLXNl cnZpY2Utd29ya2VyLmh0dHBzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDMgQEAKKworUEFTUyBv ZmZlcmVyIGRhdGEgY2hhbm5lbCBpbiBzZXJ2aWNlIHdvcmtlcgorCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9odHRwL3dwdC93ZWJydGMvdHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3Jr ZXIuaHR0cHMuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYnJ0Yy90cmFuc2Zlci1kYXRh Y2hhbm5lbC1zZXJ2aWNlLXdvcmtlci5odHRwcy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmVhNGMyZmZiZjM0 OWNkNzgxZTg0YjE4NDk5ZjU4Njg2ZmU5MjY0MTgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9odHRwL3dwdC93ZWJydGMvdHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIu aHR0cHMuaHRtbApAQCAtMCwwICsxLDkyIEBACis8IWRvY3R5cGUgaHRtbD4KKzxodG1sPgorICAg IDxoZWFkPgorICAgICAgICA8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+CisgICAgICAgIDxzY3JpcHQg c3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzLmpzIj48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlw dCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQuanMiPjwvc2NyaXB0PgorICAgIDwv aGVhZD4KKyAgICA8Ym9keT4KKyAgICAgICAgPHNjcmlwdCBzcmM9Ii9zZXJ2aWNlLXdvcmtlcnMv c2VydmljZS13b3JrZXIvcmVzb3VyY2VzL3Rlc3QtaGVscGVycy5zdWIuanMiPjwvc2NyaXB0Pgor ICAgICAgICA8c2NyaXB0PgorYXN5bmMgZnVuY3Rpb24gY3JlYXRlQ29ubmVjdGlvbnModGVzdCwg Zmlyc3RDb25uZWN0aW9uQ2FsbGJhY2ssIHNlY29uZENvbm5lY3Rpb25DYWxsYmFjaykKK3sKKyAg ICBjb25zdCBwYzEgPSBuZXcgUlRDUGVlckNvbm5lY3Rpb24oKTsKKyAgICBjb25zdCBwYzIgPSBu ZXcgUlRDUGVlckNvbm5lY3Rpb24oKTsKKworICAgIHRlc3QuYWRkX2NsZWFudXAoKCkgPT4gcGMx LmNsb3NlKCkpOworICAgIHRlc3QuYWRkX2NsZWFudXAoKCkgPT4gcGMyLmNsb3NlKCkpOworCisg ICAgcGMxLm9uaWNlY2FuZGlkYXRlID0gKGUpID0+IHBjMi5hZGRJY2VDYW5kaWRhdGUoZS5jYW5k aWRhdGUpOworICAgIHBjMi5vbmljZWNhbmRpZGF0ZSA9IChlKSA9PiBwYzEuYWRkSWNlQ2FuZGlk YXRlKGUuY2FuZGlkYXRlKTsKKworICAgIGZpcnN0Q29ubmVjdGlvbkNhbGxiYWNrKHBjMSk7CisK KyAgICBjb25zdCBvZmZlciA9IGF3YWl0IHBjMS5jcmVhdGVPZmZlcigpOworICAgIGF3YWl0IHBj MS5zZXRMb2NhbERlc2NyaXB0aW9uKG9mZmVyKTsKKyAgICBhd2FpdCBwYzIuc2V0UmVtb3RlRGVz Y3JpcHRpb24ob2ZmZXIpOworCisgICAgc2Vjb25kQ29ubmVjdGlvbkNhbGxiYWNrKHBjMik7CisK KyAgICBjb25zdCBhbnN3ZXIgPSBhd2FpdCBwYzIuY3JlYXRlQW5zd2VyKCk7CisgICAgYXdhaXQg cGMyLnNldExvY2FsRGVzY3JpcHRpb24oYW5zd2VyKTsKKyAgICBhd2FpdCBwYzEuc2V0UmVtb3Rl RGVzY3JpcHRpb24oYW5zd2VyKTsKK30KKworZnVuY3Rpb24gd2FpdEZvck1lc3NhZ2UocmVjZWl2 ZXIsIGRhdGEpCit7CisgICAgcmV0dXJuIG5ldyBQcm9taXNlKGFzeW5jIChyZXNvbHZlLCByZWpl Y3QpID0+IHsKKyAgICAgICAgc2V0VGltZW91dCgoKSA9PiByZWplY3QoIndhaXRGb3JNZXNzYWdl IGZvciAiICsgZGF0YSArICIgdGltZWQgb3V0IiksIDUwMDApOworICAgICAgICB3aGlsZSAodHJ1 ZSkgeworICAgICAgICAgICAgY29uc3QgcmVjZWl2ZWQgPSBhd2FpdCBuZXcgUHJvbWlzZShyZXNv bHZlID0+IHJlY2VpdmVyLm9ubWVzc2FnZSA9IChldmVudCkgPT4gcmVzb2x2ZShldmVudC5kYXRh KSk7CisgICAgICAgICAgICBpZiAoZGF0YSA9PT0gcmVjZWl2ZWQpIHsKKyAgICAgICAgICAgICAg ICByZXNvbHZlKCk7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorICAg ICAgICB9CisgICAgfSk7Cit9CisKK3Byb21pc2VfdGVzdChhc3luYyAodGVzdCkgPT4geworICAg IGxldCBmcmFtZTsKKyAgICBjb25zdCBzY29wZSA9ICdyZXNvdXJjZXMvJzsKKyAgICBjb25zdCBz Y3JpcHQgPSAndHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIuanMnOworCisgICAg YXdhaXQgc2VydmljZV93b3JrZXJfdW5yZWdpc3Rlcih0ZXN0LCBzY29wZSk7CisgICAgY29uc3Qg cmVnaXN0cmF0aW9uID0gYXdhaXQgbmF2aWdhdG9yLnNlcnZpY2VXb3JrZXIucmVnaXN0ZXIoc2Ny aXB0LCB7c2NvcGV9KTsKKyAgICB0ZXN0LmFkZF9jbGVhbnVwKGFzeW5jICgpID0+IHsKKyAgICAg ICAgcmV0dXJuIHNlcnZpY2Vfd29ya2VyX3VucmVnaXN0ZXIodGVzdCwgc2NvcGUpOworICAgIH0p OworICAgIGNvbnN0IHdvcmtlciA9IHJlZ2lzdHJhdGlvbi5pbnN0YWxsaW5nOworCisgICAgY29u c3QgbWVzc2FnZUNoYW5uZWwgPSBuZXcgTWVzc2FnZUNoYW5uZWwoKTsKKworICAgIGxldCBsb2Nh bENoYW5uZWw7CisgICAgbGV0IHJlbW90ZUNoYW5uZWw7CisKKyAgICBhd2FpdCBuZXcgUHJvbWlz ZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiB7CisgICAgICAgIGNyZWF0ZUNvbm5lY3Rpb25zKHRlc3Qs IChmaXJzdENvbm5lY3Rpb24pID0+IHsKKyAgICAgICAgICAgIGxvY2FsQ2hhbm5lbCA9IGZpcnN0 Q29ubmVjdGlvbi5jcmVhdGVEYXRhQ2hhbm5lbCgnc2VuZERhdGFDaGFubmVsJyk7CisgICAgICAg ICAgICB3b3JrZXIucG9zdE1lc3NhZ2Uoe2NoYW5uZWw6IGxvY2FsQ2hhbm5lbCwgcG9ydDogbWVz c2FnZUNoYW5uZWwucG9ydDJ9LCBbbG9jYWxDaGFubmVsLCBtZXNzYWdlQ2hhbm5lbC5wb3J0Ml0p OworICAgICAgICB9LCAoc2Vjb25kQ29ubmVjdGlvbikgPT4geworICAgICAgICAgICAgc2Vjb25k Q29ubmVjdGlvbi5vbmRhdGFjaGFubmVsID0gKGV2ZW50KSA9PiB7CisgICAgICAgICAgICAgICAg cmVtb3RlQ2hhbm5lbCA9IGV2ZW50LmNoYW5uZWw7CisgICAgICAgICAgICAgICAgcmVtb3RlQ2hh bm5lbC5vbm9wZW4gPSByZXNvbHZlOworICAgICAgICAgICAgfTsKKyAgICAgICAgfSk7CisgICAg ICAgIHNldFRpbWVvdXQoKCkgPT4gcmVqZWN0KCJjcmVhdGVDb25uZWN0aW9ucyB0aW1lZCBvdXQi KSwgNTAwMCk7CisgICAgfSk7CisKKyAgICBjb25zdCBwcm9taXNlID0gd2FpdEZvck1lc3NhZ2Uo bWVzc2FnZUNoYW5uZWwucG9ydDEsICJPSyIpOworICAgIHJlbW90ZUNoYW5uZWwuc2VuZCgiT0si KTsKKyAgICBhd2FpdCBwcm9taXNlOworCisgICAgY29uc3QgZGF0YSA9IG5ldyBQcm9taXNlKChy ZXNvbHZlLCByZWplY3QpID0+IHsKKyAgICAgICAgcmVtb3RlQ2hhbm5lbC5vbm1lc3NhZ2UgPSAo ZXZlbnQpID0+IHJlc29sdmUoZXZlbnQuZGF0YSkKKyAgICAgICAgc2V0VGltZW91dCgoKSA9PiBy ZWplY3QoIm9ubWVzc2FnZSB0aW1lZCBvdXQiKSwgNTAwMCk7CisgICAgfSk7CisgICAgbWVzc2Fn ZUNoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2Uoe21lc3NhZ2U6ICJPSzIifSk7CisgICAgYXNzZXJ0 X2VxdWFscyhhd2FpdCBkYXRhLCAiT0syIik7Cit9LCAib2ZmZXJlciBkYXRhIGNoYW5uZWwgaW4g c2VydmljZSB3b3JrZXIiKTsKKyAgICAgICAgPC9zY3JpcHQ+CisgICAgPC9ib2R5PgorPC9odG1s PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2VicnRjL3RyYW5zZmVyLWRhdGFj aGFubmVsLXNlcnZpY2Utd29ya2VyLmpzIGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2VicnRjL3Ry YW5zZmVyLWRhdGFjaGFubmVsLXNlcnZpY2Utd29ya2VyLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmMxOTE5ZDBi OWE3YjFjMWVmOTkxY2ZkNjAxOGE4MjY4ZTI3MWViMWEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9odHRwL3dwdC93ZWJydGMvdHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3Jr ZXIuanMKQEAgLTAsMCArMSwxNSBAQAorbGV0IGNoYW5uZWw7CitsZXQgcG9ydDsKK29ubWVzc2Fn ZSA9IChlKSA9PiB7CisgICAgaWYgKGUuZGF0YS5wb3J0KSB7CisgICAgICAgIHBvcnQgPSBlLmRh dGEucG9ydDsKKyAgICAgICAgcG9ydC5vbm1lc3NhZ2UgPSAoZXZlbnQpID0+IGNoYW5uZWwuc2Vu ZChldmVudC5kYXRhLm1lc3NhZ2UpOworICAgIH0KKyAgICBpZiAoZS5kYXRhLmNoYW5uZWwpIHsK KyAgICAgICAgY2hhbm5lbCA9IGUuZGF0YS5jaGFubmVsOworICAgICAgICBjaGFubmVsLm9ub3Bl biA9ICgpID0+IHBvcnQucG9zdE1lc3NhZ2UoIm9wZW5lZCIpOworICAgICAgICBjaGFubmVsLm9u ZXJyb3IgPSAoKSA9PiBwb3J0LnBvc3RNZXNzYWdlKCJlcnJvcmVkIik7CisgICAgICAgIGNoYW5u ZWwub25jbG9zZSA9ICgpID0+IHBvcnQucG9zdE1lc3NhZ2UoImNsb3NlZCIpOworICAgICAgICBj aGFubmVsLm9ubWVzc2FnZSA9IChldmVudCkgPT4gcG9ydC5wb3N0TWVzc2FnZShldmVudC5kYXRh KTsKKyAgICB9Cit9OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMS9U ZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMS9UZXN0RXhwZWN0 YXRpb25zCmluZGV4IDcxYzFjZGQ0NjBkZjYzMGEzNGZiZjFkOWM4MTk4ZWUwZWFiYzY4YjguLmU5 OTI3OGE5YzQyNzdjOTViZDdhMWQ1NTBlNjFlZWYxMWEzNzU0ZmQgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL3BsYXRmb3JtL21hYy13azEvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTM3Niw2ICszNzYsNyBAQCBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dvcmtsZXRzL2FuaW1hdGlvbi13b3JrbGV0 LXNlcnZpY2Utd29ya2VyLWludGVyYwogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93 b3JrbGV0cy9hdWRpby13b3JrbGV0LXNlcnZpY2Utd29ya2VyLWludGVyY2VwdGlvbi5odHRwcy5o dG1sIFsgU2tpcCBdCiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dvcmtsZXRzL2xh eW91dC13b3JrbGV0LXNlcnZpY2Utd29ya2VyLWludGVyY2VwdGlvbi5odHRwcy5odG1sIFsgU2tp cCBdCiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dvcmtsZXRzL3BhaW50LXdvcmts ZXQtc2VydmljZS13b3JrZXItaW50ZXJjZXB0aW9uLmh0dHBzLmh0bWwgWyBTa2lwIF0KK2h0dHAv d3B0L3dlYnJ0Yy90cmFuc2Zlci1kYXRhY2hhbm5lbC1zZXJ2aWNlLXdvcmtlci5odHRwcy5odG1s IFsgU2tpcCBdCiAKICMgUXVvdGEgY2hlY2sgbWlzc2luZyBpbiBXSzEKIGh0dHAvdGVzdHMvSW5k ZXhlZERCL3N0b3JhZ2UtbGltaXQuaHR0cHMuaHRtbCBbIFNraXAgXQo= 431644 2021-06-17 02:34:23 -0700 2021-06-17 05:40:31 -0700 Patch bug-226968-20210617113421.patch text/plain 8871 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4ODYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzQ2ZmFkNTFiMmFiOTJh ODMyZTIxNzIzMGYzY2ZmOTI4NmViYmM1Yy4uOGE4ODQ3M2QxN2UwMWI1ZDg1ZjEzODRmMTY3ZmIw M2VjZDZlNzJhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA2LTE1ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggUlRDRGF0YUNoYW5u ZWxJbml0OjpkZWNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyNjk2OAorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KKworICAg ICAgICBUZXN0OiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnJ0Yy1leHRlbnNp b25zL3RyYW5zZmVyLWRhdGFjaGFubmVsLXNlcnZpY2Utd29ya2VyLmh0dHBzLmh0bWwKKworICAg ICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL1JUQ0RhdGFDaGFubmVsSGFuZGxlci5oOgorICAg ICAgICAoV2ViQ29yZTo6UlRDRGF0YUNoYW5uZWxJbml0OjpkZWNvZGUpOgorICAgICAgICBNYWtl IHN1cmUgdG8gdXNlIG9wdGlvbmFscyBvZiBvcHRpb25hbHMuCisKIDIwMjEtMDYtMTUgIFNhaWQg QWJvdS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CiAKICAgICAgICAgW0NHXSBDcmVhdGUgYSBz dWItaW1hZ2Ugd2hlbiBkcmF3aW5nIGFuIGltYWdlIG9ubHkgaWYgdGhlIGRlc3RpbmF0aW9uIGlt YWdlIHdpbGwgYmUgZW5sYXJnZWQsIHJvdGF0ZWQgb3Igc2hlYXJlZApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5uZWxIYW5kbGVyLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9SVENEYXRhQ2hhbm5lbEhhbmRs ZXIuaAppbmRleCAwNTQ0MjhkNTBkYzYxYWFhZDUxODg3OWQyMmNiYzJmOTc3OTE1MDNlLi42YTNh YTg3ZDg5MzFjNGI4MGNhMGRlYTczODA2YjU3MGM4Njc4ZTU4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9SVENEYXRhQ2hhbm5lbEhhbmRsZXIuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9SVENEYXRhQ2hhbm5lbEhhbmRs ZXIuaApAQCAtNjIsMTcgKzYyLDE3IEBAIHRlbXBsYXRlPGNsYXNzIEVuY29kZXI+IHZvaWQgUlRD RGF0YUNoYW5uZWxJbml0OjplbmNvZGUoRW5jb2RlciYgZW5jb2RlcikgY29uc3QKIAogdGVtcGxh dGU8Y2xhc3MgRGVjb2Rlcj4gc3RkOjpvcHRpb25hbDxSVENEYXRhQ2hhbm5lbEluaXQ+IFJUQ0Rh dGFDaGFubmVsSW5pdDo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIpCiB7Ci0gICAgc3RkOjpvcHRp b25hbDxib29sPiBvcmRlcmVkOworICAgIHN0ZDo6b3B0aW9uYWw8c3RkOjpvcHRpb25hbDxib29s Pj4gb3JkZXJlZDsKICAgICBkZWNvZGVyID4+IG9yZGVyZWQ7CiAgICAgaWYgKCFvcmRlcmVkKQog ICAgICAgICByZXR1cm4geyB9OwogCi0gICAgc3RkOjpvcHRpb25hbDx1bnNpZ25lZCBzaG9ydD4g bWF4UGFja2V0TGlmZVRpbWU7CisgICAgc3RkOjpvcHRpb25hbDxzdGQ6Om9wdGlvbmFsPHVuc2ln bmVkIHNob3J0Pj4gbWF4UGFja2V0TGlmZVRpbWU7CiAgICAgZGVjb2RlciA+PiBtYXhQYWNrZXRM aWZlVGltZTsKICAgICBpZiAoIW1heFBhY2tldExpZmVUaW1lKQogICAgICAgICByZXR1cm4geyB9 OwogCi0gICAgc3RkOjpvcHRpb25hbDx1bnNpZ25lZCBzaG9ydD4gbWF4UmV0cmFuc21pdHM7Cisg ICAgc3RkOjpvcHRpb25hbDxzdGQ6Om9wdGlvbmFsPHVuc2lnbmVkIHNob3J0Pj4gbWF4UmV0cmFu c21pdHM7CiAgICAgZGVjb2RlciA+PiBtYXhSZXRyYW5zbWl0czsKICAgICBpZiAoIW1heFJldHJh bnNtaXRzKQogICAgICAgICByZXR1cm4geyB9OwpAQCAtODEsMTIgKzgxLDEyIEBAIHRlbXBsYXRl PGNsYXNzIERlY29kZXI+IHN0ZDo6b3B0aW9uYWw8UlRDRGF0YUNoYW5uZWxJbml0PiBSVENEYXRh Q2hhbm5lbEluaXQ6OmRlCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwcm90b2NvbCkpCiAgICAg ICAgIHJldHVybiB7IH07CiAKLSAgICBzdGQ6Om9wdGlvbmFsPGJvb2w+IG5lZ290aWF0ZWQ7Cisg ICAgc3RkOjpvcHRpb25hbDxzdGQ6Om9wdGlvbmFsPGJvb2w+PiBuZWdvdGlhdGVkOwogICAgIGRl Y29kZXIgPj4gbmVnb3RpYXRlZDsKICAgICBpZiAoIW5lZ290aWF0ZWQpCiAgICAgICAgIHJldHVy biB7IH07CiAKLSAgICBzdGQ6Om9wdGlvbmFsPHVuc2lnbmVkIHNob3J0PiBpZDsKKyAgICBzdGQ6 Om9wdGlvbmFsPHN0ZDo6b3B0aW9uYWw8dW5zaWduZWQgc2hvcnQ+PiBpZDsKICAgICBkZWNvZGVy ID4+IGlkOwogICAgIGlmICghaWQpCiAgICAgICAgIHJldHVybiB7IH07CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZmM5NzIz NWFiYjJkZTgxNDI0MGRhNTJlN2QxNTc4Mjk1OTgyM2I0My4uMmY5ZjJiOWQ1NjUwMDg1YWJiNTM5 N2RiZDI3ZTY4OWYyZGYyOWM2NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisr KyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA2LTE1ICBZ b3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggUlRDRGF0YUNo YW5uZWxJbml0OjpkZWNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyNjk2OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzkzMDAwMzg+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgorCisgICAgICAgICogaHR0cC93cHQvd2Vi cnRjL3RyYW5zZmVyLWRhdGFjaGFubmVsLXNlcnZpY2Utd29ya2VyLmh0dHBzLWV4cGVjdGVkLnR4 dDogQWRkZWQuCisgICAgICAgICogaHR0cC93cHQvd2VicnRjL3RyYW5zZmVyLWRhdGFjaGFubmVs LXNlcnZpY2Utd29ya2VyLmh0dHBzLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGh0dHAvd3B0L3dl YnJ0Yy90cmFuc2Zlci1kYXRhY2hhbm5lbC1zZXJ2aWNlLXdvcmtlci5qczogQWRkZWQuCisgICAg ICAgIChvbm1lc3NhZ2UpOgorICAgICAgICAqIHBsYXRmb3JtL21hYy13azEvVGVzdEV4cGVjdGF0 aW9uczoKKwogMjAyMS0wNi0xNSAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQHdlYmtpdC5v cmc+CiAKICAgICAgICAgW2Nzcy1zY3JvbGwtc25hcF0gTmV3IHNuYXAgY29udGFpbmVycyBhbHdh eXMgc25hcCB0byB0aGUgZmlyc3Qgc2Nyb2xsIHBvc2l0aW9uCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9odHRwL3dwdC93ZWJydGMvdHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIu aHR0cHMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2VicnRjL3RyYW5zZmVy LWRhdGFjaGFubmVsLXNlcnZpY2Utd29ya2VyLmh0dHBzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li40OWJiMjk0MzExYTczZmUwZjRhNmFjNWMxZDkyMTJmNWNlZjRiMTkwCi0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2VicnRjL3RyYW5zZmVyLWRhdGFjaGFubmVsLXNl cnZpY2Utd29ya2VyLmh0dHBzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDMgQEAKKworUEFTUyBv ZmZlcmVyIGRhdGEgY2hhbm5lbCBpbiBzZXJ2aWNlIHdvcmtlcgorCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9odHRwL3dwdC93ZWJydGMvdHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3Jr ZXIuaHR0cHMuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYnJ0Yy90cmFuc2Zlci1kYXRh Y2hhbm5lbC1zZXJ2aWNlLXdvcmtlci5odHRwcy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmJlZTRlZDQ4YzMw MDY1ZDgyYzlkZGUxZDI3NTlkYjg4ZjcyY2QxOWMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9odHRwL3dwdC93ZWJydGMvdHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIu aHR0cHMuaHRtbApAQCAtMCwwICsxLDg1IEBACis8IWRvY3R5cGUgaHRtbD4KKzxodG1sPgorICAg IDxoZWFkPgorICAgICAgICA8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+CisgICAgICAgIDxzY3JpcHQg c3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzLmpzIj48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlw dCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQuanMiPjwvc2NyaXB0PgorICAgIDwv aGVhZD4KKyAgICA8Ym9keT4KKyAgICAgICAgPHNjcmlwdCBzcmM9Ii9zZXJ2aWNlLXdvcmtlcnMv c2VydmljZS13b3JrZXIvcmVzb3VyY2VzL3Rlc3QtaGVscGVycy5zdWIuanMiPjwvc2NyaXB0Pgor ICAgICAgICA8c2NyaXB0PgorYXN5bmMgZnVuY3Rpb24gY3JlYXRlQ29ubmVjdGlvbnModGVzdCwg Zmlyc3RDb25uZWN0aW9uQ2FsbGJhY2ssIHNlY29uZENvbm5lY3Rpb25DYWxsYmFjaykKK3sKKyAg ICBjb25zdCBwYzEgPSBuZXcgUlRDUGVlckNvbm5lY3Rpb24oKTsKKyAgICBjb25zdCBwYzIgPSBu ZXcgUlRDUGVlckNvbm5lY3Rpb24oKTsKKworICAgIHRlc3QuYWRkX2NsZWFudXAoKCkgPT4gcGMx LmNsb3NlKCkpOworICAgIHRlc3QuYWRkX2NsZWFudXAoKCkgPT4gcGMyLmNsb3NlKCkpOworCisg ICAgcGMxLm9uaWNlY2FuZGlkYXRlID0gKGUpID0+IHBjMi5hZGRJY2VDYW5kaWRhdGUoZS5jYW5k aWRhdGUpOworICAgIHBjMi5vbmljZWNhbmRpZGF0ZSA9IChlKSA9PiBwYzEuYWRkSWNlQ2FuZGlk YXRlKGUuY2FuZGlkYXRlKTsKKworICAgIGZpcnN0Q29ubmVjdGlvbkNhbGxiYWNrKHBjMSk7CisK KyAgICBjb25zdCBvZmZlciA9IGF3YWl0IHBjMS5jcmVhdGVPZmZlcigpOworICAgIGF3YWl0IHBj MS5zZXRMb2NhbERlc2NyaXB0aW9uKG9mZmVyKTsKKyAgICBhd2FpdCBwYzIuc2V0UmVtb3RlRGVz Y3JpcHRpb24ob2ZmZXIpOworCisgICAgc2Vjb25kQ29ubmVjdGlvbkNhbGxiYWNrKHBjMik7CisK KyAgICBjb25zdCBhbnN3ZXIgPSBhd2FpdCBwYzIuY3JlYXRlQW5zd2VyKCk7CisgICAgYXdhaXQg cGMyLnNldExvY2FsRGVzY3JpcHRpb24oYW5zd2VyKTsKKyAgICBhd2FpdCBwYzEuc2V0UmVtb3Rl RGVzY3JpcHRpb24oYW5zd2VyKTsKK30KKworZnVuY3Rpb24gd2FpdEZvck1lc3NhZ2UocmVjZWl2 ZXIsIGRhdGEpCit7CisgICAgcmV0dXJuIG5ldyBQcm9taXNlKGFzeW5jIChyZXNvbHZlLCByZWpl Y3QpID0+IHsKKyAgICAgICAgc2V0VGltZW91dCgoKSA9PiByZWplY3QoIndhaXRGb3JNZXNzYWdl IGZvciAiICsgZGF0YSArICIgdGltZWQgb3V0IiksIDUwMDApOworICAgICAgICB3aGlsZSAodHJ1 ZSkgeworICAgICAgICAgICAgY29uc3QgcmVjZWl2ZWQgPSBhd2FpdCBuZXcgUHJvbWlzZShyZXNv bHZlID0+IHJlY2VpdmVyLm9ubWVzc2FnZSA9IChldmVudCkgPT4gcmVzb2x2ZShldmVudC5kYXRh KSk7CisgICAgICAgICAgICBpZiAoZGF0YSA9PT0gcmVjZWl2ZWQpIHsKKyAgICAgICAgICAgICAg ICByZXNvbHZlKCk7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorICAg ICAgICB9CisgICAgfSk7Cit9CisKK3Byb21pc2VfdGVzdChhc3luYyAodGVzdCkgPT4geworICAg IGxldCBmcmFtZTsKKyAgICBjb25zdCBzY29wZSA9ICdyZXNvdXJjZXMvJzsKKyAgICBjb25zdCBz Y3JpcHQgPSAndHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIuanMnOworCisgICAg YXdhaXQgc2VydmljZV93b3JrZXJfdW5yZWdpc3Rlcih0ZXN0LCBzY29wZSk7CisgICAgY29uc3Qg cmVnaXN0cmF0aW9uID0gYXdhaXQgbmF2aWdhdG9yLnNlcnZpY2VXb3JrZXIucmVnaXN0ZXIoc2Ny aXB0LCB7c2NvcGV9KTsKKyAgICB0ZXN0LmFkZF9jbGVhbnVwKGFzeW5jICgpID0+IHsKKyAgICAg ICAgcmV0dXJuIHNlcnZpY2Vfd29ya2VyX3VucmVnaXN0ZXIodGVzdCwgc2NvcGUpOworICAgIH0p OworICAgIGNvbnN0IHdvcmtlciA9IHJlZ2lzdHJhdGlvbi5pbnN0YWxsaW5nOworCisgICAgY29u c3QgbWVzc2FnZUNoYW5uZWwgPSBuZXcgTWVzc2FnZUNoYW5uZWwoKTsKKworICAgIGxldCBsb2Nh bENoYW5uZWw7CisgICAgbGV0IHJlbW90ZUNoYW5uZWw7CisKKyAgICBhd2FpdCBuZXcgUHJvbWlz ZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiB7CisgICAgICAgIGNyZWF0ZUNvbm5lY3Rpb25zKHRlc3Qs IChmaXJzdENvbm5lY3Rpb24pID0+IHsKKyAgICAgICAgICAgIGxvY2FsQ2hhbm5lbCA9IGZpcnN0 Q29ubmVjdGlvbi5jcmVhdGVEYXRhQ2hhbm5lbCgnc2VuZERhdGFDaGFubmVsJyk7CisgICAgICAg ICAgICB3b3JrZXIucG9zdE1lc3NhZ2Uoe2NoYW5uZWw6IGxvY2FsQ2hhbm5lbCwgcG9ydDogbWVz c2FnZUNoYW5uZWwucG9ydDJ9LCBbbG9jYWxDaGFubmVsLCBtZXNzYWdlQ2hhbm5lbC5wb3J0Ml0p OworICAgICAgICB9LCAoc2Vjb25kQ29ubmVjdGlvbikgPT4geworICAgICAgICAgICAgc2Vjb25k Q29ubmVjdGlvbi5vbmRhdGFjaGFubmVsID0gKGV2ZW50KSA9PiB7CisgICAgICAgICAgICAgICAg cmVtb3RlQ2hhbm5lbCA9IGV2ZW50LmNoYW5uZWw7CisgICAgICAgICAgICAgICAgcmVtb3RlQ2hh bm5lbC5vbm9wZW4gPSByZXNvbHZlOworICAgICAgICAgICAgfTsKKyAgICAgICAgfSk7CisgICAg ICAgIHNldFRpbWVvdXQoKCkgPT4gcmVqZWN0KCJjcmVhdGVDb25uZWN0aW9ucyB0aW1lZCBvdXQi KSwgNTAwMCk7CisgICAgfSk7CisKKyAgICBjb25zdCBwcm9taXNlID0gd2FpdEZvck1lc3NhZ2Uo bWVzc2FnZUNoYW5uZWwucG9ydDEsICJPSyIpOworICAgIHJlbW90ZUNoYW5uZWwuc2VuZCgiT0si KTsKKyAgICBhd2FpdCBwcm9taXNlOworfSwgIm9mZmVyZXIgZGF0YSBjaGFubmVsIGluIHNlcnZp Y2Ugd29ya2VyIik7CisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvYm9keT4KKzwvaHRtbD4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYnJ0Yy90cmFuc2Zlci1kYXRhY2hhbm5l bC1zZXJ2aWNlLXdvcmtlci5qcyBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYnJ0Yy90cmFuc2Zl ci1kYXRhY2hhbm5lbC1zZXJ2aWNlLXdvcmtlci5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jMTkxOWQwYjlhN2Ix YzFlZjk5MWNmZDYwMThhODI2OGUyNzFlYjFhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvaHR0cC93cHQvd2VicnRjL3RyYW5zZmVyLWRhdGFjaGFubmVsLXNlcnZpY2Utd29ya2VyLmpz CkBAIC0wLDAgKzEsMTUgQEAKK2xldCBjaGFubmVsOworbGV0IHBvcnQ7Citvbm1lc3NhZ2UgPSAo ZSkgPT4geworICAgIGlmIChlLmRhdGEucG9ydCkgeworICAgICAgICBwb3J0ID0gZS5kYXRhLnBv cnQ7CisgICAgICAgIHBvcnQub25tZXNzYWdlID0gKGV2ZW50KSA9PiBjaGFubmVsLnNlbmQoZXZl bnQuZGF0YS5tZXNzYWdlKTsKKyAgICB9CisgICAgaWYgKGUuZGF0YS5jaGFubmVsKSB7CisgICAg ICAgIGNoYW5uZWwgPSBlLmRhdGEuY2hhbm5lbDsKKyAgICAgICAgY2hhbm5lbC5vbm9wZW4gPSAo KSA9PiBwb3J0LnBvc3RNZXNzYWdlKCJvcGVuZWQiKTsKKyAgICAgICAgY2hhbm5lbC5vbmVycm9y ID0gKCkgPT4gcG9ydC5wb3N0TWVzc2FnZSgiZXJyb3JlZCIpOworICAgICAgICBjaGFubmVsLm9u Y2xvc2UgPSAoKSA9PiBwb3J0LnBvc3RNZXNzYWdlKCJjbG9zZWQiKTsKKyAgICAgICAgY2hhbm5l bC5vbm1lc3NhZ2UgPSAoZXZlbnQpID0+IHBvcnQucG9zdE1lc3NhZ2UoZXZlbnQuZGF0YSk7Cisg ICAgfQorfTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azEvVGVzdEV4 cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azEvVGVzdEV4cGVjdGF0aW9u cwppbmRleCA3MWMxY2RkNDYwZGY2MzBhMzRmYmYxZDljODE5OGVlMGVhYmM2OGI4Li5lOTkyNzhh OWM0Mjc3Yzk1YmQ3YTFkNTUwZTYxZWVmMTFhMzc1NGZkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxh dGZvcm0vbWFjLXdrMS9UZXN0RXhwZWN0YXRpb25zCkBAIC0zNzYsNiArMzc2LDcgQEAgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93b3JrbGV0cy9hbmltYXRpb24td29ya2xldC1zZXJ2 aWNlLXdvcmtlci1pbnRlcmMKIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd29ya2xl dHMvYXVkaW8td29ya2xldC1zZXJ2aWNlLXdvcmtlci1pbnRlcmNlcHRpb24uaHR0cHMuaHRtbCBb IFNraXAgXQogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93b3JrbGV0cy9sYXlvdXQt d29ya2xldC1zZXJ2aWNlLXdvcmtlci1pbnRlcmNlcHRpb24uaHR0cHMuaHRtbCBbIFNraXAgXQog aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93b3JrbGV0cy9wYWludC13b3JrbGV0LXNl cnZpY2Utd29ya2VyLWludGVyY2VwdGlvbi5odHRwcy5odG1sIFsgU2tpcCBdCitodHRwL3dwdC93 ZWJydGMvdHJhbnNmZXItZGF0YWNoYW5uZWwtc2VydmljZS13b3JrZXIuaHR0cHMuaHRtbCBbIFNr aXAgXQogCiAjIFF1b3RhIGNoZWNrIG1pc3NpbmcgaW4gV0sxCiBodHRwL3Rlc3RzL0luZGV4ZWRE Qi9zdG9yYWdlLWxpbWl0Lmh0dHBzLmh0bWwgWyBTa2lwIF0K