87499 2012-05-25 07:07:32 -0700 Web Inspector: Clean up Inspector.json after r118367 2012-05-25 09:25:13 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov apavlov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 633893 0 apavlov 2012-05-25 07:07:32 -0700 Patch to follow. 633912 1 144066 apavlov 2012-05-25 07:42:00 -0700 Created attachment 144066 Patch 633947 2 144066 yurys 2012-05-25 08:22:30 -0700 Comment on attachment 144066 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=144066&action=review > Source/WebCore/inspector/Inspector.json:1862 > + "id": "StyleSheetType", According to http://www.w3.org/TR/CSS21/conform.html#defs "Style sheets may have three different origins: author, user, and user agent. The interaction of these sources is described in the section on cascading and inheritance." So I'd rather leave the current name or StyleSheetOrigin. 633954 3 144077 apavlov 2012-05-25 08:29:35 -0700 Created attachment 144077 Patch 633984 4 144077 webkit.review.bot 2012-05-25 09:25:09 -0700 Comment on attachment 144077 Patch Clearing flags on attachment: 144077 Committed r118533: <http://trac.webkit.org/changeset/118533> 633985 5 webkit.review.bot 2012-05-25 09:25:13 -0700 All reviewed patches have been landed. Closing bug. 144066 2012-05-25 07:42:00 -0700 2012-05-25 08:29:28 -0700 Patch bug-87499-20120525184159.patch text/plain 18479 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2RlZjhiMTk4YmNkNmM3 NWI0NzU5ODM1ZGY1Yjc5OTE4NGMwNWQxMi4uMzBjOGU3ZjgyMjkxZmQ0YjJhZTFkZjU1OWFiYzkx MDk5YmRlMmM2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEyLTA1LTI1ICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogQ2xlYW4gdXAgSW5zcGVjdG9yLmpzb24gYWZ0ZXIgcjExODM2NworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODc0OTkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGNsZWFucyB1cCB0aGUgc2Vt YW50aWMgaW5jb25zaXN0ZW5jaWVzIGludHJvZHVjZWQgaW50byB0eXBlL2ZpZWxkIG5hbWVzIHIx MTgzNjcuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBhcyB0aGlzIGlzIGEgcmVmYWN0b3Jpbmcu CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAgICogaW5zcGVj dG9yL0luc3BlY3RvckNTU0FnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNT U0FnZW50Ojphc0luc3BlY3RvclN0eWxlU2hlZXQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yQ1NTQWdlbnQ6OmJpbmRTdHlsZVNoZWV0KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv ckNTU0FnZW50Ojp2aWFJbnNwZWN0b3JTdHlsZVNoZWV0KToKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3RvckNTU0FnZW50OjpkZXRlY3RTdHlsZVNoZWV0VHlwZSk6CisgICAgICAgICogaW5zcGVj dG9yL0luc3BlY3RvckNTU0FnZW50Lmg6CisgICAgICAgIChJbnNwZWN0b3JDU1NBZ2VudCk6Cisg ICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yU3R5bGVTaGVldDo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3RvclN0eWxlU2hlZXQ6Okluc3BlY3RvclN0eWxlU2hlZXQpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yU3R5bGVTaGVldDo6YnVpbGRPYmplY3RGb3JTdHlsZVNoZWV0SW5mbyk6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JTdHlsZVNoZWV0OjpidWlsZE9iamVjdEZvclJ1bGUp OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yU3R5bGVTaGVldDo6cmVzb3VyY2VTdHlsZVNo ZWV0VGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JTdHlsZVNoZWV0Rm9ySW5saW5l U3R5bGU6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JTdHlsZVNoZWV0Rm9y SW5saW5lU3R5bGU6Okluc3BlY3RvclN0eWxlU2hlZXRGb3JJbmxpbmVTdHlsZSk6CisgICAgICAg ICogaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuaDoKKyAgICAgICAgKEluc3BlY3RvclN0 eWxlU2hlZXQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yU3R5bGVTaGVldDo6Y2FuQmlu ZCk6CisgICAgICAgIChJbnNwZWN0b3JTdHlsZVNoZWV0Rm9ySW5saW5lU3R5bGUpOgorCiAyMDEy LTA1LTI1ICBJbHlhIFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBXZWIgSW5zcGVjdG9yOiBIZWFwU25hcHNob3Q6IGludHJvZHVjZSBwZXJmb3JtYW5jZSBjb3Vu dGVyIGZvciBIZWFwU25hcHNob3RDb25zdHJ1Y3RvcnNEYXRhR3JpZC5fYWdncmVnYXRlc1JlY2Vp dmVkIG1ldGhvZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3IuanNvbiBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRleCBj ZGEyYmNiZjFlYzhjMjc4MTdkNDlhMzgyMDBhMjhlYWZlNmJmMWRmLi4zYTIyMGM0MWExNzQ1NzI5 MTllYzU2MTc3ZTFjNWQ0MzI4MTgwYmFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yLmpzb24KKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3Rvci5qc29uCkBAIC0xODU5LDEwICsxODU5LDEwIEBACiAgICAgICAgICAgICAgICAgImRlc2Ny aXB0aW9uIjogIlRoaXMgb2JqZWN0IGlkZW50aWZpZXMgYSBDU1Mgc3R5bGUgaW4gYSB1bmlxdWUg d2F5LiIKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgImlk IjogIk9yaWdpbiIsCisgICAgICAgICAgICAgICAgImlkIjogIlN0eWxlU2hlZXRUeXBlIiwKICAg ICAgICAgICAgICAgICAidHlwZSI6ICJzdHJpbmciLAogICAgICAgICAgICAgICAgICJlbnVtIjog WyJ1c2VyIiwgInVzZXItYWdlbnQiLCAiaW5zcGVjdG9yIiwgInJlZ3VsYXIiXSwKLSAgICAgICAg ICAgICAgICAiZGVzY3JpcHRpb24iOiAiVGhlIHBhcmVudCBzdHlsZXNoZWV0IHR5cGU6IFwidXNl clwiIGZvciB1c2VyIHN0eWxlc2hlZXRzLCBcInVzZXItYWdlbnRcIiBmb3IgdXNlci1hZ2VudCBz dHlsZXNoZWV0cywgXCJpbnNwZWN0b3JcIiBmb3Igc3R5bGVzaGVldHMgY3JlYXRlZCBieSB0aGUg aW5zcGVjdG9yIChpLmUuIHRob3NlIGhvbGRpbmcgbmV3IHJ1bGVzIGNyZWF0ZWQgd2l0aCA8Y29k ZT5hZGRSdWxlKCk8L2NvZGU+KSwgXCJyZWd1bGFyXCIgZm9yIHJlZ3VsYXIgc3R5bGVzaGVldHMu IgorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJTdHlsZXNoZWV0IHR5cGU6IFwidXNl clwiIGZvciB1c2VyIHN0eWxlc2hlZXRzLCBcInVzZXItYWdlbnRcIiBmb3IgdXNlci1hZ2VudCBz dHlsZXNoZWV0cywgXCJpbnNwZWN0b3JcIiBmb3Igc3R5bGVzaGVldHMgY3JlYXRlZCBieSB0aGUg aW5zcGVjdG9yIChpLmUuIHRob3NlIGhvbGRpbmcgdGhlIFwidmlhIGluc3BlY3RvclwiIHJ1bGVz KSwgXCJyZWd1bGFyXCIgZm9yIHJlZ3VsYXIgc3R5bGVzaGVldHMuIgogICAgICAgICAgICAgfSwK ICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAiaWQiOiAiQ1NTUnVsZUlkIiwKQEAgLTE5 MDcsNyArMTkwNyw3IEBACiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic3R5bGVTaGVl dElkIiwgIiRyZWYiOiAiU3R5bGVTaGVldElkIiwgImRlc2NyaXB0aW9uIjogIlRoZSBzdHlsZXNo ZWV0IGlkZW50aWZpZXIuIn0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZnJhbWVJ ZCIsICIkcmVmIjogIk5ldHdvcmsuRnJhbWVJZCIsICJkZXNjcmlwdGlvbiI6ICJPd25lciBmcmFt ZSBpZGVudGlmaWVyLiJ9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNvdXJjZVVS TCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJTdHlsZXNoZWV0IHJlc291cmNl IFVSTC4ifSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJvcmlnaW4iLCAiJHJlZiI6 ICJPcmlnaW4iLCAiZGVzY3JpcHRpb24iOiAiUnVsZSBvcmlnaW4ifSwKKyAgICAgICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJ0eXBlIiwgIiRyZWYiOiAiU3R5bGVTaGVldFR5cGUiLCAiZGVzY3Jp cHRpb24iOiAiU3R5bGVzaGVldCB0eXBlLiJ9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogInRpdGxlIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlN0eWxlc2hlZXQg dGl0bGUuIn0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZGlzYWJsZWQiLCAidHlw ZSI6ICJib29sZWFuIiwgImRlc2NyaXB0aW9uIjogIkRlbm90ZXMgd2hldGhlciB0aGUgc3R5bGVz aGVldCBpcyBkaXNhYmxlZC4ifQogICAgICAgICAgICAgICAgIF0sCkBAIC0xOTMxLDcgKzE5MzEs NyBAQAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNlbGVjdG9yVGV4dCIsICJ0eXBl IjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJSdWxlIHNlbGVjdG9yLiJ9LAogICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogInNvdXJjZVVSTCIsICJ0eXBlIjogInN0cmluZyIsICJvcHRp b25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJQYXJlbnQgc3R5bGVzaGVldCByZXNvdXJjZSBV UkwgKGZvciByZWd1bGFyIHJ1bGVzKS4ifSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJzb3VyY2VMaW5lIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJMaW5lIG9y ZGluYWwgb2YgdGhlIHJ1bGUgc2VsZWN0b3Igc3RhcnQgY2hhcmFjdGVyIGluIHRoZSByZXNvdXJj ZS4ifSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJvcmlnaW4iLCAiJHJlZiI6ICJP cmlnaW4iLCAiZGVzY3JpcHRpb24iOiAiUnVsZSBvcmlnaW4ifSwKKyAgICAgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJvcmlnaW4iLCAiJHJlZiI6ICJTdHlsZVNoZWV0VHlwZSIsICJkZXNjcmlw dGlvbiI6ICJSdWxlIG9yaWdpbiAocGFyZW50IHN0eWxlc2hlZXQgdHlwZSkuIn0sCiAgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAic3R5bGUiLCAiJHJlZiI6ICJDU1NTdHlsZSIsICJkZXNj cmlwdGlvbiI6ICJBc3NvY2lhdGVkIHN0eWxlIGRlY2xhcmF0aW9uLiIgfSwKICAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJzZWxlY3RvclJhbmdlIiwgIiRyZWYiOiAiU291cmNlUmFuZ2Ui LCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiVGhlIHJ1bGUgc2VsZWN0b3IgcmFu Z2UgaW4gdGhlIHVuZGVybHlpbmcgcmVzb3VyY2UgKGlmIGF2YWlsYWJsZSkuIiB9LAogICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogIm1lZGlhIiwgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMi OiB7ICIkcmVmIjogIkNTU01lZGlhIiB9LCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24i OiAiTWVkaWEgbGlzdCBhcnJheSAoZm9yIHJ1bGVzIGludm9sdmluZyBtZWRpYSBxdWVyaWVzKS4g VGhlIGFycmF5IGVudW1lcmF0ZXMgbWVkaWEgcXVlcmllcyBzdGFydGluZyB3aXRoIHRoZSBpbm5l cm1vc3Qgb25lLCBnb2luZyBvdXR3YXJkcy4iIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwCmluZGV4IDg3ZjMxZTE0NmY4YTJiYjExOWE5NjgxOTBl Y2ViNWRmYTJmOTZmMjYuLmJkZTMyYjhlYjliNTFmMDkzZjEzODAwZmYwODFhYzMyMWEwMjA3NDcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcApA QCAtODI2LDcgKzgyNiw3IEBAIEluc3BlY3RvclN0eWxlU2hlZXRGb3JJbmxpbmVTdHlsZSogSW5z cGVjdG9yQ1NTQWdlbnQ6OmFzSW5zcGVjdG9yU3R5bGVTaGVldChFbGVtCiAgICAgICAgICAgICBy ZXR1cm4gMDsKIAogICAgICAgICBTdHJpbmcgbmV3U3R5bGVTaGVldElkID0gU3RyaW5nOjpudW1i ZXIobV9sYXN0U3R5bGVTaGVldElkKyspOwotICAgICAgICBSZWZQdHI8SW5zcGVjdG9yU3R5bGVT aGVldEZvcklubGluZVN0eWxlPiBpbnNwZWN0b3JTdHlsZVNoZWV0ID0gSW5zcGVjdG9yU3R5bGVT aGVldEZvcklubGluZVN0eWxlOjpjcmVhdGUobV9kb21BZ2VudC0+cGFnZUFnZW50KCksIG5ld1N0 eWxlU2hlZXRJZCwgZWxlbWVudCwgVHlwZUJ1aWxkZXI6OkNTUzo6T3JpZ2luOjpSZWd1bGFyLCB0 aGlzKTsKKyAgICAgICAgUmVmUHRyPEluc3BlY3RvclN0eWxlU2hlZXRGb3JJbmxpbmVTdHlsZT4g aW5zcGVjdG9yU3R5bGVTaGVldCA9IEluc3BlY3RvclN0eWxlU2hlZXRGb3JJbmxpbmVTdHlsZTo6 Y3JlYXRlKG1fZG9tQWdlbnQtPnBhZ2VBZ2VudCgpLCBuZXdTdHlsZVNoZWV0SWQsIGVsZW1lbnQs IFR5cGVCdWlsZGVyOjpDU1M6OlN0eWxlU2hlZXRUeXBlOjpSZWd1bGFyLCB0aGlzKTsKICAgICAg ICAgbV9pZFRvSW5zcGVjdG9yU3R5bGVTaGVldC5zZXQobmV3U3R5bGVTaGVldElkLCBpbnNwZWN0 b3JTdHlsZVNoZWV0KTsKICAgICAgICAgbV9ub2RlVG9JbnNwZWN0b3JTdHlsZVNoZWV0LnNldChl bGVtZW50LCBpbnNwZWN0b3JTdHlsZVNoZWV0KTsKICAgICAgICAgcmV0dXJuIGluc3BlY3RvclN0 eWxlU2hlZXQuZ2V0KCk7CkBAIC04NjksNyArODY5LDcgQEAgSW5zcGVjdG9yU3R5bGVTaGVldCog SW5zcGVjdG9yQ1NTQWdlbnQ6OmJpbmRTdHlsZVNoZWV0KENTU1N0eWxlU2hlZXQqIHN0eWxlU2hl ZXQKICAgICBpZiAoIWluc3BlY3RvclN0eWxlU2hlZXQpIHsKICAgICAgICAgU3RyaW5nIGlkID0g U3RyaW5nOjpudW1iZXIobV9sYXN0U3R5bGVTaGVldElkKyspOwogICAgICAgICBEb2N1bWVudCog ZG9jdW1lbnQgPSBzdHlsZVNoZWV0LT5vd25lckRvY3VtZW50KCk7Ci0gICAgICAgIGluc3BlY3Rv clN0eWxlU2hlZXQgPSBJbnNwZWN0b3JTdHlsZVNoZWV0OjpjcmVhdGUobV9kb21BZ2VudC0+cGFn ZUFnZW50KCksIGlkLCBzdHlsZVNoZWV0LCBkZXRlY3RPcmlnaW4oc3R5bGVTaGVldCwgZG9jdW1l bnQpLCBJbnNwZWN0b3JET01BZ2VudDo6ZG9jdW1lbnRVUkxTdHJpbmcoZG9jdW1lbnQpLCB0aGlz KTsKKyAgICAgICAgaW5zcGVjdG9yU3R5bGVTaGVldCA9IEluc3BlY3RvclN0eWxlU2hlZXQ6OmNy ZWF0ZShtX2RvbUFnZW50LT5wYWdlQWdlbnQoKSwgaWQsIHN0eWxlU2hlZXQsIGRldGVjdFN0eWxl U2hlZXRUeXBlKHN0eWxlU2hlZXQsIGRvY3VtZW50KSwgSW5zcGVjdG9yRE9NQWdlbnQ6OmRvY3Vt ZW50VVJMU3RyaW5nKGRvY3VtZW50KSwgdGhpcyk7CiAgICAgICAgIG1faWRUb0luc3BlY3RvclN0 eWxlU2hlZXQuc2V0KGlkLCBpbnNwZWN0b3JTdHlsZVNoZWV0KTsKICAgICAgICAgbV9jc3NTdHls ZVNoZWV0VG9JbnNwZWN0b3JTdHlsZVNoZWV0LnNldChzdHlsZVNoZWV0LCBpbnNwZWN0b3JTdHls ZVNoZWV0KTsKICAgICB9CkBAIC05MTIsNyArOTEyLDcgQEAgSW5zcGVjdG9yU3R5bGVTaGVldCog SW5zcGVjdG9yQ1NTQWdlbnQ6OnZpYUluc3BlY3RvclN0eWxlU2hlZXQoRG9jdW1lbnQqIGRvY3Vt ZW4KICAgICAgICAgcmV0dXJuIDA7CiAgICAgQ1NTU3R5bGVTaGVldCogY3NzU3R5bGVTaGVldCA9 IHN0YXRpY19jYXN0PENTU1N0eWxlU2hlZXQqPihzdHlsZVNoZWV0KTsKICAgICBTdHJpbmcgaWQg PSBTdHJpbmc6Om51bWJlcihtX2xhc3RTdHlsZVNoZWV0SWQrKyk7Ci0gICAgaW5zcGVjdG9yU3R5 bGVTaGVldCA9IEluc3BlY3RvclN0eWxlU2hlZXQ6OmNyZWF0ZShtX2RvbUFnZW50LT5wYWdlQWdl bnQoKSwgaWQsIGNzc1N0eWxlU2hlZXQsIFR5cGVCdWlsZGVyOjpDU1M6Ok9yaWdpbjo6SW5zcGVj dG9yLCBJbnNwZWN0b3JET01BZ2VudDo6ZG9jdW1lbnRVUkxTdHJpbmcoZG9jdW1lbnQpLCB0aGlz KTsKKyAgICBpbnNwZWN0b3JTdHlsZVNoZWV0ID0gSW5zcGVjdG9yU3R5bGVTaGVldDo6Y3JlYXRl KG1fZG9tQWdlbnQtPnBhZ2VBZ2VudCgpLCBpZCwgY3NzU3R5bGVTaGVldCwgVHlwZUJ1aWxkZXI6 OkNTUzo6U3R5bGVTaGVldFR5cGU6Okluc3BlY3RvciwgSW5zcGVjdG9yRE9NQWdlbnQ6OmRvY3Vt ZW50VVJMU3RyaW5nKGRvY3VtZW50KSwgdGhpcyk7CiAgICAgbV9pZFRvSW5zcGVjdG9yU3R5bGVT aGVldC5zZXQoaWQsIGluc3BlY3RvclN0eWxlU2hlZXQpOwogICAgIG1fY3NzU3R5bGVTaGVldFRv SW5zcGVjdG9yU3R5bGVTaGVldC5zZXQoY3NzU3R5bGVTaGVldCwgaW5zcGVjdG9yU3R5bGVTaGVl dCk7CiAgICAgbV9kb2N1bWVudFRvSW5zcGVjdG9yU3R5bGVTaGVldC5zZXQoZG9jdW1lbnQsIGlu c3BlY3RvclN0eWxlU2hlZXQpOwpAQCAtOTI5LDE3ICs5MjksMTcgQEAgSW5zcGVjdG9yU3R5bGVT aGVldCogSW5zcGVjdG9yQ1NTQWdlbnQ6OmFzc2VydFN0eWxlU2hlZXRGb3JJZChFcnJvclN0cmlu ZyogZXJyb3IKICAgICByZXR1cm4gaXQtPnNlY29uZC5nZXQoKTsKIH0KIAotVHlwZUJ1aWxkZXI6 OkNTUzo6T3JpZ2luOjpFbnVtIEluc3BlY3RvckNTU0FnZW50OjpkZXRlY3RPcmlnaW4oQ1NTU3R5 bGVTaGVldCogcGFnZVN0eWxlU2hlZXQsIERvY3VtZW50KiBvd25lckRvY3VtZW50KQorVHlwZUJ1 aWxkZXI6OkNTUzo6U3R5bGVTaGVldFR5cGU6OkVudW0gSW5zcGVjdG9yQ1NTQWdlbnQ6OmRldGVj dFN0eWxlU2hlZXRUeXBlKENTU1N0eWxlU2hlZXQqIHBhZ2VTdHlsZVNoZWV0LCBEb2N1bWVudCog b3duZXJEb2N1bWVudCkKIHsKLSAgICBUeXBlQnVpbGRlcjo6Q1NTOjpPcmlnaW46OkVudW0gb3Jp Z2luID0gVHlwZUJ1aWxkZXI6OkNTUzo6T3JpZ2luOjpSZWd1bGFyOworICAgIFR5cGVCdWlsZGVy OjpDU1M6OlN0eWxlU2hlZXRUeXBlOjpFbnVtIG9yaWdpbiA9IFR5cGVCdWlsZGVyOjpDU1M6OlN0 eWxlU2hlZXRUeXBlOjpSZWd1bGFyOwogICAgIGlmIChwYWdlU3R5bGVTaGVldCAmJiAhcGFnZVN0 eWxlU2hlZXQtPm93bmVyTm9kZSgpICYmIHBhZ2VTdHlsZVNoZWV0LT5ocmVmKCkuaXNFbXB0eSgp KQotICAgICAgICBvcmlnaW4gPSBUeXBlQnVpbGRlcjo6Q1NTOjpPcmlnaW46OlVzZXJfYWdlbnQ7 CisgICAgICAgIG9yaWdpbiA9IFR5cGVCdWlsZGVyOjpDU1M6OlN0eWxlU2hlZXRUeXBlOjpVc2Vy X2FnZW50OwogICAgIGVsc2UgaWYgKHBhZ2VTdHlsZVNoZWV0ICYmIHBhZ2VTdHlsZVNoZWV0LT5v d25lck5vZGUoKSAmJiBwYWdlU3R5bGVTaGVldC0+b3duZXJOb2RlKCktPm5vZGVOYW1lKCkgPT0g IiNkb2N1bWVudCIpCi0gICAgICAgIG9yaWdpbiA9IFR5cGVCdWlsZGVyOjpDU1M6Ok9yaWdpbjo6 VXNlcjsKKyAgICAgICAgb3JpZ2luID0gVHlwZUJ1aWxkZXI6OkNTUzo6U3R5bGVTaGVldFR5cGU6 OlVzZXI7CiAgICAgZWxzZSB7CiAgICAgICAgIEluc3BlY3RvclN0eWxlU2hlZXQqIHZpYUluc3Bl Y3RvclN0eWxlU2hlZXRGb3JPd25lciA9IHZpYUluc3BlY3RvclN0eWxlU2hlZXQob3duZXJEb2N1 bWVudCwgZmFsc2UpOwogICAgICAgICBpZiAodmlhSW5zcGVjdG9yU3R5bGVTaGVldEZvck93bmVy ICYmIHBhZ2VTdHlsZVNoZWV0ID09IHZpYUluc3BlY3RvclN0eWxlU2hlZXRGb3JPd25lci0+cGFn ZVN0eWxlU2hlZXQoKSkKLSAgICAgICAgICAgIG9yaWdpbiA9IFR5cGVCdWlsZGVyOjpDU1M6Ok9y aWdpbjo6SW5zcGVjdG9yOworICAgICAgICAgICAgb3JpZ2luID0gVHlwZUJ1aWxkZXI6OkNTUzo6 U3R5bGVTaGVldFR5cGU6Okluc3BlY3RvcjsKICAgICB9CiAgICAgcmV0dXJuIG9yaWdpbjsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5o IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmgKaW5kZXggNDRi MjEwNzcwYmY0MWZhYjNlNTQ5MzgyZThlMzU1MmE1YmUxZTBiMC4uZjI2MWY3NWZiMDA4NmVjMzc2 MTgwYzhlZTlkZGNiNGE5NWYzMjgxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckNTU0FnZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckNTU0FnZW50LmgKQEAgLTE0Myw3ICsxNDMsNyBAQCBwcml2YXRlOgogICAgIEluc3Bl Y3RvclN0eWxlU2hlZXQqIGJpbmRTdHlsZVNoZWV0KENTU1N0eWxlU2hlZXQqKTsKICAgICBJbnNw ZWN0b3JTdHlsZVNoZWV0KiB2aWFJbnNwZWN0b3JTdHlsZVNoZWV0KERvY3VtZW50KiwgYm9vbCBj cmVhdGVJZkFic2VudCk7CiAgICAgSW5zcGVjdG9yU3R5bGVTaGVldCogYXNzZXJ0U3R5bGVTaGVl dEZvcklkKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJik7Ci0gICAgVHlwZUJ1aWxkZXI6OkNT Uzo6T3JpZ2luOjpFbnVtIGRldGVjdE9yaWdpbihDU1NTdHlsZVNoZWV0KiBwYWdlU3R5bGVTaGVl dCwgRG9jdW1lbnQqIG93bmVyRG9jdW1lbnQpOworICAgIFR5cGVCdWlsZGVyOjpDU1M6OlN0eWxl U2hlZXRUeXBlOjpFbnVtIGRldGVjdFN0eWxlU2hlZXRUeXBlKENTU1N0eWxlU2hlZXQqIHBhZ2VT dHlsZVNoZWV0LCBEb2N1bWVudCogb3duZXJEb2N1bWVudCk7CiAKICAgICBQYXNzUmVmUHRyPFR5 cGVCdWlsZGVyOjpBcnJheTxUeXBlQnVpbGRlcjo6Q1NTOjpDU1NSdWxlPiA+IGJ1aWxkQXJyYXlG b3JSdWxlTGlzdChDU1NSdWxlTGlzdCosIFN0eWxlUmVzb2x2ZXIqKTsKICAgICBQYXNzUmVmUHRy PFR5cGVCdWlsZGVyOjpDU1M6OkNTU1N0eWxlPiBidWlsZE9iamVjdEZvckF0dHJpYnV0ZXNTdHls ZShFbGVtZW50Kik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yU3R5bGVTaGVldC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3R5 bGVTaGVldC5jcHAKaW5kZXggNDFmZWE2NWE5NzgzOTRkYzcwMGQxMTBiZDlhZjk5ODdlOGQzZmYx Yi4uMTdmOTM1M2Y2NWZiNWQ0NGUxMmFiYzEyOWJmMGM5NzhmZGI1YTg0NSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmNwcApAQCAtNjgyLDcg KzY4Miw3IEBAIE5ld0xpbmVBbmRXaGl0ZXNwYWNlJiBJbnNwZWN0b3JTdHlsZTo6bmV3TGluZUFu ZFdoaXRlc3BhY2VEZWxpbWl0ZXJzKCkgY29uc3QKICAgICByZXR1cm4gbV9mb3JtYXQ7CiB9CiAK LVBhc3NSZWZQdHI8SW5zcGVjdG9yU3R5bGVTaGVldD4gSW5zcGVjdG9yU3R5bGVTaGVldDo6Y3Jl YXRlKEluc3BlY3RvclBhZ2VBZ2VudCogcGFnZUFnZW50LCBjb25zdCBTdHJpbmcmIGlkLCBQYXNz UmVmUHRyPENTU1N0eWxlU2hlZXQ+IHBhZ2VTdHlsZVNoZWV0LCBUeXBlQnVpbGRlcjo6Q1NTOjpP cmlnaW46OkVudW0gb3JpZ2luLCBjb25zdCBTdHJpbmcmIGRvY3VtZW50VVJMLCBMaXN0ZW5lciog bGlzdGVuZXIpCitQYXNzUmVmUHRyPEluc3BlY3RvclN0eWxlU2hlZXQ+IEluc3BlY3RvclN0eWxl U2hlZXQ6OmNyZWF0ZShJbnNwZWN0b3JQYWdlQWdlbnQqIHBhZ2VBZ2VudCwgY29uc3QgU3RyaW5n JiBpZCwgUGFzc1JlZlB0cjxDU1NTdHlsZVNoZWV0PiBwYWdlU3R5bGVTaGVldCwgVHlwZUJ1aWxk ZXI6OkNTUzo6U3R5bGVTaGVldFR5cGU6OkVudW0gb3JpZ2luLCBjb25zdCBTdHJpbmcmIGRvY3Vt ZW50VVJMLCBMaXN0ZW5lciogbGlzdGVuZXIpCiB7CiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBJ bnNwZWN0b3JTdHlsZVNoZWV0KHBhZ2VBZ2VudCwgaWQsIHBhZ2VTdHlsZVNoZWV0LCBvcmlnaW4s IGRvY3VtZW50VVJMLCBsaXN0ZW5lcikpOwogfQpAQCAtNjk1LDExICs2OTUsMTEgQEAgU3RyaW5n IEluc3BlY3RvclN0eWxlU2hlZXQ6OnN0eWxlU2hlZXRVUkwoQ1NTU3R5bGVTaGVldCogcGFnZVN0 eWxlU2hlZXQpCiAgICAgcmV0dXJuIGVtcHR5U3RyaW5nKCk7CiB9CiAKLUluc3BlY3RvclN0eWxl U2hlZXQ6Okluc3BlY3RvclN0eWxlU2hlZXQoSW5zcGVjdG9yUGFnZUFnZW50KiBwYWdlQWdlbnQs IGNvbnN0IFN0cmluZyYgaWQsIFBhc3NSZWZQdHI8Q1NTU3R5bGVTaGVldD4gcGFnZVN0eWxlU2hl ZXQsIFR5cGVCdWlsZGVyOjpDU1M6Ok9yaWdpbjo6RW51bSBvcmlnaW4sIGNvbnN0IFN0cmluZyYg ZG9jdW1lbnRVUkwsIExpc3RlbmVyKiBsaXN0ZW5lcikKK0luc3BlY3RvclN0eWxlU2hlZXQ6Oklu c3BlY3RvclN0eWxlU2hlZXQoSW5zcGVjdG9yUGFnZUFnZW50KiBwYWdlQWdlbnQsIGNvbnN0IFN0 cmluZyYgaWQsIFBhc3NSZWZQdHI8Q1NTU3R5bGVTaGVldD4gcGFnZVN0eWxlU2hlZXQsIFR5cGVC dWlsZGVyOjpDU1M6OlN0eWxlU2hlZXRUeXBlOjpFbnVtIHR5cGUsIGNvbnN0IFN0cmluZyYgZG9j dW1lbnRVUkwsIExpc3RlbmVyKiBsaXN0ZW5lcikKICAgICA6IG1fcGFnZUFnZW50KHBhZ2VBZ2Vu dCkKICAgICAsIG1faWQoaWQpCiAgICAgLCBtX3BhZ2VTdHlsZVNoZWV0KHBhZ2VTdHlsZVNoZWV0 KQotICAgICwgbV9vcmlnaW4ob3JpZ2luKQorICAgICwgbV90eXBlKHR5cGUpCiAgICAgLCBtX2Rv Y3VtZW50VVJMKGRvY3VtZW50VVJMKQogICAgICwgbV9pc1JldmFsaWRhdGluZyhmYWxzZSkKICAg ICAsIG1fbGlzdGVuZXIobGlzdGVuZXIpCkBAIC04NzYsNyArODc2LDcgQEAgUGFzc1JlZlB0cjxU eXBlQnVpbGRlcjo6Q1NTOjpDU1NTdHlsZVNoZWV0SGVhZGVyPiBJbnNwZWN0b3JTdHlsZVNoZWV0 OjpidWlsZE9iamUKICAgICBGcmFtZSogZnJhbWUgPSBkb2N1bWVudCA/IGRvY3VtZW50LT5mcmFt ZSgpIDogMDsKICAgICBSZWZQdHI8VHlwZUJ1aWxkZXI6OkNTUzo6Q1NTU3R5bGVTaGVldEhlYWRl cj4gcmVzdWx0ID0gVHlwZUJ1aWxkZXI6OkNTUzo6Q1NTU3R5bGVTaGVldEhlYWRlcjo6Y3JlYXRl KCkKICAgICAgICAgLnNldFN0eWxlU2hlZXRJZChpZCgpKQotICAgICAgICAuc2V0T3JpZ2luKG1f b3JpZ2luKQorICAgICAgICAuc2V0VHlwZShtX3R5cGUpCiAgICAgICAgIC5zZXREaXNhYmxlZChz dHlsZVNoZWV0LT5kaXNhYmxlZCgpKQogICAgICAgICAuc2V0U291cmNlVVJMKGZpbmFsVVJMKCkp CiAgICAgICAgIC5zZXRUaXRsZShzdHlsZVNoZWV0LT50aXRsZSgpKQpAQCAtODk0LDExICs4OTQs MTEgQEAgUGFzc1JlZlB0cjxUeXBlQnVpbGRlcjo6Q1NTOjpDU1NSdWxlPiBJbnNwZWN0b3JTdHls ZVNoZWV0OjpidWlsZE9iamVjdEZvclJ1bGUoQ1MKICAgICBSZWZQdHI8VHlwZUJ1aWxkZXI6OkNT Uzo6Q1NTUnVsZT4gcmVzdWx0ID0gVHlwZUJ1aWxkZXI6OkNTUzo6Q1NTUnVsZTo6Y3JlYXRlKCkK ICAgICAgICAgLnNldFNlbGVjdG9yVGV4dChydWxlLT5zZWxlY3RvclRleHQoKSkKICAgICAgICAg LnNldFNvdXJjZUxpbmUocnVsZS0+c3R5bGVSdWxlKCktPnNvdXJjZUxpbmUoKSkKLSAgICAgICAg LnNldE9yaWdpbihtX29yaWdpbikKKyAgICAgICAgLnNldE9yaWdpbihtX3R5cGUpCiAgICAgICAg IC5zZXRTdHlsZShidWlsZE9iamVjdEZvclN0eWxlKHJ1bGUtPnN0eWxlKCkpKTsKIAogICAgIC8v ICJzb3VyY2VVUkwiIGlzIHByZXNlbnQgb25seSBmb3IgcmVndWxhciBydWxlcywgb3RoZXJ3aXNl ICJvcmlnaW4iIHNob3VsZCBiZSB1c2VkIGluIHRoZSBmcm9udGVuZC4KLSAgICBpZiAobV9vcmln aW4gPT0gVHlwZUJ1aWxkZXI6OkNTUzo6T3JpZ2luOjpSZWd1bGFyKQorICAgIGlmIChtX3R5cGUg PT0gVHlwZUJ1aWxkZXI6OkNTUzo6U3R5bGVTaGVldFR5cGU6OlJlZ3VsYXIpCiAgICAgICAgIHJl c3VsdC0+c2V0U291cmNlVVJMKGZpbmFsVVJMKCkpOwogCiAgICAgaWYgKGNhbkJpbmQoKSkgewpA QCAtMTIwNCw3ICsxMjA0LDcgQEAgYm9vbCBJbnNwZWN0b3JTdHlsZVNoZWV0OjpvcmlnaW5hbFN0 eWxlU2hlZXRUZXh0KFN0cmluZyogcmVzdWx0KSBjb25zdAogCiBib29sIEluc3BlY3RvclN0eWxl U2hlZXQ6OnJlc291cmNlU3R5bGVTaGVldFRleHQoU3RyaW5nKiByZXN1bHQpIGNvbnN0CiB7Ci0g ICAgaWYgKG1fb3JpZ2luID09IFR5cGVCdWlsZGVyOjpDU1M6Ok9yaWdpbjo6VXNlciB8fCBtX29y aWdpbiA9PSBUeXBlQnVpbGRlcjo6Q1NTOjpPcmlnaW46OlVzZXJfYWdlbnQpCisgICAgaWYgKG1f dHlwZSA9PSBUeXBlQnVpbGRlcjo6Q1NTOjpTdHlsZVNoZWV0VHlwZTo6VXNlciB8fCBtX3R5cGUg PT0gVHlwZUJ1aWxkZXI6OkNTUzo6U3R5bGVTaGVldFR5cGU6OlVzZXJfYWdlbnQpCiAgICAgICAg IHJldHVybiBmYWxzZTsKIAogICAgIGlmICghbV9wYWdlU3R5bGVTaGVldCB8fCAhb3duZXJEb2N1 bWVudCgpIHx8ICFvd25lckRvY3VtZW50KCktPmZyYW1lKCkpCkBAIC0xMzE1LDEyICsxMzE1LDEy IEBAIHZvaWQgSW5zcGVjdG9yU3R5bGVTaGVldDo6Y29sbGVjdEZsYXRSdWxlcyhQYXNzUmVmUHRy PENTU1J1bGVMaXN0PiBydWxlTGlzdCwgVmVjCiAgICAgfQogfQogCi1QYXNzUmVmUHRyPEluc3Bl Y3RvclN0eWxlU2hlZXRGb3JJbmxpbmVTdHlsZT4gSW5zcGVjdG9yU3R5bGVTaGVldEZvcklubGlu ZVN0eWxlOjpjcmVhdGUoSW5zcGVjdG9yUGFnZUFnZW50KiBwYWdlQWdlbnQsIGNvbnN0IFN0cmlu ZyYgaWQsIFBhc3NSZWZQdHI8RWxlbWVudD4gZWxlbWVudCwgVHlwZUJ1aWxkZXI6OkNTUzo6T3Jp Z2luOjpFbnVtIG9yaWdpbiwgTGlzdGVuZXIqIGxpc3RlbmVyKQorUGFzc1JlZlB0cjxJbnNwZWN0 b3JTdHlsZVNoZWV0Rm9ySW5saW5lU3R5bGU+IEluc3BlY3RvclN0eWxlU2hlZXRGb3JJbmxpbmVT dHlsZTo6Y3JlYXRlKEluc3BlY3RvclBhZ2VBZ2VudCogcGFnZUFnZW50LCBjb25zdCBTdHJpbmcm IGlkLCBQYXNzUmVmUHRyPEVsZW1lbnQ+IGVsZW1lbnQsIFR5cGVCdWlsZGVyOjpDU1M6OlN0eWxl U2hlZXRUeXBlOjpFbnVtIG9yaWdpbiwgTGlzdGVuZXIqIGxpc3RlbmVyKQogewogICAgIHJldHVy biBhZG9wdFJlZihuZXcgSW5zcGVjdG9yU3R5bGVTaGVldEZvcklubGluZVN0eWxlKHBhZ2VBZ2Vu dCwgaWQsIGVsZW1lbnQsIG9yaWdpbiwgbGlzdGVuZXIpKTsKIH0KIAotSW5zcGVjdG9yU3R5bGVT aGVldEZvcklubGluZVN0eWxlOjpJbnNwZWN0b3JTdHlsZVNoZWV0Rm9ySW5saW5lU3R5bGUoSW5z cGVjdG9yUGFnZUFnZW50KiBwYWdlQWdlbnQsIGNvbnN0IFN0cmluZyYgaWQsIFBhc3NSZWZQdHI8 RWxlbWVudD4gZWxlbWVudCwgVHlwZUJ1aWxkZXI6OkNTUzo6T3JpZ2luOjpFbnVtIG9yaWdpbiwg TGlzdGVuZXIqIGxpc3RlbmVyKQorSW5zcGVjdG9yU3R5bGVTaGVldEZvcklubGluZVN0eWxlOjpJ bnNwZWN0b3JTdHlsZVNoZWV0Rm9ySW5saW5lU3R5bGUoSW5zcGVjdG9yUGFnZUFnZW50KiBwYWdl QWdlbnQsIGNvbnN0IFN0cmluZyYgaWQsIFBhc3NSZWZQdHI8RWxlbWVudD4gZWxlbWVudCwgVHlw ZUJ1aWxkZXI6OkNTUzo6U3R5bGVTaGVldFR5cGU6OkVudW0gb3JpZ2luLCBMaXN0ZW5lciogbGlz dGVuZXIpCiAgICAgOiBJbnNwZWN0b3JTdHlsZVNoZWV0KHBhZ2VBZ2VudCwgaWQsIDAsIG9yaWdp biwgIiIsIGxpc3RlbmVyKQogICAgICwgbV9lbGVtZW50KGVsZW1lbnQpCiAgICAgLCBtX3J1bGVT b3VyY2VEYXRhKDApCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yU3R5bGVTaGVldC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxl U2hlZXQuaAppbmRleCA0MjdkYWIyODAxYjYwM2JlNGY2M2U5NmFmNTA0ODZiOTg1NWE3YjAxLi4y ZGE3YTdlNTE1MDEyMmRjNDY2ZTRiNzk2NDcyZjVkZTFiYzY3MjE3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmgKQEAgLTE3MSw3ICsxNzEsNyBA QCBwdWJsaWM6CiAgICAgfTsKIAogICAgIHR5cGVkZWYgSGFzaE1hcDxDU1NTdHlsZURlY2xhcmF0 aW9uKiwgUmVmUHRyPEluc3BlY3RvclN0eWxlPiA+IEluc3BlY3RvclN0eWxlTWFwOwotICAgIHN0 YXRpYyBQYXNzUmVmUHRyPEluc3BlY3RvclN0eWxlU2hlZXQ+IGNyZWF0ZShJbnNwZWN0b3JQYWdl QWdlbnQqLCBjb25zdCBTdHJpbmcmIGlkLCBQYXNzUmVmUHRyPENTU1N0eWxlU2hlZXQ+IHBhZ2VT dHlsZVNoZWV0LCBUeXBlQnVpbGRlcjo6Q1NTOjpPcmlnaW46OkVudW0sIGNvbnN0IFN0cmluZyYg ZG9jdW1lbnRVUkwsIExpc3RlbmVyKik7CisgICAgc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9y U3R5bGVTaGVldD4gY3JlYXRlKEluc3BlY3RvclBhZ2VBZ2VudCosIGNvbnN0IFN0cmluZyYgaWQs IFBhc3NSZWZQdHI8Q1NTU3R5bGVTaGVldD4gcGFnZVN0eWxlU2hlZXQsIFR5cGVCdWlsZGVyOjpD U1M6OlN0eWxlU2hlZXRUeXBlOjpFbnVtLCBjb25zdCBTdHJpbmcmIGRvY3VtZW50VVJMLCBMaXN0 ZW5lciopOwogICAgIHN0YXRpYyBTdHJpbmcgc3R5bGVTaGVldFVSTChDU1NTdHlsZVNoZWV0KiBw YWdlU3R5bGVTaGVldCk7CiAKICAgICB2aXJ0dWFsIH5JbnNwZWN0b3JTdHlsZVNoZWV0KCk7CkBA IC0yMDEsOSArMjAxLDkgQEAgcHVibGljOgogICAgIEluc3BlY3RvckNTU0lkIHN0eWxlSWQoQ1NT U3R5bGVEZWNsYXJhdGlvbiogc3R5bGUpIGNvbnN0IHsgcmV0dXJuIHJ1bGVPclN0eWxlSWQoc3R5 bGUpOyB9CiAKIHByb3RlY3RlZDoKLSAgICBJbnNwZWN0b3JTdHlsZVNoZWV0KEluc3BlY3RvclBh Z2VBZ2VudCosIGNvbnN0IFN0cmluZyYgaWQsIFBhc3NSZWZQdHI8Q1NTU3R5bGVTaGVldD4gcGFn ZVN0eWxlU2hlZXQsIFR5cGVCdWlsZGVyOjpDU1M6Ok9yaWdpbjo6RW51bSwgY29uc3QgU3RyaW5n JiBkb2N1bWVudFVSTCwgTGlzdGVuZXIqKTsKKyAgICBJbnNwZWN0b3JTdHlsZVNoZWV0KEluc3Bl Y3RvclBhZ2VBZ2VudCosIGNvbnN0IFN0cmluZyYgaWQsIFBhc3NSZWZQdHI8Q1NTU3R5bGVTaGVl dD4gcGFnZVN0eWxlU2hlZXQsIFR5cGVCdWlsZGVyOjpDU1M6OlN0eWxlU2hlZXRUeXBlOjpFbnVt LCBjb25zdCBTdHJpbmcmIGRvY3VtZW50VVJMLCBMaXN0ZW5lciopOwogCi0gICAgYm9vbCBjYW5C aW5kKCkgY29uc3QgeyByZXR1cm4gbV9vcmlnaW4gIT0gVHlwZUJ1aWxkZXI6OkNTUzo6T3JpZ2lu OjpVc2VyX2FnZW50ICYmIG1fb3JpZ2luICE9IFR5cGVCdWlsZGVyOjpDU1M6Ok9yaWdpbjo6VXNl cjsgfQorICAgIGJvb2wgY2FuQmluZCgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZSAhPSBUeXBlQnVp bGRlcjo6Q1NTOjpTdHlsZVNoZWV0VHlwZTo6VXNlcl9hZ2VudCAmJiBtX3R5cGUgIT0gVHlwZUJ1 aWxkZXI6OkNTUzo6U3R5bGVTaGVldFR5cGU6OlVzZXI7IH0KICAgICBJbnNwZWN0b3JDU1NJZCBy dWxlT3JTdHlsZUlkKENTU1N0eWxlRGVjbGFyYXRpb24qIHN0eWxlKSBjb25zdDsKICAgICB2aXJ0 dWFsIERvY3VtZW50KiBvd25lckRvY3VtZW50KCkgY29uc3Q7CiAgICAgdmlydHVhbCBSZWZQdHI8 Q1NTUnVsZVNvdXJjZURhdGE+IHJ1bGVTb3VyY2VEYXRhRm9yKENTU1N0eWxlRGVjbGFyYXRpb24q IHN0eWxlKSBjb25zdDsKQEAgLTIzNCw3ICsyMzQsNyBAQCBwcml2YXRlOgogICAgIEluc3BlY3Rv clBhZ2VBZ2VudCogbV9wYWdlQWdlbnQ7CiAgICAgU3RyaW5nIG1faWQ7CiAgICAgUmVmUHRyPENT U1N0eWxlU2hlZXQ+IG1fcGFnZVN0eWxlU2hlZXQ7Ci0gICAgVHlwZUJ1aWxkZXI6OkNTUzo6T3Jp Z2luOjpFbnVtIG1fb3JpZ2luOworICAgIFR5cGVCdWlsZGVyOjpDU1M6OlN0eWxlU2hlZXRUeXBl OjpFbnVtIG1fdHlwZTsKICAgICBTdHJpbmcgbV9kb2N1bWVudFVSTDsKICAgICBib29sIG1faXNS ZXZhbGlkYXRpbmc7CiAgICAgUGFyc2VkU3R5bGVTaGVldCogbV9wYXJzZWRTdHlsZVNoZWV0OwpA QCAtMjQ1LDE0ICsyNDUsMTQgQEAgcHJpdmF0ZToKIAogY2xhc3MgSW5zcGVjdG9yU3R5bGVTaGVl dEZvcklubGluZVN0eWxlIDogcHVibGljIEluc3BlY3RvclN0eWxlU2hlZXQgewogcHVibGljOgot ICAgIHN0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3RvclN0eWxlU2hlZXRGb3JJbmxpbmVTdHlsZT4g Y3JlYXRlKEluc3BlY3RvclBhZ2VBZ2VudCosIGNvbnN0IFN0cmluZyYgaWQsIFBhc3NSZWZQdHI8 RWxlbWVudD4sIFR5cGVCdWlsZGVyOjpDU1M6Ok9yaWdpbjo6RW51bSwgTGlzdGVuZXIqKTsKKyAg ICBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JTdHlsZVNoZWV0Rm9ySW5saW5lU3R5bGU+IGNy ZWF0ZShJbnNwZWN0b3JQYWdlQWdlbnQqLCBjb25zdCBTdHJpbmcmIGlkLCBQYXNzUmVmUHRyPEVs ZW1lbnQ+LCBUeXBlQnVpbGRlcjo6Q1NTOjpTdHlsZVNoZWV0VHlwZTo6RW51bSwgTGlzdGVuZXIq KTsKIAogICAgIHZvaWQgZGlkTW9kaWZ5RWxlbWVudEF0dHJpYnV0ZSgpOwogICAgIHZpcnR1YWwg Ym9vbCBnZXRUZXh0KFN0cmluZyogcmVzdWx0KSBjb25zdDsKICAgICB2aXJ0dWFsIENTU1N0eWxl RGVjbGFyYXRpb24qIHN0eWxlRm9ySWQoY29uc3QgSW5zcGVjdG9yQ1NTSWQmIGlkKSBjb25zdCB7 IEFTU0VSVF9VTlVTRUQoaWQsICFpZC5vcmRpbmFsKCkpOyByZXR1cm4gaW5saW5lU3R5bGUoKTsg fQogCiBwcm90ZWN0ZWQ6Ci0gICAgSW5zcGVjdG9yU3R5bGVTaGVldEZvcklubGluZVN0eWxlKElu c3BlY3RvclBhZ2VBZ2VudCosIGNvbnN0IFN0cmluZyYgaWQsIFBhc3NSZWZQdHI8RWxlbWVudD4s IFR5cGVCdWlsZGVyOjpDU1M6Ok9yaWdpbjo6RW51bSwgTGlzdGVuZXIqKTsKKyAgICBJbnNwZWN0 b3JTdHlsZVNoZWV0Rm9ySW5saW5lU3R5bGUoSW5zcGVjdG9yUGFnZUFnZW50KiwgY29uc3QgU3Ry aW5nJiBpZCwgUGFzc1JlZlB0cjxFbGVtZW50PiwgVHlwZUJ1aWxkZXI6OkNTUzo6U3R5bGVTaGVl dFR5cGU6OkVudW0sIExpc3RlbmVyKik7CiAKICAgICB2aXJ0dWFsIERvY3VtZW50KiBvd25lckRv Y3VtZW50KCkgY29uc3Q7CiAgICAgdmlydHVhbCBSZWZQdHI8Q1NTUnVsZVNvdXJjZURhdGE+IHJ1 bGVTb3VyY2VEYXRhRm9yKENTU1N0eWxlRGVjbGFyYXRpb24qIHN0eWxlKSBjb25zdCB7IEFTU0VS VF9VTlVTRUQoc3R5bGUsIHN0eWxlID09IGlubGluZVN0eWxlKCkpOyByZXR1cm4gbV9ydWxlU291 cmNlRGF0YTsgfQo= 144077 2012-05-25 08:29:35 -0700 2012-05-25 09:25:09 -0700 Patch bug-87499-20120525192933.patch text/plain 16731 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2RlZjhiMTk4YmNkNmM3 NWI0NzU5ODM1ZGY1Yjc5OTE4NGMwNWQxMi4uM2ZkMjZiNjNjMGYxMGVjYWY5YzY2MTk2NDAwMmNl MDA3ODZmNDc2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEyLTA1LTI1ICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogQ2xlYW4gdXAgSW5zcGVjdG9yLmpzb24gYWZ0ZXIgcjExODM2NworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODc0OTkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGNsZWFucyB1cCB0aGUgc2Vt YW50aWMgaW5jb25zaXN0ZW5jaWVzIGludHJvZHVjZWQgaW50byB0eXBlL2ZpZWxkIG5hbWVzIHIx MTgzNjcuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBhcyB0aGlzIGlzIGEgcmVmYWN0b3Jpbmcu CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAgICogaW5zcGVj dG9yL0luc3BlY3RvckNTU0FnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNT U0FnZW50Ojphc0luc3BlY3RvclN0eWxlU2hlZXQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yQ1NTQWdlbnQ6OnZpYUluc3BlY3RvclN0eWxlU2hlZXQpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yQ1NTQWdlbnQ6OmRldGVjdE9yaWdpbik6CisgICAgICAgICogaW5zcGVjdG9yL0lu c3BlY3RvckNTU0FnZW50Lmg6CisgICAgICAgIChJbnNwZWN0b3JDU1NBZ2VudCk6CisgICAgICAg ICogaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yU3R5bGVTaGVldDo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv clN0eWxlU2hlZXQ6Okluc3BlY3RvclN0eWxlU2hlZXQpOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yU3R5bGVTaGVldDo6YnVpbGRPYmplY3RGb3JSdWxlKToKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvclN0eWxlU2hlZXQ6OnJlc291cmNlU3R5bGVTaGVldFRleHQpOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yU3R5bGVTaGVldEZvcklubGluZVN0eWxlOjpjcmVhdGUpOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yU3R5bGVTaGVldEZvcklubGluZVN0eWxlOjpJbnNwZWN0 b3JTdHlsZVNoZWV0Rm9ySW5saW5lU3R5bGUpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0 b3JTdHlsZVNoZWV0Lmg6CisgICAgICAgIChJbnNwZWN0b3JTdHlsZVNoZWV0KToKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3RvclN0eWxlU2hlZXQ6OmNhbkJpbmQpOgorICAgICAgICAoSW5zcGVj dG9yU3R5bGVTaGVldEZvcklubGluZVN0eWxlKToKKwogMjAxMi0wNS0yNSAgSWx5YSBUaWtob25v dnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogSGVh cFNuYXBzaG90OiBpbnRyb2R1Y2UgcGVyZm9ybWFuY2UgY291bnRlciBmb3IgSGVhcFNuYXBzaG90 Q29uc3RydWN0b3JzRGF0YUdyaWQuX2FnZ3JlZ2F0ZXNSZWNlaXZlZCBtZXRob2QuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggY2RhMmJjYmYxZWM4YzI3ODE3ZDQ5 YTM4MjAwYTI4ZWFmZTZiZjFkZi4uYjJlZTk2M2Y0NjMyYzQ0ZTIwM2YwNzI0ZDIxZjQ0ZWEzNWE0 N2YxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29u CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtMTg1OSwx MCArMTg1OSwxMCBAQAogICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJUaGlzIG9iamVj dCBpZGVudGlmaWVzIGEgQ1NTIHN0eWxlIGluIGEgdW5pcXVlIHdheS4iCiAgICAgICAgICAgICB9 LAogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJpZCI6ICJPcmlnaW4iLAorICAgICAg ICAgICAgICAgICJpZCI6ICJTdHlsZVNoZWV0T3JpZ2luIiwKICAgICAgICAgICAgICAgICAidHlw ZSI6ICJzdHJpbmciLAogICAgICAgICAgICAgICAgICJlbnVtIjogWyJ1c2VyIiwgInVzZXItYWdl bnQiLCAiaW5zcGVjdG9yIiwgInJlZ3VsYXIiXSwKLSAgICAgICAgICAgICAgICAiZGVzY3JpcHRp b24iOiAiVGhlIHBhcmVudCBzdHlsZXNoZWV0IHR5cGU6IFwidXNlclwiIGZvciB1c2VyIHN0eWxl c2hlZXRzLCBcInVzZXItYWdlbnRcIiBmb3IgdXNlci1hZ2VudCBzdHlsZXNoZWV0cywgXCJpbnNw ZWN0b3JcIiBmb3Igc3R5bGVzaGVldHMgY3JlYXRlZCBieSB0aGUgaW5zcGVjdG9yIChpLmUuIHRo b3NlIGhvbGRpbmcgbmV3IHJ1bGVzIGNyZWF0ZWQgd2l0aCA8Y29kZT5hZGRSdWxlKCk8L2NvZGU+ KSwgXCJyZWd1bGFyXCIgZm9yIHJlZ3VsYXIgc3R5bGVzaGVldHMuIgorICAgICAgICAgICAgICAg ICJkZXNjcmlwdGlvbiI6ICJTdHlsZXNoZWV0IHR5cGU6IFwidXNlclwiIGZvciB1c2VyIHN0eWxl c2hlZXRzLCBcInVzZXItYWdlbnRcIiBmb3IgdXNlci1hZ2VudCBzdHlsZXNoZWV0cywgXCJpbnNw ZWN0b3JcIiBmb3Igc3R5bGVzaGVldHMgY3JlYXRlZCBieSB0aGUgaW5zcGVjdG9yIChpLmUuIHRo b3NlIGhvbGRpbmcgdGhlIFwidmlhIGluc3BlY3RvclwiIHJ1bGVzKSwgXCJyZWd1bGFyXCIgZm9y IHJlZ3VsYXIgc3R5bGVzaGVldHMuIgogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHsKICAg ICAgICAgICAgICAgICAiaWQiOiAiQ1NTUnVsZUlkIiwKQEAgLTE5MDcsNyArMTkwNyw3IEBACiAg ICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic3R5bGVTaGVldElkIiwgIiRyZWYiOiAiU3R5 bGVTaGVldElkIiwgImRlc2NyaXB0aW9uIjogIlRoZSBzdHlsZXNoZWV0IGlkZW50aWZpZXIuIn0s CiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZnJhbWVJZCIsICIkcmVmIjogIk5ldHdv cmsuRnJhbWVJZCIsICJkZXNjcmlwdGlvbiI6ICJPd25lciBmcmFtZSBpZGVudGlmaWVyLiJ9LAog ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNvdXJjZVVSTCIsICJ0eXBlIjogInN0cmlu ZyIsICJkZXNjcmlwdGlvbiI6ICJTdHlsZXNoZWV0IHJlc291cmNlIFVSTC4ifSwKLSAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJvcmlnaW4iLCAiJHJlZiI6ICJPcmlnaW4iLCAiZGVzY3Jp cHRpb24iOiAiUnVsZSBvcmlnaW4ifSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJv cmlnaW4iLCAiJHJlZiI6ICJTdHlsZVNoZWV0T3JpZ2luIiwgImRlc2NyaXB0aW9uIjogIlN0eWxl c2hlZXQgb3JpZ2luLiJ9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInRpdGxlIiwg InR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlN0eWxlc2hlZXQgdGl0bGUuIn0sCiAg ICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZGlzYWJsZWQiLCAidHlwZSI6ICJib29sZWFu IiwgImRlc2NyaXB0aW9uIjogIkRlbm90ZXMgd2hldGhlciB0aGUgc3R5bGVzaGVldCBpcyBkaXNh YmxlZC4ifQogICAgICAgICAgICAgICAgIF0sCkBAIC0xOTMxLDcgKzE5MzEsNyBAQAogICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogInNlbGVjdG9yVGV4dCIsICJ0eXBlIjogInN0cmluZyIs ICJkZXNjcmlwdGlvbiI6ICJSdWxlIHNlbGVjdG9yLiJ9LAogICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogInNvdXJjZVVSTCIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUs ICJkZXNjcmlwdGlvbiI6ICJQYXJlbnQgc3R5bGVzaGVldCByZXNvdXJjZSBVUkwgKGZvciByZWd1 bGFyIHJ1bGVzKS4ifSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzb3VyY2VMaW5l IiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJMaW5lIG9yZGluYWwgb2YgdGhl IHJ1bGUgc2VsZWN0b3Igc3RhcnQgY2hhcmFjdGVyIGluIHRoZSByZXNvdXJjZS4ifSwKLSAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJvcmlnaW4iLCAiJHJlZiI6ICJPcmlnaW4iLCAiZGVz Y3JpcHRpb24iOiAiUnVsZSBvcmlnaW4ifSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJvcmlnaW4iLCAiJHJlZiI6ICJTdHlsZVNoZWV0T3JpZ2luIiwgImRlc2NyaXB0aW9uIjogIlBh cmVudCBzdHlsZXNoZWV0J3Mgb3JpZ2luLiJ9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogInN0eWxlIiwgIiRyZWYiOiAiQ1NTU3R5bGUiLCAiZGVzY3JpcHRpb24iOiAiQXNzb2NpYXRl ZCBzdHlsZSBkZWNsYXJhdGlvbi4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi c2VsZWN0b3JSYW5nZSIsICIkcmVmIjogIlNvdXJjZVJhbmdlIiwgIm9wdGlvbmFsIjogdHJ1ZSwg ImRlc2NyaXB0aW9uIjogIlRoZSBydWxlIHNlbGVjdG9yIHJhbmdlIGluIHRoZSB1bmRlcmx5aW5n IHJlc291cmNlIChpZiBhdmFpbGFibGUpLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJtZWRpYSIsICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiI6ICJDU1NNZWRp YSIgfSwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIk1lZGlhIGxpc3QgYXJyYXkg KGZvciBydWxlcyBpbnZvbHZpbmcgbWVkaWEgcXVlcmllcykuIFRoZSBhcnJheSBlbnVtZXJhdGVz IG1lZGlhIHF1ZXJpZXMgc3RhcnRpbmcgd2l0aCB0aGUgaW5uZXJtb3N0IG9uZSwgZ29pbmcgb3V0 d2FyZHMuIiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y Q1NTQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50 LmNwcAppbmRleCA4N2YzMWUxNDZmOGEyYmIxMTlhOTY4MTkwZWNlYjVkZmEyZjk2ZjI2Li42ZmE4 OGM0NWI0NzY5MjY3YjEyMWU1Y2E5NmM0NDRiZmY5NDBkNmVmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5jcHAKQEAgLTgyNiw3ICs4MjYsNyBAQCBJ bnNwZWN0b3JTdHlsZVNoZWV0Rm9ySW5saW5lU3R5bGUqIEluc3BlY3RvckNTU0FnZW50Ojphc0lu c3BlY3RvclN0eWxlU2hlZXQoRWxlbQogICAgICAgICAgICAgcmV0dXJuIDA7CiAKICAgICAgICAg U3RyaW5nIG5ld1N0eWxlU2hlZXRJZCA9IFN0cmluZzo6bnVtYmVyKG1fbGFzdFN0eWxlU2hlZXRJ ZCsrKTsKLSAgICAgICAgUmVmUHRyPEluc3BlY3RvclN0eWxlU2hlZXRGb3JJbmxpbmVTdHlsZT4g aW5zcGVjdG9yU3R5bGVTaGVldCA9IEluc3BlY3RvclN0eWxlU2hlZXRGb3JJbmxpbmVTdHlsZTo6 Y3JlYXRlKG1fZG9tQWdlbnQtPnBhZ2VBZ2VudCgpLCBuZXdTdHlsZVNoZWV0SWQsIGVsZW1lbnQs IFR5cGVCdWlsZGVyOjpDU1M6Ok9yaWdpbjo6UmVndWxhciwgdGhpcyk7CisgICAgICAgIFJlZlB0 cjxJbnNwZWN0b3JTdHlsZVNoZWV0Rm9ySW5saW5lU3R5bGU+IGluc3BlY3RvclN0eWxlU2hlZXQg PSBJbnNwZWN0b3JTdHlsZVNoZWV0Rm9ySW5saW5lU3R5bGU6OmNyZWF0ZShtX2RvbUFnZW50LT5w YWdlQWdlbnQoKSwgbmV3U3R5bGVTaGVldElkLCBlbGVtZW50LCBUeXBlQnVpbGRlcjo6Q1NTOjpT dHlsZVNoZWV0T3JpZ2luOjpSZWd1bGFyLCB0aGlzKTsKICAgICAgICAgbV9pZFRvSW5zcGVjdG9y U3R5bGVTaGVldC5zZXQobmV3U3R5bGVTaGVldElkLCBpbnNwZWN0b3JTdHlsZVNoZWV0KTsKICAg ICAgICAgbV9ub2RlVG9JbnNwZWN0b3JTdHlsZVNoZWV0LnNldChlbGVtZW50LCBpbnNwZWN0b3JT dHlsZVNoZWV0KTsKICAgICAgICAgcmV0dXJuIGluc3BlY3RvclN0eWxlU2hlZXQuZ2V0KCk7CkBA IC05MTIsNyArOTEyLDcgQEAgSW5zcGVjdG9yU3R5bGVTaGVldCogSW5zcGVjdG9yQ1NTQWdlbnQ6 OnZpYUluc3BlY3RvclN0eWxlU2hlZXQoRG9jdW1lbnQqIGRvY3VtZW4KICAgICAgICAgcmV0dXJu IDA7CiAgICAgQ1NTU3R5bGVTaGVldCogY3NzU3R5bGVTaGVldCA9IHN0YXRpY19jYXN0PENTU1N0 eWxlU2hlZXQqPihzdHlsZVNoZWV0KTsKICAgICBTdHJpbmcgaWQgPSBTdHJpbmc6Om51bWJlciht X2xhc3RTdHlsZVNoZWV0SWQrKyk7Ci0gICAgaW5zcGVjdG9yU3R5bGVTaGVldCA9IEluc3BlY3Rv clN0eWxlU2hlZXQ6OmNyZWF0ZShtX2RvbUFnZW50LT5wYWdlQWdlbnQoKSwgaWQsIGNzc1N0eWxl U2hlZXQsIFR5cGVCdWlsZGVyOjpDU1M6Ok9yaWdpbjo6SW5zcGVjdG9yLCBJbnNwZWN0b3JET01B Z2VudDo6ZG9jdW1lbnRVUkxTdHJpbmcoZG9jdW1lbnQpLCB0aGlzKTsKKyAgICBpbnNwZWN0b3JT dHlsZVNoZWV0ID0gSW5zcGVjdG9yU3R5bGVTaGVldDo6Y3JlYXRlKG1fZG9tQWdlbnQtPnBhZ2VB Z2VudCgpLCBpZCwgY3NzU3R5bGVTaGVldCwgVHlwZUJ1aWxkZXI6OkNTUzo6U3R5bGVTaGVldE9y aWdpbjo6SW5zcGVjdG9yLCBJbnNwZWN0b3JET01BZ2VudDo6ZG9jdW1lbnRVUkxTdHJpbmcoZG9j dW1lbnQpLCB0aGlzKTsKICAgICBtX2lkVG9JbnNwZWN0b3JTdHlsZVNoZWV0LnNldChpZCwgaW5z cGVjdG9yU3R5bGVTaGVldCk7CiAgICAgbV9jc3NTdHlsZVNoZWV0VG9JbnNwZWN0b3JTdHlsZVNo ZWV0LnNldChjc3NTdHlsZVNoZWV0LCBpbnNwZWN0b3JTdHlsZVNoZWV0KTsKICAgICBtX2RvY3Vt ZW50VG9JbnNwZWN0b3JTdHlsZVNoZWV0LnNldChkb2N1bWVudCwgaW5zcGVjdG9yU3R5bGVTaGVl dCk7CkBAIC05MjksMTcgKzkyOSwxNyBAQCBJbnNwZWN0b3JTdHlsZVNoZWV0KiBJbnNwZWN0b3JD U1NBZ2VudDo6YXNzZXJ0U3R5bGVTaGVldEZvcklkKEVycm9yU3RyaW5nKiBlcnJvcgogICAgIHJl dHVybiBpdC0+c2Vjb25kLmdldCgpOwogfQogCi1UeXBlQnVpbGRlcjo6Q1NTOjpPcmlnaW46OkVu dW0gSW5zcGVjdG9yQ1NTQWdlbnQ6OmRldGVjdE9yaWdpbihDU1NTdHlsZVNoZWV0KiBwYWdlU3R5 bGVTaGVldCwgRG9jdW1lbnQqIG93bmVyRG9jdW1lbnQpCitUeXBlQnVpbGRlcjo6Q1NTOjpTdHls ZVNoZWV0T3JpZ2luOjpFbnVtIEluc3BlY3RvckNTU0FnZW50OjpkZXRlY3RPcmlnaW4oQ1NTU3R5 bGVTaGVldCogcGFnZVN0eWxlU2hlZXQsIERvY3VtZW50KiBvd25lckRvY3VtZW50KQogewotICAg IFR5cGVCdWlsZGVyOjpDU1M6Ok9yaWdpbjo6RW51bSBvcmlnaW4gPSBUeXBlQnVpbGRlcjo6Q1NT OjpPcmlnaW46OlJlZ3VsYXI7CisgICAgVHlwZUJ1aWxkZXI6OkNTUzo6U3R5bGVTaGVldE9yaWdp bjo6RW51bSBvcmlnaW4gPSBUeXBlQnVpbGRlcjo6Q1NTOjpTdHlsZVNoZWV0T3JpZ2luOjpSZWd1 bGFyOwogICAgIGlmIChwYWdlU3R5bGVTaGVldCAmJiAhcGFnZVN0eWxlU2hlZXQtPm93bmVyTm9k ZSgpICYmIHBhZ2VTdHlsZVNoZWV0LT5ocmVmKCkuaXNFbXB0eSgpKQotICAgICAgICBvcmlnaW4g PSBUeXBlQnVpbGRlcjo6Q1NTOjpPcmlnaW46OlVzZXJfYWdlbnQ7CisgICAgICAgIG9yaWdpbiA9 IFR5cGVCdWlsZGVyOjpDU1M6OlN0eWxlU2hlZXRPcmlnaW46OlVzZXJfYWdlbnQ7CiAgICAgZWxz ZSBpZiAocGFnZVN0eWxlU2hlZXQgJiYgcGFnZVN0eWxlU2hlZXQtPm93bmVyTm9kZSgpICYmIHBh Z2VTdHlsZVNoZWV0LT5vd25lck5vZGUoKS0+bm9kZU5hbWUoKSA9PSAiI2RvY3VtZW50IikKLSAg ICAgICAgb3JpZ2luID0gVHlwZUJ1aWxkZXI6OkNTUzo6T3JpZ2luOjpVc2VyOworICAgICAgICBv cmlnaW4gPSBUeXBlQnVpbGRlcjo6Q1NTOjpTdHlsZVNoZWV0T3JpZ2luOjpVc2VyOwogICAgIGVs c2UgewogICAgICAgICBJbnNwZWN0b3JTdHlsZVNoZWV0KiB2aWFJbnNwZWN0b3JTdHlsZVNoZWV0 Rm9yT3duZXIgPSB2aWFJbnNwZWN0b3JTdHlsZVNoZWV0KG93bmVyRG9jdW1lbnQsIGZhbHNlKTsK ICAgICAgICAgaWYgKHZpYUluc3BlY3RvclN0eWxlU2hlZXRGb3JPd25lciAmJiBwYWdlU3R5bGVT aGVldCA9PSB2aWFJbnNwZWN0b3JTdHlsZVNoZWV0Rm9yT3duZXItPnBhZ2VTdHlsZVNoZWV0KCkp Ci0gICAgICAgICAgICBvcmlnaW4gPSBUeXBlQnVpbGRlcjo6Q1NTOjpPcmlnaW46Okluc3BlY3Rv cjsKKyAgICAgICAgICAgIG9yaWdpbiA9IFR5cGVCdWlsZGVyOjpDU1M6OlN0eWxlU2hlZXRPcmln aW46Okluc3BlY3RvcjsKICAgICB9CiAgICAgcmV0dXJuIG9yaWdpbjsKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5oIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmgKaW5kZXggNDRiMjEwNzcwYmY0MWZh YjNlNTQ5MzgyZThlMzU1MmE1YmUxZTBiMC4uODkwMzkxYTE5Y2RmN2RlZjFkMWZjZTdlOTQ0ZmMw NTU2MWRmOWFiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckNTU0FnZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0Fn ZW50LmgKQEAgLTE0Myw3ICsxNDMsNyBAQCBwcml2YXRlOgogICAgIEluc3BlY3RvclN0eWxlU2hl ZXQqIGJpbmRTdHlsZVNoZWV0KENTU1N0eWxlU2hlZXQqKTsKICAgICBJbnNwZWN0b3JTdHlsZVNo ZWV0KiB2aWFJbnNwZWN0b3JTdHlsZVNoZWV0KERvY3VtZW50KiwgYm9vbCBjcmVhdGVJZkFic2Vu dCk7CiAgICAgSW5zcGVjdG9yU3R5bGVTaGVldCogYXNzZXJ0U3R5bGVTaGVldEZvcklkKEVycm9y U3RyaW5nKiwgY29uc3QgU3RyaW5nJik7Ci0gICAgVHlwZUJ1aWxkZXI6OkNTUzo6T3JpZ2luOjpF bnVtIGRldGVjdE9yaWdpbihDU1NTdHlsZVNoZWV0KiBwYWdlU3R5bGVTaGVldCwgRG9jdW1lbnQq IG93bmVyRG9jdW1lbnQpOworICAgIFR5cGVCdWlsZGVyOjpDU1M6OlN0eWxlU2hlZXRPcmlnaW46 OkVudW0gZGV0ZWN0T3JpZ2luKENTU1N0eWxlU2hlZXQqIHBhZ2VTdHlsZVNoZWV0LCBEb2N1bWVu dCogb3duZXJEb2N1bWVudCk7CiAKICAgICBQYXNzUmVmUHRyPFR5cGVCdWlsZGVyOjpBcnJheTxU eXBlQnVpbGRlcjo6Q1NTOjpDU1NSdWxlPiA+IGJ1aWxkQXJyYXlGb3JSdWxlTGlzdChDU1NSdWxl TGlzdCosIFN0eWxlUmVzb2x2ZXIqKTsKICAgICBQYXNzUmVmUHRyPFR5cGVCdWlsZGVyOjpDU1M6 OkNTU1N0eWxlPiBidWlsZE9iamVjdEZvckF0dHJpYnV0ZXNTdHlsZShFbGVtZW50Kik7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5jcHAKaW5kZXgg NDFmZWE2NWE5NzgzOTRkYzcwMGQxMTBiZDlhZjk5ODdlOGQzZmYxYi4uNmU2ODliN2FjMjdhNWQ5 ZDVjNmE5ZDA5NGQ3Yjc5Mjc1OGJhYmU5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmNwcApAQCAtNjgyLDcgKzY4Miw3IEBAIE5ld0xpbmVB bmRXaGl0ZXNwYWNlJiBJbnNwZWN0b3JTdHlsZTo6bmV3TGluZUFuZFdoaXRlc3BhY2VEZWxpbWl0 ZXJzKCkgY29uc3QKICAgICByZXR1cm4gbV9mb3JtYXQ7CiB9CiAKLVBhc3NSZWZQdHI8SW5zcGVj dG9yU3R5bGVTaGVldD4gSW5zcGVjdG9yU3R5bGVTaGVldDo6Y3JlYXRlKEluc3BlY3RvclBhZ2VB Z2VudCogcGFnZUFnZW50LCBjb25zdCBTdHJpbmcmIGlkLCBQYXNzUmVmUHRyPENTU1N0eWxlU2hl ZXQ+IHBhZ2VTdHlsZVNoZWV0LCBUeXBlQnVpbGRlcjo6Q1NTOjpPcmlnaW46OkVudW0gb3JpZ2lu LCBjb25zdCBTdHJpbmcmIGRvY3VtZW50VVJMLCBMaXN0ZW5lciogbGlzdGVuZXIpCitQYXNzUmVm UHRyPEluc3BlY3RvclN0eWxlU2hlZXQ+IEluc3BlY3RvclN0eWxlU2hlZXQ6OmNyZWF0ZShJbnNw ZWN0b3JQYWdlQWdlbnQqIHBhZ2VBZ2VudCwgY29uc3QgU3RyaW5nJiBpZCwgUGFzc1JlZlB0cjxD U1NTdHlsZVNoZWV0PiBwYWdlU3R5bGVTaGVldCwgVHlwZUJ1aWxkZXI6OkNTUzo6U3R5bGVTaGVl dE9yaWdpbjo6RW51bSBvcmlnaW4sIGNvbnN0IFN0cmluZyYgZG9jdW1lbnRVUkwsIExpc3RlbmVy KiBsaXN0ZW5lcikKIHsKICAgICByZXR1cm4gYWRvcHRSZWYobmV3IEluc3BlY3RvclN0eWxlU2hl ZXQocGFnZUFnZW50LCBpZCwgcGFnZVN0eWxlU2hlZXQsIG9yaWdpbiwgZG9jdW1lbnRVUkwsIGxp c3RlbmVyKSk7CiB9CkBAIC02OTUsNyArNjk1LDcgQEAgU3RyaW5nIEluc3BlY3RvclN0eWxlU2hl ZXQ6OnN0eWxlU2hlZXRVUkwoQ1NTU3R5bGVTaGVldCogcGFnZVN0eWxlU2hlZXQpCiAgICAgcmV0 dXJuIGVtcHR5U3RyaW5nKCk7CiB9CiAKLUluc3BlY3RvclN0eWxlU2hlZXQ6Okluc3BlY3RvclN0 eWxlU2hlZXQoSW5zcGVjdG9yUGFnZUFnZW50KiBwYWdlQWdlbnQsIGNvbnN0IFN0cmluZyYgaWQs IFBhc3NSZWZQdHI8Q1NTU3R5bGVTaGVldD4gcGFnZVN0eWxlU2hlZXQsIFR5cGVCdWlsZGVyOjpD U1M6Ok9yaWdpbjo6RW51bSBvcmlnaW4sIGNvbnN0IFN0cmluZyYgZG9jdW1lbnRVUkwsIExpc3Rl bmVyKiBsaXN0ZW5lcikKK0luc3BlY3RvclN0eWxlU2hlZXQ6Okluc3BlY3RvclN0eWxlU2hlZXQo SW5zcGVjdG9yUGFnZUFnZW50KiBwYWdlQWdlbnQsIGNvbnN0IFN0cmluZyYgaWQsIFBhc3NSZWZQ dHI8Q1NTU3R5bGVTaGVldD4gcGFnZVN0eWxlU2hlZXQsIFR5cGVCdWlsZGVyOjpDU1M6OlN0eWxl U2hlZXRPcmlnaW46OkVudW0gb3JpZ2luLCBjb25zdCBTdHJpbmcmIGRvY3VtZW50VVJMLCBMaXN0 ZW5lciogbGlzdGVuZXIpCiAgICAgOiBtX3BhZ2VBZ2VudChwYWdlQWdlbnQpCiAgICAgLCBtX2lk KGlkKQogICAgICwgbV9wYWdlU3R5bGVTaGVldChwYWdlU3R5bGVTaGVldCkKQEAgLTg5OCw3ICs4 OTgsNyBAQCBQYXNzUmVmUHRyPFR5cGVCdWlsZGVyOjpDU1M6OkNTU1J1bGU+IEluc3BlY3RvclN0 eWxlU2hlZXQ6OmJ1aWxkT2JqZWN0Rm9yUnVsZShDUwogICAgICAgICAuc2V0U3R5bGUoYnVpbGRP YmplY3RGb3JTdHlsZShydWxlLT5zdHlsZSgpKSk7CiAKICAgICAvLyAic291cmNlVVJMIiBpcyBw cmVzZW50IG9ubHkgZm9yIHJlZ3VsYXIgcnVsZXMsIG90aGVyd2lzZSAib3JpZ2luIiBzaG91bGQg YmUgdXNlZCBpbiB0aGUgZnJvbnRlbmQuCi0gICAgaWYgKG1fb3JpZ2luID09IFR5cGVCdWlsZGVy OjpDU1M6Ok9yaWdpbjo6UmVndWxhcikKKyAgICBpZiAobV9vcmlnaW4gPT0gVHlwZUJ1aWxkZXI6 OkNTUzo6U3R5bGVTaGVldE9yaWdpbjo6UmVndWxhcikKICAgICAgICAgcmVzdWx0LT5zZXRTb3Vy Y2VVUkwoZmluYWxVUkwoKSk7CiAKICAgICBpZiAoY2FuQmluZCgpKSB7CkBAIC0xMjA0LDcgKzEy MDQsNyBAQCBib29sIEluc3BlY3RvclN0eWxlU2hlZXQ6Om9yaWdpbmFsU3R5bGVTaGVldFRleHQo U3RyaW5nKiByZXN1bHQpIGNvbnN0CiAKIGJvb2wgSW5zcGVjdG9yU3R5bGVTaGVldDo6cmVzb3Vy Y2VTdHlsZVNoZWV0VGV4dChTdHJpbmcqIHJlc3VsdCkgY29uc3QKIHsKLSAgICBpZiAobV9vcmln aW4gPT0gVHlwZUJ1aWxkZXI6OkNTUzo6T3JpZ2luOjpVc2VyIHx8IG1fb3JpZ2luID09IFR5cGVC dWlsZGVyOjpDU1M6Ok9yaWdpbjo6VXNlcl9hZ2VudCkKKyAgICBpZiAobV9vcmlnaW4gPT0gVHlw ZUJ1aWxkZXI6OkNTUzo6U3R5bGVTaGVldE9yaWdpbjo6VXNlciB8fCBtX29yaWdpbiA9PSBUeXBl QnVpbGRlcjo6Q1NTOjpTdHlsZVNoZWV0T3JpZ2luOjpVc2VyX2FnZW50KQogICAgICAgICByZXR1 cm4gZmFsc2U7CiAKICAgICBpZiAoIW1fcGFnZVN0eWxlU2hlZXQgfHwgIW93bmVyRG9jdW1lbnQo KSB8fCAhb3duZXJEb2N1bWVudCgpLT5mcmFtZSgpKQpAQCAtMTMxNSwxMiArMTMxNSwxMiBAQCB2 b2lkIEluc3BlY3RvclN0eWxlU2hlZXQ6OmNvbGxlY3RGbGF0UnVsZXMoUGFzc1JlZlB0cjxDU1NS dWxlTGlzdD4gcnVsZUxpc3QsIFZlYwogICAgIH0KIH0KIAotUGFzc1JlZlB0cjxJbnNwZWN0b3JT dHlsZVNoZWV0Rm9ySW5saW5lU3R5bGU+IEluc3BlY3RvclN0eWxlU2hlZXRGb3JJbmxpbmVTdHls ZTo6Y3JlYXRlKEluc3BlY3RvclBhZ2VBZ2VudCogcGFnZUFnZW50LCBjb25zdCBTdHJpbmcmIGlk LCBQYXNzUmVmUHRyPEVsZW1lbnQ+IGVsZW1lbnQsIFR5cGVCdWlsZGVyOjpDU1M6Ok9yaWdpbjo6 RW51bSBvcmlnaW4sIExpc3RlbmVyKiBsaXN0ZW5lcikKK1Bhc3NSZWZQdHI8SW5zcGVjdG9yU3R5 bGVTaGVldEZvcklubGluZVN0eWxlPiBJbnNwZWN0b3JTdHlsZVNoZWV0Rm9ySW5saW5lU3R5bGU6 OmNyZWF0ZShJbnNwZWN0b3JQYWdlQWdlbnQqIHBhZ2VBZ2VudCwgY29uc3QgU3RyaW5nJiBpZCwg UGFzc1JlZlB0cjxFbGVtZW50PiBlbGVtZW50LCBUeXBlQnVpbGRlcjo6Q1NTOjpTdHlsZVNoZWV0 T3JpZ2luOjpFbnVtIG9yaWdpbiwgTGlzdGVuZXIqIGxpc3RlbmVyKQogewogICAgIHJldHVybiBh ZG9wdFJlZihuZXcgSW5zcGVjdG9yU3R5bGVTaGVldEZvcklubGluZVN0eWxlKHBhZ2VBZ2VudCwg aWQsIGVsZW1lbnQsIG9yaWdpbiwgbGlzdGVuZXIpKTsKIH0KIAotSW5zcGVjdG9yU3R5bGVTaGVl dEZvcklubGluZVN0eWxlOjpJbnNwZWN0b3JTdHlsZVNoZWV0Rm9ySW5saW5lU3R5bGUoSW5zcGVj dG9yUGFnZUFnZW50KiBwYWdlQWdlbnQsIGNvbnN0IFN0cmluZyYgaWQsIFBhc3NSZWZQdHI8RWxl bWVudD4gZWxlbWVudCwgVHlwZUJ1aWxkZXI6OkNTUzo6T3JpZ2luOjpFbnVtIG9yaWdpbiwgTGlz dGVuZXIqIGxpc3RlbmVyKQorSW5zcGVjdG9yU3R5bGVTaGVldEZvcklubGluZVN0eWxlOjpJbnNw ZWN0b3JTdHlsZVNoZWV0Rm9ySW5saW5lU3R5bGUoSW5zcGVjdG9yUGFnZUFnZW50KiBwYWdlQWdl bnQsIGNvbnN0IFN0cmluZyYgaWQsIFBhc3NSZWZQdHI8RWxlbWVudD4gZWxlbWVudCwgVHlwZUJ1 aWxkZXI6OkNTUzo6U3R5bGVTaGVldE9yaWdpbjo6RW51bSBvcmlnaW4sIExpc3RlbmVyKiBsaXN0 ZW5lcikKICAgICA6IEluc3BlY3RvclN0eWxlU2hlZXQocGFnZUFnZW50LCBpZCwgMCwgb3JpZ2lu LCAiIiwgbGlzdGVuZXIpCiAgICAgLCBtX2VsZW1lbnQoZWxlbWVudCkKICAgICAsIG1fcnVsZVNv dXJjZURhdGEoMCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JTdHlsZVNoZWV0LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVT aGVldC5oCmluZGV4IDQyN2RhYjI4MDFiNjAzYmU0ZjYzZTk2YWY1MDQ4NmI5ODU1YTdiMDEuLjAz Y2FiNjc3ZDIyNDNjN2Q1YzQ2NTAzMDQyODFkZDY5MmMxN2M5ODcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmgKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuaApAQCAtMTcxLDcgKzE3MSw3IEBA IHB1YmxpYzoKICAgICB9OwogCiAgICAgdHlwZWRlZiBIYXNoTWFwPENTU1N0eWxlRGVjbGFyYXRp b24qLCBSZWZQdHI8SW5zcGVjdG9yU3R5bGU+ID4gSW5zcGVjdG9yU3R5bGVNYXA7Ci0gICAgc3Rh dGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yU3R5bGVTaGVldD4gY3JlYXRlKEluc3BlY3RvclBhZ2VB Z2VudCosIGNvbnN0IFN0cmluZyYgaWQsIFBhc3NSZWZQdHI8Q1NTU3R5bGVTaGVldD4gcGFnZVN0 eWxlU2hlZXQsIFR5cGVCdWlsZGVyOjpDU1M6Ok9yaWdpbjo6RW51bSwgY29uc3QgU3RyaW5nJiBk b2N1bWVudFVSTCwgTGlzdGVuZXIqKTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JT dHlsZVNoZWV0PiBjcmVhdGUoSW5zcGVjdG9yUGFnZUFnZW50KiwgY29uc3QgU3RyaW5nJiBpZCwg UGFzc1JlZlB0cjxDU1NTdHlsZVNoZWV0PiBwYWdlU3R5bGVTaGVldCwgVHlwZUJ1aWxkZXI6OkNT Uzo6U3R5bGVTaGVldE9yaWdpbjo6RW51bSwgY29uc3QgU3RyaW5nJiBkb2N1bWVudFVSTCwgTGlz dGVuZXIqKTsKICAgICBzdGF0aWMgU3RyaW5nIHN0eWxlU2hlZXRVUkwoQ1NTU3R5bGVTaGVldCog cGFnZVN0eWxlU2hlZXQpOwogCiAgICAgdmlydHVhbCB+SW5zcGVjdG9yU3R5bGVTaGVldCgpOwpA QCAtMjAxLDkgKzIwMSw5IEBAIHB1YmxpYzoKICAgICBJbnNwZWN0b3JDU1NJZCBzdHlsZUlkKENT U1N0eWxlRGVjbGFyYXRpb24qIHN0eWxlKSBjb25zdCB7IHJldHVybiBydWxlT3JTdHlsZUlkKHN0 eWxlKTsgfQogCiBwcm90ZWN0ZWQ6Ci0gICAgSW5zcGVjdG9yU3R5bGVTaGVldChJbnNwZWN0b3JQ YWdlQWdlbnQqLCBjb25zdCBTdHJpbmcmIGlkLCBQYXNzUmVmUHRyPENTU1N0eWxlU2hlZXQ+IHBh Z2VTdHlsZVNoZWV0LCBUeXBlQnVpbGRlcjo6Q1NTOjpPcmlnaW46OkVudW0sIGNvbnN0IFN0cmlu ZyYgZG9jdW1lbnRVUkwsIExpc3RlbmVyKik7CisgICAgSW5zcGVjdG9yU3R5bGVTaGVldChJbnNw ZWN0b3JQYWdlQWdlbnQqLCBjb25zdCBTdHJpbmcmIGlkLCBQYXNzUmVmUHRyPENTU1N0eWxlU2hl ZXQ+IHBhZ2VTdHlsZVNoZWV0LCBUeXBlQnVpbGRlcjo6Q1NTOjpTdHlsZVNoZWV0T3JpZ2luOjpF bnVtLCBjb25zdCBTdHJpbmcmIGRvY3VtZW50VVJMLCBMaXN0ZW5lciopOwogCi0gICAgYm9vbCBj YW5CaW5kKCkgY29uc3QgeyByZXR1cm4gbV9vcmlnaW4gIT0gVHlwZUJ1aWxkZXI6OkNTUzo6T3Jp Z2luOjpVc2VyX2FnZW50ICYmIG1fb3JpZ2luICE9IFR5cGVCdWlsZGVyOjpDU1M6Ok9yaWdpbjo6 VXNlcjsgfQorICAgIGJvb2wgY2FuQmluZCgpIGNvbnN0IHsgcmV0dXJuIG1fb3JpZ2luICE9IFR5 cGVCdWlsZGVyOjpDU1M6OlN0eWxlU2hlZXRPcmlnaW46OlVzZXJfYWdlbnQgJiYgbV9vcmlnaW4g IT0gVHlwZUJ1aWxkZXI6OkNTUzo6U3R5bGVTaGVldE9yaWdpbjo6VXNlcjsgfQogICAgIEluc3Bl Y3RvckNTU0lkIHJ1bGVPclN0eWxlSWQoQ1NTU3R5bGVEZWNsYXJhdGlvbiogc3R5bGUpIGNvbnN0 OwogICAgIHZpcnR1YWwgRG9jdW1lbnQqIG93bmVyRG9jdW1lbnQoKSBjb25zdDsKICAgICB2aXJ0 dWFsIFJlZlB0cjxDU1NSdWxlU291cmNlRGF0YT4gcnVsZVNvdXJjZURhdGFGb3IoQ1NTU3R5bGVE ZWNsYXJhdGlvbiogc3R5bGUpIGNvbnN0OwpAQCAtMjM0LDcgKzIzNCw3IEBAIHByaXZhdGU6CiAg ICAgSW5zcGVjdG9yUGFnZUFnZW50KiBtX3BhZ2VBZ2VudDsKICAgICBTdHJpbmcgbV9pZDsKICAg ICBSZWZQdHI8Q1NTU3R5bGVTaGVldD4gbV9wYWdlU3R5bGVTaGVldDsKLSAgICBUeXBlQnVpbGRl cjo6Q1NTOjpPcmlnaW46OkVudW0gbV9vcmlnaW47CisgICAgVHlwZUJ1aWxkZXI6OkNTUzo6U3R5 bGVTaGVldE9yaWdpbjo6RW51bSBtX29yaWdpbjsKICAgICBTdHJpbmcgbV9kb2N1bWVudFVSTDsK ICAgICBib29sIG1faXNSZXZhbGlkYXRpbmc7CiAgICAgUGFyc2VkU3R5bGVTaGVldCogbV9wYXJz ZWRTdHlsZVNoZWV0OwpAQCAtMjQ1LDE0ICsyNDUsMTQgQEAgcHJpdmF0ZToKIAogY2xhc3MgSW5z cGVjdG9yU3R5bGVTaGVldEZvcklubGluZVN0eWxlIDogcHVibGljIEluc3BlY3RvclN0eWxlU2hl ZXQgewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3RvclN0eWxlU2hlZXRG b3JJbmxpbmVTdHlsZT4gY3JlYXRlKEluc3BlY3RvclBhZ2VBZ2VudCosIGNvbnN0IFN0cmluZyYg aWQsIFBhc3NSZWZQdHI8RWxlbWVudD4sIFR5cGVCdWlsZGVyOjpDU1M6Ok9yaWdpbjo6RW51bSwg TGlzdGVuZXIqKTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JTdHlsZVNoZWV0Rm9y SW5saW5lU3R5bGU+IGNyZWF0ZShJbnNwZWN0b3JQYWdlQWdlbnQqLCBjb25zdCBTdHJpbmcmIGlk LCBQYXNzUmVmUHRyPEVsZW1lbnQ+LCBUeXBlQnVpbGRlcjo6Q1NTOjpTdHlsZVNoZWV0T3JpZ2lu OjpFbnVtLCBMaXN0ZW5lciopOwogCiAgICAgdm9pZCBkaWRNb2RpZnlFbGVtZW50QXR0cmlidXRl KCk7CiAgICAgdmlydHVhbCBib29sIGdldFRleHQoU3RyaW5nKiByZXN1bHQpIGNvbnN0OwogICAg IHZpcnR1YWwgQ1NTU3R5bGVEZWNsYXJhdGlvbiogc3R5bGVGb3JJZChjb25zdCBJbnNwZWN0b3JD U1NJZCYgaWQpIGNvbnN0IHsgQVNTRVJUX1VOVVNFRChpZCwgIWlkLm9yZGluYWwoKSk7IHJldHVy biBpbmxpbmVTdHlsZSgpOyB9CiAKIHByb3RlY3RlZDoKLSAgICBJbnNwZWN0b3JTdHlsZVNoZWV0 Rm9ySW5saW5lU3R5bGUoSW5zcGVjdG9yUGFnZUFnZW50KiwgY29uc3QgU3RyaW5nJiBpZCwgUGFz c1JlZlB0cjxFbGVtZW50PiwgVHlwZUJ1aWxkZXI6OkNTUzo6T3JpZ2luOjpFbnVtLCBMaXN0ZW5l ciopOworICAgIEluc3BlY3RvclN0eWxlU2hlZXRGb3JJbmxpbmVTdHlsZShJbnNwZWN0b3JQYWdl QWdlbnQqLCBjb25zdCBTdHJpbmcmIGlkLCBQYXNzUmVmUHRyPEVsZW1lbnQ+LCBUeXBlQnVpbGRl cjo6Q1NTOjpTdHlsZVNoZWV0T3JpZ2luOjpFbnVtLCBMaXN0ZW5lciopOwogCiAgICAgdmlydHVh bCBEb2N1bWVudCogb3duZXJEb2N1bWVudCgpIGNvbnN0OwogICAgIHZpcnR1YWwgUmVmUHRyPENT U1J1bGVTb3VyY2VEYXRhPiBydWxlU291cmNlRGF0YUZvcihDU1NTdHlsZURlY2xhcmF0aW9uKiBz dHlsZSkgY29uc3QgeyBBU1NFUlRfVU5VU0VEKHN0eWxlLCBzdHlsZSA9PSBpbmxpbmVTdHlsZSgp KTsgcmV0dXJuIG1fcnVsZVNvdXJjZURhdGE7IH0K