43251 2010-07-30 08:00:44 -0700 Web Inspector: add support for DOM-style events to WebInspector Extensions API 2014-12-11 17:13:27 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED INVALID P2 Normal --- 0 caseq webkit-unassigned burg bweinstein joepeck keishi pfeldman pmuellr rik yurys oldest_to_newest 258197 0 caseq 2010-07-30 08:00:44 -0700 The extension API should support DOM-style events in addition to current Chrome-style event sinks, e.g. webInspector.resources.addEventListener("finish", eventHandler, false) as a counterpart for webInspector.resources.onFinished.addListener(callback). The eventHandler function should be passed a DOM Event object with properties specific to the event type. 260685 1 63605 caseq 2010-08-05 10:23:46 -0700 Created attachment 63605 patch More tests for different event types are coming. 261150 2 pfeldman 2010-08-06 01:31:17 -0700 Timothy, do you want to review this? 261315 3 63605 joepeck 2010-08-06 09:57:34 -0700 Comment on attachment 63605 patch > diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog > +++ b/LayoutTests/ChangeLog > + Web Inspector: added tests for event handling, updated expectations to include new API methods. > + https://bugs.webkit.org/show_bug.cgi?id=43344 I just glanced at this and felt I should not a couple things: 1) wrong bug number! The bug # for this was 43251 2) ChangeLogs have a typical format which tools like webkit-patch and prepare-ChangeLog will generate for you. Don't edit the bug title & link. If you have comments, put them beneath the bug link. Glancing at some of your other commits, it looks like you've been replacing the bug title with your comments. Not a big deal, just something I noticed. Examples of good style (on the front page of trac.webkit.org): http://trac.webkit.org/changeset/64855 http://trac.webkit.org/changeset/64852 327891 4 63605 pfeldman 2010-12-30 05:10:03 -0800 Comment on attachment 63605 patch Pending review for too long. Feel free to re-submit. 63605 2010-08-05 10:23:46 -0700 2010-12-30 05:10:03 -0800 patch extension-events.patch text/plain 16661 caseq ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyNTBmOWMzLi42Y2E3ZGQxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDgt MDUgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBhZGRlZCB0 ZXN0cyBmb3IgZXZlbnQgaGFuZGxpbmcsIHVwZGF0ZWQgZXhwZWN0ZWN0YXRpb25zIHRvIGluY2x1 ZGUgbmV3IEFQSSBtZXRob2RzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NDMzNDQKKworICAgICAgICAqIGluc3BlY3Rvci9leHRlbnNpb25zLWFwaS1l eHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL2V4dGVuc2lvbnMtZXZlbnRzLWV4cGVj dGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaW5zcGVjdG9yL2V4dGVuc2lvbnMtZXZlbnRzLmh0 bWw6IEFkZGVkLgorICAgICAgICAqIGluc3BlY3Rvci9leHRlbnNpb25zLWV4cGVjdGVkLnR4dDoK KyAgICAgICAgKiBpbnNwZWN0b3IvcmVzb3VyY2VzL2V4dGVuc2lvbi1tYWluLmpzOgorICAgICAg ICAoc2hhbGxvd0R1bXBQcm9wZXJ0aWVzKToKKyAgICAgICAgKGR1bXBFdmVudCk6CisKIDIwMTAt MDgtMDUgIFNhdGlzaCBTYW1wYXRoICA8c2F0aXNoQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBKZXJlbXkgT3Jsb3cuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvZXh0ZW5zaW9ucy1hcGktZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4 dGVuc2lvbnMtYXBpLWV4cGVjdGVkLnR4dAppbmRleCA4ZjFhMzJkLi45ZWRjY2U2IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZXh0ZW5zaW9ucy1hcGktZXhwZWN0ZWQudHh0Cisr KyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zLWFwaS1leHBlY3RlZC50eHQKQEAg LTE3LDE1ICsxNywzMiBAQCBSVU5OSU5HIFRFU1Q6IGV4dGVuc2lvbl90ZXN0QVBJCiAgICAgICAg ICAgICBhZGRMaXN0ZW5lciA6IDxmdW5jdGlvbj4KICAgICAgICAgICAgIHJlbW92ZUxpc3RlbmVy IDogPGZ1bmN0aW9uPgogICAgICAgICB9CisgICAgICAgIGFkZEV2ZW50TGlzdGVuZXIgOiA8ZnVu Y3Rpb24+CisgICAgICAgIHJlbW92ZUV2ZW50TGlzdGVuZXIgOiA8ZnVuY3Rpb24+CisgICAgICAg IGRpc3BhdGNoRXZlbnQgOiA8ZnVuY3Rpb24+CiAgICAgICAgIHJlbG9hZCA6IDxmdW5jdGlvbj4K ICAgICAgICAgZXZhbHVhdGUgOiA8ZnVuY3Rpb24+CiAgICAgfQogICAgIHBhbmVscyA6IHsKICAg ICAgICAgZWxlbWVudHMgOiB7CiAgICAgICAgICAgICBjcmVhdGVTaWRlYmFyUGFuZSA6IDxmdW5j dGlvbj4KKyAgICAgICAgICAgIG9uU2VsZWN0aW9uQ2hhbmdlZCA6IHsKKyAgICAgICAgICAgICAg ICBhZGRMaXN0ZW5lciA6IDxmdW5jdGlvbj4KKyAgICAgICAgICAgICAgICByZW1vdmVMaXN0ZW5l ciA6IDxmdW5jdGlvbj4KKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGFkZEV2ZW50TGlzdGVu ZXIgOiA8ZnVuY3Rpb24+CisgICAgICAgICAgICByZW1vdmVFdmVudExpc3RlbmVyIDogPGZ1bmN0 aW9uPgorICAgICAgICAgICAgZGlzcGF0Y2hFdmVudCA6IDxmdW5jdGlvbj4KICAgICAgICAgfQog ICAgICAgICBzY3JpcHRzIDogewogICAgICAgICAgICAgY3JlYXRlU2lkZWJhclBhbmUgOiA8ZnVu Y3Rpb24+CisgICAgICAgICAgICBvblNlbGVjdGlvbkNoYW5nZWQgOiB7CisgICAgICAgICAgICAg ICAgYWRkTGlzdGVuZXIgOiA8ZnVuY3Rpb24+CisgICAgICAgICAgICAgICAgcmVtb3ZlTGlzdGVu ZXIgOiA8ZnVuY3Rpb24+CisgICAgICAgICAgICB9CisgICAgICAgICAgICBhZGRFdmVudExpc3Rl bmVyIDogPGZ1bmN0aW9uPgorICAgICAgICAgICAgcmVtb3ZlRXZlbnRMaXN0ZW5lciA6IDxmdW5j dGlvbj4KKyAgICAgICAgICAgIGRpc3BhdGNoRXZlbnQgOiA8ZnVuY3Rpb24+CiAgICAgICAgIH0K ICAgICAgICAgY3JlYXRlIDogPGZ1bmN0aW9uPgogICAgIH0KQEAgLTM0LDYgKzUxLDkgQEAgUlVO TklORyBURVNUOiBleHRlbnNpb25fdGVzdEFQSQogICAgICAgICAgICAgYWRkTGlzdGVuZXIgOiA8 ZnVuY3Rpb24+CiAgICAgICAgICAgICByZW1vdmVMaXN0ZW5lciA6IDxmdW5jdGlvbj4KICAgICAg ICAgfQorICAgICAgICBhZGRFdmVudExpc3RlbmVyIDogPGZ1bmN0aW9uPgorICAgICAgICByZW1v dmVFdmVudExpc3RlbmVyIDogPGZ1bmN0aW9uPgorICAgICAgICBkaXNwYXRjaEV2ZW50IDogPGZ1 bmN0aW9uPgogICAgICAgICBnZXRBbGwgOiA8ZnVuY3Rpb24+CiAgICAgICAgIGdldCA6IDxmdW5j dGlvbj4KICAgICB9CkBAIC00MSw2ICs2MSw5IEBAIFJVTk5JTkcgVEVTVDogZXh0ZW5zaW9uX3Rl c3RBUEkKICAgICAgICAgYWRkTGlzdGVuZXIgOiA8ZnVuY3Rpb24+CiAgICAgICAgIHJlbW92ZUxp c3RlbmVyIDogPGZ1bmN0aW9uPgogICAgIH0KKyAgICBhZGRFdmVudExpc3RlbmVyIDogPGZ1bmN0 aW9uPgorICAgIHJlbW92ZUV2ZW50TGlzdGVuZXIgOiA8ZnVuY3Rpb24+CisgICAgZGlzcGF0Y2hF dmVudCA6IDxmdW5jdGlvbj4KICAgICBsb2cgOiA8ZnVuY3Rpb24+CiB9CiBBbGwgdGVzdHMgZG9u ZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zLWV2ZW50cy1l eHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZXh0ZW5zaW9ucy1ldmVudHMtZXhw ZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmZmNmYzZGEKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZXh0ZW5zaW9ucy1ldmVudHMt ZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTQgQEAKK1Rlc3RzIHB1YmxpYyBpbnRlcmZhY2Ugb2Yg V2ViSW5zcGVjdG9yIEV4dGVuc2lvbnMgQVBJCisKK1N0YXJ0ZWQgZXh0ZW5zaW9uLgorUnVubmlu ZyB0ZXN0cy4uLgorUlVOTklORyBURVNUOiBleHRlbnNpb25fdGVzdERPTUV2ZW50VGFyZ2V0Citb RXZlbnRUYXJnZXQgaGFuZGxlcl0gZ290IHJlc291cmNlOiBkb2N1bWVudAorICAgIHJlc291cmNl OiA8T2JqZWN0PgorUlVOTklORyBURVNUOiBleHRlbnNpb25fdGVzdEV2ZW50U2luaworW0V2ZW50 U2luayBoYW5kbGVyXSBnb3QgcmVzb3VyY2U6IGRvY3VtZW50CitSVU5OSU5HIFRFU1Q6IGV4dGVu c2lvbl90ZXN0SGFuZGxlcnNDb2V4aXN0CitoYW5kbGVyIGNhbGxiYWNrCitoYW5kbGVyIGNhbGxi YWNrCitBbGwgdGVzdHMgZG9uZS4KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2V4dGVuc2lvbnMtZXZlbnRzLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZXh0ZW5zaW9u cy1ldmVudHMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDc1NQppbmRleCAwMDAwMDAwLi5jM2I2ZWE2 Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMtZXZl bnRzLmh0bWwKQEAgLTAsMCArMSw3MyBAQAorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIu Li9odHRwL3Rlc3RzL2luc3BlY3Rvci9pbnNwZWN0b3ItdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2Ny aXB0IHNyYz0iZXh0ZW5zaW9ucy10ZXN0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgdHlwZT0idGV4 dC9qYXZhc2NyaXB0Ij4KKworZnVuY3Rpb24gZnJvbnRlbmRfZ2VuZXJhdGVSZXNvdXJjZUV2ZW50 KCkKK3sKKyAgICBmdW5jdGlvbiBwYXJzZUludDEwKHgpCisgICAgeworICAgICAgICByZXR1cm4g cGFyc2VJbnQoeCk7CisgICAgfQorICAgIHZhciBtaW5SZXNvdXJjZUlkID0gT2JqZWN0LnByb3Bl cnRpZXMoV2ViSW5zcGVjdG9yLnJlc291cmNlcykubWFwKHBhcnNlSW50MTApLnNvcnQoKS5zaGlm dCgpOworICAgIFdlYkluc3BlY3Rvci5leHRlbnNpb25TZXJ2ZXIubm90aWZ5UmVzb3VyY2VGaW5p c2hlZChXZWJJbnNwZWN0b3IucmVzb3VyY2VzW21pblJlc291cmNlSWRdKTsKK30KKworZnVuY3Rp b24gZXh0ZW5zaW9uX2dlbmVyYXRlUmVzb3VyY2VFdmVudCgpCit7CisgICAgd2ViSW5zcGVjdG9y Lmluc3BlY3RlZFdpbmRvdy5ldmFsdWF0ZSgiZXZhbHVhdGVJbldlYkluc3BlY3RvcignZnJvbnRl bmRfZ2VuZXJhdGVSZXNvdXJjZUV2ZW50KCknKSIpOworfQorCitmdW5jdGlvbiBleHRlbnNpb25f dGVzdEV2ZW50U2luayhuZXh0VGVzdCkKK3sKKyAgICBmdW5jdGlvbiBjYWxsYmFjayhyZXNvdXJj ZSkKKyAgICB7CisgICAgICAgIGxvZygiW0V2ZW50U2luayBoYW5kbGVyXSBnb3QgcmVzb3VyY2U6 ICIgKyByZXNvdXJjZS50eXBlKTsKKyAgICAgICAgd2ViSW5zcGVjdG9yLnJlc291cmNlcy5vbkZp bmlzaGVkLnJlbW92ZUxpc3RlbmVyKGNhbGxiYWNrKTsKKyAgICAgICAgbmV4dFRlc3QoKTsKKyAg ICB9CisgICAgd2ViSW5zcGVjdG9yLnJlc291cmNlcy5vbkZpbmlzaGVkLmFkZExpc3RlbmVyKGNh bGxiYWNrKTsKKyAgICBleHRlbnNpb25fZ2VuZXJhdGVSZXNvdXJjZUV2ZW50KCk7Cit9CisKK2Z1 bmN0aW9uIGV4dGVuc2lvbl90ZXN0RE9NRXZlbnRUYXJnZXQobmV4dFRlc3QpCit7CisgICAgZnVu Y3Rpb24gY2FsbGJhY2soZXZlbnQpCisgICAgeworICAgICAgICBsb2coIltFdmVudFRhcmdldCBo YW5kbGVyXSBnb3QgcmVzb3VyY2U6ICIgKyBldmVudC5yZXNvdXJjZS50eXBlKTsKKyAgICAgICAg ZHVtcEV2ZW50KGV2ZW50KTsKKyAgICAgICAgd2ViSW5zcGVjdG9yLnJlc291cmNlcy5yZW1vdmVF dmVudExpc3RlbmVyKCJmaW5pc2giLCBjYWxsYmFjaywgZmFsc2UpOworICAgICAgICBuZXh0VGVz dCgpOworICAgIH0KKyAgICB3ZWJJbnNwZWN0b3IucmVzb3VyY2VzLmFkZEV2ZW50TGlzdGVuZXIo ImZpbmlzaCIsIGNhbGxiYWNrLCBmYWxzZSk7CisgICAgZXh0ZW5zaW9uX2dlbmVyYXRlUmVzb3Vy Y2VFdmVudCgpOworfQorCitmdW5jdGlvbiBleHRlbnNpb25fdGVzdEhhbmRsZXJzQ29leGlzdChu ZXh0VGVzdCkKK3sKKyAgICB2YXIgY291bnQgPSAwOworICAgIGZ1bmN0aW9uIGNhbGxiYWNrKCkK KyAgICB7CisgICAgICAgIGNvdW50Kys7CisgICAgICAgIG91dHB1dCgiaGFuZGxlciBjYWxsYmFj ayIpOworICAgICAgICBpZiAoY291bnQgPiAyKQorICAgICAgICAgICAgb3V0cHV0KCJGQUlMOiBz dHJheSBldmVudCBoYW5kbGVyIGNhbGwiKTsKKyAgICAgICAgaWYgKGNvdW50ID09PSAyKSB7Cisg ICAgICAgICAgICB3ZWJJbnNwZWN0b3IucmVzb3VyY2VzLnJlbW92ZUV2ZW50TGlzdGVuZXIoImZp bmlzaCIsIGNhbGxiYWNrLCBmYWxzZSk7CisgICAgICAgICAgICB3ZWJJbnNwZWN0b3IucmVzb3Vy Y2VzLm9uRmluaXNoZWQucmVtb3ZlTGlzdGVuZXIoY2FsbGJhY2spOworICAgICAgICAgICAgd2Vi SW5zcGVjdG9yLnJlc291cmNlcy5vbkZpbmlzaGVkLmFkZExpc3RlbmVyKG5leHRUZXN0KTsKKyAg ICAgICAgICAgIGV4dGVuc2lvbl9nZW5lcmF0ZVJlc291cmNlRXZlbnQoKTsKKyAgICAgICAgfQor ICAgIH0KKyAgICB3ZWJJbnNwZWN0b3IucmVzb3VyY2VzLmFkZEV2ZW50TGlzdGVuZXIoImZpbmlz aCIsIGNhbGxiYWNrLCBmYWxzZSk7CisgICAgd2ViSW5zcGVjdG9yLnJlc291cmNlcy5vbkZpbmlz aGVkLmFkZExpc3RlbmVyKGNhbGxiYWNrKTsKKyAgICBleHRlbnNpb25fZ2VuZXJhdGVSZXNvdXJj ZUV2ZW50KCk7Cit9CisKKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgb25sb2FkPSJvbmxvYWQo KSI+Cis8cD5UZXN0cyBwdWJsaWMgaW50ZXJmYWNlIG9mIFdlYkluc3BlY3RvciBFeHRlbnNpb25z IEFQSTwvcD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9leHRlbnNpb25zLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRl bnNpb25zLWV4cGVjdGVkLnR4dAppbmRleCA2ODhjNjY2Li5kNTE5ODA3IDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvZXh0ZW5zaW9ucy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMtZXhwZWN0ZWQudHh0CkBAIC03LDYgKzcsMTMgQEAg ZG9uZSBjcmVhdGVQYW5lbAogUGFuZWwgY3JlYXRlZAogewogICAgIGNyZWF0ZVNpZGViYXJQYW5l IDogPGZ1bmN0aW9uPgorICAgIG9uU2VsZWN0aW9uQ2hhbmdlZCA6IHsKKyAgICAgICAgYWRkTGlz dGVuZXIgOiA8ZnVuY3Rpb24+CisgICAgICAgIHJlbW92ZUxpc3RlbmVyIDogPGZ1bmN0aW9uPgor ICAgIH0KKyAgICBhZGRFdmVudExpc3RlbmVyIDogPGZ1bmN0aW9uPgorICAgIHJlbW92ZUV2ZW50 TGlzdGVuZXIgOiA8ZnVuY3Rpb24+CisgICAgZGlzcGF0Y2hFdmVudCA6IDxmdW5jdGlvbj4KICAg ICBvblNlYXJjaCA6IHsKICAgICAgICAgYWRkTGlzdGVuZXIgOiA8ZnVuY3Rpb24+CiAgICAgICAg IHJlbW92ZUxpc3RlbmVyIDogPGZ1bmN0aW9uPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL3Jlc291cmNlcy9leHRlbnNpb24tbWFpbi5qcyBiL0xheW91dFRlc3RzL2luc3BlY3Rv ci9yZXNvdXJjZXMvZXh0ZW5zaW9uLW1haW4uanMKaW5kZXggOWJjNmJiMy4uYWM3NmFmYyAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlcy9leHRlbnNpb24tbWFpbi5q cworKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2VzL2V4dGVuc2lvbi1tYWluLmpz CkBAIC02Myw0ICs2MywyNiBAQCBmdW5jdGlvbiBvdXRwdXQobXNnKQogICAgIGxvZyhtc2cpOwog fQogCitmdW5jdGlvbiBzaGFsbG93RHVtcFByb3BlcnRpZXMob2JqKQoreworICAgIGZvciAodmFy IHByb3AgaW4gb2JqKSB7CisgICAgICAgIHZhciBwcm9wVHlwZSA9IHR5cGVvZiBvYmpbcHJvcF07 CisgICAgICAgIGlmIChwcm9wVHlwZSA9PT0gIm9iamVjdCIpCisgICAgICAgICAgICBwcm9wVHlw ZSA9IG9ialtwcm9wXS5jb25zdHJ1Y3Rvci5uYW1lOworICAgICAgICBvdXRwdXQoIiAgICAiICsg cHJvcCArICI6IDwiICsgcHJvcFR5cGUgKyAiPiIpOworICAgIH0KK30KKworZnVuY3Rpb24gZHVt cEV2ZW50KGV2ZW50KQoreworICAgIHZhciBiYXJlRXZlbnQgPSBkb2N1bWVudC5jcmVhdGVFdmVu dCgiRXZlbnQiKTsKKyAgICB2YXIgcHJvcHNUb0R1bXAgPSB7fTsKKworICAgIGZvciAodmFyIHBy b3AgaW4gZXZlbnQpIHsKKyAgICAgICAgaWYgKCEocHJvcCBpbiBiYXJlRXZlbnQpKQorICAgICAg ICAgICAgcHJvcHNUb0R1bXBbcHJvcF0gPSBldmVudFtwcm9wXTsKKyAgICB9CisgICAgc2hhbGxv d0R1bXBQcm9wZXJ0aWVzKHByb3BzVG9EdW1wKTsKK30KKwogZmV0Y2hUZXN0cygpOwpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4MGZhMzM0 Li4xMmQ2ODk5IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0No YW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDEwLTA4LTA1ICBBbmRyZXkgS29zeWFrb3YgIDxj YXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWRkZWQgc3VwcG9ydCBmb3IgRE9NLWNvbXBhdGli bGUgZXZlbnQgaGFuZGxlcnMgdG8gSW5zcGVjdG9yIEV4dGVuc2lvbnMgQVBJLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDMzNDQKKworICAgICAgICBU ZXN0OiBpbnNwZWN0b3IvZXh0ZW5zaW9ucy1ldmVudHMuaHRtbAorCisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9FeHRlbnNpb25BUEkuanM6CisgICAgICAgIChpbmplY3RlZEV4dGVuc2lv bkFQSS5FdmVudFRhcmdldEltcGwpOgorICAgICAgICAoaW5qZWN0ZWRFeHRlbnNpb25BUEkuRXZl bnRUYXJnZXRJbXBsLnByb3RvdHlwZS5hZGRFdmVudExpc3RlbmVyKToKKyAgICAgICAgKGluamVj dGVkRXh0ZW5zaW9uQVBJLkV2ZW50VGFyZ2V0SW1wbC5wcm90b3R5cGUuZGlzcGF0Y2hFdmVudCk6 CisgICAgICAgIChpbmplY3RlZEV4dGVuc2lvbkFQSS5FdmVudFRhcmdldEltcGwucHJvdG90eXBl LnJlbW92ZUV2ZW50TGlzdGVuZXIpOgorICAgICAgICAoaW5qZWN0ZWRFeHRlbnNpb25BUEkuRXZl bnRUYXJnZXRJbXBsLnByb3RvdHlwZS5hZGRUeXBlKToKKyAgICAgICAgKGluamVjdGVkRXh0ZW5z aW9uQVBJLkV2ZW50VGFyZ2V0SW1wbC5wcm90b3R5cGUuYmluZCk6CisgICAgICAgIChpbmplY3Rl ZEV4dGVuc2lvbkFQSS5FdmVudERpc3BhdGNoZXIpOgorICAgICAgICAoaW5qZWN0ZWRFeHRlbnNp b25BUEkuRXZlbnREaXNwYXRjaGVyLnByb3RvdHlwZS5hZGRFdmVudExpc3RlbmVyKToKKyAgICAg ICAgKGluamVjdGVkRXh0ZW5zaW9uQVBJLkV2ZW50RGlzcGF0Y2hlci5wcm90b3R5cGUucmVtb3Zl RXZlbnRMaXN0ZW5lcik6CisgICAgICAgIChpbmplY3RlZEV4dGVuc2lvbkFQSS5FdmVudERpc3Bh dGNoZXIucHJvdG90eXBlLmRpc3BhdGNoRXZlbnQpOgorICAgICAgICAoaW5qZWN0ZWRFeHRlbnNp b25BUEkuRXZlbnREaXNwYXRjaGVyLnByb3RvdHlwZS5fdHJhbnNsYXRlQW5kRGlzcGF0Y2gpOgor ICAgICAgICAoaW5qZWN0ZWRFeHRlbnNpb25BUEkuUmVzb3VyY2VzLmJ1aWxkRmluaXNoRXZlbnQp OgorICAgICAgICAoaW5qZWN0ZWRFeHRlbnNpb25BUEkpOgorICAgICAgICAoaW5qZWN0ZWRFeHRl bnNpb25BUEkuUGFuZWxJbXBsKToKKyAgICAgICAgKGluamVjdGVkRXh0ZW5zaW9uQVBJLlBhbmVs LmJ1aWxkU2VsZWN0RXZlbnQpOgorICAgICAgICAoaW5qZWN0ZWRFeHRlbnNpb25BUEkuRXh0ZW5z aW9uUGFuZWwuYnVpbGRTZWFyY2hFdmVudCk6CisgICAgICAgIChpbmplY3RlZEV4dGVuc2lvbkFQ SS5FeHRlbnNpb25QYW5lbCk6CisgICAgICAgIChpbmplY3RlZEV4dGVuc2lvbkFQSS5JbnNwZWN0 ZWRXaW5kb3cuYnVpbGROYXZpZ2F0ZUV2ZW50KToKKyAgICAgICAgKGluamVjdGVkRXh0ZW5zaW9u QVBJLkluc3BlY3RlZFdpbmRvdy5ldmVudFRhcmdldCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9FeHRlbnNpb25TZXJ2ZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRXh0ZW5z aW9uU2VydmVyLnByb3RvdHlwZS5ub3RpZnlJbnNwZWN0ZWRVUkxDaGFuZ2VkKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5FeHRlbnNpb25TZXJ2ZXIucHJvdG90eXBlLl9jb252ZXJ0UmVzb3VyY2Up OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLmluc3BlY3RlZFVSTENoYW5nZWQpOgorCiAyMDEwLTA4LTA1ICBYYW4gTG9w ZXogIDx4bG9wZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHdXN0YXZvIE5v cm9uaGEuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9u QVBJLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvbkFQSS5qcwppbmRl eCA0NzZhNDYzLi40MTRlZjcwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRXh0ZW5zaW9uQVBJLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRl bnNpb25BUEkuanMKQEAgLTgxLDEyICs4MSwxMDIgQEAgZnVuY3Rpb24gRXZlbnRTaW5rKHR5cGUp CiAgICAgdGhpcy5yZW1vdmVMaXN0ZW5lciA9IGJpbmQoaW1wbC5yZW1vdmVMaXN0ZW5lciwgaW1w bCk7CiB9CiAKK2Z1bmN0aW9uIEV2ZW50VGFyZ2V0SW1wbCgpCit7CisgICAgdGhpcy5fZGlzcGF0 Y2hlcnMgPSB7fTsKK30KKworRXZlbnRUYXJnZXRJbXBsLnByb3RvdHlwZSA9IHsKKyAgICBhZGRF dmVudExpc3RlbmVyOiBmdW5jdGlvbih0eXBlLCBjYWxsYmFjaywgdXNlQ2FwdHVyZSkKKyAgICB7 CisgICAgICAgIHZhciBkaXNwYXRjaGVyID0gdGhpcy5fZGlzcGF0Y2hlcnNbdHlwZV07CisgICAg ICAgIGlmIChkaXNwYXRjaGVyKQorICAgICAgICAgICAgZGlzcGF0Y2hlci5hZGRFdmVudExpc3Rl bmVyKGNhbGxiYWNrLCB1c2VDYXB0dXJlKTsKKyAgICB9LAorCisgICAgZGlzcGF0Y2hFdmVudDog ZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB2YXIgZGlzcGF0Y2hlciA9IHRoaXMuX2Rp c3BhdGNoZXJzW3R5cGVdOworICAgICAgICBpZiAoZGlzcGF0Y2hlcikKKyAgICAgICAgICAgIGRp c3BhdGNoZXIuZGlzcGF0Y2hFdmVudChldmVudCk7CisgICAgfSwKKworICAgIHJlbW92ZUV2ZW50 TGlzdGVuZXI6IGZ1bmN0aW9uKHR5cGUsIGNhbGxiYWNrLCB1c2VDYXB0dXJlKQorICAgIHsKKyAg ICAgICAgdmFyIGRpc3BhdGNoZXIgPSB0aGlzLl9kaXNwYXRjaGVyc1t0eXBlXTsKKyAgICAgICAg aWYgKGRpc3BhdGNoZXIpCisgICAgICAgICAgICBkaXNwYXRjaGVyLnJlbW92ZUV2ZW50TGlzdGVu ZXIoY2FsbGJhY2ssIHVzZUNhcHR1cmUpOworICAgIH0sCisKKyAgICBhZGRUeXBlOiBmdW5jdGlv bih0eXBlLCBzaW5rLCBldmVudEJ1aWxkZXIpCisgICAgeworICAgICAgICB0aGlzLl9kaXNwYXRj aGVyc1t0eXBlXSA9IG5ldyBFdmVudERpc3BhdGNoZXIodHlwZSwgc2luaywgZXZlbnRCdWlsZGVy KTsKKyAgICB9LAorCisgICAgYmluZDogZnVuY3Rpb24odGhhdCkKKyAgICB7CisgICAgICAgIHRo YXQuYWRkRXZlbnRMaXN0ZW5lciA9IGJpbmQodGhpcy5hZGRFdmVudExpc3RlbmVyLCB0aGlzKTsK KyAgICAgICAgdGhhdC5yZW1vdmVFdmVudExpc3RlbmVyID0gYmluZCh0aGlzLnJlbW92ZUV2ZW50 TGlzdGVuZXIsIHRoaXMpOworICAgICAgICB0aGF0LmRpc3BhdGNoRXZlbnQgPSBiaW5kKHRoaXMu ZGlzcGF0Y2hFdmVudCwgdGhpcyk7CisgICAgfQorfQorCitmdW5jdGlvbiBFdmVudERpc3BhdGNo ZXIodHlwZSwgc2luaywgZXZlbnRCdWlsZGVyKQoreworICAgIHRoaXMuX3R5cGUgPSB0eXBlOwor ICAgIHRoaXMuX3NpbmsgPSBzaW5rOworICAgIHRoaXMuX2V2ZW50QnVpbGRlciA9IGV2ZW50QnVp bGRlcjsKKyAgICB0aGlzLl9zdWJzY3JpYmVycyA9IFtdOworICAgIC8vIFdlIGNhbid0IGJpbmQg aXQgb24gdGhlIGZseSwgYXMgd2UgbmVlZCBzYW1lIGluc3RhbmNlIGZvciB1bnN1YnNjcmliaW5n LgorICAgIHRoaXMuX2JvdW5kVHJhbnNsYXRlQW5kRGlzcGF0Y2ggPSBiaW5kKHRoaXMuX3RyYW5z bGF0ZUFuZERpc3BhdGNoLCB0aGlzKTsKK30KKworRXZlbnREaXNwYXRjaGVyLnByb3RvdHlwZSA9 IHsKKyAgICBhZGRFdmVudExpc3RlbmVyOiBmdW5jdGlvbihjYWxsYmFjaywgdXNlQ2FwdHVyZSkK KyAgICB7CisgICAgICAgIGlmICghdGhpcy5fc3Vic2NyaWJlcnMubGVuZ3RoKQorICAgICAgICAg ICAgdGhpcy5fc2luay5hZGRMaXN0ZW5lcih0aGlzLl9ib3VuZFRyYW5zbGF0ZUFuZERpc3BhdGNo KTsKKyAgICAgICAgdGhpcy5fc3Vic2NyaWJlcnMucHVzaCh7IGNhbGxiYWNrOiBjYWxsYmFjaywg dXNlQ2FwdHVyZTogdXNlQ2FwdHVyZSB9KTsKKyAgICB9LAorCisgICAgcmVtb3ZlRXZlbnRMaXN0 ZW5lcjogZnVuY3Rpb24oY2FsbGJhY2ssIHVzZUNhcHR1cmUpCisgICAgeworICAgICAgICBmb3Ig KHZhciBpID0gMDsgaSA8IHRoaXMuX3N1YnNjcmliZXJzLmxlbmd0aDspIHsKKyAgICAgICAgICAg IHZhciBzdWJzY3JpYmVyID0gdGhpcy5fc3Vic2NyaWJlcnNbaV07CisgICAgICAgICAgICBpZiAo c3Vic2NyaWJlci5jYWxsYmFjayA9PT0gY2FsbGJhY2sgJiYgc3Vic2NyaWJlci51c2VDYXB0dXJl ID09PSB1c2VDYXB0dXJlKQorICAgICAgICAgICAgICAgIHRoaXMuX3N1YnNjcmliZXJzLnNwbGlj ZShpLCAxKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICArK2k7CisgICAgICAg IH0KKyAgICAgICAgaWYgKCF0aGlzLl9zdWJzY3JpYmVycy5sZW5ndGgpCisgICAgICAgICAgICB0 aGlzLl9zaW5rLnJlbW92ZUxpc3RlbmVyKHRoaXMuX2JvdW5kVHJhbnNsYXRlQW5kRGlzcGF0Y2gp OworICAgIH0sCisKKyAgICBkaXNwYXRjaEV2ZW50OiBmdW5jdGlvbihldmVudCkKKyAgICB7Cisg ICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fc3Vic2NyaWJlcnMubGVuZ3RoOyArK2kp CisgICAgICAgICAgICB0aGlzLl9zdWJzY3JpYmVyc1tpXS5jYWxsYmFjay5jYWxsKG51bGwsIGV2 ZW50KTsKKyAgICB9LAorCisgICAgX3RyYW5zbGF0ZUFuZERpc3BhdGNoOiBmdW5jdGlvbigpCisg ICAgeworICAgICAgICB2YXIgZXZlbnQgPSBkb2N1bWVudC5jcmVhdGVFdmVudCgiRXZlbnQiKTsK KyAgICAgICAgZXZlbnQuaW5pdEV2ZW50KHRoaXMuX3R5cGUpOworICAgICAgICB0aGlzLl9ldmVu dEJ1aWxkZXIuYXBwbHkoZXZlbnQsIGFyZ3VtZW50cyk7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hF dmVudChldmVudCk7CisgICAgfQorfTsKKwogZnVuY3Rpb24gSW5zcGVjdG9yRXh0ZW5zaW9uQVBJ KCkKIHsKICAgICB0aGlzLmluc3BlY3RlZFdpbmRvdyA9IG5ldyBJbnNwZWN0ZWRXaW5kb3coKTsK ICAgICB0aGlzLnBhbmVscyA9IG5ldyBQYW5lbHMoKTsKICAgICB0aGlzLnJlc291cmNlcyA9IG5l dyBSZXNvdXJjZXMoKTsKICAgICB0aGlzLm9uUmVzZXQgPSBuZXcgRXZlbnRTaW5rKCJyZXNldCIp OworICAgIAorICAgIHZhciBldmVudFRhcmdldCA9IG5ldyBFdmVudFRhcmdldEltcGwoKTsKKyAg ICBldmVudFRhcmdldC5hZGRUeXBlKCJyZXNldCIsIHRoaXMub25SZXNldCwgZnVuY3Rpb24oKSB7 fSk7CisgICAgZXZlbnRUYXJnZXQuYmluZCh0aGlzKTsKIH0KIAogSW5zcGVjdG9yRXh0ZW5zaW9u QVBJLnByb3RvdHlwZSA9IHsKQEAgLTk5LDYgKzE4OSwxNCBAQCBJbnNwZWN0b3JFeHRlbnNpb25B UEkucHJvdG90eXBlID0gewogZnVuY3Rpb24gUmVzb3VyY2VzKCkKIHsKICAgICB0aGlzLm9uRmlu aXNoZWQgPSBuZXcgRXZlbnRTaW5rKCJyZXNvdXJjZS1maW5pc2hlZCIpOworCisgICAgdmFyIGV2 ZW50VGFyZ2V0ID0gbmV3IEV2ZW50VGFyZ2V0SW1wbCgpOworICAgIGZ1bmN0aW9uIGJ1aWxkRmlu aXNoRXZlbnQocmVzb3VyY2UpCisgICAgeworICAgICAgICB0aGlzLnJlc291cmNlID0gcmVzb3Vy Y2U7CisgICAgfQorICAgIGV2ZW50VGFyZ2V0LmFkZFR5cGUoImZpbmlzaCIsIHRoaXMub25GaW5p c2hlZCwgYnVpbGRGaW5pc2hFdmVudCk7CisgICAgZXZlbnRUYXJnZXQuYmluZCh0aGlzKTsKIH0K IAogUmVzb3VyY2VzLnByb3RvdHlwZSA9IHsKQEAgLTE2MCw3ICsyNTgsNiBAQCBQYW5lbHMucHJv dG90eXBlID0gewogZnVuY3Rpb24gUGFuZWxJbXBsKGlkKQogewogICAgIHRoaXMuX2lkID0gaWQ7 Ci0gICAgdGhpcy5vblNlbGVjdGlvbkNoYW5nZWQgPSBuZXcgRXZlbnRTaW5rKCJwYW5lbC1vYmpl Y3RTZWxlY3RlZC0iICsgaWQpOwogfQogCiBQYW5lbEltcGwucHJvdG90eXBlID0gewpAQCAtMTgy LDEyICsyNzksMzIgQEAgZnVuY3Rpb24gUGFuZWwoaWQpCiB7CiAgICAgdmFyIGltcGwgPSBuZXcg UGFuZWxJbXBsKGlkKTsKICAgICB0aGlzLmNyZWF0ZVNpZGViYXJQYW5lID0gYmluZChpbXBsLmNy ZWF0ZVNpZGViYXJQYW5lLCBpbXBsKTsKKyAgICB0aGlzLm9uU2VsZWN0aW9uQ2hhbmdlZCA9IG5l dyBFdmVudFNpbmsoInBhbmVsLW9iamVjdFNlbGVjdGVkLSIgKyBpZCk7CisKKyAgICB2YXIgZXZl bnRUYXJnZXQgPSBuZXcgRXZlbnRUYXJnZXRJbXBsKCk7CisgICAgZnVuY3Rpb24gYnVpbGRTZWxl Y3RFdmVudChvYmplY3RUeXBlLCBvYmplY3RJZCkKKyAgICB7CisgICAgICAgIHRoaXMub2JqZWN0 VHlwZSA9IG9iamVjdFR5cGU7CisgICAgICAgIHRoaXMub2JqZWN0SWQgPSBvYmplY3RJZDsKKyAg ICB9CisgICAgZXZlbnRUYXJnZXQuYWRkVHlwZSgic2VsZWN0IiwgdGhpcy5vblNlbGVjdGlvbkNo YW5nZWQsIGJ1aWxkU2VsZWN0RXZlbnQpOworICAgIGV2ZW50VGFyZ2V0LmJpbmQodGhpcyk7CiB9 CiAKIGZ1bmN0aW9uIEV4dGVuc2lvblBhbmVsKGlkKQogewogICAgIFBhbmVsLmNhbGwodGhpcywg aWQpOwogICAgIHRoaXMub25TZWFyY2ggPSBuZXcgRXZlbnRTaW5rKCJwYW5lbC1zZWFyY2gtIiAr IGlkKTsKKworICAgIHZhciBldmVudFRhcmdldCA9IG5ldyBFdmVudFRhcmdldEltcGwoKTsKKyAg ICBmdW5jdGlvbiBidWlsZFNlYXJjaEV2ZW50KGFjdGlvbiwgc2VhcmNoU3RyaW5nKQorICAgIHsK KyAgICAgICAgdGhpcy5hY3Rpb24gPSBhY3Rpb247CisgICAgICAgIGlmIChzZWFyY2hTdHJpbmcp CisgICAgICAgICAgICB0aGlzLnNlYXJjaFN0cmluZyA9IHNlYXJjaFN0cmluZzsKKyAgICB9Cisg ICAgZXZlbnRUYXJnZXQuYWRkVHlwZSgic2VhcmNoIiwgdGhpcy5vblNlYXJjaCwgYnVpbGRTZWFy Y2hFdmVudCk7CisgICAgZXZlbnRUYXJnZXQuYmluZCh0aGlzKTsKIH0KIAogRXh0ZW5zaW9uUGFu ZWwucHJvdG90eXBlID0gewpAQCAtMjI0LDYgKzM0MSwxNiBAQCBmdW5jdGlvbiBJbnNwZWN0ZWRX aW5kb3coKQogICAgIHRoaXMub25Mb2FkZWQgPSBuZXcgRXZlbnRTaW5rKCJpbnNwZWN0ZWRQYWdl TG9hZGVkIik7CiAgICAgdGhpcy5vbk5hdmlnYXRlZCA9IG5ldyBFdmVudFNpbmsoImluc3BlY3Rl ZFVSTENoYW5nZWQiKTsKICAgICB0aGlzLm9uRE9NQ29udGVudExvYWRlZCA9IG5ldyBFdmVudFNp bmsoIkRPTUNvbnRlbnRMb2FkZWQiKTsKKworICAgIHZhciBldmVudFRhcmdldCA9IG5ldyBFdmVu dFRhcmdldEltcGwoKTsKKyAgICBmdW5jdGlvbiBidWlsZE5hdmlnYXRlRXZlbnQodXJsKQorICAg IHsKKyAgICAgICAgdGhpcy51cmwgPSB1cmw7CisgICAgfQorICAgIGV2ZW50VGFyZ2V0LmFkZFR5 cGUoImxvYWQiLCB0aGlzLm9uTG9hZGVkLCBmdW5jdGlvbigpIHt9KTsKKyAgICBldmVudFRhcmdl dC5hZGRUeXBlKCJuYXZpZ2F0ZSIsIHRoaXMub25OYXZpZ2F0ZWQsIGJ1aWxkTmF2aWdhdGVFdmVu dCk7CisgICAgZXZlbnRUYXJnZXQuYWRkVHlwZSgiRE9NTG9hZCIsIHRoaXMub25ET01Db250ZW50 TG9hZGVkLCBmdW5jdGlvbigpIHt9KTsKKyAgICBldmVudFRhcmdldC5iaW5kKHRoaXMpOwogfQog CiBJbnNwZWN0ZWRXaW5kb3cucHJvdG90eXBlID0gewpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9FeHRlbnNpb25TZXJ2ZXIuanMKaW5kZXggNWI1YTE2OS4uMTY4OWU2YyAxMDA2NDQK LS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcworKysg Yi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzCkBAIC03NCw5 ICs3NCw5IEBAIFdlYkluc3BlY3Rvci5FeHRlbnNpb25TZXJ2ZXIucHJvdG90eXBlID0gewogICAg ICAgICB0aGlzLl9wb3N0Tm90aWZpY2F0aW9uKCJpbnNwZWN0ZWRQYWdlTG9hZGVkIik7CiAgICAg fSwKIAotICAgIG5vdGlmeUluc3BlY3RlZFVSTENoYW5nZWQ6IGZ1bmN0aW9uKCkKKyAgICBub3Rp ZnlJbnNwZWN0ZWRVUkxDaGFuZ2VkOiBmdW5jdGlvbih1cmwpCiAgICAgewotICAgICAgICB0aGlz Ll9wb3N0Tm90aWZpY2F0aW9uKCJpbnNwZWN0ZWRVUkxDaGFuZ2VkIik7CisgICAgICAgIHRoaXMu X3Bvc3ROb3RpZmljYXRpb24oImluc3BlY3RlZFVSTENoYW5nZWQiLCB1cmwpOwogICAgIH0sCiAK ICAgICBub3RpZnlJbnNwZWN0b3JSZXNldDogZnVuY3Rpb24oKQpAQCAtODgsOCArODgsOCBAQCBX ZWJJbnNwZWN0b3IuRXh0ZW5zaW9uU2VydmVyLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAg IHJldHVybiB7CiAgICAgICAgICAgICBpZDogcmVzb3VyY2UuaWRlbnRpZmllciwKLSAgICAgICAg ICAgIHR5cGU6IHJlc291cmNlLnR5cGUsCi0gICAgICAgICAgICBoYXI6IChuZXcgV2ViSW5zcGVj dG9yLkhBUkVudHJ5KHJlc291cmNlKSkuYnVpbGQoKSwKKyAgICAgICAgICAgIHR5cGU6IFdlYklu c3BlY3Rvci5SZXNvdXJjZS5UeXBlLnRvU3RyaW5nKHJlc291cmNlLnR5cGUpLAorICAgICAgICAg ICAgaGFyOiAobmV3IFdlYkluc3BlY3Rvci5IQVJFbnRyeShyZXNvdXJjZSkpLmJ1aWxkKCkKICAg ICAgICAgfTsKICAgICB9LAogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvaW5zcGVjdG9yLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5q cwppbmRleCA5ZDQxNzY2Li40MjFiMWMzIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvaW5zcGVjdG9yLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuanMKQEAgLTE0NDcsNyArMTQ0Nyw3IEBAIFdlYkluc3BlY3Rvci5icmluZ1RvRnJv bnQgPSBmdW5jdGlvbigpCiBXZWJJbnNwZWN0b3IuaW5zcGVjdGVkVVJMQ2hhbmdlZCA9IGZ1bmN0 aW9uKHVybCkKIHsKICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QuaW5zcGVjdGVkVVJMQ2hhbmdl ZCh1cmwpOwotICAgIHRoaXMuZXh0ZW5zaW9uU2VydmVyLm5vdGlmeUluc3BlY3RlZFVSTENoYW5n ZWQoKTsKKyAgICB0aGlzLmV4dGVuc2lvblNlcnZlci5ub3RpZnlJbnNwZWN0ZWRVUkxDaGFuZ2Vk KHVybCk7CiB9CiAKIFdlYkluc3BlY3Rvci5yZXNvdXJjZVVSTENoYW5nZWQgPSBmdW5jdGlvbihy ZXNvdXJjZSwgb2xkVVJMKQo=