48534 2010-10-28 11:33:24 -0700 Web Inspector: pausing doesn't work 2010-10-28 13:14:23 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein commit-queue joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 301179 0 podivilov 2010-10-28 11:33:24 -0700 Web Inspector: pausing doesn't work 301181 1 72212 podivilov 2010-10-28 11:35:41 -0700 Created attachment 72212 Patch. 301182 2 72213 podivilov 2010-10-28 11:36:53 -0700 Created attachment 72213 Patch. 301183 3 72213 joepeck 2010-10-28 11:38:29 -0700 Comment on attachment 72213 Patch. Sounds like this one could use a test. Yury has written a lot of debugger tests in the past, he might be a good person to talk to. 301244 4 pfeldman 2010-10-28 12:42:46 -0700 (In reply to comment #3) > (From update of attachment 72213 [details]) > Sounds like this one could use a test. Yury has written a lot of debugger tests in the past, he might be a good person to talk to. And as far as I am concerned, most of them are using Pavel's debugging testing harness... 301263 5 72213 commit-queue 2010-10-28 13:14:17 -0700 Comment on attachment 72213 Patch. Clearing flags on attachment: 72213 Committed r70799: <http://trac.webkit.org/changeset/70799> 301264 6 commit-queue 2010-10-28 13:14:23 -0700 All reviewed patches have been landed. Closing bug. 72212 2010-10-28 11:35:41 -0700 2010-10-28 11:36:53 -0700 Patch. patch text/plain 17372 podivilov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YjQ1YjY1Yi4uNDNiNzg4YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTc4Miw2ICs3ODIsNDEgQEAKIAogMjAxMC0xMC0yNyAgUGF2ZWwg UG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBwZXJzaXN0IGJyZWFr cG9pbnRzIGluIGZyb250ZW5kIHNldHRpbmdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD00ODQzNAorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rv ci5pZGw6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6c2V0QnJlYWtwb2ludHMpOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6YnJlYWtwb2ludHNTZXR0aW5nS2V5 KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmxvYWRCcmVha3BvaW50 cyk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpzYXZlQnJlYWtwb2lu dHMpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmg6CisgICAgICAg ICogaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6c2V0QnJlYWtwb2ludCk6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpyZW1vdmVCcmVha3BvaW50KToKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmxvYWRCcmVha3BvaW50cyk6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpkaWRQYXJzZVNvdXJjZSk6Cisg ICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclN0YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvclN0YXRlOjpJbnNwZWN0b3JTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JTdGF0ZTo6Z2V0T2JqZWN0KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclN0YXRl OjpzZXRPYmplY3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yU3RhdGU6OnJlZ2lzdGVy T2JqZWN0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yU3RhdGUuaDoKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLnByb3RvdHlwZS5fYnJlYWtwb2ludFJlbW92ZWQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLnByb3RvdHlwZS5fc2V0 QnJlYWtwb2ludE9uQmFja2VuZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0 aW5ncy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZXR0aW5ncy5wcm90b3R5cGUuZ2V0U2V0 dGluZ0ZvckFsbFByb2plY3RzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZXR0aW5ncy5wcm90 b3R5cGUuaW5zcGVjdGVkVVJMQ2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2V0dGlu Z3MucHJvdG90eXBlLl9mb3JtYXRQcm9qZWN0S2V5KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5pbnNwZWN0ZWRVUkxD aGFuZ2VkKToKKworMjAxMC0xMC0yNyAgUGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9t aXVtLm9yZz4KKwogICAgICAgICBVbnJldmlld2VkLCBmaXggbGluZSBlbmRpbmdzIGluIEluc3Bl Y3RvclN0YXRlLmgKIAogICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JTdGF0ZS5oOgpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlkbCBiL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3Rvci5pZGwKaW5kZXggMmRhMGE5Mi4uYjVkNzM4OSAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlkbAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3IuaWRsCkBAIC0xMzEsNiArMTMxLDggQEAgbW9kdWxlIGNvcmUgewogICAgICAgICBbaGFu ZGxlcj1CYWNrZW5kXSB2b2lkIGVuYWJsZURlYnVnZ2VyKGluIGJvb2xlYW4gYWx3YXlzKTsKICAg ICAgICAgW2hhbmRsZXI9Q29udHJvbGxlcl0gdm9pZCBkaXNhYmxlRGVidWdnZXIoaW4gYm9vbGVh biBhbHdheXMpOwogCisgICAgICAgIFtoYW5kbGVyPUNvbnRyb2xsZXJdIHZvaWQgc2V0QnJlYWtw b2ludHMoaW4gT2JqZWN0IGJyZWFrcG9pbnRzKTsKKwogICAgICAgICBbaGFuZGxlcj1EZWJ1Z10g dm9pZCBzZXRCcmVha3BvaW50KGluIFN0cmluZyBzb3VyY2VJRCwgaW4gdW5zaWduZWQgaW50IGxp bmVOdW1iZXIsIGluIGJvb2xlYW4gZW5hYmxlZCwgaW4gU3RyaW5nIGNvbmRpdGlvbiwgb3V0IGJv b2xlYW4gc3VjY2Vzcywgb3V0IHVuc2lnbmVkIGludCBhY3R1YWxMaW5lTnVtYmVyKTsKICAgICAg ICAgW2hhbmRsZXI9RGVidWddIHZvaWQgcmVtb3ZlQnJlYWtwb2ludChpbiBTdHJpbmcgc291cmNl SUQsIGluIHVuc2lnbmVkIGxvbmcgbGluZU51bWJlcik7CiAgICAgICAgIFtoYW5kbGVyPURlYnVn XSB2b2lkIGFjdGl2YXRlQnJlYWtwb2ludHMoKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y Q29udHJvbGxlci5jcHAKaW5kZXggZDYyZWJiNi4uZWM3MjEzNSAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKQEAgLTE2ODAsNiArMTY4MCwxMSBAQCB2b2lkIElu c3BlY3RvckNvbnRyb2xsZXI6OnJlc3VtZSgpCiAgICAgICAgIG1fZGVidWdnZXJBZ2VudC0+cmVz dW1lKCk7CiB9CiAKK3ZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6c2V0QnJlYWtwb2ludHMoUGFz c1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJyZWFrcG9pbnRzKQoreworICAgIG1fc3RhdGUtPnNl dE9iamVjdChJbnNwZWN0b3JTdGF0ZTo6YnJlYWtwb2ludHMsIGJyZWFrcG9pbnRzKTsKK30KKwog dm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpzZXROYXRpdmVCcmVha3BvaW50KFBhc3NSZWZQdHI8 SW5zcGVjdG9yT2JqZWN0PiBicmVha3BvaW50LCBTdHJpbmcqIGJyZWFrcG9pbnRJZCkKIHsKICAg ICAqYnJlYWtwb2ludElkID0gIiI7CkBAIC0xNzc1LDE5ICsxNzgwLDIyIEBAIFN0cmluZyBJbnNw ZWN0b3JDb250cm9sbGVyOjpicmVha3BvaW50c1NldHRpbmdLZXkoKQogICAgIERFRklORV9TVEFU SUNfTE9DQUwoU3RyaW5nLCBrZXlQcmVmaXgsICgiYnJlYWtwb2ludHM6IikpOwogICAgIGlmICgh bV9tYWluUmVzb3VyY2UpCiAgICAgICAgIHJldHVybiAiIjsKLSAgICByZXR1cm4ga2V5UHJlZml4 ICsgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6bWQ1QmFzZTE2KG1fbWFpblJlc291cmNlLT5yZXF1 ZXN0VVJMKCkpOworICAgIEtVUkwgdXJsID0gbV9tYWluUmVzb3VyY2UtPnJlcXVlc3RVUkwoKTsK KyAgICB1cmwucmVtb3ZlRnJhZ21lbnRJZGVudGlmaWVyKCk7CisgICAgcmV0dXJuIGtleVByZWZp eCArIHVybDsKIH0KIAotUGFzc1JlZlB0cjxJbnNwZWN0b3JWYWx1ZT4gSW5zcGVjdG9yQ29udHJv bGxlcjo6bG9hZEJyZWFrcG9pbnRzKCkKK1Bhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBJbnNw ZWN0b3JDb250cm9sbGVyOjpsb2FkQnJlYWtwb2ludHMoKQogewotICAgIFN0cmluZyBqc29uU3Ry aW5nOwotICAgIG1fY2xpZW50LT5wb3B1bGF0ZVNldHRpbmcoYnJlYWtwb2ludHNTZXR0aW5nS2V5 KCksICZqc29uU3RyaW5nKTsKLSAgICByZXR1cm4gSW5zcGVjdG9yVmFsdWU6OnBhcnNlSlNPTihq c29uU3RyaW5nKTsKKyAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBicmVha3BvaW50cyA9IG1f c3RhdGUtPmdldE9iamVjdChJbnNwZWN0b3JTdGF0ZTo6YnJlYWtwb2ludHMpOworICAgIHJldHVy biBicmVha3BvaW50cy0+Z2V0T2JqZWN0KGJyZWFrcG9pbnRzU2V0dGluZ0tleSgpKTsKIH0KIAot dm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpzYXZlQnJlYWtwb2ludHMoUGFzc1JlZlB0cjxJbnNw ZWN0b3JPYmplY3Q+IGJyZWFrcG9pbnRzKQordm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpzYXZl QnJlYWtwb2ludHMoUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHByb2plY3RCcmVha3BvaW50 cykKIHsKLSAgICBtX2NsaWVudC0+c3RvcmVTZXR0aW5nKGJyZWFrcG9pbnRzU2V0dGluZ0tleSgp LCBicmVha3BvaW50cy0+dG9KU09OU3RyaW5nKCkpOworICAgIFJlZlB0cjxJbnNwZWN0b3JPYmpl Y3Q+IGJyZWFrcG9pbnRzID0gbV9zdGF0ZS0+Z2V0T2JqZWN0KEluc3BlY3RvclN0YXRlOjpicmVh a3BvaW50cyk7CisgICAgYnJlYWtwb2ludHMtPnNldE9iamVjdChicmVha3BvaW50c1NldHRpbmdL ZXkoKSwgcHJvamVjdEJyZWFrcG9pbnRzKTsKKyAgICBtX3N0YXRlLT5zZXRPYmplY3QoSW5zcGVj dG9yU3RhdGU6OmJyZWFrcG9pbnRzLCBicmVha3BvaW50cyk7CiB9CiAjZW5kaWYKIApkaWZmIC0t Z2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oIGIvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oCmluZGV4IDE4ZGIwN2YuLjkwYzJlZWYgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaAorKysgYi9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKQEAgLTI1Miw2ICsyNTIsOCBA QCBwdWJsaWM6CiAgICAgSW5zcGVjdG9yRGVidWdnZXJBZ2VudCogZGVidWdnZXJBZ2VudCgpIGNv bnN0IHsgcmV0dXJuIG1fZGVidWdnZXJBZ2VudC5nZXQoKTsgfQogICAgIHZvaWQgcmVzdW1lKCk7 CiAKKyAgICB2b2lkIHNldEJyZWFrcG9pbnRzKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBi cmVha3BvaW50cyk7CisKICAgICB2b2lkIHNldE5hdGl2ZUJyZWFrcG9pbnQoUGFzc1JlZlB0cjxJ bnNwZWN0b3JPYmplY3Q+IGJyZWFrcG9pbnQsIFN0cmluZyogYnJlYWtwb2ludElkKTsKICAgICB2 b2lkIHJlbW92ZU5hdGl2ZUJyZWFrcG9pbnQoY29uc3QgU3RyaW5nJiBicmVha3BvaW50SWQpOwog I2VuZGlmCkBAIC0zMzEsNyArMzMzLDcgQEAgcHJpdmF0ZToKICNpZiBFTkFCTEUoSkFWQVNDUklQ VF9ERUJVR0dFUikKICAgICBmcmllbmQgY2xhc3MgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDsKICAg ICBTdHJpbmcgYnJlYWtwb2ludHNTZXR0aW5nS2V5KCk7Ci0gICAgUGFzc1JlZlB0cjxJbnNwZWN0 b3JWYWx1ZT4gbG9hZEJyZWFrcG9pbnRzKCk7CisgICAgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmpl Y3Q+IGxvYWRCcmVha3BvaW50cygpOwogICAgIHZvaWQgc2F2ZUJyZWFrcG9pbnRzKFBhc3NSZWZQ dHI8SW5zcGVjdG9yT2JqZWN0PiBicmVha3BvaW50cyk7CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAgYi9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcAppbmRleCBhN2VhY2Y2Li5iMDgwYjBi IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNw cAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcApAQCAt MTAwLDEwICsxMDAsOSBAQCB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnNldEJyZWFrcG9p bnQoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgdW5zaWduZWQgbGluZQogICAgIFN0cmluZyBicmVh a3BvaW50SWQgPSBmb3JtYXRCcmVha3BvaW50SWQoc291cmNlSUQsICphY3R1YWxMaW5lTnVtYmVy KTsKICAgICBtX2JyZWFrcG9pbnRzTWFwcGluZy5zZXQoYnJlYWtwb2ludElkLCAqYWN0dWFsTGlu ZU51bWJlcik7CiAKLSAgICBTdHJpbmcga2V5ID0gbWQ1QmFzZTE2KHVybCk7Ci0gICAgSGFzaE1h cDxTdHJpbmcsIFNvdXJjZUJyZWFrcG9pbnRzPjo6aXRlcmF0b3IgaXQgPSBtX3N0aWNreUJyZWFr cG9pbnRzLmZpbmQoa2V5KTsKKyAgICBIYXNoTWFwPFN0cmluZywgU291cmNlQnJlYWtwb2ludHM+ OjppdGVyYXRvciBpdCA9IG1fc3RpY2t5QnJlYWtwb2ludHMuZmluZCh1cmwpOwogICAgIGlmIChp dCA9PSBtX3N0aWNreUJyZWFrcG9pbnRzLmVuZCgpKQotICAgICAgICBpdCA9IG1fc3RpY2t5QnJl YWtwb2ludHMuc2V0KGtleSwgU291cmNlQnJlYWtwb2ludHMoKSkuZmlyc3Q7CisgICAgICAgIGl0 ID0gbV9zdGlja3lCcmVha3BvaW50cy5zZXQodXJsLCBTb3VyY2VCcmVha3BvaW50cygpKS5maXJz dDsKICAgICBpdC0+c2Vjb25kLnNldCgqYWN0dWFsTGluZU51bWJlciwgYnJlYWtwb2ludCk7CiAg ICAgc2F2ZUJyZWFrcG9pbnRzKCk7CiB9CkBAIC0xMjMsNyArMTIyLDcgQEAgdm9pZCBJbnNwZWN0 b3JEZWJ1Z2dlckFnZW50OjpyZW1vdmVCcmVha3BvaW50KGNvbnN0IFN0cmluZyYgc291cmNlSUQs IHVuc2lnbmVkIGwKICAgICB1bnNpZ25lZCBzdGlja3lMaW5lID0gbWFwcGluZ0l0LT5zZWNvbmQ7 CiAgICAgbV9icmVha3BvaW50c01hcHBpbmcucmVtb3ZlKG1hcHBpbmdJdCk7CiAKLSAgICBIYXNo TWFwPFN0cmluZywgU291cmNlQnJlYWtwb2ludHM+OjppdGVyYXRvciBpdCA9IG1fc3RpY2t5QnJl YWtwb2ludHMuZmluZChtZDVCYXNlMTYodXJsKSk7CisgICAgSGFzaE1hcDxTdHJpbmcsIFNvdXJj ZUJyZWFrcG9pbnRzPjo6aXRlcmF0b3IgaXQgPSBtX3N0aWNreUJyZWFrcG9pbnRzLmZpbmQodXJs KTsKICAgICBpZiAoaXQgPT0gbV9zdGlja3lCcmVha3BvaW50cy5lbmQoKSkKICAgICAgICAgcmV0 dXJuOwogCkBAIC0yMDEsMjMgKzIwMCw2IEBAIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6 Y2xlYXJGb3JQYWdlTmF2aWdhdGlvbigpCiAgICAgbV9icmVha3BvaW50c0xvYWRlZCA9IGZhbHNl OwogfQogCi1TdHJpbmcgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6bWQ1QmFzZTE2KGNvbnN0IFN0 cmluZyYgc3RyaW5nKQotewotICAgIHN0YXRpYyBjb25zdCBjaGFyIGRpZ2l0c1tdID0gIjAxMjM0 NTY3ODlhYmNkZWYiOwotCi0gICAgTUQ1IG1kNTsKLSAgICBtZDUuYWRkQnl0ZXMocmVpbnRlcnBy ZXRfY2FzdDxjb25zdCB1aW50OF90Kj4oc3RyaW5nLmNoYXJhY3RlcnMoKSksIHN0cmluZy5sZW5n dGgoKSAqIDIpOwotICAgIFZlY3Rvcjx1aW50OF90LCAxNj4gZGlnZXN0OwotICAgIG1kNS5jaGVj a3N1bShkaWdlc3QpOwotCi0gICAgVmVjdG9yPGNoYXIsIDMyPiByZXN1bHQ7Ci0gICAgZm9yIChp bnQgaSA9IDA7IGkgPCAxNjsgKytpKSB7Ci0gICAgICAgIHJlc3VsdC5hcHBlbmQoZGlnaXRzWyhk aWdlc3RbaV0gPj4gNCkgJiAweGZdKTsKLSAgICAgICAgcmVzdWx0LmFwcGVuZChkaWdpdHNbZGln ZXN0W2ldICYgMHhmXSk7Ci0gICAgfQotICAgIHJldHVybiBTdHJpbmcocmVzdWx0LmRhdGEoKSwg cmVzdWx0LnNpemUoKSk7Ci19Ci0KIFBhc3NSZWZQdHI8SW5zcGVjdG9yVmFsdWU+IEluc3BlY3Rv ckRlYnVnZ2VyQWdlbnQ6OmN1cnJlbnRDYWxsRnJhbWVzKCkKIHsKICAgICBpZiAoIW1fcGF1c2Vk U2NyaXB0U3RhdGUpCkBAIC0yMzYsMTAgKzIxOCw3IEBAIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJB Z2VudDo6bG9hZEJyZWFrcG9pbnRzKCkKICAgICAgICAgcmV0dXJuOwogICAgIG1fYnJlYWtwb2lu dHNMb2FkZWQgPSB0cnVlOwogCi0gICAgUmVmUHRyPEluc3BlY3RvclZhbHVlPiBwYXJzZWRTZXR0 aW5nID0gbV9pbnNwZWN0b3JDb250cm9sbGVyLT5sb2FkQnJlYWtwb2ludHMoKTsKLSAgICBpZiAo IXBhcnNlZFNldHRpbmcpCi0gICAgICAgIHJldHVybjsKLSAgICBSZWZQdHI8SW5zcGVjdG9yT2Jq ZWN0PiBicmVha3BvaW50cyA9IHBhcnNlZFNldHRpbmctPmFzT2JqZWN0KCk7CisgICAgUmVmUHRy PEluc3BlY3Rvck9iamVjdD4gYnJlYWtwb2ludHMgPSBtX2luc3BlY3RvckNvbnRyb2xsZXItPmxv YWRCcmVha3BvaW50cygpOwogICAgIGlmICghYnJlYWtwb2ludHMpCiAgICAgICAgIHJldHVybjsK ICAgICBmb3IgKEluc3BlY3Rvck9iamVjdDo6aXRlcmF0b3IgaXQgPSBicmVha3BvaW50cy0+YmVn aW4oKTsgaXQgIT0gYnJlYWtwb2ludHMtPmVuZCgpOyArK2l0KSB7CkBAIC0yNzYsNyArMjU1LDcg QEAgdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpkaWRQYXJzZVNvdXJjZShjb25zdCBTdHJp bmcmIHNvdXJjZUlELCBjb25zdCBTdHJpbmcKICAgICAgICAgcmV0dXJuOwogCiAgICAgbG9hZEJy ZWFrcG9pbnRzKCk7Ci0gICAgSGFzaE1hcDxTdHJpbmcsIFNvdXJjZUJyZWFrcG9pbnRzPjo6aXRl cmF0b3IgaXQgPSBtX3N0aWNreUJyZWFrcG9pbnRzLmZpbmQobWQ1QmFzZTE2KHVybCkpOworICAg IEhhc2hNYXA8U3RyaW5nLCBTb3VyY2VCcmVha3BvaW50cz46Oml0ZXJhdG9yIGl0ID0gbV9zdGlj a3lCcmVha3BvaW50cy5maW5kKHVybCk7CiAgICAgaWYgKGl0ICE9IG1fc3RpY2t5QnJlYWtwb2lu dHMuZW5kKCkpIHsKICAgICAgICAgZm9yIChTb3VyY2VCcmVha3BvaW50czo6aXRlcmF0b3IgYnJl YWtwb2ludEl0ID0gaXQtPnNlY29uZC5iZWdpbigpOyBicmVha3BvaW50SXQgIT0gaXQtPnNlY29u ZC5lbmQoKTsgKyticmVha3BvaW50SXQpIHsKICAgICAgICAgICAgIGludCBsaW5lTnVtYmVyID0g YnJlYWtwb2ludEl0LT5maXJzdDsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvclN0YXRlLmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0YXRlLmNwcAppbmRl eCA2YTUwNGM2Li5jYmUxNDE3IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JTdGF0ZS5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3RhdGUuY3BwCkBA IC01MSw2ICs1MSw3IEBAIEluc3BlY3RvclN0YXRlOjpJbnNwZWN0b3JTdGF0ZShJbnNwZWN0b3JD bGllbnQqIGNsaWVudCkKICAgICByZWdpc3RlckxvbmcoaW5zcGVjdG9yQXR0YWNoZWRIZWlnaHQs IEluc3BlY3RvckNvbnRyb2xsZXI6OmRlZmF1bHRBdHRhY2hlZEhlaWdodCwgKGNvbnN0IGNoYXIq KTAsICJpbnNwZWN0b3JBdHRhY2hlZEhlaWdodCIpOwogICAgIHJlZ2lzdGVyTG9uZyhwYXVzZU9u RXhjZXB0aW9uc1N0YXRlLCAwLCAicGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSIsIChjb25zdCBjaGFy KikwKTsKICAgICByZWdpc3RlckJvb2xlYW4oY29uc29sZU1lc3NhZ2VzRW5hYmxlZCwgZmFsc2Us ICJjb25zb2xlTWVzc2FnZXNFbmFibGVkIiwgKGNvbnN0IGNoYXIqKTApOworICAgIHJlZ2lzdGVy T2JqZWN0KGJyZWFrcG9pbnRzLCAoY29uc3QgY2hhciopMCwgKGNvbnN0IGNoYXIqKTApOwogfQog CiB2b2lkIEluc3BlY3RvclN0YXRlOjpyZXN0b3JlRnJvbUluc3BlY3RvckNvb2tpZShjb25zdCBT dHJpbmcmIGpzb24pCkBAIC0xNTQsNiArMTU1LDI0IEBAIGxvbmcgSW5zcGVjdG9yU3RhdGU6Omdl dExvbmcoSW5zcGVjdG9yUHJvcGVydHlJZCBpZCkKICAgICByZXR1cm4gdmFsdWU7CiB9CiAKK1Bh c3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBJbnNwZWN0b3JTdGF0ZTo6Z2V0T2JqZWN0KEluc3Bl Y3RvclByb3BlcnR5SWQgaWQpCit7CisgICAgUHJvcGVydHlNYXA6Oml0ZXJhdG9yIGkgPSBtX3By b3BlcnRpZXMuZmluZChpZCk7CisgICAgQVNTRVJUKGkgIT0gbV9wcm9wZXJ0aWVzLmVuZCgpKTsK KyAgICByZXR1cm4gaS0+c2Vjb25kLm1fdmFsdWUtPmFzT2JqZWN0KCk7Cit9CisKK3ZvaWQgSW5z cGVjdG9yU3RhdGU6OnNldE9iamVjdChJbnNwZWN0b3JQcm9wZXJ0eUlkIGlkLCBQYXNzUmVmUHRy PEluc3BlY3Rvck9iamVjdD4gdmFsdWUpCit7CisgICAgUHJvcGVydHlNYXA6Oml0ZXJhdG9yIGkg PSBtX3Byb3BlcnRpZXMuZmluZChpZCk7CisgICAgQVNTRVJUKGkgIT0gbV9wcm9wZXJ0aWVzLmVu ZCgpKTsKKyAgICBQcm9wZXJ0eSYgcHJvcGVydHkgPSBpLT5zZWNvbmQ7CisgICAgcHJvcGVydHku bV92YWx1ZSA9IHZhbHVlOworICAgIGlmIChwcm9wZXJ0eS5tX3ByZWZlcmVuY2VOYW1lLmxlbmd0 aCgpKQorICAgICAgICBtX2NsaWVudC0+c3RvcmVTZXR0aW5nKHByb3BlcnR5Lm1fcHJlZmVyZW5j ZU5hbWUsIHZhbHVlLT50b0pTT05TdHJpbmcoKSk7CisgICAgdXBkYXRlQ29va2llKCk7Cit9CisK IHZvaWQgSW5zcGVjdG9yU3RhdGU6OnJlZ2lzdGVyQm9vbGVhbihJbnNwZWN0b3JQcm9wZXJ0eUlk IHByb3BlcnR5SWQsIGJvb2wgdmFsdWUsIGNvbnN0IFN0cmluZyYgZnJvbnRlbmRBbGlhcywgY29u c3QgU3RyaW5nJiBwcmVmZXJlbmNlTmFtZSkKIHsKICAgICBtX3Byb3BlcnRpZXMuc2V0KHByb3Bl cnR5SWQsIFByb3BlcnR5OjpjcmVhdGUoSW5zcGVjdG9yQmFzaWNWYWx1ZTo6Y3JlYXRlKHZhbHVl KSwgZnJvbnRlbmRBbGlhcywgcHJlZmVyZW5jZU5hbWUpKTsKQEAgLTE2OSw2ICsxODgsMTEgQEAg dm9pZCBJbnNwZWN0b3JTdGF0ZTo6cmVnaXN0ZXJMb25nKEluc3BlY3RvclByb3BlcnR5SWQgcHJv cGVydHlJZCwgbG9uZyB2YWx1ZSwgY28KICAgICBtX3Byb3BlcnRpZXMuc2V0KHByb3BlcnR5SWQs IFByb3BlcnR5OjpjcmVhdGUoSW5zcGVjdG9yQmFzaWNWYWx1ZTo6Y3JlYXRlKChkb3VibGUpdmFs dWUpLCBmcm9udGVuZEFsaWFzLCBwcmVmZXJlbmNlTmFtZSkpOwogfQogCit2b2lkIEluc3BlY3Rv clN0YXRlOjpyZWdpc3Rlck9iamVjdChJbnNwZWN0b3JQcm9wZXJ0eUlkIHByb3BlcnR5SWQsIGNv bnN0IFN0cmluZyYgZnJvbnRlbmRBbGlhcywgY29uc3QgU3RyaW5nJiBwcmVmZXJlbmNlTmFtZSkK K3sKKyAgICBtX3Byb3BlcnRpZXMuc2V0KHByb3BlcnR5SWQsIFByb3BlcnR5OjpjcmVhdGUoSW5z cGVjdG9yT2JqZWN0OjpjcmVhdGUoKSwgZnJvbnRlbmRBbGlhcywgcHJlZmVyZW5jZU5hbWUpKTsK K30KKwogSW5zcGVjdG9yU3RhdGU6OlByb3BlcnR5IEluc3BlY3RvclN0YXRlOjpQcm9wZXJ0eTo6 Y3JlYXRlKFBhc3NSZWZQdHI8SW5zcGVjdG9yVmFsdWU+IHZhbHVlLCBjb25zdCBTdHJpbmcmIGZy b250ZW5kQWxpYXMsIGNvbnN0IFN0cmluZyYgcHJlZmVyZW5jZU5hbWUpCiB7CiAgICAgUHJvcGVy dHkgcHJvcGVydHk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdGF0 ZS5oIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3RhdGUuaAppbmRleCAzODdmM2M3Li42 YjczMzM2IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdGF0ZS5oCisr KyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0YXRlLmgKQEAgLTU2LDYgKzU2LDcgQEAg cHVibGljOgogICAgICAgICBpbnNwZWN0b3JBdHRhY2hlZEhlaWdodCwKICAgICAgICAgcGF1c2VP bkV4Y2VwdGlvbnNTdGF0ZSwKICAgICAgICAgY29uc29sZU1lc3NhZ2VzRW5hYmxlZCwKKyAgICAg ICAgYnJlYWtwb2ludHMsCiAgICAgICAgIGxhc3RQcm9wZXJ0eUlkCiAgICAgfTsKIApAQCAtNjks MTAgKzcwLDEyIEBAIHB1YmxpYzoKICAgICBib29sIGdldEJvb2xlYW4oSW5zcGVjdG9yUHJvcGVy dHlJZCBwcm9wZXJ0eUlkKTsKICAgICBTdHJpbmcgZ2V0U3RyaW5nKEluc3BlY3RvclByb3BlcnR5 SWQgcHJvcGVydHlJZCk7CiAgICAgbG9uZyBnZXRMb25nKEluc3BlY3RvclByb3BlcnR5SWQgcHJv cGVydHlJZCk7CisgICAgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGdldE9iamVjdChJbnNw ZWN0b3JQcm9wZXJ0eUlkIGlkKTsKIAogICAgIHZvaWQgc2V0Qm9vbGVhbihJbnNwZWN0b3JQcm9w ZXJ0eUlkIHByb3BlcnR5SWQsIGJvb2wgdmFsdWUpIHsgc2V0VmFsdWUocHJvcGVydHlJZCwgSW5z cGVjdG9yQmFzaWNWYWx1ZTo6Y3JlYXRlKHZhbHVlKSwgdmFsdWUgPyAidHJ1ZSIgOiAiZmFsc2Ui KTsgfQogICAgIHZvaWQgc2V0U3RyaW5nKEluc3BlY3RvclByb3BlcnR5SWQgcHJvcGVydHlJZCwg Y29uc3QgU3RyaW5nJiB2YWx1ZSkgeyBzZXRWYWx1ZShwcm9wZXJ0eUlkLCBJbnNwZWN0b3JTdHJp bmc6OmNyZWF0ZSh2YWx1ZSksIHZhbHVlKTsgfQogICAgIHZvaWQgc2V0TG9uZyhJbnNwZWN0b3JQ cm9wZXJ0eUlkIHByb3BlcnR5SWQsIGxvbmcgdmFsdWUpIHsgc2V0VmFsdWUocHJvcGVydHlJZCwg SW5zcGVjdG9yQmFzaWNWYWx1ZTo6Y3JlYXRlKChkb3VibGUpdmFsdWUpLCBTdHJpbmc6Om51bWJl cih2YWx1ZSkpOyB9CisgICAgdm9pZCBzZXRPYmplY3QoSW5zcGVjdG9yUHJvcGVydHlJZCBwcm9w ZXJ0eUlkLCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gdmFsdWUpOwogCiBwcml2YXRlOgog ICAgIHZvaWQgdXBkYXRlQ29va2llKCk7CkBAIC05MCw2ICs5Myw3IEBAIHByaXZhdGU6CiAgICAg dm9pZCByZWdpc3RlckJvb2xlYW4oSW5zcGVjdG9yUHJvcGVydHlJZCBwcm9wZXJ0eUlkLCBib29s IHZhbHVlLCBjb25zdCBTdHJpbmcmIGZyb250ZW5kQWxpYXMsIGNvbnN0IFN0cmluZyYgcHJlZmVy ZW5jZU5hbWUpOwogICAgIHZvaWQgcmVnaXN0ZXJTdHJpbmcoSW5zcGVjdG9yUHJvcGVydHlJZCBw cm9wZXJ0eUlkLCBjb25zdCBTdHJpbmcmIHZhbHVlLCBjb25zdCBTdHJpbmcmIGZyb250ZW5kQWxp YXMsIGNvbnN0IFN0cmluZyYgcHJlZmVyZW5jZU5hbWUpOwogICAgIHZvaWQgcmVnaXN0ZXJMb25n KEluc3BlY3RvclByb3BlcnR5SWQgcHJvcGVydHlJZCwgbG9uZyB2YWx1ZSwgY29uc3QgU3RyaW5n JiBmcm9udGVuZEFsaWFzLCBjb25zdCBTdHJpbmcmIHByZWZlcmVuY2VOYW1lKTsKKyAgICB2b2lk IHJlZ2lzdGVyT2JqZWN0KEluc3BlY3RvclByb3BlcnR5SWQgcHJvcGVydHlJZCwgY29uc3QgU3Ry aW5nJiBmcm9udGVuZEFsaWFzLCBjb25zdCBTdHJpbmcmIHByZWZlcmVuY2VOYW1lKTsKIAogICAg IEluc3BlY3RvckNsaWVudCogbV9jbGllbnQ7CiB9OwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpzCmluZGV4IDc3YmE4OWQuLjQyNDhjNDEgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdlci5q cworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMK QEAgLTEwNiwxMyArMTA2LDM5IEBAIFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5wcm90 b3R5cGUgPSB7CiAKICAgICBfYnJlYWtwb2ludFJlbW92ZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAg IHsKLSAgICAgICAgZGVsZXRlIHRoaXMuX2JyZWFrcG9pbnRzW2V2ZW50LnRhcmdldC5pZF07Cisg ICAgICAgIHZhciBicmVha3BvaW50ID0gZXZlbnQudGFyZ2V0OworCisgICAgICAgIGRlbGV0ZSB0 aGlzLl9icmVha3BvaW50c1ticmVha3BvaW50LmlkXTsKKworICAgICAgICBpZiAoIWJyZWFrcG9p bnQudXJsKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB2YXIgYnJlYWtwb2ludHMgPSBX ZWJJbnNwZWN0b3IuYXBwbGljYXRpb25TZXR0aW5ncy5icmVha3BvaW50czsKKyAgICAgICAgdmFy IHNvdXJjZUJyZWFrcG9pbnRzID0gYnJlYWtwb2ludHNbYnJlYWtwb2ludC51cmxdOworICAgICAg ICBpZiAoIXNvdXJjZUJyZWFrcG9pbnRzKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBp ZiAoIWJyZWFrcG9pbnQubGluZSBpbiBzb3VyY2VCcmVha3BvaW50cykKKyAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgZGVsZXRlIHNvdXJjZUJyZWFrcG9pbnRzW2JyZWFrcG9pbnQubGluZV07 CisgICAgICAgIGZvciAodmFyIGxpbmUgaW4gc291cmNlQnJlYWtwb2ludHMpIHsKKyAgICAgICAg ICAgIFdlYkluc3BlY3Rvci5hcHBsaWNhdGlvblNldHRpbmdzLmJyZWFrcG9pbnRzID0gYnJlYWtw b2ludHM7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgZGVsZXRlIGJy ZWFrcG9pbnRzW2JyZWFrcG9pbnQudXJsXTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLmFwcGxpY2F0 aW9uU2V0dGluZ3MuYnJlYWtwb2ludHMgPSBicmVha3BvaW50czsKICAgICB9LAogCiAgICAgX3Nl dEJyZWFrcG9pbnRPbkJhY2tlbmQ6IGZ1bmN0aW9uKGJyZWFrcG9pbnQsIGlzT25lVGltZSkKICAg ICB7CiAgICAgICAgIGZ1bmN0aW9uIGRpZFNldEJyZWFrcG9pbnQoc3VjY2VzcywgbGluZSkKICAg ICAgICAgeworICAgICAgICAgICAgaWYgKHN1Y2Nlc3MgJiYgIWlzT25lVGltZSAmJiBicmVha3Bv aW50LnVybCkgeworICAgICAgICAgICAgICAgIHZhciBicmVha3BvaW50cyA9IFdlYkluc3BlY3Rv ci5hcHBsaWNhdGlvblNldHRpbmdzLmJyZWFrcG9pbnRzOworICAgICAgICAgICAgICAgIGlmICgh KGJyZWFrcG9pbnQudXJsIGluIGJyZWFrcG9pbnRzKSkKKyAgICAgICAgICAgICAgICAgICAgYnJl YWtwb2ludHNbYnJlYWtwb2ludC51cmxdID0ge307CisgICAgICAgICAgICAgICAgYnJlYWtwb2lu dHNbYnJlYWtwb2ludC51cmxdW2xpbmVdID0geyBlbmFibGVkOiBicmVha3BvaW50LmVuYWJsZWQs IGNvbmRpdGlvbjogYnJlYWtwb2ludC5jb25kaXRpb24gfTsKKyAgICAgICAgICAgICAgICBXZWJJ bnNwZWN0b3IuYXBwbGljYXRpb25TZXR0aW5ncy5icmVha3BvaW50cyA9IGJyZWFrcG9pbnRzOwor ICAgICAgICAgICAgfQorCiAgICAgICAgICAgICBpZiAoc3VjY2VzcyAmJiBsaW5lID09IGJyZWFr cG9pbnQubGluZSkKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICBpZiAoaXNP bmVUaW1lKSB7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGlu Z3MuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKaW5kZXggMjgw NWJjNS4uZWFmNGNlNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nl dHRpbmdzLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcwpA QCAtNzgsNiArNzgsMzEgQEAgV2ViSW5zcGVjdG9yLlNldHRpbmdzLnByb3RvdHlwZSA9IHsKICAg ICAgICAgdGhpcy5fX2RlZmluZVNldHRlcl9fKGtleSwgdGhpcy5fc2V0UHJvamVjdFNldHRpbmcu YmluZCh0aGlzLCBrZXkpKTsKICAgICB9LAogCisgICAgZ2V0U2V0dGluZ0ZvckFsbFByb2plY3Rz OiBmdW5jdGlvbihrZXkpCisgICAgeworICAgICAgICB2YXIgcmVzdWx0ID0ge307CisgICAgICAg IHZhciByZWdleHAgPSAiXiIgKyBrZXkgKyAiOiI7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBp IDwgd2luZG93LmxvY2FsU3RvcmFnZS5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgdmFyIHN0 b3JhZ2VLZXkgPSB3aW5kb3cubG9jYWxTdG9yYWdlLmtleShpKTsKKyAgICAgICAgICAgIGlmIChz dG9yYWdlS2V5LnNlYXJjaChyZWdleHApID09PSAtMSkKKyAgICAgICAgICAgICAgICBjb250aW51 ZTsKKyAgICAgICAgICAgIHRyeSB7CisgICAgICAgICAgICAgICAgcmVzdWx0W3N0b3JhZ2VLZXld ID0gSlNPTi5wYXJzZSh3aW5kb3cubG9jYWxTdG9yYWdlW3N0b3JhZ2VLZXldKTsKKyAgICAgICAg ICAgIH0gY2F0Y2goZSkgeworICAgICAgICAgICAgICAgIHdpbmRvdy5sb2NhbFN0b3JhZ2UucmVt b3ZlSXRlbShzdG9yYWdlS2V5KTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICBy ZXR1cm4gcmVzdWx0OworICAgIH0sCisKKyAgICBpbnNwZWN0ZWRVUkxDaGFuZ2VkOiBmdW5jdGlv bih1cmwpCisgICAgeworICAgICAgICB2YXIgZnJhZ21lbnRJbmRleCA9IHVybC5pbmRleE9mKCIj Iik7CisgICAgICAgIGlmIChmcmFnbWVudEluZGV4ICE9PSAtMSkKKyAgICAgICAgICAgIHVybCA9 IHVybC5zdWJzdHJpbmcoMCwgZnJhZ21lbnRJbmRleCk7CisgICAgICAgIHRoaXMuX2luc3BlY3Rl ZFVSTCA9IHVybDsKKyAgICB9LAorCiAgICAgX2dldDogZnVuY3Rpb24oa2V5LCBkZWZhdWx0VmFs dWUpCiAgICAgewogICAgICAgICBpZiAoa2V5IGluIHdpbmRvdy5sb2NhbFN0b3JhZ2UpIHsKQEAg LTEwNywxMSArMTMyLDcgQEAgV2ViSW5zcGVjdG9yLlNldHRpbmdzLnByb3RvdHlwZSA9IHsKIAog ICAgIF9mb3JtYXRQcm9qZWN0S2V5OiBmdW5jdGlvbihrZXkpCiAgICAgewotICAgICAgICB2YXIg dXJsID0gdGhpcy5fbWFpblJlc291cmNlVVJMOwotICAgICAgICB2YXIgZnJhZ21lbnRJbmRleCA9 IHVybC5pbmRleE9mKCIjIik7Ci0gICAgICAgIGlmIChmcmFnbWVudEluZGV4ICE9PSAtMSkKLSAg ICAgICAgICAgIHVybCA9IHVybC5zdWJzdHJpbmcoMCwgZnJhZ21lbnRJbmRleCk7Ci0gICAgICAg IHJldHVybiBrZXkgKyAiLiIgKyB1cmw7CisgICAgICAgIHJldHVybiBrZXkgKyAiOiIgKyB0aGlz Ll9pbnNwZWN0ZWRVUkw7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5qcwppbmRleCA4NWNhM2Y2Li5iY2QzZjRhIDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9pbnNwZWN0b3IuanMKQEAgLTUzMCw3ICs1MzAsOSBAQCBXZWJJbnNwZWN0b3IuZG9M b2FkZWREb25lID0gZnVuY3Rpb24oKQogICAgIGRvY3VtZW50LmJvZHkuYWRkU3R5bGVDbGFzcygi cG9ydC0iICsgcG9ydCk7CiAKICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QubG9hZGVkKCk7CisK ICAgICBXZWJJbnNwZWN0b3IuYXBwbGljYXRpb25TZXR0aW5ncyA9IG5ldyBXZWJJbnNwZWN0b3Iu U2V0dGluZ3MoKTsKKyAgICBJbnNwZWN0b3JCYWNrZW5kLnNldEJyZWFrcG9pbnRzKFdlYkluc3Bl Y3Rvci5hcHBsaWNhdGlvblNldHRpbmdzLmdldFNldHRpbmdGb3JBbGxQcm9qZWN0cygiYnJlYWtw b2ludHMiKSk7CiAKICAgICB0aGlzLl9yZWdpc3RlclNob3J0Y3V0cygpOwogCkBAIC0xNTMxLDYg KzE1MzMsNyBAQCBXZWJJbnNwZWN0b3IuYnJpbmdUb0Zyb250ID0gZnVuY3Rpb24oKQogV2ViSW5z cGVjdG9yLmluc3BlY3RlZFVSTENoYW5nZWQgPSBmdW5jdGlvbih1cmwpCiB7CiAgICAgSW5zcGVj dG9yRnJvbnRlbmRIb3N0Lmluc3BlY3RlZFVSTENoYW5nZWQodXJsKTsKKyAgICB0aGlzLmFwcGxp Y2F0aW9uU2V0dGluZ3MuaW5zcGVjdGVkVVJMQ2hhbmdlZCh1cmwpOwogICAgIHRoaXMuZXh0ZW5z aW9uU2VydmVyLm5vdGlmeUluc3BlY3RlZFVSTENoYW5nZWQoKTsKIH0KIAo= 72213 2010-10-28 11:36:53 -0700 2010-10-28 13:14:17 -0700 Patch. patch text/plain 3176 podivilov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YjQ1YjY1Yi4uNWQ5NDNkYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0xMC0yOCAgUGF2ZWwgUG9kaXZp bG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBmaXggcGF1c2luZyBvbiBuZXh0 IEphdmFTY3JpcHQgc3RhdGVtZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD00ODUzNAorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRlYnVn Z2VyQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6 SW5zcGVjdG9yRGVidWdnZXJBZ2VudCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JEZWJ1 Z2dlckFnZW50OjpzY2hlZHVsZVBhdXNlT25OZXh0U3RhdGVtZW50KToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmNhbmNlbFBhdXNlT25OZXh0U3RhdGVtZW50KToK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnBhdXNlKToKKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRpZFBhdXNlKToKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oOgorCiAyMDEwLTEwLTI3ICBFcmlj IFVocmhhbmUgIDxlcmljdUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2 aWQgTGV2aW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dl ckFnZW50LmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3Bw CmluZGV4IGE3ZWFjZjYuLmViZDAzZTYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckRlYnVnZ2VyQWdlbnQuY3BwCkBAIC02Miw2ICs2Miw3IEBAIEluc3BlY3RvckRlYnVnZ2VyQWdl bnQ6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQoSW5zcGVjdG9yQ29udHJvbGxlciogaW5zcGVjdG9y Q29uCiAgICAgLCBtX2Zyb250ZW5kKGZyb250ZW5kKQogICAgICwgbV9wYXVzZWRTY3JpcHRTdGF0 ZSgwKQogICAgICwgbV9icmVha3BvaW50c0xvYWRlZChmYWxzZSkKKyAgICAsIG1famF2YVNjcmlw dFBhdXNlU2NoZWR1bGVkKGZhbHNlKQogewogfQogCkBAIC0xNDQsNiArMTQ1LDggQEAgdm9pZCBJ bnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpnZXRTY3JpcHRTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3Vy Y2VJRCwgU3RyaW5nKiBzY3IKIAogdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpzY2hlZHVs ZVBhdXNlT25OZXh0U3RhdGVtZW50KERlYnVnZ2VyRXZlbnRUeXBlIHR5cGUsIFBhc3NSZWZQdHI8 SW5zcGVjdG9yVmFsdWU+IGRhdGEpCiB7CisgICAgaWYgKG1famF2YVNjcmlwdFBhdXNlU2NoZWR1 bGVkKQorICAgICAgICByZXR1cm47CiAgICAgbV9icmVha1Byb2dyYW1EZXRhaWxzID0gSW5zcGVj dG9yT2JqZWN0OjpjcmVhdGUoKTsKICAgICBtX2JyZWFrUHJvZ3JhbURldGFpbHMtPnNldE51bWJl cigiZXZlbnRUeXBlIiwgdHlwZSk7CiAgICAgbV9icmVha1Byb2dyYW1EZXRhaWxzLT5zZXRWYWx1 ZSgiZXZlbnREYXRhIiwgZGF0YSk7CkBAIC0xNTIsNiArMTU1LDggQEAgdm9pZCBJbnNwZWN0b3JE ZWJ1Z2dlckFnZW50OjpzY2hlZHVsZVBhdXNlT25OZXh0U3RhdGVtZW50KERlYnVnZ2VyRXZlbnRU eXBlIHR5cGUKIAogdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpjYW5jZWxQYXVzZU9uTmV4 dFN0YXRlbWVudCgpCiB7CisgICAgaWYgKG1famF2YVNjcmlwdFBhdXNlU2NoZWR1bGVkKQorICAg ICAgICByZXR1cm47CiAgICAgbV9icmVha1Byb2dyYW1EZXRhaWxzID0gMDsKICAgICBTY3JpcHRE ZWJ1Z1NlcnZlcjo6c2hhcmVkKCkuc2V0UGF1c2VPbk5leHRTdGF0ZW1lbnQoZmFsc2UpOwogfQpA QCAtMTU5LDYgKzE2NCw3IEBAIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6Y2FuY2VsUGF1 c2VPbk5leHRTdGF0ZW1lbnQoKQogdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpwYXVzZSgp CiB7CiAgICAgc2NoZWR1bGVQYXVzZU9uTmV4dFN0YXRlbWVudChKYXZhU2NyaXB0UGF1c2VFdmVu dFR5cGUsIEluc3BlY3Rvck9iamVjdDo6Y3JlYXRlKCkpOworICAgIG1famF2YVNjcmlwdFBhdXNl U2NoZWR1bGVkID0gdHJ1ZTsKIH0KIAogdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpyZXN1 bWUoKQpAQCAtMzA5LDYgKzMxNSw3IEBAIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6ZGlk UGF1c2UoU2NyaXB0U3RhdGUqIHNjcmlwdFN0YXRlKQogICAgIG1fYnJlYWtQcm9ncmFtRGV0YWls cy0+c2V0VmFsdWUoImNhbGxGcmFtZXMiLCBjdXJyZW50Q2FsbEZyYW1lcygpKTsKIAogICAgIG1f ZnJvbnRlbmQtPnBhdXNlZFNjcmlwdChtX2JyZWFrUHJvZ3JhbURldGFpbHMpOworICAgIG1famF2 YVNjcmlwdFBhdXNlU2NoZWR1bGVkID0gZmFsc2U7CiB9CiAKIHZvaWQgSW5zcGVjdG9yRGVidWdn ZXJBZ2VudDo6ZGlkQ29udGludWUoKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yRGVidWdnZXJBZ2VudC5oIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdn ZXJBZ2VudC5oCmluZGV4IDM4MjUwNDIuLjk1MDFhYzggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgKQEAgLTEwNiw2ICsxMDYsNyBAQCBwcml2YXRlOgogICAg IGJvb2wgbV9icmVha3BvaW50c0xvYWRlZDsKICAgICBzdGF0aWMgSW5zcGVjdG9yRGVidWdnZXJB Z2VudCogc19kZWJ1Z2dlckFnZW50T25CcmVha3BvaW50OwogICAgIFJlZlB0cjxJbnNwZWN0b3JP YmplY3Q+IG1fYnJlYWtQcm9ncmFtRGV0YWlsczsKKyAgICBib29sIG1famF2YVNjcmlwdFBhdXNl U2NoZWR1bGVkOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=