192638 2018-12-12 13:44:58 -0800 [macOS] Inline WebVTT styles should override styles from Captions settings in System Preferences 2018-12-13 15:06:57 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan bfulgham commit-queue eric.carlson koivisto oldest_to_newest 1487322 0 pvollan 2018-12-12 13:44:58 -0800 It should be possible to override styles generated from Captions settings in System Preferences with inline WebVTT styles when ‘Allow video to override’ is checked in System Preferences. 1487323 1 pvollan 2018-12-12 13:45:19 -0800 rdar://problem/46421091 1487326 2 357165 pvollan 2018-12-12 14:00:00 -0800 Created attachment 357165 Patch 1487348 3 357172 pvollan 2018-12-12 15:05:27 -0800 Created attachment 357172 Patch 1487396 4 357190 pvollan 2018-12-12 16:24:38 -0800 Created attachment 357190 Patch 1487723 5 357190 pvollan 2018-12-13 14:40:13 -0800 Comment on attachment 357190 Patch Thanks for reviewing! 1487731 6 357190 commit-queue 2018-12-13 15:06:56 -0800 Comment on attachment 357190 Patch Clearing flags on attachment: 357190 Committed r239181: <https://trac.webkit.org/changeset/239181> 1487732 7 commit-queue 2018-12-13 15:06:57 -0800 All reviewed patches have been landed. Closing bug. 357165 2018-12-12 14:00:00 -0800 2018-12-12 15:05:25 -0800 Patch bug-192638-20181212135959.patch text/plain 11557 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzOTEyOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE4LTEyLTEyICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIElubGluZSBX ZWJWVFQgc3R5bGVzIHNob3VsZCBvdmVycmlkZSBzdHlsZXMgZnJvbSBDYXB0aW9ucyBzZXR0aW5n cyBpbiBTeXN0ZW0gUHJlZmVyZW5jZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5MjYzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEl0IGlzIGN1cnJlbnRseSBub3QgcG9zc2libGUgdG8gb3ZlcnJpZGUg Y2FwdGlvbiBzdHlsZXMgZ2VuZXJhdGVkIGZyb20gU3lzdGVtIFByZWZlcmVuY2VzIHdpdGggaW5s aW5lCisgICAgICAgIFdlYlZUVCBzdHlsZXMgd2l0aG91dCBhZGRpbmcgIWltcG9ydGFudC4gVGhl IHJlYXNvbiBmb3IgdGhpcyBpcyB0aGF0IHRoZSBnZW5lcmF0ZWQgc3R5bGVzIGZyb20KKyAgICAg ICAgU3lzdGVtIHByZWZlcmVuY2VzIGFyZSBhdXRob3Igc3R5bGVzIHdoaWNoIGhhdmUgaGlnaGVy IHByaW9yaXR5IHRoYW4gdGhlIGlubGluZSBXZWJWVFQgc3R5bGVzLCB3aGljaAorICAgICAgICBh cmUgdXNlciBzdHlsZXMgaW4gdGhlIHZpZGVvIHVzZXIgYWdlbnQgc2hhZG93IHRyZWUuIFRoaXMg Y2FuIGJlIGZpeGVkIGJ5IG1vdmluZyB0aGUgZ2VuZXJhdGVkIHN0eWxlcworICAgICAgICB0byB0 aGUgdmlkZW8gdXNlciBhZ2VudCBzaGFkb3cgdHJlZS4gSW5saW5lIFdlYlZUVCBzdHlsZXMgd2ls bCB0aGVuIGhhdmUgaGlnaGVyIHByaW9yaXR5IHNpbmNlIHRoZXkKKyAgICAgICAgYXJlIGFkZGVk IGFmdGVyIHRoZSBnZW5lcmF0ZWQgc3R5bGVzLiBUaGlzIHBhdGNoIGFsc28gZml4ZXMgYSBwcm9i bGVtIHdoZXJlIGlubGluZSBzdHlsZXMgY291bGQgYmUKKyAgICAgICAgYWRkZWQgdHdpY2UgdG8g dGhlIHZpZGVvIHVzZXIgYWdlbnQgc2hhZG93IHJvb3QuCisKKyAgICAgICAgVGVzdDogbWVkaWEv dHJhY2svdHJhY2stY3VlLWNzcy5odG1sCisKKyAgICAgICAgKiBkb20vRXh0ZW5zaW9uU3R5bGVT aGVldHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RXh0ZW5zaW9uU3R5bGVTaGVldHM6OnVwZGF0 ZUluamVjdGVkU3R5bGVTaGVldENhY2hlIGNvbnN0KToKKyAgICAgICAgKiBodG1sL3RyYWNrL1ZU VEN1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWVFRDdWU6OmdldERpc3BsYXlUcmVlKToKKyAg ICAgICAgKiBwYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Q2FwdGlvblVzZXJQcmVmZXJlbmNlczo6c2V0Q2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUp OgorCiAyMDE4LTEyLTExICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAg ICAgIE1ha2UgSFRNTENvbnZlcnRlciB0YWtlIHR3byBQb3NpdGlvbnMgaW4gcHJlcGFyYXRpb24g dG8gbWFrZSBpdCB3b3JrIHdpdGggc2hhZG93IERPTQpJbmRleDogU291cmNlL1dlYkNvcmUvZG9t L0V4dGVuc2lvblN0eWxlU2hlZXRzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9k b20vRXh0ZW5zaW9uU3R5bGVTaGVldHMuY3BwCShyZXZpc2lvbiAyMzkwMTQpCisrKyBTb3VyY2Uv V2ViQ29yZS9kb20vRXh0ZW5zaW9uU3R5bGVTaGVldHMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x MzcsMTUgKzEzNyw2IEBAIHZvaWQgRXh0ZW5zaW9uU3R5bGVTaGVldHM6OnVwZGF0ZUluamVjdGUK ICAgICAgICAgZWxzZQogICAgICAgICAgICAgbV9pbmplY3RlZEF1dGhvclN0eWxlU2hlZXRzLmFw cGVuZChXVEZNb3ZlKHNoZWV0KSk7CiAgICAgfSk7Ci0gICAgCi0gICAgaWYgKCFvd25pbmdQYWdl LT5jYXB0aW9uVXNlclByZWZlcmVuY2VzU3R5bGVTaGVldCgpLmlzRW1wdHkoKSkgewotICAgICAg ICAvLyBJZGVudGlmeSBvdXIgb3ZlcnJpZGUgc3R5bGUgc2hlZXQgd2l0aCBhIHVuaXF1ZSBVUkwg LSBhIG5ldyBzY2hlbWUgYW5kIGEgVVVJRC4KLSAgICAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVk PFVSTD4gY2FwdGlvbnNTdHlsZVNoZWV0VVJMKFVSTCgpLCAidXNlci1jYXB0aW9ucy1vdmVycmlk ZTowMUY2QUYxMi1DM0IwLTRGNzAtQUY1RS1BM0UwMDIzNERDMjMiKTsKLQotICAgICAgICBhdXRv IHNoZWV0ID0gY3JlYXRlRXh0ZW5zaW9uc1N0eWxlU2hlZXQoY29uc3RfY2FzdDxEb2N1bWVudCY+ KG1fZG9jdW1lbnQpLCBjYXB0aW9uc1N0eWxlU2hlZXRVUkwsIG93bmluZ1BhZ2UtPmNhcHRpb25V c2VyUHJlZmVyZW5jZXNTdHlsZVNoZWV0KCksIFVzZXJTdHlsZUF1dGhvckxldmVsKTsKLQotICAg ICAgICBtX2luamVjdGVkQXV0aG9yU3R5bGVTaGVldHMuYXBwZW5kKFdURk1vdmUoc2hlZXQpKTsK LSAgICB9CiB9CiAKIHZvaWQgRXh0ZW5zaW9uU3R5bGVTaGVldHM6OmludmFsaWRhdGVJbmplY3Rl ZFN0eWxlU2hlZXRDYWNoZSgpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1ZUVEN1 ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9WVFRDdWUuY3Bw CShyZXZpc2lvbiAyMzkwMTQpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1ZUVEN1ZS5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTg5NCwxMiArODk0LDE5IEBAIFZUVEN1ZUJveCYgVlRUQ3Vl OjpnZXREaXNwbGF5VHJlZShjb25zdCAKICAgICBkaXNwbGF5VHJlZS0+c2V0Rm9udFNpemVGcm9t Q2FwdGlvblVzZXJQcmVmcyhmb250U2l6ZSk7CiAgICAgZGlzcGxheVRyZWUtPmFwcGx5Q1NTUHJv cGVydGllcyh2aWRlb1NpemUpOwogCisgICAgaWYgKGRpc3BsYXlUcmVlLT5kb2N1bWVudCgpLnBh Z2UoKSkgeworICAgICAgICBhdXRvIGNzc1N0cmluZyA9IGRpc3BsYXlUcmVlLT5kb2N1bWVudCgp LnBhZ2UoKS0+Y2FwdGlvblVzZXJQcmVmZXJlbmNlc1N0eWxlU2hlZXQoKTsKKyAgICAgICAgYXV0 byBzdHlsZSA9IEhUTUxTdHlsZUVsZW1lbnQ6OmNyZWF0ZShIVE1MTmFtZXM6OnN0eWxlVGFnLCBk aXNwbGF5VHJlZS0+ZG9jdW1lbnQoKSwgZmFsc2UpOworICAgICAgICBzdHlsZS0+c2V0VGV4dENv bnRlbnQoY3NzU3RyaW5nKTsKKyAgICAgICAgZGlzcGxheVRyZWUtPmFwcGVuZENoaWxkKHN0eWxl KTsKKyAgICB9CisKICAgICBjb25zdCBhdXRvJiBzdHlsZVNoZWV0cyA9IHRyYWNrKCktPnN0eWxl U2hlZXRzKCk7CiAgICAgaWYgKHN0eWxlU2hlZXRzKSB7CiAgICAgICAgIGZvciAoY29uc3QgYXV0 byYgY3NzU3RyaW5nIDogKnN0eWxlU2hlZXRzKSB7Ci0gICAgICAgICAgICBhdXRvIHN0eWxlID0g SFRNTFN0eWxlRWxlbWVudDo6Y3JlYXRlKEhUTUxOYW1lczo6c3R5bGVUYWcsIG1fY3VlQmFja2Ry b3BCb3gtPmRvY3VtZW50KCksIGZhbHNlKTsKKyAgICAgICAgICAgIGF1dG8gc3R5bGUgPSBIVE1M U3R5bGVFbGVtZW50OjpjcmVhdGUoSFRNTE5hbWVzOjpzdHlsZVRhZywgZGlzcGxheVRyZWUtPmRv Y3VtZW50KCksIGZhbHNlKTsKICAgICAgICAgICAgIHN0eWxlLT5zZXRUZXh0Q29udGVudChjc3NT dHJpbmcpOwotICAgICAgICAgICAgbV9jdWVCYWNrZHJvcEJveC0+YXBwZW5kQ2hpbGQoc3R5bGUp OworICAgICAgICAgICAgZGlzcGxheVRyZWUtPmFwcGVuZENoaWxkKHN0eWxlKTsKICAgICAgICAg fQogICAgIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0aW9uVXNlclByZWZlcmVu Y2VzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0NhcHRpb25Vc2VyUHJl ZmVyZW5jZXMuY3BwCShyZXZpc2lvbiAyMzkwMTQpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0Nh cHRpb25Vc2VyUHJlZmVyZW5jZXMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMTQsOCArMzE0LDEz IEBAIGludCBDYXB0aW9uVXNlclByZWZlcmVuY2VzOjp0ZXh0VHJhY2tMYW4KIAogdm9pZCBDYXB0 aW9uVXNlclByZWZlcmVuY2VzOjpzZXRDYXB0aW9uc1N0eWxlU2hlZXRPdmVycmlkZShjb25zdCBT dHJpbmcmIG92ZXJyaWRlKQogeworICAgIGlmIChvdmVycmlkZSA9PSBtX2NhcHRpb25zU3R5bGVT aGVldE92ZXJyaWRlKQorICAgICAgICByZXR1cm47CisKICAgICBtX2NhcHRpb25zU3R5bGVTaGVl dE92ZXJyaWRlID0gb3ZlcnJpZGU7CiAgICAgdXBkYXRlQ2FwdGlvblN0eWxlU2hlZXRPdmVycmlk ZSgpOworICAgIGlmICghbV90aW1lci5pc0FjdGl2ZSgpKQorICAgICAgICBtX3RpbWVyLnN0YXJ0 T25lU2hvdCgwX3MpOwogfQogCiB2b2lkIENhcHRpb25Vc2VyUHJlZmVyZW5jZXM6OnVwZGF0ZUNh cHRpb25TdHlsZVNoZWV0T3ZlcnJpZGUoKQpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMjM5MDE0KQorKysg TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIw MTgtMTItMTIgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgorCisgICAgICAg IFttYWNPU10gSW5saW5lIFdlYlZUVCBzdHlsZXMgc2hvdWxkIG92ZXJyaWRlIHN0eWxlcyBmcm9t IENhcHRpb25zIHNldHRpbmdzIGluIFN5c3RlbSBQcmVmZXJlbmNlcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkyNjM4CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBtZWRpYS90cmFjay9jYXB0aW9ucy13 ZWJ2dHQvY3NzLXN0eWxpbmcudnR0OgorICAgICAgICAqIG1lZGlhL3RyYWNrL2NhcHRpb25zLXdl YnZ0dC9uby1jc3Mtc3R5bGluZy52dHQ6CisgICAgICAgICogbWVkaWEvdHJhY2svdHJhY2stY3Nz LXVzZXItb3ZlcnJpZGUtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIG1lZGlhL3RyYWNrL3RyYWNr LWNzcy11c2VyLW92ZXJyaWRlLmh0bWw6CisgICAgICAgICogbWVkaWEvdHJhY2svdHJhY2stY3Vl LWNzcy1leHBlY3RlZC5odG1sOgorCiAyMDE4LTEyLTA4ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5m cmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEFsbG93IGNvbnRyb2wgb3ZlciBjaGlsZCBvcmRl ciB3aGVuIGFkZGluZyBub2RlcyB0byB0aGUgc2Nyb2xsaW5nIHRyZWUKSW5kZXg6IExheW91dFRl c3RzL21lZGlhL3RyYWNrL3RyYWNrLWNzcy11c2VyLW92ZXJyaWRlLWV4cGVjdGVkLnR4dAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS90cmFjay90cmFjay1jc3MtdXNlci1vdmVycmlk ZS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDIzOTAxNCkKKysrIExheW91dFRlc3RzL21lZGlhL3Ry YWNrL3RyYWNrLWNzcy11c2VyLW92ZXJyaWRlLWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpA QCAtMSw2ICsxLDYgQEAKIAogCi1pbnRlcm5hbHMuY2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUg PSBmdW5jdGlvbiBjYXB0aW9uc1N0eWxlU2hlZXRPdmVycmlkZSgpIHsgW25hdGl2ZSBjb2RlXSB9 CitpbnRlcm5hbHMuY2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUgPSAKIFRlc3QgdGhhdCBzdHls ZSB0byBhbGwgY3VlcyBpcyBhcHBsaWVkIGNvcnJlY3RseS4KIEVWRU5UKGNhbnBsYXl0aHJvdWdo KQogRVZFTlQoc2Vla2VkKQpAQCAtMTYsNyArMTYsNyBAQCBFWFBFQ1RFRCAoZ2V0Q29tcHV0ZWRT dHlsZSh0ZXh0VHJhY2tEaXNwCiAKICoqIEFkZCBhbiBvdmVycmlkZSwgd2l0aG91dCAnIWltcG9y dGFudCcgKioKIFJVTihpbnRlcm5hbHMuc2V0Q2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUoJ3Zp ZGVvOjpjdWUgeyBjb2xvcjogYmx1ZTsgYmFja2dyb3VuZC1jb2xvcjogeWVsbG93OyB9JykpCi1p bnRlcm5hbHMuY2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUgPSBmdW5jdGlvbiBjYXB0aW9uc1N0 eWxlU2hlZXRPdmVycmlkZSgpIHsgW25hdGl2ZSBjb2RlXSB9CitpbnRlcm5hbHMuY2FwdGlvbnNT dHlsZVNoZWV0T3ZlcnJpZGUgPSB2aWRlbzo6Y3VlIHsgY29sb3I6IGJsdWU7IGJhY2tncm91bmQt Y29sb3I6IHllbGxvdzsgfQogRVhQRUNURUQgKGdldENvbXB1dGVkU3R5bGUodGV4dFRyYWNrRGlz cGxheUVsZW1lbnQodmlkZW8sICdjdWUnKSkuY29sb3IgPT0gJ3JnYigxMjgsIDAsIDEyOCknKSBP SwogRVhQRUNURUQgKGdldENvbXB1dGVkU3R5bGUodGV4dFRyYWNrRGlzcGxheUVsZW1lbnQodmlk ZW8sICdjdWUnKSkuYmFja2dyb3VuZENvbG9yID09ICdyZ2IoMCwgMjU1LCAwKScpIE9LCiAKSW5k ZXg6IExheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWNzcy11c2VyLW92ZXJyaWRlLmh0bWwK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svdHJhY2stY3NzLXVzZXItb3Zl cnJpZGUuaHRtbAkocmV2aXNpb24gMjM5MDE0KQorKysgTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2sv dHJhY2stY3NzLXVzZXItb3ZlcnJpZGUuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMzAsMzAgKzMw LDMyIEBACiAgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8YnI+KiogQWRkIGFuIG92ZXJy aWRlLCB3aXRob3V0ICchaW1wb3J0YW50JyAqKiIpOwogICAgICAgICAgICAgICAgIGRvY3VtZW50 LmJvZHkub2Zmc2V0VG9wOwogICAgICAgICAgICAgICAgIHJ1bigiaW50ZXJuYWxzLnNldENhcHRp b25zU3R5bGVTaGVldE92ZXJyaWRlKCd2aWRlbzo6Y3VlIHsgY29sb3I6IGJsdWU7IGJhY2tncm91 bmQtY29sb3I6IHllbGxvdzsgfScpIik7Ci0gICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCJp bnRlcm5hbHMuY2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUgPSAiICsgaW50ZXJuYWxzLmNhcHRp b25zU3R5bGVTaGVldE92ZXJyaWRlKTsKKyAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoImlu dGVybmFscy5jYXB0aW9uc1N0eWxlU2hlZXRPdmVycmlkZSA9ICIgKyBpbnRlcm5hbHMuY2FwdGlv bnNTdHlsZVNoZWV0T3ZlcnJpZGUoKSk7CiAgICAgICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5v ZmZzZXRUb3A7CiAgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJnZXRDb21wdXRlZFN0eWxl KHRleHRUcmFja0Rpc3BsYXlFbGVtZW50KHZpZGVvLCAnY3VlJykpLmNvbG9yIiwgInJnYigxMjgs IDAsIDEyOCkiKTsKICAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoImdldENvbXB1dGVkU3R5 bGUodGV4dFRyYWNrRGlzcGxheUVsZW1lbnQodmlkZW8sICdjdWUnKSkuYmFja2dyb3VuZENvbG9y IiwgInJnYigwLCAyNTUsIDApIik7CiAKICAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIjxi cj4qKiBNYXJrIGJhY2tncm91bmQtY29sb3IgJyFpbXBvcnRhbnQnICoqIik7CiAgICAgICAgICAg ICAgICAgcnVuKCJpbnRlcm5hbHMuc2V0Q2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUoJ3ZpZGVv OjpjdWUgeyBjb2xvcjogYmx1ZSA7IGJhY2tncm91bmQtY29sb3I6IHllbGxvdyAhaW1wb3J0YW50 OyB9JykiKTsKLSAgICAgICAgICAgICAgICBkb2N1bWVudC5ib2R5Lm9mZnNldFRvcDsKLSAgICAg ICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoImdldENvbXB1dGVkU3R5bGUodGV4dFRyYWNrRGlzcGxh eUVsZW1lbnQodmlkZW8sICdjdWUnKSkuY29sb3IiLCAicmdiKDEyOCwgMCwgMTI4KSIpOwotICAg ICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgiZ2V0Q29tcHV0ZWRTdHlsZSh0ZXh0VHJhY2tEaXNw bGF5RWxlbWVudCh2aWRlbywgJ2N1ZScpKS5iYWNrZ3JvdW5kQ29sb3IiLCAicmdiKDI1NSwgMjU1 LCAwKSIpOwotCi0gICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8YnI+KiogTWFyayBjb2xv ciAnIWltcG9ydGFudCcgKioiKTsKLSAgICAgICAgICAgICAgICBydW4oInN0eWxlc2hlZXQuaW5z ZXJ0UnVsZSgndmlkZW86OmN1ZSB7IGNvbG9yOiBibHVlICFpbXBvcnRhbnQ7IGJhY2tncm91bmQt Y29sb3I6IHllbGxvdyAgIWltcG9ydGFudDsgfScsIDApIik7Ci0gICAgICAgICAgICAgICAgZG9j dW1lbnQuYm9keS5vZmZzZXRUb3A7Ci0gICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJnZXRD b21wdXRlZFN0eWxlKHRleHRUcmFja0Rpc3BsYXlFbGVtZW50KHZpZGVvLCAnY3VlJykpLmNvbG9y IiwgInJnYigwLCAwLCAyNTUpIik7Ci0gICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJnZXRD b21wdXRlZFN0eWxlKHRleHRUcmFja0Rpc3BsYXlFbGVtZW50KHZpZGVvLCAnY3VlJykpLmJhY2tn cm91bmRDb2xvciIsICJyZ2IoMjU1LCAyNTUsIDApIik7Ci0KLSAgICAgICAgICAgICAgICBjb25z b2xlV3JpdGUoIiIpOwotICAgICAgICAgICAgICAgIGVuZFRlc3QoKTsKKyAgICAgICAgICAgICAg ICAvLyBUaGUgc3R5bGUgaXMgbm90IGltbWVkaWF0ZWx5IHVwZGF0ZWQsIHNjaGVkdWxlIHRoZSBy ZXN0IG9mIHRoZSB0ZXN0IHdpdGggYSB6ZXJvIHRpbWVvdXQgdGltZXIuCisgICAgICAgICAgICAg ICAgc2V0VGltZW91dChmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICAgICAgdGVzdEV4cGVj dGVkKCJnZXRDb21wdXRlZFN0eWxlKHRleHRUcmFja0Rpc3BsYXlFbGVtZW50KHZpZGVvLCAnY3Vl JykpLmNvbG9yIiwgInJnYigxMjgsIDAsIDEyOCkiKTsKKyAgICAgICAgICAgICAgICAgICAgdGVz dEV4cGVjdGVkKCJnZXRDb21wdXRlZFN0eWxlKHRleHRUcmFja0Rpc3BsYXlFbGVtZW50KHZpZGVv LCAnY3VlJykpLmJhY2tncm91bmRDb2xvciIsICJyZ2IoMjU1LCAyNTUsIDApIik7CisKKyAgICAg ICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8YnI+KiogTWFyayBjb2xvciAnIWltcG9ydGFu dCcgKioiKTsKKyAgICAgICAgICAgICAgICAgICAgcnVuKCJzdHlsZXNoZWV0Lmluc2VydFJ1bGUo J3ZpZGVvOjpjdWUgeyBjb2xvcjogYmx1ZSAhaW1wb3J0YW50OyBiYWNrZ3JvdW5kLWNvbG9yOiB5 ZWxsb3cgICFpbXBvcnRhbnQ7IH0nLCAwKSIpOworICAgICAgICAgICAgICAgICAgICBkb2N1bWVu dC5ib2R5Lm9mZnNldFRvcDsKKyAgICAgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJnZXRD b21wdXRlZFN0eWxlKHRleHRUcmFja0Rpc3BsYXlFbGVtZW50KHZpZGVvLCAnY3VlJykpLmNvbG9y IiwgInJnYigwLCAwLCAyNTUpIik7CisgICAgICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgi Z2V0Q29tcHV0ZWRTdHlsZSh0ZXh0VHJhY2tEaXNwbGF5RWxlbWVudCh2aWRlbywgJ2N1ZScpKS5i YWNrZ3JvdW5kQ29sb3IiLCAicmdiKDI1NSwgMjU1LCAwKSIpOworCisgICAgICAgICAgICAgICAg ICAgIGNvbnNvbGVXcml0ZSgiIik7CisgICAgICAgICAgICAgICAgICAgIGVuZFRlc3QoKTsKKyAg ICAgICAgICAgICAgICB9LCAxMDApOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBmdW5j dGlvbiBsb2FkZWQoKQogICAgICAgICAgICAgewotY29uc29sZVdyaXRlKCI8YnI+aW50ZXJuYWxz LmNhcHRpb25zU3R5bGVTaGVldE92ZXJyaWRlID0gIiArIGludGVybmFscy5jYXB0aW9uc1N0eWxl U2hlZXRPdmVycmlkZSk7CisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8YnI+aW50ZXJu YWxzLmNhcHRpb25zU3R5bGVTaGVldE92ZXJyaWRlID0gIiArIGludGVybmFscy5jYXB0aW9uc1N0 eWxlU2hlZXRPdmVycmlkZSgpKTsKIAogICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiVGVz dCB0aGF0IHN0eWxlIHRvIGFsbCBjdWVzIGlzIGFwcGxpZWQgY29ycmVjdGx5LiIpOwogICAgICAg ICAgICAgICAgIGZpbmRNZWRpYUVsZW1lbnQoKTsKSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3Ry YWNrL3RyYWNrLWN1ZS1jc3MtZXhwZWN0ZWQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9tZWRpYS90cmFjay90cmFjay1jdWUtY3NzLWV4cGVjdGVkLmh0bWwJKHJldmlzaW9uIDIzOTAx NCkKKysrIExheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWN1ZS1jc3MtZXhwZWN0ZWQuaHRt bAkod29ya2luZyBjb3B5KQpAQCAtMTQsNiArMTQsMTAgQEAKICAgICAgICAgICAgIGNvbG9yOiBy ZWQ7CiAgICAgICAgICAgICBmb250LXNpemU6IDE1cHg7CiAgICAgICAgIH0KKyAgICAgICAgdmlk ZW86OmN1ZSB7CisgICAgICAgICAgICBjb2xvcjogZ3JlZW47CisgICAgICAgICAgICBmb250LXNp emU6IDE1cHg7CisgICAgICAgIH0KICAgICAgICAgPC9zdHlsZT4KICAgICAgICAgPHNjcmlwdD4K ICAgICAgICAgZnVuY3Rpb24gc2Vla2VkKCkKSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3RyYWNr L2NhcHRpb25zLXdlYnZ0dC9jc3Mtc3R5bGluZy52dHQKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvbWVkaWEvdHJhY2svY2FwdGlvbnMtd2VidnR0L2Nzcy1zdHlsaW5nLnZ0dAkocmV2aXNpb24g MjM5MDE0KQorKysgTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svY2FwdGlvbnMtd2VidnR0L2Nzcy1z dHlsaW5nLnZ0dAkod29ya2luZyBjb3B5KQpAQCAtMTEsNiArMTEsMTIgQEAgY29sb3I6IHJlZDsK IGZvbnQtc2l6ZTogMTVweDsKIH0KIAorU1RZTEUKK3ZpZGVvOjpjdWUgeworY29sb3I6IGdyZWVu OworZm9udC1zaXplOiAxNXB4OworfQorCiBoZWxsbwogMDA6MDA6MDAuMDAwIC0tPiAwMDowMDox MC4wMDAKLTxiPkhlbGxvPC9iPi4KKzxiPkhlbGxvPC9iPiBmaXJzdCBjdWUuCkluZGV4OiBMYXlv dXRUZXN0cy9tZWRpYS90cmFjay9jYXB0aW9ucy13ZWJ2dHQvbm8tY3NzLXN0eWxpbmcudnR0Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL21lZGlhL3RyYWNrL2NhcHRpb25zLXdlYnZ0dC9uby1j c3Mtc3R5bGluZy52dHQJKHJldmlzaW9uIDIzOTAxNCkKKysrIExheW91dFRlc3RzL21lZGlhL3Ry YWNrL2NhcHRpb25zLXdlYnZ0dC9uby1jc3Mtc3R5bGluZy52dHQJKHdvcmtpbmcgY29weSkKQEAg LTIsNCArMiw0IEBAIFdFQlZUVAogCiBoZWxsbwogMDA6MDA6MDAuMDAwIC0tPiAwMDowMDoxMC4w MDAKLTxiPkhlbGxvPC9iPi4KKzxiPkhlbGxvPC9iPiBmaXJzdCBjdWUuCg== 357172 2018-12-12 15:05:27 -0800 2018-12-12 16:24:36 -0800 Patch bug-192638-20181212150526.patch text/plain 12094 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzOTEyOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE4LTEyLTEyICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIElubGluZSBX ZWJWVFQgc3R5bGVzIHNob3VsZCBvdmVycmlkZSBzdHlsZXMgZnJvbSBDYXB0aW9ucyBzZXR0aW5n cyBpbiBTeXN0ZW0gUHJlZmVyZW5jZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5MjYzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEl0IGlzIGN1cnJlbnRseSBub3QgcG9zc2libGUgdG8gb3ZlcnJpZGUg Y2FwdGlvbiBzdHlsZXMgZ2VuZXJhdGVkIGZyb20gU3lzdGVtIFByZWZlcmVuY2VzIHdpdGggaW5s aW5lCisgICAgICAgIFdlYlZUVCBzdHlsZXMgd2l0aG91dCBhZGRpbmcgIWltcG9ydGFudC4gVGhl IHJlYXNvbiBmb3IgdGhpcyBpcyB0aGF0IHRoZSBnZW5lcmF0ZWQgc3R5bGVzIGZyb20KKyAgICAg ICAgU3lzdGVtIHByZWZlcmVuY2VzIGFyZSBhdXRob3Igc3R5bGVzIHdoaWNoIGhhdmUgaGlnaGVy IHByaW9yaXR5IHRoYW4gdGhlIGlubGluZSBXZWJWVFQgc3R5bGVzLCB3aGljaAorICAgICAgICBh cmUgdXNlciBzdHlsZXMgaW4gdGhlIHZpZGVvIHVzZXIgYWdlbnQgc2hhZG93IHRyZWUuIFRoaXMg Y2FuIGJlIGZpeGVkIGJ5IG1vdmluZyB0aGUgZ2VuZXJhdGVkIHN0eWxlcworICAgICAgICB0byB0 aGUgdmlkZW8gdXNlciBhZ2VudCBzaGFkb3cgdHJlZS4gSW5saW5lIFdlYlZUVCBzdHlsZXMgd2ls bCB0aGVuIGhhdmUgaGlnaGVyIHByaW9yaXR5IHNpbmNlIHRoZXkKKyAgICAgICAgYXJlIGFkZGVk IGFmdGVyIHRoZSBnZW5lcmF0ZWQgc3R5bGVzLiBUaGlzIHBhdGNoIGFsc28gZml4ZXMgYSBwcm9i bGVtIHdoZXJlIGlubGluZSBzdHlsZXMgY291bGQgYmUKKyAgICAgICAgYWRkZWQgdHdpY2UgdG8g dGhlIHZpZGVvIHVzZXIgYWdlbnQgc2hhZG93IHJvb3QuCisKKyAgICAgICAgVGVzdDogbWVkaWEv dHJhY2svdHJhY2stY3VlLWNzcy5odG1sCisKKyAgICAgICAgKiBkb20vRXh0ZW5zaW9uU3R5bGVT aGVldHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RXh0ZW5zaW9uU3R5bGVTaGVldHM6OnVwZGF0 ZUluamVjdGVkU3R5bGVTaGVldENhY2hlIGNvbnN0KToKKyAgICAgICAgKiBodG1sL3RyYWNrL1ZU VEN1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWVFRDdWU6OmdldERpc3BsYXlUcmVlKToKKyAg ICAgICAgKiBwYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Q2FwdGlvblVzZXJQcmVmZXJlbmNlczo6c2V0Q2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUp OgorICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpzZXRD YXB0aW9uVXNlclByZWZlcmVuY2VzU3R5bGVTaGVldCk6CisKIDIwMTgtMTItMTEgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTWFrZSBIVE1MQ29udmVydGVyIHRh a2UgdHdvIFBvc2l0aW9ucyBpbiBwcmVwYXJhdGlvbiB0byBtYWtlIGl0IHdvcmsgd2l0aCBzaGFk b3cgRE9NCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRXh0ZW5zaW9uU3R5bGVTaGVldHMuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9FeHRlbnNpb25TdHlsZVNoZWV0cy5j cHAJKHJldmlzaW9uIDIzOTAxNCkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9FeHRlbnNpb25TdHls ZVNoZWV0cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzNywxNSArMTM3LDYgQEAgdm9pZCBFeHRl bnNpb25TdHlsZVNoZWV0czo6dXBkYXRlSW5qZWN0ZQogICAgICAgICBlbHNlCiAgICAgICAgICAg ICBtX2luamVjdGVkQXV0aG9yU3R5bGVTaGVldHMuYXBwZW5kKFdURk1vdmUoc2hlZXQpKTsKICAg ICB9KTsKLSAgICAKLSAgICBpZiAoIW93bmluZ1BhZ2UtPmNhcHRpb25Vc2VyUHJlZmVyZW5jZXNT dHlsZVNoZWV0KCkuaXNFbXB0eSgpKSB7Ci0gICAgICAgIC8vIElkZW50aWZ5IG91ciBvdmVycmlk ZSBzdHlsZSBzaGVldCB3aXRoIGEgdW5pcXVlIFVSTCAtIGEgbmV3IHNjaGVtZSBhbmQgYSBVVUlE LgotICAgICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8VVJMPiBjYXB0aW9uc1N0eWxlU2hlZXRV UkwoVVJMKCksICJ1c2VyLWNhcHRpb25zLW92ZXJyaWRlOjAxRjZBRjEyLUMzQjAtNEY3MC1BRjVF LUEzRTAwMjM0REMyMyIpOwotCi0gICAgICAgIGF1dG8gc2hlZXQgPSBjcmVhdGVFeHRlbnNpb25z U3R5bGVTaGVldChjb25zdF9jYXN0PERvY3VtZW50Jj4obV9kb2N1bWVudCksIGNhcHRpb25zU3R5 bGVTaGVldFVSTCwgb3duaW5nUGFnZS0+Y2FwdGlvblVzZXJQcmVmZXJlbmNlc1N0eWxlU2hlZXQo KSwgVXNlclN0eWxlQXV0aG9yTGV2ZWwpOwotCi0gICAgICAgIG1faW5qZWN0ZWRBdXRob3JTdHls ZVNoZWV0cy5hcHBlbmQoV1RGTW92ZShzaGVldCkpOwotICAgIH0KIH0KIAogdm9pZCBFeHRlbnNp b25TdHlsZVNoZWV0czo6aW52YWxpZGF0ZUluamVjdGVkU3R5bGVTaGVldENhY2hlKCkKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVlRUQ3VlLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9odG1sL3RyYWNrL1ZUVEN1ZS5jcHAJKHJldmlzaW9uIDIzOTAxNCkKKysrIFNv dXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVlRUQ3VlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODk0 LDEyICs4OTQsMTkgQEAgVlRUQ3VlQm94JiBWVFRDdWU6OmdldERpc3BsYXlUcmVlKGNvbnN0IAog ICAgIGRpc3BsYXlUcmVlLT5zZXRGb250U2l6ZUZyb21DYXB0aW9uVXNlclByZWZzKGZvbnRTaXpl KTsKICAgICBkaXNwbGF5VHJlZS0+YXBwbHlDU1NQcm9wZXJ0aWVzKHZpZGVvU2l6ZSk7CiAKKyAg ICBpZiAoZGlzcGxheVRyZWUtPmRvY3VtZW50KCkucGFnZSgpKSB7CisgICAgICAgIGF1dG8gY3Nz U3RyaW5nID0gZGlzcGxheVRyZWUtPmRvY3VtZW50KCkucGFnZSgpLT5jYXB0aW9uVXNlclByZWZl cmVuY2VzU3R5bGVTaGVldCgpOworICAgICAgICBhdXRvIHN0eWxlID0gSFRNTFN0eWxlRWxlbWVu dDo6Y3JlYXRlKEhUTUxOYW1lczo6c3R5bGVUYWcsIGRpc3BsYXlUcmVlLT5kb2N1bWVudCgpLCBm YWxzZSk7CisgICAgICAgIHN0eWxlLT5zZXRUZXh0Q29udGVudChjc3NTdHJpbmcpOworICAgICAg ICBkaXNwbGF5VHJlZS0+YXBwZW5kQ2hpbGQoc3R5bGUpOworICAgIH0KKwogICAgIGNvbnN0IGF1 dG8mIHN0eWxlU2hlZXRzID0gdHJhY2soKS0+c3R5bGVTaGVldHMoKTsKICAgICBpZiAoc3R5bGVT aGVldHMpIHsKICAgICAgICAgZm9yIChjb25zdCBhdXRvJiBjc3NTdHJpbmcgOiAqc3R5bGVTaGVl dHMpIHsKLSAgICAgICAgICAgIGF1dG8gc3R5bGUgPSBIVE1MU3R5bGVFbGVtZW50OjpjcmVhdGUo SFRNTE5hbWVzOjpzdHlsZVRhZywgbV9jdWVCYWNrZHJvcEJveC0+ZG9jdW1lbnQoKSwgZmFsc2Up OworICAgICAgICAgICAgYXV0byBzdHlsZSA9IEhUTUxTdHlsZUVsZW1lbnQ6OmNyZWF0ZShIVE1M TmFtZXM6OnN0eWxlVGFnLCBkaXNwbGF5VHJlZS0+ZG9jdW1lbnQoKSwgZmFsc2UpOwogICAgICAg ICAgICAgc3R5bGUtPnNldFRleHRDb250ZW50KGNzc1N0cmluZyk7Ci0gICAgICAgICAgICBtX2N1 ZUJhY2tkcm9wQm94LT5hcHBlbmRDaGlsZChzdHlsZSk7CisgICAgICAgICAgICBkaXNwbGF5VHJl ZS0+YXBwZW5kQ2hpbGQoc3R5bGUpOwogICAgICAgICB9CiAgICAgfQogCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXMuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlcy5jcHAJKHJldmlzaW9uIDIz OTAxNCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlcy5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTMxNCw4ICszMTQsMTMgQEAgaW50IENhcHRpb25Vc2VyUHJlZmVy ZW5jZXM6OnRleHRUcmFja0xhbgogCiB2b2lkIENhcHRpb25Vc2VyUHJlZmVyZW5jZXM6OnNldENh cHRpb25zU3R5bGVTaGVldE92ZXJyaWRlKGNvbnN0IFN0cmluZyYgb3ZlcnJpZGUpCiB7CisgICAg aWYgKG92ZXJyaWRlID09IG1fY2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUpCisgICAgICAgIHJl dHVybjsKKwogICAgIG1fY2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUgPSBvdmVycmlkZTsKICAg ICB1cGRhdGVDYXB0aW9uU3R5bGVTaGVldE92ZXJyaWRlKCk7CisgICAgaWYgKCFtX3RpbWVyLmlz QWN0aXZlKCkpCisgICAgICAgIG1fdGltZXIuc3RhcnRPbmVTaG90KDBfcyk7CiB9CiAKIHZvaWQg Q2FwdGlvblVzZXJQcmVmZXJlbmNlczo6dXBkYXRlQ2FwdGlvblN0eWxlU2hlZXRPdmVycmlkZSgp CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAJKHJldmlzaW9uIDIzOTAxNCkKKysrIFNvdXJjZS9XZWJD b3JlL3BhZ2UvUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1NjQsOCArMjU2NCw2IEBAIHZv aWQgUGFnZTo6c2V0Q2FwdGlvblVzZXJQcmVmZXJlbmNlc1N0eWwKICAgICAgICAgcmV0dXJuOwog CiAgICAgbV9jYXB0aW9uVXNlclByZWZlcmVuY2VzU3R5bGVTaGVldCA9IHN0eWxlU2hlZXQ7Ci0g ICAgCi0gICAgaW52YWxpZGF0ZUluamVjdGVkU3R5bGVTaGVldENhY2hlSW5BbGxGcmFtZXMoKTsK IH0KIAogdm9pZCBQYWdlOjphY2Nlc3NpYmlsaXR5U2V0dGluZ3NEaWRDaGFuZ2UoKQpJbmRleDog TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxv ZwkocmV2aXNpb24gMjM5MDE0KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTgtMTItMTIgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xs YW5AYXBwbGUuY29tPgorCisgICAgICAgIFttYWNPU10gSW5saW5lIFdlYlZUVCBzdHlsZXMgc2hv dWxkIG92ZXJyaWRlIHN0eWxlcyBmcm9tIENhcHRpb25zIHNldHRpbmdzIGluIFN5c3RlbSBQcmVm ZXJlbmNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTkyNjM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBtZWRpYS90cmFjay9jYXB0aW9ucy13ZWJ2dHQvY3NzLXN0eWxpbmcudnR0OgorICAgICAgICAq IG1lZGlhL3RyYWNrL2NhcHRpb25zLXdlYnZ0dC9uby1jc3Mtc3R5bGluZy52dHQ6CisgICAgICAg ICogbWVkaWEvdHJhY2svdHJhY2stY3NzLXVzZXItb3ZlcnJpZGUtZXhwZWN0ZWQudHh0OgorICAg ICAgICAqIG1lZGlhL3RyYWNrL3RyYWNrLWNzcy11c2VyLW92ZXJyaWRlLmh0bWw6CisgICAgICAg ICogbWVkaWEvdHJhY2svdHJhY2stY3VlLWNzcy1leHBlY3RlZC5odG1sOgorCiAyMDE4LTEyLTA4 ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEFsbG93 IGNvbnRyb2wgb3ZlciBjaGlsZCBvcmRlciB3aGVuIGFkZGluZyBub2RlcyB0byB0aGUgc2Nyb2xs aW5nIHRyZWUKSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWNzcy11c2VyLW92 ZXJyaWRlLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS90cmFj ay90cmFjay1jc3MtdXNlci1vdmVycmlkZS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDIzOTAxNCkK KysrIExheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWNzcy11c2VyLW92ZXJyaWRlLWV4cGVj dGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMSw2ICsxLDYgQEAKIAogCi1pbnRlcm5hbHMuY2Fw dGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUgPSBmdW5jdGlvbiBjYXB0aW9uc1N0eWxlU2hlZXRPdmVy cmlkZSgpIHsgW25hdGl2ZSBjb2RlXSB9CitpbnRlcm5hbHMuY2FwdGlvbnNTdHlsZVNoZWV0T3Zl cnJpZGUgPSAKIFRlc3QgdGhhdCBzdHlsZSB0byBhbGwgY3VlcyBpcyBhcHBsaWVkIGNvcnJlY3Rs eS4KIEVWRU5UKGNhbnBsYXl0aHJvdWdoKQogRVZFTlQoc2Vla2VkKQpAQCAtMTYsNyArMTYsNyBA QCBFWFBFQ1RFRCAoZ2V0Q29tcHV0ZWRTdHlsZSh0ZXh0VHJhY2tEaXNwCiAKICoqIEFkZCBhbiBv dmVycmlkZSwgd2l0aG91dCAnIWltcG9ydGFudCcgKioKIFJVTihpbnRlcm5hbHMuc2V0Q2FwdGlv bnNTdHlsZVNoZWV0T3ZlcnJpZGUoJ3ZpZGVvOjpjdWUgeyBjb2xvcjogYmx1ZTsgYmFja2dyb3Vu ZC1jb2xvcjogeWVsbG93OyB9JykpCi1pbnRlcm5hbHMuY2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJp ZGUgPSBmdW5jdGlvbiBjYXB0aW9uc1N0eWxlU2hlZXRPdmVycmlkZSgpIHsgW25hdGl2ZSBjb2Rl XSB9CitpbnRlcm5hbHMuY2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUgPSB2aWRlbzo6Y3VlIHsg Y29sb3I6IGJsdWU7IGJhY2tncm91bmQtY29sb3I6IHllbGxvdzsgfQogRVhQRUNURUQgKGdldENv bXB1dGVkU3R5bGUodGV4dFRyYWNrRGlzcGxheUVsZW1lbnQodmlkZW8sICdjdWUnKSkuY29sb3Ig PT0gJ3JnYigxMjgsIDAsIDEyOCknKSBPSwogRVhQRUNURUQgKGdldENvbXB1dGVkU3R5bGUodGV4 dFRyYWNrRGlzcGxheUVsZW1lbnQodmlkZW8sICdjdWUnKSkuYmFja2dyb3VuZENvbG9yID09ICdy Z2IoMCwgMjU1LCAwKScpIE9LCiAKSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNr LWNzcy11c2VyLW92ZXJyaWRlLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEv dHJhY2svdHJhY2stY3NzLXVzZXItb3ZlcnJpZGUuaHRtbAkocmV2aXNpb24gMjM5MDE0KQorKysg TGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svdHJhY2stY3NzLXVzZXItb3ZlcnJpZGUuaHRtbAkod29y a2luZyBjb3B5KQpAQCAtMzAsMzAgKzMwLDMyIEBACiAgICAgICAgICAgICAgICAgY29uc29sZVdy aXRlKCI8YnI+KiogQWRkIGFuIG92ZXJyaWRlLCB3aXRob3V0ICchaW1wb3J0YW50JyAqKiIpOwog ICAgICAgICAgICAgICAgIGRvY3VtZW50LmJvZHkub2Zmc2V0VG9wOwogICAgICAgICAgICAgICAg IHJ1bigiaW50ZXJuYWxzLnNldENhcHRpb25zU3R5bGVTaGVldE92ZXJyaWRlKCd2aWRlbzo6Y3Vl IHsgY29sb3I6IGJsdWU7IGJhY2tncm91bmQtY29sb3I6IHllbGxvdzsgfScpIik7Ci0gICAgICAg ICAgICAgICAgY29uc29sZVdyaXRlKCJpbnRlcm5hbHMuY2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJp ZGUgPSAiICsgaW50ZXJuYWxzLmNhcHRpb25zU3R5bGVTaGVldE92ZXJyaWRlKTsKKyAgICAgICAg ICAgICAgICBjb25zb2xlV3JpdGUoImludGVybmFscy5jYXB0aW9uc1N0eWxlU2hlZXRPdmVycmlk ZSA9ICIgKyBpbnRlcm5hbHMuY2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUoKSk7CiAgICAgICAg ICAgICAgICAgZG9jdW1lbnQuYm9keS5vZmZzZXRUb3A7CiAgICAgICAgICAgICAgICAgdGVzdEV4 cGVjdGVkKCJnZXRDb21wdXRlZFN0eWxlKHRleHRUcmFja0Rpc3BsYXlFbGVtZW50KHZpZGVvLCAn Y3VlJykpLmNvbG9yIiwgInJnYigxMjgsIDAsIDEyOCkiKTsKICAgICAgICAgICAgICAgICB0ZXN0 RXhwZWN0ZWQoImdldENvbXB1dGVkU3R5bGUodGV4dFRyYWNrRGlzcGxheUVsZW1lbnQodmlkZW8s ICdjdWUnKSkuYmFja2dyb3VuZENvbG9yIiwgInJnYigwLCAyNTUsIDApIik7CiAKICAgICAgICAg ICAgICAgICBjb25zb2xlV3JpdGUoIjxicj4qKiBNYXJrIGJhY2tncm91bmQtY29sb3IgJyFpbXBv cnRhbnQnICoqIik7CiAgICAgICAgICAgICAgICAgcnVuKCJpbnRlcm5hbHMuc2V0Q2FwdGlvbnNT dHlsZVNoZWV0T3ZlcnJpZGUoJ3ZpZGVvOjpjdWUgeyBjb2xvcjogYmx1ZSA7IGJhY2tncm91bmQt Y29sb3I6IHllbGxvdyAhaW1wb3J0YW50OyB9JykiKTsKLSAgICAgICAgICAgICAgICBkb2N1bWVu dC5ib2R5Lm9mZnNldFRvcDsKLSAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoImdldENvbXB1 dGVkU3R5bGUodGV4dFRyYWNrRGlzcGxheUVsZW1lbnQodmlkZW8sICdjdWUnKSkuY29sb3IiLCAi cmdiKDEyOCwgMCwgMTI4KSIpOwotICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgiZ2V0Q29t cHV0ZWRTdHlsZSh0ZXh0VHJhY2tEaXNwbGF5RWxlbWVudCh2aWRlbywgJ2N1ZScpKS5iYWNrZ3Jv dW5kQ29sb3IiLCAicmdiKDI1NSwgMjU1LCAwKSIpOwotCi0gICAgICAgICAgICAgICAgY29uc29s ZVdyaXRlKCI8YnI+KiogTWFyayBjb2xvciAnIWltcG9ydGFudCcgKioiKTsKLSAgICAgICAgICAg ICAgICBydW4oInN0eWxlc2hlZXQuaW5zZXJ0UnVsZSgndmlkZW86OmN1ZSB7IGNvbG9yOiBibHVl ICFpbXBvcnRhbnQ7IGJhY2tncm91bmQtY29sb3I6IHllbGxvdyAgIWltcG9ydGFudDsgfScsIDAp Iik7Ci0gICAgICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5vZmZzZXRUb3A7Ci0gICAgICAgICAg ICAgICAgdGVzdEV4cGVjdGVkKCJnZXRDb21wdXRlZFN0eWxlKHRleHRUcmFja0Rpc3BsYXlFbGVt ZW50KHZpZGVvLCAnY3VlJykpLmNvbG9yIiwgInJnYigwLCAwLCAyNTUpIik7Ci0gICAgICAgICAg ICAgICAgdGVzdEV4cGVjdGVkKCJnZXRDb21wdXRlZFN0eWxlKHRleHRUcmFja0Rpc3BsYXlFbGVt ZW50KHZpZGVvLCAnY3VlJykpLmJhY2tncm91bmRDb2xvciIsICJyZ2IoMjU1LCAyNTUsIDApIik7 Ci0KLSAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOwotICAgICAgICAgICAgICAgIGVu ZFRlc3QoKTsKKyAgICAgICAgICAgICAgICAvLyBUaGUgc3R5bGUgaXMgbm90IGltbWVkaWF0ZWx5 IHVwZGF0ZWQsIHNjaGVkdWxlIHRoZSByZXN0IG9mIHRoZSB0ZXN0IHdpdGggYSB6ZXJvIHRpbWVv dXQgdGltZXIuCisgICAgICAgICAgICAgICAgc2V0VGltZW91dChmdW5jdGlvbigpIHsKKyAgICAg ICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJnZXRDb21wdXRlZFN0eWxlKHRleHRUcmFja0Rp c3BsYXlFbGVtZW50KHZpZGVvLCAnY3VlJykpLmNvbG9yIiwgInJnYigxMjgsIDAsIDEyOCkiKTsK KyAgICAgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJnZXRDb21wdXRlZFN0eWxlKHRleHRU cmFja0Rpc3BsYXlFbGVtZW50KHZpZGVvLCAnY3VlJykpLmJhY2tncm91bmRDb2xvciIsICJyZ2Io MjU1LCAyNTUsIDApIik7CisKKyAgICAgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8YnI+ KiogTWFyayBjb2xvciAnIWltcG9ydGFudCcgKioiKTsKKyAgICAgICAgICAgICAgICAgICAgcnVu KCJzdHlsZXNoZWV0Lmluc2VydFJ1bGUoJ3ZpZGVvOjpjdWUgeyBjb2xvcjogYmx1ZSAhaW1wb3J0 YW50OyBiYWNrZ3JvdW5kLWNvbG9yOiB5ZWxsb3cgICFpbXBvcnRhbnQ7IH0nLCAwKSIpOworICAg ICAgICAgICAgICAgICAgICBkb2N1bWVudC5ib2R5Lm9mZnNldFRvcDsKKyAgICAgICAgICAgICAg ICAgICAgdGVzdEV4cGVjdGVkKCJnZXRDb21wdXRlZFN0eWxlKHRleHRUcmFja0Rpc3BsYXlFbGVt ZW50KHZpZGVvLCAnY3VlJykpLmNvbG9yIiwgInJnYigwLCAwLCAyNTUpIik7CisgICAgICAgICAg ICAgICAgICAgIHRlc3RFeHBlY3RlZCgiZ2V0Q29tcHV0ZWRTdHlsZSh0ZXh0VHJhY2tEaXNwbGF5 RWxlbWVudCh2aWRlbywgJ2N1ZScpKS5iYWNrZ3JvdW5kQ29sb3IiLCAicmdiKDI1NSwgMjU1LCAw KSIpOworCisgICAgICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CisgICAgICAgICAg ICAgICAgICAgIGVuZFRlc3QoKTsKKyAgICAgICAgICAgICAgICB9LCAxMDApOwogICAgICAgICAg ICAgfQogCiAgICAgICAgICAgICBmdW5jdGlvbiBsb2FkZWQoKQogICAgICAgICAgICAgewotY29u c29sZVdyaXRlKCI8YnI+aW50ZXJuYWxzLmNhcHRpb25zU3R5bGVTaGVldE92ZXJyaWRlID0gIiAr IGludGVybmFscy5jYXB0aW9uc1N0eWxlU2hlZXRPdmVycmlkZSk7CisgICAgICAgICAgICAgICAg Y29uc29sZVdyaXRlKCI8YnI+aW50ZXJuYWxzLmNhcHRpb25zU3R5bGVTaGVldE92ZXJyaWRlID0g IiArIGludGVybmFscy5jYXB0aW9uc1N0eWxlU2hlZXRPdmVycmlkZSgpKTsKIAogICAgICAgICAg ICAgICAgIGNvbnNvbGVXcml0ZSgiVGVzdCB0aGF0IHN0eWxlIHRvIGFsbCBjdWVzIGlzIGFwcGxp ZWQgY29ycmVjdGx5LiIpOwogICAgICAgICAgICAgICAgIGZpbmRNZWRpYUVsZW1lbnQoKTsKSW5k ZXg6IExheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWN1ZS1jc3MtZXhwZWN0ZWQuaHRtbAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS90cmFjay90cmFjay1jdWUtY3NzLWV4cGVj dGVkLmh0bWwJKHJldmlzaW9uIDIzOTAxNCkKKysrIExheW91dFRlc3RzL21lZGlhL3RyYWNrL3Ry YWNrLWN1ZS1jc3MtZXhwZWN0ZWQuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMTQsNiArMTQsMTAg QEAKICAgICAgICAgICAgIGNvbG9yOiByZWQ7CiAgICAgICAgICAgICBmb250LXNpemU6IDE1cHg7 CiAgICAgICAgIH0KKyAgICAgICAgdmlkZW86OmN1ZSB7CisgICAgICAgICAgICBjb2xvcjogZ3Jl ZW47CisgICAgICAgICAgICBmb250LXNpemU6IDE1cHg7CisgICAgICAgIH0KICAgICAgICAgPC9z dHlsZT4KICAgICAgICAgPHNjcmlwdD4KICAgICAgICAgZnVuY3Rpb24gc2Vla2VkKCkKSW5kZXg6 IExheW91dFRlc3RzL21lZGlhL3RyYWNrL2NhcHRpb25zLXdlYnZ0dC9jc3Mtc3R5bGluZy52dHQK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svY2FwdGlvbnMtd2VidnR0L2Nz cy1zdHlsaW5nLnZ0dAkocmV2aXNpb24gMjM5MDE0KQorKysgTGF5b3V0VGVzdHMvbWVkaWEvdHJh Y2svY2FwdGlvbnMtd2VidnR0L2Nzcy1zdHlsaW5nLnZ0dAkod29ya2luZyBjb3B5KQpAQCAtMTEs NiArMTEsMTIgQEAgY29sb3I6IHJlZDsKIGZvbnQtc2l6ZTogMTVweDsKIH0KIAorU1RZTEUKK3Zp ZGVvOjpjdWUgeworY29sb3I6IGdyZWVuOworZm9udC1zaXplOiAxNXB4OworfQorCiBoZWxsbwog MDA6MDA6MDAuMDAwIC0tPiAwMDowMDoxMC4wMDAKLTxiPkhlbGxvPC9iPi4KKzxiPkhlbGxvPC9i PiBmaXJzdCBjdWUuCkluZGV4OiBMYXlvdXRUZXN0cy9tZWRpYS90cmFjay9jYXB0aW9ucy13ZWJ2 dHQvbm8tY3NzLXN0eWxpbmcudnR0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL21lZGlhL3Ry YWNrL2NhcHRpb25zLXdlYnZ0dC9uby1jc3Mtc3R5bGluZy52dHQJKHJldmlzaW9uIDIzOTAxNCkK KysrIExheW91dFRlc3RzL21lZGlhL3RyYWNrL2NhcHRpb25zLXdlYnZ0dC9uby1jc3Mtc3R5bGlu Zy52dHQJKHdvcmtpbmcgY29weSkKQEAgLTIsNCArMiw0IEBAIFdFQlZUVAogCiBoZWxsbwogMDA6 MDA6MDAuMDAwIC0tPiAwMDowMDoxMC4wMDAKLTxiPkhlbGxvPC9iPi4KKzxiPkhlbGxvPC9iPiBm aXJzdCBjdWUuCg== 357190 2018-12-12 16:24:38 -0800 2018-12-13 15:06:56 -0800 Patch bug-192638-20181212162437.patch text/plain 12100 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzOTEyOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE4LTEyLTEyICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIElubGluZSBX ZWJWVFQgc3R5bGVzIHNob3VsZCBvdmVycmlkZSBzdHlsZXMgZnJvbSBDYXB0aW9ucyBzZXR0aW5n cyBpbiBTeXN0ZW0gUHJlZmVyZW5jZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5MjYzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEl0IGlzIGN1cnJlbnRseSBub3QgcG9zc2libGUgdG8gb3ZlcnJpZGUg Y2FwdGlvbiBzdHlsZXMgZ2VuZXJhdGVkIGZyb20gU3lzdGVtIFByZWZlcmVuY2VzIHdpdGggaW5s aW5lCisgICAgICAgIFdlYlZUVCBzdHlsZXMgd2l0aG91dCBhZGRpbmcgIWltcG9ydGFudC4gVGhl IHJlYXNvbiBmb3IgdGhpcyBpcyB0aGF0IHRoZSBnZW5lcmF0ZWQgc3R5bGVzIGZyb20KKyAgICAg ICAgU3lzdGVtIHByZWZlcmVuY2VzIGFyZSBhdXRob3Igc3R5bGVzIHdoaWNoIGhhdmUgaGlnaGVy IHByaW9yaXR5IHRoYW4gdGhlIGlubGluZSBXZWJWVFQgc3R5bGVzLCB3aGljaAorICAgICAgICBh cmUgdXNlciBhZ2VudCBzdHlsZXMgaW4gdGhlIHZpZGVvIHVzZXIgYWdlbnQgc2hhZG93IHRyZWUu IFRoaXMgY2FuIGJlIGZpeGVkIGJ5IG1vdmluZyB0aGUgZ2VuZXJhdGVkCisgICAgICAgIHN0eWxl cyB0byB0aGUgdmlkZW8gdXNlciBhZ2VudCBzaGFkb3cgdHJlZS4gSW5saW5lIFdlYlZUVCBzdHls ZXMgd2lsbCB0aGVuIGhhdmUgaGlnaGVyIHByaW9yaXR5IHNpbmNlCisgICAgICAgIHRoZXkgYXJl IGFkZGVkIGFmdGVyIHRoZSBnZW5lcmF0ZWQgc3R5bGVzLiBUaGlzIHBhdGNoIGFsc28gZml4ZXMg YSBwcm9ibGVtIHdoZXJlIGlubGluZSBzdHlsZXMgY291bGQgYmUKKyAgICAgICAgYWRkZWQgdHdp Y2UgdG8gdGhlIHZpZGVvIHVzZXIgYWdlbnQgc2hhZG93IHJvb3QuCisKKyAgICAgICAgVGVzdDog bWVkaWEvdHJhY2svdHJhY2stY3VlLWNzcy5odG1sCisKKyAgICAgICAgKiBkb20vRXh0ZW5zaW9u U3R5bGVTaGVldHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RXh0ZW5zaW9uU3R5bGVTaGVldHM6 OnVwZGF0ZUluamVjdGVkU3R5bGVTaGVldENhY2hlIGNvbnN0KToKKyAgICAgICAgKiBodG1sL3Ry YWNrL1ZUVEN1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWVFRDdWU6OmdldERpc3BsYXlUcmVl KToKKyAgICAgICAgKiBwYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAo V2ViQ29yZTo6Q2FwdGlvblVzZXJQcmVmZXJlbmNlczo6c2V0Q2FwdGlvbnNTdHlsZVNoZWV0T3Zl cnJpZGUpOgorICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdl OjpzZXRDYXB0aW9uVXNlclByZWZlcmVuY2VzU3R5bGVTaGVldCk6CisKIDIwMTgtMTItMTEgIFJ5 b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTWFrZSBIVE1MQ29udmVy dGVyIHRha2UgdHdvIFBvc2l0aW9ucyBpbiBwcmVwYXJhdGlvbiB0byBtYWtlIGl0IHdvcmsgd2l0 aCBzaGFkb3cgRE9NCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRXh0ZW5zaW9uU3R5bGVTaGVl dHMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9FeHRlbnNpb25TdHlsZVNo ZWV0cy5jcHAJKHJldmlzaW9uIDIzOTAxNCkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9FeHRlbnNp b25TdHlsZVNoZWV0cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzNywxNSArMTM3LDYgQEAgdm9p ZCBFeHRlbnNpb25TdHlsZVNoZWV0czo6dXBkYXRlSW5qZWN0ZQogICAgICAgICBlbHNlCiAgICAg ICAgICAgICBtX2luamVjdGVkQXV0aG9yU3R5bGVTaGVldHMuYXBwZW5kKFdURk1vdmUoc2hlZXQp KTsKICAgICB9KTsKLSAgICAKLSAgICBpZiAoIW93bmluZ1BhZ2UtPmNhcHRpb25Vc2VyUHJlZmVy ZW5jZXNTdHlsZVNoZWV0KCkuaXNFbXB0eSgpKSB7Ci0gICAgICAgIC8vIElkZW50aWZ5IG91ciBv dmVycmlkZSBzdHlsZSBzaGVldCB3aXRoIGEgdW5pcXVlIFVSTCAtIGEgbmV3IHNjaGVtZSBhbmQg YSBVVUlELgotICAgICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8VVJMPiBjYXB0aW9uc1N0eWxl U2hlZXRVUkwoVVJMKCksICJ1c2VyLWNhcHRpb25zLW92ZXJyaWRlOjAxRjZBRjEyLUMzQjAtNEY3 MC1BRjVFLUEzRTAwMjM0REMyMyIpOwotCi0gICAgICAgIGF1dG8gc2hlZXQgPSBjcmVhdGVFeHRl bnNpb25zU3R5bGVTaGVldChjb25zdF9jYXN0PERvY3VtZW50Jj4obV9kb2N1bWVudCksIGNhcHRp b25zU3R5bGVTaGVldFVSTCwgb3duaW5nUGFnZS0+Y2FwdGlvblVzZXJQcmVmZXJlbmNlc1N0eWxl U2hlZXQoKSwgVXNlclN0eWxlQXV0aG9yTGV2ZWwpOwotCi0gICAgICAgIG1faW5qZWN0ZWRBdXRo b3JTdHlsZVNoZWV0cy5hcHBlbmQoV1RGTW92ZShzaGVldCkpOwotICAgIH0KIH0KIAogdm9pZCBF eHRlbnNpb25TdHlsZVNoZWV0czo6aW52YWxpZGF0ZUluamVjdGVkU3R5bGVTaGVldENhY2hlKCkK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVlRUQ3VlLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1ZUVEN1ZS5jcHAJKHJldmlzaW9uIDIzOTAxNCkK KysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVlRUQ3VlLmNwcAkod29ya2luZyBjb3B5KQpA QCAtODk0LDEyICs4OTQsMTkgQEAgVlRUQ3VlQm94JiBWVFRDdWU6OmdldERpc3BsYXlUcmVlKGNv bnN0IAogICAgIGRpc3BsYXlUcmVlLT5zZXRGb250U2l6ZUZyb21DYXB0aW9uVXNlclByZWZzKGZv bnRTaXplKTsKICAgICBkaXNwbGF5VHJlZS0+YXBwbHlDU1NQcm9wZXJ0aWVzKHZpZGVvU2l6ZSk7 CiAKKyAgICBpZiAoZGlzcGxheVRyZWUtPmRvY3VtZW50KCkucGFnZSgpKSB7CisgICAgICAgIGF1 dG8gY3NzU3RyaW5nID0gZGlzcGxheVRyZWUtPmRvY3VtZW50KCkucGFnZSgpLT5jYXB0aW9uVXNl clByZWZlcmVuY2VzU3R5bGVTaGVldCgpOworICAgICAgICBhdXRvIHN0eWxlID0gSFRNTFN0eWxl RWxlbWVudDo6Y3JlYXRlKEhUTUxOYW1lczo6c3R5bGVUYWcsIGRpc3BsYXlUcmVlLT5kb2N1bWVu dCgpLCBmYWxzZSk7CisgICAgICAgIHN0eWxlLT5zZXRUZXh0Q29udGVudChjc3NTdHJpbmcpOwor ICAgICAgICBkaXNwbGF5VHJlZS0+YXBwZW5kQ2hpbGQoc3R5bGUpOworICAgIH0KKwogICAgIGNv bnN0IGF1dG8mIHN0eWxlU2hlZXRzID0gdHJhY2soKS0+c3R5bGVTaGVldHMoKTsKICAgICBpZiAo c3R5bGVTaGVldHMpIHsKICAgICAgICAgZm9yIChjb25zdCBhdXRvJiBjc3NTdHJpbmcgOiAqc3R5 bGVTaGVldHMpIHsKLSAgICAgICAgICAgIGF1dG8gc3R5bGUgPSBIVE1MU3R5bGVFbGVtZW50Ojpj cmVhdGUoSFRNTE5hbWVzOjpzdHlsZVRhZywgbV9jdWVCYWNrZHJvcEJveC0+ZG9jdW1lbnQoKSwg ZmFsc2UpOworICAgICAgICAgICAgYXV0byBzdHlsZSA9IEhUTUxTdHlsZUVsZW1lbnQ6OmNyZWF0 ZShIVE1MTmFtZXM6OnN0eWxlVGFnLCBkaXNwbGF5VHJlZS0+ZG9jdW1lbnQoKSwgZmFsc2UpOwog ICAgICAgICAgICAgc3R5bGUtPnNldFRleHRDb250ZW50KGNzc1N0cmluZyk7Ci0gICAgICAgICAg ICBtX2N1ZUJhY2tkcm9wQm94LT5hcHBlbmRDaGlsZChzdHlsZSk7CisgICAgICAgICAgICBkaXNw bGF5VHJlZS0+YXBwZW5kQ2hpbGQoc3R5bGUpOwogICAgICAgICB9CiAgICAgfQogCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXMuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlcy5jcHAJKHJldmlz aW9uIDIzOTAxNCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNl cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxNCw4ICszMTQsMTMgQEAgaW50IENhcHRpb25Vc2Vy UHJlZmVyZW5jZXM6OnRleHRUcmFja0xhbgogCiB2b2lkIENhcHRpb25Vc2VyUHJlZmVyZW5jZXM6 OnNldENhcHRpb25zU3R5bGVTaGVldE92ZXJyaWRlKGNvbnN0IFN0cmluZyYgb3ZlcnJpZGUpCiB7 CisgICAgaWYgKG92ZXJyaWRlID09IG1fY2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUpCisgICAg ICAgIHJldHVybjsKKwogICAgIG1fY2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUgPSBvdmVycmlk ZTsKICAgICB1cGRhdGVDYXB0aW9uU3R5bGVTaGVldE92ZXJyaWRlKCk7CisgICAgaWYgKCFtX3Rp bWVyLmlzQWN0aXZlKCkpCisgICAgICAgIG1fdGltZXIuc3RhcnRPbmVTaG90KDBfcyk7CiB9CiAK IHZvaWQgQ2FwdGlvblVzZXJQcmVmZXJlbmNlczo6dXBkYXRlQ2FwdGlvblN0eWxlU2hlZXRPdmVy cmlkZSgpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAJKHJldmlzaW9uIDIzOTAxNCkKKysrIFNvdXJj ZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1NjQsOCArMjU2NCw2 IEBAIHZvaWQgUGFnZTo6c2V0Q2FwdGlvblVzZXJQcmVmZXJlbmNlc1N0eWwKICAgICAgICAgcmV0 dXJuOwogCiAgICAgbV9jYXB0aW9uVXNlclByZWZlcmVuY2VzU3R5bGVTaGVldCA9IHN0eWxlU2hl ZXQ7Ci0gICAgCi0gICAgaW52YWxpZGF0ZUluamVjdGVkU3R5bGVTaGVldENhY2hlSW5BbGxGcmFt ZXMoKTsKIH0KIAogdm9pZCBQYWdlOjphY2Nlc3NpYmlsaXR5U2V0dGluZ3NEaWRDaGFuZ2UoKQpJ bmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0No YW5nZUxvZwkocmV2aXNpb24gMjM5MDE0KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTgtMTItMTIgIFBlciBBcm5lIFZvbGxhbiAg PHB2b2xsYW5AYXBwbGUuY29tPgorCisgICAgICAgIFttYWNPU10gSW5saW5lIFdlYlZUVCBzdHls ZXMgc2hvdWxkIG92ZXJyaWRlIHN0eWxlcyBmcm9tIENhcHRpb25zIHNldHRpbmdzIGluIFN5c3Rl bSBQcmVmZXJlbmNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTkyNjM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBtZWRpYS90cmFjay9jYXB0aW9ucy13ZWJ2dHQvY3NzLXN0eWxpbmcudnR0OgorICAg ICAgICAqIG1lZGlhL3RyYWNrL2NhcHRpb25zLXdlYnZ0dC9uby1jc3Mtc3R5bGluZy52dHQ6Cisg ICAgICAgICogbWVkaWEvdHJhY2svdHJhY2stY3NzLXVzZXItb3ZlcnJpZGUtZXhwZWN0ZWQudHh0 OgorICAgICAgICAqIG1lZGlhL3RyYWNrL3RyYWNrLWNzcy11c2VyLW92ZXJyaWRlLmh0bWw6Cisg ICAgICAgICogbWVkaWEvdHJhY2svdHJhY2stY3VlLWNzcy1leHBlY3RlZC5odG1sOgorCiAyMDE4 LTEyLTA4ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAg IEFsbG93IGNvbnRyb2wgb3ZlciBjaGlsZCBvcmRlciB3aGVuIGFkZGluZyBub2RlcyB0byB0aGUg c2Nyb2xsaW5nIHRyZWUKSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWNzcy11 c2VyLW92ZXJyaWRlLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRp YS90cmFjay90cmFjay1jc3MtdXNlci1vdmVycmlkZS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDIz OTAxNCkKKysrIExheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWNzcy11c2VyLW92ZXJyaWRl LWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMSw2ICsxLDYgQEAKIAogCi1pbnRlcm5h bHMuY2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUgPSBmdW5jdGlvbiBjYXB0aW9uc1N0eWxlU2hl ZXRPdmVycmlkZSgpIHsgW25hdGl2ZSBjb2RlXSB9CitpbnRlcm5hbHMuY2FwdGlvbnNTdHlsZVNo ZWV0T3ZlcnJpZGUgPSAKIFRlc3QgdGhhdCBzdHlsZSB0byBhbGwgY3VlcyBpcyBhcHBsaWVkIGNv cnJlY3RseS4KIEVWRU5UKGNhbnBsYXl0aHJvdWdoKQogRVZFTlQoc2Vla2VkKQpAQCAtMTYsNyAr MTYsNyBAQCBFWFBFQ1RFRCAoZ2V0Q29tcHV0ZWRTdHlsZSh0ZXh0VHJhY2tEaXNwCiAKICoqIEFk ZCBhbiBvdmVycmlkZSwgd2l0aG91dCAnIWltcG9ydGFudCcgKioKIFJVTihpbnRlcm5hbHMuc2V0 Q2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUoJ3ZpZGVvOjpjdWUgeyBjb2xvcjogYmx1ZTsgYmFj a2dyb3VuZC1jb2xvcjogeWVsbG93OyB9JykpCi1pbnRlcm5hbHMuY2FwdGlvbnNTdHlsZVNoZWV0 T3ZlcnJpZGUgPSBmdW5jdGlvbiBjYXB0aW9uc1N0eWxlU2hlZXRPdmVycmlkZSgpIHsgW25hdGl2 ZSBjb2RlXSB9CitpbnRlcm5hbHMuY2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUgPSB2aWRlbzo6 Y3VlIHsgY29sb3I6IGJsdWU7IGJhY2tncm91bmQtY29sb3I6IHllbGxvdzsgfQogRVhQRUNURUQg KGdldENvbXB1dGVkU3R5bGUodGV4dFRyYWNrRGlzcGxheUVsZW1lbnQodmlkZW8sICdjdWUnKSku Y29sb3IgPT0gJ3JnYigxMjgsIDAsIDEyOCknKSBPSwogRVhQRUNURUQgKGdldENvbXB1dGVkU3R5 bGUodGV4dFRyYWNrRGlzcGxheUVsZW1lbnQodmlkZW8sICdjdWUnKSkuYmFja2dyb3VuZENvbG9y ID09ICdyZ2IoMCwgMjU1LCAwKScpIE9LCiAKSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3RyYWNr L3RyYWNrLWNzcy11c2VyLW92ZXJyaWRlLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMv bWVkaWEvdHJhY2svdHJhY2stY3NzLXVzZXItb3ZlcnJpZGUuaHRtbAkocmV2aXNpb24gMjM5MDE0 KQorKysgTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svdHJhY2stY3NzLXVzZXItb3ZlcnJpZGUuaHRt bAkod29ya2luZyBjb3B5KQpAQCAtMzAsMzAgKzMwLDMyIEBACiAgICAgICAgICAgICAgICAgY29u c29sZVdyaXRlKCI8YnI+KiogQWRkIGFuIG92ZXJyaWRlLCB3aXRob3V0ICchaW1wb3J0YW50JyAq KiIpOwogICAgICAgICAgICAgICAgIGRvY3VtZW50LmJvZHkub2Zmc2V0VG9wOwogICAgICAgICAg ICAgICAgIHJ1bigiaW50ZXJuYWxzLnNldENhcHRpb25zU3R5bGVTaGVldE92ZXJyaWRlKCd2aWRl bzo6Y3VlIHsgY29sb3I6IGJsdWU7IGJhY2tncm91bmQtY29sb3I6IHllbGxvdzsgfScpIik7Ci0g ICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCJpbnRlcm5hbHMuY2FwdGlvbnNTdHlsZVNoZWV0 T3ZlcnJpZGUgPSAiICsgaW50ZXJuYWxzLmNhcHRpb25zU3R5bGVTaGVldE92ZXJyaWRlKTsKKyAg ICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoImludGVybmFscy5jYXB0aW9uc1N0eWxlU2hlZXRP dmVycmlkZSA9ICIgKyBpbnRlcm5hbHMuY2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUoKSk7CiAg ICAgICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5vZmZzZXRUb3A7CiAgICAgICAgICAgICAgICAg dGVzdEV4cGVjdGVkKCJnZXRDb21wdXRlZFN0eWxlKHRleHRUcmFja0Rpc3BsYXlFbGVtZW50KHZp ZGVvLCAnY3VlJykpLmNvbG9yIiwgInJnYigxMjgsIDAsIDEyOCkiKTsKICAgICAgICAgICAgICAg ICB0ZXN0RXhwZWN0ZWQoImdldENvbXB1dGVkU3R5bGUodGV4dFRyYWNrRGlzcGxheUVsZW1lbnQo dmlkZW8sICdjdWUnKSkuYmFja2dyb3VuZENvbG9yIiwgInJnYigwLCAyNTUsIDApIik7CiAKICAg ICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIjxicj4qKiBNYXJrIGJhY2tncm91bmQtY29sb3Ig JyFpbXBvcnRhbnQnICoqIik7CiAgICAgICAgICAgICAgICAgcnVuKCJpbnRlcm5hbHMuc2V0Q2Fw dGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUoJ3ZpZGVvOjpjdWUgeyBjb2xvcjogYmx1ZSA7IGJhY2tn cm91bmQtY29sb3I6IHllbGxvdyAhaW1wb3J0YW50OyB9JykiKTsKLSAgICAgICAgICAgICAgICBk b2N1bWVudC5ib2R5Lm9mZnNldFRvcDsKLSAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoImdl dENvbXB1dGVkU3R5bGUodGV4dFRyYWNrRGlzcGxheUVsZW1lbnQodmlkZW8sICdjdWUnKSkuY29s b3IiLCAicmdiKDEyOCwgMCwgMTI4KSIpOwotICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgi Z2V0Q29tcHV0ZWRTdHlsZSh0ZXh0VHJhY2tEaXNwbGF5RWxlbWVudCh2aWRlbywgJ2N1ZScpKS5i YWNrZ3JvdW5kQ29sb3IiLCAicmdiKDI1NSwgMjU1LCAwKSIpOwotCi0gICAgICAgICAgICAgICAg Y29uc29sZVdyaXRlKCI8YnI+KiogTWFyayBjb2xvciAnIWltcG9ydGFudCcgKioiKTsKLSAgICAg ICAgICAgICAgICBydW4oInN0eWxlc2hlZXQuaW5zZXJ0UnVsZSgndmlkZW86OmN1ZSB7IGNvbG9y OiBibHVlICFpbXBvcnRhbnQ7IGJhY2tncm91bmQtY29sb3I6IHllbGxvdyAgIWltcG9ydGFudDsg fScsIDApIik7Ci0gICAgICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5vZmZzZXRUb3A7Ci0gICAg ICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJnZXRDb21wdXRlZFN0eWxlKHRleHRUcmFja0Rpc3Bs YXlFbGVtZW50KHZpZGVvLCAnY3VlJykpLmNvbG9yIiwgInJnYigwLCAwLCAyNTUpIik7Ci0gICAg ICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJnZXRDb21wdXRlZFN0eWxlKHRleHRUcmFja0Rpc3Bs YXlFbGVtZW50KHZpZGVvLCAnY3VlJykpLmJhY2tncm91bmRDb2xvciIsICJyZ2IoMjU1LCAyNTUs IDApIik7Ci0KLSAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOwotICAgICAgICAgICAg ICAgIGVuZFRlc3QoKTsKKyAgICAgICAgICAgICAgICAvLyBUaGUgc3R5bGUgaXMgbm90IGltbWVk aWF0ZWx5IHVwZGF0ZWQsIHNjaGVkdWxlIHRoZSByZXN0IG9mIHRoZSB0ZXN0IHdpdGggYSB6ZXJv IHRpbWVvdXQgdGltZXIuCisgICAgICAgICAgICAgICAgc2V0VGltZW91dChmdW5jdGlvbigpIHsK KyAgICAgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJnZXRDb21wdXRlZFN0eWxlKHRleHRU cmFja0Rpc3BsYXlFbGVtZW50KHZpZGVvLCAnY3VlJykpLmNvbG9yIiwgInJnYigxMjgsIDAsIDEy OCkiKTsKKyAgICAgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJnZXRDb21wdXRlZFN0eWxl KHRleHRUcmFja0Rpc3BsYXlFbGVtZW50KHZpZGVvLCAnY3VlJykpLmJhY2tncm91bmRDb2xvciIs ICJyZ2IoMjU1LCAyNTUsIDApIik7CisKKyAgICAgICAgICAgICAgICAgICAgY29uc29sZVdyaXRl KCI8YnI+KiogTWFyayBjb2xvciAnIWltcG9ydGFudCcgKioiKTsKKyAgICAgICAgICAgICAgICAg ICAgcnVuKCJzdHlsZXNoZWV0Lmluc2VydFJ1bGUoJ3ZpZGVvOjpjdWUgeyBjb2xvcjogYmx1ZSAh aW1wb3J0YW50OyBiYWNrZ3JvdW5kLWNvbG9yOiB5ZWxsb3cgICFpbXBvcnRhbnQ7IH0nLCAwKSIp OworICAgICAgICAgICAgICAgICAgICBkb2N1bWVudC5ib2R5Lm9mZnNldFRvcDsKKyAgICAgICAg ICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJnZXRDb21wdXRlZFN0eWxlKHRleHRUcmFja0Rpc3Bs YXlFbGVtZW50KHZpZGVvLCAnY3VlJykpLmNvbG9yIiwgInJnYigwLCAwLCAyNTUpIik7CisgICAg ICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgiZ2V0Q29tcHV0ZWRTdHlsZSh0ZXh0VHJhY2tE aXNwbGF5RWxlbWVudCh2aWRlbywgJ2N1ZScpKS5iYWNrZ3JvdW5kQ29sb3IiLCAicmdiKDI1NSwg MjU1LCAwKSIpOworCisgICAgICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CisgICAg ICAgICAgICAgICAgICAgIGVuZFRlc3QoKTsKKyAgICAgICAgICAgICAgICB9LCAxMDApOwogICAg ICAgICAgICAgfQogCiAgICAgICAgICAgICBmdW5jdGlvbiBsb2FkZWQoKQogICAgICAgICAgICAg ewotY29uc29sZVdyaXRlKCI8YnI+aW50ZXJuYWxzLmNhcHRpb25zU3R5bGVTaGVldE92ZXJyaWRl ID0gIiArIGludGVybmFscy5jYXB0aW9uc1N0eWxlU2hlZXRPdmVycmlkZSk7CisgICAgICAgICAg ICAgICAgY29uc29sZVdyaXRlKCI8YnI+aW50ZXJuYWxzLmNhcHRpb25zU3R5bGVTaGVldE92ZXJy aWRlID0gIiArIGludGVybmFscy5jYXB0aW9uc1N0eWxlU2hlZXRPdmVycmlkZSgpKTsKIAogICAg ICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiVGVzdCB0aGF0IHN0eWxlIHRvIGFsbCBjdWVzIGlz IGFwcGxpZWQgY29ycmVjdGx5LiIpOwogICAgICAgICAgICAgICAgIGZpbmRNZWRpYUVsZW1lbnQo KTsKSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWN1ZS1jc3MtZXhwZWN0ZWQu aHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS90cmFjay90cmFjay1jdWUtY3Nz LWV4cGVjdGVkLmh0bWwJKHJldmlzaW9uIDIzOTAxNCkKKysrIExheW91dFRlc3RzL21lZGlhL3Ry YWNrL3RyYWNrLWN1ZS1jc3MtZXhwZWN0ZWQuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMTQsNiAr MTQsMTAgQEAKICAgICAgICAgICAgIGNvbG9yOiByZWQ7CiAgICAgICAgICAgICBmb250LXNpemU6 IDE1cHg7CiAgICAgICAgIH0KKyAgICAgICAgdmlkZW86OmN1ZSB7CisgICAgICAgICAgICBjb2xv cjogZ3JlZW47CisgICAgICAgICAgICBmb250LXNpemU6IDE1cHg7CisgICAgICAgIH0KICAgICAg ICAgPC9zdHlsZT4KICAgICAgICAgPHNjcmlwdD4KICAgICAgICAgZnVuY3Rpb24gc2Vla2VkKCkK SW5kZXg6IExheW91dFRlc3RzL21lZGlhL3RyYWNrL2NhcHRpb25zLXdlYnZ0dC9jc3Mtc3R5bGlu Zy52dHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svY2FwdGlvbnMtd2Vi dnR0L2Nzcy1zdHlsaW5nLnZ0dAkocmV2aXNpb24gMjM5MDE0KQorKysgTGF5b3V0VGVzdHMvbWVk aWEvdHJhY2svY2FwdGlvbnMtd2VidnR0L2Nzcy1zdHlsaW5nLnZ0dAkod29ya2luZyBjb3B5KQpA QCAtMTEsNiArMTEsMTIgQEAgY29sb3I6IHJlZDsKIGZvbnQtc2l6ZTogMTVweDsKIH0KIAorU1RZ TEUKK3ZpZGVvOjpjdWUgeworY29sb3I6IGdyZWVuOworZm9udC1zaXplOiAxNXB4OworfQorCiBo ZWxsbwogMDA6MDA6MDAuMDAwIC0tPiAwMDowMDoxMC4wMDAKLTxiPkhlbGxvPC9iPi4KKzxiPkhl bGxvPC9iPiBmaXJzdCBjdWUuCkluZGV4OiBMYXlvdXRUZXN0cy9tZWRpYS90cmFjay9jYXB0aW9u cy13ZWJ2dHQvbm8tY3NzLXN0eWxpbmcudnR0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL21l ZGlhL3RyYWNrL2NhcHRpb25zLXdlYnZ0dC9uby1jc3Mtc3R5bGluZy52dHQJKHJldmlzaW9uIDIz OTAxNCkKKysrIExheW91dFRlc3RzL21lZGlhL3RyYWNrL2NhcHRpb25zLXdlYnZ0dC9uby1jc3Mt c3R5bGluZy52dHQJKHdvcmtpbmcgY29weSkKQEAgLTIsNCArMiw0IEBAIFdFQlZUVAogCiBoZWxs bwogMDA6MDA6MDAuMDAwIC0tPiAwMDowMDoxMC4wMDAKLTxiPkhlbGxvPC9iPi4KKzxiPkhlbGxv PC9iPiBmaXJzdCBjdWUuCg==