225187 2021-04-29 04:37:37 -0700 Share style resolvers between author shadow trees with identical style 2021-05-01 22:22:59 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 225102 148695 222187 1 koivisto webkit-unassigned emilio rniwa sam webkit-bug-importer oldest_to_newest 1755341 0 koivisto 2021-04-29 04:37:37 -0700 It is common for a web components based application to have many shadow trees with identical style. We should share the style resolver for better performance and lower memory usage. 1755350 1 webkit-bug-importer 2021-04-29 05:41:48 -0700 <rdar://problem/77317178> 1755674 2 427416 koivisto 2021-04-30 07:21:40 -0700 Created attachment 427416 patch 1755688 3 427422 koivisto 2021-04-30 08:32:27 -0700 Created attachment 427422 patch 1755691 4 427424 koivisto 2021-04-30 08:50:00 -0700 Created attachment 427424 patch 1755697 5 427425 koivisto 2021-04-30 08:58:42 -0700 Created attachment 427425 patch 1756024 6 ews-feeder 2021-05-01 22:22:57 -0700 Committed r276882 (237228@main): <https://commits.webkit.org/237228@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 427425. 427416 2021-04-30 07:21:40 -0700 2021-04-30 08:19:32 -0700 patch shared-resolver-all.patch text/plain 9828 koivisto ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3ZTUyZDE5MGYyMGQuLjVmY2Q1ZDVlNDhhYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDIxLTA0LTMwICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAg ICBTaGFyZSBzdHlsZSByZXNvbHZlcnMgYmV0d2VlbiBhdXRob3Igc2hhZG93IHRyZWVzIHdpdGgg aWRlbnRpY2FsIHN0eWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjUxODcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc3MzE3MTc4PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9zaGFkb3ct ZG9tL3N0eWxlLXJlc29sdmVyLXNoYXJpbmctZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3Qv c2hhZG93LWRvbS9zdHlsZS1yZXNvbHZlci1zaGFyaW5nLmh0bWw6CisKIDIwMjEtMDQtMzAgIEFu dHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFNoYXJlIHN0eWxlIHJl c29sdmVycyBiZXR3ZWVuIGF1dGhvciBzaGFkb3cgdHJlZXMgd2l0aG91dCBzdHlsZSBzaGVldHMK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhZG93LWRvbS9zdHlsZS1yZXNvbHZlci1z aGFyaW5nLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhZG93LWRvbS9zdHlsZS1y ZXNvbHZlci1zaGFyaW5nLWV4cGVjdGVkLnR4dAppbmRleCBjZmZhMGU3ODQ3ZTQuLjY5NGQwNDYz OWQxNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFkb3ctZG9tL3N0eWxlLXJlc29s dmVyLXNoYXJpbmctZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhZG93LWRv bS9zdHlsZS1yZXNvbHZlci1zaGFyaW5nLWV4cGVjdGVkLnR4dApAQCAtNyw5ICs3LDEwIEBAIFZl cmlmeSB0aGF0IHNoYWRvdyByb290cyB3aXRoIGlkZW50aWNhbCBzdHlsZXMgc2hhcmUgc3R5bGUg cmVzb2x2ZXJzIChoYXZlIGVxdWFsCiAoc2hhZG93IHJvb3QgcmVzb2x2ZXIgKGF1dGhvcikgKGlk ZW50aWZpZXI9MikgKGF1dGhvciBydWxlIGNvdW50PTApKQogKHNoYWRvdyByb290IHJlc29sdmVy IChhdXRob3IpIChpZGVudGlmaWVyPTIpIChhdXRob3IgcnVsZSBjb3VudD0wKSkKIChzaGFkb3cg cm9vdCByZXNvbHZlciAoYXV0aG9yKSAoaWRlbnRpZmllcj0zKSAoYXV0aG9yIHJ1bGUgY291bnQ9 MSkpCi0oc2hhZG93IHJvb3QgcmVzb2x2ZXIgKGF1dGhvcikgKGlkZW50aWZpZXI9NCkgKGF1dGhv ciBydWxlIGNvdW50PTEpKQotKHNoYWRvdyByb290IHJlc29sdmVyIChhdXRob3IpIChpZGVudGlm aWVyPTUpIChhdXRob3IgcnVsZSBjb3VudD0xKSkKLShzaGFkb3cgcm9vdCByZXNvbHZlciAoYXV0 aG9yKSAoaWRlbnRpZmllcj02KSAoYXV0aG9yIHJ1bGUgY291bnQ9MSkpCisoc2hhZG93IHJvb3Qg cmVzb2x2ZXIgKGF1dGhvcikgKGlkZW50aWZpZXI9MykgKGF1dGhvciBydWxlIGNvdW50PTEpKQor KHNoYWRvdyByb290IHJlc29sdmVyIChhdXRob3IpIChpZGVudGlmaWVyPTMpIChhdXRob3IgcnVs ZSBjb3VudD0xKSkKKyhzaGFkb3cgcm9vdCByZXNvbHZlciAoYXV0aG9yKSAoaWRlbnRpZmllcj0z KSAoYXV0aG9yIHJ1bGUgY291bnQ9MSkpCisoc2hhZG93IHJvb3QgcmVzb2x2ZXIgKGF1dGhvcikg KGlkZW50aWZpZXI9MykgKGF1dGhvciBydWxlIGNvdW50PTEpKQogCiBBZnRlciBzdHlsZSBtdXRh dGlvbgogKGRvY3VtZW50IHJlc29sdmVyIChpZGVudGlmaWVyPTApIChhdXRob3IgcnVsZSBjb3Vu dD0wKSkKQEAgLTE4LDkgKzE5LDEwIEBAIEFmdGVyIHN0eWxlIG11dGF0aW9uCiAoc2hhZG93IHJv b3QgcmVzb2x2ZXIgKGF1dGhvcikgKGlkZW50aWZpZXI9MikgKGF1dGhvciBydWxlIGNvdW50PTAp KQogKHNoYWRvdyByb290IHJlc29sdmVyIChhdXRob3IpIChpZGVudGlmaWVyPTIpIChhdXRob3Ig cnVsZSBjb3VudD0wKSkKIChzaGFkb3cgcm9vdCByZXNvbHZlciAoYXV0aG9yKSAoaWRlbnRpZmll cj0zKSAoYXV0aG9yIHJ1bGUgY291bnQ9MSkpCi0oc2hhZG93IHJvb3QgcmVzb2x2ZXIgKGF1dGhv cikgKGlkZW50aWZpZXI9NCkgKGF1dGhvciBydWxlIGNvdW50PTEpKQorKHNoYWRvdyByb290IHJl c29sdmVyIChhdXRob3IpIChpZGVudGlmaWVyPTMpIChhdXRob3IgcnVsZSBjb3VudD0xKSkKKyhz aGFkb3cgcm9vdCByZXNvbHZlciAoYXV0aG9yKSAoaWRlbnRpZmllcj00KSAoYXV0aG9yIHJ1bGUg Y291bnQ9MikpCiAoc2hhZG93IHJvb3QgcmVzb2x2ZXIgKGF1dGhvcikgKGlkZW50aWZpZXI9NSkg KGF1dGhvciBydWxlIGNvdW50PTIpKQotKHNoYWRvdyByb290IHJlc29sdmVyIChhdXRob3IpIChp ZGVudGlmaWVyPTYpIChhdXRob3IgcnVsZSBjb3VudD0yKSkKIChzaGFkb3cgcm9vdCByZXNvbHZl ciAoYXV0aG9yKSAoaWRlbnRpZmllcj0yKSAoYXV0aG9yIHJ1bGUgY291bnQ9MCkpCiAoc2hhZG93 IHJvb3QgcmVzb2x2ZXIgKGF1dGhvcikgKGlkZW50aWZpZXI9MikgKGF1dGhvciBydWxlIGNvdW50 PTApKQorKHNoYWRvdyByb290IHJlc29sdmVyIChhdXRob3IpIChpZGVudGlmaWVyPTMpIChhdXRo b3IgcnVsZSBjb3VudD0xKSkKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFkb3ct ZG9tL3N0eWxlLXJlc29sdmVyLXNoYXJpbmcuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhZG93 LWRvbS9zdHlsZS1yZXNvbHZlci1zaGFyaW5nLmh0bWwKaW5kZXggNGEwYjVmZGQ0NzNlLi44YzE5 NmE1OThhNzkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhZG93LWRvbS9zdHlsZS1y ZXNvbHZlci1zaGFyaW5nLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFkb3ctZG9tL3N0 eWxlLXJlc29sdmVyLXNoYXJpbmcuaHRtbApAQCAtOSw2ICs5LDggQEAgVmVyaWZ5IHRoYXQgc2hh ZG93IHJvb3RzIHdpdGggaWRlbnRpY2FsIHN0eWxlcyBzaGFyZSBzdHlsZSByZXNvbHZlcnMgKGhh dmUgZXF1YWwKIDxkaXYgaWQ9Zj48L2Rpdj4KIDxkaXYgaWQ9Zz48L2Rpdj4KIDxkaXYgaWQ9aD48 L2Rpdj4KKzxkaXYgaWQ9aT48L2Rpdj4KKwogPHByZSBpZD1sb2c+PC9wcmU+CiAKIDxzY3JpcHQ+ CkBAIC0zMyw2ICszNSw3IEBAIGF0dGFjaFNoYWRvd1dpdGhTdHlsZSgiZSIsICJkaXYgeyBjb2xv cjogZ3JlZW4gfSIpOwogYXR0YWNoU2hhZG93V2l0aFN0eWxlKCJmIiwgImRpdiB7IGNvbG9yOiBn cmVlbiB9Iik7CiBhdHRhY2hTaGFkb3dXaXRoU3R5bGUoImciLCAiZGl2IHsgY29sb3I6IGdyZWVu IH0iKTsKIGF0dGFjaFNoYWRvd1dpdGhTdHlsZSgiaCIsICJkaXYgeyBjb2xvcjogZ3JlZW4gfSIp OworYXR0YWNoU2hhZG93V2l0aFN0eWxlKCJpIiwgImRpdiB7IGNvbG9yOiBncmVlbiB9Iik7CiAK IGlmICh3aW5kb3cuaW50ZXJuYWxzKSB7CiAgICAgbG9nLnRleHRDb250ZW50ICs9IGludGVybmFs cy5kdW1wU3R5bGVSZXNvbHZlcnMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAyNmJkYTBjOTg2NWUuLmE2NmFi NDUyODM3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTA0LTMwICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBTaGFyZSBzdHlsZSByZXNvbHZl cnMgYmV0d2VlbiBhdXRob3Igc2hhZG93IHRyZWVzIHdpdGggaWRlbnRpY2FsIHN0eWxlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUxODcKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzc3MzE3MTc4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN0eWxlIHJlc29sdmVycyBvd24gc3R5bGUgcmVzb2x1dGlv biBhbmQgaW52YWxpZGF0aW9uIHJ1bGUgc2V0cywgbWF0Y2hlZCBkZWNsYXJhdGlvbnMgY2FjaGUs IGFuZCBvdGhlciB0aGluZ3MuCisgICAgICAgIFdpdGggY29tcGxleCBzdHlsZXNoZWV0cyB0aGF0 IGNhbiBiZSBsb3Qgb2YgZGF0YS4gV2UgY3VycmVudGx5IGNyZWF0ZSBhIHN0eWxlIHJlc29sdmVy IGZvciBlYWNoIGF1dGhvcgorICAgICAgICBzaGFkb3cgdHJlZS4gV2l0aCB3ZWIgY29tcG9uZW50 cyBpdCBpcyBjb21tb24gZm9yIGEgcGFnZSB0byBoYXZlIGxhcmdlIG51bWJlciBvZiBpbnN0YW5j ZXMgb2YgdGhlIHNhbWUKKyAgICAgICAgY29tcG9uZW50LCBhbmQgc28gc2hhZG93IHRyZWVzIHdp dGggaWRlbnRpY2FsIHN0eWxlLgorCisgICAgICAgIFdlIGFscmVhZHkgZGVkdXBsaWNhdGUgc2hh ZG93IHRyZWUgc3R5bGVzaGVldHMgKGluY2x1ZGluZyBpbmxpbmUgc3R5bGVzaGVldHMgYmFzZWQg b24gc3RyaW5nIGVxdWFsaXR5KS4KKyAgICAgICAgV2l0aCB0aGlzIHBhdGNoIHdlJ2xsIHVzZSB0 aGVzZSBzdHlsZXNoZWV0cyBhcyBrZXlzIGZvciBzaGFyaW5nIHRoZSBmdWxsIHN0eWxlIHJlc29s dmVycyBhcyB3ZWxsLgorCisgICAgICAgICogc3R5bGUvU3R5bGVTY29wZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTdHlsZTo6U2NvcGU6OmNyZWF0ZU9yRmluZFNoYXJlZFNoYWRvd1RyZWVSZXNv bHZlcik6CisKKyAgICAgICAgRXhwYW5kIHRoZSBleGlzdGluZyBzdXBwb3J0IGZvciBzaGFyaW5n IGJldHdlZW4gdXNlciBhZ2VudCBzaGFkb3cgdHJlZXMgYW5kIGF1dGhvciBzaGFkb3cgdHJlZXMg d2l0aAorICAgICAgICBlbXB0eSBzdHlsZS4gTG9vayB1cCBzaGFyZWFibGUgcmVzb2x2ZXJzIGZy b20gYSBtYXAuCisKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpTY29wZTo6dW5zaGFyZVNoYWRv d1RyZWVSZXNvbHZlckJlZm9yZU11dGF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpT Y29wZTo6bWFrZVJlc29sdmVyU2hhcmluZ0tleSk6CisKKyAgICAgICAgTWFrZSBhIGtleSBmcm9t IHRoZSBhY3RpdmUgc3R5bGVzaGVldHMgYW5kIGEgYml0IGluZGljYXRpbmcgdGhlIHNoYWRvdyB0 cmVlIHR5cGUuCisKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpTY29wZTo6cmVsZWFzZU1lbW9y eSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6U2NvcGU6OmRpZENoYW5nZVN0eWxlU2hlZXRF bnZpcm9ubWVudCk6CisgICAgICAgICogc3R5bGUvU3R5bGVTY29wZS5oOgorCiAyMDIxLTA0LTMw ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBTaGFyZSBzdHls ZSByZXNvbHZlcnMgYmV0d2VlbiBhdXRob3Igc2hhZG93IHRyZWVzIHdpdGhvdXQgc3R5bGUgc2hl ZXRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGUuY3BwCmluZGV4IDk5ZWQyNzUyMjRiMi4uNGEy ZTk2ZDU3NmQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlLmNwcApAQCAtMTA4LDIyICsx MDgsMjMgQEAgdm9pZCBTY29wZTo6Y3JlYXRlT3JGaW5kU2hhcmVkU2hhZG93VHJlZVJlc29sdmVy KCkKICAgICBBU1NFUlQoIW1fcmVzb2x2ZXIpOwogICAgIEFTU0VSVChtX3NoYWRvd1Jvb3QpOwog Ci0gICAgaWYgKG1fYWN0aXZlU3R5bGVTaGVldHMuaXNFbXB0eSgpKSB7Ci0gICAgICAgIGF1dG8m IHNoYXJlZFJlc29sdmVyID0gaXNGb3JVc2VyQWdlbnRTaGFkb3dUcmVlKCkgPyBkb2N1bWVudFNj b3BlKCkubV9zaGFyZWRVc2VyQWdlbnRTaGFkb3dUcmVlUmVzb2x2ZXIgOiBkb2N1bWVudFNjb3Bl KCkubV9zaGFyZWRFbXB0eUF1dGhvclNoYWRvd1RyZWVSZXNvbHZlcjsKLSAgICAgICAgaWYgKCFz aGFyZWRSZXNvbHZlcikgewotICAgICAgICAgICAgc2hhcmVkUmVzb2x2ZXIgPSBSZXNvbHZlcjo6 Y3JlYXRlKG1fZG9jdW1lbnQpOwotICAgICAgICAgICAgc2hhcmVkUmVzb2x2ZXItPnJ1bGVTZXRz KCkuc2V0VXNlc1NoYXJlZFVzZXJTdHlsZSghaXNGb3JVc2VyQWdlbnRTaGFkb3dUcmVlKCkpOwot ICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIHNoYXJlZFJlc29sdmVyLT5zZXRTaGFyZWRCZXR3 ZWVuU2hhZG93VHJlZXMoKTsKLQotICAgICAgICBtX3Jlc29sdmVyID0gc2hhcmVkUmVzb2x2ZXI7 Ci0gICAgICAgIHJldHVybjsKLSAgICB9CisgICAgYXV0byBrZXkgPSBtYWtlUmVzb2x2ZXJTaGFy aW5nS2V5KCk7CiAKLSAgICBtX3Jlc29sdmVyID0gUmVzb2x2ZXI6OmNyZWF0ZShtX2RvY3VtZW50 KTsKKyAgICBhdXRvIHJlc3VsdCA9IGRvY3VtZW50U2NvcGUoKS5tX3NoYXJlZFNoYWRvd1RyZWVS ZXNvbHZlcnMuZW5zdXJlKGtleSwgWyZdIHsKKyAgICAgICAgU2V0Rm9yU2NvcGU8Ym9vbD4gaXNV cGRhdGluZ1N0eWxlUmVzb2x2ZXIgeyBtX2lzVXBkYXRpbmdTdHlsZVJlc29sdmVyLCB0cnVlIH07 CiAKLSAgICBtX3Jlc29sdmVyLT5ydWxlU2V0cygpLnNldFVzZXNTaGFyZWRVc2VyU3R5bGUoIWlz Rm9yVXNlckFnZW50U2hhZG93VHJlZSgpKTsKLSAgICBtX3Jlc29sdmVyLT5hcHBlbmRBdXRob3JT dHlsZVNoZWV0cyhtX2FjdGl2ZVN0eWxlU2hlZXRzKTsKKyAgICAgICAgbV9yZXNvbHZlciA9IFJl c29sdmVyOjpjcmVhdGUobV9kb2N1bWVudCk7CisKKyAgICAgICAgbV9yZXNvbHZlci0+cnVsZVNl dHMoKS5zZXRVc2VzU2hhcmVkVXNlclN0eWxlKCFpc0ZvclVzZXJBZ2VudFNoYWRvd1RyZWUoKSk7 CisgICAgICAgIG1fcmVzb2x2ZXItPmFwcGVuZEF1dGhvclN0eWxlU2hlZXRzKG1fYWN0aXZlU3R5 bGVTaGVldHMpOworCisgICAgICAgIHJldHVybiBtYWtlUmVmKCptX3Jlc29sdmVyKTsKKyAgICB9 KTsKKworICAgIGlmICghcmVzdWx0LmlzTmV3RW50cnkpIHsKKyAgICAgICAgbV9yZXNvbHZlciA9 IHJlc3VsdC5pdGVyYXRvci0+dmFsdWUucHRyKCk7CisgICAgICAgIG1fcmVzb2x2ZXItPnNldFNo YXJlZEJldHdlZW5TaGFkb3dUcmVlcygpOworICAgIH0KIH0KIAogdm9pZCBTY29wZTo6dW5zaGFy ZVNoYWRvd1RyZWVSZXNvbHZlckJlZm9yZU11dGF0aW9uKCkKQEAgLTEzMSwxMCArMTMyLDI0IEBA IHZvaWQgU2NvcGU6OnVuc2hhcmVTaGFkb3dUcmVlUmVzb2x2ZXJCZWZvcmVNdXRhdGlvbigpCiAg ICAgQVNTRVJUKG1fc2hhZG93Um9vdCk7CiAgICAgQVNTRVJUKCFtX3Jlc29sdmVyLT5pc1NoYXJl ZEJldHdlZW5TaGFkb3dUcmVlcygpKTsKIAotICAgIGF1dG8mIHNoYXJlZFJlc29sdmVyID0gaXNG b3JVc2VyQWdlbnRTaGFkb3dUcmVlKCkgPyBkb2N1bWVudFNjb3BlKCkubV9zaGFyZWRVc2VyQWdl bnRTaGFkb3dUcmVlUmVzb2x2ZXIgOiBkb2N1bWVudFNjb3BlKCkubV9zaGFyZWRFbXB0eUF1dGhv clNoYWRvd1RyZWVSZXNvbHZlcjsKLSAgICAKLSAgICBpZiAobV9yZXNvbHZlciA9PSBzaGFyZWRS ZXNvbHZlcikKLSAgICAgICAgc2hhcmVkUmVzb2x2ZXIgPSBudWxscHRyOworICAgIGRvY3VtZW50 U2NvcGUoKS5tX3NoYXJlZFNoYWRvd1RyZWVSZXNvbHZlcnMucmVtb3ZlKG1ha2VSZXNvbHZlclNo YXJpbmdLZXkoKSk7Cit9CisKK2F1dG8gU2NvcGU6Om1ha2VSZXNvbHZlclNoYXJpbmdLZXkoKSAt PiBSZXNvbHZlclNoYXJpbmdLZXkKK3sKKyAgICBhdXRvIGtleSA9IFJlc29sdmVyU2hhcmluZ0tl eSB7IHsgfSwgaXNGb3JVc2VyQWdlbnRTaGFkb3dUcmVlKCkgfTsKKworICAgIGlmIChtX2FjdGl2 ZVN0eWxlU2hlZXRzLmlzRW1wdHkoKSkgeworICAgICAgICAvLyBDb21wbGV0ZWx5IGVtcHR5IHZl Y3RvciBpcyB1c2VkIGFzIHRoZSBoYXNoIHRhYmxlIGVtcHR5IHZhbHVlLgorICAgICAgICBrZXku Zmlyc3QuYXBwZW5kKG51bGxwdHIpOworICAgICAgICByZXR1cm4ga2V5OworICAgIH0KKworICAg IGtleS5maXJzdCA9IG1fYWN0aXZlU3R5bGVTaGVldHMubWFwKFsmXShhdXRvJiBzaGVldCkgewor ICAgICAgICByZXR1cm4gbWFrZVJlZlB0cihzaGVldC0+Y29udGVudHMoKSk7CisgICAgfSk7CisK KyAgICByZXR1cm4ga2V5OwogfQogCiB2b2lkIFNjb3BlOjpjbGVhclJlc29sdmVyKCkKQEAgLTE2 MCw4ICsxNzUsNyBAQCB2b2lkIFNjb3BlOjpyZWxlYXNlTWVtb3J5KCkKICNlbmRpZgogICAgIGNs ZWFyUmVzb2x2ZXIoKTsKIAotICAgIG1fc2hhcmVkVXNlckFnZW50U2hhZG93VHJlZVJlc29sdmVy ID0gbnVsbHB0cjsKLSAgICBtX3NoYXJlZEVtcHR5QXV0aG9yU2hhZG93VHJlZVJlc29sdmVyID0g bnVsbHB0cjsKKyAgICBtX3NoYXJlZFNoYWRvd1RyZWVSZXNvbHZlcnMuY2xlYXIoKTsKIH0KIAog U2NvcGUmIFNjb3BlOjpmb3JOb2RlKE5vZGUmIG5vZGUpCkBAIC02ODcsOCArNzAxLDcgQEAgdm9p ZCBTY29wZTo6ZGlkQ2hhbmdlU3R5bGVTaGVldENvbnRlbnRzKCkKIHZvaWQgU2NvcGU6OmRpZENo YW5nZVN0eWxlU2hlZXRFbnZpcm9ubWVudCgpCiB7CiAgICAgaWYgKCFtX3NoYWRvd1Jvb3QpIHsK LSAgICAgICAgbV9zaGFyZWRVc2VyQWdlbnRTaGFkb3dUcmVlUmVzb2x2ZXIgPSBudWxscHRyOwot ICAgICAgICBtX3NoYXJlZEVtcHR5QXV0aG9yU2hhZG93VHJlZVJlc29sdmVyID0gbnVsbHB0cjsK KyAgICAgICAgbV9zaGFyZWRTaGFkb3dUcmVlUmVzb2x2ZXJzLmNsZWFyKCk7CiAKICAgICAgICAg Zm9yIChhdXRvKiBkZXNjZW5kYW50U2hhZG93Um9vdCA6IG1fZG9jdW1lbnQuaW5Eb2N1bWVudFNo YWRvd1Jvb3RzKCkpIHsKICAgICAgICAgICAgIC8vIFN0eWxlc2hlZXRzIGlzIGF1dGhvciBzaGFk b3cgcm9vdHMgYXJlIHBvdGVudGlhbGx5IGFmZmVjdGVkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvc3R5bGUvU3R5bGVTY29wZS5oIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTY29w ZS5oCmluZGV4IDQ0N2JhY2IwYzU5NS4uOTQ2OWIwNmMzNTZjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5 bGVTY29wZS5oCkBAIC0xNjUsNiArMTY1LDkgQEAgcHJpdmF0ZToKICAgICB2b2lkIGNyZWF0ZU9y RmluZFNoYXJlZFNoYWRvd1RyZWVSZXNvbHZlcigpOwogICAgIHZvaWQgdW5zaGFyZVNoYWRvd1Ry ZWVSZXNvbHZlckJlZm9yZU11dGF0aW9uKCk7CiAKKyAgICB1c2luZyBSZXNvbHZlclNoYXJpbmdL ZXkgPSBzdGQ6OnBhaXI8VmVjdG9yPFJlZlB0cjxTdHlsZVNoZWV0Q29udGVudHM+LCAxPiwgYm9v bD47CisgICAgUmVzb2x2ZXJTaGFyaW5nS2V5IG1ha2VSZXNvbHZlclNoYXJpbmdLZXkoKTsKKwog ICAgIERvY3VtZW50JiBtX2RvY3VtZW50OwogICAgIFNoYWRvd1Jvb3QqIG1fc2hhZG93Um9vdCB7 IG51bGxwdHIgfTsKIApAQCAtMTk0LDggKzE5Nyw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2lz VXBkYXRpbmdTdHlsZVJlc29sdmVyIHsgZmFsc2UgfTsKIAogICAgIC8vIEZJWE1FOiBUaGVzZSAo YW5kIHNvbWUgdGhpbmdzIGFib3ZlKSBhcmUgb25seSByZWxldmFudCBmb3IgdGhlIHJvb3Qgc2Nv cGUuCi0gICAgUmVmUHRyPFJlc29sdmVyPiBtX3NoYXJlZFVzZXJBZ2VudFNoYWRvd1RyZWVSZXNv bHZlcjsKLSAgICBSZWZQdHI8UmVzb2x2ZXI+IG1fc2hhcmVkRW1wdHlBdXRob3JTaGFkb3dUcmVl UmVzb2x2ZXI7CisgICAgSGFzaE1hcDxSZXNvbHZlclNoYXJpbmdLZXksIFJlZjxSZXNvbHZlcj4+ IG1fc2hhcmVkU2hhZG93VHJlZVJlc29sdmVyczsKIH07CiAKIGlubGluZSBib29sIFNjb3BlOjpo YXNQZW5kaW5nU2hlZXRzKCkgY29uc3QK 427422 2021-04-30 08:32:27 -0700 2021-04-30 08:35:45 -0700 patch shared-resolver-all-2.patch text/plain 9680 koivisto ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3ZTUyZDE5MGYyMGQuLjVmY2Q1ZDVlNDhhYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDIxLTA0LTMwICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAg ICBTaGFyZSBzdHlsZSByZXNvbHZlcnMgYmV0d2VlbiBhdXRob3Igc2hhZG93IHRyZWVzIHdpdGgg aWRlbnRpY2FsIHN0eWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjUxODcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc3MzE3MTc4PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9zaGFkb3ct ZG9tL3N0eWxlLXJlc29sdmVyLXNoYXJpbmctZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3Qv c2hhZG93LWRvbS9zdHlsZS1yZXNvbHZlci1zaGFyaW5nLmh0bWw6CisKIDIwMjEtMDQtMzAgIEFu dHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFNoYXJlIHN0eWxlIHJl c29sdmVycyBiZXR3ZWVuIGF1dGhvciBzaGFkb3cgdHJlZXMgd2l0aG91dCBzdHlsZSBzaGVldHMK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhZG93LWRvbS9zdHlsZS1yZXNvbHZlci1z aGFyaW5nLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhZG93LWRvbS9zdHlsZS1y ZXNvbHZlci1zaGFyaW5nLWV4cGVjdGVkLnR4dAppbmRleCBjZmZhMGU3ODQ3ZTQuLjY5NGQwNDYz OWQxNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFkb3ctZG9tL3N0eWxlLXJlc29s dmVyLXNoYXJpbmctZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhZG93LWRv bS9zdHlsZS1yZXNvbHZlci1zaGFyaW5nLWV4cGVjdGVkLnR4dApAQCAtNyw5ICs3LDEwIEBAIFZl cmlmeSB0aGF0IHNoYWRvdyByb290cyB3aXRoIGlkZW50aWNhbCBzdHlsZXMgc2hhcmUgc3R5bGUg cmVzb2x2ZXJzIChoYXZlIGVxdWFsCiAoc2hhZG93IHJvb3QgcmVzb2x2ZXIgKGF1dGhvcikgKGlk ZW50aWZpZXI9MikgKGF1dGhvciBydWxlIGNvdW50PTApKQogKHNoYWRvdyByb290IHJlc29sdmVy IChhdXRob3IpIChpZGVudGlmaWVyPTIpIChhdXRob3IgcnVsZSBjb3VudD0wKSkKIChzaGFkb3cg cm9vdCByZXNvbHZlciAoYXV0aG9yKSAoaWRlbnRpZmllcj0zKSAoYXV0aG9yIHJ1bGUgY291bnQ9 MSkpCi0oc2hhZG93IHJvb3QgcmVzb2x2ZXIgKGF1dGhvcikgKGlkZW50aWZpZXI9NCkgKGF1dGhv ciBydWxlIGNvdW50PTEpKQotKHNoYWRvdyByb290IHJlc29sdmVyIChhdXRob3IpIChpZGVudGlm aWVyPTUpIChhdXRob3IgcnVsZSBjb3VudD0xKSkKLShzaGFkb3cgcm9vdCByZXNvbHZlciAoYXV0 aG9yKSAoaWRlbnRpZmllcj02KSAoYXV0aG9yIHJ1bGUgY291bnQ9MSkpCisoc2hhZG93IHJvb3Qg cmVzb2x2ZXIgKGF1dGhvcikgKGlkZW50aWZpZXI9MykgKGF1dGhvciBydWxlIGNvdW50PTEpKQor KHNoYWRvdyByb290IHJlc29sdmVyIChhdXRob3IpIChpZGVudGlmaWVyPTMpIChhdXRob3IgcnVs ZSBjb3VudD0xKSkKKyhzaGFkb3cgcm9vdCByZXNvbHZlciAoYXV0aG9yKSAoaWRlbnRpZmllcj0z KSAoYXV0aG9yIHJ1bGUgY291bnQ9MSkpCisoc2hhZG93IHJvb3QgcmVzb2x2ZXIgKGF1dGhvcikg KGlkZW50aWZpZXI9MykgKGF1dGhvciBydWxlIGNvdW50PTEpKQogCiBBZnRlciBzdHlsZSBtdXRh dGlvbgogKGRvY3VtZW50IHJlc29sdmVyIChpZGVudGlmaWVyPTApIChhdXRob3IgcnVsZSBjb3Vu dD0wKSkKQEAgLTE4LDkgKzE5LDEwIEBAIEFmdGVyIHN0eWxlIG11dGF0aW9uCiAoc2hhZG93IHJv b3QgcmVzb2x2ZXIgKGF1dGhvcikgKGlkZW50aWZpZXI9MikgKGF1dGhvciBydWxlIGNvdW50PTAp KQogKHNoYWRvdyByb290IHJlc29sdmVyIChhdXRob3IpIChpZGVudGlmaWVyPTIpIChhdXRob3Ig cnVsZSBjb3VudD0wKSkKIChzaGFkb3cgcm9vdCByZXNvbHZlciAoYXV0aG9yKSAoaWRlbnRpZmll cj0zKSAoYXV0aG9yIHJ1bGUgY291bnQ9MSkpCi0oc2hhZG93IHJvb3QgcmVzb2x2ZXIgKGF1dGhv cikgKGlkZW50aWZpZXI9NCkgKGF1dGhvciBydWxlIGNvdW50PTEpKQorKHNoYWRvdyByb290IHJl c29sdmVyIChhdXRob3IpIChpZGVudGlmaWVyPTMpIChhdXRob3IgcnVsZSBjb3VudD0xKSkKKyhz aGFkb3cgcm9vdCByZXNvbHZlciAoYXV0aG9yKSAoaWRlbnRpZmllcj00KSAoYXV0aG9yIHJ1bGUg Y291bnQ9MikpCiAoc2hhZG93IHJvb3QgcmVzb2x2ZXIgKGF1dGhvcikgKGlkZW50aWZpZXI9NSkg KGF1dGhvciBydWxlIGNvdW50PTIpKQotKHNoYWRvdyByb290IHJlc29sdmVyIChhdXRob3IpIChp ZGVudGlmaWVyPTYpIChhdXRob3IgcnVsZSBjb3VudD0yKSkKIChzaGFkb3cgcm9vdCByZXNvbHZl ciAoYXV0aG9yKSAoaWRlbnRpZmllcj0yKSAoYXV0aG9yIHJ1bGUgY291bnQ9MCkpCiAoc2hhZG93 IHJvb3QgcmVzb2x2ZXIgKGF1dGhvcikgKGlkZW50aWZpZXI9MikgKGF1dGhvciBydWxlIGNvdW50 PTApKQorKHNoYWRvdyByb290IHJlc29sdmVyIChhdXRob3IpIChpZGVudGlmaWVyPTMpIChhdXRo b3IgcnVsZSBjb3VudD0xKSkKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFkb3ct ZG9tL3N0eWxlLXJlc29sdmVyLXNoYXJpbmcuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhZG93 LWRvbS9zdHlsZS1yZXNvbHZlci1zaGFyaW5nLmh0bWwKaW5kZXggNGEwYjVmZGQ0NzNlLi44YzE5 NmE1OThhNzkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhZG93LWRvbS9zdHlsZS1y ZXNvbHZlci1zaGFyaW5nLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFkb3ctZG9tL3N0 eWxlLXJlc29sdmVyLXNoYXJpbmcuaHRtbApAQCAtOSw2ICs5LDggQEAgVmVyaWZ5IHRoYXQgc2hh ZG93IHJvb3RzIHdpdGggaWRlbnRpY2FsIHN0eWxlcyBzaGFyZSBzdHlsZSByZXNvbHZlcnMgKGhh dmUgZXF1YWwKIDxkaXYgaWQ9Zj48L2Rpdj4KIDxkaXYgaWQ9Zz48L2Rpdj4KIDxkaXYgaWQ9aD48 L2Rpdj4KKzxkaXYgaWQ9aT48L2Rpdj4KKwogPHByZSBpZD1sb2c+PC9wcmU+CiAKIDxzY3JpcHQ+ CkBAIC0zMyw2ICszNSw3IEBAIGF0dGFjaFNoYWRvd1dpdGhTdHlsZSgiZSIsICJkaXYgeyBjb2xv cjogZ3JlZW4gfSIpOwogYXR0YWNoU2hhZG93V2l0aFN0eWxlKCJmIiwgImRpdiB7IGNvbG9yOiBn cmVlbiB9Iik7CiBhdHRhY2hTaGFkb3dXaXRoU3R5bGUoImciLCAiZGl2IHsgY29sb3I6IGdyZWVu IH0iKTsKIGF0dGFjaFNoYWRvd1dpdGhTdHlsZSgiaCIsICJkaXYgeyBjb2xvcjogZ3JlZW4gfSIp OworYXR0YWNoU2hhZG93V2l0aFN0eWxlKCJpIiwgImRpdiB7IGNvbG9yOiBncmVlbiB9Iik7CiAK IGlmICh3aW5kb3cuaW50ZXJuYWxzKSB7CiAgICAgbG9nLnRleHRDb250ZW50ICs9IGludGVybmFs cy5kdW1wU3R5bGVSZXNvbHZlcnMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAyNmJkYTBjOTg2NWUuLmE2NmFi NDUyODM3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTA0LTMwICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBTaGFyZSBzdHlsZSByZXNvbHZl cnMgYmV0d2VlbiBhdXRob3Igc2hhZG93IHRyZWVzIHdpdGggaWRlbnRpY2FsIHN0eWxlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUxODcKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzc3MzE3MTc4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN0eWxlIHJlc29sdmVycyBvd24gc3R5bGUgcmVzb2x1dGlv biBhbmQgaW52YWxpZGF0aW9uIHJ1bGUgc2V0cywgbWF0Y2hlZCBkZWNsYXJhdGlvbnMgY2FjaGUs IGFuZCBvdGhlciB0aGluZ3MuCisgICAgICAgIFdpdGggY29tcGxleCBzdHlsZXNoZWV0cyB0aGF0 IGNhbiBiZSBsb3Qgb2YgZGF0YS4gV2UgY3VycmVudGx5IGNyZWF0ZSBhIHN0eWxlIHJlc29sdmVy IGZvciBlYWNoIGF1dGhvcgorICAgICAgICBzaGFkb3cgdHJlZS4gV2l0aCB3ZWIgY29tcG9uZW50 cyBpdCBpcyBjb21tb24gZm9yIGEgcGFnZSB0byBoYXZlIGxhcmdlIG51bWJlciBvZiBpbnN0YW5j ZXMgb2YgdGhlIHNhbWUKKyAgICAgICAgY29tcG9uZW50LCBhbmQgc28gc2hhZG93IHRyZWVzIHdp dGggaWRlbnRpY2FsIHN0eWxlLgorCisgICAgICAgIFdlIGFscmVhZHkgZGVkdXBsaWNhdGUgc2hh ZG93IHRyZWUgc3R5bGVzaGVldHMgKGluY2x1ZGluZyBpbmxpbmUgc3R5bGVzaGVldHMgYmFzZWQg b24gc3RyaW5nIGVxdWFsaXR5KS4KKyAgICAgICAgV2l0aCB0aGlzIHBhdGNoIHdlJ2xsIHVzZSB0 aGVzZSBzdHlsZXNoZWV0cyBhcyBrZXlzIGZvciBzaGFyaW5nIHRoZSBmdWxsIHN0eWxlIHJlc29s dmVycyBhcyB3ZWxsLgorCisgICAgICAgICogc3R5bGUvU3R5bGVTY29wZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTdHlsZTo6U2NvcGU6OmNyZWF0ZU9yRmluZFNoYXJlZFNoYWRvd1RyZWVSZXNv bHZlcik6CisKKyAgICAgICAgRXhwYW5kIHRoZSBleGlzdGluZyBzdXBwb3J0IGZvciBzaGFyaW5n IGJldHdlZW4gdXNlciBhZ2VudCBzaGFkb3cgdHJlZXMgYW5kIGF1dGhvciBzaGFkb3cgdHJlZXMg d2l0aAorICAgICAgICBlbXB0eSBzdHlsZS4gTG9vayB1cCBzaGFyZWFibGUgcmVzb2x2ZXJzIGZy b20gYSBtYXAuCisKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpTY29wZTo6dW5zaGFyZVNoYWRv d1RyZWVSZXNvbHZlckJlZm9yZU11dGF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpT Y29wZTo6bWFrZVJlc29sdmVyU2hhcmluZ0tleSk6CisKKyAgICAgICAgTWFrZSBhIGtleSBmcm9t IHRoZSBhY3RpdmUgc3R5bGVzaGVldHMgYW5kIGEgYml0IGluZGljYXRpbmcgdGhlIHNoYWRvdyB0 cmVlIHR5cGUuCisKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpTY29wZTo6cmVsZWFzZU1lbW9y eSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6U2NvcGU6OmRpZENoYW5nZVN0eWxlU2hlZXRF bnZpcm9ubWVudCk6CisgICAgICAgICogc3R5bGUvU3R5bGVTY29wZS5oOgorCiAyMDIxLTA0LTMw ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBTaGFyZSBzdHls ZSByZXNvbHZlcnMgYmV0d2VlbiBhdXRob3Igc2hhZG93IHRyZWVzIHdpdGhvdXQgc3R5bGUgc2hl ZXRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGUuY3BwCmluZGV4IDk5ZWQyNzUyMjRiMi4uOGQ5 ZmZhYTA1YTFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlLmNwcApAQCAtMTA4LDIyICsx MDgsMjMgQEAgdm9pZCBTY29wZTo6Y3JlYXRlT3JGaW5kU2hhcmVkU2hhZG93VHJlZVJlc29sdmVy KCkKICAgICBBU1NFUlQoIW1fcmVzb2x2ZXIpOwogICAgIEFTU0VSVChtX3NoYWRvd1Jvb3QpOwog Ci0gICAgaWYgKG1fYWN0aXZlU3R5bGVTaGVldHMuaXNFbXB0eSgpKSB7Ci0gICAgICAgIGF1dG8m IHNoYXJlZFJlc29sdmVyID0gaXNGb3JVc2VyQWdlbnRTaGFkb3dUcmVlKCkgPyBkb2N1bWVudFNj b3BlKCkubV9zaGFyZWRVc2VyQWdlbnRTaGFkb3dUcmVlUmVzb2x2ZXIgOiBkb2N1bWVudFNjb3Bl KCkubV9zaGFyZWRFbXB0eUF1dGhvclNoYWRvd1RyZWVSZXNvbHZlcjsKLSAgICAgICAgaWYgKCFz aGFyZWRSZXNvbHZlcikgewotICAgICAgICAgICAgc2hhcmVkUmVzb2x2ZXIgPSBSZXNvbHZlcjo6 Y3JlYXRlKG1fZG9jdW1lbnQpOwotICAgICAgICAgICAgc2hhcmVkUmVzb2x2ZXItPnJ1bGVTZXRz KCkuc2V0VXNlc1NoYXJlZFVzZXJTdHlsZSghaXNGb3JVc2VyQWdlbnRTaGFkb3dUcmVlKCkpOwot ICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIHNoYXJlZFJlc29sdmVyLT5zZXRTaGFyZWRCZXR3 ZWVuU2hhZG93VHJlZXMoKTsKLQotICAgICAgICBtX3Jlc29sdmVyID0gc2hhcmVkUmVzb2x2ZXI7 Ci0gICAgICAgIHJldHVybjsKLSAgICB9CisgICAgYXV0byBrZXkgPSBtYWtlUmVzb2x2ZXJTaGFy aW5nS2V5KCk7CiAKLSAgICBtX3Jlc29sdmVyID0gUmVzb2x2ZXI6OmNyZWF0ZShtX2RvY3VtZW50 KTsKKyAgICBhdXRvIHJlc3VsdCA9IGRvY3VtZW50U2NvcGUoKS5tX3NoYXJlZFNoYWRvd1RyZWVS ZXNvbHZlcnMuZW5zdXJlKGtleSwgWyZdIHsKKyAgICAgICAgU2V0Rm9yU2NvcGU8Ym9vbD4gaXNV cGRhdGluZ1N0eWxlUmVzb2x2ZXIgeyBtX2lzVXBkYXRpbmdTdHlsZVJlc29sdmVyLCB0cnVlIH07 CiAKLSAgICBtX3Jlc29sdmVyLT5ydWxlU2V0cygpLnNldFVzZXNTaGFyZWRVc2VyU3R5bGUoIWlz Rm9yVXNlckFnZW50U2hhZG93VHJlZSgpKTsKLSAgICBtX3Jlc29sdmVyLT5hcHBlbmRBdXRob3JT dHlsZVNoZWV0cyhtX2FjdGl2ZVN0eWxlU2hlZXRzKTsKKyAgICAgICAgbV9yZXNvbHZlciA9IFJl c29sdmVyOjpjcmVhdGUobV9kb2N1bWVudCk7CisKKyAgICAgICAgbV9yZXNvbHZlci0+cnVsZVNl dHMoKS5zZXRVc2VzU2hhcmVkVXNlclN0eWxlKCFpc0ZvclVzZXJBZ2VudFNoYWRvd1RyZWUoKSk7 CisgICAgICAgIG1fcmVzb2x2ZXItPmFwcGVuZEF1dGhvclN0eWxlU2hlZXRzKG1fYWN0aXZlU3R5 bGVTaGVldHMpOworCisgICAgICAgIHJldHVybiBtYWtlUmVmKCptX3Jlc29sdmVyKTsKKyAgICB9 KTsKKworICAgIGlmICghcmVzdWx0LmlzTmV3RW50cnkpIHsKKyAgICAgICAgbV9yZXNvbHZlciA9 IHJlc3VsdC5pdGVyYXRvci0+dmFsdWUucHRyKCk7CisgICAgICAgIG1fcmVzb2x2ZXItPnNldFNo YXJlZEJldHdlZW5TaGFkb3dUcmVlcygpOworICAgIH0KIH0KIAogdm9pZCBTY29wZTo6dW5zaGFy ZVNoYWRvd1RyZWVSZXNvbHZlckJlZm9yZU11dGF0aW9uKCkKQEAgLTEzMSwxMCArMTMyLDE3IEBA IHZvaWQgU2NvcGU6OnVuc2hhcmVTaGFkb3dUcmVlUmVzb2x2ZXJCZWZvcmVNdXRhdGlvbigpCiAg ICAgQVNTRVJUKG1fc2hhZG93Um9vdCk7CiAgICAgQVNTRVJUKCFtX3Jlc29sdmVyLT5pc1NoYXJl ZEJldHdlZW5TaGFkb3dUcmVlcygpKTsKIAotICAgIGF1dG8mIHNoYXJlZFJlc29sdmVyID0gaXNG b3JVc2VyQWdlbnRTaGFkb3dUcmVlKCkgPyBkb2N1bWVudFNjb3BlKCkubV9zaGFyZWRVc2VyQWdl bnRTaGFkb3dUcmVlUmVzb2x2ZXIgOiBkb2N1bWVudFNjb3BlKCkubV9zaGFyZWRFbXB0eUF1dGhv clNoYWRvd1RyZWVSZXNvbHZlcjsKLSAgICAKLSAgICBpZiAobV9yZXNvbHZlciA9PSBzaGFyZWRS ZXNvbHZlcikKLSAgICAgICAgc2hhcmVkUmVzb2x2ZXIgPSBudWxscHRyOworICAgIGRvY3VtZW50 U2NvcGUoKS5tX3NoYXJlZFNoYWRvd1RyZWVSZXNvbHZlcnMucmVtb3ZlKG1ha2VSZXNvbHZlclNo YXJpbmdLZXkoKSk7Cit9CisKK2F1dG8gU2NvcGU6Om1ha2VSZXNvbHZlclNoYXJpbmdLZXkoKSAt PiBSZXNvbHZlclNoYXJpbmdLZXkKK3sKKyAgICBjb25zdGV4cHIgYm9vbCBpc05vbkVtcHR5SGFz aFRhYmxlVmFsdWUgPSB0cnVlOworICAgIHJldHVybiB7CisgICAgICAgIG1fYWN0aXZlU3R5bGVT aGVldHMubWFwKFsmXShhdXRvJiBzaGVldCkgeyByZXR1cm4gbWFrZVJlZlB0cihzaGVldC0+Y29u dGVudHMoKSk7IH0pLAorICAgICAgICBpc0ZvclVzZXJBZ2VudFNoYWRvd1RyZWUoKSwKKyAgICAg ICAgaXNOb25FbXB0eUhhc2hUYWJsZVZhbHVlCisgICAgfTsKIH0KIAogdm9pZCBTY29wZTo6Y2xl YXJSZXNvbHZlcigpCkBAIC0xNjAsOCArMTY4LDcgQEAgdm9pZCBTY29wZTo6cmVsZWFzZU1lbW9y eSgpCiAjZW5kaWYKICAgICBjbGVhclJlc29sdmVyKCk7CiAKLSAgICBtX3NoYXJlZFVzZXJBZ2Vu dFNoYWRvd1RyZWVSZXNvbHZlciA9IG51bGxwdHI7Ci0gICAgbV9zaGFyZWRFbXB0eUF1dGhvclNo YWRvd1RyZWVSZXNvbHZlciA9IG51bGxwdHI7CisgICAgbV9zaGFyZWRTaGFkb3dUcmVlUmVzb2x2 ZXJzLmNsZWFyKCk7CiB9CiAKIFNjb3BlJiBTY29wZTo6Zm9yTm9kZShOb2RlJiBub2RlKQpAQCAt Njg3LDggKzY5NCw3IEBAIHZvaWQgU2NvcGU6OmRpZENoYW5nZVN0eWxlU2hlZXRDb250ZW50cygp CiB2b2lkIFNjb3BlOjpkaWRDaGFuZ2VTdHlsZVNoZWV0RW52aXJvbm1lbnQoKQogewogICAgIGlm ICghbV9zaGFkb3dSb290KSB7Ci0gICAgICAgIG1fc2hhcmVkVXNlckFnZW50U2hhZG93VHJlZVJl c29sdmVyID0gbnVsbHB0cjsKLSAgICAgICAgbV9zaGFyZWRFbXB0eUF1dGhvclNoYWRvd1RyZWVS ZXNvbHZlciA9IG51bGxwdHI7CisgICAgICAgIG1fc2hhcmVkU2hhZG93VHJlZVJlc29sdmVycy5j bGVhcigpOwogCiAgICAgICAgIGZvciAoYXV0byogZGVzY2VuZGFudFNoYWRvd1Jvb3QgOiBtX2Rv Y3VtZW50LmluRG9jdW1lbnRTaGFkb3dSb290cygpKSB7CiAgICAgICAgICAgICAvLyBTdHlsZXNo ZWV0cyBpcyBhdXRob3Igc2hhZG93IHJvb3RzIGFyZSBwb3RlbnRpYWxseSBhZmZlY3RlZC4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGUuaCBiL1NvdXJjZS9XZWJD b3JlL3N0eWxlL1N0eWxlU2NvcGUuaAppbmRleCA0NDdiYWNiMGM1OTUuLmYyNjBiZjZhMWM1MSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTY29wZS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGUuaApAQCAtMTY1LDYgKzE2NSw5IEBAIHByaXZhdGU6 CiAgICAgdm9pZCBjcmVhdGVPckZpbmRTaGFyZWRTaGFkb3dUcmVlUmVzb2x2ZXIoKTsKICAgICB2 b2lkIHVuc2hhcmVTaGFkb3dUcmVlUmVzb2x2ZXJCZWZvcmVNdXRhdGlvbigpOwogCisgICAgdXNp bmcgUmVzb2x2ZXJTaGFyaW5nS2V5ID0gc3RkOjp0dXBsZTxWZWN0b3I8UmVmUHRyPFN0eWxlU2hl ZXRDb250ZW50cz4+LCBib29sLCBib29sPjsKKyAgICBSZXNvbHZlclNoYXJpbmdLZXkgbWFrZVJl c29sdmVyU2hhcmluZ0tleSgpOworCiAgICAgRG9jdW1lbnQmIG1fZG9jdW1lbnQ7CiAgICAgU2hh ZG93Um9vdCogbV9zaGFkb3dSb290IHsgbnVsbHB0ciB9OwogCkBAIC0xOTQsOCArMTk3LDcgQEAg cHJpdmF0ZToKICAgICBib29sIG1faXNVcGRhdGluZ1N0eWxlUmVzb2x2ZXIgeyBmYWxzZSB9Owog CiAgICAgLy8gRklYTUU6IFRoZXNlIChhbmQgc29tZSB0aGluZ3MgYWJvdmUpIGFyZSBvbmx5IHJl bGV2YW50IGZvciB0aGUgcm9vdCBzY29wZS4KLSAgICBSZWZQdHI8UmVzb2x2ZXI+IG1fc2hhcmVk VXNlckFnZW50U2hhZG93VHJlZVJlc29sdmVyOwotICAgIFJlZlB0cjxSZXNvbHZlcj4gbV9zaGFy ZWRFbXB0eUF1dGhvclNoYWRvd1RyZWVSZXNvbHZlcjsKKyAgICBIYXNoTWFwPFJlc29sdmVyU2hh cmluZ0tleSwgUmVmPFJlc29sdmVyPj4gbV9zaGFyZWRTaGFkb3dUcmVlUmVzb2x2ZXJzOwogfTsK IAogaW5saW5lIGJvb2wgU2NvcGU6Omhhc1BlbmRpbmdTaGVldHMoKSBjb25zdAo= 427424 2021-04-30 08:50:00 -0700 2021-04-30 08:58:42 -0700 patch shared-resolver-all-2.patch text/plain 9680 koivisto ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3ZTUyZDE5MGYyMGQuLjVmY2Q1ZDVlNDhhYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDIxLTA0LTMwICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAg ICBTaGFyZSBzdHlsZSByZXNvbHZlcnMgYmV0d2VlbiBhdXRob3Igc2hhZG93IHRyZWVzIHdpdGgg aWRlbnRpY2FsIHN0eWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjUxODcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc3MzE3MTc4PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9zaGFkb3ct ZG9tL3N0eWxlLXJlc29sdmVyLXNoYXJpbmctZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3Qv c2hhZG93LWRvbS9zdHlsZS1yZXNvbHZlci1zaGFyaW5nLmh0bWw6CisKIDIwMjEtMDQtMzAgIEFu dHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFNoYXJlIHN0eWxlIHJl c29sdmVycyBiZXR3ZWVuIGF1dGhvciBzaGFkb3cgdHJlZXMgd2l0aG91dCBzdHlsZSBzaGVldHMK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhZG93LWRvbS9zdHlsZS1yZXNvbHZlci1z aGFyaW5nLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhZG93LWRvbS9zdHlsZS1y ZXNvbHZlci1zaGFyaW5nLWV4cGVjdGVkLnR4dAppbmRleCBjZmZhMGU3ODQ3ZTQuLjY5NGQwNDYz OWQxNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFkb3ctZG9tL3N0eWxlLXJlc29s dmVyLXNoYXJpbmctZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhZG93LWRv bS9zdHlsZS1yZXNvbHZlci1zaGFyaW5nLWV4cGVjdGVkLnR4dApAQCAtNyw5ICs3LDEwIEBAIFZl cmlmeSB0aGF0IHNoYWRvdyByb290cyB3aXRoIGlkZW50aWNhbCBzdHlsZXMgc2hhcmUgc3R5bGUg cmVzb2x2ZXJzIChoYXZlIGVxdWFsCiAoc2hhZG93IHJvb3QgcmVzb2x2ZXIgKGF1dGhvcikgKGlk ZW50aWZpZXI9MikgKGF1dGhvciBydWxlIGNvdW50PTApKQogKHNoYWRvdyByb290IHJlc29sdmVy IChhdXRob3IpIChpZGVudGlmaWVyPTIpIChhdXRob3IgcnVsZSBjb3VudD0wKSkKIChzaGFkb3cg cm9vdCByZXNvbHZlciAoYXV0aG9yKSAoaWRlbnRpZmllcj0zKSAoYXV0aG9yIHJ1bGUgY291bnQ9 MSkpCi0oc2hhZG93IHJvb3QgcmVzb2x2ZXIgKGF1dGhvcikgKGlkZW50aWZpZXI9NCkgKGF1dGhv ciBydWxlIGNvdW50PTEpKQotKHNoYWRvdyByb290IHJlc29sdmVyIChhdXRob3IpIChpZGVudGlm aWVyPTUpIChhdXRob3IgcnVsZSBjb3VudD0xKSkKLShzaGFkb3cgcm9vdCByZXNvbHZlciAoYXV0 aG9yKSAoaWRlbnRpZmllcj02KSAoYXV0aG9yIHJ1bGUgY291bnQ9MSkpCisoc2hhZG93IHJvb3Qg cmVzb2x2ZXIgKGF1dGhvcikgKGlkZW50aWZpZXI9MykgKGF1dGhvciBydWxlIGNvdW50PTEpKQor KHNoYWRvdyByb290IHJlc29sdmVyIChhdXRob3IpIChpZGVudGlmaWVyPTMpIChhdXRob3IgcnVs ZSBjb3VudD0xKSkKKyhzaGFkb3cgcm9vdCByZXNvbHZlciAoYXV0aG9yKSAoaWRlbnRpZmllcj0z KSAoYXV0aG9yIHJ1bGUgY291bnQ9MSkpCisoc2hhZG93IHJvb3QgcmVzb2x2ZXIgKGF1dGhvcikg KGlkZW50aWZpZXI9MykgKGF1dGhvciBydWxlIGNvdW50PTEpKQogCiBBZnRlciBzdHlsZSBtdXRh dGlvbgogKGRvY3VtZW50IHJlc29sdmVyIChpZGVudGlmaWVyPTApIChhdXRob3IgcnVsZSBjb3Vu dD0wKSkKQEAgLTE4LDkgKzE5LDEwIEBAIEFmdGVyIHN0eWxlIG11dGF0aW9uCiAoc2hhZG93IHJv b3QgcmVzb2x2ZXIgKGF1dGhvcikgKGlkZW50aWZpZXI9MikgKGF1dGhvciBydWxlIGNvdW50PTAp KQogKHNoYWRvdyByb290IHJlc29sdmVyIChhdXRob3IpIChpZGVudGlmaWVyPTIpIChhdXRob3Ig cnVsZSBjb3VudD0wKSkKIChzaGFkb3cgcm9vdCByZXNvbHZlciAoYXV0aG9yKSAoaWRlbnRpZmll cj0zKSAoYXV0aG9yIHJ1bGUgY291bnQ9MSkpCi0oc2hhZG93IHJvb3QgcmVzb2x2ZXIgKGF1dGhv cikgKGlkZW50aWZpZXI9NCkgKGF1dGhvciBydWxlIGNvdW50PTEpKQorKHNoYWRvdyByb290IHJl c29sdmVyIChhdXRob3IpIChpZGVudGlmaWVyPTMpIChhdXRob3IgcnVsZSBjb3VudD0xKSkKKyhz aGFkb3cgcm9vdCByZXNvbHZlciAoYXV0aG9yKSAoaWRlbnRpZmllcj00KSAoYXV0aG9yIHJ1bGUg Y291bnQ9MikpCiAoc2hhZG93IHJvb3QgcmVzb2x2ZXIgKGF1dGhvcikgKGlkZW50aWZpZXI9NSkg KGF1dGhvciBydWxlIGNvdW50PTIpKQotKHNoYWRvdyByb290IHJlc29sdmVyIChhdXRob3IpIChp ZGVudGlmaWVyPTYpIChhdXRob3IgcnVsZSBjb3VudD0yKSkKIChzaGFkb3cgcm9vdCByZXNvbHZl ciAoYXV0aG9yKSAoaWRlbnRpZmllcj0yKSAoYXV0aG9yIHJ1bGUgY291bnQ9MCkpCiAoc2hhZG93 IHJvb3QgcmVzb2x2ZXIgKGF1dGhvcikgKGlkZW50aWZpZXI9MikgKGF1dGhvciBydWxlIGNvdW50 PTApKQorKHNoYWRvdyByb290IHJlc29sdmVyIChhdXRob3IpIChpZGVudGlmaWVyPTMpIChhdXRo b3IgcnVsZSBjb3VudD0xKSkKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFkb3ct ZG9tL3N0eWxlLXJlc29sdmVyLXNoYXJpbmcuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhZG93 LWRvbS9zdHlsZS1yZXNvbHZlci1zaGFyaW5nLmh0bWwKaW5kZXggNGEwYjVmZGQ0NzNlLi44YzE5 NmE1OThhNzkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhZG93LWRvbS9zdHlsZS1y ZXNvbHZlci1zaGFyaW5nLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFkb3ctZG9tL3N0 eWxlLXJlc29sdmVyLXNoYXJpbmcuaHRtbApAQCAtOSw2ICs5LDggQEAgVmVyaWZ5IHRoYXQgc2hh ZG93IHJvb3RzIHdpdGggaWRlbnRpY2FsIHN0eWxlcyBzaGFyZSBzdHlsZSByZXNvbHZlcnMgKGhh dmUgZXF1YWwKIDxkaXYgaWQ9Zj48L2Rpdj4KIDxkaXYgaWQ9Zz48L2Rpdj4KIDxkaXYgaWQ9aD48 L2Rpdj4KKzxkaXYgaWQ9aT48L2Rpdj4KKwogPHByZSBpZD1sb2c+PC9wcmU+CiAKIDxzY3JpcHQ+ CkBAIC0zMyw2ICszNSw3IEBAIGF0dGFjaFNoYWRvd1dpdGhTdHlsZSgiZSIsICJkaXYgeyBjb2xv cjogZ3JlZW4gfSIpOwogYXR0YWNoU2hhZG93V2l0aFN0eWxlKCJmIiwgImRpdiB7IGNvbG9yOiBn cmVlbiB9Iik7CiBhdHRhY2hTaGFkb3dXaXRoU3R5bGUoImciLCAiZGl2IHsgY29sb3I6IGdyZWVu IH0iKTsKIGF0dGFjaFNoYWRvd1dpdGhTdHlsZSgiaCIsICJkaXYgeyBjb2xvcjogZ3JlZW4gfSIp OworYXR0YWNoU2hhZG93V2l0aFN0eWxlKCJpIiwgImRpdiB7IGNvbG9yOiBncmVlbiB9Iik7CiAK IGlmICh3aW5kb3cuaW50ZXJuYWxzKSB7CiAgICAgbG9nLnRleHRDb250ZW50ICs9IGludGVybmFs cy5kdW1wU3R5bGVSZXNvbHZlcnMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAyNmJkYTBjOTg2NWUuLmE2NmFi NDUyODM3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTA0LTMwICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBTaGFyZSBzdHlsZSByZXNvbHZl cnMgYmV0d2VlbiBhdXRob3Igc2hhZG93IHRyZWVzIHdpdGggaWRlbnRpY2FsIHN0eWxlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUxODcKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzc3MzE3MTc4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN0eWxlIHJlc29sdmVycyBvd24gc3R5bGUgcmVzb2x1dGlv biBhbmQgaW52YWxpZGF0aW9uIHJ1bGUgc2V0cywgbWF0Y2hlZCBkZWNsYXJhdGlvbnMgY2FjaGUs IGFuZCBvdGhlciB0aGluZ3MuCisgICAgICAgIFdpdGggY29tcGxleCBzdHlsZXNoZWV0cyB0aGF0 IGNhbiBiZSBsb3Qgb2YgZGF0YS4gV2UgY3VycmVudGx5IGNyZWF0ZSBhIHN0eWxlIHJlc29sdmVy IGZvciBlYWNoIGF1dGhvcgorICAgICAgICBzaGFkb3cgdHJlZS4gV2l0aCB3ZWIgY29tcG9uZW50 cyBpdCBpcyBjb21tb24gZm9yIGEgcGFnZSB0byBoYXZlIGxhcmdlIG51bWJlciBvZiBpbnN0YW5j ZXMgb2YgdGhlIHNhbWUKKyAgICAgICAgY29tcG9uZW50LCBhbmQgc28gc2hhZG93IHRyZWVzIHdp dGggaWRlbnRpY2FsIHN0eWxlLgorCisgICAgICAgIFdlIGFscmVhZHkgZGVkdXBsaWNhdGUgc2hh ZG93IHRyZWUgc3R5bGVzaGVldHMgKGluY2x1ZGluZyBpbmxpbmUgc3R5bGVzaGVldHMgYmFzZWQg b24gc3RyaW5nIGVxdWFsaXR5KS4KKyAgICAgICAgV2l0aCB0aGlzIHBhdGNoIHdlJ2xsIHVzZSB0 aGVzZSBzdHlsZXNoZWV0cyBhcyBrZXlzIGZvciBzaGFyaW5nIHRoZSBmdWxsIHN0eWxlIHJlc29s dmVycyBhcyB3ZWxsLgorCisgICAgICAgICogc3R5bGUvU3R5bGVTY29wZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTdHlsZTo6U2NvcGU6OmNyZWF0ZU9yRmluZFNoYXJlZFNoYWRvd1RyZWVSZXNv bHZlcik6CisKKyAgICAgICAgRXhwYW5kIHRoZSBleGlzdGluZyBzdXBwb3J0IGZvciBzaGFyaW5n IGJldHdlZW4gdXNlciBhZ2VudCBzaGFkb3cgdHJlZXMgYW5kIGF1dGhvciBzaGFkb3cgdHJlZXMg d2l0aAorICAgICAgICBlbXB0eSBzdHlsZS4gTG9vayB1cCBzaGFyZWFibGUgcmVzb2x2ZXJzIGZy b20gYSBtYXAuCisKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpTY29wZTo6dW5zaGFyZVNoYWRv d1RyZWVSZXNvbHZlckJlZm9yZU11dGF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpT Y29wZTo6bWFrZVJlc29sdmVyU2hhcmluZ0tleSk6CisKKyAgICAgICAgTWFrZSBhIGtleSBmcm9t IHRoZSBhY3RpdmUgc3R5bGVzaGVldHMgYW5kIGEgYml0IGluZGljYXRpbmcgdGhlIHNoYWRvdyB0 cmVlIHR5cGUuCisKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpTY29wZTo6cmVsZWFzZU1lbW9y eSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6U2NvcGU6OmRpZENoYW5nZVN0eWxlU2hlZXRF bnZpcm9ubWVudCk6CisgICAgICAgICogc3R5bGUvU3R5bGVTY29wZS5oOgorCiAyMDIxLTA0LTMw ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBTaGFyZSBzdHls ZSByZXNvbHZlcnMgYmV0d2VlbiBhdXRob3Igc2hhZG93IHRyZWVzIHdpdGhvdXQgc3R5bGUgc2hl ZXRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGUuY3BwCmluZGV4IDk5ZWQyNzUyMjRiMi4uOGQ5 ZmZhYTA1YTFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlLmNwcApAQCAtMTA4LDIyICsx MDgsMjMgQEAgdm9pZCBTY29wZTo6Y3JlYXRlT3JGaW5kU2hhcmVkU2hhZG93VHJlZVJlc29sdmVy KCkKICAgICBBU1NFUlQoIW1fcmVzb2x2ZXIpOwogICAgIEFTU0VSVChtX3NoYWRvd1Jvb3QpOwog Ci0gICAgaWYgKG1fYWN0aXZlU3R5bGVTaGVldHMuaXNFbXB0eSgpKSB7Ci0gICAgICAgIGF1dG8m IHNoYXJlZFJlc29sdmVyID0gaXNGb3JVc2VyQWdlbnRTaGFkb3dUcmVlKCkgPyBkb2N1bWVudFNj b3BlKCkubV9zaGFyZWRVc2VyQWdlbnRTaGFkb3dUcmVlUmVzb2x2ZXIgOiBkb2N1bWVudFNjb3Bl KCkubV9zaGFyZWRFbXB0eUF1dGhvclNoYWRvd1RyZWVSZXNvbHZlcjsKLSAgICAgICAgaWYgKCFz aGFyZWRSZXNvbHZlcikgewotICAgICAgICAgICAgc2hhcmVkUmVzb2x2ZXIgPSBSZXNvbHZlcjo6 Y3JlYXRlKG1fZG9jdW1lbnQpOwotICAgICAgICAgICAgc2hhcmVkUmVzb2x2ZXItPnJ1bGVTZXRz KCkuc2V0VXNlc1NoYXJlZFVzZXJTdHlsZSghaXNGb3JVc2VyQWdlbnRTaGFkb3dUcmVlKCkpOwot ICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIHNoYXJlZFJlc29sdmVyLT5zZXRTaGFyZWRCZXR3 ZWVuU2hhZG93VHJlZXMoKTsKLQotICAgICAgICBtX3Jlc29sdmVyID0gc2hhcmVkUmVzb2x2ZXI7 Ci0gICAgICAgIHJldHVybjsKLSAgICB9CisgICAgYXV0byBrZXkgPSBtYWtlUmVzb2x2ZXJTaGFy aW5nS2V5KCk7CiAKLSAgICBtX3Jlc29sdmVyID0gUmVzb2x2ZXI6OmNyZWF0ZShtX2RvY3VtZW50 KTsKKyAgICBhdXRvIHJlc3VsdCA9IGRvY3VtZW50U2NvcGUoKS5tX3NoYXJlZFNoYWRvd1RyZWVS ZXNvbHZlcnMuZW5zdXJlKGtleSwgWyZdIHsKKyAgICAgICAgU2V0Rm9yU2NvcGU8Ym9vbD4gaXNV cGRhdGluZ1N0eWxlUmVzb2x2ZXIgeyBtX2lzVXBkYXRpbmdTdHlsZVJlc29sdmVyLCB0cnVlIH07 CiAKLSAgICBtX3Jlc29sdmVyLT5ydWxlU2V0cygpLnNldFVzZXNTaGFyZWRVc2VyU3R5bGUoIWlz Rm9yVXNlckFnZW50U2hhZG93VHJlZSgpKTsKLSAgICBtX3Jlc29sdmVyLT5hcHBlbmRBdXRob3JT dHlsZVNoZWV0cyhtX2FjdGl2ZVN0eWxlU2hlZXRzKTsKKyAgICAgICAgbV9yZXNvbHZlciA9IFJl c29sdmVyOjpjcmVhdGUobV9kb2N1bWVudCk7CisKKyAgICAgICAgbV9yZXNvbHZlci0+cnVsZVNl dHMoKS5zZXRVc2VzU2hhcmVkVXNlclN0eWxlKCFpc0ZvclVzZXJBZ2VudFNoYWRvd1RyZWUoKSk7 CisgICAgICAgIG1fcmVzb2x2ZXItPmFwcGVuZEF1dGhvclN0eWxlU2hlZXRzKG1fYWN0aXZlU3R5 bGVTaGVldHMpOworCisgICAgICAgIHJldHVybiBtYWtlUmVmKCptX3Jlc29sdmVyKTsKKyAgICB9 KTsKKworICAgIGlmICghcmVzdWx0LmlzTmV3RW50cnkpIHsKKyAgICAgICAgbV9yZXNvbHZlciA9 IHJlc3VsdC5pdGVyYXRvci0+dmFsdWUucHRyKCk7CisgICAgICAgIG1fcmVzb2x2ZXItPnNldFNo YXJlZEJldHdlZW5TaGFkb3dUcmVlcygpOworICAgIH0KIH0KIAogdm9pZCBTY29wZTo6dW5zaGFy ZVNoYWRvd1RyZWVSZXNvbHZlckJlZm9yZU11dGF0aW9uKCkKQEAgLTEzMSwxMCArMTMyLDE3IEBA IHZvaWQgU2NvcGU6OnVuc2hhcmVTaGFkb3dUcmVlUmVzb2x2ZXJCZWZvcmVNdXRhdGlvbigpCiAg ICAgQVNTRVJUKG1fc2hhZG93Um9vdCk7CiAgICAgQVNTRVJUKCFtX3Jlc29sdmVyLT5pc1NoYXJl ZEJldHdlZW5TaGFkb3dUcmVlcygpKTsKIAotICAgIGF1dG8mIHNoYXJlZFJlc29sdmVyID0gaXNG b3JVc2VyQWdlbnRTaGFkb3dUcmVlKCkgPyBkb2N1bWVudFNjb3BlKCkubV9zaGFyZWRVc2VyQWdl bnRTaGFkb3dUcmVlUmVzb2x2ZXIgOiBkb2N1bWVudFNjb3BlKCkubV9zaGFyZWRFbXB0eUF1dGhv clNoYWRvd1RyZWVSZXNvbHZlcjsKLSAgICAKLSAgICBpZiAobV9yZXNvbHZlciA9PSBzaGFyZWRS ZXNvbHZlcikKLSAgICAgICAgc2hhcmVkUmVzb2x2ZXIgPSBudWxscHRyOworICAgIGRvY3VtZW50 U2NvcGUoKS5tX3NoYXJlZFNoYWRvd1RyZWVSZXNvbHZlcnMucmVtb3ZlKG1ha2VSZXNvbHZlclNo YXJpbmdLZXkoKSk7Cit9CisKK2F1dG8gU2NvcGU6Om1ha2VSZXNvbHZlclNoYXJpbmdLZXkoKSAt PiBSZXNvbHZlclNoYXJpbmdLZXkKK3sKKyAgICBjb25zdGV4cHIgYm9vbCBpc05vbkVtcHR5SGFz aFRhYmxlVmFsdWUgPSB0cnVlOworICAgIHJldHVybiB7CisgICAgICAgIG1fYWN0aXZlU3R5bGVT aGVldHMubWFwKFsmXShhdXRvJiBzaGVldCkgeyByZXR1cm4gbWFrZVJlZlB0cihzaGVldC0+Y29u dGVudHMoKSk7IH0pLAorICAgICAgICBpc0ZvclVzZXJBZ2VudFNoYWRvd1RyZWUoKSwKKyAgICAg ICAgaXNOb25FbXB0eUhhc2hUYWJsZVZhbHVlCisgICAgfTsKIH0KIAogdm9pZCBTY29wZTo6Y2xl YXJSZXNvbHZlcigpCkBAIC0xNjAsOCArMTY4LDcgQEAgdm9pZCBTY29wZTo6cmVsZWFzZU1lbW9y eSgpCiAjZW5kaWYKICAgICBjbGVhclJlc29sdmVyKCk7CiAKLSAgICBtX3NoYXJlZFVzZXJBZ2Vu dFNoYWRvd1RyZWVSZXNvbHZlciA9IG51bGxwdHI7Ci0gICAgbV9zaGFyZWRFbXB0eUF1dGhvclNo YWRvd1RyZWVSZXNvbHZlciA9IG51bGxwdHI7CisgICAgbV9zaGFyZWRTaGFkb3dUcmVlUmVzb2x2 ZXJzLmNsZWFyKCk7CiB9CiAKIFNjb3BlJiBTY29wZTo6Zm9yTm9kZShOb2RlJiBub2RlKQpAQCAt Njg3LDggKzY5NCw3IEBAIHZvaWQgU2NvcGU6OmRpZENoYW5nZVN0eWxlU2hlZXRDb250ZW50cygp CiB2b2lkIFNjb3BlOjpkaWRDaGFuZ2VTdHlsZVNoZWV0RW52aXJvbm1lbnQoKQogewogICAgIGlm ICghbV9zaGFkb3dSb290KSB7Ci0gICAgICAgIG1fc2hhcmVkVXNlckFnZW50U2hhZG93VHJlZVJl c29sdmVyID0gbnVsbHB0cjsKLSAgICAgICAgbV9zaGFyZWRFbXB0eUF1dGhvclNoYWRvd1RyZWVS ZXNvbHZlciA9IG51bGxwdHI7CisgICAgICAgIG1fc2hhcmVkU2hhZG93VHJlZVJlc29sdmVycy5j bGVhcigpOwogCiAgICAgICAgIGZvciAoYXV0byogZGVzY2VuZGFudFNoYWRvd1Jvb3QgOiBtX2Rv Y3VtZW50LmluRG9jdW1lbnRTaGFkb3dSb290cygpKSB7CiAgICAgICAgICAgICAvLyBTdHlsZXNo ZWV0cyBpcyBhdXRob3Igc2hhZG93IHJvb3RzIGFyZSBwb3RlbnRpYWxseSBhZmZlY3RlZC4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGUuaCBiL1NvdXJjZS9XZWJD b3JlL3N0eWxlL1N0eWxlU2NvcGUuaAppbmRleCA0NDdiYWNiMGM1OTUuLmYyNjBiZjZhMWM1MSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTY29wZS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGUuaApAQCAtMTY1LDYgKzE2NSw5IEBAIHByaXZhdGU6 CiAgICAgdm9pZCBjcmVhdGVPckZpbmRTaGFyZWRTaGFkb3dUcmVlUmVzb2x2ZXIoKTsKICAgICB2 b2lkIHVuc2hhcmVTaGFkb3dUcmVlUmVzb2x2ZXJCZWZvcmVNdXRhdGlvbigpOwogCisgICAgdXNp bmcgUmVzb2x2ZXJTaGFyaW5nS2V5ID0gc3RkOjp0dXBsZTxWZWN0b3I8UmVmUHRyPFN0eWxlU2hl ZXRDb250ZW50cz4+LCBib29sLCBib29sPjsKKyAgICBSZXNvbHZlclNoYXJpbmdLZXkgbWFrZVJl c29sdmVyU2hhcmluZ0tleSgpOworCiAgICAgRG9jdW1lbnQmIG1fZG9jdW1lbnQ7CiAgICAgU2hh ZG93Um9vdCogbV9zaGFkb3dSb290IHsgbnVsbHB0ciB9OwogCkBAIC0xOTQsOCArMTk3LDcgQEAg cHJpdmF0ZToKICAgICBib29sIG1faXNVcGRhdGluZ1N0eWxlUmVzb2x2ZXIgeyBmYWxzZSB9Owog CiAgICAgLy8gRklYTUU6IFRoZXNlIChhbmQgc29tZSB0aGluZ3MgYWJvdmUpIGFyZSBvbmx5IHJl bGV2YW50IGZvciB0aGUgcm9vdCBzY29wZS4KLSAgICBSZWZQdHI8UmVzb2x2ZXI+IG1fc2hhcmVk VXNlckFnZW50U2hhZG93VHJlZVJlc29sdmVyOwotICAgIFJlZlB0cjxSZXNvbHZlcj4gbV9zaGFy ZWRFbXB0eUF1dGhvclNoYWRvd1RyZWVSZXNvbHZlcjsKKyAgICBIYXNoTWFwPFJlc29sdmVyU2hh cmluZ0tleSwgUmVmPFJlc29sdmVyPj4gbV9zaGFyZWRTaGFkb3dUcmVlUmVzb2x2ZXJzOwogfTsK IAogaW5saW5lIGJvb2wgU2NvcGU6Omhhc1BlbmRpbmdTaGVldHMoKSBjb25zdAo= 427425 2021-04-30 08:58:42 -0700 2021-05-01 22:22:58 -0700 patch shared-resolver-all-3.patch text/plain 9689 koivisto ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3ZTUyZDE5MGYyMGQuLjVmY2Q1ZDVlNDhhYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDIxLTA0LTMwICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAg ICBTaGFyZSBzdHlsZSByZXNvbHZlcnMgYmV0d2VlbiBhdXRob3Igc2hhZG93IHRyZWVzIHdpdGgg aWRlbnRpY2FsIHN0eWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjUxODcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc3MzE3MTc4PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9zaGFkb3ct ZG9tL3N0eWxlLXJlc29sdmVyLXNoYXJpbmctZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3Qv c2hhZG93LWRvbS9zdHlsZS1yZXNvbHZlci1zaGFyaW5nLmh0bWw6CisKIDIwMjEtMDQtMzAgIEFu dHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFNoYXJlIHN0eWxlIHJl c29sdmVycyBiZXR3ZWVuIGF1dGhvciBzaGFkb3cgdHJlZXMgd2l0aG91dCBzdHlsZSBzaGVldHMK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhZG93LWRvbS9zdHlsZS1yZXNvbHZlci1z aGFyaW5nLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhZG93LWRvbS9zdHlsZS1y ZXNvbHZlci1zaGFyaW5nLWV4cGVjdGVkLnR4dAppbmRleCBjZmZhMGU3ODQ3ZTQuLjY5NGQwNDYz OWQxNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFkb3ctZG9tL3N0eWxlLXJlc29s dmVyLXNoYXJpbmctZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhZG93LWRv bS9zdHlsZS1yZXNvbHZlci1zaGFyaW5nLWV4cGVjdGVkLnR4dApAQCAtNyw5ICs3LDEwIEBAIFZl cmlmeSB0aGF0IHNoYWRvdyByb290cyB3aXRoIGlkZW50aWNhbCBzdHlsZXMgc2hhcmUgc3R5bGUg cmVzb2x2ZXJzIChoYXZlIGVxdWFsCiAoc2hhZG93IHJvb3QgcmVzb2x2ZXIgKGF1dGhvcikgKGlk ZW50aWZpZXI9MikgKGF1dGhvciBydWxlIGNvdW50PTApKQogKHNoYWRvdyByb290IHJlc29sdmVy IChhdXRob3IpIChpZGVudGlmaWVyPTIpIChhdXRob3IgcnVsZSBjb3VudD0wKSkKIChzaGFkb3cg cm9vdCByZXNvbHZlciAoYXV0aG9yKSAoaWRlbnRpZmllcj0zKSAoYXV0aG9yIHJ1bGUgY291bnQ9 MSkpCi0oc2hhZG93IHJvb3QgcmVzb2x2ZXIgKGF1dGhvcikgKGlkZW50aWZpZXI9NCkgKGF1dGhv ciBydWxlIGNvdW50PTEpKQotKHNoYWRvdyByb290IHJlc29sdmVyIChhdXRob3IpIChpZGVudGlm aWVyPTUpIChhdXRob3IgcnVsZSBjb3VudD0xKSkKLShzaGFkb3cgcm9vdCByZXNvbHZlciAoYXV0 aG9yKSAoaWRlbnRpZmllcj02KSAoYXV0aG9yIHJ1bGUgY291bnQ9MSkpCisoc2hhZG93IHJvb3Qg cmVzb2x2ZXIgKGF1dGhvcikgKGlkZW50aWZpZXI9MykgKGF1dGhvciBydWxlIGNvdW50PTEpKQor KHNoYWRvdyByb290IHJlc29sdmVyIChhdXRob3IpIChpZGVudGlmaWVyPTMpIChhdXRob3IgcnVs ZSBjb3VudD0xKSkKKyhzaGFkb3cgcm9vdCByZXNvbHZlciAoYXV0aG9yKSAoaWRlbnRpZmllcj0z KSAoYXV0aG9yIHJ1bGUgY291bnQ9MSkpCisoc2hhZG93IHJvb3QgcmVzb2x2ZXIgKGF1dGhvcikg KGlkZW50aWZpZXI9MykgKGF1dGhvciBydWxlIGNvdW50PTEpKQogCiBBZnRlciBzdHlsZSBtdXRh dGlvbgogKGRvY3VtZW50IHJlc29sdmVyIChpZGVudGlmaWVyPTApIChhdXRob3IgcnVsZSBjb3Vu dD0wKSkKQEAgLTE4LDkgKzE5LDEwIEBAIEFmdGVyIHN0eWxlIG11dGF0aW9uCiAoc2hhZG93IHJv b3QgcmVzb2x2ZXIgKGF1dGhvcikgKGlkZW50aWZpZXI9MikgKGF1dGhvciBydWxlIGNvdW50PTAp KQogKHNoYWRvdyByb290IHJlc29sdmVyIChhdXRob3IpIChpZGVudGlmaWVyPTIpIChhdXRob3Ig cnVsZSBjb3VudD0wKSkKIChzaGFkb3cgcm9vdCByZXNvbHZlciAoYXV0aG9yKSAoaWRlbnRpZmll cj0zKSAoYXV0aG9yIHJ1bGUgY291bnQ9MSkpCi0oc2hhZG93IHJvb3QgcmVzb2x2ZXIgKGF1dGhv cikgKGlkZW50aWZpZXI9NCkgKGF1dGhvciBydWxlIGNvdW50PTEpKQorKHNoYWRvdyByb290IHJl c29sdmVyIChhdXRob3IpIChpZGVudGlmaWVyPTMpIChhdXRob3IgcnVsZSBjb3VudD0xKSkKKyhz aGFkb3cgcm9vdCByZXNvbHZlciAoYXV0aG9yKSAoaWRlbnRpZmllcj00KSAoYXV0aG9yIHJ1bGUg Y291bnQ9MikpCiAoc2hhZG93IHJvb3QgcmVzb2x2ZXIgKGF1dGhvcikgKGlkZW50aWZpZXI9NSkg KGF1dGhvciBydWxlIGNvdW50PTIpKQotKHNoYWRvdyByb290IHJlc29sdmVyIChhdXRob3IpIChp ZGVudGlmaWVyPTYpIChhdXRob3IgcnVsZSBjb3VudD0yKSkKIChzaGFkb3cgcm9vdCByZXNvbHZl ciAoYXV0aG9yKSAoaWRlbnRpZmllcj0yKSAoYXV0aG9yIHJ1bGUgY291bnQ9MCkpCiAoc2hhZG93 IHJvb3QgcmVzb2x2ZXIgKGF1dGhvcikgKGlkZW50aWZpZXI9MikgKGF1dGhvciBydWxlIGNvdW50 PTApKQorKHNoYWRvdyByb290IHJlc29sdmVyIChhdXRob3IpIChpZGVudGlmaWVyPTMpIChhdXRo b3IgcnVsZSBjb3VudD0xKSkKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFkb3ct ZG9tL3N0eWxlLXJlc29sdmVyLXNoYXJpbmcuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhZG93 LWRvbS9zdHlsZS1yZXNvbHZlci1zaGFyaW5nLmh0bWwKaW5kZXggNGEwYjVmZGQ0NzNlLi44YzE5 NmE1OThhNzkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhZG93LWRvbS9zdHlsZS1y ZXNvbHZlci1zaGFyaW5nLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFkb3ctZG9tL3N0 eWxlLXJlc29sdmVyLXNoYXJpbmcuaHRtbApAQCAtOSw2ICs5LDggQEAgVmVyaWZ5IHRoYXQgc2hh ZG93IHJvb3RzIHdpdGggaWRlbnRpY2FsIHN0eWxlcyBzaGFyZSBzdHlsZSByZXNvbHZlcnMgKGhh dmUgZXF1YWwKIDxkaXYgaWQ9Zj48L2Rpdj4KIDxkaXYgaWQ9Zz48L2Rpdj4KIDxkaXYgaWQ9aD48 L2Rpdj4KKzxkaXYgaWQ9aT48L2Rpdj4KKwogPHByZSBpZD1sb2c+PC9wcmU+CiAKIDxzY3JpcHQ+ CkBAIC0zMyw2ICszNSw3IEBAIGF0dGFjaFNoYWRvd1dpdGhTdHlsZSgiZSIsICJkaXYgeyBjb2xv cjogZ3JlZW4gfSIpOwogYXR0YWNoU2hhZG93V2l0aFN0eWxlKCJmIiwgImRpdiB7IGNvbG9yOiBn cmVlbiB9Iik7CiBhdHRhY2hTaGFkb3dXaXRoU3R5bGUoImciLCAiZGl2IHsgY29sb3I6IGdyZWVu IH0iKTsKIGF0dGFjaFNoYWRvd1dpdGhTdHlsZSgiaCIsICJkaXYgeyBjb2xvcjogZ3JlZW4gfSIp OworYXR0YWNoU2hhZG93V2l0aFN0eWxlKCJpIiwgImRpdiB7IGNvbG9yOiBncmVlbiB9Iik7CiAK IGlmICh3aW5kb3cuaW50ZXJuYWxzKSB7CiAgICAgbG9nLnRleHRDb250ZW50ICs9IGludGVybmFs cy5kdW1wU3R5bGVSZXNvbHZlcnMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAyNmJkYTBjOTg2NWUuLmE2NmFi NDUyODM3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTA0LTMwICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBTaGFyZSBzdHlsZSByZXNvbHZl cnMgYmV0d2VlbiBhdXRob3Igc2hhZG93IHRyZWVzIHdpdGggaWRlbnRpY2FsIHN0eWxlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUxODcKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzc3MzE3MTc4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN0eWxlIHJlc29sdmVycyBvd24gc3R5bGUgcmVzb2x1dGlv biBhbmQgaW52YWxpZGF0aW9uIHJ1bGUgc2V0cywgbWF0Y2hlZCBkZWNsYXJhdGlvbnMgY2FjaGUs IGFuZCBvdGhlciB0aGluZ3MuCisgICAgICAgIFdpdGggY29tcGxleCBzdHlsZXNoZWV0cyB0aGF0 IGNhbiBiZSBsb3Qgb2YgZGF0YS4gV2UgY3VycmVudGx5IGNyZWF0ZSBhIHN0eWxlIHJlc29sdmVy IGZvciBlYWNoIGF1dGhvcgorICAgICAgICBzaGFkb3cgdHJlZS4gV2l0aCB3ZWIgY29tcG9uZW50 cyBpdCBpcyBjb21tb24gZm9yIGEgcGFnZSB0byBoYXZlIGxhcmdlIG51bWJlciBvZiBpbnN0YW5j ZXMgb2YgdGhlIHNhbWUKKyAgICAgICAgY29tcG9uZW50LCBhbmQgc28gc2hhZG93IHRyZWVzIHdp dGggaWRlbnRpY2FsIHN0eWxlLgorCisgICAgICAgIFdlIGFscmVhZHkgZGVkdXBsaWNhdGUgc2hh ZG93IHRyZWUgc3R5bGVzaGVldHMgKGluY2x1ZGluZyBpbmxpbmUgc3R5bGVzaGVldHMgYmFzZWQg b24gc3RyaW5nIGVxdWFsaXR5KS4KKyAgICAgICAgV2l0aCB0aGlzIHBhdGNoIHdlJ2xsIHVzZSB0 aGVzZSBzdHlsZXNoZWV0cyBhcyBrZXlzIGZvciBzaGFyaW5nIHRoZSBmdWxsIHN0eWxlIHJlc29s dmVycyBhcyB3ZWxsLgorCisgICAgICAgICogc3R5bGUvU3R5bGVTY29wZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTdHlsZTo6U2NvcGU6OmNyZWF0ZU9yRmluZFNoYXJlZFNoYWRvd1RyZWVSZXNv bHZlcik6CisKKyAgICAgICAgRXhwYW5kIHRoZSBleGlzdGluZyBzdXBwb3J0IGZvciBzaGFyaW5n IGJldHdlZW4gdXNlciBhZ2VudCBzaGFkb3cgdHJlZXMgYW5kIGF1dGhvciBzaGFkb3cgdHJlZXMg d2l0aAorICAgICAgICBlbXB0eSBzdHlsZS4gTG9vayB1cCBzaGFyZWFibGUgcmVzb2x2ZXJzIGZy b20gYSBtYXAuCisKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpTY29wZTo6dW5zaGFyZVNoYWRv d1RyZWVSZXNvbHZlckJlZm9yZU11dGF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpT Y29wZTo6bWFrZVJlc29sdmVyU2hhcmluZ0tleSk6CisKKyAgICAgICAgTWFrZSBhIGtleSBmcm9t IHRoZSBhY3RpdmUgc3R5bGVzaGVldHMgYW5kIGEgYml0IGluZGljYXRpbmcgdGhlIHNoYWRvdyB0 cmVlIHR5cGUuCisKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpTY29wZTo6cmVsZWFzZU1lbW9y eSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6U2NvcGU6OmRpZENoYW5nZVN0eWxlU2hlZXRF bnZpcm9ubWVudCk6CisgICAgICAgICogc3R5bGUvU3R5bGVTY29wZS5oOgorCiAyMDIxLTA0LTMw ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBTaGFyZSBzdHls ZSByZXNvbHZlcnMgYmV0d2VlbiBhdXRob3Igc2hhZG93IHRyZWVzIHdpdGhvdXQgc3R5bGUgc2hl ZXRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGUuY3BwCmluZGV4IDk5ZWQyNzUyMjRiMi4uYmFm Y2ViODBmOWNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlLmNwcApAQCAtMTA4LDIyICsx MDgsMjMgQEAgdm9pZCBTY29wZTo6Y3JlYXRlT3JGaW5kU2hhcmVkU2hhZG93VHJlZVJlc29sdmVy KCkKICAgICBBU1NFUlQoIW1fcmVzb2x2ZXIpOwogICAgIEFTU0VSVChtX3NoYWRvd1Jvb3QpOwog Ci0gICAgaWYgKG1fYWN0aXZlU3R5bGVTaGVldHMuaXNFbXB0eSgpKSB7Ci0gICAgICAgIGF1dG8m IHNoYXJlZFJlc29sdmVyID0gaXNGb3JVc2VyQWdlbnRTaGFkb3dUcmVlKCkgPyBkb2N1bWVudFNj b3BlKCkubV9zaGFyZWRVc2VyQWdlbnRTaGFkb3dUcmVlUmVzb2x2ZXIgOiBkb2N1bWVudFNjb3Bl KCkubV9zaGFyZWRFbXB0eUF1dGhvclNoYWRvd1RyZWVSZXNvbHZlcjsKLSAgICAgICAgaWYgKCFz aGFyZWRSZXNvbHZlcikgewotICAgICAgICAgICAgc2hhcmVkUmVzb2x2ZXIgPSBSZXNvbHZlcjo6 Y3JlYXRlKG1fZG9jdW1lbnQpOwotICAgICAgICAgICAgc2hhcmVkUmVzb2x2ZXItPnJ1bGVTZXRz KCkuc2V0VXNlc1NoYXJlZFVzZXJTdHlsZSghaXNGb3JVc2VyQWdlbnRTaGFkb3dUcmVlKCkpOwot ICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIHNoYXJlZFJlc29sdmVyLT5zZXRTaGFyZWRCZXR3 ZWVuU2hhZG93VHJlZXMoKTsKLQotICAgICAgICBtX3Jlc29sdmVyID0gc2hhcmVkUmVzb2x2ZXI7 Ci0gICAgICAgIHJldHVybjsKLSAgICB9CisgICAgYXV0byBrZXkgPSBtYWtlUmVzb2x2ZXJTaGFy aW5nS2V5KCk7CiAKLSAgICBtX3Jlc29sdmVyID0gUmVzb2x2ZXI6OmNyZWF0ZShtX2RvY3VtZW50 KTsKKyAgICBhdXRvIHJlc3VsdCA9IGRvY3VtZW50U2NvcGUoKS5tX3NoYXJlZFNoYWRvd1RyZWVS ZXNvbHZlcnMuZW5zdXJlKFdURk1vdmUoa2V5KSwgWyZdIHsKKyAgICAgICAgU2V0Rm9yU2NvcGU8 Ym9vbD4gaXNVcGRhdGluZ1N0eWxlUmVzb2x2ZXIgeyBtX2lzVXBkYXRpbmdTdHlsZVJlc29sdmVy LCB0cnVlIH07CiAKLSAgICBtX3Jlc29sdmVyLT5ydWxlU2V0cygpLnNldFVzZXNTaGFyZWRVc2Vy U3R5bGUoIWlzRm9yVXNlckFnZW50U2hhZG93VHJlZSgpKTsKLSAgICBtX3Jlc29sdmVyLT5hcHBl bmRBdXRob3JTdHlsZVNoZWV0cyhtX2FjdGl2ZVN0eWxlU2hlZXRzKTsKKyAgICAgICAgbV9yZXNv bHZlciA9IFJlc29sdmVyOjpjcmVhdGUobV9kb2N1bWVudCk7CisKKyAgICAgICAgbV9yZXNvbHZl ci0+cnVsZVNldHMoKS5zZXRVc2VzU2hhcmVkVXNlclN0eWxlKCFpc0ZvclVzZXJBZ2VudFNoYWRv d1RyZWUoKSk7CisgICAgICAgIG1fcmVzb2x2ZXItPmFwcGVuZEF1dGhvclN0eWxlU2hlZXRzKG1f YWN0aXZlU3R5bGVTaGVldHMpOworCisgICAgICAgIHJldHVybiBtYWtlUmVmKCptX3Jlc29sdmVy KTsKKyAgICB9KTsKKworICAgIGlmICghcmVzdWx0LmlzTmV3RW50cnkpIHsKKyAgICAgICAgbV9y ZXNvbHZlciA9IHJlc3VsdC5pdGVyYXRvci0+dmFsdWUucHRyKCk7CisgICAgICAgIG1fcmVzb2x2 ZXItPnNldFNoYXJlZEJldHdlZW5TaGFkb3dUcmVlcygpOworICAgIH0KIH0KIAogdm9pZCBTY29w ZTo6dW5zaGFyZVNoYWRvd1RyZWVSZXNvbHZlckJlZm9yZU11dGF0aW9uKCkKQEAgLTEzMSwxMCAr MTMyLDE3IEBAIHZvaWQgU2NvcGU6OnVuc2hhcmVTaGFkb3dUcmVlUmVzb2x2ZXJCZWZvcmVNdXRh dGlvbigpCiAgICAgQVNTRVJUKG1fc2hhZG93Um9vdCk7CiAgICAgQVNTRVJUKCFtX3Jlc29sdmVy LT5pc1NoYXJlZEJldHdlZW5TaGFkb3dUcmVlcygpKTsKIAotICAgIGF1dG8mIHNoYXJlZFJlc29s dmVyID0gaXNGb3JVc2VyQWdlbnRTaGFkb3dUcmVlKCkgPyBkb2N1bWVudFNjb3BlKCkubV9zaGFy ZWRVc2VyQWdlbnRTaGFkb3dUcmVlUmVzb2x2ZXIgOiBkb2N1bWVudFNjb3BlKCkubV9zaGFyZWRF bXB0eUF1dGhvclNoYWRvd1RyZWVSZXNvbHZlcjsKLSAgICAKLSAgICBpZiAobV9yZXNvbHZlciA9 PSBzaGFyZWRSZXNvbHZlcikKLSAgICAgICAgc2hhcmVkUmVzb2x2ZXIgPSBudWxscHRyOworICAg IGRvY3VtZW50U2NvcGUoKS5tX3NoYXJlZFNoYWRvd1RyZWVSZXNvbHZlcnMucmVtb3ZlKG1ha2VS ZXNvbHZlclNoYXJpbmdLZXkoKSk7Cit9CisKK2F1dG8gU2NvcGU6Om1ha2VSZXNvbHZlclNoYXJp bmdLZXkoKSAtPiBSZXNvbHZlclNoYXJpbmdLZXkKK3sKKyAgICBjb25zdGV4cHIgYm9vbCBpc05v bkVtcHR5SGFzaFRhYmxlVmFsdWUgPSB0cnVlOworICAgIHJldHVybiB7CisgICAgICAgIG1fYWN0 aXZlU3R5bGVTaGVldHMubWFwKFsmXShhdXRvJiBzaGVldCkgeyByZXR1cm4gbWFrZVJlZlB0cihz aGVldC0+Y29udGVudHMoKSk7IH0pLAorICAgICAgICBpc0ZvclVzZXJBZ2VudFNoYWRvd1RyZWUo KSwKKyAgICAgICAgaXNOb25FbXB0eUhhc2hUYWJsZVZhbHVlCisgICAgfTsKIH0KIAogdm9pZCBT Y29wZTo6Y2xlYXJSZXNvbHZlcigpCkBAIC0xNjAsOCArMTY4LDcgQEAgdm9pZCBTY29wZTo6cmVs ZWFzZU1lbW9yeSgpCiAjZW5kaWYKICAgICBjbGVhclJlc29sdmVyKCk7CiAKLSAgICBtX3NoYXJl ZFVzZXJBZ2VudFNoYWRvd1RyZWVSZXNvbHZlciA9IG51bGxwdHI7Ci0gICAgbV9zaGFyZWRFbXB0 eUF1dGhvclNoYWRvd1RyZWVSZXNvbHZlciA9IG51bGxwdHI7CisgICAgbV9zaGFyZWRTaGFkb3dU cmVlUmVzb2x2ZXJzLmNsZWFyKCk7CiB9CiAKIFNjb3BlJiBTY29wZTo6Zm9yTm9kZShOb2RlJiBu b2RlKQpAQCAtNjg3LDggKzY5NCw3IEBAIHZvaWQgU2NvcGU6OmRpZENoYW5nZVN0eWxlU2hlZXRD b250ZW50cygpCiB2b2lkIFNjb3BlOjpkaWRDaGFuZ2VTdHlsZVNoZWV0RW52aXJvbm1lbnQoKQog ewogICAgIGlmICghbV9zaGFkb3dSb290KSB7Ci0gICAgICAgIG1fc2hhcmVkVXNlckFnZW50U2hh ZG93VHJlZVJlc29sdmVyID0gbnVsbHB0cjsKLSAgICAgICAgbV9zaGFyZWRFbXB0eUF1dGhvclNo YWRvd1RyZWVSZXNvbHZlciA9IG51bGxwdHI7CisgICAgICAgIG1fc2hhcmVkU2hhZG93VHJlZVJl c29sdmVycy5jbGVhcigpOwogCiAgICAgICAgIGZvciAoYXV0byogZGVzY2VuZGFudFNoYWRvd1Jv b3QgOiBtX2RvY3VtZW50LmluRG9jdW1lbnRTaGFkb3dSb290cygpKSB7CiAgICAgICAgICAgICAv LyBTdHlsZXNoZWV0cyBpcyBhdXRob3Igc2hhZG93IHJvb3RzIGFyZSBwb3RlbnRpYWxseSBhZmZl Y3RlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGUuaCBiL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGUuaAppbmRleCA0NDdiYWNiMGM1OTUuLmYyNjBi ZjZhMWM1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTY29wZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGUuaApAQCAtMTY1LDYgKzE2NSw5IEBA IHByaXZhdGU6CiAgICAgdm9pZCBjcmVhdGVPckZpbmRTaGFyZWRTaGFkb3dUcmVlUmVzb2x2ZXIo KTsKICAgICB2b2lkIHVuc2hhcmVTaGFkb3dUcmVlUmVzb2x2ZXJCZWZvcmVNdXRhdGlvbigpOwog CisgICAgdXNpbmcgUmVzb2x2ZXJTaGFyaW5nS2V5ID0gc3RkOjp0dXBsZTxWZWN0b3I8UmVmUHRy PFN0eWxlU2hlZXRDb250ZW50cz4+LCBib29sLCBib29sPjsKKyAgICBSZXNvbHZlclNoYXJpbmdL ZXkgbWFrZVJlc29sdmVyU2hhcmluZ0tleSgpOworCiAgICAgRG9jdW1lbnQmIG1fZG9jdW1lbnQ7 CiAgICAgU2hhZG93Um9vdCogbV9zaGFkb3dSb290IHsgbnVsbHB0ciB9OwogCkBAIC0xOTQsOCAr MTk3LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1faXNVcGRhdGluZ1N0eWxlUmVzb2x2ZXIgeyBm YWxzZSB9OwogCiAgICAgLy8gRklYTUU6IFRoZXNlIChhbmQgc29tZSB0aGluZ3MgYWJvdmUpIGFy ZSBvbmx5IHJlbGV2YW50IGZvciB0aGUgcm9vdCBzY29wZS4KLSAgICBSZWZQdHI8UmVzb2x2ZXI+ IG1fc2hhcmVkVXNlckFnZW50U2hhZG93VHJlZVJlc29sdmVyOwotICAgIFJlZlB0cjxSZXNvbHZl cj4gbV9zaGFyZWRFbXB0eUF1dGhvclNoYWRvd1RyZWVSZXNvbHZlcjsKKyAgICBIYXNoTWFwPFJl c29sdmVyU2hhcmluZ0tleSwgUmVmPFJlc29sdmVyPj4gbV9zaGFyZWRTaGFkb3dUcmVlUmVzb2x2 ZXJzOwogfTsKIAogaW5saW5lIGJvb2wgU2NvcGU6Omhhc1BlbmRpbmdTaGVldHMoKSBjb25zdAo=