68240 2011-09-16 05:27:01 -0700 Web Inspector: paint box model colors in Metrics sidebar at all times, do not draw box outlines. 2011-09-21 06:34:49 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 468440 0 pfeldman 2011-09-16 05:27:01 -0700 1. Today we paint backgrounds in Metrics box model on hover only - should be painted at all times for the reference. 2. Outlining boxes is highlight is wrong since outlines are outside the corresponding box regions. We've seen few reports on that + Firebug does not do borders for that reason. 468448 1 107640 pfeldman 2011-09-16 05:47:04 -0700 Created attachment 107640 Patch 470723 2 107640 yurys 2011-09-21 05:21:51 -0700 Comment on attachment 107640 Patch Looks good, but it was more interactive when rectangle under cursor was highlighted in the metrics box on mouse hover. Would be nice to preserve that behavior. 470745 3 108142 pfeldman 2011-09-21 06:31:35 -0700 Created attachment 108142 [Patch] for landing 470747 4 pfeldman 2011-09-21 06:32:18 -0700 Committed r95621: <http://trac.webkit.org/changeset/95621> 107640 2011-09-16 05:47:04 -0700 2011-09-21 06:31:27 -0700 Patch bug-68240-20110916164702.patch text/plain 18697 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTUyODMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmNjA0YTc0NmYwZmM3ZTY4 ZDdiOGMyMzZhYzc1MDM1OTRmZDZkNTkxLi5kZmY5YzUzMjA1NzgwZTgwZWVhODYxZDVmMWFkYjJi OWZiMTkwNzU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDktMTYgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IHBhaW50IGJveCBtb2RlbCBjb2xvcnMgaW4gTWV0cmljcyBzaWRlYmFyIGF0IGFsbCB0aW1lcywg ZG8gbm90IGRyYXcgYm94IG91dGxpbmVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjgyNDAKKworICAgICAgICBUb2RheSB3ZSBwYWludCBiYWNrZ3Jv dW5kcyBpbiBNZXRyaWNzIGJveCBtb2RlbCBvbiBob3ZlciBvbmx5IC0gc2hvdWxkIGJlIHBhaW50 ZWQgYXQgYWxsCisgICAgICAgIHRpbWVzIGZvciB0aGUgcmVmZXJlbmNlLiBPdXRsaW5pbmcgYm94 ZXMgaXMgaGlnaGxpZ2h0IGlzIHdyb25nIHNpbmNlIG91dGxpbmVzIGFyZSBvdXRzaWRlCisgICAg ICAgIHRoZSBjb3JyZXNwb25kaW5nIGJveCByZWdpb25zLiBXZSd2ZSBzZWVuIGZldyByZXBvcnRz IG9uIHRoYXQgKyBGaXJlYnVnIGRvZXMgbm90IGRvIGJvcmRlcnMKKyAgICAgICAgZm9yIHRoYXQg cmVhc29uLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogaW5zcGVjdG9yL0RPTU5vZGVIaWdobGlnaHRlci5jcHA6CisgICAgICAgICogaW5zcGVjdG9y L0RPTU5vZGVIaWdobGlnaHRlci5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuanNv bjoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OnNldEhpZ2hsaWdodERhdGFGcm9tQ29uZmlnKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbG9yLmpzOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvTWV0cmljc1NpZGViYXJQYW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLk1ldHJpY3NTaWRlYmFyUGFuZS5wcm90b3R5cGUuX2hpZ2hsaWdodERPTU5vZGUpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLk1ldHJpY3NTaWRlYmFyUGFuZS5wcm90b3R5cGUuX3VwZGF0ZU1l dHJpY3MpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzczoKKyAg ICAgICAgKC5tZXRyaWNzIC5sYWJlbCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuYnVpbGRIaWdobGlnaHRDb25maWcp OgorCiAyMDExLTA5LTE1ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KIAog ICAgICAgICBXZWIgSW5zcGVjdG9yOiByZW5hbWUgQ29uc29sZS5jbGVhckNvbnNvbGVNZXNzYWdl cyB0byBDb25zb2xlLmNsZWFyTWVzc2FnZXMsIGJydXNoIHVwIGNvbnNvbGUgZG9tYWluIGRvYy4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9ET01Ob2RlSGlnaGxpZ2h0ZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0RPTU5vZGVIaWdobGlnaHRlci5jcHAKaW5k ZXggNzg2MWUzNmFkMDVkZjNhZWI4MTU4ODIwODFiODVlNWRjZTc0YzQ5Yy4uZTY4OWI1MjUwYjZh ODY4ZWE1YTU1MGQ2ZGFhYmEyOTQ1YTc4ZjY5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0RPTU5vZGVIaWdobGlnaHRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0RPTU5vZGVIaWdobGlnaHRlci5jcHAKQEAgLTk5LDUxICs5OSw0NCBAQCB2b2lkIGRy YXdPdXRsaW5lZFF1YWQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBGbG9hdFF1YWQm IHF1YWQsIGNvbnN0IENvbAogICAgIGNvbnRleHQuZmlsbFBhdGgocXVhZFBhdGgpOwogfQogCi12 b2lkIGRyYXdPdXRsaW5lZFF1YWRXaXRoQ2xpcChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNv bnN0IEZsb2F0UXVhZCYgcXVhZCwgY29uc3QgRmxvYXRRdWFkJiBjbGlwUXVhZCwgY29uc3QgQ29s b3ImIGZpbGxDb2xvciwgY29uc3QgQ29sb3ImIG91dGxpbmVDb2xvcikKK3ZvaWQgZHJhd091dGxp bmVkUXVhZFdpdGhDbGlwKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgRmxvYXRRdWFk JiBxdWFkLCBjb25zdCBGbG9hdFF1YWQmIGNsaXBRdWFkLCBjb25zdCBDb2xvciYgZmlsbENvbG9y KQogewogICAgIGNvbnRleHQuc2F2ZSgpOwogICAgIFBhdGggY2xpcFF1YWRQYXRoID0gcXVhZFRv UGF0aChjbGlwUXVhZCk7CiAgICAgY29udGV4dC5jbGlwT3V0KGNsaXBRdWFkUGF0aCk7Ci0gICAg ZHJhd091dGxpbmVkUXVhZChjb250ZXh0LCBxdWFkLCBmaWxsQ29sb3IsIG91dGxpbmVDb2xvcik7 CisgICAgZHJhd091dGxpbmVkUXVhZChjb250ZXh0LCBxdWFkLCBmaWxsQ29sb3IsIENvbG9yOjp0 cmFuc3BhcmVudCk7CiAgICAgY29udGV4dC5yZXN0b3JlKCk7CiB9CiAKIHZvaWQgZHJhd0hpZ2hs aWdodEZvckJveChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEZsb2F0UXVhZCYgY29u dGVudFF1YWQsIGNvbnN0IEZsb2F0UXVhZCYgcGFkZGluZ1F1YWQsIGNvbnN0IEZsb2F0UXVhZCYg Ym9yZGVyUXVhZCwgY29uc3QgRmxvYXRRdWFkJiBtYXJnaW5RdWFkLCBIaWdobGlnaHREYXRhKiBo aWdobGlnaHREYXRhKQogewotICAgIGJvb2wgaGFzTWFyZ2luID0gaGlnaGxpZ2h0RGF0YS0+bWFy Z2luICE9IENvbG9yOjp0cmFuc3BhcmVudCB8fCBoaWdobGlnaHREYXRhLT5tYXJnaW5PdXRsaW5l ICE9IENvbG9yOjp0cmFuc3BhcmVudDsKLSAgICBib29sIGhhc0JvcmRlciA9IGhpZ2hsaWdodERh dGEtPmJvcmRlciAhPSBDb2xvcjo6dHJhbnNwYXJlbnQgfHwgaGlnaGxpZ2h0RGF0YS0+Ym9yZGVy T3V0bGluZSAhPSBDb2xvcjo6dHJhbnNwYXJlbnQ7Ci0gICAgYm9vbCBoYXNQYWRkaW5nID0gaGln aGxpZ2h0RGF0YS0+cGFkZGluZyAhPSBDb2xvcjo6dHJhbnNwYXJlbnQgfHwgaGlnaGxpZ2h0RGF0 YS0+cGFkZGluZ091dGxpbmUgIT0gQ29sb3I6OnRyYW5zcGFyZW50OworICAgIGJvb2wgaGFzTWFy Z2luID0gaGlnaGxpZ2h0RGF0YS0+bWFyZ2luICE9IENvbG9yOjp0cmFuc3BhcmVudDsKKyAgICBi b29sIGhhc0JvcmRlciA9IGhpZ2hsaWdodERhdGEtPmJvcmRlciAhPSBDb2xvcjo6dHJhbnNwYXJl bnQ7CisgICAgYm9vbCBoYXNQYWRkaW5nID0gaGlnaGxpZ2h0RGF0YS0+cGFkZGluZyAhPSBDb2xv cjo6dHJhbnNwYXJlbnQ7CiAgICAgYm9vbCBoYXNDb250ZW50ID0gaGlnaGxpZ2h0RGF0YS0+Y29u dGVudCAhPSBDb2xvcjo6dHJhbnNwYXJlbnQgfHwgaGlnaGxpZ2h0RGF0YS0+Y29udGVudE91dGxp bmUgIT0gQ29sb3I6OnRyYW5zcGFyZW50OwogCiAgICAgRmxvYXRRdWFkIGNsaXBRdWFkOwogICAg IENvbG9yIGNsaXBDb2xvcjsKICAgICBpZiAoaGFzTWFyZ2luICYmICghaGFzQm9yZGVyIHx8IG1h cmdpblF1YWQgIT0gYm9yZGVyUXVhZCkpIHsKLSAgICAgICAgZHJhd091dGxpbmVkUXVhZFdpdGhD bGlwKGNvbnRleHQsIG1hcmdpblF1YWQsIGJvcmRlclF1YWQsIGhpZ2hsaWdodERhdGEtPm1hcmdp biwgaGlnaGxpZ2h0RGF0YS0+bWFyZ2luT3V0bGluZSk7CisgICAgICAgIGRyYXdPdXRsaW5lZFF1 YWRXaXRoQ2xpcChjb250ZXh0LCBtYXJnaW5RdWFkLCBib3JkZXJRdWFkLCBoaWdobGlnaHREYXRh LT5tYXJnaW4pOwogICAgICAgICBjbGlwUXVhZCA9IGJvcmRlclF1YWQ7Ci0gICAgICAgIGNsaXBD b2xvciA9IGhpZ2hsaWdodERhdGEtPm1hcmdpbk91dGxpbmU7CiAgICAgfQogICAgIGlmIChoYXNC b3JkZXIgJiYgKCFoYXNQYWRkaW5nIHx8IGJvcmRlclF1YWQgIT0gcGFkZGluZ1F1YWQpKSB7Ci0g ICAgICAgIGRyYXdPdXRsaW5lZFF1YWRXaXRoQ2xpcChjb250ZXh0LCBib3JkZXJRdWFkLCBwYWRk aW5nUXVhZCwgaGlnaGxpZ2h0RGF0YS0+Ym9yZGVyLCBoaWdobGlnaHREYXRhLT5ib3JkZXJPdXRs aW5lKTsKKyAgICAgICAgZHJhd091dGxpbmVkUXVhZFdpdGhDbGlwKGNvbnRleHQsIGJvcmRlclF1 YWQsIHBhZGRpbmdRdWFkLCBoaWdobGlnaHREYXRhLT5ib3JkZXIpOwogICAgICAgICBjbGlwUXVh ZCA9IHBhZGRpbmdRdWFkOwotICAgICAgICBjbGlwQ29sb3IgPSBoaWdobGlnaHREYXRhLT5ib3Jk ZXJPdXRsaW5lOwogICAgIH0KICAgICBpZiAoaGFzUGFkZGluZyAmJiAoIWhhc0NvbnRlbnQgfHwg cGFkZGluZ1F1YWQgIT0gY29udGVudFF1YWQpKSB7Ci0gICAgICAgIGRyYXdPdXRsaW5lZFF1YWRX aXRoQ2xpcChjb250ZXh0LCBwYWRkaW5nUXVhZCwgY29udGVudFF1YWQsIGhpZ2hsaWdodERhdGEt PnBhZGRpbmcsIGhpZ2hsaWdodERhdGEtPnBhZGRpbmdPdXRsaW5lKTsKKyAgICAgICAgZHJhd091 dGxpbmVkUXVhZFdpdGhDbGlwKGNvbnRleHQsIHBhZGRpbmdRdWFkLCBjb250ZW50UXVhZCwgaGln aGxpZ2h0RGF0YS0+cGFkZGluZyk7CiAgICAgICAgIGNsaXBRdWFkID0gY29udGVudFF1YWQ7Ci0g ICAgICAgIGNsaXBDb2xvciA9IGhpZ2hsaWdodERhdGEtPnBhZGRpbmdPdXRsaW5lOwogICAgIH0K ICAgICBpZiAoaGFzQ29udGVudCkKICAgICAgICAgZHJhd091dGxpbmVkUXVhZChjb250ZXh0LCBj b250ZW50UXVhZCwgaGlnaGxpZ2h0RGF0YS0+Y29udGVudCwgaGlnaGxpZ2h0RGF0YS0+Y29udGVu dE91dGxpbmUpOwotICAgIGVsc2UgewotICAgICAgICBpZiAoY2xpcENvbG9yLmlzVmFsaWQoKSkK LSAgICAgICAgICAgIGRyYXdPdXRsaW5lZFF1YWRXaXRoQ2xpcChjb250ZXh0LCBjbGlwUXVhZCwg Y2xpcFF1YWQsIGNsaXBDb2xvciwgY2xpcENvbG9yKTsKLSAgICB9CiB9CiAKIHZvaWQgZHJhd0hp Z2hsaWdodEZvckxpbmVCb3hlc09yU1ZHUmVuZGVyZXIoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0 LCBjb25zdCBWZWN0b3I8RmxvYXRRdWFkPiYgbGluZUJveFF1YWRzLCBIaWdobGlnaHREYXRhKiBo aWdobGlnaHREYXRhKQogewogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbGluZUJveFF1YWRz LnNpemUoKTsgKytpKQotICAgICAgICBkcmF3T3V0bGluZWRRdWFkKGNvbnRleHQsIGxpbmVCb3hR dWFkc1tpXSwgaGlnaGxpZ2h0RGF0YS0+Y29udGVudCwgaGlnaGxpZ2h0RGF0YS0+Y29udGVudE91 dGxpbmUpOworICAgICAgICBkcmF3T3V0bGluZWRRdWFkKGNvbnRleHQsIGxpbmVCb3hRdWFkc1tp XSwgaGlnaGxpZ2h0RGF0YS0+Y29udGVudCwgQ29sb3I6OnRyYW5zcGFyZW50KTsKIH0KIAogaW5s aW5lIExheW91dFNpemUgZnJhbWVUb01haW5GcmFtZU9mZnNldChGcmFtZSogZnJhbWUpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvRE9NTm9kZUhpZ2hsaWdodGVyLmggYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvRE9NTm9kZUhpZ2hsaWdodGVyLmgKaW5kZXggZmFjOGMx NDRiYjUxNThiYzEzOGQ1NjhhMjA0ZjhiM2E0MzA1ODkyNC4uNDJkNDRkMmYxOWRjNmM1NmM5NTUz NDFjMDBmZmI1YzFkZTYzYWU5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0RPTU5vZGVIaWdobGlnaHRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9ET01O b2RlSGlnaGxpZ2h0ZXIuaApAQCAtNDYsMTEgKzQ2LDggQEAgc3RydWN0IEhpZ2hsaWdodERhdGEg ewogICAgIENvbG9yIGNvbnRlbnQ7CiAgICAgQ29sb3IgY29udGVudE91dGxpbmU7CiAgICAgQ29s b3IgcGFkZGluZzsKLSAgICBDb2xvciBwYWRkaW5nT3V0bGluZTsKICAgICBDb2xvciBib3JkZXI7 Ci0gICAgQ29sb3IgYm9yZGVyT3V0bGluZTsKICAgICBDb2xvciBtYXJnaW47Ci0gICAgQ29sb3Ig bWFyZ2luT3V0bGluZTsKICAgICBib29sIHNob3dJbmZvOwogCiAgICAgLy8gRWl0aGVyIG9mIHRo ZXNlIG11c3QgYmUgMC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3IuanNvbiBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRl eCBhOTM3NzUxNDk1YTI0MTYyMTMwMzdiZmQzMDlhNTFiNmY4MDczYWZjLi42Y2RkNzlkMzAwNjVl MzE0NzE3ODFkODVkMTNlYmViOGIwNGUyMzE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3Rvci5qc29uCkBAIC04ODUsMTggKzg4NSwxNCBAQAogICAgICAgICAgICAgICAgICJkZXNj cmlwdGlvbiI6ICJBIHN0cnVjdHVyZSBob2xkaW5nIGFuIFJHQkEgY29sb3IuIgogICAgICAgICAg ICAgfSwKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAiaWQiOiAiQm94SGlnaGxpZ2h0 Q29uZmlnIiwKKyAgICAgICAgICAgICAgICAiaWQiOiAiSGlnaGxpZ2h0Q29sb3JzIiwKICAgICAg ICAgICAgICAgICAidHlwZSI6ICJvYmplY3QiLAogICAgICAgICAgICAgICAgICJwcm9wZXJ0aWVz IjogWwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNob3dJbmZvIiwgInR5cGUiOiAi Ym9vbGVhbiIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJXaGV0aGVyIHRoZSBu b2RlIGluZm8gdG9vbHRpcCBzaG91bGQgYmUgc2hvd24gKGRlZmF1bHQ6IGZhbHNlKS4iIH0sCiAg ICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY29udGVudENvbG9yIiwgIiRyZWYiOiAiUkdC QSIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJUaGUgY29udGVudCBib3ggaGln aGxpZ2h0IGZpbGwgY29sb3IgKGRlZmF1bHQ6IHRyYW5zcGFyZW50KS4iIH0sCi0gICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAiY29udGVudE91dGxpbmVDb2xvciIsICIkcmVmIjogIlJHQkEi LCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiVGhlIGNvbnRlbnQgYm94IGhpZ2hs aWdodCBvdXRsaW5lIGNvbG9yIChkZWZhdWx0OiB0cmFuc3BhcmVudCkuIiB9LAogICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogInBhZGRpbmdDb2xvciIsICIkcmVmIjogIlJHQkEiLCAib3B0 aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiVGhlIHBhZGRpbmcgaGlnaGxpZ2h0IGZpbGwg Y29sb3IgKGRlZmF1bHQ6IHRyYW5zcGFyZW50KS4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAicGFkZGluZ091dGxpbmVDb2xvciIsICIkcmVmIjogIlJHQkEiLCAib3B0aW9uYWwi OiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiVGhlIHBhZGRpbmcgaGlnaGxpZ2h0IG91dGxpbmUgY29s b3IgKGRlZmF1bHQ6IHRyYW5zcGFyZW50KS4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAiYm9yZGVyQ29sb3IiLCAiJHJlZiI6ICJSR0JBIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRl c2NyaXB0aW9uIjogIlRoZSBib3JkZXIgaGlnaGxpZ2h0IGZpbGwgY29sb3IgKGRlZmF1bHQ6IHRy YW5zcGFyZW50KS4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiYm9yZGVyT3V0 bGluZUNvbG9yIiwgIiRyZWYiOiAiUkdCQSIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlv biI6ICJUaGUgYm9yZGVyIGhpZ2hsaWdodCBvdXRsaW5lIGNvbG9yIChkZWZhdWx0OiB0cmFuc3Bh cmVudCkuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm1hcmdpbkNvbG9yIiwg IiRyZWYiOiAiUkdCQSIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJUaGUgbWFy Z2luIGhpZ2hsaWdodCBmaWxsIGNvbG9yIChkZWZhdWx0OiB0cmFuc3BhcmVudCkuIiB9LAotICAg ICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm1hcmdpbk91dGxpbmVDb2xvciIsICIkcmVmIjog IlJHQkEiLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiVGhlIG1hcmdpbiBoaWdo bGlnaHQgb3V0bGluZSBjb2xvciAoZGVmYXVsdDogdHJhbnNwYXJlbnQpLiIgfQogICAgICAgICAg ICAgICAgIF0sCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyYXRpb24g ZGF0YSBmb3IgdGhlIGhpZ2hsaWdodGluZyBvZiBwYWdlIGVsZW1lbnRzLiIKICAgICAgICAgICAg IH0KQEAgLTkyNSw3ICs5MjEsNyBAQAogICAgICAgICAgICAgICAgICJyZXR1cm5zIjogWwogICAg ICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm5vZGVJZCIsICIkcmVmIjogIk5vZGVJZCIsICJk ZXNjcmlwdGlvbiI6ICJRdWVyeSBzZWxlY3RvciByZXN1bHQuIiB9CiAgICAgICAgICAgICAgICAg XSwKLSAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRXhlY3V0ZXMgPGNvZGU+cXVlcnlT ZWxlY3RvcjwvY29kZT4gb24gYSBnaXZlbiBub2RlLiBTZXR0aW5nIDxjb2RlPmRvY3VtZW50V2lk ZTwvY29kZT4gdG8gdHJ1ZSBzdGFydHMgc2VsZWN0aW5nIGZyb20gdGhlIGRvY3VtZW50IG5vZGUu IgorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJFeGVjdXRlcyA8Y29kZT5xdWVyeVNl bGVjdG9yPC9jb2RlPiBvbiBhIGdpdmVuIG5vZGUuIgogICAgICAgICAgICAgfSwKICAgICAgICAg ICAgIHsKICAgICAgICAgICAgICAgICAibmFtZSI6ICJxdWVyeVNlbGVjdG9yQWxsIiwKQEAgLTkz Niw3ICs5MzIsNyBAQAogICAgICAgICAgICAgICAgICJyZXR1cm5zIjogWwogICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogIm5vZGVJZHMiLCAidHlwZSI6ICJhcnJheSIsICJpdGVtcyI6IHsg IiRyZWYiOiAiTm9kZUlkIiB9LCAiZGVzY3JpcHRpb24iOiAiUXVlcnkgc2VsZWN0b3IgcmVzdWx0 LiIgfQogICAgICAgICAgICAgICAgIF0sCi0gICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjog IkV4ZWN1dGVzIDxjb2RlPnF1ZXJ5U2VsZWN0b3JBbGw8L2NvZGU+IG9uIGEgZ2l2ZW4gbm9kZS4g U2V0dGluZyA8Y29kZT5kb2N1bWVudFdpZGU8L2NvZGU+IHRvIHRydWUgc3RhcnRzIHNlbGVjdGlu ZyBmcm9tIHRoZSBkb2N1bWVudCBub2RlLiIKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24i OiAiRXhlY3V0ZXMgPGNvZGU+cXVlcnlTZWxlY3RvckFsbDwvY29kZT4gb24gYSBnaXZlbiBub2Rl LiIKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUi OiAic2V0Tm9kZU5hbWUiLApAQCAtMTA1OSw3ICsxMDU1LDcgQEAKICAgICAgICAgICAgICAgICAi aGlkZGVuIjogdHJ1ZSwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKICAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJlbmFibGVkIiwgInR5cGUiOiAiYm9vbGVhbiIsICJkZXNj cmlwdGlvbiI6ICJUcnVlIHRvIGVuYWJsZSBpbnNwZWN0aW9uIG1vZGUsIGZhbHNlIHRvIGRpc2Fi bGUgaXQuIiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImhpZ2hsaWdodENvbmZp ZyIsICIkcmVmIjogIkJveEhpZ2hsaWdodENvbmZpZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNj cmlwdGlvbiI6ICJBIGRlc2NyaXB0b3IgZm9yIHRoZSBoaWdobGlnaHQgYXBwZWFyYW5jZSBvZiBo b3ZlcmVkLW92ZXIgbm9kZXMuIE1heSBiZSBvbWl0dGVkIGlmIDxjb2RlPmVuYWJsZWQgPT0gZmFs c2U8L2NvZGU+LiIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImhpZ2hsaWdodENv bmZpZyIsICIkcmVmIjogIkhpZ2hsaWdodENvbG9ycyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNj cmlwdGlvbiI6ICJBIGRlc2NyaXB0b3IgZm9yIHRoZSBoaWdobGlnaHQgYXBwZWFyYW5jZSBvZiBo b3ZlcmVkLW92ZXIgbm9kZXMuIE1heSBiZSBvbWl0dGVkIGlmIDxjb2RlPmVuYWJsZWQgPT0gZmFs c2U8L2NvZGU+LiIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgImRlc2Ny aXB0aW9uIjogIkVudGVycyB0aGUgJ2luc3BlY3QnIG1vZGUuIEluIHRoaXMgbW9kZSwgZWxlbWVu dHMgdGhhdCB1c2VyIGlzIGhvdmVyaW5nIG92ZXIgYXJlIGhpZ2hsaWdodGVkLiBCYWNrZW5kIHRo ZW4gZ2VuZXJhdGVzICdpbnNwZWN0JyBjb21tYW5kIHVwb24gZWxlbWVudCBzZWxlY3Rpb24uIgog ICAgICAgICAgICAgfSwKQEAgLTEwNzksNyArMTA3NSw3IEBACiAgICAgICAgICAgICAgICAgIm5h bWUiOiAiaGlnaGxpZ2h0Tm9kZSIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAg ICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibm9kZUlkIiwgIiRyZWYiOiAiTm9kZUlkIiwg ImRlc2NyaXB0aW9uIjogIklkZW50aWZpZXIgb2YgdGhlIG5vZGUgdG8gaGlnaGxpZ2h0LiIgfSwK LSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJoaWdobGlnaHRDb25maWciLCAiJHJlZiI6 ICJCb3hIaWdobGlnaHRDb25maWciLCAiZGVzY3JpcHRpb24iOiAiQSBkZXNjcmlwdG9yIGZvciB0 aGUgaGlnaGxpZ2h0IGFwcGVhcmFuY2UuIiB9CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAiaGlnaGxpZ2h0Q29uZmlnIiwgIiRyZWYiOiAiSGlnaGxpZ2h0Q29sb3JzIiwgImRlc2NyaXB0 aW9uIjogIkEgZGVzY3JpcHRvciBmb3IgdGhlIGhpZ2hsaWdodCBhcHBlYXJhbmNlLiIgfQogICAg ICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdo dHMgRE9NIG5vZGUgd2l0aCBnaXZlbiBpZC4iCiAgICAgICAgICAgICB9LApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKaW5kZXggNzk3MzU3MjI0Yjgz YjI2NTIxZWZiOTU3NGI2NzNlMGIxN2JkNmE3Ny4uMWM1MGUyMTAzZmZmMDRmMjg1NDdkNGI0OGQ0 ZTliOWE2Y2RiMzk4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckRPTUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RE9NQWdlbnQuY3BwCkBAIC0xMDYxLDExICsxMDYxLDggQEAgYm9vbCBJbnNwZWN0b3JET01BZ2Vu dDo6c2V0SGlnaGxpZ2h0RGF0YUZyb21Db25maWcoSW5zcGVjdG9yT2JqZWN0KiBoaWdobGlnaHRD b24KICAgICBtX2hpZ2hsaWdodERhdGEtPmNvbnRlbnQgPSBwYXJzZUNvbmZpZ0NvbG9yKCJjb250 ZW50Q29sb3IiLCBoaWdobGlnaHRDb25maWcpOwogICAgIG1faGlnaGxpZ2h0RGF0YS0+Y29udGVu dE91dGxpbmUgPSBwYXJzZUNvbmZpZ0NvbG9yKCJjb250ZW50T3V0bGluZUNvbG9yIiwgaGlnaGxp Z2h0Q29uZmlnKTsKICAgICBtX2hpZ2hsaWdodERhdGEtPnBhZGRpbmcgPSBwYXJzZUNvbmZpZ0Nv bG9yKCJwYWRkaW5nQ29sb3IiLCBoaWdobGlnaHRDb25maWcpOwotICAgIG1faGlnaGxpZ2h0RGF0 YS0+cGFkZGluZ091dGxpbmUgPSBwYXJzZUNvbmZpZ0NvbG9yKCJwYWRkaW5nT3V0bGluZUNvbG9y IiwgaGlnaGxpZ2h0Q29uZmlnKTsKICAgICBtX2hpZ2hsaWdodERhdGEtPmJvcmRlciA9IHBhcnNl Q29uZmlnQ29sb3IoImJvcmRlckNvbG9yIiwgaGlnaGxpZ2h0Q29uZmlnKTsKLSAgICBtX2hpZ2hs aWdodERhdGEtPmJvcmRlck91dGxpbmUgPSBwYXJzZUNvbmZpZ0NvbG9yKCJib3JkZXJPdXRsaW5l Q29sb3IiLCBoaWdobGlnaHRDb25maWcpOwogICAgIG1faGlnaGxpZ2h0RGF0YS0+bWFyZ2luID0g cGFyc2VDb25maWdDb2xvcigibWFyZ2luQ29sb3IiLCBoaWdobGlnaHRDb25maWcpOwotICAgIG1f aGlnaGxpZ2h0RGF0YS0+bWFyZ2luT3V0bGluZSA9IHBhcnNlQ29uZmlnQ29sb3IoIm1hcmdpbk91 dGxpbmVDb2xvciIsIGhpZ2hsaWdodENvbmZpZyk7CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29sb3IuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbG9yLmpzCmluZGV4IDJjNWJhMDNh NjMwMGMzYmNjNTYyZTkzNTM4YzIyMjJkZTNjZmYzZGQuLmEwYjcyZmJjNWUwNzQxM2Y0NDM0NWRl OGY1ODEwNzg1MTUyNmQ4ZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQ29sb3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Db2xvci5qcwpAQCAtNjg2LDkgKzY4Niw2IEBAIFdlYkluc3BlY3Rvci5Db2xvci5QYWdlSGln aGxpZ2h0ID0gewogICAgIENvbnRlbnQ6IFdlYkluc3BlY3Rvci5Db2xvci5mcm9tUkdCQSgxMTEs IDE2OCwgMjIwLCAuNjYpLAogICAgIENvbnRlbnRPdXRsaW5lOiBXZWJJbnNwZWN0b3IuQ29sb3Iu ZnJvbVJHQkEoOSwgODMsIDE0OCksCiAgICAgUGFkZGluZzogV2ViSW5zcGVjdG9yLkNvbG9yLmZy b21SR0JBKDE0NywgMTk2LCAxMjUsIC41NSksCi0gICAgUGFkZGluZ091dGxpbmU6IFdlYkluc3Bl Y3Rvci5Db2xvci5mcm9tUkdCQSg1NSwgMTE4LCAyOCksCiAgICAgQm9yZGVyOiBXZWJJbnNwZWN0 b3IuQ29sb3IuZnJvbVJHQkEoMjU1LCAyMjksIDE1MywgLjY2KSwKLSAgICBCb3JkZXJPdXRsaW5l OiBXZWJJbnNwZWN0b3IuQ29sb3IuZnJvbVJHQkEoMTI3LCA5NiwgMCksCi0gICAgTWFyZ2luOiBX ZWJJbnNwZWN0b3IuQ29sb3IuZnJvbVJHQkEoMjQ2LCAxNzgsIDEwNywgLjY2KSwKLSAgICBNYXJn aW5PdXRsaW5lOiBXZWJJbnNwZWN0b3IuQ29sb3IuZnJvbVJHQkEoMTgwLCA5NSwgNCkKLX0KXCBO byBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCisgICAgTWFyZ2luOiBXZWJJbnNwZWN0b3IuQ29sb3Iu ZnJvbVJHQkEoMjQ2LCAxNzgsIDEwNywgLjY2KQorfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9NZXRyaWNzU2lkZWJhclBhbmUuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL01ldHJpY3NTaWRlYmFyUGFuZS5qcwppbmRleCA1MDMw NzA3YThkYjg3NmRiNDgyZDQ3NmU1ZDE4OTI4Mzk0MjM2NmQ5Li4yNGYxMzQ0NDliMWMwNWYxODI3 ZTliYzBlOTBhNjhhMWFjNjMxNDUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL01ldHJpY3NTaWRlYmFyUGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL01ldHJpY3NTaWRlYmFyUGFuZS5qcwpAQCAtMTI4LDQwICsxMjgs MTEgQEAgV2ViSW5zcGVjdG9yLk1ldHJpY3NTaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAgICAg ICAgIGlmIChmcm9tRWxlbWVudCA9PT0gdG9FbGVtZW50KQogICAgICAgICAgICAgcmV0dXJuOwog Ci0gICAgICAgIGZ1bmN0aW9uIGhhbmRsZU1vdXNlT3ZlcihlbGVtZW50KQotICAgICAgICB7Ci0g ICAgICAgICAgICBlbGVtZW50LmFkZFN0eWxlQ2xhc3MoImhvdmVyZWQiKTsKLQotICAgICAgICAg ICAgdmFyIGJnQ29sb3I7Ci0gICAgICAgICAgICBpZiAoZWxlbWVudC5oYXNTdHlsZUNsYXNzKCJt YXJnaW4iKSkKLSAgICAgICAgICAgICAgICBiZ0NvbG9yID0gV2ViSW5zcGVjdG9yLkNvbG9yLlBh Z2VIaWdobGlnaHQuTWFyZ2luLnRvU3RyaW5nKCJvcmlnaW5hbCIpOwotICAgICAgICAgICAgZWxz ZSBpZiAoZWxlbWVudC5oYXNTdHlsZUNsYXNzKCJib3JkZXIiKSkKLSAgICAgICAgICAgICAgICBi Z0NvbG9yID0gV2ViSW5zcGVjdG9yLkNvbG9yLlBhZ2VIaWdobGlnaHQuQm9yZGVyLnRvU3RyaW5n KCJvcmlnaW5hbCIpOwotICAgICAgICAgICAgZWxzZSBpZiAoZWxlbWVudC5oYXNTdHlsZUNsYXNz KCJwYWRkaW5nIikpCi0gICAgICAgICAgICAgICAgYmdDb2xvciA9IFdlYkluc3BlY3Rvci5Db2xv ci5QYWdlSGlnaGxpZ2h0LlBhZGRpbmcudG9TdHJpbmcoIm9yaWdpbmFsIik7Ci0gICAgICAgICAg ICBlbHNlIGlmIChlbGVtZW50Lmhhc1N0eWxlQ2xhc3MoImNvbnRlbnQiKSkKLSAgICAgICAgICAg ICAgICBiZ0NvbG9yID0gV2ViSW5zcGVjdG9yLkNvbG9yLlBhZ2VIaWdobGlnaHQuQ29udGVudC50 b1N0cmluZygib3JpZ2luYWwiKTsKLSAgICAgICAgICAgIGlmIChiZ0NvbG9yKQotICAgICAgICAg ICAgICAgIGVsZW1lbnQuc3R5bGUuYmFja2dyb3VuZENvbG9yID0gYmdDb2xvcjsKLSAgICAgICAg fQotCi0gICAgICAgIGZ1bmN0aW9uIGhhbmRsZU1vdXNlT3V0KGVsZW1lbnQpCi0gICAgICAgIHsK LSAgICAgICAgICAgIGVsZW1lbnQuc3R5bGUuYmFja2dyb3VuZENvbG9yID0gIiI7Ci0gICAgICAg ICAgICBlbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImhvdmVyZWQiKTsKLSAgICAgICAgfQotCi0g ICAgICAgIGlmIChzaG93SGlnaGxpZ2h0KSB7Ci0gICAgICAgICAgICAvLyBJbnRvIGVsZW1lbnQu Ci0gICAgICAgICAgICBpZiAodGhpcy5ub2RlICYmIHRvRWxlbWVudCkKLSAgICAgICAgICAgICAg ICBoYW5kbGVNb3VzZU92ZXIodG9FbGVtZW50KTsKKyAgICAgICAgaWYgKHNob3dIaWdobGlnaHQp CiAgICAgICAgICAgICB2YXIgbm9kZUlkID0gdGhpcy5ub2RlID8gdGhpcy5ub2RlLmlkIDogMDsK LSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIC8vIE91dCBvZiBlbGVtZW50LgotICAgICAg ICAgICAgaWYgKGZyb21FbGVtZW50KQotICAgICAgICAgICAgICAgIGhhbmRsZU1vdXNlT3V0KGZy b21FbGVtZW50KTsKKyAgICAgICAgZWxzZQogICAgICAgICAgICAgdmFyIG5vZGVJZCA9IDA7Ci0g ICAgICAgIH0KKwogICAgICAgICBpZiAobm9kZUlkKSB7CiAgICAgICAgICAgICBpZiAodGhpcy5f aGlnaGxpZ2h0TW9kZSA9PT0gbW9kZSkKICAgICAgICAgICAgICAgICByZXR1cm47CkBAIC0yNDgs NiArMjE5LDEzIEBAIFdlYkluc3BlY3Rvci5NZXRyaWNzU2lkZWJhclBhbmUucHJvdG90eXBlID0g ewogICAgICAgICB9OwogCiAgICAgICAgIHZhciBib3hlcyA9IFsiY29udGVudCIsICJwYWRkaW5n IiwgImJvcmRlciIsICJtYXJnaW4iLCAicG9zaXRpb24iXTsKKyAgICAgICAgdmFyIGJveENvbG9y cyA9IFsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5Db2xvci5QYWdlSGlnaGxpZ2h0LkNvbnRl bnQsCisgICAgICAgICAgICBXZWJJbnNwZWN0b3IuQ29sb3IuUGFnZUhpZ2hsaWdodC5QYWRkaW5n LAorICAgICAgICAgICAgV2ViSW5zcGVjdG9yLkNvbG9yLlBhZ2VIaWdobGlnaHQuQm9yZGVyLAor ICAgICAgICAgICAgV2ViSW5zcGVjdG9yLkNvbG9yLlBhZ2VIaWdobGlnaHQuTWFyZ2luLAorICAg ICAgICAgICAgV2ViSW5zcGVjdG9yLkNvbG9yLmZyb21SR0JBKDAsIDAsIDAsIDApCisgICAgICAg IF07CiAgICAgICAgIHZhciBib3hMYWJlbHMgPSBbV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJjb250 ZW50IiksIFdlYkluc3BlY3Rvci5VSVN0cmluZygicGFkZGluZyIpLCBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoImJvcmRlciIpLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIm1hcmdpbiIpLCBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoInBvc2l0aW9uIildOwogICAgICAgICB2YXIgcHJldmlvdXNCb3g7CiAg ICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgYm94ZXMubGVuZ3RoOyArK2kpIHsKQEAgLTI2Miw2 ICsyNDAsNyBAQCBXZWJJbnNwZWN0b3IuTWV0cmljc1NpZGViYXJQYW5lLnByb3RvdHlwZSA9IHsK IAogICAgICAgICAgICAgdmFyIGJveEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJk aXYiKTsKICAgICAgICAgICAgIGJveEVsZW1lbnQuY2xhc3NOYW1lID0gbmFtZTsKKyAgICAgICAg ICAgIGJveEVsZW1lbnQuc3R5bGUuYmFja2dyb3VuZENvbG9yID0gYm94Q29sb3JzW2ldLnRvU3Ry aW5nKCJvcmlnaW5hbCIpOyAKICAgICAgICAgICAgIGJveEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5l cigibW91c2VvdmVyIiwgdGhpcy5faGlnaGxpZ2h0RE9NTm9kZS5iaW5kKHRoaXMsIHRydWUsIG5h bWUgPT09ICJwb3NpdGlvbiIgPyAiYWxsIiA6IG5hbWUpLCBmYWxzZSk7CiAgICAgICAgICAgICBi b3hFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlb3V0IiwgdGhpcy5faGlnaGxpZ2h0RE9N Tm9kZS5iaW5kKHRoaXMsIGZhbHNlLCAiIiksIGZhbHNlKTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCmluZGV4IDY0NGE2ODYwYzI4YmQ1 OTkzYmE4NTAxYzI0MjI1ZmExNzg1M2ZjMTguLjMwYmU3ZGY4MGFmZGRmYTM1MWIxY2FmYjNhM2Fk OTdiOWJkNTgzNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvaW5zcGVjdG9yLmNzcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5jc3MKQEAgLTE4NTYsMTkgKzE4NTYsMTMgQEAgYm9keS5wbGF0Zm9ybS13aW5k b3dzIC5zaWRlYmFyLXBhbmUtc3VidGl0bGUgewogCiAubWV0cmljcyAubGFiZWwgewogICAgIHBv c2l0aW9uOiBhYnNvbHV0ZTsKLSAgICBtYXJnaW4tdG9wOiAtMTBweDsKLSAgICBmb250LXNpemU6 IDlweDsKLSAgICBjb2xvcjogZ3JleTsKLSAgICBiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsKKyAg ICBmb250LXNpemU6IDEwcHg7CisgICAgY29sb3I6IGJsYWNrOwogICAgIG1hcmdpbi1sZWZ0OiAz cHg7CiAgICAgcGFkZGluZy1sZWZ0OiAycHg7CiAgICAgcGFkZGluZy1yaWdodDogMnB4OwogfQog Ci0ubWV0cmljcyAuaG92ZXJlZCA+IC5sYWJlbCB7Ci0gICAgYm9yZGVyOiAxcHggc29saWQgYmxh Y2s7Ci19Ci0KIC5tZXRyaWNzIC5wb3NpdGlvbiB7CiAgICAgYm9yZGVyOiAxcHggcmdiKDY2JSwg NjYlLCA2NiUpIGRvdHRlZDsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggNGM2Zjlh OGE3YzhjZjBhYmQ4Njc0ZTA4ZmQ1MDQzYmRjMjEyZjBlOC4uMTZkZTc3NTFkMTczMDU3MjNjZjNk MjYyNWU1NjZjN2U4ZmJlNGNjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9pbnNwZWN0b3IuanMKQEAgLTM0NywyNSArMzQ3LDE3IEBAIHZhciBXZWJJbnNwZWN0 b3IgPSB7CiAgICAgewogICAgICAgICBtb2RlID0gbW9kZSB8fCAiYWxsIjsKICAgICAgICAgdmFy IGhpZ2hsaWdodENvbmZpZyA9IHsgc2hvd0luZm86IG1vZGUgPT09ICJhbGwiIH07Ci0gICAgICAg IGlmIChtb2RlID09PSAiYWxsIiB8fCBtb2RlID09PSAiY29udGVudCIpIHsKKyAgICAgICAgaWYg KG1vZGUgPT09ICJhbGwiIHx8IG1vZGUgPT09ICJjb250ZW50IikKICAgICAgICAgICAgIGhpZ2hs aWdodENvbmZpZy5jb250ZW50Q29sb3IgPSBXZWJJbnNwZWN0b3IuQ29sb3IuUGFnZUhpZ2hsaWdo dC5Db250ZW50LnRvUHJvdG9jb2xSR0JBKCk7Ci0gICAgICAgICAgICBoaWdobGlnaHRDb25maWcu Y29udGVudE91dGxpbmVDb2xvciA9IFdlYkluc3BlY3Rvci5Db2xvci5QYWdlSGlnaGxpZ2h0LkNv bnRlbnRPdXRsaW5lLnRvUHJvdG9jb2xSR0JBKCk7Ci0gICAgICAgIH0KIAotICAgICAgICBpZiAo bW9kZSA9PT0gImFsbCIgfHwgbW9kZSA9PT0gInBhZGRpbmciKSB7CisgICAgICAgIGlmIChtb2Rl ID09PSAiYWxsIiB8fCBtb2RlID09PSAicGFkZGluZyIpCiAgICAgICAgICAgICBoaWdobGlnaHRD b25maWcucGFkZGluZ0NvbG9yID0gV2ViSW5zcGVjdG9yLkNvbG9yLlBhZ2VIaWdobGlnaHQuUGFk ZGluZy50b1Byb3RvY29sUkdCQSgpOwotICAgICAgICAgICAgaGlnaGxpZ2h0Q29uZmlnLnBhZGRp bmdPdXRsaW5lQ29sb3IgPSBXZWJJbnNwZWN0b3IuQ29sb3IuUGFnZUhpZ2hsaWdodC5QYWRkaW5n T3V0bGluZS50b1Byb3RvY29sUkdCQSgpOwotICAgICAgICB9CiAKLSAgICAgICAgaWYgKG1vZGUg PT09ICJhbGwiIHx8IG1vZGUgPT09ICJib3JkZXIiKSB7CisgICAgICAgIGlmIChtb2RlID09PSAi YWxsIiB8fCBtb2RlID09PSAiYm9yZGVyIikKICAgICAgICAgICAgIGhpZ2hsaWdodENvbmZpZy5i b3JkZXJDb2xvciA9IFdlYkluc3BlY3Rvci5Db2xvci5QYWdlSGlnaGxpZ2h0LkJvcmRlci50b1By b3RvY29sUkdCQSgpOwotICAgICAgICAgICAgaGlnaGxpZ2h0Q29uZmlnLmJvcmRlck91dGxpbmVD b2xvciA9IFdlYkluc3BlY3Rvci5Db2xvci5QYWdlSGlnaGxpZ2h0LkJvcmRlck91dGxpbmUudG9Q cm90b2NvbFJHQkEoKTsKLSAgICAgICAgfQogCi0gICAgICAgIGlmIChtb2RlID09PSAiYWxsIiB8 fCBtb2RlID09PSAibWFyZ2luIikgeworICAgICAgICBpZiAobW9kZSA9PT0gImFsbCIgfHwgbW9k ZSA9PT0gIm1hcmdpbiIpCiAgICAgICAgICAgICBoaWdobGlnaHRDb25maWcubWFyZ2luQ29sb3Ig PSBXZWJJbnNwZWN0b3IuQ29sb3IuUGFnZUhpZ2hsaWdodC5NYXJnaW4udG9Qcm90b2NvbFJHQkEo KTsKLSAgICAgICAgICAgIGhpZ2hsaWdodENvbmZpZy5tYXJnaW5PdXRsaW5lQ29sb3IgPSBXZWJJ bnNwZWN0b3IuQ29sb3IuUGFnZUhpZ2hsaWdodC5NYXJnaW5PdXRsaW5lLnRvUHJvdG9jb2xSR0JB KCk7Ci0gICAgICAgIH0KIAogICAgICAgICByZXR1cm4gaGlnaGxpZ2h0Q29uZmlnOwogICAgIH0s Cg== 108142 2011-09-21 06:31:35 -0700 2011-09-21 06:34:49 -0700 [Patch] for landing bug-68240-20110921173133.patch text/plain 22475 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTU2MjAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1Njk4NzUyMDg3MjhiNjg1 MjI1YzFlYmQxODYwZWI5MzNmMmFjZTUwLi4xZjNjYzc4YThkNTZhMzk5ZDdkNWY3YWI5ZWNhNWEx MWYzNjJjYTg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDktMjEgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IHBhaW50IGJveCBtb2RlbCBjb2xvcnMgaW4gTWV0cmljcyBzaWRlYmFyIGF0IGFsbCB0aW1lcywg ZG8gbm90IGRyYXcgYm94IG91dGxpbmVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjgyNDAKKworICAgICAgICBUb2RheSB3ZSBwYWludCBiYWNrZ3Jv dW5kcyBpbiBNZXRyaWNzIGJveCBtb2RlbCBvbiBob3ZlciBvbmx5IC0gc2hvdWxkIGJlIHBhaW50 ZWQgYXQgYWxsCisgICAgICAgIHRpbWVzIGZvciB0aGUgcmVmZXJlbmNlLiBPdXRsaW5pbmcgYm94 ZXMgaXMgaGlnaGxpZ2h0IGlzIHdyb25nIHNpbmNlIG91dGxpbmVzIGFyZSBvdXRzaWRlCisgICAg ICAgIHRoZSBjb3JyZXNwb25kaW5nIGJveCByZWdpb25zLiBXZSd2ZSBzZWVuIGZldyByZXBvcnRz IG9uIHRoYXQgKyBGaXJlYnVnIGRvZXMgbm90IGRvIGJvcmRlcnMKKyAgICAgICAgZm9yIHRoYXQg cmVhc29uLgorCisgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRza3kuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvRE9NTm9kZUhpZ2hsaWdodGVyLmNwcDoKKyAgICAgICAgKiBpbnNwZWN0 b3IvRE9NTm9kZUhpZ2hsaWdodGVyLmg6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5q c29uOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6c2V0SGlnaGxpZ2h0RGF0YUZyb21Db25maWcp OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29sb3IuanM6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9NZXRyaWNzU2lkZWJhclBhbmUuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuTWV0cmljc1NpZGViYXJQYW5lLnByb3RvdHlwZS5faGlnaGxpZ2h0RE9NTm9kZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuTWV0cmljc1NpZGViYXJQYW5lLnByb3RvdHlwZS5fdXBkYXRl TWV0cmljcyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzOgor ICAgICAgICAoLm1ldHJpY3MgLmxhYmVsKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5idWlsZEhpZ2hsaWdodENvbmZp Zyk6CisKIDIwMTEtMDktMjEgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgogCiAg ICAgICAgIFByb3RlY3QgYWdhaW5zdCBtaXN1c2Ugb2YgRXZlbnRMaXN0ZW5lckl0ZXJhdG9yLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0RPTU5vZGVIaWdobGlnaHRlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvRE9NTm9kZUhpZ2hsaWdodGVyLmNwcAppbmRl eCA3ODYxZTM2YWQwNWRmM2FlYjgxNTg4MjA4MWI4NWU1ZGNlNzRjNDljLi5lNjg5YjUyNTBiNmE4 NjhlYTVhNTUwZDZkYWFiYTI5NDVhNzhmNjlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvRE9NTm9kZUhpZ2hsaWdodGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvRE9NTm9kZUhpZ2hsaWdodGVyLmNwcApAQCAtOTksNTEgKzk5LDQ0IEBAIHZvaWQgZHJh d091dGxpbmVkUXVhZChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEZsb2F0UXVhZCYg cXVhZCwgY29uc3QgQ29sCiAgICAgY29udGV4dC5maWxsUGF0aChxdWFkUGF0aCk7CiB9CiAKLXZv aWQgZHJhd091dGxpbmVkUXVhZFdpdGhDbGlwKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29u c3QgRmxvYXRRdWFkJiBxdWFkLCBjb25zdCBGbG9hdFF1YWQmIGNsaXBRdWFkLCBjb25zdCBDb2xv ciYgZmlsbENvbG9yLCBjb25zdCBDb2xvciYgb3V0bGluZUNvbG9yKQordm9pZCBkcmF3T3V0bGlu ZWRRdWFkV2l0aENsaXAoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBGbG9hdFF1YWQm IHF1YWQsIGNvbnN0IEZsb2F0UXVhZCYgY2xpcFF1YWQsIGNvbnN0IENvbG9yJiBmaWxsQ29sb3Ip CiB7CiAgICAgY29udGV4dC5zYXZlKCk7CiAgICAgUGF0aCBjbGlwUXVhZFBhdGggPSBxdWFkVG9Q YXRoKGNsaXBRdWFkKTsKICAgICBjb250ZXh0LmNsaXBPdXQoY2xpcFF1YWRQYXRoKTsKLSAgICBk cmF3T3V0bGluZWRRdWFkKGNvbnRleHQsIHF1YWQsIGZpbGxDb2xvciwgb3V0bGluZUNvbG9yKTsK KyAgICBkcmF3T3V0bGluZWRRdWFkKGNvbnRleHQsIHF1YWQsIGZpbGxDb2xvciwgQ29sb3I6OnRy YW5zcGFyZW50KTsKICAgICBjb250ZXh0LnJlc3RvcmUoKTsKIH0KIAogdm9pZCBkcmF3SGlnaGxp Z2h0Rm9yQm94KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgRmxvYXRRdWFkJiBjb250 ZW50UXVhZCwgY29uc3QgRmxvYXRRdWFkJiBwYWRkaW5nUXVhZCwgY29uc3QgRmxvYXRRdWFkJiBi b3JkZXJRdWFkLCBjb25zdCBGbG9hdFF1YWQmIG1hcmdpblF1YWQsIEhpZ2hsaWdodERhdGEqIGhp Z2hsaWdodERhdGEpCiB7Ci0gICAgYm9vbCBoYXNNYXJnaW4gPSBoaWdobGlnaHREYXRhLT5tYXJn aW4gIT0gQ29sb3I6OnRyYW5zcGFyZW50IHx8IGhpZ2hsaWdodERhdGEtPm1hcmdpbk91dGxpbmUg IT0gQ29sb3I6OnRyYW5zcGFyZW50OwotICAgIGJvb2wgaGFzQm9yZGVyID0gaGlnaGxpZ2h0RGF0 YS0+Ym9yZGVyICE9IENvbG9yOjp0cmFuc3BhcmVudCB8fCBoaWdobGlnaHREYXRhLT5ib3JkZXJP dXRsaW5lICE9IENvbG9yOjp0cmFuc3BhcmVudDsKLSAgICBib29sIGhhc1BhZGRpbmcgPSBoaWdo bGlnaHREYXRhLT5wYWRkaW5nICE9IENvbG9yOjp0cmFuc3BhcmVudCB8fCBoaWdobGlnaHREYXRh LT5wYWRkaW5nT3V0bGluZSAhPSBDb2xvcjo6dHJhbnNwYXJlbnQ7CisgICAgYm9vbCBoYXNNYXJn aW4gPSBoaWdobGlnaHREYXRhLT5tYXJnaW4gIT0gQ29sb3I6OnRyYW5zcGFyZW50OworICAgIGJv b2wgaGFzQm9yZGVyID0gaGlnaGxpZ2h0RGF0YS0+Ym9yZGVyICE9IENvbG9yOjp0cmFuc3BhcmVu dDsKKyAgICBib29sIGhhc1BhZGRpbmcgPSBoaWdobGlnaHREYXRhLT5wYWRkaW5nICE9IENvbG9y Ojp0cmFuc3BhcmVudDsKICAgICBib29sIGhhc0NvbnRlbnQgPSBoaWdobGlnaHREYXRhLT5jb250 ZW50ICE9IENvbG9yOjp0cmFuc3BhcmVudCB8fCBoaWdobGlnaHREYXRhLT5jb250ZW50T3V0bGlu ZSAhPSBDb2xvcjo6dHJhbnNwYXJlbnQ7CiAKICAgICBGbG9hdFF1YWQgY2xpcFF1YWQ7CiAgICAg Q29sb3IgY2xpcENvbG9yOwogICAgIGlmIChoYXNNYXJnaW4gJiYgKCFoYXNCb3JkZXIgfHwgbWFy Z2luUXVhZCAhPSBib3JkZXJRdWFkKSkgewotICAgICAgICBkcmF3T3V0bGluZWRRdWFkV2l0aENs aXAoY29udGV4dCwgbWFyZ2luUXVhZCwgYm9yZGVyUXVhZCwgaGlnaGxpZ2h0RGF0YS0+bWFyZ2lu LCBoaWdobGlnaHREYXRhLT5tYXJnaW5PdXRsaW5lKTsKKyAgICAgICAgZHJhd091dGxpbmVkUXVh ZFdpdGhDbGlwKGNvbnRleHQsIG1hcmdpblF1YWQsIGJvcmRlclF1YWQsIGhpZ2hsaWdodERhdGEt Pm1hcmdpbik7CiAgICAgICAgIGNsaXBRdWFkID0gYm9yZGVyUXVhZDsKLSAgICAgICAgY2xpcENv bG9yID0gaGlnaGxpZ2h0RGF0YS0+bWFyZ2luT3V0bGluZTsKICAgICB9CiAgICAgaWYgKGhhc0Jv cmRlciAmJiAoIWhhc1BhZGRpbmcgfHwgYm9yZGVyUXVhZCAhPSBwYWRkaW5nUXVhZCkpIHsKLSAg ICAgICAgZHJhd091dGxpbmVkUXVhZFdpdGhDbGlwKGNvbnRleHQsIGJvcmRlclF1YWQsIHBhZGRp bmdRdWFkLCBoaWdobGlnaHREYXRhLT5ib3JkZXIsIGhpZ2hsaWdodERhdGEtPmJvcmRlck91dGxp bmUpOworICAgICAgICBkcmF3T3V0bGluZWRRdWFkV2l0aENsaXAoY29udGV4dCwgYm9yZGVyUXVh ZCwgcGFkZGluZ1F1YWQsIGhpZ2hsaWdodERhdGEtPmJvcmRlcik7CiAgICAgICAgIGNsaXBRdWFk ID0gcGFkZGluZ1F1YWQ7Ci0gICAgICAgIGNsaXBDb2xvciA9IGhpZ2hsaWdodERhdGEtPmJvcmRl ck91dGxpbmU7CiAgICAgfQogICAgIGlmIChoYXNQYWRkaW5nICYmICghaGFzQ29udGVudCB8fCBw YWRkaW5nUXVhZCAhPSBjb250ZW50UXVhZCkpIHsKLSAgICAgICAgZHJhd091dGxpbmVkUXVhZFdp dGhDbGlwKGNvbnRleHQsIHBhZGRpbmdRdWFkLCBjb250ZW50UXVhZCwgaGlnaGxpZ2h0RGF0YS0+ cGFkZGluZywgaGlnaGxpZ2h0RGF0YS0+cGFkZGluZ091dGxpbmUpOworICAgICAgICBkcmF3T3V0 bGluZWRRdWFkV2l0aENsaXAoY29udGV4dCwgcGFkZGluZ1F1YWQsIGNvbnRlbnRRdWFkLCBoaWdo bGlnaHREYXRhLT5wYWRkaW5nKTsKICAgICAgICAgY2xpcFF1YWQgPSBjb250ZW50UXVhZDsKLSAg ICAgICAgY2xpcENvbG9yID0gaGlnaGxpZ2h0RGF0YS0+cGFkZGluZ091dGxpbmU7CiAgICAgfQog ICAgIGlmIChoYXNDb250ZW50KQogICAgICAgICBkcmF3T3V0bGluZWRRdWFkKGNvbnRleHQsIGNv bnRlbnRRdWFkLCBoaWdobGlnaHREYXRhLT5jb250ZW50LCBoaWdobGlnaHREYXRhLT5jb250ZW50 T3V0bGluZSk7Ci0gICAgZWxzZSB7Ci0gICAgICAgIGlmIChjbGlwQ29sb3IuaXNWYWxpZCgpKQot ICAgICAgICAgICAgZHJhd091dGxpbmVkUXVhZFdpdGhDbGlwKGNvbnRleHQsIGNsaXBRdWFkLCBj bGlwUXVhZCwgY2xpcENvbG9yLCBjbGlwQ29sb3IpOwotICAgIH0KIH0KIAogdm9pZCBkcmF3SGln aGxpZ2h0Rm9yTGluZUJveGVzT3JTVkdSZW5kZXJlcihHcmFwaGljc0NvbnRleHQmIGNvbnRleHQs IGNvbnN0IFZlY3RvcjxGbG9hdFF1YWQ+JiBsaW5lQm94UXVhZHMsIEhpZ2hsaWdodERhdGEqIGhp Z2hsaWdodERhdGEpCiB7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsaW5lQm94UXVhZHMu c2l6ZSgpOyArK2kpCi0gICAgICAgIGRyYXdPdXRsaW5lZFF1YWQoY29udGV4dCwgbGluZUJveFF1 YWRzW2ldLCBoaWdobGlnaHREYXRhLT5jb250ZW50LCBoaWdobGlnaHREYXRhLT5jb250ZW50T3V0 bGluZSk7CisgICAgICAgIGRyYXdPdXRsaW5lZFF1YWQoY29udGV4dCwgbGluZUJveFF1YWRzW2ld LCBoaWdobGlnaHREYXRhLT5jb250ZW50LCBDb2xvcjo6dHJhbnNwYXJlbnQpOwogfQogCiBpbmxp bmUgTGF5b3V0U2l6ZSBmcmFtZVRvTWFpbkZyYW1lT2Zmc2V0KEZyYW1lKiBmcmFtZSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9ET01Ob2RlSGlnaGxpZ2h0ZXIuaCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9ET01Ob2RlSGlnaGxpZ2h0ZXIuaAppbmRleCBmYWM4YzE0 NGJiNTE1OGJjMTM4ZDU2OGEyMDRmOGIzYTQzMDU4OTI0Li40MmQ0NGQyZjE5ZGM2YzU2Yzk1NTM0 MWMwMGZmYjVjMWRlNjNhZTkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv RE9NTm9kZUhpZ2hsaWdodGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0RPTU5v ZGVIaWdobGlnaHRlci5oCkBAIC00NiwxMSArNDYsOCBAQCBzdHJ1Y3QgSGlnaGxpZ2h0RGF0YSB7 CiAgICAgQ29sb3IgY29udGVudDsKICAgICBDb2xvciBjb250ZW50T3V0bGluZTsKICAgICBDb2xv ciBwYWRkaW5nOwotICAgIENvbG9yIHBhZGRpbmdPdXRsaW5lOwogICAgIENvbG9yIGJvcmRlcjsK LSAgICBDb2xvciBib3JkZXJPdXRsaW5lOwogICAgIENvbG9yIG1hcmdpbjsKLSAgICBDb2xvciBt YXJnaW5PdXRsaW5lOwogICAgIGJvb2wgc2hvd0luZm87CiAKICAgICAvLyBFaXRoZXIgb2YgdGhl c2UgbXVzdCBiZSAwLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3Rvci5qc29uIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCmluZGV4 IGZmZDI3OWNkODI1OGY0ZmNjM2VhY2ZmMzliZTMyOWNmMDE5MmY2ZWYuLmZhNzk4OTJlYzE0MDk1 YjYyMGRhOWY2NDAxZDliMDZiODQ3MjNmYzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3IuanNvbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yLmpzb24KQEAgLTg5MCwxOCArODkwLDE0IEBACiAgICAgICAgICAgICAgICAgImRlc2Ny aXB0aW9uIjogIkEgc3RydWN0dXJlIGhvbGRpbmcgYW4gUkdCQSBjb2xvci4iCiAgICAgICAgICAg ICB9LAogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJpZCI6ICJCb3hIaWdobGlnaHRD b25maWciLAorICAgICAgICAgICAgICAgICJpZCI6ICJIaWdobGlnaHRDb25maWciLAogICAgICAg ICAgICAgICAgICJ0eXBlIjogIm9iamVjdCIsCiAgICAgICAgICAgICAgICAgInByb3BlcnRpZXMi OiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic2hvd0luZm8iLCAidHlwZSI6ICJi b29sZWFuIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIldoZXRoZXIgdGhlIG5v ZGUgaW5mbyB0b29sdGlwIHNob3VsZCBiZSBzaG93biAoZGVmYXVsdDogZmFsc2UpLiIgfSwKICAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjb250ZW50Q29sb3IiLCAiJHJlZiI6ICJSR0JB IiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlRoZSBjb250ZW50IGJveCBoaWdo bGlnaHQgZmlsbCBjb2xvciAoZGVmYXVsdDogdHJhbnNwYXJlbnQpLiIgfSwKLSAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJjb250ZW50T3V0bGluZUNvbG9yIiwgIiRyZWYiOiAiUkdCQSIs ICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJUaGUgY29udGVudCBib3ggaGlnaGxp Z2h0IG91dGxpbmUgY29sb3IgKGRlZmF1bHQ6IHRyYW5zcGFyZW50KS4iIH0sCiAgICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAicGFkZGluZ0NvbG9yIiwgIiRyZWYiOiAiUkdCQSIsICJvcHRp b25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJUaGUgcGFkZGluZyBoaWdobGlnaHQgZmlsbCBj b2xvciAoZGVmYXVsdDogdHJhbnNwYXJlbnQpLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJwYWRkaW5nT3V0bGluZUNvbG9yIiwgIiRyZWYiOiAiUkdCQSIsICJvcHRpb25hbCI6 IHRydWUsICJkZXNjcmlwdGlvbiI6ICJUaGUgcGFkZGluZyBoaWdobGlnaHQgb3V0bGluZSBjb2xv ciAoZGVmYXVsdDogdHJhbnNwYXJlbnQpLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJib3JkZXJDb2xvciIsICIkcmVmIjogIlJHQkEiLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVz Y3JpcHRpb24iOiAiVGhlIGJvcmRlciBoaWdobGlnaHQgZmlsbCBjb2xvciAoZGVmYXVsdDogdHJh bnNwYXJlbnQpLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJib3JkZXJPdXRs aW5lQ29sb3IiLCAiJHJlZiI6ICJSR0JBIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9u IjogIlRoZSBib3JkZXIgaGlnaGxpZ2h0IG91dGxpbmUgY29sb3IgKGRlZmF1bHQ6IHRyYW5zcGFy ZW50KS4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibWFyZ2luQ29sb3IiLCAi JHJlZiI6ICJSR0JBIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlRoZSBtYXJn aW4gaGlnaGxpZ2h0IGZpbGwgY29sb3IgKGRlZmF1bHQ6IHRyYW5zcGFyZW50KS4iIH0sCi0gICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibWFyZ2luT3V0bGluZUNvbG9yIiwgIiRyZWYiOiAi UkdCQSIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJUaGUgbWFyZ2luIGhpZ2hs aWdodCBvdXRsaW5lIGNvbG9yIChkZWZhdWx0OiB0cmFuc3BhcmVudCkuIiB9CiAgICAgICAgICAg ICAgICAgXSwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiQ29uZmlndXJhdGlvbiBk YXRhIGZvciB0aGUgaGlnaGxpZ2h0aW5nIG9mIHBhZ2UgZWxlbWVudHMuIgogICAgICAgICAgICAg fQpAQCAtOTMwLDcgKzkyNiw3IEBACiAgICAgICAgICAgICAgICAgInJldHVybnMiOiBbCiAgICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibm9kZUlkIiwgIiRyZWYiOiAiTm9kZUlkIiwgImRl c2NyaXB0aW9uIjogIlF1ZXJ5IHNlbGVjdG9yIHJlc3VsdC4iIH0KICAgICAgICAgICAgICAgICBd LAotICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJFeGVjdXRlcyA8Y29kZT5xdWVyeVNl bGVjdG9yPC9jb2RlPiBvbiBhIGdpdmVuIG5vZGUuIFNldHRpbmcgPGNvZGU+ZG9jdW1lbnRXaWRl PC9jb2RlPiB0byB0cnVlIHN0YXJ0cyBzZWxlY3RpbmcgZnJvbSB0aGUgZG9jdW1lbnQgbm9kZS4i CisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGVzIDxjb2RlPnF1ZXJ5U2Vs ZWN0b3I8L2NvZGU+IG9uIGEgZ2l2ZW4gbm9kZS4iCiAgICAgICAgICAgICB9LAogICAgICAgICAg ICAgewogICAgICAgICAgICAgICAgICJuYW1lIjogInF1ZXJ5U2VsZWN0b3JBbGwiLApAQCAtOTQx LDcgKzkzNyw3IEBACiAgICAgICAgICAgICAgICAgInJldHVybnMiOiBbCiAgICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAibm9kZUlkcyIsICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAi JHJlZiI6ICJOb2RlSWQiIH0sICJkZXNjcmlwdGlvbiI6ICJRdWVyeSBzZWxlY3RvciByZXN1bHQu IiB9CiAgICAgICAgICAgICAgICAgXSwKLSAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAi RXhlY3V0ZXMgPGNvZGU+cXVlcnlTZWxlY3RvckFsbDwvY29kZT4gb24gYSBnaXZlbiBub2RlLiBT ZXR0aW5nIDxjb2RlPmRvY3VtZW50V2lkZTwvY29kZT4gdG8gdHJ1ZSBzdGFydHMgc2VsZWN0aW5n IGZyb20gdGhlIGRvY3VtZW50IG5vZGUuIgorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6 ICJFeGVjdXRlcyA8Y29kZT5xdWVyeVNlbGVjdG9yQWxsPC9jb2RlPiBvbiBhIGdpdmVuIG5vZGUu IgogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAibmFtZSI6 ICJzZXROb2RlTmFtZSIsCkBAIC0xMDY0LDcgKzEwNjAsNyBAQAogICAgICAgICAgICAgICAgICJo aWRkZW4iOiB0cnVlLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwogICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogImVuYWJsZWQiLCAidHlwZSI6ICJib29sZWFuIiwgImRlc2Ny aXB0aW9uIjogIlRydWUgdG8gZW5hYmxlIGluc3BlY3Rpb24gbW9kZSwgZmFsc2UgdG8gZGlzYWJs ZSBpdC4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaGlnaGxpZ2h0Q29uZmln IiwgIiRyZWYiOiAiQm94SGlnaGxpZ2h0Q29uZmlnIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2Ny aXB0aW9uIjogIkEgZGVzY3JpcHRvciBmb3IgdGhlIGhpZ2hsaWdodCBhcHBlYXJhbmNlIG9mIGhv dmVyZWQtb3ZlciBub2Rlcy4gTWF5IGJlIG9taXR0ZWQgaWYgPGNvZGU+ZW5hYmxlZCA9PSBmYWxz ZTwvY29kZT4uIiB9CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaGlnaGxpZ2h0Q29u ZmlnIiwgIiRyZWYiOiAiSGlnaGxpZ2h0Q29uZmlnIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2Ny aXB0aW9uIjogIkEgZGVzY3JpcHRvciBmb3IgdGhlIGhpZ2hsaWdodCBhcHBlYXJhbmNlIG9mIGhv dmVyZWQtb3ZlciBub2Rlcy4gTWF5IGJlIG9taXR0ZWQgaWYgPGNvZGU+ZW5hYmxlZCA9PSBmYWxz ZTwvY29kZT4uIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAgICAiZGVzY3Jp cHRpb24iOiAiRW50ZXJzIHRoZSAnaW5zcGVjdCcgbW9kZS4gSW4gdGhpcyBtb2RlLCBlbGVtZW50 cyB0aGF0IHVzZXIgaXMgaG92ZXJpbmcgb3ZlciBhcmUgaGlnaGxpZ2h0ZWQuIEJhY2tlbmQgdGhl biBnZW5lcmF0ZXMgJ2luc3BlY3QnIGNvbW1hbmQgdXBvbiBlbGVtZW50IHNlbGVjdGlvbi4iCiAg ICAgICAgICAgICB9LApAQCAtMTA4NCw3ICsxMDgwLDcgQEAKICAgICAgICAgICAgICAgICAibmFt ZSI6ICJoaWdobGlnaHROb2RlIiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKICAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJub2RlSWQiLCAiJHJlZiI6ICJOb2RlSWQiLCAi ZGVzY3JpcHRpb24iOiAiSWRlbnRpZmllciBvZiB0aGUgbm9kZSB0byBoaWdobGlnaHQuIiB9LAot ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImhpZ2hsaWdodENvbmZpZyIsICIkcmVmIjog IkJveEhpZ2hsaWdodENvbmZpZyIsICJkZXNjcmlwdGlvbiI6ICJBIGRlc2NyaXB0b3IgZm9yIHRo ZSBoaWdobGlnaHQgYXBwZWFyYW5jZS4iIH0KKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJoaWdobGlnaHRDb25maWciLCAiJHJlZiI6ICJIaWdobGlnaHRDb25maWciLCAiZGVzY3JpcHRp b24iOiAiQSBkZXNjcmlwdG9yIGZvciB0aGUgaGlnaGxpZ2h0IGFwcGVhcmFuY2UuIiB9CiAgICAg ICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiSGlnaGxpZ2h0 cyBET00gbm9kZSB3aXRoIGdpdmVuIGlkLiIKICAgICAgICAgICAgIH0sCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAppbmRleCA3NTNkNTI2YmRlMDAw MzBjM2YwZGZhOTQwYmI5OWJlMGNlYTZiMGJiLi41MjNlOTNjYWFkNDQwZDZjOWFkM2UxZjhkZGJm NWEzMmNhYzk3OGUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yRE9NQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JE T01BZ2VudC5jcHAKQEAgLTEwNTcsMTEgKzEwNTcsOCBAQCBib29sIEluc3BlY3RvckRPTUFnZW50 OjpzZXRIaWdobGlnaHREYXRhRnJvbUNvbmZpZyhJbnNwZWN0b3JPYmplY3QqIGhpZ2hsaWdodENv bgogICAgIG1faGlnaGxpZ2h0RGF0YS0+Y29udGVudCA9IHBhcnNlQ29uZmlnQ29sb3IoImNvbnRl bnRDb2xvciIsIGhpZ2hsaWdodENvbmZpZyk7CiAgICAgbV9oaWdobGlnaHREYXRhLT5jb250ZW50 T3V0bGluZSA9IHBhcnNlQ29uZmlnQ29sb3IoImNvbnRlbnRPdXRsaW5lQ29sb3IiLCBoaWdobGln aHRDb25maWcpOwogICAgIG1faGlnaGxpZ2h0RGF0YS0+cGFkZGluZyA9IHBhcnNlQ29uZmlnQ29s b3IoInBhZGRpbmdDb2xvciIsIGhpZ2hsaWdodENvbmZpZyk7Ci0gICAgbV9oaWdobGlnaHREYXRh LT5wYWRkaW5nT3V0bGluZSA9IHBhcnNlQ29uZmlnQ29sb3IoInBhZGRpbmdPdXRsaW5lQ29sb3Ii LCBoaWdobGlnaHRDb25maWcpOwogICAgIG1faGlnaGxpZ2h0RGF0YS0+Ym9yZGVyID0gcGFyc2VD b25maWdDb2xvcigiYm9yZGVyQ29sb3IiLCBoaWdobGlnaHRDb25maWcpOwotICAgIG1faGlnaGxp Z2h0RGF0YS0+Ym9yZGVyT3V0bGluZSA9IHBhcnNlQ29uZmlnQ29sb3IoImJvcmRlck91dGxpbmVD b2xvciIsIGhpZ2hsaWdodENvbmZpZyk7CiAgICAgbV9oaWdobGlnaHREYXRhLT5tYXJnaW4gPSBw YXJzZUNvbmZpZ0NvbG9yKCJtYXJnaW5Db2xvciIsIGhpZ2hsaWdodENvbmZpZyk7Ci0gICAgbV9o aWdobGlnaHREYXRhLT5tYXJnaW5PdXRsaW5lID0gcGFyc2VDb25maWdDb2xvcigibWFyZ2luT3V0 bGluZUNvbG9yIiwgaGlnaGxpZ2h0Q29uZmlnKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db2xvci5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29sb3IuanMKaW5kZXggMmM1YmEwM2E2 MzAwYzNiY2M1NjJlOTM1MzhjMjIyMmRlM2NmZjNkZC4uMzIyMmFkZTRjMmMwZmM0NjE5YjRjNzcy OWQ0ZjZhNmFjNjI1OTdhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Db2xvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0NvbG9yLmpzCkBAIC02ODQsMTEgKzY4NCwxMiBAQCBXZWJJbnNwZWN0b3IuQ29sb3IuQWR2YW5j ZWROaWNrTmFtZXMgPSB7CiAKIFdlYkluc3BlY3Rvci5Db2xvci5QYWdlSGlnaGxpZ2h0ID0gewog ICAgIENvbnRlbnQ6IFdlYkluc3BlY3Rvci5Db2xvci5mcm9tUkdCQSgxMTEsIDE2OCwgMjIwLCAu NjYpLAorICAgIENvbnRlbnRMaWdodDogV2ViSW5zcGVjdG9yLkNvbG9yLmZyb21SR0JBKDExMSwg MTY4LCAyMjAsIC41KSwKICAgICBDb250ZW50T3V0bGluZTogV2ViSW5zcGVjdG9yLkNvbG9yLmZy b21SR0JBKDksIDgzLCAxNDgpLAogICAgIFBhZGRpbmc6IFdlYkluc3BlY3Rvci5Db2xvci5mcm9t UkdCQSgxNDcsIDE5NiwgMTI1LCAuNTUpLAotICAgIFBhZGRpbmdPdXRsaW5lOiBXZWJJbnNwZWN0 b3IuQ29sb3IuZnJvbVJHQkEoNTUsIDExOCwgMjgpLAorICAgIFBhZGRpbmdMaWdodDogV2ViSW5z cGVjdG9yLkNvbG9yLmZyb21SR0JBKDE0NywgMTk2LCAxMjUsIC40KSwKICAgICBCb3JkZXI6IFdl Ykluc3BlY3Rvci5Db2xvci5mcm9tUkdCQSgyNTUsIDIyOSwgMTUzLCAuNjYpLAotICAgIEJvcmRl ck91dGxpbmU6IFdlYkluc3BlY3Rvci5Db2xvci5mcm9tUkdCQSgxMjcsIDk2LCAwKSwKKyAgICBC b3JkZXJMaWdodDogV2ViSW5zcGVjdG9yLkNvbG9yLmZyb21SR0JBKDI1NSwgMjI5LCAxNTMsIC41 KSwKICAgICBNYXJnaW46IFdlYkluc3BlY3Rvci5Db2xvci5mcm9tUkdCQSgyNDYsIDE3OCwgMTA3 LCAuNjYpLAotICAgIE1hcmdpbk91dGxpbmU6IFdlYkluc3BlY3Rvci5Db2xvci5mcm9tUkdCQSgx ODAsIDk1LCA0KQotfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKKyAgICBNYXJnaW5MaWdo dDogV2ViSW5zcGVjdG9yLkNvbG9yLmZyb21SR0JBKDI0NiwgMTc4LCAxMDcsIC41KQorfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9NZXRyaWNzU2lkZWJh clBhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL01ldHJpY3NTaWRl YmFyUGFuZS5qcwppbmRleCA1MDMwNzA3YThkYjg3NmRiNDgyZDQ3NmU1ZDE4OTI4Mzk0MjM2NmQ5 Li5lMTI5NzYzZWMzNjE0OTFmMzBhODNmOTM1NTEyYTc3ZGQwM2QzNWRmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL01ldHJpY3NTaWRlYmFyUGFuZS5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL01ldHJpY3NTaWRlYmFyUGFu ZS5qcwpAQCAtMTAxLDc0ICsxMDEsMjUgQEAgV2ViSW5zcGVjdG9yLk1ldHJpY3NTaWRlYmFyUGFu ZS5wcm90b3R5cGUgPSB7CiAKICAgICBfaGlnaGxpZ2h0RE9NTm9kZTogZnVuY3Rpb24oc2hvd0hp Z2hsaWdodCwgbW9kZSwgZXZlbnQpCiAgICAgewotICAgICAgICBmdW5jdGlvbiBlbmNsb3NpbmdP clNlbGZXaXRoQ2xhc3NJbkFycmF5KGVsZW1lbnQsIGNsYXNzTmFtZXMpCi0gICAgICAgIHsKLSAg ICAgICAgICAgIGZvciAodmFyIG5vZGUgPSBlbGVtZW50OyBub2RlICYmIG5vZGUgIT09IGVsZW1l bnQub3duZXJEb2N1bWVudDsgbm9kZSA9IG5vZGUucGFyZW50Tm9kZSkgewotICAgICAgICAgICAg ICAgIGlmIChub2RlLm5vZGVUeXBlID09PSBOb2RlLkVMRU1FTlRfTk9ERSkgewotICAgICAgICAg ICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGNsYXNzTmFtZXMubGVuZ3RoOyArK2kpIHsK LSAgICAgICAgICAgICAgICAgICAgICAgIGlmIChub2RlLmhhc1N0eWxlQ2xhc3MoY2xhc3NOYW1l c1tpXSkpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIG5vZGU7Ci0gICAgICAg ICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9Ci0gICAgICAg ICAgICByZXR1cm4gbnVsbDsKLSAgICAgICAgfQotCi0gICAgICAgIGZ1bmN0aW9uIGdldEJveFJl Y3RhbmdsZUVsZW1lbnQoZWxlbWVudCkKLSAgICAgICAgewotICAgICAgICAgICAgaWYgKCFlbGVt ZW50KQotICAgICAgICAgICAgICAgIHJldHVybiBudWxsOwotICAgICAgICAgICAgcmV0dXJuIGVu Y2xvc2luZ09yU2VsZldpdGhDbGFzc0luQXJyYXkoZWxlbWVudCwgWyJtZXRyaWNzIiwgIm1hcmdp biIsICJib3JkZXIiLCAicGFkZGluZyIsICJjb250ZW50Il0pOwotICAgICAgICB9Ci0KICAgICAg ICAgZXZlbnQuc3RvcFByb3BhZ2F0aW9uKCk7Ci0gICAgICAgIHZhciBmcm9tRWxlbWVudCA9IGdl dEJveFJlY3RhbmdsZUVsZW1lbnQoZXZlbnQuZnJvbUVsZW1lbnQpOwotICAgICAgICB2YXIgdG9F bGVtZW50ID0gZ2V0Qm94UmVjdGFuZ2xlRWxlbWVudChldmVudC50b0VsZW1lbnQpOwotCi0gICAg ICAgIGlmIChmcm9tRWxlbWVudCA9PT0gdG9FbGVtZW50KQotICAgICAgICAgICAgcmV0dXJuOwot Ci0gICAgICAgIGZ1bmN0aW9uIGhhbmRsZU1vdXNlT3ZlcihlbGVtZW50KQotICAgICAgICB7Ci0g ICAgICAgICAgICBlbGVtZW50LmFkZFN0eWxlQ2xhc3MoImhvdmVyZWQiKTsKLQotICAgICAgICAg ICAgdmFyIGJnQ29sb3I7Ci0gICAgICAgICAgICBpZiAoZWxlbWVudC5oYXNTdHlsZUNsYXNzKCJt YXJnaW4iKSkKLSAgICAgICAgICAgICAgICBiZ0NvbG9yID0gV2ViSW5zcGVjdG9yLkNvbG9yLlBh Z2VIaWdobGlnaHQuTWFyZ2luLnRvU3RyaW5nKCJvcmlnaW5hbCIpOwotICAgICAgICAgICAgZWxz ZSBpZiAoZWxlbWVudC5oYXNTdHlsZUNsYXNzKCJib3JkZXIiKSkKLSAgICAgICAgICAgICAgICBi Z0NvbG9yID0gV2ViSW5zcGVjdG9yLkNvbG9yLlBhZ2VIaWdobGlnaHQuQm9yZGVyLnRvU3RyaW5n KCJvcmlnaW5hbCIpOwotICAgICAgICAgICAgZWxzZSBpZiAoZWxlbWVudC5oYXNTdHlsZUNsYXNz KCJwYWRkaW5nIikpCi0gICAgICAgICAgICAgICAgYmdDb2xvciA9IFdlYkluc3BlY3Rvci5Db2xv ci5QYWdlSGlnaGxpZ2h0LlBhZGRpbmcudG9TdHJpbmcoIm9yaWdpbmFsIik7Ci0gICAgICAgICAg ICBlbHNlIGlmIChlbGVtZW50Lmhhc1N0eWxlQ2xhc3MoImNvbnRlbnQiKSkKLSAgICAgICAgICAg ICAgICBiZ0NvbG9yID0gV2ViSW5zcGVjdG9yLkNvbG9yLlBhZ2VIaWdobGlnaHQuQ29udGVudC50 b1N0cmluZygib3JpZ2luYWwiKTsKLSAgICAgICAgICAgIGlmIChiZ0NvbG9yKQotICAgICAgICAg ICAgICAgIGVsZW1lbnQuc3R5bGUuYmFja2dyb3VuZENvbG9yID0gYmdDb2xvcjsKLSAgICAgICAg fQotCi0gICAgICAgIGZ1bmN0aW9uIGhhbmRsZU1vdXNlT3V0KGVsZW1lbnQpCi0gICAgICAgIHsK LSAgICAgICAgICAgIGVsZW1lbnQuc3R5bGUuYmFja2dyb3VuZENvbG9yID0gIiI7Ci0gICAgICAg ICAgICBlbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImhvdmVyZWQiKTsKLSAgICAgICAgfQotCi0g ICAgICAgIGlmIChzaG93SGlnaGxpZ2h0KSB7Ci0gICAgICAgICAgICAvLyBJbnRvIGVsZW1lbnQu Ci0gICAgICAgICAgICBpZiAodGhpcy5ub2RlICYmIHRvRWxlbWVudCkKLSAgICAgICAgICAgICAg ICBoYW5kbGVNb3VzZU92ZXIodG9FbGVtZW50KTsKLSAgICAgICAgICAgIHZhciBub2RlSWQgPSB0 aGlzLm5vZGUgPyB0aGlzLm5vZGUuaWQgOiAwOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAg ICAgLy8gT3V0IG9mIGVsZW1lbnQuCi0gICAgICAgICAgICBpZiAoZnJvbUVsZW1lbnQpCi0gICAg ICAgICAgICAgICAgaGFuZGxlTW91c2VPdXQoZnJvbUVsZW1lbnQpOwotICAgICAgICAgICAgdmFy IG5vZGVJZCA9IDA7Ci0gICAgICAgIH0KKyAgICAgICAgdmFyIG5vZGVJZCA9IHNob3dIaWdobGln aHQgJiYgdGhpcy5ub2RlID8gdGhpcy5ub2RlLmlkIDogMDsKICAgICAgICAgaWYgKG5vZGVJZCkg ewogICAgICAgICAgICAgaWYgKHRoaXMuX2hpZ2hsaWdodE1vZGUgPT09IG1vZGUpCiAgICAgICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgdGhpcy5faGlnaGxpZ2h0TW9kZSA9IG1vZGU7 Ci0gICAgICAgIH0gZWxzZQorICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmhpZ2hsaWdodERPTU5v ZGUobm9kZUlkLCBtb2RlKTsKKyAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGRlbGV0ZSB0 aGlzLl9oaWdobGlnaHRNb2RlOwotICAgICAgICBXZWJJbnNwZWN0b3IuaGlnaGxpZ2h0RE9NTm9k ZShub2RlSWQsIG1vZGUpOworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmhpZ2hsaWdodERPTU5v ZGUoMCwgIiIpOworICAgICAgICB9CisKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IHRoaXMuX2Jv eEVsZW1lbnRzICYmIGkgPCB0aGlzLl9ib3hFbGVtZW50cy5sZW5ndGg7ICsraSkgeworICAgICAg ICAgICAgdmFyIGVsZW1lbnQgPSB0aGlzLl9ib3hFbGVtZW50c1tpXTsKKyAgICAgICAgICAgIGlm ICghbm9kZUlkIHx8IG1vZGUgPT09ICJhbGwiIHx8IGVsZW1lbnQuX25hbWUgPT09IG1vZGUpCisg ICAgICAgICAgICAgICAgZWxlbWVudC5zdHlsZS5iYWNrZ3JvdW5kQ29sb3IgPSBlbGVtZW50Ll9i YWNrZ3JvdW5kQ29sb3I7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgZWxlbWVu dC5zdHlsZS5iYWNrZ3JvdW5kQ29sb3IgPSAiIjsKKyAgICAgICAgfQogICAgIH0sCiAKICAgICBf dXBkYXRlTWV0cmljczogZnVuY3Rpb24oc3R5bGUpCkBAIC0yNDgsOCArMTk5LDE2IEBAIFdlYklu c3BlY3Rvci5NZXRyaWNzU2lkZWJhclBhbmUucHJvdG90eXBlID0gewogICAgICAgICB9OwogCiAg ICAgICAgIHZhciBib3hlcyA9IFsiY29udGVudCIsICJwYWRkaW5nIiwgImJvcmRlciIsICJtYXJn aW4iLCAicG9zaXRpb24iXTsKKyAgICAgICAgdmFyIGJveENvbG9ycyA9IFsKKyAgICAgICAgICAg IFdlYkluc3BlY3Rvci5Db2xvci5QYWdlSGlnaGxpZ2h0LkNvbnRlbnQsCisgICAgICAgICAgICBX ZWJJbnNwZWN0b3IuQ29sb3IuUGFnZUhpZ2hsaWdodC5QYWRkaW5nLAorICAgICAgICAgICAgV2Vi SW5zcGVjdG9yLkNvbG9yLlBhZ2VIaWdobGlnaHQuQm9yZGVyLAorICAgICAgICAgICAgV2ViSW5z cGVjdG9yLkNvbG9yLlBhZ2VIaWdobGlnaHQuTWFyZ2luLAorICAgICAgICAgICAgV2ViSW5zcGVj dG9yLkNvbG9yLmZyb21SR0JBKDAsIDAsIDAsIDApCisgICAgICAgIF07CiAgICAgICAgIHZhciBi b3hMYWJlbHMgPSBbV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJjb250ZW50IiksIFdlYkluc3BlY3Rv ci5VSVN0cmluZygicGFkZGluZyIpLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoImJvcmRlciIpLCBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIm1hcmdpbiIpLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoInBv c2l0aW9uIildOwogICAgICAgICB2YXIgcHJldmlvdXNCb3g7CisgICAgICAgIHRoaXMuX2JveEVs ZW1lbnRzID0gW107CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgYm94ZXMubGVuZ3RoOyAr K2kpIHsKICAgICAgICAgICAgIHZhciBuYW1lID0gYm94ZXNbaV07CiAKQEAgLTI2Miw4ICsyMjEs MTEgQEAgV2ViSW5zcGVjdG9yLk1ldHJpY3NTaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAKICAg ICAgICAgICAgIHZhciBib3hFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7 CiAgICAgICAgICAgICBib3hFbGVtZW50LmNsYXNzTmFtZSA9IG5hbWU7CisgICAgICAgICAgICBi b3hFbGVtZW50Ll9iYWNrZ3JvdW5kQ29sb3IgPSBib3hDb2xvcnNbaV0udG9TdHJpbmcoIm9yaWdp bmFsIik7CisgICAgICAgICAgICBib3hFbGVtZW50Ll9uYW1lID0gbmFtZTsKKyAgICAgICAgICAg IGJveEVsZW1lbnQuc3R5bGUuYmFja2dyb3VuZENvbG9yID0gYm94RWxlbWVudC5fYmFja2dyb3Vu ZENvbG9yOwogICAgICAgICAgICAgYm94RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZW92 ZXIiLCB0aGlzLl9oaWdobGlnaHRET01Ob2RlLmJpbmQodGhpcywgdHJ1ZSwgbmFtZSA9PT0gInBv c2l0aW9uIiA/ICJhbGwiIDogbmFtZSksIGZhbHNlKTsKLSAgICAgICAgICAgIGJveEVsZW1lbnQu YWRkRXZlbnRMaXN0ZW5lcigibW91c2VvdXQiLCB0aGlzLl9oaWdobGlnaHRET01Ob2RlLmJpbmQo dGhpcywgZmFsc2UsICIiKSwgZmFsc2UpOworICAgICAgICAgICAgdGhpcy5fYm94RWxlbWVudHMu cHVzaChib3hFbGVtZW50KTsKIAogICAgICAgICAgICAgaWYgKG5hbWUgPT09ICJjb250ZW50Iikg ewogICAgICAgICAgICAgICAgIHZhciB3aWR0aEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJzcGFuIik7CkBAIC0zMDEsOCArMjYzLDcgQEAgV2ViSW5zcGVjdG9yLk1ldHJpY3NTaWRl YmFyUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KIAogICAgICAgICBtZXRyaWNzRWxlbWVu dC5hcHBlbmRDaGlsZChwcmV2aW91c0JveCk7Ci0gICAgICAgIG1ldHJpY3NFbGVtZW50LmFkZEV2 ZW50TGlzdGVuZXIoIm1vdXNlb3ZlciIsIHRoaXMuX2hpZ2hsaWdodERPTU5vZGUuYmluZCh0aGlz LCB0cnVlLCAiIiksIGZhbHNlKTsKLSAgICAgICAgbWV0cmljc0VsZW1lbnQuYWRkRXZlbnRMaXN0 ZW5lcigibW91c2VvdXQiLCB0aGlzLl9oaWdobGlnaHRET01Ob2RlLmJpbmQodGhpcywgZmFsc2Us ICIiKSwgZmFsc2UpOworICAgICAgICBtZXRyaWNzRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJt b3VzZW92ZXIiLCB0aGlzLl9oaWdobGlnaHRET01Ob2RlLmJpbmQodGhpcywgZmFsc2UsICIiKSwg ZmFsc2UpOwogICAgICAgICB0aGlzLmJvZHlFbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CiAgICAg ICAgIHRoaXMuYm9keUVsZW1lbnQuYXBwZW5kQ2hpbGQobWV0cmljc0VsZW1lbnQpOwogICAgIH0s CkBAIC00NTUsMTAgKzQxNiwxMiBAQCBXZWJJbnNwZWN0b3IuTWV0cmljc1NpZGViYXJQYW5lLnBy b3RvdHlwZSA9IHsKICAgICAgICAgICAgIHNlbGYuaW5saW5lU3R5bGUgPSBzdHlsZTsKICAgICAg ICAgICAgIGlmICghKCJvcmlnaW5hbFByb3BlcnR5RGF0YSIgaW4gc2VsZikpCiAgICAgICAgICAg ICAgICAgc2VsZi5vcmlnaW5hbFByb3BlcnR5RGF0YSA9IHNlbGYucHJldmlvdXNQcm9wZXJ0eURh dGFDYW5kaWRhdGU7Ci0gICAgICAgICAgICBpZiAoIl9oaWdobGlnaHRNb2RlIiBpbiBzZWxmKSB7 CisKKyAgICAgICAgICAgIGlmICh0eXBlb2Ygc2VsZi5faGlnaGxpZ2h0TW9kZSAhPT0gInVuZGVm aW5lZCIpIHsKICAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuaGlnaGxpZ2h0RE9NTm9kZSgw LCAiIik7CiAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmhpZ2hsaWdodERPTU5vZGUoc2Vs Zi5ub2RlLmlkLCBzZWxmLl9oaWdobGlnaHRNb2RlKTsKICAgICAgICAgICAgIH0KKwogICAgICAg ICAgICAgaWYgKGNvbW1pdEVkaXRvcikgewogICAgICAgICAgICAgICAgIHNlbGYuZGlzcGF0Y2hF dmVudFRvTGlzdGVuZXJzKCJtZXRyaWNzIGVkaXRlZCIpOwogICAgICAgICAgICAgICAgIHNlbGYu dXBkYXRlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5jc3MKaW5kZXggYzI3NTFhOTZlMzQ5MTBiZjM4ZWY3MTZkNjg1YTg2ODU4NmFjNGEyYi4u Mzg0MDU1NjJhYWFiNzg2NmY2MzVmMzA1YTdjMzA1MDNhMjgwZjAzMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcwpAQCAtMTg2OSwxOSAr MTg2OSwxMyBAQCBib2R5LnBsYXRmb3JtLXdpbmRvd3MgLnNpZGViYXItcGFuZS1zdWJ0aXRsZSB7 CiAKIC5tZXRyaWNzIC5sYWJlbCB7CiAgICAgcG9zaXRpb246IGFic29sdXRlOwotICAgIG1hcmdp bi10b3A6IC0xMHB4OwotICAgIGZvbnQtc2l6ZTogOXB4OwotICAgIGNvbG9yOiBncmV5OwotICAg IGJhY2tncm91bmQtY29sb3I6IHdoaXRlOworICAgIGZvbnQtc2l6ZTogMTBweDsKKyAgICBjb2xv cjogYmxhY2s7CiAgICAgbWFyZ2luLWxlZnQ6IDNweDsKICAgICBwYWRkaW5nLWxlZnQ6IDJweDsK ICAgICBwYWRkaW5nLXJpZ2h0OiAycHg7CiB9CiAKLS5tZXRyaWNzIC5ob3ZlcmVkID4gLmxhYmVs IHsKLSAgICBib3JkZXI6IDFweCBzb2xpZCBibGFjazsKLX0KLQogLm1ldHJpY3MgLnBvc2l0aW9u IHsKICAgICBib3JkZXI6IDFweCByZ2IoNjYlLCA2NiUsIDY2JSkgZG90dGVkOwogICAgIGJhY2tn cm91bmQtY29sb3I6IHdoaXRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL2luc3BlY3Rvci5qcwppbmRleCA1Y2Q3MjM1MGRmYWM2OGI5Y2Y5YTQ3YjBiM2I4Y2JkNDRi ZWIyZjJiLi4zYTRiYWQ4NzZmNWE0ZTc1OWRkMDEwYzM5MjQ1MjFiMTE2YWM0ZmY4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAtMzY4 LDI1ICszNjgsMTcgQEAgdmFyIFdlYkluc3BlY3RvciA9IHsKICAgICB7CiAgICAgICAgIG1vZGUg PSBtb2RlIHx8ICJhbGwiOwogICAgICAgICB2YXIgaGlnaGxpZ2h0Q29uZmlnID0geyBzaG93SW5m bzogbW9kZSA9PT0gImFsbCIgfTsKLSAgICAgICAgaWYgKG1vZGUgPT09ICJhbGwiIHx8IG1vZGUg PT09ICJjb250ZW50IikgeworICAgICAgICBpZiAobW9kZSA9PT0gImFsbCIgfHwgbW9kZSA9PT0g ImNvbnRlbnQiKQogICAgICAgICAgICAgaGlnaGxpZ2h0Q29uZmlnLmNvbnRlbnRDb2xvciA9IFdl Ykluc3BlY3Rvci5Db2xvci5QYWdlSGlnaGxpZ2h0LkNvbnRlbnQudG9Qcm90b2NvbFJHQkEoKTsK LSAgICAgICAgICAgIGhpZ2hsaWdodENvbmZpZy5jb250ZW50T3V0bGluZUNvbG9yID0gV2ViSW5z cGVjdG9yLkNvbG9yLlBhZ2VIaWdobGlnaHQuQ29udGVudE91dGxpbmUudG9Qcm90b2NvbFJHQkEo KTsKLSAgICAgICAgfQogCi0gICAgICAgIGlmIChtb2RlID09PSAiYWxsIiB8fCBtb2RlID09PSAi cGFkZGluZyIpIHsKKyAgICAgICAgaWYgKG1vZGUgPT09ICJhbGwiIHx8IG1vZGUgPT09ICJwYWRk aW5nIikKICAgICAgICAgICAgIGhpZ2hsaWdodENvbmZpZy5wYWRkaW5nQ29sb3IgPSBXZWJJbnNw ZWN0b3IuQ29sb3IuUGFnZUhpZ2hsaWdodC5QYWRkaW5nLnRvUHJvdG9jb2xSR0JBKCk7Ci0gICAg ICAgICAgICBoaWdobGlnaHRDb25maWcucGFkZGluZ091dGxpbmVDb2xvciA9IFdlYkluc3BlY3Rv ci5Db2xvci5QYWdlSGlnaGxpZ2h0LlBhZGRpbmdPdXRsaW5lLnRvUHJvdG9jb2xSR0JBKCk7Ci0g ICAgICAgIH0KIAotICAgICAgICBpZiAobW9kZSA9PT0gImFsbCIgfHwgbW9kZSA9PT0gImJvcmRl ciIpIHsKKyAgICAgICAgaWYgKG1vZGUgPT09ICJhbGwiIHx8IG1vZGUgPT09ICJib3JkZXIiKQog ICAgICAgICAgICAgaGlnaGxpZ2h0Q29uZmlnLmJvcmRlckNvbG9yID0gV2ViSW5zcGVjdG9yLkNv bG9yLlBhZ2VIaWdobGlnaHQuQm9yZGVyLnRvUHJvdG9jb2xSR0JBKCk7Ci0gICAgICAgICAgICBo aWdobGlnaHRDb25maWcuYm9yZGVyT3V0bGluZUNvbG9yID0gV2ViSW5zcGVjdG9yLkNvbG9yLlBh Z2VIaWdobGlnaHQuQm9yZGVyT3V0bGluZS50b1Byb3RvY29sUkdCQSgpOwotICAgICAgICB9CiAK LSAgICAgICAgaWYgKG1vZGUgPT09ICJhbGwiIHx8IG1vZGUgPT09ICJtYXJnaW4iKSB7CisgICAg ICAgIGlmIChtb2RlID09PSAiYWxsIiB8fCBtb2RlID09PSAibWFyZ2luIikKICAgICAgICAgICAg IGhpZ2hsaWdodENvbmZpZy5tYXJnaW5Db2xvciA9IFdlYkluc3BlY3Rvci5Db2xvci5QYWdlSGln aGxpZ2h0Lk1hcmdpbi50b1Byb3RvY29sUkdCQSgpOwotICAgICAgICAgICAgaGlnaGxpZ2h0Q29u ZmlnLm1hcmdpbk91dGxpbmVDb2xvciA9IFdlYkluc3BlY3Rvci5Db2xvci5QYWdlSGlnaGxpZ2h0 Lk1hcmdpbk91dGxpbmUudG9Qcm90b2NvbFJHQkEoKTsKLSAgICAgICAgfQogCiAgICAgICAgIHJl dHVybiBoaWdobGlnaHRDb25maWc7CiAgICAgfSwKQEAgLTM5OCw5ICszOTAsNiBAQCB2YXIgV2Vi SW5zcGVjdG9yID0gewogICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2hpZGVET01Ob2RlSGlnaGxp Z2h0VGltZW91dDsKICAgICAgICAgfQogCi0gICAgICAgIGlmICh0aGlzLl9oaWdobGlnaHRlZERP TU5vZGVJZCA9PT0gbm9kZUlkKQotICAgICAgICAgICAgcmV0dXJuOwotCiAgICAgICAgIHRoaXMu X2hpZ2hsaWdodGVkRE9NTm9kZUlkID0gbm9kZUlkOwogICAgICAgICBpZiAobm9kZUlkKQogICAg ICAgICAgICAgRE9NQWdlbnQuaGlnaGxpZ2h0Tm9kZShub2RlSWQsIHRoaXMuYnVpbGRIaWdobGln aHRDb25maWcobW9kZSkpOwo=