57763 2011-04-04 10:23:45 -0700 Web Inspector: [Extensions API] remove inspectedPage.* events 2011-04-06 01:27:28 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 caseq caseq apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik yurys oldest_to_newest 378861 0 caseq 2011-04-04 10:23:45 -0700 - remove onDOMContentLoaded & onLoaded events (native browser extensions should be used instead) - moved onNavigated to webInspecor.resources 378867 1 88077 caseq 2011-04-04 10:31:21 -0700 Created attachment 88077 patch 379373 2 88077 yurys 2011-04-05 01:35:36 -0700 Comment on attachment 88077 patch View in context: https://bugs.webkit.org/attachment.cgi?id=88077&action=review > Source/WebCore/inspector/front-end/ExtensionAPI.js:114 > + this.onNavigated = new EventSink("inspectedURLChanged"); Is there a test for this event? > Source/WebCore/inspector/front-end/ExtensionAPISchema.json:170 > + "name": "callback", Looks unrelated to this change. 379637 3 88253 caseq 2011-04-05 09:29:27 -0700 Created attachment 88253 patch - the schema change is intended (just a drive-by fix to bring it in-sync with the code) - added test 379688 4 88253 yurys 2011-04-05 09:59:59 -0700 Comment on attachment 88253 patch View in context: https://bugs.webkit.org/attachment.cgi?id=88253&action=review > LayoutTests/inspector/extensions/extensions-events-expected.txt:8 > +Navigated to: file:///E:/src/gchromium/src/third_party/WebKit/LayoutTests/inspector/extensions/extensions-events.html?navigated Test result is source-path dependent, r- for this. 379697 5 88266 caseq 2011-04-05 10:08:00 -0700 Created attachment 88266 patch oops, thanks for spotting this! 380207 6 caseq 2011-04-06 01:27:28 -0700 Manually committed r83033: http://trac.webkit.org/changeset/83033 88077 2011-04-04 10:31:21 -0700 2011-04-05 09:29:27 -0700 patch page-events.diff text/plain 8917 caseq ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkMzU5MDllLi42YjYzMTc5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDQt MDQgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBbRXh0ZW5z aW9ucyBBUEldIHJlbW92ZSBpbnNwZWN0ZWRQYWdlLiogZXZlbnRzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Nzc2MworCisgICAgICAgIC0gUmVtb3Zl ZCB3ZWJJbnNwZWN0b3IuaW5zcGVjdGVkUGFnZS4qIGV2ZW50cworICAgICAgICAtIG1vdmVkIG9u TmF2aWdhdGVkIHRvIHdlYkluc3BlY3Rvci5yZXNvdXJjZXMKKworICAgICAgICAqIGluc3BlY3Rv ci9leHRlbnNpb25zL2V4dGVuc2lvbnMtYXBpLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNw ZWN0b3IvZXh0ZW5zaW9ucy9leHRlbnNpb25zLWV2ZW50cy1leHBlY3RlZC50eHQ6CisgICAgICAg ICogaW5zcGVjdG9yL2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1ldmVudHMuaHRtbDoKKwogMjAxMS0w NC0wNCAgSmVzc2llIEJlcmxpbiAgPGpiZXJsaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92 ZSBhIHRlc3QgZnJvbSB0aGUgd2luLXdrMiBza2lwcGVkIGxpc3QgdGhhdCBkb2VzIG5vdCBleGlz dC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zL2V4dGVuc2lv bnMtYXBpLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zL2V4 dGVuc2lvbnMtYXBpLWV4cGVjdGVkLnR4dAppbmRleCA1Mzc3ZDM2Li41ZjI5NWY3IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZXh0ZW5zaW9ucy9leHRlbnNpb25zLWFwaS1leHBl Y3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMvZXh0ZW5zaW9u cy1hcGktZXhwZWN0ZWQudHh0CkBAIC04LDE4ICs4LDYgQEAgUlVOTklORyBURVNUOiBleHRlbnNp b25fdGVzdEFQSQogICAgICAgICBhZGRDYXRlZ29yeSA6IDxmdW5jdGlvbj4KICAgICB9CiAgICAg aW5zcGVjdGVkV2luZG93IDogewotICAgICAgICBvbkRPTUNvbnRlbnRMb2FkZWQgOiB7Ci0gICAg ICAgICAgICBhZGRMaXN0ZW5lciA6IDxmdW5jdGlvbj4KLSAgICAgICAgICAgIHJlbW92ZUxpc3Rl bmVyIDogPGZ1bmN0aW9uPgotICAgICAgICB9Ci0gICAgICAgIG9uTG9hZGVkIDogewotICAgICAg ICAgICAgYWRkTGlzdGVuZXIgOiA8ZnVuY3Rpb24+Ci0gICAgICAgICAgICByZW1vdmVMaXN0ZW5l ciA6IDxmdW5jdGlvbj4KLSAgICAgICAgfQotICAgICAgICBvbk5hdmlnYXRlZCA6IHsKLSAgICAg ICAgICAgIGFkZExpc3RlbmVyIDogPGZ1bmN0aW9uPgotICAgICAgICAgICAgcmVtb3ZlTGlzdGVu ZXIgOiA8ZnVuY3Rpb24+Ci0gICAgICAgIH0KICAgICAgICAgcmVsb2FkIDogPGZ1bmN0aW9uPgog ICAgICAgICBldmFsIDogPGZ1bmN0aW9uPgogICAgIH0KQEAgLTQ2LDYgKzM0LDEwIEBAIFJVTk5J TkcgVEVTVDogZXh0ZW5zaW9uX3Rlc3RBUEkKICAgICAgICAgICAgIGFkZExpc3RlbmVyIDogPGZ1 bmN0aW9uPgogICAgICAgICAgICAgcmVtb3ZlTGlzdGVuZXIgOiA8ZnVuY3Rpb24+CiAgICAgICAg IH0KKyAgICAgICAgb25OYXZpZ2F0ZWQgOiB7CisgICAgICAgICAgICBhZGRMaXN0ZW5lciA6IDxm dW5jdGlvbj4KKyAgICAgICAgICAgIHJlbW92ZUxpc3RlbmVyIDogPGZ1bmN0aW9uPgorICAgICAg ICB9CiAgICAgICAgIGdldEhBUiA6IDxmdW5jdGlvbj4KICAgICAgICAgYWRkUmVxdWVzdEhlYWRl cnMgOiA8ZnVuY3Rpb24+CiAgICAgfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1ldmVudHMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1ldmVudHMtZXhwZWN0ZWQudHh0CmluZGV4 IGUxNGZjN2UuLjZiMmExZTAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRl bnNpb25zL2V4dGVuc2lvbnMtZXZlbnRzLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvZXh0ZW5zaW9ucy9leHRlbnNpb25zLWV2ZW50cy1leHBlY3RlZC50eHQKQEAgLTYs MTAgKzYsNiBAQCBSVU5OSU5HIFRFU1Q6IGV4dGVuc2lvbl90ZXN0T25SZXNvdXJjZUZpbmlzaGVk CiBvbkZpbmlzaGVkIGZpcmVkCiBSVU5OSU5HIFRFU1Q6IGV4dGVuc2lvbl90ZXN0T25TZWxlY3Rp b25DaGFuZ2VkCiBvblNlbGVjdGlvbkNoYW5nZWQgZmlyZWQKLVJVTk5JTkcgVEVTVDogZXh0ZW5z aW9uX3Rlc3RQYWdlTG9hZEV2ZW50cwotUGFnZSByZWxvYWRlZC4KLW9uRE9NQ29udGVudExvYWRl ZCBmaXJlZDogbnVtYmVyCi1vbkxvYWRlZCBmaXJlZDogbnVtYmVyCiBSVU5OSU5HIFRFU1Q6IGV4 dGVuc2lvbl90ZXN0UGFuZWxTaG93SGlkZQogR290IG9uSGlkZGVuIGV2ZW50IGZvciBwYW5lbCBl bGVtZW50cwogR290IG9uU2hvd24gZXZlbnQgZm9yIHBhbmVsIGV4dGVuc2lvbgpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1ldmVudHMuaHRt bCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zL2V4dGVuc2lvbnMtZXZlbnRzLmh0 bWwKaW5kZXggOGRjOTlkZC4uYzRiN2I3NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1ldmVudHMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvZXh0ZW5zaW9ucy9leHRlbnNpb25zLWV2ZW50cy5odG1sCkBAIC0yOCwzNCArMjgs NiBAQCBmdW5jdGlvbiBleHRlbnNpb25fdGVzdE9uUmVzb3VyY2VGaW5pc2hlZChuZXh0VGVzdCkK ICAgICB3ZWJJbnNwZWN0b3IuaW5zcGVjdGVkV2luZG93LmV2YWwoInZhciB4aHIgPSBuZXcgWE1M SHR0cFJlcXVlc3QoKTsgeGhyLm9wZW4oJ0dFVCcsICciICsgbG9jYXRpb24uaHJlZiArICInLCBm YWxzZSk7IHhoci5zZW5kKG51bGwpOyIpOwogfQogCi1mdW5jdGlvbiBleHRlbnNpb25fdGVzdFBh Z2VMb2FkRXZlbnRzKG5leHRUZXN0KQotewotICAgIHZhciBxdWV1ZWRPdXRwdXQgPSBbXTsKLQot ICAgIC8vIExvZ2dpbmcgb24gb25Mb2FkZWQgaXMgdHJpY2t5IGR1ZSB0byByYWNlIGNvbmRpdGlv bnMgd2l0aCBvdXRwdXQoIlBhZ2UgcmVsb2FkZWQiKSBpbiBwYWdlIGluaXRpYWxpemF0aW9uIGNv ZGUuCi0gICAgLy8gU28gb25seSBsb2cgd2hlbiB3ZSdyZSBzdXJlIGFsbCBoYW5kbGVycyBhcmUg Y2FsbGVkIGFuZCByZWxvYWQgaXMgZG9uZS4KLSAgICBmdW5jdGlvbiBxdWV1ZU91dHB1dEFuZENv bnRpbnVlKG1lc3NhZ2UpCi0gICAgewotICAgICAgICBxdWV1ZWRPdXRwdXQucHVzaChtZXNzYWdl KTsKLSAgICAgICAgaWYgKHF1ZXVlZE91dHB1dC5sZW5ndGggIT0gMykKLSAgICAgICAgICAgIHJl dHVybjsKLSAgICAgICAgZm9yIChpID0gMDsgaSA8IHF1ZXVlZE91dHB1dC5sZW5ndGg7ICsraSkg ewotICAgICAgICAgICAgaWYgKHF1ZXVlZE91dHB1dFtpXSkKLSAgICAgICAgICAgICAgICBvdXRw dXQocXVldWVkT3V0cHV0W2ldKTsKLSAgICAgICAgfQotICAgICAgICBuZXh0VGVzdCgpOwotICAg IH0KLQotICAgIHdlYkluc3BlY3Rvci5pbnNwZWN0ZWRXaW5kb3cub25ET01Db250ZW50TG9hZGVk LmFkZExpc3RlbmVyKGZ1bmN0aW9uKHRpbWUpIHsKLSAgICAgICAgcXVldWVPdXRwdXRBbmRDb250 aW51ZSgib25ET01Db250ZW50TG9hZGVkIGZpcmVkOiAiICsgdHlwZW9mIHRpbWUpOwotICAgIH0p OwotCi0gICAgd2ViSW5zcGVjdG9yLmluc3BlY3RlZFdpbmRvdy5vbkxvYWRlZC5hZGRMaXN0ZW5l cihmdW5jdGlvbih0aW1lKSB7Ci0gICAgICAgIHF1ZXVlT3V0cHV0QW5kQ29udGludWUoIm9uTG9h ZGVkIGZpcmVkOiAiICsgdHlwZW9mIHRpbWUpOwotICAgIH0pOwotICAgIGRpc3BhdGNoT25Gcm9u dGVuZCh7IGNvbW1hbmQ6ICJyZWxvYWQiIH0sIHF1ZXVlT3V0cHV0QW5kQ29udGludWUpOwotfQot CiBmdW5jdGlvbiBleHRlbnNpb25fdGVzdFBhbmVsU2hvd0hpZGUobmV4dFRlc3QpCiB7CiAgICAg dmFyIGxpc3RlbmVyc1RvQ2xlYW51cCA9IFtdOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDE3OTVlNmMuLjk0NWNi NmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMS0wNC0wNCAgQW5kcmV5IEtvc3lh a292ICA8Y2FzZXFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtFeHRlbnNpb25zIEFQSV0gcmVtb3Zl IGluc3BlY3RlZFBhZ2UuKiBldmVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTU3NzYzCisKKyAgICAgICAgLSBSZW1vdmVkIHdlYkluc3BlY3Rvci5p bnNwZWN0ZWRQYWdlLiogZXZlbnRzCisgICAgICAgIC0gbW92ZWQgb25OYXZpZ2F0ZWQgdG8gd2Vi SW5zcGVjdG9yLnJlc291cmNlcworCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRl bnNpb25BUEkuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuaW5qZWN0ZWRFeHRlbnNpb25BUEkp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLmluamVjdGVkRXh0ZW5zaW9uQVBJLkluc3BlY3RlZFdp bmRvdyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25BUElTY2hlbWEu anNvbjoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qczoK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5kb21Db250ZW50RXZlbnRGaXJlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu bG9hZEV2ZW50RmlyZWQpOgorCiAyMDExLTA0LTA0ICBTZXJnaW8gVmlsbGFyIFNlbmluICA8c3Zp bGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcnRpbiBSb2JpbnNvbi4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9u QVBJLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25BUEku anMKaW5kZXggYmFiNWYxOC4uOTQwZTM0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25BUEkuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25BUEkuanMKQEAgLTExMSw2ICsxMTEsNyBAQCBmdW5j dGlvbiBSZXNvdXJjZXMoKQogICAgICAgICB0aGlzLl9maXJlKHJlc291cmNlKTsKICAgICB9CiAg ICAgdGhpcy5vbkZpbmlzaGVkID0gbmV3IEV2ZW50U2luaygicmVzb3VyY2UtZmluaXNoZWQiLCBy ZXNvdXJjZURpc3BhdGNoKTsKKyAgICB0aGlzLm9uTmF2aWdhdGVkID0gbmV3IEV2ZW50U2luaygi aW5zcGVjdGVkVVJMQ2hhbmdlZCIpOwogfQogCiBSZXNvdXJjZXMucHJvdG90eXBlID0gewpAQCAt MzU2LDkgKzM1Nyw2IEBAIEF1ZGl0UmVzdWx0Tm9kZS5wcm90b3R5cGUgPSB7CiAKIGZ1bmN0aW9u IEluc3BlY3RlZFdpbmRvdygpCiB7Ci0gICAgdGhpcy5vbkRPTUNvbnRlbnRMb2FkZWQgPSBuZXcg RXZlbnRTaW5rKCJpbnNwZWN0ZWRQYWdlRE9NQ29udGVudExvYWRlZCIpOwotICAgIHRoaXMub25M b2FkZWQgPSBuZXcgRXZlbnRTaW5rKCJpbnNwZWN0ZWRQYWdlTG9hZGVkIik7Ci0gICAgdGhpcy5v bk5hdmlnYXRlZCA9IG5ldyBFdmVudFNpbmsoImluc3BlY3RlZFVSTENoYW5nZWQiKTsKIH0KIAog SW5zcGVjdGVkV2luZG93LnByb3RvdHlwZSA9IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uQVBJU2NoZW1hLmpzb24gYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvbkFQSVNjaGVtYS5qc29uCmluZGV4IDUy NmZkNDEuLjFhZGIyZDcgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRXh0ZW5zaW9uQVBJU2NoZW1hLmpzb24KKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9FeHRlbnNpb25BUElTY2hlbWEuanNvbgpAQCAtMTY1LDEyICsxNjUsMjAg QEAKICAgICAgICAgICAgICJuYW1lIjogInBhZ2VVUkwiLAogICAgICAgICAgICAgInR5cGUiOiAi c3RyaW5nIiwKICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJBbiBVUkwgb2YgdGhlIHBhZ2Ug dGhhdCByZXByZXNlbnRzIHRoaXMgcGFuZWwuIgorICAgICAgICAgIH0uCisgICAgICAgICAgeyAK KyAgICAgICAgICAgICJuYW1lIjogImNhbGxiYWNrIiwKKyAgICAgICAgICAgICJ0eXBlIjogImZ1 bmN0aW9uIiwKKyAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJBIGZ1bmN0aW9uIHRoYXQgaXMg Y2FsbGVkIHVwb24gcmVxdWVzdCBjb21wbGV0aW9uLiIsCisgICAgICAgICAgICAicGFyYW1ldGVy cyI6IFsKKyAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICJuYW1lIjogInBhbmVsIiwK KyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiQW4gRXh0ZW5zaW9uUGFuZWwgb2JqZWN0 IHJlcHJlc2VudGluZyB0aGUgY3JlYXRlZCBwYW5lbC4iLAorICAgICAgICAgICAgICAgICIkcmVm IjogIkV4dGVuc2lvblBhbmVsIgorICAgICAgICAgICAgICB9CisgICAgICAgICAgICBdCiAgICAg ICAgICAgfQotICAgICAgICBdLAotICAgICAgICAicmV0dXJucyIgOiB7Ci0gICAgICAgICAgIiRy ZWYiOiAiRXh0ZW5zaW9uUGFuZWwiLAotICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJBIHBhbmVs IHRoYXQgd2FzIGNyZWF0ZWQuIgotICAgICAgICB9CisgICAgICAgIF0KICAgICAgIH0KICAgICBd CiAgIH0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4 dGVuc2lvblNlcnZlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0 ZW5zaW9uU2VydmVyLmpzCmluZGV4IGQ1MjBmZDkuLmYwYmUzZDEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzCkBAIC03 OSwxNiArNzksNiBAQCBXZWJJbnNwZWN0b3IuRXh0ZW5zaW9uU2VydmVyLnByb3RvdHlwZSA9IHsK ICAgICAgICAgdGhpcy5fcG9zdE5vdGlmaWNhdGlvbigicGFuZWwtaGlkZGVuLSIgKyBwYW5lbElk KTsKICAgICB9LAogCi0gICAgbm90aWZ5UGFnZUxvYWRlZDogZnVuY3Rpb24obWlsbGlzZWNvbmRz KQotICAgIHsKLSAgICAgICAgdGhpcy5fcG9zdE5vdGlmaWNhdGlvbigiaW5zcGVjdGVkUGFnZUxv YWRlZCIsIG1pbGxpc2Vjb25kcyk7Ci0gICAgfSwKLQotICAgIG5vdGlmeVBhZ2VET01Db250ZW50 TG9hZGVkOiBmdW5jdGlvbihtaWxsaXNlY29uZHMpCi0gICAgewotICAgICAgICB0aGlzLl9wb3N0 Tm90aWZpY2F0aW9uKCJpbnNwZWN0ZWRQYWdlRE9NQ29udGVudExvYWRlZCIsIG1pbGxpc2Vjb25k cyk7Ci0gICAgfSwKLQogICAgIG5vdGlmeUluc3BlY3RlZFVSTENoYW5nZWQ6IGZ1bmN0aW9uKCkK ICAgICB7CiAgICAgICAgIHRoaXMuX3Bvc3ROb3RpZmljYXRpb24oImluc3BlY3RlZFVSTENoYW5n ZWQiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5z cGVjdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu anMKaW5kZXggNTM2YTgwNi4uMjlmYmQ5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKQEAgLTk4OSw3ICs5ODksNiBAQCBXZWJJbnNwZWN0 b3IuZG9tQ29udGVudEV2ZW50RmlyZWQgPSBmdW5jdGlvbih0aW1lKQogICAgIHRoaXMucGFuZWxz LmF1ZGl0cy5tYWluUmVzb3VyY2VET01Db250ZW50VGltZSA9IHRpbWU7CiAgICAgaWYgKHRoaXMu cGFuZWxzLm5ldHdvcmspCiAgICAgICAgIHRoaXMucGFuZWxzLm5ldHdvcmsubWFpblJlc291cmNl RE9NQ29udGVudFRpbWUgPSB0aW1lOwotICAgIHRoaXMuZXh0ZW5zaW9uU2VydmVyLm5vdGlmeVBh Z2VET01Db250ZW50TG9hZGVkKCh0aW1lIC0gV2ViSW5zcGVjdG9yLm1haW5SZXNvdXJjZS5zdGFy dFRpbWUpICogMTAwMCk7CiAgICAgdGhpcy5tYWluUmVzb3VyY2VET01Db250ZW50VGltZSA9IHRp bWU7CiB9CiAKQEAgLTk5OCw3ICs5OTcsNiBAQCBXZWJJbnNwZWN0b3IubG9hZEV2ZW50RmlyZWQg PSBmdW5jdGlvbih0aW1lKQogICAgIHRoaXMucGFuZWxzLmF1ZGl0cy5tYWluUmVzb3VyY2VMb2Fk VGltZSA9IHRpbWU7CiAgICAgdGhpcy5wYW5lbHMubmV0d29yay5tYWluUmVzb3VyY2VMb2FkVGlt ZSA9IHRpbWU7CiAgICAgdGhpcy5wYW5lbHMucmVzb3VyY2VzLmxvYWRFdmVudEZpcmVkKCk7Ci0g ICAgdGhpcy5leHRlbnNpb25TZXJ2ZXIubm90aWZ5UGFnZUxvYWRlZCgodGltZSAtIFdlYkluc3Bl Y3Rvci5tYWluUmVzb3VyY2Uuc3RhcnRUaW1lKSAqIDEwMDApOwogICAgIHRoaXMubWFpblJlc291 cmNlTG9hZFRpbWUgPSB0aW1lOwogfQogCg== 88253 2011-04-05 09:29:27 -0700 2011-04-05 10:08:00 -0700 patch page-events.diff text/plain 13081 caseq ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzZmZkNTRjLi4zNmQ4YWRkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDQt MDUgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtIFJlbW92ZWQgd2ViSW5zcGVjdG9y Lmluc3BlY3RlZFBhZ2UuKiBldmVudHMKKyAgICAgICAgLSBtb3ZlZCBvbk5hdmlnYXRlZCB0byB3 ZWJJbnNwZWN0b3IucmVzb3VyY2VzCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogW0V4dGVuc2lv bnMgQVBJXSByZW1vdmUgaW5zcGVjdGVkUGFnZS4qIGV2ZW50cworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTc3NjMKKworICAgICAgICAqIGh0dHAvdGVz dHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMtdGVzdC5qczoKKyAgICAgICAgKGluaXRpYWxpemVfRXh0 ZW5zaW9uc1Rlc3QucnVuV2hlblBhZ2VMb2Fkcyk6CisgICAgICAgICogaHR0cC90ZXN0cy9pbnNw ZWN0b3IvaW5zcGVjdG9yLXRlc3QuanM6CisgICAgICAgIChpbml0aWFsaXplX0luc3BlY3RvclRl c3QuSW5zcGVjdG9yVGVzdC5ydW5XaGVuUGFnZUxvYWRzLmNoYWluZWRDYWxsYmFjayk6CisgICAg ICAgIChpbml0aWFsaXplX0luc3BlY3RvclRlc3QuSW5zcGVjdG9yVGVzdC5ydW5XaGVuUGFnZUxv YWRzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZXh0ZW5zaW9ucy9leHRlbnNpb25zLWFwaS1leHBl Y3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1ldmVu dHMtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9leHRlbnNpb25zL2V4dGVuc2lv bnMtZXZlbnRzLmh0bWw6CisKIDIwMTEtMDQtMDUgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxv dkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0IGJhZCByZWJhc2Vs aW5lIG9mIGVuZ2xpc2gtbHItdGV4dC1leHBlY3RlZC5odG1sIGluIHI4MjkxOC4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMtdGVzdC5qcyBi L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMtdGVzdC5qcwppbmRl eCBlY2FjOWEzLi5mZjYxYTIxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2lu c3BlY3Rvci9leHRlbnNpb25zLXRlc3QuanMKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9p bnNwZWN0b3IvZXh0ZW5zaW9ucy10ZXN0LmpzCkBAIC04NCw2ICs4NCwxNCBAQCBmdW5jdGlvbiBy ZWxvYWRQYWdlKGRhdGEsIHBvcnQpCiB9CiBJbnNwZWN0b3JUZXN0LmRpc3BhdGNoT25NZXNzYWdl KCJyZWxvYWQiLCByZWxvYWRQYWdlLCB0cnVlKTsKIAorZnVuY3Rpb24gcnVuV2hlblBhZ2VMb2Fk cyhkYXRhLCBwb3J0KQoreworICAgIEluc3BlY3RvclRlc3QucnVuV2hlblBhZ2VMb2FkcyhmdW5j dGlvbigpIHsKKyAgICAgICAgcG9ydC5wb3N0TWVzc2FnZSgiIik7CisgICAgfSk7Cit9CitJbnNw ZWN0b3JUZXN0LmRpc3BhdGNoT25NZXNzYWdlKCJydW4td2hlbi1wYWdlLWxvYWRzIiwgcnVuV2hl blBhZ2VMb2FkcywgdHJ1ZSk7CisKIH0KIAogdmFyIHRlc3QgPSBmdW5jdGlvbigpCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9pbnNwZWN0b3ItdGVzdC5qcyBi L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2luc3BlY3Rvci10ZXN0LmpzCmluZGV4 IDFlNzA3Y2EuLmY0NDY2OWIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5z cGVjdG9yL2luc3BlY3Rvci10ZXN0LmpzCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5z cGVjdG9yL2luc3BlY3Rvci10ZXN0LmpzCkBAIC0xNTEsNiArMTUxLDE4IEBAIEluc3BlY3RvclRl c3QucGFnZVJlbG9hZGVkID0gZnVuY3Rpb24oKQogICAgIH0KIH0KIAorSW5zcGVjdG9yVGVzdC5y dW5XaGVuUGFnZUxvYWRzID0gZnVuY3Rpb24oY2FsbGJhY2spCit7CisgICAgdmFyIG9sZENhbGxi YWNrID0gSW5zcGVjdG9yVGVzdC5fcmVsb2FkUGFnZUNhbGxiYWNrOworICAgIGZ1bmN0aW9uIGNo YWluZWRDYWxsYmFjaygpCisgICAgeworICAgICAgICBpZiAob2xkQ2FsbGJhY2spCisgICAgICAg ICAgICBvbGRDYWxsYmFjaygpOworICAgICAgICBjYWxsYmFjaygpOworICAgIH0KKyAgICBJbnNw ZWN0b3JUZXN0Ll9yZWxvYWRQYWdlQ2FsbGJhY2sgPSBJbnNwZWN0b3JUZXN0LnNhZmVXcmFwKGNo YWluZWRDYWxsYmFjayk7Cit9CisKIEluc3BlY3RvclRlc3QucnVuQWZ0ZXJQZW5kaW5nRGlzcGF0 Y2hlcyA9IGZ1bmN0aW9uKGNhbGxiYWNrKQogewogICAgIGNhbGxiYWNrID0gSW5zcGVjdG9yVGVz dC5zYWZlV3JhcChjYWxsYmFjayk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv ZXh0ZW5zaW9ucy9leHRlbnNpb25zLWFwaS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZXh0ZW5zaW9ucy9leHRlbnNpb25zLWFwaS1leHBlY3RlZC50eHQKaW5kZXggNTM3N2Qz Ni4uNWYyOTVmNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMv ZXh0ZW5zaW9ucy1hcGktZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9l eHRlbnNpb25zL2V4dGVuc2lvbnMtYXBpLWV4cGVjdGVkLnR4dApAQCAtOCwxOCArOCw2IEBAIFJV Tk5JTkcgVEVTVDogZXh0ZW5zaW9uX3Rlc3RBUEkKICAgICAgICAgYWRkQ2F0ZWdvcnkgOiA8ZnVu Y3Rpb24+CiAgICAgfQogICAgIGluc3BlY3RlZFdpbmRvdyA6IHsKLSAgICAgICAgb25ET01Db250 ZW50TG9hZGVkIDogewotICAgICAgICAgICAgYWRkTGlzdGVuZXIgOiA8ZnVuY3Rpb24+Ci0gICAg ICAgICAgICByZW1vdmVMaXN0ZW5lciA6IDxmdW5jdGlvbj4KLSAgICAgICAgfQotICAgICAgICBv bkxvYWRlZCA6IHsKLSAgICAgICAgICAgIGFkZExpc3RlbmVyIDogPGZ1bmN0aW9uPgotICAgICAg ICAgICAgcmVtb3ZlTGlzdGVuZXIgOiA8ZnVuY3Rpb24+Ci0gICAgICAgIH0KLSAgICAgICAgb25O YXZpZ2F0ZWQgOiB7Ci0gICAgICAgICAgICBhZGRMaXN0ZW5lciA6IDxmdW5jdGlvbj4KLSAgICAg ICAgICAgIHJlbW92ZUxpc3RlbmVyIDogPGZ1bmN0aW9uPgotICAgICAgICB9CiAgICAgICAgIHJl bG9hZCA6IDxmdW5jdGlvbj4KICAgICAgICAgZXZhbCA6IDxmdW5jdGlvbj4KICAgICB9CkBAIC00 Niw2ICszNCwxMCBAQCBSVU5OSU5HIFRFU1Q6IGV4dGVuc2lvbl90ZXN0QVBJCiAgICAgICAgICAg ICBhZGRMaXN0ZW5lciA6IDxmdW5jdGlvbj4KICAgICAgICAgICAgIHJlbW92ZUxpc3RlbmVyIDog PGZ1bmN0aW9uPgogICAgICAgICB9CisgICAgICAgIG9uTmF2aWdhdGVkIDogeworICAgICAgICAg ICAgYWRkTGlzdGVuZXIgOiA8ZnVuY3Rpb24+CisgICAgICAgICAgICByZW1vdmVMaXN0ZW5lciA6 IDxmdW5jdGlvbj4KKyAgICAgICAgfQogICAgICAgICBnZXRIQVIgOiA8ZnVuY3Rpb24+CiAgICAg ICAgIGFkZFJlcXVlc3RIZWFkZXJzIDogPGZ1bmN0aW9uPgogICAgIH0KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zL2V4dGVuc2lvbnMtZXZlbnRzLWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zL2V4dGVuc2lvbnMtZXZlbnRz LWV4cGVjdGVkLnR4dAppbmRleCBlMTRmYzdlLi5jMzIxMGU0IDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvZXh0ZW5zaW9ucy9leHRlbnNpb25zLWV2ZW50cy1leHBlY3RlZC50eHQK KysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1ldmVudHMt ZXhwZWN0ZWQudHh0CkBAIC0yLDE0ICsyLDE1IEBAIFRlc3RzIFdlYkluc3BlY3RvciBleHRlbnNp b24gQVBJCiAKIFN0YXJ0ZWQgZXh0ZW5zaW9uLgogUnVubmluZyB0ZXN0cy4uLgorUlVOTklORyBU RVNUOiBleHRlbnNpb25fdGVzdE9uTmF2aWdhdGVkCitQYWdlIHJlbG9hZGVkLgorUGFnZSByZWxv YWRlZC4KK05hdmlnYXRlZCB0bzogZmlsZTovLy9FOi9zcmMvZ2Nocm9taXVtL3NyYy90aGlyZF9w YXJ0eS9XZWJLaXQvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1l dmVudHMuaHRtbD9uYXZpZ2F0ZWQKK05hdmlnYXRlZCB0bzogZmlsZTovLy9FOi9zcmMvZ2Nocm9t aXVtL3NyYy90aGlyZF9wYXJ0eS9XZWJLaXQvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lv bnMvZXh0ZW5zaW9ucy1ldmVudHMuaHRtbAogUlVOTklORyBURVNUOiBleHRlbnNpb25fdGVzdE9u UmVzb3VyY2VGaW5pc2hlZAogb25GaW5pc2hlZCBmaXJlZAogUlVOTklORyBURVNUOiBleHRlbnNp b25fdGVzdE9uU2VsZWN0aW9uQ2hhbmdlZAogb25TZWxlY3Rpb25DaGFuZ2VkIGZpcmVkCi1SVU5O SU5HIFRFU1Q6IGV4dGVuc2lvbl90ZXN0UGFnZUxvYWRFdmVudHMKLVBhZ2UgcmVsb2FkZWQuCi1v bkRPTUNvbnRlbnRMb2FkZWQgZmlyZWQ6IG51bWJlcgotb25Mb2FkZWQgZmlyZWQ6IG51bWJlcgog UlVOTklORyBURVNUOiBleHRlbnNpb25fdGVzdFBhbmVsU2hvd0hpZGUKIEdvdCBvbkhpZGRlbiBl dmVudCBmb3IgcGFuZWwgZWxlbWVudHMKIEdvdCBvblNob3duIGV2ZW50IGZvciBwYW5lbCBleHRl bnNpb24KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zL2V4dGVu c2lvbnMtZXZlbnRzLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZXh0ZW5zaW9ucy9leHRl bnNpb25zLWV2ZW50cy5odG1sCmluZGV4IDhkYzk5ZGQuLmRhM2RiNjMgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zL2V4dGVuc2lvbnMtZXZlbnRzLmh0bWwKKysr IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1ldmVudHMuaHRt bApAQCAtMjgsMzIgKzI4LDM5IEBAIGZ1bmN0aW9uIGV4dGVuc2lvbl90ZXN0T25SZXNvdXJjZUZp bmlzaGVkKG5leHRUZXN0KQogICAgIHdlYkluc3BlY3Rvci5pbnNwZWN0ZWRXaW5kb3cuZXZhbCgi dmFyIHhociA9IG5ldyBYTUxIdHRwUmVxdWVzdCgpOyB4aHIub3BlbignR0VUJywgJyIgKyBsb2Nh dGlvbi5ocmVmICsgIicsIGZhbHNlKTsgeGhyLnNlbmQobnVsbCk7Iik7CiB9CiAKLWZ1bmN0aW9u IGV4dGVuc2lvbl90ZXN0UGFnZUxvYWRFdmVudHMobmV4dFRlc3QpCitmdW5jdGlvbiBleHRlbnNp b25fdGVzdE9uTmF2aWdhdGVkKG5leHRUZXN0KQogewotICAgIHZhciBxdWV1ZWRPdXRwdXQgPSBb XTsKKyAgICB2YXIgdXJscyA9IFtdOworICAgIHZhciBsb2FkQ291bnQgPSAwOwogCi0gICAgLy8g TG9nZ2luZyBvbiBvbkxvYWRlZCBpcyB0cmlja3kgZHVlIHRvIHJhY2UgY29uZGl0aW9ucyB3aXRo IG91dHB1dCgiUGFnZSByZWxvYWRlZCIpIGluIHBhZ2UgaW5pdGlhbGl6YXRpb24gY29kZS4KLSAg ICAvLyBTbyBvbmx5IGxvZyB3aGVuIHdlJ3JlIHN1cmUgYWxsIGhhbmRsZXJzIGFyZSBjYWxsZWQg YW5kIHJlbG9hZCBpcyBkb25lLgotICAgIGZ1bmN0aW9uIHF1ZXVlT3V0cHV0QW5kQ29udGludWUo bWVzc2FnZSkKKyAgICBmdW5jdGlvbiBvbkxvYWQoKQogICAgIHsKLSAgICAgICAgcXVldWVkT3V0 cHV0LnB1c2gobWVzc2FnZSk7Ci0gICAgICAgIGlmIChxdWV1ZWRPdXRwdXQubGVuZ3RoICE9IDMp CisgICAgICAgICsrbG9hZENvdW50OworICAgICAgICBwcm9jZXNzRXZlbnQoKTsKKyAgICB9Cisg ICAgZnVuY3Rpb24gcHJvY2Vzc0V2ZW50KCkKKyAgICB7CisgICAgICAgIGlmIChsb2FkQ291bnQg IT09IHVybHMubGVuZ3RoKQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBmb3IgKGkgPSAw OyBpIDwgcXVldWVkT3V0cHV0Lmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICBpZiAocXVldWVk T3V0cHV0W2ldKQotICAgICAgICAgICAgICAgIG91dHB1dChxdWV1ZWRPdXRwdXRbaV0pOworICAg ICAgICBpZiAobG9hZENvdW50ID09PSAxKSB7CisgICAgICAgICAgICBkaXNwYXRjaE9uRnJvbnRl bmQoeyBjb21tYW5kOiAicnVuLXdoZW4tcGFnZS1sb2FkcyIgfSwgb25Mb2FkKTsKKyAgICAgICAg ICAgIHdlYkluc3BlY3Rvci5pbnNwZWN0ZWRXaW5kb3cuZXZhbCgibG9jYXRpb24uaHJlZiA9IGxv Y2F0aW9uLm9yaWdpbiArIGxvY2F0aW9uLnBhdGhuYW1lIik7CisgICAgICAgIH0KKyAgICAgICAg ZWxzZSB7CisgICAgICAgICAgICB3ZWJJbnNwZWN0b3IucmVzb3VyY2VzLm9uTmF2aWdhdGVkLnJl bW92ZUxpc3RlbmVyKG9uTmF2aWdhdGVkKTsKKyAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBp IDwgdXJscy5sZW5ndGg7ICsraSkKKyAgICAgICAgICAgICAgICBvdXRwdXQoIk5hdmlnYXRlZCB0 bzogIiArIHVybHNbaV0pOworICAgICAgICAgICAgbmV4dFRlc3QoKTsKICAgICAgICAgfQotICAg ICAgICBuZXh0VGVzdCgpOwogICAgIH0KLQotICAgIHdlYkluc3BlY3Rvci5pbnNwZWN0ZWRXaW5k b3cub25ET01Db250ZW50TG9hZGVkLmFkZExpc3RlbmVyKGZ1bmN0aW9uKHRpbWUpIHsKLSAgICAg ICAgcXVldWVPdXRwdXRBbmRDb250aW51ZSgib25ET01Db250ZW50TG9hZGVkIGZpcmVkOiAiICsg dHlwZW9mIHRpbWUpOwotICAgIH0pOwotCi0gICAgd2ViSW5zcGVjdG9yLmluc3BlY3RlZFdpbmRv dy5vbkxvYWRlZC5hZGRMaXN0ZW5lcihmdW5jdGlvbih0aW1lKSB7Ci0gICAgICAgIHF1ZXVlT3V0 cHV0QW5kQ29udGludWUoIm9uTG9hZGVkIGZpcmVkOiAiICsgdHlwZW9mIHRpbWUpOwotICAgIH0p OwotICAgIGRpc3BhdGNoT25Gcm9udGVuZCh7IGNvbW1hbmQ6ICJyZWxvYWQiIH0sIHF1ZXVlT3V0 cHV0QW5kQ29udGludWUpOworICAgIGZ1bmN0aW9uIG9uTmF2aWdhdGVkKHVybCkKKyAgICB7Cisg ICAgICAgIHVybHMucHVzaCh1cmwpOworICAgICAgICBwcm9jZXNzRXZlbnQoKTsKKyAgICB9Cisg ICAgd2ViSW5zcGVjdG9yLnJlc291cmNlcy5vbk5hdmlnYXRlZC5hZGRMaXN0ZW5lcihvbk5hdmln YXRlZCk7CisgICAgZGlzcGF0Y2hPbkZyb250ZW5kKHsgY29tbWFuZDogInJ1bi13aGVuLXBhZ2Ut bG9hZHMiIH0sIG9uTG9hZCk7CisgICAgd2ViSW5zcGVjdG9yLmluc3BlY3RlZFdpbmRvdy5ldmFs KCJsb2NhdGlvbi5ocmVmID0gbG9jYXRpb24uaHJlZiArICc/bmF2aWdhdGVkJyIpOwogfQogCiBm dW5jdGlvbiBleHRlbnNpb25fdGVzdFBhbmVsU2hvd0hpZGUobmV4dFRlc3QpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5k ZXggZDNiZTA4OS4uMjgxYTE0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDExLTA0 LTA1ICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgLSBSZW1vdmVkIHdlYkluc3BlY3Rv ci5pbnNwZWN0ZWRQYWdlLiogZXZlbnRzCisgICAgICAgIC0gbW92ZWQgb25OYXZpZ2F0ZWQgdG8g d2ViSW5zcGVjdG9yLnJlc291cmNlcworCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtFeHRlbnNp b25zIEFQSV0gcmVtb3ZlIGluc3BlY3RlZFBhZ2UuKiBldmVudHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3NzYzCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL0V4dGVuc2lvbkFQSS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5pbmpl Y3RlZEV4dGVuc2lvbkFQSSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuaW5qZWN0ZWRFeHRlbnNp b25BUEkuSW5zcGVjdGVkV2luZG93KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0V4 dGVuc2lvbkFQSVNjaGVtYS5qc29uOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRXh0 ZW5zaW9uU2VydmVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV4dGVuc2lvblNlcnZlci5w cm90b3R5cGUubm90aWZ5SW5zcGVjdGVkVVJMQ2hhbmdlZCk6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9pbnNwZWN0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuZG9tQ29udGVu dEV2ZW50RmlyZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmxvYWRFdmVudEZpcmVkKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5pbnNwZWN0ZWRVUkxDaGFuZ2VkKToKKwogMjAxMS0wNC0wNSAg QWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRXh0ZW5zaW9uQVBJLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9FeHRlbnNpb25BUEkuanMKaW5kZXggYmFiNWYxOC4uOTQwZTM0MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25BUEkuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25BUEkuanMKQEAgLTExMSw2 ICsxMTEsNyBAQCBmdW5jdGlvbiBSZXNvdXJjZXMoKQogICAgICAgICB0aGlzLl9maXJlKHJlc291 cmNlKTsKICAgICB9CiAgICAgdGhpcy5vbkZpbmlzaGVkID0gbmV3IEV2ZW50U2luaygicmVzb3Vy Y2UtZmluaXNoZWQiLCByZXNvdXJjZURpc3BhdGNoKTsKKyAgICB0aGlzLm9uTmF2aWdhdGVkID0g bmV3IEV2ZW50U2luaygiaW5zcGVjdGVkVVJMQ2hhbmdlZCIpOwogfQogCiBSZXNvdXJjZXMucHJv dG90eXBlID0gewpAQCAtMzU2LDkgKzM1Nyw2IEBAIEF1ZGl0UmVzdWx0Tm9kZS5wcm90b3R5cGUg PSB7CiAKIGZ1bmN0aW9uIEluc3BlY3RlZFdpbmRvdygpCiB7Ci0gICAgdGhpcy5vbkRPTUNvbnRl bnRMb2FkZWQgPSBuZXcgRXZlbnRTaW5rKCJpbnNwZWN0ZWRQYWdlRE9NQ29udGVudExvYWRlZCIp OwotICAgIHRoaXMub25Mb2FkZWQgPSBuZXcgRXZlbnRTaW5rKCJpbnNwZWN0ZWRQYWdlTG9hZGVk Iik7Ci0gICAgdGhpcy5vbk5hdmlnYXRlZCA9IG5ldyBFdmVudFNpbmsoImluc3BlY3RlZFVSTENo YW5nZWQiKTsKIH0KIAogSW5zcGVjdGVkV2luZG93LnByb3RvdHlwZSA9IHsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uQVBJU2NoZW1hLmpz b24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvbkFQSVNjaGVt YS5qc29uCmluZGV4IDUyNmZkNDEuLmFiZDMwNTggMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uQVBJU2NoZW1hLmpzb24KKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25BUElTY2hlbWEuanNvbgpAQCAt MTY1LDEyICsxNjUsMjAgQEAKICAgICAgICAgICAgICJuYW1lIjogInBhZ2VVUkwiLAogICAgICAg ICAgICAgInR5cGUiOiAic3RyaW5nIiwKICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJBbiBV Ukwgb2YgdGhlIHBhZ2UgdGhhdCByZXByZXNlbnRzIHRoaXMgcGFuZWwuIgorICAgICAgICAgIH0s CisgICAgICAgICAgeyAKKyAgICAgICAgICAgICJuYW1lIjogImNhbGxiYWNrIiwKKyAgICAgICAg ICAgICJ0eXBlIjogImZ1bmN0aW9uIiwKKyAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJBIGZ1 bmN0aW9uIHRoYXQgaXMgY2FsbGVkIHVwb24gcmVxdWVzdCBjb21wbGV0aW9uLiIsCisgICAgICAg ICAgICAicGFyYW1ldGVycyI6IFsKKyAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICJu YW1lIjogInBhbmVsIiwKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiQW4gRXh0ZW5z aW9uUGFuZWwgb2JqZWN0IHJlcHJlc2VudGluZyB0aGUgY3JlYXRlZCBwYW5lbC4iLAorICAgICAg ICAgICAgICAgICIkcmVmIjogIkV4dGVuc2lvblBhbmVsIgorICAgICAgICAgICAgICB9CisgICAg ICAgICAgICBdCiAgICAgICAgICAgfQotICAgICAgICBdLAotICAgICAgICAicmV0dXJucyIgOiB7 Ci0gICAgICAgICAgIiRyZWYiOiAiRXh0ZW5zaW9uUGFuZWwiLAotICAgICAgICAgICJkZXNjcmlw dGlvbiI6ICJBIHBhbmVsIHRoYXQgd2FzIGNyZWF0ZWQuIgotICAgICAgICB9CisgICAgICAgIF0K ICAgICAgIH0KICAgICBdCiAgIH0sCkBAIC0yMzgsNiArMjQ2LDE4IEBACiAgICAgICAgICJwYXJh bWV0ZXJzIjogWwogICAgICAgICAgIHsgIm5hbWUiOiAicmVzb3VyY2UiLCAiJHJlZiI6ICJSZXNv dXJjZSIgfQogICAgICAgICBdCisgICAgICB9LAorICAgICAgeworICAgICAgICAibmFtZSI6ICJv bk5hdmlnYXRpb24iLAorICAgICAgICAidHlwZSI6ICJmdW5jdGlvbiIsCisgICAgICAgICJkZXNj cmlwdGlvbiI6ICJGaXJlZCB3aGVuIGFuIGluc3BlY3RlZCB3aW5kb3cgbmF2aWdhdGVzIHRvIGEg bmV3IFVSTC4iLAorICAgICAgICAicGFyYW1ldGVycyI6IFsKKyAgICAgICAgICB7IAorICAgICAg ICAgICAgIm5hbWUiOiAidXJsIiwKKyAgICAgICAgICAgICJ0eXBlIjogInN0aXJuZyIsCisgICAg ICAgICAgICAiZGVzY3JpcHRpb24iOiAiVVJMIG9mIHRoZSBuZXcgcGFnZS4iCisgICAgICAgICAg fQorICAgICAgICBdCiAgICAgICB9CiAgICAgXQogICB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25TZXJ2ZXIuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcwppbmRleCBkNTIwZmQ5 Li4yYzk1ZWYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0V4dGVuc2lvblNlcnZlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0V4dGVuc2lvblNlcnZlci5qcwpAQCAtNzksMTkgKzc5LDkgQEAgV2ViSW5zcGVjdG9yLkV4 dGVuc2lvblNlcnZlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3Bvc3ROb3RpZmljYXRp b24oInBhbmVsLWhpZGRlbi0iICsgcGFuZWxJZCk7CiAgICAgfSwKIAotICAgIG5vdGlmeVBhZ2VM b2FkZWQ6IGZ1bmN0aW9uKG1pbGxpc2Vjb25kcykKKyAgICBub3RpZnlJbnNwZWN0ZWRVUkxDaGFu Z2VkOiBmdW5jdGlvbih1cmwpCiAgICAgewotICAgICAgICB0aGlzLl9wb3N0Tm90aWZpY2F0aW9u KCJpbnNwZWN0ZWRQYWdlTG9hZGVkIiwgbWlsbGlzZWNvbmRzKTsKLSAgICB9LAotCi0gICAgbm90 aWZ5UGFnZURPTUNvbnRlbnRMb2FkZWQ6IGZ1bmN0aW9uKG1pbGxpc2Vjb25kcykKLSAgICB7Ci0g ICAgICAgIHRoaXMuX3Bvc3ROb3RpZmljYXRpb24oImluc3BlY3RlZFBhZ2VET01Db250ZW50TG9h ZGVkIiwgbWlsbGlzZWNvbmRzKTsKLSAgICB9LAotCi0gICAgbm90aWZ5SW5zcGVjdGVkVVJMQ2hh bmdlZDogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgdGhpcy5fcG9zdE5vdGlmaWNhdGlvbigi aW5zcGVjdGVkVVJMQ2hhbmdlZCIpOworICAgICAgICB0aGlzLl9wb3N0Tm90aWZpY2F0aW9uKCJp bnNwZWN0ZWRVUkxDaGFuZ2VkIiwgdXJsKTsKICAgICB9LAogCiAgICAgbm90aWZ5SW5zcGVjdG9y UmVzZXQ6IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvaW5zcGVjdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9pbnNwZWN0b3IuanMKaW5kZXggNTM2YTgwNi4uYmU3Y2YzYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKQEAgLTk4OSw3ICs5ODksNiBA QCBXZWJJbnNwZWN0b3IuZG9tQ29udGVudEV2ZW50RmlyZWQgPSBmdW5jdGlvbih0aW1lKQogICAg IHRoaXMucGFuZWxzLmF1ZGl0cy5tYWluUmVzb3VyY2VET01Db250ZW50VGltZSA9IHRpbWU7CiAg ICAgaWYgKHRoaXMucGFuZWxzLm5ldHdvcmspCiAgICAgICAgIHRoaXMucGFuZWxzLm5ldHdvcmsu bWFpblJlc291cmNlRE9NQ29udGVudFRpbWUgPSB0aW1lOwotICAgIHRoaXMuZXh0ZW5zaW9uU2Vy dmVyLm5vdGlmeVBhZ2VET01Db250ZW50TG9hZGVkKCh0aW1lIC0gV2ViSW5zcGVjdG9yLm1haW5S ZXNvdXJjZS5zdGFydFRpbWUpICogMTAwMCk7CiAgICAgdGhpcy5tYWluUmVzb3VyY2VET01Db250 ZW50VGltZSA9IHRpbWU7CiB9CiAKQEAgLTk5OCw3ICs5OTcsNiBAQCBXZWJJbnNwZWN0b3IubG9h ZEV2ZW50RmlyZWQgPSBmdW5jdGlvbih0aW1lKQogICAgIHRoaXMucGFuZWxzLmF1ZGl0cy5tYWlu UmVzb3VyY2VMb2FkVGltZSA9IHRpbWU7CiAgICAgdGhpcy5wYW5lbHMubmV0d29yay5tYWluUmVz b3VyY2VMb2FkVGltZSA9IHRpbWU7CiAgICAgdGhpcy5wYW5lbHMucmVzb3VyY2VzLmxvYWRFdmVu dEZpcmVkKCk7Ci0gICAgdGhpcy5leHRlbnNpb25TZXJ2ZXIubm90aWZ5UGFnZUxvYWRlZCgodGlt ZSAtIFdlYkluc3BlY3Rvci5tYWluUmVzb3VyY2Uuc3RhcnRUaW1lKSAqIDEwMDApOwogICAgIHRo aXMubWFpblJlc291cmNlTG9hZFRpbWUgPSB0aW1lOwogfQogCkBAIC0xMDM4LDcgKzEwMzYsNyBA QCBXZWJJbnNwZWN0b3IuaW5zcGVjdGVkVVJMQ2hhbmdlZCA9IGZ1bmN0aW9uKHVybCkKIHsKICAg ICBJbnNwZWN0b3JGcm9udGVuZEhvc3QuaW5zcGVjdGVkVVJMQ2hhbmdlZCh1cmwpOwogICAgIHRo aXMuc2V0dGluZ3MuaW5zcGVjdGVkVVJMQ2hhbmdlZCh1cmwpOwotICAgIHRoaXMuZXh0ZW5zaW9u U2VydmVyLm5vdGlmeUluc3BlY3RlZFVSTENoYW5nZWQoKTsKKyAgICB0aGlzLmV4dGVuc2lvblNl cnZlci5ub3RpZnlJbnNwZWN0ZWRVUkxDaGFuZ2VkKHVybCk7CiB9CiAKIFdlYkluc3BlY3Rvci5k aWRDcmVhdGVXb3JrZXIgPSBmdW5jdGlvbigpCg== 88266 2011-04-05 10:08:00 -0700 2011-04-05 10:44:55 -0700 patch page-events.diff text/plain 12943 caseq ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzZmZkNTRjLi4zNmQ4YWRkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDQt MDUgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtIFJlbW92ZWQgd2ViSW5zcGVjdG9y Lmluc3BlY3RlZFBhZ2UuKiBldmVudHMKKyAgICAgICAgLSBtb3ZlZCBvbk5hdmlnYXRlZCB0byB3 ZWJJbnNwZWN0b3IucmVzb3VyY2VzCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogW0V4dGVuc2lv bnMgQVBJXSByZW1vdmUgaW5zcGVjdGVkUGFnZS4qIGV2ZW50cworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTc3NjMKKworICAgICAgICAqIGh0dHAvdGVz dHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMtdGVzdC5qczoKKyAgICAgICAgKGluaXRpYWxpemVfRXh0 ZW5zaW9uc1Rlc3QucnVuV2hlblBhZ2VMb2Fkcyk6CisgICAgICAgICogaHR0cC90ZXN0cy9pbnNw ZWN0b3IvaW5zcGVjdG9yLXRlc3QuanM6CisgICAgICAgIChpbml0aWFsaXplX0luc3BlY3RvclRl c3QuSW5zcGVjdG9yVGVzdC5ydW5XaGVuUGFnZUxvYWRzLmNoYWluZWRDYWxsYmFjayk6CisgICAg ICAgIChpbml0aWFsaXplX0luc3BlY3RvclRlc3QuSW5zcGVjdG9yVGVzdC5ydW5XaGVuUGFnZUxv YWRzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZXh0ZW5zaW9ucy9leHRlbnNpb25zLWFwaS1leHBl Y3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1ldmVu dHMtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9leHRlbnNpb25zL2V4dGVuc2lv bnMtZXZlbnRzLmh0bWw6CisKIDIwMTEtMDQtMDUgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxv dkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0IGJhZCByZWJhc2Vs aW5lIG9mIGVuZ2xpc2gtbHItdGV4dC1leHBlY3RlZC5odG1sIGluIHI4MjkxOC4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMtdGVzdC5qcyBi L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMtdGVzdC5qcwppbmRl eCBlY2FjOWEzLi5mZjYxYTIxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2lu c3BlY3Rvci9leHRlbnNpb25zLXRlc3QuanMKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9p bnNwZWN0b3IvZXh0ZW5zaW9ucy10ZXN0LmpzCkBAIC04NCw2ICs4NCwxNCBAQCBmdW5jdGlvbiBy ZWxvYWRQYWdlKGRhdGEsIHBvcnQpCiB9CiBJbnNwZWN0b3JUZXN0LmRpc3BhdGNoT25NZXNzYWdl KCJyZWxvYWQiLCByZWxvYWRQYWdlLCB0cnVlKTsKIAorZnVuY3Rpb24gcnVuV2hlblBhZ2VMb2Fk cyhkYXRhLCBwb3J0KQoreworICAgIEluc3BlY3RvclRlc3QucnVuV2hlblBhZ2VMb2FkcyhmdW5j dGlvbigpIHsKKyAgICAgICAgcG9ydC5wb3N0TWVzc2FnZSgiIik7CisgICAgfSk7Cit9CitJbnNw ZWN0b3JUZXN0LmRpc3BhdGNoT25NZXNzYWdlKCJydW4td2hlbi1wYWdlLWxvYWRzIiwgcnVuV2hl blBhZ2VMb2FkcywgdHJ1ZSk7CisKIH0KIAogdmFyIHRlc3QgPSBmdW5jdGlvbigpCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9pbnNwZWN0b3ItdGVzdC5qcyBi L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2luc3BlY3Rvci10ZXN0LmpzCmluZGV4 IDFlNzA3Y2EuLmY0NDY2OWIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5z cGVjdG9yL2luc3BlY3Rvci10ZXN0LmpzCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5z cGVjdG9yL2luc3BlY3Rvci10ZXN0LmpzCkBAIC0xNTEsNiArMTUxLDE4IEBAIEluc3BlY3RvclRl c3QucGFnZVJlbG9hZGVkID0gZnVuY3Rpb24oKQogICAgIH0KIH0KIAorSW5zcGVjdG9yVGVzdC5y dW5XaGVuUGFnZUxvYWRzID0gZnVuY3Rpb24oY2FsbGJhY2spCit7CisgICAgdmFyIG9sZENhbGxi YWNrID0gSW5zcGVjdG9yVGVzdC5fcmVsb2FkUGFnZUNhbGxiYWNrOworICAgIGZ1bmN0aW9uIGNo YWluZWRDYWxsYmFjaygpCisgICAgeworICAgICAgICBpZiAob2xkQ2FsbGJhY2spCisgICAgICAg ICAgICBvbGRDYWxsYmFjaygpOworICAgICAgICBjYWxsYmFjaygpOworICAgIH0KKyAgICBJbnNw ZWN0b3JUZXN0Ll9yZWxvYWRQYWdlQ2FsbGJhY2sgPSBJbnNwZWN0b3JUZXN0LnNhZmVXcmFwKGNo YWluZWRDYWxsYmFjayk7Cit9CisKIEluc3BlY3RvclRlc3QucnVuQWZ0ZXJQZW5kaW5nRGlzcGF0 Y2hlcyA9IGZ1bmN0aW9uKGNhbGxiYWNrKQogewogICAgIGNhbGxiYWNrID0gSW5zcGVjdG9yVGVz dC5zYWZlV3JhcChjYWxsYmFjayk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv ZXh0ZW5zaW9ucy9leHRlbnNpb25zLWFwaS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZXh0ZW5zaW9ucy9leHRlbnNpb25zLWFwaS1leHBlY3RlZC50eHQKaW5kZXggNTM3N2Qz Ni4uNWYyOTVmNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMv ZXh0ZW5zaW9ucy1hcGktZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9l eHRlbnNpb25zL2V4dGVuc2lvbnMtYXBpLWV4cGVjdGVkLnR4dApAQCAtOCwxOCArOCw2IEBAIFJV Tk5JTkcgVEVTVDogZXh0ZW5zaW9uX3Rlc3RBUEkKICAgICAgICAgYWRkQ2F0ZWdvcnkgOiA8ZnVu Y3Rpb24+CiAgICAgfQogICAgIGluc3BlY3RlZFdpbmRvdyA6IHsKLSAgICAgICAgb25ET01Db250 ZW50TG9hZGVkIDogewotICAgICAgICAgICAgYWRkTGlzdGVuZXIgOiA8ZnVuY3Rpb24+Ci0gICAg ICAgICAgICByZW1vdmVMaXN0ZW5lciA6IDxmdW5jdGlvbj4KLSAgICAgICAgfQotICAgICAgICBv bkxvYWRlZCA6IHsKLSAgICAgICAgICAgIGFkZExpc3RlbmVyIDogPGZ1bmN0aW9uPgotICAgICAg ICAgICAgcmVtb3ZlTGlzdGVuZXIgOiA8ZnVuY3Rpb24+Ci0gICAgICAgIH0KLSAgICAgICAgb25O YXZpZ2F0ZWQgOiB7Ci0gICAgICAgICAgICBhZGRMaXN0ZW5lciA6IDxmdW5jdGlvbj4KLSAgICAg ICAgICAgIHJlbW92ZUxpc3RlbmVyIDogPGZ1bmN0aW9uPgotICAgICAgICB9CiAgICAgICAgIHJl bG9hZCA6IDxmdW5jdGlvbj4KICAgICAgICAgZXZhbCA6IDxmdW5jdGlvbj4KICAgICB9CkBAIC00 Niw2ICszNCwxMCBAQCBSVU5OSU5HIFRFU1Q6IGV4dGVuc2lvbl90ZXN0QVBJCiAgICAgICAgICAg ICBhZGRMaXN0ZW5lciA6IDxmdW5jdGlvbj4KICAgICAgICAgICAgIHJlbW92ZUxpc3RlbmVyIDog PGZ1bmN0aW9uPgogICAgICAgICB9CisgICAgICAgIG9uTmF2aWdhdGVkIDogeworICAgICAgICAg ICAgYWRkTGlzdGVuZXIgOiA8ZnVuY3Rpb24+CisgICAgICAgICAgICByZW1vdmVMaXN0ZW5lciA6 IDxmdW5jdGlvbj4KKyAgICAgICAgfQogICAgICAgICBnZXRIQVIgOiA8ZnVuY3Rpb24+CiAgICAg ICAgIGFkZFJlcXVlc3RIZWFkZXJzIDogPGZ1bmN0aW9uPgogICAgIH0KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zL2V4dGVuc2lvbnMtZXZlbnRzLWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zL2V4dGVuc2lvbnMtZXZlbnRz LWV4cGVjdGVkLnR4dAppbmRleCBlMTRmYzdlLi42YjdkMjJjIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvZXh0ZW5zaW9ucy9leHRlbnNpb25zLWV2ZW50cy1leHBlY3RlZC50eHQK KysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1ldmVudHMt ZXhwZWN0ZWQudHh0CkBAIC0yLDE0ICsyLDE1IEBAIFRlc3RzIFdlYkluc3BlY3RvciBleHRlbnNp b24gQVBJCiAKIFN0YXJ0ZWQgZXh0ZW5zaW9uLgogUnVubmluZyB0ZXN0cy4uLgorUlVOTklORyBU RVNUOiBleHRlbnNpb25fdGVzdE9uTmF2aWdhdGVkCitQYWdlIHJlbG9hZGVkLgorUGFnZSByZWxv YWRlZC4KK05hdmlnYXRlZCB0bzogZXh0ZW5zaW9ucy1ldmVudHMuaHRtbD9uYXZpZ2F0ZWQKK05h dmlnYXRlZCB0bzogZXh0ZW5zaW9ucy1ldmVudHMuaHRtbAogUlVOTklORyBURVNUOiBleHRlbnNp b25fdGVzdE9uUmVzb3VyY2VGaW5pc2hlZAogb25GaW5pc2hlZCBmaXJlZAogUlVOTklORyBURVNU OiBleHRlbnNpb25fdGVzdE9uU2VsZWN0aW9uQ2hhbmdlZAogb25TZWxlY3Rpb25DaGFuZ2VkIGZp cmVkCi1SVU5OSU5HIFRFU1Q6IGV4dGVuc2lvbl90ZXN0UGFnZUxvYWRFdmVudHMKLVBhZ2UgcmVs b2FkZWQuCi1vbkRPTUNvbnRlbnRMb2FkZWQgZmlyZWQ6IG51bWJlcgotb25Mb2FkZWQgZmlyZWQ6 IG51bWJlcgogUlVOTklORyBURVNUOiBleHRlbnNpb25fdGVzdFBhbmVsU2hvd0hpZGUKIEdvdCBv bkhpZGRlbiBldmVudCBmb3IgcGFuZWwgZWxlbWVudHMKIEdvdCBvblNob3duIGV2ZW50IGZvciBw YW5lbCBleHRlbnNpb24KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNp b25zL2V4dGVuc2lvbnMtZXZlbnRzLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZXh0ZW5z aW9ucy9leHRlbnNpb25zLWV2ZW50cy5odG1sCmluZGV4IDhkYzk5ZGQuLjQwNGMwYjggMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zL2V4dGVuc2lvbnMtZXZlbnRz Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1l dmVudHMuaHRtbApAQCAtMjgsMzIgKzI4LDM5IEBAIGZ1bmN0aW9uIGV4dGVuc2lvbl90ZXN0T25S ZXNvdXJjZUZpbmlzaGVkKG5leHRUZXN0KQogICAgIHdlYkluc3BlY3Rvci5pbnNwZWN0ZWRXaW5k b3cuZXZhbCgidmFyIHhociA9IG5ldyBYTUxIdHRwUmVxdWVzdCgpOyB4aHIub3BlbignR0VUJywg JyIgKyBsb2NhdGlvbi5ocmVmICsgIicsIGZhbHNlKTsgeGhyLnNlbmQobnVsbCk7Iik7CiB9CiAK LWZ1bmN0aW9uIGV4dGVuc2lvbl90ZXN0UGFnZUxvYWRFdmVudHMobmV4dFRlc3QpCitmdW5jdGlv biBleHRlbnNpb25fdGVzdE9uTmF2aWdhdGVkKG5leHRUZXN0KQogewotICAgIHZhciBxdWV1ZWRP dXRwdXQgPSBbXTsKKyAgICB2YXIgdXJscyA9IFtdOworICAgIHZhciBsb2FkQ291bnQgPSAwOwog Ci0gICAgLy8gTG9nZ2luZyBvbiBvbkxvYWRlZCBpcyB0cmlja3kgZHVlIHRvIHJhY2UgY29uZGl0 aW9ucyB3aXRoIG91dHB1dCgiUGFnZSByZWxvYWRlZCIpIGluIHBhZ2UgaW5pdGlhbGl6YXRpb24g Y29kZS4KLSAgICAvLyBTbyBvbmx5IGxvZyB3aGVuIHdlJ3JlIHN1cmUgYWxsIGhhbmRsZXJzIGFy ZSBjYWxsZWQgYW5kIHJlbG9hZCBpcyBkb25lLgotICAgIGZ1bmN0aW9uIHF1ZXVlT3V0cHV0QW5k Q29udGludWUobWVzc2FnZSkKKyAgICBmdW5jdGlvbiBvbkxvYWQoKQogICAgIHsKLSAgICAgICAg cXVldWVkT3V0cHV0LnB1c2gobWVzc2FnZSk7Ci0gICAgICAgIGlmIChxdWV1ZWRPdXRwdXQubGVu Z3RoICE9IDMpCisgICAgICAgICsrbG9hZENvdW50OworICAgICAgICBwcm9jZXNzRXZlbnQoKTsK KyAgICB9CisgICAgZnVuY3Rpb24gcHJvY2Vzc0V2ZW50KCkKKyAgICB7CisgICAgICAgIGlmIChs b2FkQ291bnQgIT09IHVybHMubGVuZ3RoKQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBm b3IgKGkgPSAwOyBpIDwgcXVldWVkT3V0cHV0Lmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICBp ZiAocXVldWVkT3V0cHV0W2ldKQotICAgICAgICAgICAgICAgIG91dHB1dChxdWV1ZWRPdXRwdXRb aV0pOworICAgICAgICBpZiAobG9hZENvdW50ID09PSAxKSB7CisgICAgICAgICAgICBkaXNwYXRj aE9uRnJvbnRlbmQoeyBjb21tYW5kOiAicnVuLXdoZW4tcGFnZS1sb2FkcyIgfSwgb25Mb2FkKTsK KyAgICAgICAgICAgIHdlYkluc3BlY3Rvci5pbnNwZWN0ZWRXaW5kb3cuZXZhbCgibG9jYXRpb24u aHJlZiA9IGxvY2F0aW9uLm9yaWdpbiArIGxvY2F0aW9uLnBhdGhuYW1lIik7CisgICAgICAgIH0K KyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICB3ZWJJbnNwZWN0b3IucmVzb3VyY2VzLm9uTmF2 aWdhdGVkLnJlbW92ZUxpc3RlbmVyKG9uTmF2aWdhdGVkKTsKKyAgICAgICAgICAgIGZvciAodmFy IGkgPSAwOyBpIDwgdXJscy5sZW5ndGg7ICsraSkKKyAgICAgICAgICAgICAgICBvdXRwdXQoIk5h dmlnYXRlZCB0bzogIiArIHVybHNbaV0pOworICAgICAgICAgICAgbmV4dFRlc3QoKTsKICAgICAg ICAgfQotICAgICAgICBuZXh0VGVzdCgpOwogICAgIH0KLQotICAgIHdlYkluc3BlY3Rvci5pbnNw ZWN0ZWRXaW5kb3cub25ET01Db250ZW50TG9hZGVkLmFkZExpc3RlbmVyKGZ1bmN0aW9uKHRpbWUp IHsKLSAgICAgICAgcXVldWVPdXRwdXRBbmRDb250aW51ZSgib25ET01Db250ZW50TG9hZGVkIGZp cmVkOiAiICsgdHlwZW9mIHRpbWUpOwotICAgIH0pOwotCi0gICAgd2ViSW5zcGVjdG9yLmluc3Bl Y3RlZFdpbmRvdy5vbkxvYWRlZC5hZGRMaXN0ZW5lcihmdW5jdGlvbih0aW1lKSB7Ci0gICAgICAg IHF1ZXVlT3V0cHV0QW5kQ29udGludWUoIm9uTG9hZGVkIGZpcmVkOiAiICsgdHlwZW9mIHRpbWUp OwotICAgIH0pOwotICAgIGRpc3BhdGNoT25Gcm9udGVuZCh7IGNvbW1hbmQ6ICJyZWxvYWQiIH0s IHF1ZXVlT3V0cHV0QW5kQ29udGludWUpOworICAgIGZ1bmN0aW9uIG9uTmF2aWdhdGVkKHVybCkK KyAgICB7CisgICAgICAgIHVybHMucHVzaCh1cmwucmVwbGFjZSgvXiguKlwvKSovLCAiIikpOwor ICAgICAgICBwcm9jZXNzRXZlbnQoKTsKKyAgICB9CisgICAgd2ViSW5zcGVjdG9yLnJlc291cmNl cy5vbk5hdmlnYXRlZC5hZGRMaXN0ZW5lcihvbk5hdmlnYXRlZCk7CisgICAgZGlzcGF0Y2hPbkZy b250ZW5kKHsgY29tbWFuZDogInJ1bi13aGVuLXBhZ2UtbG9hZHMiIH0sIG9uTG9hZCk7CisgICAg d2ViSW5zcGVjdG9yLmluc3BlY3RlZFdpbmRvdy5ldmFsKCJsb2NhdGlvbi5ocmVmID0gbG9jYXRp b24uaHJlZiArICc/bmF2aWdhdGVkJyIpOwogfQogCiBmdW5jdGlvbiBleHRlbnNpb25fdGVzdFBh bmVsU2hvd0hpZGUobmV4dFRlc3QpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDNiZTA4OS4uMjgxYTE0NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDExLTA0LTA1ICBBbmRyZXkgS29zeWFrb3YgIDxj YXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgLSBSZW1vdmVkIHdlYkluc3BlY3Rvci5pbnNwZWN0ZWRQYWdlLiogZXZlbnRz CisgICAgICAgIC0gbW92ZWQgb25OYXZpZ2F0ZWQgdG8gd2ViSW5zcGVjdG9yLnJlc291cmNlcwor CisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtFeHRlbnNpb25zIEFQSV0gcmVtb3ZlIGluc3BlY3Rl ZFBhZ2UuKiBldmVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTU3NzYzCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvbkFQ SS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5pbmplY3RlZEV4dGVuc2lvbkFQSSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuaW5qZWN0ZWRFeHRlbnNpb25BUEkuSW5zcGVjdGVkV2luZG93KToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvbkFQSVNjaGVtYS5qc29uOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkV4dGVuc2lvblNlcnZlci5wcm90b3R5cGUubm90aWZ5SW5zcGVjdGVk VVJMQ2hhbmdlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuZG9tQ29udGVudEV2ZW50RmlyZWQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLmxvYWRFdmVudEZpcmVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5pbnNw ZWN0ZWRVUkxDaGFuZ2VkKToKKwogMjAxMS0wNC0wNSAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFw QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uQVBJLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25BUEkuanMKaW5kZXgg YmFiNWYxOC4uOTQwZTM0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9FeHRlbnNpb25BUEkuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9FeHRlbnNpb25BUEkuanMKQEAgLTExMSw2ICsxMTEsNyBAQCBmdW5jdGlvbiBSZXNv dXJjZXMoKQogICAgICAgICB0aGlzLl9maXJlKHJlc291cmNlKTsKICAgICB9CiAgICAgdGhpcy5v bkZpbmlzaGVkID0gbmV3IEV2ZW50U2luaygicmVzb3VyY2UtZmluaXNoZWQiLCByZXNvdXJjZURp c3BhdGNoKTsKKyAgICB0aGlzLm9uTmF2aWdhdGVkID0gbmV3IEV2ZW50U2luaygiaW5zcGVjdGVk VVJMQ2hhbmdlZCIpOwogfQogCiBSZXNvdXJjZXMucHJvdG90eXBlID0gewpAQCAtMzU2LDkgKzM1 Nyw2IEBAIEF1ZGl0UmVzdWx0Tm9kZS5wcm90b3R5cGUgPSB7CiAKIGZ1bmN0aW9uIEluc3BlY3Rl ZFdpbmRvdygpCiB7Ci0gICAgdGhpcy5vbkRPTUNvbnRlbnRMb2FkZWQgPSBuZXcgRXZlbnRTaW5r KCJpbnNwZWN0ZWRQYWdlRE9NQ29udGVudExvYWRlZCIpOwotICAgIHRoaXMub25Mb2FkZWQgPSBu ZXcgRXZlbnRTaW5rKCJpbnNwZWN0ZWRQYWdlTG9hZGVkIik7Ci0gICAgdGhpcy5vbk5hdmlnYXRl ZCA9IG5ldyBFdmVudFNpbmsoImluc3BlY3RlZFVSTENoYW5nZWQiKTsKIH0KIAogSW5zcGVjdGVk V2luZG93LnByb3RvdHlwZSA9IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRXh0ZW5zaW9uQVBJU2NoZW1hLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvbkFQSVNjaGVtYS5qc29uCmluZGV4IDUyNmZkNDEuLmFi ZDMwNTggMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0 ZW5zaW9uQVBJU2NoZW1hLmpzb24KKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9FeHRlbnNpb25BUElTY2hlbWEuanNvbgpAQCAtMTY1LDEyICsxNjUsMjAgQEAKICAgICAg ICAgICAgICJuYW1lIjogInBhZ2VVUkwiLAogICAgICAgICAgICAgInR5cGUiOiAic3RyaW5nIiwK ICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJBbiBVUkwgb2YgdGhlIHBhZ2UgdGhhdCByZXBy ZXNlbnRzIHRoaXMgcGFuZWwuIgorICAgICAgICAgIH0sCisgICAgICAgICAgeyAKKyAgICAgICAg ICAgICJuYW1lIjogImNhbGxiYWNrIiwKKyAgICAgICAgICAgICJ0eXBlIjogImZ1bmN0aW9uIiwK KyAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJBIGZ1bmN0aW9uIHRoYXQgaXMgY2FsbGVkIHVw b24gcmVxdWVzdCBjb21wbGV0aW9uLiIsCisgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKKyAg ICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICJuYW1lIjogInBhbmVsIiwKKyAgICAgICAg ICAgICAgICAiZGVzY3JpcHRpb24iOiAiQW4gRXh0ZW5zaW9uUGFuZWwgb2JqZWN0IHJlcHJlc2Vu dGluZyB0aGUgY3JlYXRlZCBwYW5lbC4iLAorICAgICAgICAgICAgICAgICIkcmVmIjogIkV4dGVu c2lvblBhbmVsIgorICAgICAgICAgICAgICB9CisgICAgICAgICAgICBdCiAgICAgICAgICAgfQot ICAgICAgICBdLAotICAgICAgICAicmV0dXJucyIgOiB7Ci0gICAgICAgICAgIiRyZWYiOiAiRXh0 ZW5zaW9uUGFuZWwiLAotICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJBIHBhbmVsIHRoYXQgd2Fz IGNyZWF0ZWQuIgotICAgICAgICB9CisgICAgICAgIF0KICAgICAgIH0KICAgICBdCiAgIH0sCkBA IC0yMzgsNiArMjQ2LDE4IEBACiAgICAgICAgICJwYXJhbWV0ZXJzIjogWwogICAgICAgICAgIHsg Im5hbWUiOiAicmVzb3VyY2UiLCAiJHJlZiI6ICJSZXNvdXJjZSIgfQogICAgICAgICBdCisgICAg ICB9LAorICAgICAgeworICAgICAgICAibmFtZSI6ICJvbk5hdmlnYXRpb24iLAorICAgICAgICAi dHlwZSI6ICJmdW5jdGlvbiIsCisgICAgICAgICJkZXNjcmlwdGlvbiI6ICJGaXJlZCB3aGVuIGFu IGluc3BlY3RlZCB3aW5kb3cgbmF2aWdhdGVzIHRvIGEgbmV3IFVSTC4iLAorICAgICAgICAicGFy YW1ldGVycyI6IFsKKyAgICAgICAgICB7IAorICAgICAgICAgICAgIm5hbWUiOiAidXJsIiwKKyAg ICAgICAgICAgICJ0eXBlIjogInN0aXJuZyIsCisgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAi VVJMIG9mIHRoZSBuZXcgcGFnZS4iCisgICAgICAgICAgfQorICAgICAgICBdCiAgICAgICB9CiAg ICAgXQogICB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9FeHRlbnNpb25TZXJ2ZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0V4dGVuc2lvblNlcnZlci5qcwppbmRleCBkNTIwZmQ5Li4yYzk1ZWYwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcwpA QCAtNzksMTkgKzc5LDkgQEAgV2ViSW5zcGVjdG9yLkV4dGVuc2lvblNlcnZlci5wcm90b3R5cGUg PSB7CiAgICAgICAgIHRoaXMuX3Bvc3ROb3RpZmljYXRpb24oInBhbmVsLWhpZGRlbi0iICsgcGFu ZWxJZCk7CiAgICAgfSwKIAotICAgIG5vdGlmeVBhZ2VMb2FkZWQ6IGZ1bmN0aW9uKG1pbGxpc2Vj b25kcykKKyAgICBub3RpZnlJbnNwZWN0ZWRVUkxDaGFuZ2VkOiBmdW5jdGlvbih1cmwpCiAgICAg ewotICAgICAgICB0aGlzLl9wb3N0Tm90aWZpY2F0aW9uKCJpbnNwZWN0ZWRQYWdlTG9hZGVkIiwg bWlsbGlzZWNvbmRzKTsKLSAgICB9LAotCi0gICAgbm90aWZ5UGFnZURPTUNvbnRlbnRMb2FkZWQ6 IGZ1bmN0aW9uKG1pbGxpc2Vjb25kcykKLSAgICB7Ci0gICAgICAgIHRoaXMuX3Bvc3ROb3RpZmlj YXRpb24oImluc3BlY3RlZFBhZ2VET01Db250ZW50TG9hZGVkIiwgbWlsbGlzZWNvbmRzKTsKLSAg ICB9LAotCi0gICAgbm90aWZ5SW5zcGVjdGVkVVJMQ2hhbmdlZDogZnVuY3Rpb24oKQotICAgIHsK LSAgICAgICAgdGhpcy5fcG9zdE5vdGlmaWNhdGlvbigiaW5zcGVjdGVkVVJMQ2hhbmdlZCIpOwor ICAgICAgICB0aGlzLl9wb3N0Tm90aWZpY2F0aW9uKCJpbnNwZWN0ZWRVUkxDaGFuZ2VkIiwgdXJs KTsKICAgICB9LAogCiAgICAgbm90aWZ5SW5zcGVjdG9yUmVzZXQ6IGZ1bmN0aW9uKCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggNTM2 YTgwNi4uYmU3Y2YzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9pbnNwZWN0b3IuanMKQEAgLTk4OSw3ICs5ODksNiBAQCBXZWJJbnNwZWN0b3IuZG9tQ29udGVu dEV2ZW50RmlyZWQgPSBmdW5jdGlvbih0aW1lKQogICAgIHRoaXMucGFuZWxzLmF1ZGl0cy5tYWlu UmVzb3VyY2VET01Db250ZW50VGltZSA9IHRpbWU7CiAgICAgaWYgKHRoaXMucGFuZWxzLm5ldHdv cmspCiAgICAgICAgIHRoaXMucGFuZWxzLm5ldHdvcmsubWFpblJlc291cmNlRE9NQ29udGVudFRp bWUgPSB0aW1lOwotICAgIHRoaXMuZXh0ZW5zaW9uU2VydmVyLm5vdGlmeVBhZ2VET01Db250ZW50 TG9hZGVkKCh0aW1lIC0gV2ViSW5zcGVjdG9yLm1haW5SZXNvdXJjZS5zdGFydFRpbWUpICogMTAw MCk7CiAgICAgdGhpcy5tYWluUmVzb3VyY2VET01Db250ZW50VGltZSA9IHRpbWU7CiB9CiAKQEAg LTk5OCw3ICs5OTcsNiBAQCBXZWJJbnNwZWN0b3IubG9hZEV2ZW50RmlyZWQgPSBmdW5jdGlvbih0 aW1lKQogICAgIHRoaXMucGFuZWxzLmF1ZGl0cy5tYWluUmVzb3VyY2VMb2FkVGltZSA9IHRpbWU7 CiAgICAgdGhpcy5wYW5lbHMubmV0d29yay5tYWluUmVzb3VyY2VMb2FkVGltZSA9IHRpbWU7CiAg ICAgdGhpcy5wYW5lbHMucmVzb3VyY2VzLmxvYWRFdmVudEZpcmVkKCk7Ci0gICAgdGhpcy5leHRl bnNpb25TZXJ2ZXIubm90aWZ5UGFnZUxvYWRlZCgodGltZSAtIFdlYkluc3BlY3Rvci5tYWluUmVz b3VyY2Uuc3RhcnRUaW1lKSAqIDEwMDApOwogICAgIHRoaXMubWFpblJlc291cmNlTG9hZFRpbWUg PSB0aW1lOwogfQogCkBAIC0xMDM4LDcgKzEwMzYsNyBAQCBXZWJJbnNwZWN0b3IuaW5zcGVjdGVk VVJMQ2hhbmdlZCA9IGZ1bmN0aW9uKHVybCkKIHsKICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3Qu aW5zcGVjdGVkVVJMQ2hhbmdlZCh1cmwpOwogICAgIHRoaXMuc2V0dGluZ3MuaW5zcGVjdGVkVVJM Q2hhbmdlZCh1cmwpOwotICAgIHRoaXMuZXh0ZW5zaW9uU2VydmVyLm5vdGlmeUluc3BlY3RlZFVS TENoYW5nZWQoKTsKKyAgICB0aGlzLmV4dGVuc2lvblNlcnZlci5ub3RpZnlJbnNwZWN0ZWRVUkxD aGFuZ2VkKHVybCk7CiB9CiAKIFdlYkluc3BlY3Rvci5kaWRDcmVhdGVXb3JrZXIgPSBmdW5jdGlv bigpCg==