57240 2011-03-28 09:33:32 -0700 Web Inspector: brush up and rename debugger domain. 2011-03-30 02:35:08 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman webkit-unassigned aandrey abarth apavlov bweinstein dglazkov eric joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 374545 0 pfeldman 2011-03-28 09:33:32 -0700 Patch to follow. 374554 1 87155 pfeldman 2011-03-28 09:49:50 -0700 Created attachment 87155 Patch 374567 2 webkit.review.bot 2011-03-28 09:58:22 -0700 Attachment 87155 did not build on chromium: Build output: http://queues.webkit.org/results/8272553 374568 3 87155 yurys 2011-03-28 09:58:31 -0700 Comment on attachment 87155 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=87155&action=review > Source/WebCore/inspector/Inspector.json:1228 > + "name": "scriptFailedToParse", scriptParsingFailed > Source/WebCore/inspector/InspectorDebuggerAgent.cpp:181 > +void InspectorDebuggerAgent::setBreakpoint(ErrorString*, const String& sourceId, int lineNumber, int columnNumber, const String& condition, bool enabled, String* outBreakpointId, int* actualLineNumber, int* actualColumnNumber) setBreakpointBySourceId? 374582 4 pfeldman 2011-03-28 10:17:21 -0700 Committed r82131: <http://trac.webkit.org/changeset/82131> 374587 5 webkit.review.bot 2011-03-28 10:24:26 -0700 http://trac.webkit.org/changeset/82131 might have broken Chromium Linux Release 376149 6 aandrey 2011-03-30 02:35:08 -0700 View in context: https://bugs.webkit.org/attachment.cgi?id=87155&action=review > Source/WebCore/inspector/front-end/DebuggerModel.js:182 > + _didEditScriptSource: function(sourceID, callback, error, error, newBody, callFrames) ERROR: redefinition of "error" variable. It breaks handling JS backend compile errors in live edit. 87155 2011-03-28 09:49:50 -0700 2011-03-28 09:58:31 -0700 Patch bug-57240-20110328204944.patch text/plain 39230 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODIxMTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmZWU3YTczZTEyODM3ZDFh N2UxYTQ1YmVmMDNlZmJjZmFlNTk4ZmE1Li43NzFhZDBkZmYzZGUxNGE3OTJhN2JlMGVlMjcyZjA0 NzFjMjVjYmE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDQgQEAKIDIwMTEtMDMtMjggIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYnJ1c2ggdXAgYW5kIHJl bmFtZSBkZWJ1Z2dlciBkb21haW4gZnVuY3Rpb25zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTcyNDAKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNw ZWN0b3IuanNvbjoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQWdlbnQ6OnNldEZyb250ZW5kKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvckFnZW50Ojpwb3N0V29ya2VyTm90aWZpY2F0aW9uVG9Gcm9udGVuZCk6 CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6c2V0QnJlYWtwb2ludHNBY3RpdmUp OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6c2V0QnJlYWtwb2lu dEJ5VXJsKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnNldEJy ZWFrcG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6cmVt b3ZlQnJlYWtwb2ludCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50 OjplZGl0U2NyaXB0U291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRlYnVnZ2Vy QWdlbnQ6OnNldFBhdXNlT25FeGNlcHRpb25zU3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yRGVidWdnZXJBZ2VudDo6ZGlkUGFyc2VTb3VyY2UpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6ZmFpbGVkVG9QYXJzZVNvdXJjZSk6CisgICAgICAgIChX ZWJDb3JlOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpkaWRQYXVzZSk6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpkaWRDb250aW51ZSk6CisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL0RlYnVnZ2VyTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJN b2RlbC5wcm90b3R5cGUuc2V0QnJlYWtwb2ludCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVi dWdnZXJNb2RlbC5wcm90b3R5cGUuc2V0QnJlYWtwb2ludEJ5U291cmNlSWQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwucHJvdG90eXBlLnJlbW92ZUJyZWFrcG9pbnQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwucHJvdG90eXBlLl9kaWRFZGl0U2Ny aXB0U291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlckRpc3BhdGNoZXIucHJv dG90eXBlLnBhdXNlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJEaXNwYXRjaGVy LnByb3RvdHlwZS5yZXN1bWVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlckRpc3Bh dGNoZXIucHJvdG90eXBlLnNjcmlwdFBhcnNlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVi dWdnZXJEaXNwYXRjaGVyLnByb3RvdHlwZS5zY3JpcHRGYWlsZWRUb1BhcnNlKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5EZWJ1Z2dlckRpc3BhdGNoZXIucHJvdG90eXBlLmJyZWFrcG9pbnRSZXNv bHZlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS50b2dnbGVCcmVha3Bv aW50c0NsaWNrZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLmRpZENyZWF0ZVdvcmtlcik6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuZGlkRGVzdHJveVdvcmtlcik6CisKKzIwMTEtMDMtMjggIFBhdmVsIEZlbGRtYW4g IDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgWXVyeSBTZW1p a2hhdHNreS4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiByZW5hbWUgbmV0d29yayBkb21haW4g ZXZlbnRzIGZyb20gZGlkSGFwcGVuU29tZXRoaW5nIHRvIHNvbWV0aGluZ0hhcHBlbmVkLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCmluZGV4IDMwY2EzZDEyZGI0NmEwMTEz MTI3ZTg5NjczOWEzN2ViZWNkNzM1NTYuLmRjYmJhMWFkOTYyNDgxZDcwMTNkZGVmOWI2Mjk5MjE3 YTZhNTNiYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3Iu anNvbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KQEAgLTEw NSw2ICsxMDUsMjAgQEAKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJvYmplY3QiLCAi JHJlZiI6ICJSZW1vdGVPYmplY3QiIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi aGludHMiLCAidHlwZSI6ICJvYmplY3QiIH0KICAgICAgICAgICAgICAgICBdCisgICAgICAgICAg ICB9LAorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICJuYW1lIjogImRpZENyZWF0ZVdv cmtlciIsCisgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCisgICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAiaWQiLCAidHlwZSI6ICJpbnRlZ2VyIiB9LAorICAgICAgICAgICAgICAg ICAgICB7ICJuYW1lIjogInVybCIsICJ0eXBlIjogInN0cmluZyIgfSwKKyAgICAgICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJpc1NoYXJlZCIsICJ0eXBlIjogImJvb2xlYW4iIH0KKyAgICAgICAg ICAgICAgICBdCisgICAgICAgICAgICB9LAorICAgICAgICAgICAgeworICAgICAgICAgICAgICAg ICJuYW1lIjogImRpZERlc3Ryb3lXb3JrZXIiLAorICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJz IjogWworICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImlkIiwgInR5cGUiOiAiaW50ZWdl ciIgfQorICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgIH0KICAgICAgICAgXQogICAgIH0s CkBAIC0xMDM2LDE4MCArMTA1MCwyMTggQEAKICAgICB9LAogICAgIHsKICAgICAgICAgImRvbWFp biI6ICJEZWJ1Z2dlciIsCi0gICAgICAgICJ0eXBlcyI6IFtdLAotICAgICAgICAiY29tbWFuZHMi OiBbCisgICAgICAgICJkZXNjcmlwdGlvbiI6ICJEZWJ1Z2dlciBkb21haW4gZXhwb3NlcyBKYXZh U2NyaXB0IGRlYnVnZ2luZyBmdW5jdGlvbnMuIEl0IGFsbG93cyBzZXR0aW5nIGFuZCByZW1vdmlu ZyBicmVha3BvaW50cywgc3RlcHBpbmcgdGhyb3VnaCBleGVjdXRpb24sIGV4cGxvcmluZyBzdGFj ayB0cmFjZXMsIGV0Yy4iLAorICAgICAgICAidHlwZXMiOiBbCiAgICAgICAgICAgICB7Ci0gICAg ICAgICAgICAgICAgIm5hbWUiOiAiZW5hYmxlIgorICAgICAgICAgICAgICAgICJpZCI6ICJMb2Nh dGlvbiIsCisgICAgICAgICAgICAgICAgInR5cGUiOiAib2JqZWN0IiwKKyAgICAgICAgICAgICAg ICAicHJvcGVydGllcyI6IHsKKyAgICAgICAgICAgICAgICAgICAgInNvdXJjZUlEIjogeyAidHlw ZSI6ICJzdHJpbmciLCAgImRlc2NyaXB0aW9uIjogIlNjcmlwdCBpZGVudGlmaWVyIGFzIHJlcG9y dGVkIGJ5IHRoZSA8Y29kZT5zY3JpcHRQYXJzZWQ8L2NvZGU+IiB9LAorICAgICAgICAgICAgICAg ICAgICAibGluZU51bWJlciI6IHsgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJM aW5lIG51bWJlciBpbiB0aGUgc2NyaXB0LiIgfSwKKyAgICAgICAgICAgICAgICAgICAgImNvbHVt bk51bWJlciI6IHsgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJDb2x1bW4gbnVt YmVyIGluIHRoZSBzY3JpcHQuIiB9CisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAg ICAiZGVzY3JpcHRpb24iOiAiTG9jYXRpb24gaW4gdGhlIHNvdXJjZSBjb2RlLiIKICAgICAgICAg ICAgIH0sCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgIm5hbWUiOiAiZGlzYWJsZSIK KyAgICAgICAgICAgICAgICAiaWQiOiAiQ2FsbEZyYW1lIiwKKyAgICAgICAgICAgICAgICAidHlw ZSI6ICJvYmplY3QiLAorICAgICAgICAgICAgICAgICJwcm9wZXJ0aWVzIjogeworICAgICAgICAg ICAgICAgICAgICAiaWQiOiB7ICJ0eXBlIjogInN0cmluZyIsICAiZGVzY3JpcHRpb24iOiAiQ2Fs bCBmcmFtZSBpZGVudGlmaWVyIiB9LAorICAgICAgICAgICAgICAgICAgICAidHlwZSI6IHsgInR5 cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIkNhbGwgZnJhbWUgdHlwZS4gLy8gRklYTUUi IH0sCisgICAgICAgICAgICAgICAgICAgICJmdW5jdGlvbk5hbWUiOiB7ICJ0eXBlIjogInN0cmlu ZyIsICJkZXNjcmlwdGlvbiI6ICJOYW1lIG9mIHRoZSBmdW5jdGlvbiBjYWxsZWQgb24gdGhpcyBm cmFtZS4iIH0sCisgICAgICAgICAgICAgICAgICAgICJzb3VyY2VJRCI6IHsgInR5cGUiOiAic3Ry aW5nIiwgImRlc2NyaXB0aW9uIjogIlNjcmlwdCBpZGVudGlmaWVyLiIgfSwKKyAgICAgICAgICAg ICAgICAgICAgImxpbmUiOiB7ICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiTGlu ZSBudW1iZXIgaW4gdGhlIHNjcmlwdC4iIH0sCisgICAgICAgICAgICAgICAgICAgICJjb2x1bW4i OiB7ICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiQ29sdW1uIG51bWJlciBpbiB0 aGUgc2NyaXB0LiIgfSwKKyAgICAgICAgICAgICAgICAgICAgInNjb3BlQ2hhaW4iOiB7ICJ0eXBl IjogImFycmF5IiwgIml0ZW1zIjogeyAidHlwZSI6ICJvYmplY3QiIH0sICJkZXNjcmlwdGlvbiI6 ICJTY29wZSBjaGFpbiBmb3IgZ2l2ZW4gY2FsbCBmcmFtZS4gLy8gRklYTUUiIH0KKyAgICAgICAg ICAgICAgICB9LAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJEZWJ1Z2dlciBjYWxs IGZyYW1lLiBBcnJheSBvZiBjYWxsIGZyYW1lcyBmb3JtIGNhbGwgc3RhY2suIgorICAgICAgICAg ICAgfQorICAgICAgICBdLAorICAgICAgICAiY29tbWFuZHMiOiBbCisgICAgICAgICAgICB7Cisg ICAgICAgICAgICAgICAgIm5hbWUiOiAiZW5hYmxlIiwKKyAgICAgICAgICAgICAgICAiZGVzY3Jp cHRpb24iOiAiRW5hYmxlcyBkZWJ1Z2dlciBmb3IgZ2l2ZW4gcGFnZS4iCiAgICAgICAgICAgICB9 LAogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIjogImFjdGl2YXRlQnJlYWtw b2ludHMiCisgICAgICAgICAgICAgICAgIm5hbWUiOiAiZGlzYWJsZSIsCisgICAgICAgICAgICAg ICAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIGRlYnVnZ2VyIGZvciBnaXZlbiBwYWdlLiIKICAg ICAgICAgICAgIH0sCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgIm5hbWUiOiAiZGVh Y3RpdmF0ZUJyZWFrcG9pbnRzIgorICAgICAgICAgICAgICAgICJuYW1lIjogInNldEJyZWFrcG9p bnRzQWN0aXZlIiwKKyAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKKyAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJhY3RpdmUiLCAidHlwZSI6ICJib29sZWFuIiwgImRlc2NyaXB0 aW9uIjogIk5ldyB2YWx1ZSBmb3IgYnJlYWtwb2ludHMgYWN0aXZlIHN0YXRlLiIgfQorICAgICAg ICAgICAgICAgIF0sCisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlcyAv IGRlYWN0aXZhdGVzIGFsbCBicmVha3BvaW50cyBvbiB0aGUgcGFnZS4iCiAgICAgICAgICAgICB9 LAogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIjogInNldEphdmFTY3JpcHRC cmVha3BvaW50IiwKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJzZXRCcmVha3BvaW50QnlVcmwi LAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogInVybCIsICJ0eXBlIjogInN0cmluZyIgfSwKLSAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJsaW5lTnVtYmVyIiwgInR5cGUiOiAiaW50ZWdlciIgfSwKLSAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJjb2x1bW5OdW1iZXIiLCAidHlwZSI6ICJpbnRlZ2VyIiB9LAot ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImNvbmRpdGlvbiIsICJ0eXBlIjogInN0cmlu ZyIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJlbmFibGVkIiwgInR5cGUiOiAi Ym9vbGVhbiIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInVybCIsICJ0eXBlIjog InN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJVUkwgb2YgdGhlIHJlc291cmNlIHRvIHNldCBicmVh a3BvaW50IG9uLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJsaW5lTnVtYmVy IiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJMaW5lIG51bWJlciB0byBzZXQg YnJlYWtwb2ludCBhdC4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY29sdW1u TnVtYmVyIiwgInR5cGUiOiAiaW50ZWdlciIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlv biI6ICJPZmZzZXQgaW4gdGhlIGxpbmUgdG8gc2V0IGJyZWFrcG9pbnQgYXQuIiB9LAorICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogImNvbmRpdGlvbiIsICJ0eXBlIjogInN0cmluZyIsICJv cHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJFeHByZXNzaW9uIHRvIHVzZSBhcyBhIGJy ZWFrcG9pbnQgY29uZGl0aW9uLiBXaGVuIHNwZWNpZmllZCwgZGVidWdnZXIgd2lsbCBvbmx5IHN0 b3Agb24gdGhlIGJyZWFrcG9pbnQgaWYgdGhpcyBleHByZXNzaW9uIGV2YWx1YXRlcyB0byB0cnVl LiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJlbmFibGVkIiwgInR5cGUiOiAi Ym9vbGVhbiIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJEZXRlcm1pbmVzIGlu aXRpYWwgc3RhdGUgZm9yIHRoZSBicmVha3BvaW50LiIgfQogICAgICAgICAgICAgICAgIF0sCiAg ICAgICAgICAgICAgICAgInJldHVybnMiOiBbCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAiYnJlYWtwb2ludElkIiwgInR5cGUiOiAic3RyaW5nIiB9LAotICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogImxvY2F0aW9ucyIsICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJl ZiIgOiAiRGVidWdnZXJMb2NhdGlvbiJ9IH0KLSAgICAgICAgICAgICAgICBdCisgICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAiYnJlYWtwb2ludElkIiwgInR5cGUiOiAic3RyaW5nIiwgImRl c2NyaXB0aW9uIjogIklkIG9mIHRoZSBjcmVhdGVkIGJyZWFrcG9pbnQgZm9yIGZ1cnRoZXIgbWFu aXB1bGF0aW9ucy4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibG9jYXRpb25z IiwgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICIkcmVmIiA6ICJMb2NhdGlvbiJ9LCAiZGVz Y3JpcHRpb24iOiAiTGlzdCBvZiB0aGUgbG9jYXRpb25zIHRoaXMgYnJlYWtwb2ludCByZXNvbHZl ZCBpbnRvLiIgIH0KKyAgICAgICAgICAgICAgICBdLAorICAgICAgICAgICAgICAgICJkZXNjcmlw dGlvbiI6ICJTZXRzIEphdmFTY3JpcHQgYnJlYWtwb2ludCBhdCBhIGdpdmVuIGxvY2F0aW9uIHNw ZWNpZmllZCBieSBVUkwuIFRoaXMgYnJlYWtwb2ludCB3aWxsIHN1cnZpdmUgcGFnZSByZWxvYWQu IgogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAibmFtZSI6 ICJzZXRKYXZhU2NyaXB0QnJlYWtwb2ludEJ5U291cmNlSWQiLAorICAgICAgICAgICAgICAgICJu YW1lIjogInNldEJyZWFrcG9pbnQiLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwot ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNvdXJjZUlkIiwgInR5cGUiOiAic3RyaW5n IiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImxpbmVOdW1iZXIiLCAidHlwZSI6 ICJpbnRlZ2VyIiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImNvbHVtbk51bWJl ciIsICJ0eXBlIjogImludGVnZXIiIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi Y29uZGl0aW9uIiwgInR5cGUiOiAic3RyaW5nIiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJu YW1lIjogImVuYWJsZWQiLCAidHlwZSI6ICJib29sZWFuIiB9CisgICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAic291cmNlSWQiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAi U291cmNlIElEIG9mIHRoZSByZXNvdXJjZSB0byBzZXQgYnJlYWtwb2ludCBvbiAoYXMgcmVwb3J0 ZWQgYnkgPGNvZGU+c2NyaXB0UGFyc2VkPC9jb2RlPikuIiB9LAorICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogImxpbmVOdW1iZXIiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9u IjogIkxpbmUgbnVtYmVyIHRvIHNldCBicmVha3BvaW50IGF0LiIgfSwKKyAgICAgICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJjb2x1bW5OdW1iZXIiLCAidHlwZSI6ICJpbnRlZ2VyIiwgIm9wdGlv bmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIk9mZnNldCBpbiB0aGUgbGluZSB0byBzZXQgYnJl YWtwb2ludCBhdC4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY29uZGl0aW9u IiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIkV4 cHJlc3Npb24gdG8gdXNlIGFzIGEgYnJlYWtwb2ludCBjb25kaXRpb24uIFdoZW4gc3BlY2lmaWVk LCBkZWJ1Z2dlciB3aWxsIG9ubHkgc3RvcCBvbiB0aGUgYnJlYWtwb2ludCBpZiB0aGlzIGV4cHJl c3Npb24gZXZhbHVhdGVzIHRvIHRydWUuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogImVuYWJsZWQiLCAidHlwZSI6ICJib29sZWFuIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2Ny aXB0aW9uIjogIkRldGVybWluZXMgaW5pdGlhbCBzdGF0ZSBmb3IgdGhlIGJyZWFrcG9pbnQuIiB9 CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsKLSAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJicmVha3BvaW50SWQiLCAidHlwZSI6ICJzdHJpbmci IH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiYWN0dWFsTGluZU51bWJlciIsICJ0 eXBlIjogImludGVnZXIiIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiYWN0dWFs Q29sdW1uTnVtYmVyIiwgInR5cGUiOiAiaW50ZWdlciIgfQotICAgICAgICAgICAgICAgIF0KKyAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJicmVha3BvaW50SWQiLCAidHlwZSI6ICJzdHJp bmciLCAiZGVzY3JpcHRpb24iOiAiSWQgb2YgdGhlIGNyZWF0ZWQgYnJlYWtwb2ludCBmb3IgZnVy dGhlciBtYW5pcHVsYXRpb25zLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJh Y3R1YWxMaW5lTnVtYmVyIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJMaW5l IG51bWJlciBpbiB0aGUgc2NyaXB0LiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJhY3R1YWxDb2x1bW5OdW1iZXIiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjog IkNvbHVtbiBudW1iZXIgaW4gdGhlIHNjcmlwdC4iIH0KKyAgICAgICAgICAgICAgICBdLAorICAg ICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJTZXRzIEphdmFTY3JpcHQgYnJlYWtwb2ludCBh dCBhIGdpdmVuIGxvY2F0aW9uLiIKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7Ci0gICAg ICAgICAgICAgICAgIm5hbWUiOiAicmVtb3ZlSmF2YVNjcmlwdEJyZWFrcG9pbnQiLAorICAgICAg ICAgICAgICAgICJuYW1lIjogInJlbW92ZUJyZWFrcG9pbnQiLAogICAgICAgICAgICAgICAgICJw YXJhbWV0ZXJzIjogWwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImJyZWFrcG9pbnRJ ZCIsICJ0eXBlIjogInN0cmluZyIgfQotICAgICAgICAgICAgICAgIF0KKyAgICAgICAgICAgICAg ICBdLAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJSZW1vdmVzIEphdmFTY3JpcHQg YnJlYWtwb2ludC4iCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewogICAgICAgICAgICAg ICAgICJuYW1lIjogImNvbnRpbnVlVG9Mb2NhdGlvbiIsCiAgICAgICAgICAgICAgICAgInBhcmFt ZXRlcnMiOiBbCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic291cmNlSWQiLCAidHlw ZSI6ICJzdHJpbmciIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibGluZU51bWJl ciIsICJ0eXBlIjogImludGVnZXIiIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi Y29sdW1uTnVtYmVyIiwgInR5cGUiOiAiaW50ZWdlciIgfQotICAgICAgICAgICAgICAgIF0KKyAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzb3VyY2VJZCIsICJ0eXBlIjogInN0cmluZyIs ICJkZXNjcmlwdGlvbiI6ICJTb3VyY2UgSUQgb2YgdGhlIHJlc291cmNlIHRvIGNvbnRpbnVlIHRv IChhcyByZXBvcnRlZCBieSA8Y29kZT5zY3JpcHRQYXJzZWQ8L2NvZGU+KS4iIH0sCisgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAibGluZU51bWJlciIsICJ0eXBlIjogImludGVnZXIiLCAi ZGVzY3JpcHRpb24iOiAiTGluZSBudW1iZXIgdG8gc3RvcCBhdC4iIH0sCisgICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAiY29sdW1uTnVtYmVyIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNj cmlwdGlvbiI6ICJDb2x1bW4gbnVtYmVyIHRvIHN0b3AgYXQuIiB9CisgICAgICAgICAgICAgICAg XSwKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiQ29udGludWVzIGV4ZWN1dGlvbiB1 bnRpbCBzcGVjaWZpYyBsb2NhdGlvbiBpcyByZWFjaGVkLiIKICAgICAgICAgICAgIH0sCiAgICAg ICAgICAgICB7Ci0gICAgICAgICAgICAgICAgIm5hbWUiOiAic3RlcE92ZXIiCisgICAgICAgICAg ICAgICAgIm5hbWUiOiAic3RlcE92ZXIiLAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6 ICJTdGVwcyBvdmVyIHRoZSBzdGF0ZW1lbnQuIgogICAgICAgICAgICAgfSwKICAgICAgICAgICAg IHsKLSAgICAgICAgICAgICAgICAibmFtZSI6ICJzdGVwSW50byIKKyAgICAgICAgICAgICAgICAi bmFtZSI6ICJzdGVwSW50byIsCisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIlN0ZXBz IGludG8gdGhlIHN0YXRlbWVudC4iCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewotICAg ICAgICAgICAgICAgICJuYW1lIjogInN0ZXBPdXQiCisgICAgICAgICAgICAgICAgIm5hbWUiOiAi c3RlcE91dCIsCisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIlN0ZXBzIG91dCBvZiB0 aGUgZnVuY3Rpb24uIgogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHsKLSAgICAgICAgICAg ICAgICAibmFtZSI6ICJwYXVzZSIKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJwYXVzZSIsCisg ICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIlN0b3BzIG9uIHRoZSBuZXh0IEphdmFTY3Jp cHQgc3RhdGVtZW50LiIKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7Ci0gICAgICAgICAg ICAgICAgIm5hbWUiOiAicmVzdW1lIgorICAgICAgICAgICAgICAgICJuYW1lIjogInJlc3VtZSIs CisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIlJlc3VtZXMgSmF2YVNjcmlwdCBleGVj dXRpb24uIgogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAi bmFtZSI6ICJlZGl0U2NyaXB0U291cmNlIiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6 IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzb3VyY2VJRCIsICJ0eXBlIjogInN0 cmluZyIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJuZXdDb250ZW50IiwgInR5 cGUiOiAic3RyaW5nIiB9CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic291cmNlSUQi LCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiSWQgb2YgdGhlIHNjcmlwdCB0byBl ZGl0LiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJuZXdDb250ZW50IiwgInR5 cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIk5ldyBjb250ZW50IG9mIHRoZSBzY3JpcHQu IiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsKLSAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzdWNjZXNzIiwgInR5cGUiOiAiYm9vbGVhbiIg fSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXN1bHQiLCAidHlwZSI6ICJzdHJp bmciIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic3RhY2tGcmFtZXMiLCAidHlw ZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgIiRyZWYiIDogIkRlYnVnZ2VyU3RhY2tGcmFtZSJ9IH0K LSAgICAgICAgICAgICAgICBdCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVzdWx0 IiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIk5ldyBjb250ZW50IG9mIHRoZSBz Y3JpcHQuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInN0YWNrRnJhbWVzIiwg InR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICIkcmVmIiA6ICJDYWxsRnJhbWUifSwgImRlc2Ny aXB0aW9uIjogIk5ldyBzdGFjayB0cmFjZSBpbiBjYXNlIGVkaXRpbmcgaGFzIGhhcHBlbmVkIHdo aWxlIFZNIHdhcyBzdG9wcGVkLiIgfQorICAgICAgICAgICAgICAgIF0sCisgICAgICAgICAgICAg ICAgImRlc2NyaXB0aW9uIjogIkVkaXRzIEphdmFTY3JpcHQgc2NyaXB0IGxpdmUuIgogICAgICAg ICAgICAgfSwKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAibmFtZSI6ICJnZXRTY3Jp cHRTb3VyY2UiLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogInNvdXJjZUlEIiwgInR5cGUiOiAic3RyaW5nIiB9CisgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAic291cmNlSUQiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVz Y3JpcHRpb24iOiAiSWQgb2YgdGhlIHNjcmlwdCB0byBnZXQgc291cmNlIGZvci4iIH0KICAgICAg ICAgICAgICAgICBdLAogICAgICAgICAgICAgICAgICJyZXR1cm5zIjogWwotICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogInNjcmlwdFNvdXJjZSIsICJ0eXBlIjogInN0cmluZyIgfQotICAg ICAgICAgICAgICAgIF0KKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzY3JpcHRTb3Vy Y2UiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiU2NyaXB0IHNvdXJjZS4iIH0K KyAgICAgICAgICAgICAgICBdLAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJSZXR1 cm5zIHNvdXJjZSBmb3IgdGhlIHNjcmlwdCB3aXRoIGdpdmVuIElELiIKICAgICAgICAgICAgIH0s CiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAic2V0UGF1c2VPbkV4Y2Vw dGlvbnNTdGF0ZSIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCi0gICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAicGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSIsICJ0eXBlIjogImlu dGVnZXIiIH0KKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJwYXVzZU9uRXhjZXB0aW9u c1N0YXRlIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJQYXVzZSBvbiBleGNl cHRpb25zIG1vZGUuIC8vIEZJWE1FLCBtYWtlIGVudW1lcmFibGUuIiB9CiAgICAgICAgICAgICAg ICAgXSwKLSAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsKLSAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJuZXdTdGF0ZSIsICJ0eXBlIjogImludGVnZXIiIH0KLSAgICAgICAgICAgICAg ICBdCisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkRlZmluZXMgcGF1c2Ugb24gZXhj ZXB0aW9ucyBzdGF0ZS4gQ2FuIGJlIHNldCB0byBzdG9wIG9uIGFsbCBleGNlcHRpb25zLCB1bmNh dWdodCBleGNlcHRpb25zIG9yIG5vIGV4Y2VwdGlvbnMuIgogICAgICAgICAgICAgfSwKICAgICAg ICAgICAgIHsKICAgICAgICAgICAgICAgICAibmFtZSI6ICJldmFsdWF0ZU9uQ2FsbEZyYW1lIiwK ICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJjYWxsRnJhbWVJZCIsICJ0eXBlIjogInN0cmluZyIgfSwKLSAgICAgICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJleHByZXNzaW9uIiwgInR5cGUiOiAic3RyaW5nIiB9LAotICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogIm9iamVjdEdyb3VwIiwgInR5cGUiOiAic3RyaW5nIiB9 LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImluY2x1ZGVDb21tYW5kTGluZUFQSSIs ICJ0eXBlIjogImJvb2xlYW4iIH0KKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjYWxs RnJhbWVJZCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJDYWxsIGZyYW1lIGlk ZW50aWZpZXIgdG8gZXZhbHVhdGUgb24uIFRoaXMgaWRlbnRpZmllciBpcyBhIHBhcnQgb2YgYmFj a3RyYWNlIHJlcG9ydGVkIGJ5IHRoZSA8Y29kZT5wYXVzZWRTY3JpcHQ8L2NvZGU+LiIgfSwKKyAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJleHByZXNzaW9uIiwgInR5cGUiOiAic3RyaW5n IiwgImRlc2NyaXB0aW9uIjogIkV4cHJlc3Npb24gdG8gZXZhbHVhdGUuIiB9LAorICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogIm9iamVjdEdyb3VwIiwgInR5cGUiOiAic3RyaW5nIiwgImRl c2NyaXB0aW9uIjogIlN0cmluZyBvYmplY3QgZ3JvdXAgbmFtZSB0byBwdXQgcmVzdWx0IGludG8g KGFsbG93cyByYXBpZCByZWxlYXNpbmcgcmVzdWx0aW5nIG9iamVjdCBoYW5kbGVzIHVzaW5nIDxj b2RlPnJlbGVhc2VPYmplY3RHcm91cDwvY29kZT4pLiIgfSwKKyAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJpbmNsdWRlQ29tbWFuZExpbmVBUEkiLCAidHlwZSI6ICJib29sZWFuIiwgIm9w dGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlNwZWNpZmllcyB3aGV0aGVyIGNvbW1hbmQg bGluZSBBUEkgc2hvdWxkIGJlIGF2YWlsYWJsZSB0byB0aGUgZXZhbHVhdGVkIGV4cHJlc3Npb24s IGRlZmF1bHRzIHRvIGZhbHNlLiIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAg ICAgInJldHVybnMiOiBbCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVzdWx0Iiwg IiRyZWYiOiAiUnVudGltZU9iamVjdCIgfQotICAgICAgICAgICAgICAgIF0KKyAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJyZXN1bHQiLCAiJHJlZiI6ICJPYmplY3QiLCAiZGVzY3JpcHRp b24iOiAiT2JqZWN0IHdyYXBwZXIgZm9yIHRoZSBldmFsdWF0aW9uIHJlc3VsdC4iIH0KKyAgICAg ICAgICAgICAgICBdLAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJFdmFsdWF0ZXMg ZXhwcmVzc2lvbiBvbiBhIGdpdmVuIGNhbGwgZnJhbWUuIgogICAgICAgICAgICAgfQogICAgICAg ICBdLAogICAgICAgICAiZXZlbnRzIjogWwogICAgICAgICAgICAgewotICAgICAgICAgICAgICAg ICJuYW1lIjogImRlYnVnZ2VyV2FzRW5hYmxlZCIKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJk ZWJ1Z2dlcldhc0VuYWJsZWQiLAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJGaXJl ZCB3aGVuIGRlYnVnZ2VyIGdldHMgZW5hYmxlZC4iCiAgICAgICAgICAgICB9LAogICAgICAgICAg ICAgewotICAgICAgICAgICAgICAgICJuYW1lIjogImRlYnVnZ2VyV2FzRGlzYWJsZWQiCisgICAg ICAgICAgICAgICAgIm5hbWUiOiAiZGVidWdnZXJXYXNEaXNhYmxlZCIsCisgICAgICAgICAgICAg ICAgImRlc2NyaXB0aW9uIjogIkZpcmVkIHdoZW4gZGVidWdnZXIgZ2V0cyBkaXNhYmxlZC4iCiAg ICAgICAgICAgICB9LAogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIjogInBh cnNlZFNjcmlwdFNvdXJjZSIsCisgICAgICAgICAgICAgICAgIm5hbWUiOiAic2NyaXB0UGFyc2Vk IiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJzb3VyY2VJRCIsICJ0eXBlIjogInN0cmluZyIgfSwKLSAgICAgICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJ1cmwiLCAidHlwZSI6ICJzdHJpbmciIH0sCi0gICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAibGluZU9mZnNldCIsICJ0eXBlIjogImludGVnZXIiIH0sCi0gICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY29sdW1uT2Zmc2V0IiwgInR5cGUiOiAiaW50ZWdl ciIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJsZW5ndGgiLCAidHlwZSI6ICJp bnRlZ2VyIiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNjcmlwdFdvcmxkVHlw ZSIsICJ0eXBlIjogImludGVnZXIiIH0KLSAgICAgICAgICAgICAgICBdCisgICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAic291cmNlSUQiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRp b24iOiAiSWRlbnRpZmllciBvZiB0aGUgc2NyaXB0IHBhcnNlZC4iIH0sCisgICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAidXJsIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjog IlVSTCBvZiB0aGUgc2NyaXB0IHBhcnNlZCAoaWYgYW55KS4iIH0sCisgICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAibGluZU9mZnNldCIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRp b24iOiAiTGluZSBvZmZzZXQgb2YgdGhlIHNjcmlwdCB3aXRoaW4gdGhlIHJlc291cmNlIHdpdGgg Z2l2ZW4gVVJMIChmb3Igc2NyaXB0IHRhZ3MpLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJjb2x1bW5PZmZzZXQiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjog IkNvbHVtbiBvZmZzZXQgb2YgdGhlIHNjcmlwdCB3aXRoaW4gdGhlIHJlc291cmNlIHdpdGggZ2l2 ZW4gVVJMLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJsZW5ndGgiLCAidHlw ZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIkxlbmd0aCBvZiB0aGUgc2NyaXB0IiB9LAor ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNjcmlwdFdvcmxkVHlwZSIsICJ0eXBlIjog ImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiU2NyaXB0IHR5cGUuIC8vIEZJWE1FLiIgfQorICAg ICAgICAgICAgICAgIF0sCisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkZpcmVkIHdo ZW4gdmlydHVhbCBtYWNoaW5lIHBhcnNlcyBzY3JpcHQuIFRoaXMgZXZlbiBpcyBhbHNvIGZpcmVk IGZvciBhbGwga25vd24gc2NyaXB0cyB1cG9uIGVuYWJsaW5nIGRlYnVnZ2VyLiIKICAgICAgICAg ICAgIH0sCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgIm5hbWUiOiAiZmFpbGVkVG9Q YXJzZVNjcmlwdFNvdXJjZSIsCisgICAgICAgICAgICAgICAgIm5hbWUiOiAic2NyaXB0RmFpbGVk VG9QYXJzZSIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCi0gICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAidXJsIiwgInR5cGUiOiAic3RyaW5nIiB9LAotICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogImRhdGEiLCAidHlwZSI6ICJzdHJpbmciIH0sCi0gICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAiZmlyc3RMaW5lIiwgInR5cGUiOiAiaW50ZWdlciIgfSwKLSAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJlcnJvckxpbmUiLCAidHlwZSI6ICJpbnRlZ2Vy IiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImVycm9yTWVzc2FnZSIsICJ0eXBl IjogInN0cmluZyIgfQotICAgICAgICAgICAgICAgIF0KKyAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJ1cmwiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiVVJMIG9mIHRo ZSBzY3JpcHQgdGhhdCBmYWlsZWQgdG8gcGFyc2UuIiB9LAorICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogImRhdGEiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiU291cmNl IHRleHQgb2YgdGhlIHNjcmlwdCB0aGF0IGZhaWxlZCB0byBwYXJzZS4iIH0sCisgICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAiZmlyc3RMaW5lIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNj cmlwdGlvbiI6ICJMaW5lIG9mZnNldCBvZiB0aGUgc2NyaXB0IHdpdGhpbiB0aGUgcmVzb3VyY2Uu IiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImVycm9yTGluZSIsICJ0eXBlIjog ImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiTGluZSB3aXRoIGVycm9yLiIgfSwKKyAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJlcnJvck1lc3NhZ2UiLCAidHlwZSI6ICJzdHJpbmciLCAi ZGVzY3JpcHRpb24iOiAiUGFyc2UgZXJyb3IgbWVzc2FnZS4iIH0KKyAgICAgICAgICAgICAgICBd LAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJGaXJlZCB3aGVuIHZpcnR1YWwgbWFj aGluZSBmYWlscyB0byBwYXJzZSB0aGUgc2NyaXB0LiIKICAgICAgICAgICAgIH0sCiAgICAgICAg ICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAiYnJlYWtwb2ludFJlc29sdmVkIiwKICAg ICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJicmVha3BvaW50SWQiLCAidHlwZSI6ICJzdHJpbmciIH0sCi0gICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAic291cmNlSWQiLCAidHlwZSI6ICJzdHJpbmciIH0sCi0gICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAibGluZU51bWJlciIsICJ0eXBlIjogImludGVnZXIiIH0sCi0g ICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY29sdW1uTnVtYmVyIiwgInR5cGUiOiAiaW50 ZWdlciIgfQotICAgICAgICAgICAgICAgIF0KLSAgICAgICAgICAgIH0sCi0gICAgICAgICAgICB7 Ci0gICAgICAgICAgICAgICAgIm5hbWUiOiAicGF1c2VkU2NyaXB0IiwKLSAgICAgICAgICAgICAg ICAicGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJkZXRhaWxz IiwgIiRyZWYiOiAiRGVidWdnZXJCYWNrdHJhY2UiIH0KLSAgICAgICAgICAgICAgICBdCi0gICAg ICAgICAgICB9LAotICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIjogInJlc3Vt ZWRTY3JpcHQiCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiYnJlYWtwb2ludElkIiwg InR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIkJyZWFrcG9pbnQgdW5pcXVlIGlkZW50 aWZpZXIuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNvdXJjZUlkIiwgInR5 cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIklkZW50aWZpZXIgb2YgdGhlIHNjcmlwdCBi cmVha3BvaW50IGlzIHNldCBpbi4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi bGluZU51bWJlciIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiTGluZSBudW1i ZXIgb2YgdGhlIHN0YXRlbWVudCBicmVha3BvaW50IGlzIHNldCBvbi4iIH0sCisgICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAiY29sdW1uTnVtYmVyIiwgInR5cGUiOiAiaW50ZWdlciIsICJk ZXNjcmlwdGlvbiI6ICJDb2x1bW4gb2Zmc2V0IG9mIHRoZSBzdGF0ZW1lbnQgYnJlYWtwb2ludCBp cyBzZXQgb24uIiB9CisgICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICAiZGVzY3Jp cHRpb24iOiAiRmlyZWQgd2hlbiBicmVha3BvaW50IGlzIHJlc29sdmVkIHRvIGFuIGFjdHVhbCBz Y3JpcHQgYW5kIGxvY2F0aW9uLiIKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7Ci0gICAg ICAgICAgICAgICAgIm5hbWUiOiAiZGlkQ3JlYXRlV29ya2VyIiwKKyAgICAgICAgICAgICAgICAi bmFtZSI6ICJwYXVzZWQiLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogImlkIiwgInR5cGUiOiAiaW50ZWdlciIgfSwKLSAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ1cmwiLCAidHlwZSI6ICJzdHJpbmciIH0sCi0gICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaXNTaGFyZWQiLCAidHlwZSI6ICJib29sZWFuIiB9 Ci0gICAgICAgICAgICAgICAgXQorICAgICAgICAgICAgICAgICAgICB7IAorICAgICAgICAgICAg ICAgICAgICAgICAgIm5hbWUiOiAiZGV0YWlscyIsCisgICAgICAgICAgICAgICAgICAgICAgICAi dHlwZSI6ICJvYmplY3QiLAorICAgICAgICAgICAgICAgICAgICAgICAgInByb3BlcnRpZXMiOiB7 CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgImNhbGxGcmFtZXMiOiB7ICJ0eXBlIjogImFy cmF5IiwgIml0ZW1zIjogeyAiJHJlZiI6ICJDYWxsRnJhbWUiIH0sICJkZXNjcmlwdGlvbiI6ICJD YWxsIHN0YWNrIHRoZSB2aXJ0dWFsIG1hY2hpbmUgc3RvcHBlZCBvbi4iIH0sCisgICAgICAgICAg ICAgICAgICAgICAgICB9LAorCQkgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkNhbGwg c3RhY2sgaW5mb3JtYXRpb24uIgorICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAg ICAgXSwKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRmlyZWQgd2hlbiB0aGUgdmly dHVhbCBtYWNoaW5lIHN0b3BwZWQgb24gYnJlYWtwb2ludCBvciBleGNlcHRpb24gb3IgYW55IG90 aGVyIHN0b3AgY3JpdGVyaWEuIgogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHsKLSAgICAg ICAgICAgICAgICAibmFtZSI6ICJkaWREZXN0cm95V29ya2VyIiwKLSAgICAgICAgICAgICAgICAi cGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJpZCIsICJ0eXBl IjogImludGVnZXIiIH0KLSAgICAgICAgICAgICAgICBdCisgICAgICAgICAgICAgICAgIm5hbWUi OiAicmVzdW1lZCIsCisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkZpcmVkIHdoZW4g dGhlIHZpcnR1YWwgbWFjaGluZSByZXN1bWVkIGV4ZWN1dGlvbi4iCiAgICAgICAgICAgICB9CiAg ICAgICAgIF0KICAgICB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2Vu dC5jcHAKaW5kZXggN2M1MzRkNjA4NTA0N2NjNGIyZWMyY2MxMjU5N2I4ZGRjMTZlYzFhNS4uY2Fh YWUzZDM4NzQ2NTUyYTMwMGExMzg3NjQ3MWRmNDk0OWRhODE1MyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuY3BwCkBAIC0yODMsNyArMjgzLDcgQEAgdm9pZCBJ bnNwZWN0b3JBZ2VudDo6c2V0RnJvbnRlbmQoSW5zcGVjdG9yRnJvbnRlbmQqIGluc3BlY3RvckZy b250ZW5kKQogICAgIFdvcmtlcnNNYXA6Oml0ZXJhdG9yIHdvcmtlcnNFbmQgPSBtX3dvcmtlcnMu ZW5kKCk7CiAgICAgZm9yIChXb3JrZXJzTWFwOjppdGVyYXRvciBpdCA9IG1fd29ya2Vycy5iZWdp bigpOyBpdCAhPSB3b3JrZXJzRW5kOyArK2l0KSB7CiAgICAgICAgIEluc3BlY3RvcldvcmtlclJl c291cmNlKiB3b3JrZXIgPSBpdC0+c2Vjb25kLmdldCgpOwotICAgICAgICBtX2Zyb250ZW5kLT5k ZWJ1Z2dlcigpLT5kaWRDcmVhdGVXb3JrZXIod29ya2VyLT5pZCgpLCB3b3JrZXItPnVybCgpLCB3 b3JrZXItPmlzU2hhcmVkV29ya2VyKCkpOworICAgICAgICBtX2Zyb250ZW5kLT5pbnNwZWN0b3Io KS0+ZGlkQ3JlYXRlV29ya2VyKHdvcmtlci0+aWQoKSwgd29ya2VyLT51cmwoKSwgd29ya2VyLT5p c1NoYXJlZFdvcmtlcigpKTsKICAgICB9CiAjZW5kaWYKICAgICAvLyBEaXNwYXRjaCBwZW5kaW5n IGZyb250ZW5kIGNvbW1hbmRzCkBAIC00MzMsMTAgKzQzMywxMCBAQCB2b2lkIEluc3BlY3RvckFn ZW50Ojpwb3N0V29ya2VyTm90aWZpY2F0aW9uVG9Gcm9udGVuZChjb25zdCBJbnNwZWN0b3JXb3Jr ZXJSZXNvdQogI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQogICAgIHN3aXRjaCAoYWN0 aW9uKSB7CiAgICAgY2FzZSBJbnNwZWN0b3JBZ2VudDo6V29ya2VyQ3JlYXRlZDoKLSAgICAgICAg bV9mcm9udGVuZC0+ZGVidWdnZXIoKS0+ZGlkQ3JlYXRlV29ya2VyKHdvcmtlci5pZCgpLCB3b3Jr ZXIudXJsKCksIHdvcmtlci5pc1NoYXJlZFdvcmtlcigpKTsKKyAgICAgICAgbV9mcm9udGVuZC0+ aW5zcGVjdG9yKCktPmRpZENyZWF0ZVdvcmtlcih3b3JrZXIuaWQoKSwgd29ya2VyLnVybCgpLCB3 b3JrZXIuaXNTaGFyZWRXb3JrZXIoKSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgSW5zcGVj dG9yQWdlbnQ6OldvcmtlckRlc3Ryb3llZDoKLSAgICAgICAgbV9mcm9udGVuZC0+ZGVidWdnZXIo KS0+ZGlkRGVzdHJveVdvcmtlcih3b3JrZXIuaWQoKSk7CisgICAgICAgIG1fZnJvbnRlbmQtPmlu c3BlY3RvcigpLT5kaWREZXN0cm95V29ya2VyKHdvcmtlci5pZCgpKTsKICAgICAgICAgYnJlYWs7 CiAgICAgfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yRGVidWdnZXJBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yRGVidWdnZXJBZ2VudC5jcHAKaW5kZXggNzliODI1ZWZjMTZlNjBiZGViOGRjYWY2ZTBjMjVj Mjc0NDI4YWQ2Yi4uZDQ1OTUzYTE3YTA5YzZkM2ZmNDc2NGJmY2U1ZTk1MjAxMGRlMjcwNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50 LmNwcApAQCAtMTMzLDE0ICsxMzMsMTIgQEAgdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50Ojpj bGVhckZyb250ZW5kKCkKICAgICBkaXNhYmxlKCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yRGVidWdn ZXJBZ2VudDo6YWN0aXZhdGVCcmVha3BvaW50cyhFcnJvclN0cmluZyopCit2b2lkIEluc3BlY3Rv ckRlYnVnZ2VyQWdlbnQ6OnNldEJyZWFrcG9pbnRzQWN0aXZlKEVycm9yU3RyaW5nKiwgYm9vbCBh Y3RpdmUpCiB7Ci0gICAgU2NyaXB0RGVidWdTZXJ2ZXI6OnNoYXJlZCgpLmFjdGl2YXRlQnJlYWtw b2ludHMoKTsKLX0KLQotdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpkZWFjdGl2YXRlQnJl YWtwb2ludHMoRXJyb3JTdHJpbmcqKQotewotICAgIFNjcmlwdERlYnVnU2VydmVyOjpzaGFyZWQo KS5kZWFjdGl2YXRlQnJlYWtwb2ludHMoKTsKKyAgICBpZiAoYWN0aXZlKQorICAgICAgICBTY3Jp cHREZWJ1Z1NlcnZlcjo6c2hhcmVkKCkuYWN0aXZhdGVCcmVha3BvaW50cygpOworICAgIGVsc2UK KyAgICAgICAgU2NyaXB0RGVidWdTZXJ2ZXI6OnNoYXJlZCgpLmRlYWN0aXZhdGVCcmVha3BvaW50 cygpOwogfQogCiB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6Omluc3BlY3RlZFVSTENoYW5n ZWQoY29uc3QgU3RyaW5nJikKQEAgLTE0OSw3ICsxNDcsNyBAQCB2b2lkIEluc3BlY3RvckRlYnVn Z2VyQWdlbnQ6Omluc3BlY3RlZFVSTENoYW5nZWQoY29uc3QgU3RyaW5nJikKICAgICBtX2JyZWFr cG9pbnRJZFRvRGVidWdTZXJ2ZXJCcmVha3BvaW50SWRzLmNsZWFyKCk7CiB9CiAKLXZvaWQgSW5z cGVjdG9yRGVidWdnZXJBZ2VudDo6c2V0SmF2YVNjcmlwdEJyZWFrcG9pbnQoRXJyb3JTdHJpbmcq LCBjb25zdCBTdHJpbmcmIHVybCwgaW50IGxpbmVOdW1iZXIsIGludCBjb2x1bW5OdW1iZXIsIGNv bnN0IFN0cmluZyYgY29uZGl0aW9uLCBib29sIGVuYWJsZWQsIFN0cmluZyogb3V0QnJlYWtwb2lu dElkLCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiBsb2NhdGlvbnMpCit2b2lkIEluc3BlY3RvckRl YnVnZ2VyQWdlbnQ6OnNldEJyZWFrcG9pbnRCeVVybChFcnJvclN0cmluZyosIGNvbnN0IFN0cmlu ZyYgdXJsLCBpbnQgbGluZU51bWJlciwgaW50IGNvbHVtbk51bWJlciwgY29uc3QgU3RyaW5nJiBj b25kaXRpb24sIGJvb2wgZW5hYmxlZCwgU3RyaW5nKiBvdXRCcmVha3BvaW50SWQsIFJlZlB0cjxJ bnNwZWN0b3JBcnJheT4qIGxvY2F0aW9ucykKIHsKICAgICBTdHJpbmcgYnJlYWtwb2ludElkID0g bWFrZVN0cmluZyh1cmwsICI6IiwgU3RyaW5nOjpudW1iZXIobGluZU51bWJlciksICI6IiwgU3Ry aW5nOjpudW1iZXIoY29sdW1uTnVtYmVyKSk7CiAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4g YnJlYWtwb2ludHNDb29raWUgPSBtX2luc3BlY3RvclN0YXRlLT5nZXRPYmplY3QoRGVidWdnZXJB Z2VudFN0YXRlOjpqYXZhU2NyaXB0QnJlYWtwb2ludHMpOwpAQCAtMTgwLDcgKzE3OCw3IEBAIHZv aWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6c2V0SmF2YVNjcmlwdEJyZWFrcG9pbnQoRXJyb3JT dHJpbmcqLCBjb25zdCBTdHJpbmcmCiAgICAgKm91dEJyZWFrcG9pbnRJZCA9IGJyZWFrcG9pbnRJ ZDsKIH0KIAotdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpzZXRKYXZhU2NyaXB0QnJlYWtw b2ludEJ5U291cmNlSWQoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlkLCBpbnQg bGluZU51bWJlciwgaW50IGNvbHVtbk51bWJlciwgY29uc3QgU3RyaW5nJiBjb25kaXRpb24sIGJv b2wgZW5hYmxlZCwgU3RyaW5nKiBvdXRCcmVha3BvaW50SWQsIGludCogYWN0dWFsTGluZU51bWJl ciwgaW50KiBhY3R1YWxDb2x1bW5OdW1iZXIpCit2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6 OnNldEJyZWFrcG9pbnQoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlkLCBpbnQg bGluZU51bWJlciwgaW50IGNvbHVtbk51bWJlciwgY29uc3QgU3RyaW5nJiBjb25kaXRpb24sIGJv b2wgZW5hYmxlZCwgU3RyaW5nKiBvdXRCcmVha3BvaW50SWQsIGludCogYWN0dWFsTGluZU51bWJl ciwgaW50KiBhY3R1YWxDb2x1bW5OdW1iZXIpCiB7CiAgICAgU3RyaW5nIGJyZWFrcG9pbnRJZCA9 IG1ha2VTdHJpbmcoc291cmNlSWQsICI6IiwgU3RyaW5nOjpudW1iZXIobGluZU51bWJlciksICI6 IiwgU3RyaW5nOjpudW1iZXIoY29sdW1uTnVtYmVyKSk7CiAgICAgaWYgKG1fYnJlYWtwb2ludElk VG9EZWJ1Z1NlcnZlckJyZWFrcG9pbnRJZHMuZmluZChicmVha3BvaW50SWQpICE9IG1fYnJlYWtw b2ludElkVG9EZWJ1Z1NlcnZlckJyZWFrcG9pbnRJZHMuZW5kKCkpCkBAIC0xOTEsNyArMTg5LDcg QEAgdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpzZXRKYXZhU2NyaXB0QnJlYWtwb2ludEJ5 U291cmNlSWQoRXJyb3JTdHJpbmcqLCBjb24KICAgICAqb3V0QnJlYWtwb2ludElkID0gYnJlYWtw b2ludElkOwogfQogCi12b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnJlbW92ZUphdmFTY3Jp cHRCcmVha3BvaW50KEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBicmVha3BvaW50SWQpCit2 b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnJlbW92ZUJyZWFrcG9pbnQoRXJyb3JTdHJpbmcq LCBjb25zdCBTdHJpbmcmIGJyZWFrcG9pbnRJZCkKIHsKICAgICBSZWZQdHI8SW5zcGVjdG9yT2Jq ZWN0PiBicmVha3BvaW50c0Nvb2tpZSA9IG1faW5zcGVjdG9yU3RhdGUtPmdldE9iamVjdChEZWJ1 Z2dlckFnZW50U3RhdGU6OmphdmFTY3JpcHRCcmVha3BvaW50cyk7CiAgICAgYnJlYWtwb2ludHND b29raWUtPnJlbW92ZShicmVha3BvaW50SWQpOwpAQCAtMjQ2LDEwICsyNDQsMTQgQEAgYm9vbCBJ bnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpyZXNvbHZlQnJlYWtwb2ludChjb25zdCBTdHJpbmcmIGJy ZWFrcG9pbnRJZCwgY29uc3QKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBJbnNwZWN0b3JE ZWJ1Z2dlckFnZW50OjplZGl0U2NyaXB0U291cmNlKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5n JiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiBuZXdDb250ZW50LCBib29sKiBzdWNjZXNzLCBTdHJp bmcqIHJlc3VsdCwgUmVmUHRyPEluc3BlY3RvckFycmF5PiogbmV3Q2FsbEZyYW1lcykKK3ZvaWQg SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6ZWRpdFNjcmlwdFNvdXJjZShFcnJvclN0cmluZyogZXJy b3JTdHJpbmcsIGNvbnN0IFN0cmluZyYgc291cmNlSUQsIGNvbnN0IFN0cmluZyYgbmV3Q29udGVu dCwgU3RyaW5nKiByZXN1bHQsIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qIG5ld0NhbGxGcmFtZXMp CiB7Ci0gICAgaWYgKCgqc3VjY2VzcyA9IFNjcmlwdERlYnVnU2VydmVyOjpzaGFyZWQoKS5lZGl0 U2NyaXB0U291cmNlKHNvdXJjZUlELCBuZXdDb250ZW50LCAqcmVzdWx0KSkpCisgICAgU3RyaW5n IGVkaXRSZXN1bHQ7CisgICAgaWYgKFNjcmlwdERlYnVnU2VydmVyOjpzaGFyZWQoKS5lZGl0U2Ny aXB0U291cmNlKHNvdXJjZUlELCBuZXdDb250ZW50LCBlZGl0UmVzdWx0KSkgewogICAgICAgICAq bmV3Q2FsbEZyYW1lcyA9IGN1cnJlbnRDYWxsRnJhbWVzKCk7CisgICAgICAgICpyZXN1bHQgPSBl ZGl0UmVzdWx0OworICAgIH0gZWxzZQorICAgICAgICAqZXJyb3JTdHJpbmcgPSBlZGl0UmVzdWx0 OwogfQogCiB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmdldFNjcmlwdFNvdXJjZShFcnJv clN0cmluZyosIGNvbnN0IFN0cmluZyYgc291cmNlSUQsIFN0cmluZyogc2NyaXB0U291cmNlKQpA QCAtMzAxLDEwICszMDMsMTEgQEAgdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpzdGVwT3V0 KEVycm9yU3RyaW5nKikKICAgICBTY3JpcHREZWJ1Z1NlcnZlcjo6c2hhcmVkKCkuc3RlcE91dE9m RnVuY3Rpb24oKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpzZXRQYXVzZU9u RXhjZXB0aW9uc1N0YXRlKEVycm9yU3RyaW5nKiwgaW50IHBhdXNlU3RhdGUsIGludCogbmV3U3Rh dGUpCit2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnNldFBhdXNlT25FeGNlcHRpb25zU3Rh dGUoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBpbnQgcGF1c2VTdGF0ZSkKIHsKICAgICBTY3Jp cHREZWJ1Z1NlcnZlcjo6c2hhcmVkKCkuc2V0UGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZShzdGF0aWNf Y2FzdDxTY3JpcHREZWJ1Z1NlcnZlcjo6UGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZT4ocGF1c2VTdGF0 ZSkpOwotICAgICpuZXdTdGF0ZSA9IFNjcmlwdERlYnVnU2VydmVyOjpzaGFyZWQoKS5wYXVzZU9u RXhjZXB0aW9uc1N0YXRlKCk7CisgICAgaWYgKFNjcmlwdERlYnVnU2VydmVyOjpzaGFyZWQoKS5w YXVzZU9uRXhjZXB0aW9uc1N0YXRlKCkgIT0gcGF1c2VTdGF0ZSkKKyAgICAgICAgKmVycm9yU3Ry aW5nID0gIkludGVybmFsIGVycm9yLiBDb3VsZCBub3QgY2hhbmdlIHBhdXNlIG9uIGV4Y2VwdGlv bnMgc3RhdGUuIjsKIH0KIAogdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpldmFsdWF0ZU9u Q2FsbEZyYW1lKEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgY29uc3QgU3RyaW5nJiBjYWxsRnJh bWVJZCwgY29uc3QgU3RyaW5nJiBleHByZXNzaW9uLCBjb25zdCBTdHJpbmcmIG9iamVjdEdyb3Vw LCBib29sIGluY2x1ZGVDb21tYW5kTGluZUFQSSwgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4qIHJl c3VsdCkKQEAgLTMzMSw3ICszMzQsNyBAQCBQYXNzUmVmUHRyPEluc3BlY3RvckFycmF5PiBJbnNw ZWN0b3JEZWJ1Z2dlckFnZW50OjpjdXJyZW50Q2FsbEZyYW1lcygpCiB2b2lkIEluc3BlY3RvckRl YnVnZ2VyQWdlbnQ6OmRpZFBhcnNlU291cmNlKGNvbnN0IFN0cmluZyYgc291cmNlSUQsIGNvbnN0 IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGRhdGEsIGludCBsaW5lT2Zmc2V0LCBpbnQgY29s dW1uT2Zmc2V0LCBTY3JpcHRXb3JsZFR5cGUgd29ybGRUeXBlKQogewogICAgIC8vIERvbid0IHNl bmQgc2NyaXB0IGNvbnRlbnQgdG8gdGhlIGZyb250IGVuZCB1bnRpbCBpdCdzIHJlYWxseSBuZWVk ZWQuCi0gICAgbV9mcm9udGVuZC0+cGFyc2VkU2NyaXB0U291cmNlKHNvdXJjZUlELCB1cmwsIGxp bmVPZmZzZXQsIGNvbHVtbk9mZnNldCwgZGF0YS5sZW5ndGgoKSwgd29ybGRUeXBlKTsKKyAgICBt X2Zyb250ZW5kLT5zY3JpcHRQYXJzZWQoc291cmNlSUQsIHVybCwgbGluZU9mZnNldCwgY29sdW1u T2Zmc2V0LCBkYXRhLmxlbmd0aCgpLCB3b3JsZFR5cGUpOwogCiAgICAgbV9zY3JpcHRzLnNldChz b3VyY2VJRCwgU2NyaXB0KHVybCwgZGF0YSwgbGluZU9mZnNldCwgY29sdW1uT2Zmc2V0KSk7CiAK QEAgLTM1OCw3ICszNjEsNyBAQCB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRpZFBhcnNl U291cmNlKGNvbnN0IFN0cmluZyYgc291cmNlSUQsIGNvbnN0IFN0cmluZwogCiB2b2lkIEluc3Bl Y3RvckRlYnVnZ2VyQWdlbnQ6OmZhaWxlZFRvUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiB1cmws IGNvbnN0IFN0cmluZyYgZGF0YSwgaW50IGZpcnN0TGluZSwgaW50IGVycm9yTGluZSwgY29uc3Qg U3RyaW5nJiBlcnJvck1lc3NhZ2UpCiB7Ci0gICAgbV9mcm9udGVuZC0+ZmFpbGVkVG9QYXJzZVNj cmlwdFNvdXJjZSh1cmwsIGRhdGEsIGZpcnN0TGluZSwgZXJyb3JMaW5lLCBlcnJvck1lc3NhZ2Up OworICAgIG1fZnJvbnRlbmQtPnNjcmlwdEZhaWxlZFRvUGFyc2UodXJsLCBkYXRhLCBmaXJzdExp bmUsIGVycm9yTGluZSwgZXJyb3JNZXNzYWdlKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JEZWJ1Z2dl ckFnZW50OjpkaWRQYXVzZShTY3JpcHRTdGF0ZSogc2NyaXB0U3RhdGUpCkBAIC0zNzAsNyArMzcz LDcgQEAgdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpkaWRQYXVzZShTY3JpcHRTdGF0ZSog c2NyaXB0U3RhdGUpCiAgICAgICAgIG1fYnJlYWtQcm9ncmFtRGV0YWlscyA9IEluc3BlY3Rvck9i amVjdDo6Y3JlYXRlKCk7CiAgICAgbV9icmVha1Byb2dyYW1EZXRhaWxzLT5zZXRWYWx1ZSgiY2Fs bEZyYW1lcyIsIGN1cnJlbnRDYWxsRnJhbWVzKCkpOwogCi0gICAgbV9mcm9udGVuZC0+cGF1c2Vk U2NyaXB0KG1fYnJlYWtQcm9ncmFtRGV0YWlscyk7CisgICAgbV9mcm9udGVuZC0+cGF1c2VkKG1f YnJlYWtQcm9ncmFtRGV0YWlscyk7CiAgICAgbV9qYXZhU2NyaXB0UGF1c2VTY2hlZHVsZWQgPSBm YWxzZTsKIAogICAgIGlmICghbV9jb250aW51ZVRvTG9jYXRpb25CcmVha3BvaW50SWQuaXNFbXB0 eSgpKSB7CkBAIC0zODMsNyArMzg2LDcgQEAgdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50Ojpk aWRDb250aW51ZSgpCiB7CiAgICAgbV9wYXVzZWRTY3JpcHRTdGF0ZSA9IDA7CiAgICAgbV9icmVh a1Byb2dyYW1EZXRhaWxzID0gMDsKLSAgICBtX2Zyb250ZW5kLT5yZXN1bWVkU2NyaXB0KCk7Cisg ICAgbV9mcm9udGVuZC0+cmVzdW1lZCgpOwogfQogCiB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdl bnQ6OmJyZWFrUHJvZ3JhbShEZWJ1Z2dlckV2ZW50VHlwZSB0eXBlLCBQYXNzUmVmUHRyPEluc3Bl Y3RvclZhbHVlPiBkYXRhKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckRlYnVnZ2VyQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JEZWJ1Z2dlckFnZW50LmgKaW5kZXggNzg5NmQ0ZDY1YjUyZTZmYjZjNzFhMTVlMTBkYmYyNTlk MTViMzYwYS4uNDYzYmI4YTk5OWRkMTEwM2Q1YjBhMDczNGM2ZmM4N2ZhMDNlNWQ5YSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oCkBA IC03OCwxNSArNzgsMTQgQEAgcHVibGljOgogICAgIHZvaWQgaW5zcGVjdGVkVVJMQ2hhbmdlZChj b25zdCBTdHJpbmcmIHVybCk7CiAKICAgICAvLyBQYXJ0IG9mIHRoZSBwcm90b2NvbC4KLSAgICB2 b2lkIGFjdGl2YXRlQnJlYWtwb2ludHMoRXJyb3JTdHJpbmcqKTsKLSAgICB2b2lkIGRlYWN0aXZh dGVCcmVha3BvaW50cyhFcnJvclN0cmluZyopOworICAgIHZvaWQgc2V0QnJlYWtwb2ludHNBY3Rp dmUoRXJyb3JTdHJpbmcqLCBib29sIGFjdGl2ZSk7CiAKLSAgICB2b2lkIHNldEphdmFTY3JpcHRC cmVha3BvaW50KEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiB1cmwsIGludCBsaW5lTnVtYmVy LCBpbnQgY29sdW1uTnVtYmVyLCBjb25zdCBTdHJpbmcmIGNvbmRpdGlvbiwgYm9vbCBlbmFibGVk LCBTdHJpbmcqIGJyZWFrcG9pbnRJZCwgUmVmUHRyPEluc3BlY3RvckFycmF5PiogbG9jYXRpb25z KTsKLSAgICB2b2lkIHNldEphdmFTY3JpcHRCcmVha3BvaW50QnlTb3VyY2VJZChFcnJvclN0cmlu ZyosIGNvbnN0IFN0cmluZyYgc291cmNlSWQsIGludCBsaW5lTnVtYmVyLCBpbnQgY29sdW1uTnVt YmVyLCBjb25zdCBTdHJpbmcmIGNvbmRpdGlvbiwgYm9vbCBlbmFibGVkLCBTdHJpbmcqIGJyZWFr cG9pbnRJZCwgaW50KiBhY3R1YWxMaW5lTnVtYmVyLCBpbnQqIGFjdHVhbENvbHVtbk51bWJlcik7 Ci0gICAgdm9pZCByZW1vdmVKYXZhU2NyaXB0QnJlYWtwb2ludChFcnJvclN0cmluZyosIGNvbnN0 IFN0cmluZyYgYnJlYWtwb2ludElkKTsKKyAgICB2b2lkIHNldEJyZWFrcG9pbnRCeVVybChFcnJv clN0cmluZyosIGNvbnN0IFN0cmluZyYgdXJsLCBpbnQgbGluZU51bWJlciwgaW50IGNvbHVtbk51 bWJlciwgY29uc3QgU3RyaW5nJiBjb25kaXRpb24sIGJvb2wgZW5hYmxlZCwgU3RyaW5nKiBicmVh a3BvaW50SWQsIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qIGxvY2F0aW9ucyk7CisgICAgdm9pZCBz ZXRCcmVha3BvaW50KEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBzb3VyY2VJZCwgaW50IGxp bmVOdW1iZXIsIGludCBjb2x1bW5OdW1iZXIsIGNvbnN0IFN0cmluZyYgY29uZGl0aW9uLCBib29s IGVuYWJsZWQsIFN0cmluZyogYnJlYWtwb2ludElkLCBpbnQqIGFjdHVhbExpbmVOdW1iZXIsIGlu dCogYWN0dWFsQ29sdW1uTnVtYmVyKTsKKyAgICB2b2lkIHJlbW92ZUJyZWFrcG9pbnQoRXJyb3JT dHJpbmcqLCBjb25zdCBTdHJpbmcmIGJyZWFrcG9pbnRJZCk7CiAgICAgdm9pZCBjb250aW51ZVRv TG9jYXRpb24oRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlkLCBpbnQgbGluZU51 bWJlciwgaW50IGNvbHVtbk51bWJlcik7CiAKLSAgICB2b2lkIGVkaXRTY3JpcHRTb3VyY2UoRXJy b3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlELCBjb25zdCBTdHJpbmcmIG5ld0NvbnRl bnQsIGJvb2wqIHN1Y2Nlc3MsIFN0cmluZyogcmVzdWx0LCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+ KiBuZXdDYWxsRnJhbWVzKTsKKyAgICB2b2lkIGVkaXRTY3JpcHRTb3VyY2UoRXJyb3JTdHJpbmcq LCBjb25zdCBTdHJpbmcmIHNvdXJjZUlELCBjb25zdCBTdHJpbmcmIG5ld0NvbnRlbnQsIFN0cmlu ZyogcmVzdWx0LCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiBuZXdDYWxsRnJhbWVzKTsKICAgICB2 b2lkIGdldFNjcmlwdFNvdXJjZShFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgc291cmNlSUQs IFN0cmluZyogc2NyaXB0U291cmNlKTsKICAgICB2b2lkIHNjaGVkdWxlUGF1c2VPbk5leHRTdGF0 ZW1lbnQoRGVidWdnZXJFdmVudFR5cGUgdHlwZSwgUGFzc1JlZlB0cjxJbnNwZWN0b3JWYWx1ZT4g ZGF0YSk7CiAgICAgdm9pZCBjYW5jZWxQYXVzZU9uTmV4dFN0YXRlbWVudCgpOwpAQCAtOTYsNyAr OTUsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzdGVwT3ZlcihFcnJvclN0cmluZyopOwogICAgIHZv aWQgc3RlcEludG8oRXJyb3JTdHJpbmcqKTsKICAgICB2b2lkIHN0ZXBPdXQoRXJyb3JTdHJpbmcq KTsKLSAgICB2b2lkIHNldFBhdXNlT25FeGNlcHRpb25zU3RhdGUoRXJyb3JTdHJpbmcqLCBpbnQg cGF1c2VTdGF0ZSwgaW50KiBuZXdTdGF0ZSk7CisgICAgdm9pZCBzZXRQYXVzZU9uRXhjZXB0aW9u c1N0YXRlKEVycm9yU3RyaW5nKiwgaW50IHBhdXNlU3RhdGUpOwogICAgIHZvaWQgZXZhbHVhdGVP bkNhbGxGcmFtZShFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgY2FsbEZyYW1lSWQsIGNvbnN0 IFN0cmluZyYgZXhwcmVzc2lvbiwgY29uc3QgU3RyaW5nJiBvYmplY3RHcm91cCwgYm9vbCBpbmNs dWRlQ29tbWFuZExpbmVBUEksIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiByZXN1bHQpOwogCiAg ICAgY2xhc3MgTGlzdGVuZXIgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9EZWJ1Z2dlck1vZGVsLmpzCmluZGV4IDEwODA1NWU4OWNmODY3YTNjNjdkOTgwMzEx NGM1YjI4OWVmODFjZGMuLjNmZmQwY2Y4MzYyZjAzOWQwOWE1MDMwZTNlY2EzNTY5ZDQzOWNhZWUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJN b2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2Vy TW9kZWwuanMKQEAgLTk3LDcgKzk3LDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwucHJv dG90eXBlID0gewogICAgICAgICAgICAgaWYgKGNhbGxiYWNrKQogICAgICAgICAgICAgICAgIGNh bGxiYWNrKGJyZWFrcG9pbnQpOwogICAgICAgICB9Ci0gICAgICAgIERlYnVnZ2VyQWdlbnQuc2V0 SmF2YVNjcmlwdEJyZWFrcG9pbnQodXJsLCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIsIGNvbmRp dGlvbiwgZW5hYmxlZCwgZGlkU2V0QnJlYWtwb2ludC5iaW5kKHRoaXMpKTsKKyAgICAgICAgRGVi dWdnZXJBZ2VudC5zZXRCcmVha3BvaW50QnlVcmwodXJsLCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1i ZXIsIGNvbmRpdGlvbiwgZW5hYmxlZCwgZGlkU2V0QnJlYWtwb2ludC5iaW5kKHRoaXMpKTsKICAg ICB9LAogCiAgICAgc2V0QnJlYWtwb2ludEJ5U291cmNlSWQ6IGZ1bmN0aW9uKHNvdXJjZUlELCBs aW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIsIGNvbmRpdGlvbiwgZW5hYmxlZCwgY2FsbGJhY2spCkBA IC0xMTMsMTIgKzExMywxMiBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICBpZiAoY2FsbGJhY2spCiAgICAgICAgICAgICAgICAgY2FsbGJhY2so YnJlYWtwb2ludCk7CiAgICAgICAgIH0KLSAgICAgICAgRGVidWdnZXJBZ2VudC5zZXRKYXZhU2Ny aXB0QnJlYWtwb2ludEJ5U291cmNlSWQoc291cmNlSUQsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJl ciwgY29uZGl0aW9uLCBlbmFibGVkLCBkaWRTZXRCcmVha3BvaW50LmJpbmQodGhpcykpOworICAg ICAgICBEZWJ1Z2dlckFnZW50LnNldEJyZWFrcG9pbnQoc291cmNlSUQsIGxpbmVOdW1iZXIsIGNv bHVtbk51bWJlciwgY29uZGl0aW9uLCBlbmFibGVkLCBkaWRTZXRCcmVha3BvaW50LmJpbmQodGhp cykpOwogICAgIH0sCiAKICAgICByZW1vdmVCcmVha3BvaW50OiBmdW5jdGlvbihicmVha3BvaW50 SWQpCiAgICAgewotICAgICAgICBEZWJ1Z2dlckFnZW50LnJlbW92ZUphdmFTY3JpcHRCcmVha3Bv aW50KGJyZWFrcG9pbnRJZCk7CisgICAgICAgIERlYnVnZ2VyQWdlbnQucmVtb3ZlQnJlYWtwb2lu dChicmVha3BvaW50SWQpOwogICAgICAgICBkZWxldGUgdGhpcy5fYnJlYWtwb2ludHNbYnJlYWtw b2ludElkXTsKICAgICB9LAogCkBAIC0xNzksMTIgKzE3OSwxMiBAQCBXZWJJbnNwZWN0b3IuRGVi dWdnZXJNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIERlYnVnZ2VyQWdlbnQuZWRpdFNjcmlw dFNvdXJjZShzb3VyY2VJRCwgbmV3U291cmNlLCB0aGlzLl9kaWRFZGl0U2NyaXB0U291cmNlLmJp bmQodGhpcywgc291cmNlSUQsIGNhbGxiYWNrKSk7CiAgICAgfSwKIAotICAgIF9kaWRFZGl0U2Ny aXB0U291cmNlOiBmdW5jdGlvbihzb3VyY2VJRCwgY2FsbGJhY2ssIGVycm9yLCBzdWNjZXNzLCBu ZXdCb2R5T3JFcnJvck1lc3NhZ2UsIGNhbGxGcmFtZXMpCisgICAgX2RpZEVkaXRTY3JpcHRTb3Vy Y2U6IGZ1bmN0aW9uKHNvdXJjZUlELCBjYWxsYmFjaywgZXJyb3IsIGVycm9yLCBuZXdCb2R5LCBj YWxsRnJhbWVzKQogICAgIHsKLSAgICAgICAgY2FsbGJhY2soc3VjY2VzcywgbmV3Qm9keU9yRXJy b3JNZXNzYWdlKTsKLSAgICAgICAgaWYgKCFzdWNjZXNzKQorICAgICAgICBjYWxsYmFjayghZXJy b3IsIGVycm9yIHx8IG5ld0JvZHkpOworICAgICAgICBpZiAoZXJyb3IpCiAgICAgICAgICAgICBy ZXR1cm47Ci0gICAgICAgIHRoaXMuX3NjcmlwdHNbc291cmNlSURdLnNvdXJjZSA9IG5ld0JvZHlP ckVycm9yTWVzc2FnZTsKKyAgICAgICAgdGhpcy5fc2NyaXB0c1tzb3VyY2VJRF0uc291cmNlID0g bmV3Qm9keTsKICAgICAgICAgaWYgKGNhbGxGcmFtZXMgJiYgY2FsbEZyYW1lcy5sZW5ndGgpIHsK ICAgICAgICAgICAgIHRoaXMuX2RlYnVnZ2VyUGF1c2VkRGV0YWlscy5jYWxsRnJhbWVzID0gY2Fs bEZyYW1lczsKICAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYklu c3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5EZWJ1Z2dlclBhdXNlZCwgdGhpcy5fZGVidWdn ZXJQYXVzZWREZXRhaWxzKTsKQEAgLTI1NCwxMiArMjU0LDEyIEBAIFdlYkluc3BlY3Rvci5EZWJ1 Z2dlckRpc3BhdGNoZXIgPSBmdW5jdGlvbihkZWJ1Z2dlck1vZGVsKQogfQogCiBXZWJJbnNwZWN0 b3IuRGVidWdnZXJEaXNwYXRjaGVyLnByb3RvdHlwZSA9IHsKLSAgICBwYXVzZWRTY3JpcHQ6IGZ1 bmN0aW9uKGRldGFpbHMpCisgICAgcGF1c2VkOiBmdW5jdGlvbihkZXRhaWxzKQogICAgIHsKICAg ICAgICAgdGhpcy5fZGVidWdnZXJNb2RlbC5fcGF1c2VkU2NyaXB0KGRldGFpbHMpOwogICAgIH0s CiAKLSAgICByZXN1bWVkU2NyaXB0OiBmdW5jdGlvbigpCisgICAgcmVzdW1lZDogZnVuY3Rpb24o KQogICAgIHsKICAgICAgICAgdGhpcy5fZGVidWdnZXJNb2RlbC5fcmVzdW1lZFNjcmlwdCgpOwog ICAgIH0sCkBAIC0yNzQsMTIgKzI3NCwxMiBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJEaXNwYXRj aGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fZGVidWdnZXJNb2RlbC5fZGVidWdnZXJX YXNEaXNhYmxlZCgpOwogICAgIH0sCiAKLSAgICBwYXJzZWRTY3JpcHRTb3VyY2U6IGZ1bmN0aW9u KHNvdXJjZUlELCBzb3VyY2VVUkwsIGxpbmVPZmZzZXQsIGNvbHVtbk9mZnNldCwgbGVuZ3RoLCBz Y3JpcHRXb3JsZFR5cGUpCisgICAgc2NyaXB0UGFyc2VkOiBmdW5jdGlvbihzb3VyY2VJRCwgc291 cmNlVVJMLCBsaW5lT2Zmc2V0LCBjb2x1bW5PZmZzZXQsIGxlbmd0aCwgc2NyaXB0V29ybGRUeXBl KQogICAgIHsKICAgICAgICAgdGhpcy5fZGVidWdnZXJNb2RlbC5fcGFyc2VkU2NyaXB0U291cmNl KHNvdXJjZUlELCBzb3VyY2VVUkwsIGxpbmVPZmZzZXQsIGNvbHVtbk9mZnNldCwgbGVuZ3RoLCBz Y3JpcHRXb3JsZFR5cGUpOwogICAgIH0sCiAKLSAgICBmYWlsZWRUb1BhcnNlU2NyaXB0U291cmNl OiBmdW5jdGlvbihzb3VyY2VVUkwsIHNvdXJjZSwgc3RhcnRpbmdMaW5lLCBlcnJvckxpbmUsIGVy cm9yTWVzc2FnZSkKKyAgICBzY3JpcHRGYWlsZWRUb1BhcnNlOiBmdW5jdGlvbihzb3VyY2VVUkws IHNvdXJjZSwgc3RhcnRpbmdMaW5lLCBlcnJvckxpbmUsIGVycm9yTWVzc2FnZSkKICAgICB7CiAg ICAgICAgIHRoaXMuX2RlYnVnZ2VyTW9kZWwuX2ZhaWxlZFRvUGFyc2VTY3JpcHRTb3VyY2Uoc291 cmNlVVJMLCBzb3VyY2UsIHN0YXJ0aW5nTGluZSwgZXJyb3JMaW5lLCBlcnJvck1lc3NhZ2UpOwog ICAgIH0sCkBAIC0yODcsMTcgKzI4Nyw1IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlckRpc3BhdGNo ZXIucHJvdG90eXBlID0gewogICAgIGJyZWFrcG9pbnRSZXNvbHZlZDogZnVuY3Rpb24oYnJlYWtw b2ludElkLCBzb3VyY2VJRCwgbGluZU51bWJlciwgY29sdW1uTnVtYmVyKQogICAgIHsKICAgICAg ICAgdGhpcy5fZGVidWdnZXJNb2RlbC5fYnJlYWtwb2ludFJlc29sdmVkKGJyZWFrcG9pbnRJZCwg c291cmNlSUQsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcik7Ci0gICAgfSwKLQotICAgIGRpZENy ZWF0ZVdvcmtlcjogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgdmFyIHdvcmtlcnNQYW5lID0g V2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzLnNpZGViYXJQYW5lcy53b3JrZXJzOwotICAgICAg ICB3b3JrZXJzUGFuZS5hZGRXb3JrZXIuYXBwbHkod29ya2Vyc1BhbmUsIGFyZ3VtZW50cyk7Ci0g ICAgfSwKLQotICAgIGRpZERlc3Ryb3lXb3JrZXI6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAg IHZhciB3b3JrZXJzUGFuZSA9IFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5zaWRlYmFyUGFu ZXMud29ya2VyczsKLSAgICAgICAgd29ya2Vyc1BhbmUucmVtb3ZlV29ya2VyLmFwcGx5KHdvcmtl cnNQYW5lLCBhcmd1bWVudHMpOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggOWU2OGQ2Mjk2ZThhYzIxYWJj Y2ZmMDdjYzdiYmZhZTk0MmM1YTkzYy4uYTFmNWVhM2RkZjZhYmZmNmE1MjZkZTk4NGNkYWM5MWI3 OGNkZjdmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRzUGFuZWwuanMKQEAgLTY4Myw3ICs2ODMsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1Bh bmVsLnByb3RvdHlwZSA9IHsKIAogICAgIF9zZXRQYXVzZU9uRXhjZXB0aW9uczogZnVuY3Rpb24o cGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSkKICAgICB7Ci0gICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNr KGVycm9yLCBwYXVzZU9uRXhjZXB0aW9uc1N0YXRlKQorICAgICAgICBmdW5jdGlvbiBjYWxsYmFj ayhlcnJvcikKICAgICAgICAgewogICAgICAgICAgICAgaWYgKGVycm9yKQogICAgICAgICAgICAg ICAgIHJldHVybjsKQEAgLTg2NCwxMSArODY0LDExIEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFu ZWwucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgdGhpcy50b2dnbGVCcmVha3BvaW50c0J1 dHRvbi50b2dnbGVkID0gIXRoaXMudG9nZ2xlQnJlYWtwb2ludHNCdXR0b24udG9nZ2xlZDsKICAg ICAgICAgaWYgKHRoaXMudG9nZ2xlQnJlYWtwb2ludHNCdXR0b24udG9nZ2xlZCkgewotICAgICAg ICAgICAgRGVidWdnZXJBZ2VudC5hY3RpdmF0ZUJyZWFrcG9pbnRzKCk7CisgICAgICAgICAgICBE ZWJ1Z2dlckFnZW50LnNldEJyZWFrcG9pbnRzQWN0aXZlKHRydWUpOwogICAgICAgICAgICAgdGhp cy50b2dnbGVCcmVha3BvaW50c0J1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygi RGVhY3RpdmF0ZSBhbGwgYnJlYWtwb2ludHMuIik7CiAgICAgICAgICAgICBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgibWFpbi1wYW5lbHMiKS5yZW1vdmVTdHlsZUNsYXNzKCJicmVha3BvaW50cy1k ZWFjdGl2YXRlZCIpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgRGVidWdnZXJBZ2Vu dC5kZWFjdGl2YXRlQnJlYWtwb2ludHMoKTsKKyAgICAgICAgICAgIERlYnVnZ2VyQWdlbnQuc2V0 QnJlYWtwb2ludHNBY3RpdmUoZmFsc2UpOwogICAgICAgICAgICAgdGhpcy50b2dnbGVCcmVha3Bv aW50c0J1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiQWN0aXZhdGUgYWxsIGJy ZWFrcG9pbnRzLiIpOwogICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm1haW4t cGFuZWxzIikuYWRkU3R5bGVDbGFzcygiYnJlYWtwb2ludHMtZGVhY3RpdmF0ZWQiKTsKICAgICAg ICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNw ZWN0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5q cwppbmRleCA4ZTI3NjcwNGJmMTBlY2Q3OGE4MDIwMTFiYzA4NWU2ZTdhNDJkZGU4Li5kOGM4ZjUx MDQ1NjViOTEwYTk5N2U5NjZhMTI5ZDY3ZDQ1MThkODI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAtMTA0OCw2ICsxMDQ4LDE4IEBA IFdlYkluc3BlY3Rvci5pbnNwZWN0ZWRVUkxDaGFuZ2VkID0gZnVuY3Rpb24odXJsKQogICAgIHRo aXMuZXh0ZW5zaW9uU2VydmVyLm5vdGlmeUluc3BlY3RlZFVSTENoYW5nZWQoKTsKIH0KIAorV2Vi SW5zcGVjdG9yLmRpZENyZWF0ZVdvcmtlciA9IGZ1bmN0aW9uKCkKK3sKKyAgICB2YXIgd29ya2Vy c1BhbmUgPSBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMuc2lkZWJhclBhbmVzLndvcmtlcnM7 CisgICAgd29ya2Vyc1BhbmUuYWRkV29ya2VyLmFwcGx5KHdvcmtlcnNQYW5lLCBhcmd1bWVudHMp OworfQorCitXZWJJbnNwZWN0b3IuZGlkRGVzdHJveVdvcmtlciA9IGZ1bmN0aW9uKCkKK3sKKyAg ICB2YXIgd29ya2Vyc1BhbmUgPSBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMuc2lkZWJhclBh bmVzLndvcmtlcnM7CisgICAgd29ya2Vyc1BhbmUucmVtb3ZlV29ya2VyLmFwcGx5KHdvcmtlcnNQ YW5lLCBhcmd1bWVudHMpOworfQorCiBXZWJJbnNwZWN0b3IubG9nID0gZnVuY3Rpb24obWVzc2Fn ZSwgbWVzc2FnZUxldmVsKQogewogICAgIC8vIHJlbWVtYmVyICd0aGlzJyBmb3Igc2V0SW50ZXJ2 YWwoKSBjYWxsYmFjawo=