55131 2011-02-24 04:06:56 -0800 Web Inspector: move querySelectorAll from CSS agent to DOM agent where it belongs. 2011-02-24 09:54:19 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 356859 0 pfeldman 2011-02-24 04:06:56 -0800 Patch to follow. 356902 1 83638 pfeldman 2011-02-24 05:18:41 -0800 Created attachment 83638 Patch 356981 2 83655 pfeldman 2011-02-24 07:38:06 -0800 Created attachment 83655 Patch 357043 3 83655 yurys 2011-02-24 08:54:11 -0800 Comment on attachment 83655 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=83655&action=review > LayoutTests/inspector/elements/dom-agent-query-selector.html:32 > + InspectorTest.addResult("number of selected nodes: " + nodeIds.length); Should we print the ids here? 357121 4 pfeldman 2011-02-24 09:54:19 -0800 Committed r79583: <http://trac.webkit.org/changeset/79583> 83638 2011-02-24 05:18:41 -0800 2011-02-24 07:37:59 -0800 Patch bug-55131-20110224161838.patch text/plain 15929 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogNzk0MTIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAzZWRhMzI5NmJlOWRlZDNhYjkxZmJm Mzg3YmJhZWU2YWFiZGFmYzEwLi43NzQ5ODY4MzA2NTE3ZDVkNzY2MjEzN2EwN2JiMzY3NjU0ZDc4 YzE4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDItMjQgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogbW92ZSBxdWVyeVNlbGVjdG9yQWxsIGZyb20g Q1NTIGFnZW50IHRvIERPTSBhZ2VudCB3aGVyZSBpdCBiZWxvbmdzLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTUxMzEKKworICAgICAgICAqIGh0dHAv dGVzdHMvaW5zcGVjdG9yL2luc3BlY3Rvci10ZXN0LmpzOgorICAgICAgICAqIGluc3BlY3Rvci9l bGVtZW50cy9kb20tYWdlbnQtcXVlcnktc2VsZWN0b3ItZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAg ICAgICAgKiBpbnNwZWN0b3IvZWxlbWVudHMvZG9tLWFnZW50LXF1ZXJ5LXNlbGVjdG9yLmh0bWw6 IEFkZGVkLgorCiAyMDExLTAyLTIzICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5zcGVjdG9yLXRlc3QuanMgYi9MYXlv dXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9pbnNwZWN0b3ItdGVzdC5qcwppbmRleCAxYzZi NDM1YmUxMTZhMzhiODA2MDgyZmE3ZDRjYzVjMmIyMDg3YmRiLi43NDU1YjE0ZGQ5ZTdlMjk4ZTFl MjgxMzdjNjIxNjUyMjBiMjcwNWJmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L2luc3BlY3Rvci9pbnNwZWN0b3ItdGVzdC5qcworKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L2luc3BlY3Rvci9pbnNwZWN0b3ItdGVzdC5qcwpAQCAtNzQsNiArNzQsOSBAQCBJbnNwZWN0b3JU ZXN0LmFkZFJlc3VsdCA9IGZ1bmN0aW9uKHRleHQpCiAgICAgfQogfQogCitjb25zb2xlLmxvZyA9 IEluc3BlY3RvclRlc3QuYWRkUmVzdWx0OworY29uc29sZS5lcnJvciA9IEluc3BlY3RvclRlc3Qu YWRkUmVzdWx0OworCiBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdHMgPSBmdW5jdGlvbih0ZXh0QXJy YXkpCiB7CiAgICAgaWYgKCF0ZXh0QXJyYXkpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZWxlbWVudHMvZG9tLWFnZW50LXF1ZXJ5LXNlbGVjdG9yLWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy9kb20tYWdlbnQtcXVlcnktc2VsZWN0b3ItZXhw ZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjM5NTRjZThhYTc4MjVkNDU0MGFkOTk4NjM4NzYwODI4NjVl YmM4NmEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMv ZG9tLWFnZW50LXF1ZXJ5LXNlbGVjdG9yLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDcgQEAKK1Rl c3RzIERPTUFnZW50LnF1ZXJ5U2VsZWN0b3IgYW5kIERPTUFnZW50LnF1ZXJ5U2VsZWN0b3JBbGwu CisKK25vZGUgaWQ6IGlkMQorbnVtYmVyIG9mIHNlbGVjdGVkIG5vZGVzOiA2Citub2RlIGlkOiBp ZDMKK251bWJlciBvZiBzZWxlY3RlZCBub2RlczogNAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZWxlbWVudHMvZG9tLWFnZW50LXF1ZXJ5LXNlbGVjdG9yLmh0bWwgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMvZG9tLWFnZW50LXF1ZXJ5LXNlbGVjdG9yLmh0bWwK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uODczYjIzM2UzM2ExZmY3ZjE2MDE4ZWNiZDUwYWNlMWQxNDE2ZDhhMgotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy9kb20tYWdlbnQt cXVlcnktc2VsZWN0b3IuaHRtbApAQCAtMCwwICsxLDgwIEBACis8aHRtbD4KKzxoZWFkPgorCis8 c2NyaXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5zcGVjdG9yLXRlc3QuanMi Pjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2VsZW1l bnRzLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KKworZnVuY3Rpb24gdGVzdCgpCit7Cisg ICAgSW5zcGVjdG9yVGVzdC5zZWxlY3ROb2RlV2l0aElkKCJjb250YWluZXIiLCBzdGVwMSk7CisK KyAgICBmdW5jdGlvbiBzdGVwMShub2RlKQorICAgIHsKKyAgICAgICAgdmFyIGNvbnRhaW5lcklk ID0gbm9kZS5pZDsKKworICAgICAgICBJbnNwZWN0b3JUZXN0LnJ1blRlc3RTdWl0ZShbCisgICAg ICAgICAgICBmdW5jdGlvbiB0ZXN0RG9jdW1lbnRRdWVyeVNlbGVjdG9yKG5leHQpCisgICAgICAg ICAgICB7CisgICAgICAgICAgICAgICAgZnVuY3Rpb24gY2FsbGJhY2soZWxlbWVudElkKQorICAg ICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgdmFyIG5vZGUgPSBXZWJJbnNwZWN0 b3IuZG9tQWdlbnQubm9kZUZvcklkKGVsZW1lbnRJZCk7CisgICAgICAgICAgICAgICAgICAgIElu c3BlY3RvclRlc3QuYWRkUmVzdWx0KCJub2RlIGlkOiAiICsgbm9kZS5nZXRBdHRyaWJ1dGUoImlk IikpOworICAgICAgICAgICAgICAgICAgICBuZXh0KCk7CisgICAgICAgICAgICAgICAgfQorICAg ICAgICAgICAgICAgIERPTUFnZW50LnF1ZXJ5U2VsZWN0b3IoY29udGFpbmVySWQsICJkaXYuZm9v IiwgdHJ1ZSwgY2FsbGJhY2spOworICAgICAgICAgICAgfSwKKworICAgICAgICAgICAgZnVuY3Rp b24gdGVzdERvY3VtZW50UXVlcnlTZWxlY3RvckFsbChuZXh0KQorICAgICAgICAgICAgeworICAg ICAgICAgICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNrKG5vZGVJZHMpCisgICAgICAgICAgICAgICAg eworICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgibnVtYmVyIG9m IHNlbGVjdGVkIG5vZGVzOiAiICsgbm9kZUlkcy5sZW5ndGgpOworICAgICAgICAgICAgICAgICAg ICBuZXh0KCk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIERPTUFnZW50LnF1 ZXJ5U2VsZWN0b3JBbGwoY29udGFpbmVySWQsICJkaXYuZm9vIiwgdHJ1ZSwgY2FsbGJhY2spOwor ICAgICAgICAgICAgfSwKKworICAgICAgICAgICAgZnVuY3Rpb24gdGVzdFF1ZXJ5U2VsZWN0b3Io bmV4dCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBmdW5jdGlvbiBjYWxsYmFjayhl bGVtZW50SWQpCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICB2YXIgbm9k ZSA9IFdlYkluc3BlY3Rvci5kb21BZ2VudC5ub2RlRm9ySWQoZWxlbWVudElkKTsKKyAgICAgICAg ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIm5vZGUgaWQ6ICIgKyBub2RlLmdl dEF0dHJpYnV0ZSgiaWQiKSk7CisgICAgICAgICAgICAgICAgICAgIG5leHQoKTsKKyAgICAgICAg ICAgICAgICB9CisgICAgICAgICAgICAgICAgRE9NQWdlbnQucXVlcnlTZWxlY3Rvcihjb250YWlu ZXJJZCwgImRpdi5mb28iLCBmYWxzZSwgY2FsbGJhY2spOworICAgICAgICAgICAgfSwKKworICAg ICAgICAgICAgZnVuY3Rpb24gdGVzdFF1ZXJ5U2VsZWN0b3JBbGwobmV4dCkKKyAgICAgICAgICAg IHsKKyAgICAgICAgICAgICAgICBmdW5jdGlvbiBjYWxsYmFjayhub2RlSWRzKQorICAgICAgICAg ICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIm51 bWJlciBvZiBzZWxlY3RlZCBub2RlczogIiArIG5vZGVJZHMubGVuZ3RoKTsKKyAgICAgICAgICAg ICAgICAgICAgbmV4dCgpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBET01B Z2VudC5xdWVyeVNlbGVjdG9yQWxsKGNvbnRhaW5lcklkLCAiZGl2LmZvbyIsIGZhbHNlLCBjYWxs YmFjayk7CisgICAgICAgICAgICB9CisgICAgICAgIF0pOworICAgIH0KK30KKzwvc2NyaXB0Pgor PC9oZWFkPgorCis8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+Cis8cD4KK1Rlc3RzIERPTUFnZW50 LnF1ZXJ5U2VsZWN0b3IgYW5kIERPTUFnZW50LnF1ZXJ5U2VsZWN0b3JBbGwuCis8L3A+CisKKzxk aXYgaWQ9ImlkMSIgY2xhc3M9ImZvbyI+PC9kaXY+Cis8ZGl2IGlkPSJpZDIiIGNsYXNzPSJmb28i PjwvZGl2PgorCis8ZGl2IGlkPSJjb250YWluZXIiPgorICAgIDxkaXYgaWQ9ImlkMyIgY2xhc3M9 ImZvbyI+PC9kaXY+CisgICAgPGRpdiBpZD0iaWQ0IiBjbGFzcz0iZm9vIj48L2Rpdj4KKyAgICA8 ZGl2IGlkPSJpZDUiIGNsYXNzPSJmb28iPjwvZGl2PgorICAgIDxkaXYgaWQ9ImlkNiIgY2xhc3M9 ImZvbyI+PC9kaXY+Cis8L2Rpdj4KKworPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDVj YjVkMzA2NTI0MTg3MjhjYjIwMjM2NzlhZjRmZjMzMGFkODcyZTUuLjA2ZWM5ZDg2MWRhZWQ0ODE1 YWVlZWFlMzY1MGUxODgxZDgwNjc4ZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAx MS0wMi0yNCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBt b3ZlIHF1ZXJ5U2VsZWN0b3JBbGwgZnJvbSBDU1MgYWdlbnQgdG8gRE9NIGFnZW50IHdoZXJlIGl0 IGJlbG9uZ3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD01NTEzMQorCisgICAgICAgIFRlc3Q6IGluc3BlY3Rvci9lbGVtZW50cy9kb20tYWdlbnQtcXVl cnktc2VsZWN0b3IuaHRtbAorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5pZGw6Cisg ICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcDoKKyAgICAgICAgKiBpbnNw ZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y RE9NQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6Om5vZGVU b1NlbGVjdE9uKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50OjpxdWVyeVNl bGVjdG9yKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50OjpxdWVyeVNlbGVj dG9yQWxsKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaDoKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0UnVsZXMuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQXVkaXRSdWxlcy5JbWFnZURpbWVuc2lvbnNSdWxlLnByb3RvdHlwZS5kb1J1bik6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwucHJvdG90eXBlLnNldFJ1bGVTZWxlY3Rvci5jYWxs YmFjayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbC5wcm90b3R5cGUuc2V0 UnVsZVNlbGVjdG9yKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVsLnByb3Rv dHlwZS5hZGRSdWxlLmNhbGxiYWNrKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZU1v ZGVsLnByb3RvdHlwZS5hZGRSdWxlKToKKwogMjAxMS0wMi0yMyAgUGF2ZWwgRmVsZG1hbiAgPHBm ZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKaW5kZXggNzU2Y2E1MjQ5MzI4 NWQ0Mzg3OTBhNGRlY2JiMGVkMTEyNGMwMzRiNy4uZGExMDNjMDgzYjVhMTIzZDlhZTA1OWQzY2I5 ZmE2NTgxNjY4ODRjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3Rvci5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKQEAg LTE0Niw2ICsxNDYsOCBAQCBtb2R1bGUgY29yZSB7CiAKICAgICBpbnRlcmZhY2UgW0NvbmRpdGlv bmFsPUlOU1BFQ1RPUl0gRE9NIHsKICAgICAgICAgdm9pZCBnZXRDaGlsZE5vZGVzKGluIGxvbmcg bm9kZUlkKTsKKyAgICAgICAgdm9pZCBxdWVyeVNlbGVjdG9yKGluIGxvbmcgbm9kZUlkLCBpbiBT dHJpbmcgc2VsZWN0b3JzLCBpbiBib29sZWFuIGRvY3VtZW50V2lkZSwgb3V0IGxvbmcgZWxlbWVu dElkKTsKKyAgICAgICAgdm9pZCBxdWVyeVNlbGVjdG9yQWxsKGluIGxvbmcgbm9kZUlkLCBpbiBT dHJpbmcgc2VsZWN0b3JzLCBpbiBib29sZWFuIGRvY3VtZW50V2lkZSwgb3V0IEFycmF5IHJlc3Vs dCk7CiAgICAgICAgIHZvaWQgc2V0QXR0cmlidXRlKGluIGxvbmcgZWxlbWVudElkLCBpbiBTdHJp bmcgbmFtZSwgaW4gU3RyaW5nIHZhbHVlLCBvdXQgYm9vbGVhbiBzdWNjZXNzKTsKICAgICAgICAg dm9pZCByZW1vdmVBdHRyaWJ1dGUoaW4gbG9uZyBlbGVtZW50SWQsIGluIFN0cmluZyBuYW1lLCBv dXQgYm9vbGVhbiBzdWNjZXNzKTsKICAgICAgICAgdm9pZCBzZXRUZXh0Tm9kZVZhbHVlKGluIGxv bmcgbm9kZUlkLCBpbiBTdHJpbmcgdmFsdWUsIG91dCBib29sZWFuIHN1Y2Nlc3MpOwpAQCAtMTg3 LDcgKzE4OSw2IEBAIG1vZHVsZSBjb3JlIHsKICAgICAgICAgdm9pZCBzZXRSdWxlU2VsZWN0b3Io aW4gT2JqZWN0IHJ1bGVJZCwgaW4gU3RyaW5nIHNlbGVjdG9yLCBvdXQgVmFsdWUgcnVsZSk7CiAg ICAgICAgIHZvaWQgYWRkUnVsZShpbiBsb25nIGNvbnRleHROb2RlSWQsIGluIFN0cmluZyBzZWxl Y3Rvciwgb3V0IFZhbHVlIHJ1bGUpOwogICAgICAgICB2b2lkIGdldFN1cHBvcnRlZENTU1Byb3Bl cnRpZXMob3V0IEFycmF5IGNzc1Byb3BlcnRpZXMpOwotICAgICAgICB2b2lkIHF1ZXJ5U2VsZWN0 b3JBbGwoaW4gbG9uZyBkb2N1bWVudElkLCBpbiBTdHJpbmcgc2VsZWN0b3IsIG91dCBBcnJheSBy ZXN1bHQpOwogICAgIH07CiAKICAgICBpbnRlcmZhY2UgW0NvbmRpdGlvbmFsPUlOU1BFQ1RPUl0g VGltZWxpbmUgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckNTU0FnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2Vu dC5jcHAKaW5kZXggMzNkNDg1Yzk4YjViMTk3NTAxMjQyYmRkYzY2OTJiNjM0ZDc0YTMxZS4uN2E5 ZGQ4M2VkODc5OGU1OGE1NDdiY2YzNThiMTk4Y2NlMDFiN2JiZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwCkBAIC0zNjEsMjYgKzM2MSw2IEBA IHZvaWQgSW5zcGVjdG9yQ1NTQWdlbnQ6OmdldFN1cHBvcnRlZENTU1Byb3BlcnRpZXMoUmVmUHRy PEluc3BlY3RvckFycmF5PiogY3NzUHJvCiAgICAgKmNzc1Byb3BlcnRpZXMgPSBwcm9wZXJ0aWVz LnJlbGVhc2UoKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JDU1NBZ2VudDo6cXVlcnlTZWxlY3RvckFs bChjb25zdCBsb25nIG5vZGVJZCwgY29uc3QgU3RyaW5nJiBzZWxlY3RvciwgUmVmUHRyPEluc3Bl Y3RvckFycmF5PiogcmVzdWx0KQotewotICAgIE5vZGUqIG5vZGUgPSBtX2RvbUFnZW50LT5ub2Rl Rm9ySWQobm9kZUlkKTsKLSAgICBpZiAoIW5vZGUpCi0gICAgICAgIHJldHVybjsKLSAgICBpZiAo IW5vZGUtPmlzRG9jdW1lbnROb2RlKCkpCi0gICAgICAgIG5vZGUgPSBub2RlLT5vd25lckRvY3Vt ZW50KCk7Ci0gICAgaWYgKCFub2RlKQotICAgICAgICByZXR1cm47Ci0gICAgRXhjZXB0aW9uQ29k ZSBlYyA9IDA7Ci0gICAgUmVmUHRyPE5vZGVMaXN0PiBub2RlcyA9IHN0YXRpY19jYXN0PERvY3Vt ZW50Kj4obm9kZSktPnF1ZXJ5U2VsZWN0b3JBbGwoc2VsZWN0b3IsIGVjKTsKLSAgICBpZiAoZWMp Ci0gICAgICAgIHJldHVybjsKLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbm9kZXMtPmxl bmd0aCgpOyArK2kpIHsKLSAgICAgICAgTm9kZSogYWZmZWN0ZWROb2RlID0gbm9kZXMtPml0ZW0o aSk7Ci0gICAgICAgIGxvbmcgaWQgPSBtX2RvbUFnZW50LT5wdXNoTm9kZVBhdGhUb0Zyb250ZW5k KGFmZmVjdGVkTm9kZSk7Ci0gICAgICAgICgqcmVzdWx0KS0+cHVzaE51bWJlcihpZCk7Ci0gICAg fQotfQotCiAvLyBzdGF0aWMKIEVsZW1lbnQqIEluc3BlY3RvckNTU0FnZW50OjppbmxpbmVTdHls ZUVsZW1lbnQoQ1NTU3R5bGVEZWNsYXJhdGlvbiogc3R5bGUpCiB7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5oCmluZGV4IDNmMWVlYzU4NmFkOGMxZjVlMGU5 YWE2Mjg0N2E3M2QwMDc4NGNmZDYuLjUzYTJjYzVjYWU5ODFhZTc4OGFlMGIxNGRkNTg5Njk1YmEw MzZlMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NB Z2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5o CkBAIC03MSw3ICs3MSw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFJ1bGVTZWxlY3Rvcihjb25z dCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiYgcnVsZUlkLCBjb25zdCBTdHJpbmcmIHNlbGVjdG9y LCBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+KiByZXN1bHQpOwogICAgIHZvaWQgYWRkUnVsZShjb25z dCBsb25nIGNvbnRleHROb2RlSWQsIGNvbnN0IFN0cmluZyYgc2VsZWN0b3IsIFJlZlB0cjxJbnNw ZWN0b3JWYWx1ZT4qIHJlc3VsdCk7CiAgICAgdm9pZCBnZXRTdXBwb3J0ZWRDU1NQcm9wZXJ0aWVz KFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qIHJlc3VsdCk7Ci0gICAgdm9pZCBxdWVyeVNlbGVjdG9y QWxsKGNvbnN0IGxvbmcgbm9kZUlkLCBjb25zdCBTdHJpbmcmIHNlbGVjdG9yLCBSZWZQdHI8SW5z cGVjdG9yQXJyYXk+KiByZXN1bHQpOwogCiBwcml2YXRlOgogICAgIHR5cGVkZWYgSGFzaE1hcDxT dHJpbmcsIFJlZlB0cjxJbnNwZWN0b3JTdHlsZVNoZWV0PiA+IElkVG9JbnNwZWN0b3JTdHlsZVNo ZWV0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFn ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAK aW5kZXggY2NjMmUzYjY1MDI0NDcwZDVkNGY3MzU1N2Q1YmIzYzNjNDRmMTlkMy4uZmYyZGViYWU2 NzI4NjliN2U0YjYxOTk3NGZiN2I3Y2Y0ZGNmN2ZmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCkBAIC0zNTcsNiArMzU3LDIxIEBAIHZvaWQg SW5zcGVjdG9yRE9NQWdlbnQ6OnVuYmluZChOb2RlKiBub2RlLCBOb2RlVG9JZE1hcCogbm9kZXNN YXApCiAgICAgfQogfQogCitOb2RlKiBJbnNwZWN0b3JET01BZ2VudDo6bm9kZVRvU2VsZWN0T24o bG9uZyBub2RlSWQsIGJvb2wgZG9jdW1lbnRXaWRlKQoreworICAgIE5vZGUqIG5vZGU7CisgICAg aWYgKCFub2RlSWQpCisgICAgICAgIG5vZGUgPSBtX2RvY3VtZW50LmdldCgpOworICAgIGVsc2UK KyAgICAgICAgbm9kZSA9IG5vZGVGb3JJZChub2RlSWQpOworICAgIGlmICghbm9kZSkKKyAgICAg ICAgcmV0dXJuIDA7CisKKyAgICBpZiAoZG9jdW1lbnRXaWRlICYmIG5vZGVJZCkKKyAgICAgICAg bm9kZSA9IG5vZGUtPm93bmVyRG9jdW1lbnQoKTsKKyAgICByZXR1cm4gbm9kZTsKK30KKwogYm9v bCBJbnNwZWN0b3JET01BZ2VudDo6cHVzaERvY3VtZW50VG9Gcm9udGVuZCgpCiB7CiAgICAgaWYg KCFtX2RvY3VtZW50KQpAQCAtNDEyLDYgKzQyNywzNyBAQCB2b2lkIEluc3BlY3RvckRPTUFnZW50 OjpnZXRDaGlsZE5vZGVzKGxvbmcgbm9kZUlkKQogICAgIHB1c2hDaGlsZE5vZGVzVG9Gcm9udGVu ZChub2RlSWQpOwogfQogCit2b2lkIEluc3BlY3RvckRPTUFnZW50OjpxdWVyeVNlbGVjdG9yKGxv bmcgbm9kZUlkLCBjb25zdCBTdHJpbmcmIHNlbGVjdG9ycywgYm9vbCBkb2N1bWVudFdpZGUsIGxv bmcqIGVsZW1lbnRJZCkKK3sKKyAgICAqZWxlbWVudElkID0gMDsKKyAgICBOb2RlKiBub2RlID0g bm9kZVRvU2VsZWN0T24obm9kZUlkLCBkb2N1bWVudFdpZGUpOworICAgIGlmICghbm9kZSkKKyAg ICAgICAgcmV0dXJuOworCisgICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7CisgICAgUmVmUHRyPEVs ZW1lbnQ+IGVsZW1lbnQgPSBub2RlLT5xdWVyeVNlbGVjdG9yKHNlbGVjdG9ycywgZWMpOworICAg IGlmIChlYykKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKGVsZW1lbnQpCisgICAgICAgICpl bGVtZW50SWQgPSBwdXNoTm9kZVBhdGhUb0Zyb250ZW5kKGVsZW1lbnQuZ2V0KCkpOworfQorCit2 b2lkIEluc3BlY3RvckRPTUFnZW50OjpxdWVyeVNlbGVjdG9yQWxsKGxvbmcgbm9kZUlkLCBjb25z dCBTdHJpbmcmIHNlbGVjdG9ycywgYm9vbCBkb2N1bWVudFdpZGUsIFJlZlB0cjxJbnNwZWN0b3JB cnJheT4qIHJlc3VsdCkKK3sKKyAgICBOb2RlKiBub2RlID0gbm9kZVRvU2VsZWN0T24obm9kZUlk LCBkb2N1bWVudFdpZGUpOworICAgIGlmICghbm9kZSkKKyAgICAgICAgcmV0dXJuOworCisgICAg RXhjZXB0aW9uQ29kZSBlYyA9IDA7CisgICAgUmVmUHRyPE5vZGVMaXN0PiBub2RlcyA9IG5vZGUt PnF1ZXJ5U2VsZWN0b3JBbGwoc2VsZWN0b3JzLCBlYyk7CisgICAgaWYgKGVjKQorICAgICAgICBy ZXR1cm47CisKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbm9kZXMtPmxlbmd0aCgpOyAr K2kpCisgICAgICAgICgqcmVzdWx0KS0+cHVzaE51bWJlcihwdXNoTm9kZVBhdGhUb0Zyb250ZW5k KG5vZGVzLT5pdGVtKGkpKSk7Cit9CisKIGxvbmcgSW5zcGVjdG9yRE9NQWdlbnQ6OnB1c2hOb2Rl UGF0aFRvRnJvbnRlbmQoTm9kZSogbm9kZVRvUHVzaCkKIHsKICAgICBBU1NFUlQobm9kZVRvUHVz aCk7ICAvLyBJbnZhbGlkIGlucHV0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yRE9NQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JET01BZ2VudC5oCmluZGV4IDE3OWIwZTg2NGE1YTk1NmNmZjA4NjEwZTEzYTc5ZmMzMGVmZjE3 ZjguLmQ2OGJhYjgyMGI0MmJhMDE1NWUyM2RlODBjYjZkZjUzMDRhMGIxZjMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oCkBAIC0xMDEsNiArMTAxLDgg QEAgcHVibGljOgogCiAgICAgLy8gTWV0aG9kcyBjYWxsZWQgZnJvbSB0aGUgZnJvbnRlbmQgZm9y IERPTSBub2RlcyBpbnNwZWN0aW9uLgogICAgIHZvaWQgZ2V0Q2hpbGROb2Rlcyhsb25nIG5vZGVJ ZCk7CisgICAgdm9pZCBxdWVyeVNlbGVjdG9yKGxvbmcgbm9kZUlkLCBjb25zdCBTdHJpbmcmIHNl bGVjdG9ycywgYm9vbCBkb2N1bWVudFdpZGUsIGxvbmcqIGVsZW1lbnRJZCk7CisgICAgdm9pZCBx dWVyeVNlbGVjdG9yQWxsKGxvbmcgbm9kZUlkLCBjb25zdCBTdHJpbmcmIHNlbGVjdG9ycywgYm9v bCBkb2N1bWVudFdpZGUsIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qIHJlc3VsdCk7CiAgICAgdm9p ZCBzZXRBdHRyaWJ1dGUobG9uZyBlbGVtZW50SWQsIGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3Qg U3RyaW5nJiB2YWx1ZSwgYm9vbCogc3VjY2Vzcyk7CiAgICAgdm9pZCByZW1vdmVBdHRyaWJ1dGUo bG9uZyBlbGVtZW50SWQsIGNvbnN0IFN0cmluZyYgbmFtZSwgYm9vbCogc3VjY2Vzcyk7CiAgICAg dm9pZCByZW1vdmVOb2RlKGxvbmcgbm9kZUlkLCBsb25nKiBvdXROb2RlSWQpOwpAQCAtMTU3LDYg KzE1OSw4IEBAIHByaXZhdGU6CiAgICAgbG9uZyBiaW5kKE5vZGUqLCBOb2RlVG9JZE1hcCopOwog ICAgIHZvaWQgdW5iaW5kKE5vZGUqLCBOb2RlVG9JZE1hcCopOwogCisgICAgTm9kZSogbm9kZVRv U2VsZWN0T24obG9uZyBub2RlSWQsIGJvb2wgZG9jdW1lbnRXaWRlKTsKKwogICAgIGJvb2wgcHVz aERvY3VtZW50VG9Gcm9udGVuZCgpOwogCiAgICAgYm9vbCBoYXNCcmVha3BvaW50KE5vZGUqLCBs b25nIHR5cGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9BdWRpdFJ1bGVzLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRp dFJ1bGVzLmpzCmluZGV4IGJkY2NiZmUxODM4YTNhYTY3MmE2YjM1ZDdiOTI0NzQzNmNjNTVkNTUu LjgwM2U5ZTAwNjhlMzAyZGJiYzg0ZjE0Y2JhOTlkODZkNjViNzE3NTUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRSdWxlcy5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0UnVsZXMuanMKQEAgLTcyMyw1MCAr NzIzLDcgQEAgV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuSW1hZ2VEaW1lbnNpb25zUnVsZS5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmNzc01vZGVsLmdldFN0eWxl c0FzeW5jKG5vZGVJZHNbaV0sIGltYWdlU3R5bGVzUmVhZHkuYmluZCh0aGlzLCBub2RlSWRzW2ld LCBpID09PSBub2RlSWRzLmxlbmd0aCAtIDEpKTsKICAgICAgICAgfQogCi0gICAgICAgIGZ1bmN0 aW9uIHJlY2VpdmVkSW1hZ2VzKGFycmF5RWxlbWVudHMpCi0gICAgICAgIHsKLSAgICAgICAgICAg IGlmICghYXJyYXlFbGVtZW50cykKLSAgICAgICAgICAgICAgICByZXR1cm4gY2FsbGJhY2sobnVs bCk7Ci0KLSAgICAgICAgICAgIHZhciBub2RlSWRzID0gW107Ci0KLSAgICAgICAgICAgIGZ1bmN0 aW9uIGFwcGVuZElkKGxhc3RDYWxsLCBub2RlSWQpCi0gICAgICAgICAgICB7Ci0gICAgICAgICAg ICAgICAgaWYgKG5vZGVJZCkKLSAgICAgICAgICAgICAgICAgICAgbm9kZUlkcy5wdXNoKG5vZGVJ ZCk7Ci0KLSAgICAgICAgICAgICAgICBpZiAobGFzdENhbGwpCi0gICAgICAgICAgICAgICAgICAg IGdldFN0eWxlcyhub2RlSWRzKTsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgZm9yICh2 YXIgaSA9IDA7IGFycmF5RWxlbWVudHMgJiYgaSA8IGFycmF5RWxlbWVudHMubGVuZ3RoOyArK2kp IHsKLSAgICAgICAgICAgICAgICB2YXIgdmFsdWUgPSBhcnJheUVsZW1lbnRzW2ldLnZhbHVlOwot ICAgICAgICAgICAgICAgIHZhbHVlLnB1c2hOb2RlVG9Gcm9udGVuZChhcHBlbmRJZC5iaW5kKHRo aXMsIGkgPT09IGFycmF5RWxlbWVudHMubGVuZ3RoIC0gMSkpOwotICAgICAgICAgICAgfQotICAg ICAgICB9Ci0KLSAgICAgICAgZnVuY3Rpb24gcmVjZWl2ZWRJbWFnZXNBcnJheShwYXlsb2FkKQot ICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoIXBheWxvYWQpCi0gICAgICAgICAgICAgICAgcmV0 dXJuIGNhbGxiYWNrKG51bGwpOwotCi0gICAgICAgICAgICB2YXIgbm9kZUlkc0FycmF5ID0gV2Vi SW5zcGVjdG9yLlJlbW90ZU9iamVjdC5mcm9tUGF5bG9hZChwYXlsb2FkKTsKLSAgICAgICAgICAg IG5vZGVJZHNBcnJheS5nZXRPd25Qcm9wZXJ0aWVzKGZhbHNlLCByZWNlaXZlZEltYWdlcyk7Ci0g ICAgICAgIH0KLQotICAgICAgICBmdW5jdGlvbiBwdXNoSW1hZ2VOb2RlcygpCi0gICAgICAgIHsK LSAgICAgICAgICAgIHZhciByZXN1bHQgPSBbXTsKLSAgICAgICAgICAgIHZhciBub2RlcyA9IGRv Y3VtZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCJpbWciKTsKLQotICAgICAgICAgICAgZm9yICh2 YXIgaSA9IDA7IGkgPCBub2Rlcy5sZW5ndGg7ICsraSkgewotICAgICAgICAgICAgICAgIGlmIChu b2Rlc1tpXS5zcmMpCi0gICAgICAgICAgICAgICAgICAgIHJlc3VsdC5wdXNoKG5vZGVzW2ldKTsK LSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJldHVybiByZXN1bHQ7Ci0gICAgICAgIH0KLQot ICAgICAgICBSdW50aW1lQWdlbnQuZXZhbHVhdGUoIigiICsgcHVzaEltYWdlTm9kZXMgKyAiKSgp IiwgIiIsIGZhbHNlLCByZWNlaXZlZEltYWdlc0FycmF5KTsKKyAgICAgICAgRE9NQWdlbnQucXVl cnlTZWxlY3RvckFsbCgwLCAiaW1nW3NyY10iLCB0cnVlLCBnZXRTdHlsZXMpOwogICAgIH0KIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHls ZU1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1v ZGVsLmpzCmluZGV4IGRjNWNhMWU3ODZhODBlMGE0ZTU3NjdkODJkMmFjZDJhYjBlZjgyZTcuLjcw MDQxN2VhNTI0OTY2YTYyMjRiNTljZDZmMTA2MGY1OTBmYmY2NzEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanMKQEAgLTEyNyw3 ICsxMjcsNyBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAg ICAgICAgICBpZiAoIXJ1bGVQYXlsb2FkKQogICAgICAgICAgICAgICAgIGZhaWx1cmVDYWxsYmFj aygpOwogICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIENTU0FnZW50LnF1ZXJ5U2Vs ZWN0b3JBbGwobm9kZUlkLCBuZXdTZWxlY3RvciwgY2hlY2tBZmZlY3RzQ2FsbGJhY2suYmluZCh0 aGlzLCBub2RlSWQsIHN1Y2Nlc3NDYWxsYmFjaywgcnVsZVBheWxvYWQpKTsKKyAgICAgICAgICAg ICAgICBET01BZ2VudC5xdWVyeVNlbGVjdG9yQWxsKG5vZGVJZCwgbmV3U2VsZWN0b3IsIHRydWUs IGNoZWNrQWZmZWN0c0NhbGxiYWNrLmJpbmQodGhpcywgbm9kZUlkLCBzdWNjZXNzQ2FsbGJhY2ss IHJ1bGVQYXlsb2FkKSk7CiAgICAgICAgIH0KIAogICAgICAgICBDU1NBZ2VudC5zZXRSdWxlU2Vs ZWN0b3IocnVsZUlkLCBuZXdTZWxlY3RvciwgY2FsbGJhY2suYmluZCh0aGlzLCBub2RlSWQsIHN1 Y2Nlc3NDYWxsYmFjaywgZmFpbHVyZUNhbGxiYWNrKSk7CkBAIC0xNDksNyArMTQ5LDcgQEAgV2Vi SW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIC8v IEludmFsaWQgc3ludGF4IGZvciBhIHNlbGVjdG9yCiAgICAgICAgICAgICAgICAgZmFpbHVyZUNh bGxiYWNrKCk7CiAgICAgICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgICAgICBDU1NBZ2VudC5x dWVyeVNlbGVjdG9yQWxsKG5vZGVJZCwgc2VsZWN0b3IsIGNoZWNrQWZmZWN0c0NhbGxiYWNrLmJp bmQodGhpcywgbm9kZUlkLCBzdWNjZXNzQ2FsbGJhY2ssIHJ1bGVQYXlsb2FkKSk7CisgICAgICAg ICAgICAgICAgRE9NQWdlbnQucXVlcnlTZWxlY3RvckFsbChub2RlSWQsIHNlbGVjdG9yLCB0cnVl LCBjaGVja0FmZmVjdHNDYWxsYmFjay5iaW5kKHRoaXMsIG5vZGVJZCwgc3VjY2Vzc0NhbGxiYWNr LCBydWxlUGF5bG9hZCkpOwogICAgICAgICB9CiAKICAgICAgICAgQ1NTQWdlbnQuYWRkUnVsZShu b2RlSWQsIHNlbGVjdG9yLCBjYWxsYmFjay5iaW5kKHRoaXMsIHN1Y2Nlc3NDYWxsYmFjaywgZmFp bHVyZUNhbGxiYWNrLCBzZWxlY3RvcikpOwo= 83655 2011-02-24 07:38:06 -0800 2011-02-24 08:54:11 -0800 Patch bug-55131-20110224183803.patch text/plain 15611 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogNzk1NTQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBmNzJlNGE4NTE1ZDljMDc0YmMwODNl OWQxMjhlOWE3MDRlOTViNzRjLi4wNDYxY2M4Yjc0MTQ1NjQxNmQ1YzkyMDQ0YWI4NDNiMDRhN2Qx NTVhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDItMjQgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogbW92ZSBxdWVyeVNlbGVjdG9yQWxsIGZyb20g Q1NTIGFnZW50IHRvIERPTSBhZ2VudCB3aGVyZSBpdCBiZWxvbmdzLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTUxMzEKKworICAgICAgICAqIGh0dHAv dGVzdHMvaW5zcGVjdG9yL2luc3BlY3Rvci10ZXN0LmpzOgorICAgICAgICAqIGluc3BlY3Rvci9l bGVtZW50cy9kb20tYWdlbnQtcXVlcnktc2VsZWN0b3ItZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAg ICAgICAgKiBpbnNwZWN0b3IvZWxlbWVudHMvZG9tLWFnZW50LXF1ZXJ5LXNlbGVjdG9yLmh0bWw6 IEFkZGVkLgorCiAyMDExLTAyLTI0ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL2VsZW1lbnRzL2RvbS1hZ2VudC1xdWVyeS1zZWxlY3Rvci1leHBlY3RlZC50eHQg Yi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMvZG9tLWFnZW50LXF1ZXJ5LXNlbGVjdG9y LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zNTllODgxOWI3MzIyOTg2OTIyOGIwZGIwN2U0N2I2 NjJjYjkxZjUzCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1l bnRzL2RvbS1hZ2VudC1xdWVyeS1zZWxlY3Rvci1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxNSBA QAorVGVzdHMgRE9NQWdlbnQucXVlcnlTZWxlY3RvciBhbmQgRE9NQWdlbnQucXVlcnlTZWxlY3Rv ckFsbC4KKworCitSdW5uaW5nOiB0ZXN0RG9jdW1lbnRRdWVyeVNlbGVjdG9yCitub2RlIGlkOiBp ZDEKKworUnVubmluZzogdGVzdERvY3VtZW50UXVlcnlTZWxlY3RvckFsbAorbnVtYmVyIG9mIHNl bGVjdGVkIG5vZGVzOiA2CisKK1J1bm5pbmc6IHRlc3RRdWVyeVNlbGVjdG9yCitub2RlIGlkOiBp ZDMKKworUnVubmluZzogdGVzdFF1ZXJ5U2VsZWN0b3JBbGwKK251bWJlciBvZiBzZWxlY3RlZCBu b2RlczogNAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMvZG9t LWFnZW50LXF1ZXJ5LXNlbGVjdG9yLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVu dHMvZG9tLWFnZW50LXF1ZXJ5LXNlbGVjdG9yLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uODczYjIzM2UzM2Ex ZmY3ZjE2MDE4ZWNiZDUwYWNlMWQxNDE2ZDhhMgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9lbGVtZW50cy9kb20tYWdlbnQtcXVlcnktc2VsZWN0b3IuaHRtbApAQCAt MCwwICsxLDgwIEBACis8aHRtbD4KKzxoZWFkPgorCis8c2NyaXB0IHNyYz0iLi4vLi4vaHR0cC90 ZXN0cy9pbnNwZWN0b3IvaW5zcGVjdG9yLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9 Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzLXRlc3QuanMiPjwvc2NyaXB0Pgor PHNjcmlwdD4KKworZnVuY3Rpb24gdGVzdCgpCit7CisgICAgSW5zcGVjdG9yVGVzdC5zZWxlY3RO b2RlV2l0aElkKCJjb250YWluZXIiLCBzdGVwMSk7CisKKyAgICBmdW5jdGlvbiBzdGVwMShub2Rl KQorICAgIHsKKyAgICAgICAgdmFyIGNvbnRhaW5lcklkID0gbm9kZS5pZDsKKworICAgICAgICBJ bnNwZWN0b3JUZXN0LnJ1blRlc3RTdWl0ZShbCisgICAgICAgICAgICBmdW5jdGlvbiB0ZXN0RG9j dW1lbnRRdWVyeVNlbGVjdG9yKG5leHQpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAg ZnVuY3Rpb24gY2FsbGJhY2soZWxlbWVudElkKQorICAgICAgICAgICAgICAgIHsKKyAgICAgICAg ICAgICAgICAgICAgdmFyIG5vZGUgPSBXZWJJbnNwZWN0b3IuZG9tQWdlbnQubm9kZUZvcklkKGVs ZW1lbnRJZCk7CisgICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJu b2RlIGlkOiAiICsgbm9kZS5nZXRBdHRyaWJ1dGUoImlkIikpOworICAgICAgICAgICAgICAgICAg ICBuZXh0KCk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIERPTUFnZW50LnF1 ZXJ5U2VsZWN0b3IoY29udGFpbmVySWQsICJkaXYuZm9vIiwgdHJ1ZSwgY2FsbGJhY2spOworICAg ICAgICAgICAgfSwKKworICAgICAgICAgICAgZnVuY3Rpb24gdGVzdERvY3VtZW50UXVlcnlTZWxl Y3RvckFsbChuZXh0KQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGZ1bmN0aW9uIGNh bGxiYWNrKG5vZGVJZHMpCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgibnVtYmVyIG9mIHNlbGVjdGVkIG5vZGVzOiAiICsgbm9k ZUlkcy5sZW5ndGgpOworICAgICAgICAgICAgICAgICAgICBuZXh0KCk7CisgICAgICAgICAgICAg ICAgfQorICAgICAgICAgICAgICAgIERPTUFnZW50LnF1ZXJ5U2VsZWN0b3JBbGwoY29udGFpbmVy SWQsICJkaXYuZm9vIiwgdHJ1ZSwgY2FsbGJhY2spOworICAgICAgICAgICAgfSwKKworICAgICAg ICAgICAgZnVuY3Rpb24gdGVzdFF1ZXJ5U2VsZWN0b3IobmV4dCkKKyAgICAgICAgICAgIHsKKyAg ICAgICAgICAgICAgICBmdW5jdGlvbiBjYWxsYmFjayhlbGVtZW50SWQpCisgICAgICAgICAgICAg ICAgeworICAgICAgICAgICAgICAgICAgICB2YXIgbm9kZSA9IFdlYkluc3BlY3Rvci5kb21BZ2Vu dC5ub2RlRm9ySWQoZWxlbWVudElkKTsKKyAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5hZGRSZXN1bHQoIm5vZGUgaWQ6ICIgKyBub2RlLmdldEF0dHJpYnV0ZSgiaWQiKSk7CisgICAg ICAgICAgICAgICAgICAgIG5leHQoKTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAg ICAgRE9NQWdlbnQucXVlcnlTZWxlY3Rvcihjb250YWluZXJJZCwgImRpdi5mb28iLCBmYWxzZSwg Y2FsbGJhY2spOworICAgICAgICAgICAgfSwKKworICAgICAgICAgICAgZnVuY3Rpb24gdGVzdFF1 ZXJ5U2VsZWN0b3JBbGwobmV4dCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBmdW5j dGlvbiBjYWxsYmFjayhub2RlSWRzKQorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIm51bWJlciBvZiBzZWxlY3RlZCBub2Rlczog IiArIG5vZGVJZHMubGVuZ3RoKTsKKyAgICAgICAgICAgICAgICAgICAgbmV4dCgpOworICAgICAg ICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBET01BZ2VudC5xdWVyeVNlbGVjdG9yQWxsKGNv bnRhaW5lcklkLCAiZGl2LmZvbyIsIGZhbHNlLCBjYWxsYmFjayk7CisgICAgICAgICAgICB9Cisg ICAgICAgIF0pOworICAgIH0KK30KKzwvc2NyaXB0PgorPC9oZWFkPgorCis8Ym9keSBvbmxvYWQ9 InJ1blRlc3QoKSI+Cis8cD4KK1Rlc3RzIERPTUFnZW50LnF1ZXJ5U2VsZWN0b3IgYW5kIERPTUFn ZW50LnF1ZXJ5U2VsZWN0b3JBbGwuCis8L3A+CisKKzxkaXYgaWQ9ImlkMSIgY2xhc3M9ImZvbyI+ PC9kaXY+Cis8ZGl2IGlkPSJpZDIiIGNsYXNzPSJmb28iPjwvZGl2PgorCis8ZGl2IGlkPSJjb250 YWluZXIiPgorICAgIDxkaXYgaWQ9ImlkMyIgY2xhc3M9ImZvbyI+PC9kaXY+CisgICAgPGRpdiBp ZD0iaWQ0IiBjbGFzcz0iZm9vIj48L2Rpdj4KKyAgICA8ZGl2IGlkPSJpZDUiIGNsYXNzPSJmb28i PjwvZGl2PgorICAgIDxkaXYgaWQ9ImlkNiIgY2xhc3M9ImZvbyI+PC9kaXY+Cis8L2Rpdj4KKwor PC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGYzZGE2MDg5MTEzZTkwZDNiNDAyNWY3MDE5 NmRmYzNkNDAyZTk4M2IuLjkxYjE5MzEyZDRmZmE3NGIxNjljNzIxMmEzMWI3MTJlZGI1ODMzMzAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxMS0wMi0yNCAgUGF2ZWwgRmVsZG1hbiAg PHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBtb3ZlIHF1ZXJ5U2VsZWN0b3JBbGwgZnJv bSBDU1MgYWdlbnQgdG8gRE9NIGFnZW50IHdoZXJlIGl0IGJlbG9uZ3MuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTEzMQorCisgICAgICAgIFRlc3Q6 IGluc3BlY3Rvci9lbGVtZW50cy9kb20tYWdlbnQtcXVlcnktc2VsZWN0b3IuaHRtbAorCisgICAg ICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5pZGw6CisgICAgICAgICogaW5zcGVjdG9yL0luc3Bl Y3RvckNTU0FnZW50LmNwcDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQu aDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6Om5vZGVUb1NlbGVjdE9uKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvckRPTUFnZW50OjpxdWVyeVNlbGVjdG9yKToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvckRPTUFnZW50OjpxdWVyeVNlbGVjdG9yQWxsKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L0F1ZGl0UnVsZXMuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5JbWFnZURp bWVuc2lvbnNSdWxlLnByb3RvdHlwZS5kb1J1bik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9DU1NTdHlsZU1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9k ZWwucHJvdG90eXBlLnNldFJ1bGVTZWxlY3Rvci5jYWxsYmFjayk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQ1NTU3R5bGVNb2RlbC5wcm90b3R5cGUuc2V0UnVsZVNlbGVjdG9yKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVsLnByb3RvdHlwZS5hZGRSdWxlLmNhbGxiYWNrKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVsLnByb3RvdHlwZS5hZGRSdWxlKToK KwogMjAxMS0wMi0yNCAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3IuaWRsIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5p ZGwKaW5kZXggNzU2Y2E1MjQ5MzI4NWQ0Mzg3OTBhNGRlY2JiMGVkMTEyNGMwMzRiNy4uZGExMDNj MDgzYjVhMTIzZDlhZTA1OWQzY2I5ZmE2NTgxNjY4ODRjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3Rvci5pZGwKQEAgLTE0Niw2ICsxNDYsOCBAQCBtb2R1bGUgY29yZSB7CiAKICAg ICBpbnRlcmZhY2UgW0NvbmRpdGlvbmFsPUlOU1BFQ1RPUl0gRE9NIHsKICAgICAgICAgdm9pZCBn ZXRDaGlsZE5vZGVzKGluIGxvbmcgbm9kZUlkKTsKKyAgICAgICAgdm9pZCBxdWVyeVNlbGVjdG9y KGluIGxvbmcgbm9kZUlkLCBpbiBTdHJpbmcgc2VsZWN0b3JzLCBpbiBib29sZWFuIGRvY3VtZW50 V2lkZSwgb3V0IGxvbmcgZWxlbWVudElkKTsKKyAgICAgICAgdm9pZCBxdWVyeVNlbGVjdG9yQWxs KGluIGxvbmcgbm9kZUlkLCBpbiBTdHJpbmcgc2VsZWN0b3JzLCBpbiBib29sZWFuIGRvY3VtZW50 V2lkZSwgb3V0IEFycmF5IHJlc3VsdCk7CiAgICAgICAgIHZvaWQgc2V0QXR0cmlidXRlKGluIGxv bmcgZWxlbWVudElkLCBpbiBTdHJpbmcgbmFtZSwgaW4gU3RyaW5nIHZhbHVlLCBvdXQgYm9vbGVh biBzdWNjZXNzKTsKICAgICAgICAgdm9pZCByZW1vdmVBdHRyaWJ1dGUoaW4gbG9uZyBlbGVtZW50 SWQsIGluIFN0cmluZyBuYW1lLCBvdXQgYm9vbGVhbiBzdWNjZXNzKTsKICAgICAgICAgdm9pZCBz ZXRUZXh0Tm9kZVZhbHVlKGluIGxvbmcgbm9kZUlkLCBpbiBTdHJpbmcgdmFsdWUsIG91dCBib29s ZWFuIHN1Y2Nlc3MpOwpAQCAtMTg3LDcgKzE4OSw2IEBAIG1vZHVsZSBjb3JlIHsKICAgICAgICAg dm9pZCBzZXRSdWxlU2VsZWN0b3IoaW4gT2JqZWN0IHJ1bGVJZCwgaW4gU3RyaW5nIHNlbGVjdG9y LCBvdXQgVmFsdWUgcnVsZSk7CiAgICAgICAgIHZvaWQgYWRkUnVsZShpbiBsb25nIGNvbnRleHRO b2RlSWQsIGluIFN0cmluZyBzZWxlY3Rvciwgb3V0IFZhbHVlIHJ1bGUpOwogICAgICAgICB2b2lk IGdldFN1cHBvcnRlZENTU1Byb3BlcnRpZXMob3V0IEFycmF5IGNzc1Byb3BlcnRpZXMpOwotICAg ICAgICB2b2lkIHF1ZXJ5U2VsZWN0b3JBbGwoaW4gbG9uZyBkb2N1bWVudElkLCBpbiBTdHJpbmcg c2VsZWN0b3IsIG91dCBBcnJheSByZXN1bHQpOwogICAgIH07CiAKICAgICBpbnRlcmZhY2UgW0Nv bmRpdGlvbmFsPUlOU1BFQ1RPUl0gVGltZWxpbmUgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5jcHAKaW5kZXggMWZiODhiMTMwZGM5MDNlNjM1MmY5YzFm MzgyYjViYzBkZmJlZGJiMS4uZjQwNmMwYTYxZTI0NWVkODExMmI2N2QzMmY2YmI0ZTUzOTcyZGE1 NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3Bw CkBAIC0zNjEsMjYgKzM2MSw2IEBAIHZvaWQgSW5zcGVjdG9yQ1NTQWdlbnQ6OmdldFN1cHBvcnRl ZENTU1Byb3BlcnRpZXMoRXJyb3JTdHJpbmcqLCBSZWZQdHI8SW5zcGVjdG9yCiAgICAgKmNzc1By b3BlcnRpZXMgPSBwcm9wZXJ0aWVzLnJlbGVhc2UoKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JDU1NB Z2VudDo6cXVlcnlTZWxlY3RvckFsbChFcnJvclN0cmluZyosIGNvbnN0IGxvbmcgbm9kZUlkLCBj b25zdCBTdHJpbmcmIHNlbGVjdG9yLCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiByZXN1bHQpCi17 Ci0gICAgTm9kZSogbm9kZSA9IG1fZG9tQWdlbnQtPm5vZGVGb3JJZChub2RlSWQpOwotICAgIGlm ICghbm9kZSkKLSAgICAgICAgcmV0dXJuOwotICAgIGlmICghbm9kZS0+aXNEb2N1bWVudE5vZGUo KSkKLSAgICAgICAgbm9kZSA9IG5vZGUtPm93bmVyRG9jdW1lbnQoKTsKLSAgICBpZiAoIW5vZGUp Ci0gICAgICAgIHJldHVybjsKLSAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsKLSAgICBSZWZQdHI8 Tm9kZUxpc3Q+IG5vZGVzID0gc3RhdGljX2Nhc3Q8RG9jdW1lbnQqPihub2RlKS0+cXVlcnlTZWxl Y3RvckFsbChzZWxlY3RvciwgZWMpOwotICAgIGlmIChlYykKLSAgICAgICAgcmV0dXJuOwotICAg IGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBub2Rlcy0+bGVuZ3RoKCk7ICsraSkgewotICAgICAg ICBOb2RlKiBhZmZlY3RlZE5vZGUgPSBub2Rlcy0+aXRlbShpKTsKLSAgICAgICAgbG9uZyBpZCA9 IG1fZG9tQWdlbnQtPnB1c2hOb2RlUGF0aFRvRnJvbnRlbmQoYWZmZWN0ZWROb2RlKTsKLSAgICAg ICAgKCpyZXN1bHQpLT5wdXNoTnVtYmVyKGlkKTsKLSAgICB9Ci19Ci0KIC8vIHN0YXRpYwogRWxl bWVudCogSW5zcGVjdG9yQ1NTQWdlbnQ6OmlubGluZVN0eWxlRWxlbWVudChDU1NTdHlsZURlY2xh cmF0aW9uKiBzdHlsZSkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JDU1NBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNT U0FnZW50LmgKaW5kZXggYTgxZmJiYzcyYmE0NjNjMWMyMjBjYmIzMmQ5NTU1NWQ0YzA2M2ZjYi4u NzcwYjM5NzE2ZmVkNzM5ZDVlMGJlY2QyYmY5ZjNhN2QyNmQ1N2Y4MyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmgKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmgKQEAgLTcxLDcgKzcxLDYgQEAgcHVi bGljOgogICAgIHZvaWQgc2V0UnVsZVNlbGVjdG9yKEVycm9yU3RyaW5nKiBlcnJvciwgY29uc3Qg UmVmUHRyPEluc3BlY3Rvck9iamVjdD4mIHJ1bGVJZCwgY29uc3QgU3RyaW5nJiBzZWxlY3Rvciwg UmVmUHRyPEluc3BlY3RvclZhbHVlPiogcmVzdWx0KTsKICAgICB2b2lkIGFkZFJ1bGUoRXJyb3JT dHJpbmcqIGVycm9yLCBjb25zdCBsb25nIGNvbnRleHROb2RlSWQsIGNvbnN0IFN0cmluZyYgc2Vs ZWN0b3IsIFJlZlB0cjxJbnNwZWN0b3JWYWx1ZT4qIHJlc3VsdCk7CiAgICAgdm9pZCBnZXRTdXBw b3J0ZWRDU1NQcm9wZXJ0aWVzKEVycm9yU3RyaW5nKiBlcnJvciwgUmVmUHRyPEluc3BlY3RvckFy cmF5PiogcmVzdWx0KTsKLSAgICB2b2lkIHF1ZXJ5U2VsZWN0b3JBbGwoRXJyb3JTdHJpbmcqIGVy cm9yLCBjb25zdCBsb25nIG5vZGVJZCwgY29uc3QgU3RyaW5nJiBzZWxlY3RvciwgUmVmUHRyPElu c3BlY3RvckFycmF5PiogcmVzdWx0KTsKIAogcHJpdmF0ZToKICAgICB0eXBlZGVmIEhhc2hNYXA8 U3RyaW5nLCBSZWZQdHI8SW5zcGVjdG9yU3R5bGVTaGVldD4gPiBJZFRvSW5zcGVjdG9yU3R5bGVT aGVldDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01B Z2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3Bw CmluZGV4IGI2MzVhNGY4MjY3ZmI1ZjEyMDI1OTg4YjVkZDNkNTFiZmY2Y2NjZWQuLjdmMmQ0ZGYx NTk0ZmUyMGJhNTM3YzUyODQ1ODQ2YzJkZWE3YmMzMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcApAQCAtMzU4LDYgKzM1OCwyMSBAQCB2b2lk IEluc3BlY3RvckRPTUFnZW50Ojp1bmJpbmQoTm9kZSogbm9kZSwgTm9kZVRvSWRNYXAqIG5vZGVz TWFwKQogICAgIH0KIH0KIAorTm9kZSogSW5zcGVjdG9yRE9NQWdlbnQ6Om5vZGVUb1NlbGVjdE9u KGxvbmcgbm9kZUlkLCBib29sIGRvY3VtZW50V2lkZSkKK3sKKyAgICBOb2RlKiBub2RlOworICAg IGlmICghbm9kZUlkKQorICAgICAgICBub2RlID0gbV9kb2N1bWVudC5nZXQoKTsKKyAgICBlbHNl CisgICAgICAgIG5vZGUgPSBub2RlRm9ySWQobm9kZUlkKTsKKyAgICBpZiAoIW5vZGUpCisgICAg ICAgIHJldHVybiAwOworCisgICAgaWYgKGRvY3VtZW50V2lkZSAmJiBub2RlSWQpCisgICAgICAg IG5vZGUgPSBub2RlLT5vd25lckRvY3VtZW50KCk7CisgICAgcmV0dXJuIG5vZGU7Cit9CisKIGJv b2wgSW5zcGVjdG9yRE9NQWdlbnQ6OnB1c2hEb2N1bWVudFRvRnJvbnRlbmQoKQogewogICAgIGlm ICghbV9kb2N1bWVudCkKQEAgLTQxMyw2ICs0MjgsMzcgQEAgdm9pZCBJbnNwZWN0b3JET01BZ2Vu dDo6Z2V0Q2hpbGROb2RlcyhFcnJvclN0cmluZyosIGxvbmcgbm9kZUlkKQogICAgIHB1c2hDaGls ZE5vZGVzVG9Gcm9udGVuZChub2RlSWQpOwogfQogCit2b2lkIEluc3BlY3RvckRPTUFnZW50Ojpx dWVyeVNlbGVjdG9yKEVycm9yU3RyaW5nKiwgbG9uZyBub2RlSWQsIGNvbnN0IFN0cmluZyYgc2Vs ZWN0b3JzLCBib29sIGRvY3VtZW50V2lkZSwgbG9uZyogZWxlbWVudElkKQoreworICAgICplbGVt ZW50SWQgPSAwOworICAgIE5vZGUqIG5vZGUgPSBub2RlVG9TZWxlY3RPbihub2RlSWQsIGRvY3Vt ZW50V2lkZSk7CisgICAgaWYgKCFub2RlKQorICAgICAgICByZXR1cm47CisKKyAgICBFeGNlcHRp b25Db2RlIGVjID0gMDsKKyAgICBSZWZQdHI8RWxlbWVudD4gZWxlbWVudCA9IG5vZGUtPnF1ZXJ5 U2VsZWN0b3Ioc2VsZWN0b3JzLCBlYyk7CisgICAgaWYgKGVjKQorICAgICAgICByZXR1cm47CisK KyAgICBpZiAoZWxlbWVudCkKKyAgICAgICAgKmVsZW1lbnRJZCA9IHB1c2hOb2RlUGF0aFRvRnJv bnRlbmQoZWxlbWVudC5nZXQoKSk7Cit9CisKK3ZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OnF1ZXJ5 U2VsZWN0b3JBbGwoRXJyb3JTdHJpbmcqLCBsb25nIG5vZGVJZCwgY29uc3QgU3RyaW5nJiBzZWxl Y3RvcnMsIGJvb2wgZG9jdW1lbnRXaWRlLCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiByZXN1bHQp Cit7CisgICAgTm9kZSogbm9kZSA9IG5vZGVUb1NlbGVjdE9uKG5vZGVJZCwgZG9jdW1lbnRXaWRl KTsKKyAgICBpZiAoIW5vZGUpCisgICAgICAgIHJldHVybjsKKworICAgIEV4Y2VwdGlvbkNvZGUg ZWMgPSAwOworICAgIFJlZlB0cjxOb2RlTGlzdD4gbm9kZXMgPSBub2RlLT5xdWVyeVNlbGVjdG9y QWxsKHNlbGVjdG9ycywgZWMpOworICAgIGlmIChlYykKKyAgICAgICAgcmV0dXJuOworCisgICAg Zm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG5vZGVzLT5sZW5ndGgoKTsgKytpKQorICAgICAgICAo KnJlc3VsdCktPnB1c2hOdW1iZXIocHVzaE5vZGVQYXRoVG9Gcm9udGVuZChub2Rlcy0+aXRlbShp KSkpOworfQorCiBsb25nIEluc3BlY3RvckRPTUFnZW50OjpwdXNoTm9kZVBhdGhUb0Zyb250ZW5k KE5vZGUqIG5vZGVUb1B1c2gpCiB7CiAgICAgQVNTRVJUKG5vZGVUb1B1c2gpOyAgLy8gSW52YWxp ZCBpbnB1dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRP TUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaApp bmRleCA5NTU4ZmMzZGM2ZWExMjdlNzI3ZjlkYmEzNTkyYmIzYzkzMTZlYTU0Li5kZjgzNTliNzNl ZTMxYjY5OWJkN2NmZGQ0OTdmODUxNjA0N2E5ZjI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaApAQCAtMTAxLDYgKzEwMSw4IEBAIHB1YmxpYzoKICAg ICBWZWN0b3I8RG9jdW1lbnQqPiBkb2N1bWVudHMoKTsKICAgICB2b2lkIHJlc2V0KCk7CiAKKyAg ICB2b2lkIHF1ZXJ5U2VsZWN0b3IoRXJyb3JTdHJpbmcqLCBsb25nIG5vZGVJZCwgY29uc3QgU3Ry aW5nJiBzZWxlY3RvcnMsIGJvb2wgZG9jdW1lbnRXaWRlLCBsb25nKiBlbGVtZW50SWQpOworICAg IHZvaWQgcXVlcnlTZWxlY3RvckFsbChFcnJvclN0cmluZyosIGxvbmcgbm9kZUlkLCBjb25zdCBT dHJpbmcmIHNlbGVjdG9ycywgYm9vbCBkb2N1bWVudFdpZGUsIFJlZlB0cjxJbnNwZWN0b3JBcnJh eT4qIHJlc3VsdCk7CiAgICAgLy8gTWV0aG9kcyBjYWxsZWQgZnJvbSB0aGUgZnJvbnRlbmQgZm9y IERPTSBub2RlcyBpbnNwZWN0aW9uLgogICAgIHZvaWQgZ2V0Q2hpbGROb2RlcyhFcnJvclN0cmlu ZyosIGxvbmcgbm9kZUlkKTsKICAgICB2b2lkIHNldEF0dHJpYnV0ZShFcnJvclN0cmluZyosIGxv bmcgZWxlbWVudElkLCBjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgdmFsdWUsIGJv b2wqIHN1Y2Nlc3MpOwpAQCAtMTU5LDYgKzE2MSw4IEBAIHByaXZhdGU6CiAgICAgbG9uZyBiaW5k KE5vZGUqLCBOb2RlVG9JZE1hcCopOwogICAgIHZvaWQgdW5iaW5kKE5vZGUqLCBOb2RlVG9JZE1h cCopOwogCisgICAgTm9kZSogbm9kZVRvU2VsZWN0T24obG9uZyBub2RlSWQsIGJvb2wgZG9jdW1l bnRXaWRlKTsKKwogICAgIGJvb2wgcHVzaERvY3VtZW50VG9Gcm9udGVuZCgpOwogCiAgICAgYm9v bCBoYXNCcmVha3BvaW50KE5vZGUqLCBsb25nIHR5cGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdFJ1bGVzLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdFJ1bGVzLmpzCmluZGV4IGJkY2NiZmUxODM4YTNhYTY3 MmE2YjM1ZDdiOTI0NzQzNmNjNTVkNTUuLjgwM2U5ZTAwNjhlMzAyZGJiYzg0ZjE0Y2JhOTlkODZk NjViNzE3NTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv QXVkaXRSdWxlcy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0F1 ZGl0UnVsZXMuanMKQEAgLTcyMyw1MCArNzIzLDcgQEAgV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMu SW1hZ2VEaW1lbnNpb25zUnVsZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgV2ViSW5z cGVjdG9yLmNzc01vZGVsLmdldFN0eWxlc0FzeW5jKG5vZGVJZHNbaV0sIGltYWdlU3R5bGVzUmVh ZHkuYmluZCh0aGlzLCBub2RlSWRzW2ldLCBpID09PSBub2RlSWRzLmxlbmd0aCAtIDEpKTsKICAg ICAgICAgfQogCi0gICAgICAgIGZ1bmN0aW9uIHJlY2VpdmVkSW1hZ2VzKGFycmF5RWxlbWVudHMp Ci0gICAgICAgIHsKLSAgICAgICAgICAgIGlmICghYXJyYXlFbGVtZW50cykKLSAgICAgICAgICAg ICAgICByZXR1cm4gY2FsbGJhY2sobnVsbCk7Ci0KLSAgICAgICAgICAgIHZhciBub2RlSWRzID0g W107Ci0KLSAgICAgICAgICAgIGZ1bmN0aW9uIGFwcGVuZElkKGxhc3RDYWxsLCBub2RlSWQpCi0g ICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgaWYgKG5vZGVJZCkKLSAgICAgICAgICAgICAg ICAgICAgbm9kZUlkcy5wdXNoKG5vZGVJZCk7Ci0KLSAgICAgICAgICAgICAgICBpZiAobGFzdENh bGwpCi0gICAgICAgICAgICAgICAgICAgIGdldFN0eWxlcyhub2RlSWRzKTsKLSAgICAgICAgICAg IH0KLQotICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGFycmF5RWxlbWVudHMgJiYgaSA8IGFy cmF5RWxlbWVudHMubGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgICAgICB2YXIgdmFsdWUgPSBh cnJheUVsZW1lbnRzW2ldLnZhbHVlOwotICAgICAgICAgICAgICAgIHZhbHVlLnB1c2hOb2RlVG9G cm9udGVuZChhcHBlbmRJZC5iaW5kKHRoaXMsIGkgPT09IGFycmF5RWxlbWVudHMubGVuZ3RoIC0g MSkpOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0KLSAgICAgICAgZnVuY3Rpb24gcmVjZWl2 ZWRJbWFnZXNBcnJheShwYXlsb2FkKQotICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoIXBheWxv YWQpCi0gICAgICAgICAgICAgICAgcmV0dXJuIGNhbGxiYWNrKG51bGwpOwotCi0gICAgICAgICAg ICB2YXIgbm9kZUlkc0FycmF5ID0gV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5mcm9tUGF5bG9h ZChwYXlsb2FkKTsKLSAgICAgICAgICAgIG5vZGVJZHNBcnJheS5nZXRPd25Qcm9wZXJ0aWVzKGZh bHNlLCByZWNlaXZlZEltYWdlcyk7Ci0gICAgICAgIH0KLQotICAgICAgICBmdW5jdGlvbiBwdXNo SW1hZ2VOb2RlcygpCi0gICAgICAgIHsKLSAgICAgICAgICAgIHZhciByZXN1bHQgPSBbXTsKLSAg ICAgICAgICAgIHZhciBub2RlcyA9IGRvY3VtZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCJpbWci KTsKLQotICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBub2Rlcy5sZW5ndGg7ICsraSkg ewotICAgICAgICAgICAgICAgIGlmIChub2Rlc1tpXS5zcmMpCi0gICAgICAgICAgICAgICAgICAg IHJlc3VsdC5wdXNoKG5vZGVzW2ldKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJldHVy biByZXN1bHQ7Ci0gICAgICAgIH0KLQotICAgICAgICBSdW50aW1lQWdlbnQuZXZhbHVhdGUoIigi ICsgcHVzaEltYWdlTm9kZXMgKyAiKSgpIiwgIiIsIGZhbHNlLCByZWNlaXZlZEltYWdlc0FycmF5 KTsKKyAgICAgICAgRE9NQWdlbnQucXVlcnlTZWxlY3RvckFsbCgwLCAiaW1nW3NyY10iLCB0cnVl LCBnZXRTdHlsZXMpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCmluZGV4IGRjNWNhMWU3ODZhODBlMGE0ZTU3 NjdkODJkMmFjZDJhYjBlZjgyZTcuLjcwMDQxN2VhNTI0OTY2YTYyMjRiNTljZDZmMTA2MGY1OTBm YmY2NzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NT U3R5bGVNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NT U1N0eWxlTW9kZWwuanMKQEAgLTEyNyw3ICsxMjcsNyBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVN b2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBpZiAoIXJ1bGVQYXlsb2FkKQogICAgICAg ICAgICAgICAgIGZhaWx1cmVDYWxsYmFjaygpOwogICAgICAgICAgICAgZWxzZQotICAgICAgICAg ICAgICAgIENTU0FnZW50LnF1ZXJ5U2VsZWN0b3JBbGwobm9kZUlkLCBuZXdTZWxlY3RvciwgY2hl Y2tBZmZlY3RzQ2FsbGJhY2suYmluZCh0aGlzLCBub2RlSWQsIHN1Y2Nlc3NDYWxsYmFjaywgcnVs ZVBheWxvYWQpKTsKKyAgICAgICAgICAgICAgICBET01BZ2VudC5xdWVyeVNlbGVjdG9yQWxsKG5v ZGVJZCwgbmV3U2VsZWN0b3IsIHRydWUsIGNoZWNrQWZmZWN0c0NhbGxiYWNrLmJpbmQodGhpcywg bm9kZUlkLCBzdWNjZXNzQ2FsbGJhY2ssIHJ1bGVQYXlsb2FkKSk7CiAgICAgICAgIH0KIAogICAg ICAgICBDU1NBZ2VudC5zZXRSdWxlU2VsZWN0b3IocnVsZUlkLCBuZXdTZWxlY3RvciwgY2FsbGJh Y2suYmluZCh0aGlzLCBub2RlSWQsIHN1Y2Nlc3NDYWxsYmFjaywgZmFpbHVyZUNhbGxiYWNrKSk7 CkBAIC0xNDksNyArMTQ5LDcgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwucHJvdG90eXBl ID0gewogICAgICAgICAgICAgICAgIC8vIEludmFsaWQgc3ludGF4IGZvciBhIHNlbGVjdG9yCiAg ICAgICAgICAgICAgICAgZmFpbHVyZUNhbGxiYWNrKCk7CiAgICAgICAgICAgICB9IGVsc2UKLSAg ICAgICAgICAgICAgICBDU1NBZ2VudC5xdWVyeVNlbGVjdG9yQWxsKG5vZGVJZCwgc2VsZWN0b3Is IGNoZWNrQWZmZWN0c0NhbGxiYWNrLmJpbmQodGhpcywgbm9kZUlkLCBzdWNjZXNzQ2FsbGJhY2ss IHJ1bGVQYXlsb2FkKSk7CisgICAgICAgICAgICAgICAgRE9NQWdlbnQucXVlcnlTZWxlY3RvckFs bChub2RlSWQsIHNlbGVjdG9yLCB0cnVlLCBjaGVja0FmZmVjdHNDYWxsYmFjay5iaW5kKHRoaXMs IG5vZGVJZCwgc3VjY2Vzc0NhbGxiYWNrLCBydWxlUGF5bG9hZCkpOwogICAgICAgICB9CiAKICAg ICAgICAgQ1NTQWdlbnQuYWRkUnVsZShub2RlSWQsIHNlbGVjdG9yLCBjYWxsYmFjay5iaW5kKHRo aXMsIHN1Y2Nlc3NDYWxsYmFjaywgZmFpbHVyZUNhbGxiYWNrLCBzZWxlY3RvcikpOwo=