72733 2011-11-18 08:48:38 -0800 Web Inspector: [protocol] actual JSON messages do not conform to Inspector.json in CSS 2011-11-22 03:15:16 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 peter.rybin apavlov apavlov bweinstein joepeck keishi loislo peter.rybin pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 505826 0 peter.rybin 2011-11-18 08:48:38 -0800 InspectorStyleSheet.cpp:141 'sourceLine' is declared 'string' but actual value is 'integer' InspectorStyleSheet.cpp:246 'styleId' property must be set unconditionally, it is not optional. InspectorStyleSheet.cpp:248-249 'witdh' and 'height' property are declared 'integer', but actual values are 'string' InspectorStyleSheet.cpp:448 warning: 'text' property is undeclared InspectorStyleSheet.cpp:499 'shorthandName' must be set unconditionally, it is not optional InspectorStyleSheet.cpp:795 'ruleId' must be set unconditionally, it is not optional (all line numbers are as in r100177) This should be fixed to conform to protocol declaration AND to prepare switching to type-safe JSON API. 506875 1 116068 apavlov 2011-11-21 04:34:57 -0800 Created attachment 116068 Patch 506932 2 116068 pfeldman 2011-11-21 07:09:26 -0800 Comment on attachment 116068 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116068&action=review > Source/WebCore/inspector/Inspector.json:1520 > + { "name": "styleId", "$ref": "CSSStyleId", "optional": true, "description": "The CSS style identifier (absent for computed styles and attribute styles)." }, You should use different structure for computed and matched styles. 506994 3 116094 apavlov 2011-11-21 08:33:11 -0800 Created attachment 116094 Patch 506995 4 webkit.review.bot 2011-11-21 08:34:33 -0800 Attachment 116094 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/insp..." exit_code: 1 Source/WebCore/inspector/InspectorCSSAgent.cpp:317: The parameter type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5] Source/WebCore/inspector/InspectorCSSAgent.h:67: The parameter type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5] Total errors found: 2 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 507485 5 116094 webkit.review.bot 2011-11-22 03:15:11 -0800 Comment on attachment 116094 Patch Clearing flags on attachment: 116094 Committed r100987: <http://trac.webkit.org/changeset/100987> 507486 6 webkit.review.bot 2011-11-22 03:15:16 -0800 All reviewed patches have been landed. Closing bug. 116068 2011-11-21 04:34:57 -0800 2011-11-21 08:33:03 -0800 Patch bug-72733-20111121163455.patch text/plain 6850 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwOTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmVhMzM5NTc3YWI3ZTIz OWZmYjYyNzUyM2U3MzM2NDk5ZGM1NDA0OC4uMmNhZDk1MjhlMjZlMzlmZWQ4ODcwYjNiZjZjNWM1 OTQzOGUzOWY3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDExLTExLTIxICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogW3Byb3RvY29sXSBhY3R1YWwgSlNPTiBtZXNzYWdlcyBkbyBub3QgY29uZm9ybSB0byBJ bnNwZWN0b3IuanNvbiBpbiBDU1MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTcyNzMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisKIDIwMTEtMTEtMTggIEFs ZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5z cGVjdG9yOiBbUHJvdG9jb2xdIFJldGFpbiBhIHNpbmdsZSB1bml2ZXJzYWwgbWV0aG9kIGZvciBs b2FkaW5nIGEgcmVxdWlyZWQgY29tYmluYXRpb24gb2YgZWxlbWVudCBzdHlsZXMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbiBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRleCBhNDNmNmMzYTEwZmE3NmJiZWUwYjI0 MDlhNjA1YmJmNWRmMDQwN2NkLi41NzUxYjA5NmRhODMzMThkZDRiNzMzOThjOTQzZDU3NGU2YTdk M2Y1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24K KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCkBAIC0xNDg1LDcg KzE0ODUsNyBAQAogICAgICAgICAgICAgICAgICJpZCI6ICJDU1NSdWxlIiwKICAgICAgICAgICAg ICAgICAidHlwZSI6ICJvYmplY3QiLAogICAgICAgICAgICAgICAgICJwcm9wZXJ0aWVzIjogWwot ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInJ1bGVJZCIsICIkcmVmIjogIkNTU1J1bGVJ ZCIsICJkZXNjcmlwdGlvbiI6ICJUaGUgQ1NTIHJ1bGUgaWRlbnRpZmllci4ifSwKKyAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJydWxlSWQiLCAiJHJlZiI6ICJDU1NSdWxlSWQiLCAib3B0 aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiVGhlIENTUyBydWxlIGlkZW50aWZpZXIgKGFi c2VudCBmb3IgdXNlciBhZ2VudCBzdHlsZXNoZWV0IGFuZCB1c2VyLXNwZWNpZmllZCBzdHlsZXNo ZWV0IHJ1bGVzKS4ifSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzZWxlY3RvclRl eHQiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiUnVsZSBzZWxlY3Rvci4ifSwK ICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzb3VyY2VVUkwiLCAidHlwZSI6ICJzdHJp bmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiUGFyZW50IHN0eWxlc2hlZXQg cmVzb3VyY2UgVVJMIChmb3IgcmVndWxhciBydWxlcykuIn0sCiAgICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAic291cmNlTGluZSIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24i OiAiTGluZSBvcmRpbmFsIG9mIHRoZSBydWxlIHNlbGVjdG9yIHN0YXJ0IGNoYXJhY3RlciBpbiB0 aGUgcmVzb3VyY2UuIn0sCkBAIC0xNTE3LDEzICsxNTE3LDEzIEBACiAgICAgICAgICAgICAgICAg ImlkIjogIkNTU1N0eWxlIiwKICAgICAgICAgICAgICAgICAidHlwZSI6ICJvYmplY3QiLAogICAg ICAgICAgICAgICAgICJwcm9wZXJ0aWVzIjogWwotICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogInN0eWxlSWQiLCAiJHJlZiI6ICJDU1NTdHlsZUlkIiwgImRlc2NyaXB0aW9uIjogIlRoZSBD U1Mgc3R5bGUgaWRlbnRpZmllci4ifSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJj c3NQcm9wZXJ0aWVzIiwgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICIkcmVmIjogIkNTU1By b3BlcnR5IiB9LCAiZGVzY3JpcHRpb24iOiAiQ1NTIHByb3BlcnRpZXMgaW4gdGhlIHN0eWxlLiJ9 LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInN0eWxlSWQiLCAiJHJlZiI6ICJDU1NT dHlsZUlkIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlRoZSBDU1Mgc3R5bGUg aWRlbnRpZmllciAoYWJzZW50IGZvciBjb21wdXRlZCBzdHlsZXMgYW5kIGF0dHJpYnV0ZSBzdHls ZXMpLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjc3NQcm9wZXJ0aWVzIiwg InR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICIkcmVmIjogIkNTU1Byb3BlcnR5IiB9LCAiZGVz Y3JpcHRpb24iOiAiQ1NTIHByb3BlcnRpZXMgaW4gdGhlIHN0eWxlLiIgfSwKICAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJzaG9ydGhhbmRFbnRyaWVzIiwgInR5cGUiOiAiYXJyYXkiLCAi aXRlbXMiOiB7ICIkcmVmIjogIlNob3J0aGFuZEVudHJ5IiB9LCAiZGVzY3JpcHRpb24iOiAiQ29t cHV0ZWQgdmFsdWVzIGZvciBhbGwgc2hvcnRoYW5kcyBmb3VuZCBpbiB0aGUgc3R5bGUuIiB9LAot ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImNzc1RleHQiLCAidHlwZSI6ICJzdHJpbmci LCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiU3R5bGUgZGVjbGFyYXRpb24gdGV4 dCAoaWYgYXZhaWxhYmxlKS4ifSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjc3NU ZXh0IiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjog IlN0eWxlIGRlY2xhcmF0aW9uIHRleHQgKGlmIGF2YWlsYWJsZSkuIiB9LAogICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogInJhbmdlIiwgIiRyZWYiOiAiU291cmNlUmFuZ2UiLCAib3B0aW9u YWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiU3R5bGUgZGVjbGFyYXRpb24gcmFuZ2UgaW4gdGhl IGVuY2xvc2luZyBzdHlsZXNoZWV0IChpZiBhdmFpbGFibGUpLiIgfSwKLSAgICAgICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJ3aWR0aCIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24i OiAiVGhlIGVmZmVjdGl2ZSBcIndpZHRoXCIgcHJvcGVydHkgdmFsdWUgZnJvbSB0aGlzIHN0eWxl LiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJoZWlnaHQiLCAidHlwZSI6ICJp bnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIlRoZSBlZmZlY3RpdmUgXCJoZWlnaHRcIiBwcm9wZXJ0 eSB2YWx1ZSBmcm9tIHRoaXMgc3R5bGUuIiB9CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAid2lkdGgiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiVGhlIGVmZmVjdGl2 ZSBcIndpZHRoXCIgcHJvcGVydHkgdmFsdWUgZnJvbSB0aGlzIHN0eWxlLiIgfSwKKyAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJoZWlnaHQiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3Jp cHRpb24iOiAiVGhlIGVmZmVjdGl2ZSBcImhlaWdodFwiIHByb3BlcnR5IHZhbHVlIGZyb20gdGhp cyBzdHlsZS4iIH0KICAgICAgICAgICAgICAgICBdLAogICAgICAgICAgICAgICAgICJkZXNjcmlw dGlvbiI6ICJDU1Mgc3R5bGUgcmVwcmVzZW50YXRpb24uIgogICAgICAgICAgICAgfSwKQEAgLTE1 MzUsOSArMTUzNSwxMCBAQAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInZhbHVlIiwg InR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlRoZSBwcm9wZXJ0eSB2YWx1ZS4iIH0s CiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicHJpb3JpdHkiLCAidHlwZSI6ICJzdHJp bmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiVGhlIHByb3BlcnR5IHByaW9y aXR5IChpbXBsaWVzIFwiXCIgaWYgYWJzZW50KS4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAiaW1wbGljaXQiLCAidHlwZSI6ICJib29sZWFuIiwgIm9wdGlvbmFsIjogdHJ1ZSwg ImRlc2NyaXB0aW9uIjogIldoZXRoZXIgdGhlIHByb3BlcnR5IGlzIGltcGxpY2l0IChpbXBsaWVz IDxjb2RlPmZhbHNlPC9jb2RlPiBpZiBhYnNlbnQpLiIgfSwKKyAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJ0ZXh0IiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRl c2NyaXB0aW9uIjogIlRoZSBmdWxsIHByb3BlcnR5IHRleHQgYXMgc3BlY2lmaWVkIGluIHRoZSBz dHlsZS4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicGFyc2VkT2siLCAidHlw ZSI6ICJib29sZWFuIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIldoZXRoZXIg dGhlIHByb3BlcnR5IGlzIHVuZGVyc3Rvb2QgYnkgdGhlIGJyb3dzZXIgKGltcGxpZXMgPGNvZGU+ dHJ1ZTwvY29kZT4gaWYgYWJzZW50KS4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAic3RhdHVzIiwgInR5cGUiOiAic3RyaW5nIiwgImVudW0iOiBbImFjdGl2ZSIsICJpbmFjdGl2 ZSIsICJkaXNhYmxlZCIsICJzdHlsZSJdLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24i OiAiVGhlIHByb3BlcnR5IHN0YXR1czogXCJhY3RpdmVcIiAoaW1wbGllZCBpZiBhYnNlbnQpIGlm IHRoZSBwcm9wZXJ0eSBpcyBlZmZlY3RpdmUgaW4gdGhlIHN0eWxlLCBcImluYWN0aXZlXCIgaWYg dGhlIHByb3BlcnR5IGlzIG92ZXJyaWRkZW4gYnkgYSBzYW1lLW5hbWVkIHByb3BlcnR5IGluIHRo aXMgc3R5bGUgbGF0ZXIgb24sIFwiZGlzYWJsZWRcIiBpZiB0aGUgcHJvcGVydHkgaXMgZGlzYWJs ZWQgYnkgdGhlIHVzZXIsIFwic3R5bGVcIiBpZiB0aGUgcHJvcGVydHkgaXMgcmVwb3J0ZWQgYnkg dGhlIGJyb3dzZXIgcmF0aGVyIHRoYW4gYnkgdGhlIENTUyBzb3VyY2UgcGFyc2VyLiIgfSwKLSAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzaG9ydGhhbmROYW1lIiwgInR5cGUiOiAic3Ry aW5nIiwgImRlc2NyaXB0aW9uIjogIlRoZSByZWxhdGVkIHNob3J0aGFuZCBwcm9wZXJ0eSBuYW1l IChhYnNlbnQgaWYgdGhpcyBwcm9wZXJ0eSBpcyBub3QgYSBsb25naGFuZCkuIiB9LAorICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogInNob3J0aGFuZE5hbWUiLCAidHlwZSI6ICJzdHJpbmci LCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiVGhlIHJlbGF0ZWQgc2hvcnRoYW5k IHByb3BlcnR5IG5hbWUgKGFic2VudCBpZiB0aGlzIHByb3BlcnR5IGlzIG5vdCBhIGxvbmdoYW5k KS4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmFuZ2UiLCAiJHJlZiI6ICJT b3VyY2VSYW5nZSIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJUaGUgZW50aXJl IHByb3BlcnR5IHJhbmdlIGluIHRoZSBlbmNsb3Npbmcgc3R5bGUgZGVjbGFyYXRpb24gKGlmIGF2 YWlsYWJsZSkuIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAgICAiZGVzY3Jp cHRpb24iOiAiQ1NTIHN0eWxlIGVmZmVjdGl2ZSB2aXN1YWwgZGltZW5zaW9ucyBhbmQgc291cmNl IG9mZnNldHMuIgpAQCAtMTU0OSw3ICsxNTUwLDcgQEAKICAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJ0ZXh0IiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIk1lZGlhIHF1 ZXJ5IHRleHQuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNvdXJjZSIsICJ0 eXBlIjogInN0cmluZyIsICJlbnVtIjogWyJtZWRpYVJ1bGUiLCAiaW1wb3J0UnVsZSIsICJzdHls ZXNoZWV0Il0sICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJTb3VyY2Ugb2YgdGhl IG1lZGlhIHF1ZXJ5OiBcIm1lZGlhUnVsZVwiIGlmIHNwZWNpZmllZCBieSBhIEBtZWRpYSBydWxl LCBcImltcG9ydFJ1bGVcIiBpZiBzcGVjaWZpZWQgYnkgYW4gQGltcG9ydCBydWxlLCBcInN0eWxl c2hlZXRcIiAoaW1wbGllZCBpZiBhYnNlbnQpIGlmIHNwZWNpZmllZCBieSBhIFwibWVkaWFcIiBh dHRyaWJ1dGUgaW4gYSBzdHlsZXNoZWV0J3MgTElOSyBvciBTVFlMRSB0YWcuIiB9LAogICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogInNvdXJjZVVSTCIsICJ0eXBlIjogInN0cmluZyIsICJv cHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJVUkwgb2YgdGhlIGRvY3VtZW50IGNvbnRh aW5pbmcgdGhlIG1lZGlhIHF1ZXJ5IGRlc2NyaXB0aW9uLiIgfSwKLSAgICAgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJzb3VyY2VMaW5lIiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjog dHJ1ZSwgImRlc2NyaXB0aW9uIjogIkxpbmUgaW4gdGhlIGRvY3VtZW50IGNvbnRhaW5pbmcgdGhl IG1lZGlhIHF1ZXJ5IChub3QgZGVmaW5lZCBmb3IgdGhlIFwic3R5bGVzaGVldFwiIHNvdXJjZSku IiB9CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic291cmNlTGluZSIsICJ0eXBlIjog ImludGVnZXIiLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiTGluZSBpbiB0aGUg ZG9jdW1lbnQgY29udGFpbmluZyB0aGUgbWVkaWEgcXVlcnkgKG5vdCBkZWZpbmVkIGZvciB0aGUg XCJzdHlsZXNoZWV0XCIgc291cmNlKS4iIH0KICAgICAgICAgICAgICAgICBdLAogICAgICAgICAg ICAgICAgICJkZXNjcmlwdGlvbiI6ICJDU1MgbWVkaWEgcXVlcnkgZGVzY3JpcHRvci4iCiAgICAg ICAgICAgICB9Cg== 116094 2011-11-21 08:33:11 -0800 2011-11-22 03:15:11 -0800 Patch bug-72733-20111121203309.patch text/plain 16165 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwOTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTM4YjU2YTgyZTkzNzQx YmY4M2M3NGZkNjViNjAwOTMyOGQ5MzdmZi4uMGNhZjA3Mjg0YWI3YzgzNGQ4NGRiNWEyMjI0NGU3 NjUwNWIyNzZhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDExLTExLTIxICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogW3Byb3RvY29sXSBhY3R1YWwgSlNPTiBtZXNzYWdlcyBkbyBub3QgY29uZm9ybSB0byBJ bnNwZWN0b3IuanNvbiBpbiBDU1MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTcyNzMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAgICogaW5zcGVj dG9yL0luc3BlY3RvckNTU0FnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNT U0FnZW50OjpnZXRDb21wdXRlZFN0eWxlRm9yTm9kZSk6CisgICAgICAgICogaW5zcGVjdG9yL0lu c3BlY3RvckNTU0FnZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hl ZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yU3R5bGU6OmJ1aWxkQXJyYXlGb3JD b21wdXRlZFN0eWxlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5o OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVsLnByb3RvdHlwZS5nZXRDb21wdXRlZFN0eWxl QXN5bmMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb24ucGFyc2VD b21wdXRlZFN0eWxlUGF5bG9hZCk6CisKIDIwMTEtMTEtMjEgIEJhbGF6cyBLZWxlbWVuICA8a2Jh bGF6c0B3ZWJraXQub3JnPgogCiAgICAgICAgIEVuYWJsZSBQYXJhbGxlbEpvYnMgYnkgZGVmYXVs dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCmluZGV4IDllOGE5NjQwNzE2 OWRmMGI5M2M3ZmJlMjkzNjk2NmI2OTUxNDc2ODcuLjAwZGFhMDhlMjk2YTAxMjc1YTI5ZjQzOWEy OTAxMjRjYTA1YmZkNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3IuanNvbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24K QEAgLTE0ODIsNyArMTQ4Miw3IEBACiAgICAgICAgICAgICAgICAgImlkIjogIkNTU1J1bGUiLAog ICAgICAgICAgICAgICAgICJ0eXBlIjogIm9iamVjdCIsCiAgICAgICAgICAgICAgICAgInByb3Bl cnRpZXMiOiBbCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicnVsZUlkIiwgIiRyZWYi OiAiQ1NTUnVsZUlkIiwgImRlc2NyaXB0aW9uIjogIlRoZSBDU1MgcnVsZSBpZGVudGlmaWVyLiJ9 LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInJ1bGVJZCIsICIkcmVmIjogIkNTU1J1 bGVJZCIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJUaGUgQ1NTIHJ1bGUgaWRl bnRpZmllciAoYWJzZW50IGZvciB1c2VyIGFnZW50IHN0eWxlc2hlZXQgYW5kIHVzZXItc3BlY2lm aWVkIHN0eWxlc2hlZXQgcnVsZXMpLiJ9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog InNlbGVjdG9yVGV4dCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJSdWxlIHNl bGVjdG9yLiJ9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNvdXJjZVVSTCIsICJ0 eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJQYXJlbnQg c3R5bGVzaGVldCByZXNvdXJjZSBVUkwgKGZvciByZWd1bGFyIHJ1bGVzKS4ifSwKICAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJzb3VyY2VMaW5lIiwgInR5cGUiOiAiaW50ZWdlciIsICJk ZXNjcmlwdGlvbiI6ICJMaW5lIG9yZGluYWwgb2YgdGhlIHJ1bGUgc2VsZWN0b3Igc3RhcnQgY2hh cmFjdGVyIGluIHRoZSByZXNvdXJjZS4ifSwKQEAgLTE1MDcsMjAgKzE1MDcsMjQgQEAKICAgICAg ICAgICAgICAgICAidHlwZSI6ICJvYmplY3QiCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAg ewotICAgICAgICAgICAgICAgICJpZCI6ICJDU1NDb21wdXRlZFN0eWxlIiwKLSAgICAgICAgICAg ICAgICAidHlwZSI6ICJvYmplY3QiCisgICAgICAgICAgICAgICAgImlkIjogIkNTU0NvbXB1dGVk U3R5bGVQcm9wZXJ0eSIsCisgICAgICAgICAgICAgICAgInR5cGUiOiAib2JqZWN0IiwKKyAgICAg ICAgICAgICAgICAicHJvcGVydGllcyI6IFsKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJuYW1lIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIkNvbXB1dGVkIHN0eWxl IHByb3BlcnR5IG5hbWUuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInZhbHVl IiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIkNvbXB1dGVkIHN0eWxlIHByb3Bl cnR5IHZhbHVlLiIgfQorICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgIH0sICAgICAgICAg ICAgCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgImlkIjogIkNTU1N0eWxlIiwKICAg ICAgICAgICAgICAgICAidHlwZSI6ICJvYmplY3QiLAogICAgICAgICAgICAgICAgICJwcm9wZXJ0 aWVzIjogWwotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInN0eWxlSWQiLCAiJHJlZiI6 ICJDU1NTdHlsZUlkIiwgImRlc2NyaXB0aW9uIjogIlRoZSBDU1Mgc3R5bGUgaWRlbnRpZmllci4i fSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjc3NQcm9wZXJ0aWVzIiwgInR5cGUi OiAiYXJyYXkiLCAiaXRlbXMiOiB7ICIkcmVmIjogIkNTU1Byb3BlcnR5IiB9LCAiZGVzY3JpcHRp b24iOiAiQ1NTIHByb3BlcnRpZXMgaW4gdGhlIHN0eWxlLiJ9LAorICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogInN0eWxlSWQiLCAiJHJlZiI6ICJDU1NTdHlsZUlkIiwgIm9wdGlvbmFsIjog dHJ1ZSwgImRlc2NyaXB0aW9uIjogIlRoZSBDU1Mgc3R5bGUgaWRlbnRpZmllciAoYWJzZW50IGZv ciBhdHRyaWJ1dGUgc3R5bGVzKS4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi Y3NzUHJvcGVydGllcyIsICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiI6ICJDU1NQ cm9wZXJ0eSIgfSwgImRlc2NyaXB0aW9uIjogIkNTUyBwcm9wZXJ0aWVzIGluIHRoZSBzdHlsZS4i IH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic2hvcnRoYW5kRW50cmllcyIsICJ0 eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiI6ICJTaG9ydGhhbmRFbnRyeSIgfSwgImRl c2NyaXB0aW9uIjogIkNvbXB1dGVkIHZhbHVlcyBmb3IgYWxsIHNob3J0aGFuZHMgZm91bmQgaW4g dGhlIHN0eWxlLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjc3NUZXh0Iiwg InR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlN0eWxl IGRlY2xhcmF0aW9uIHRleHQgKGlmIGF2YWlsYWJsZSkuIn0sCisgICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAiY3NzVGV4dCIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUs ICJkZXNjcmlwdGlvbiI6ICJTdHlsZSBkZWNsYXJhdGlvbiB0ZXh0IChpZiBhdmFpbGFibGUpLiIg fSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyYW5nZSIsICIkcmVmIjogIlNvdXJj ZVJhbmdlIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlN0eWxlIGRlY2xhcmF0 aW9uIHJhbmdlIGluIHRoZSBlbmNsb3Npbmcgc3R5bGVzaGVldCAoaWYgYXZhaWxhYmxlKS4iIH0s Ci0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAid2lkdGgiLCAidHlwZSI6ICJpbnRlZ2Vy IiwgImRlc2NyaXB0aW9uIjogIlRoZSBlZmZlY3RpdmUgXCJ3aWR0aFwiIHByb3BlcnR5IHZhbHVl IGZyb20gdGhpcyBzdHlsZS4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaGVp Z2h0IiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJUaGUgZWZmZWN0aXZlIFwi aGVpZ2h0XCIgcHJvcGVydHkgdmFsdWUgZnJvbSB0aGlzIHN0eWxlLiIgfQorICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogIndpZHRoIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9u IjogIlRoZSBlZmZlY3RpdmUgXCJ3aWR0aFwiIHByb3BlcnR5IHZhbHVlIGZyb20gdGhpcyBzdHls ZS4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaGVpZ2h0IiwgInR5cGUiOiAi c3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlRoZSBlZmZlY3RpdmUgXCJoZWlnaHRcIiBwcm9wZXJ0 eSB2YWx1ZSBmcm9tIHRoaXMgc3R5bGUuIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAg ICAgICAgICAiZGVzY3JpcHRpb24iOiAiQ1NTIHN0eWxlIHJlcHJlc2VudGF0aW9uLiIKICAgICAg ICAgICAgIH0sCkBAIC0xNTMyLDkgKzE1MzYsMTAgQEAKICAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJ2YWx1ZSIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJUaGUgcHJv cGVydHkgdmFsdWUuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInByaW9yaXR5 IiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlRo ZSBwcm9wZXJ0eSBwcmlvcml0eSAoaW1wbGllcyBcIlwiIGlmIGFic2VudCkuIiB9LAogICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogImltcGxpY2l0IiwgInR5cGUiOiAiYm9vbGVhbiIsICJv cHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJXaGV0aGVyIHRoZSBwcm9wZXJ0eSBpcyBp bXBsaWNpdCAoaW1wbGllcyA8Y29kZT5mYWxzZTwvY29kZT4gaWYgYWJzZW50KS4iIH0sCisgICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidGV4dCIsICJ0eXBlIjogInN0cmluZyIsICJvcHRp b25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJUaGUgZnVsbCBwcm9wZXJ0eSB0ZXh0IGFzIHNw ZWNpZmllZCBpbiB0aGUgc3R5bGUuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog InBhcnNlZE9rIiwgInR5cGUiOiAiYm9vbGVhbiIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlw dGlvbiI6ICJXaGV0aGVyIHRoZSBwcm9wZXJ0eSBpcyB1bmRlcnN0b29kIGJ5IHRoZSBicm93c2Vy IChpbXBsaWVzIDxjb2RlPnRydWU8L2NvZGU+IGlmIGFic2VudCkuIiB9LAogICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogInN0YXR1cyIsICJ0eXBlIjogInN0cmluZyIsICJlbnVtIjogWyJh Y3RpdmUiLCAiaW5hY3RpdmUiLCAiZGlzYWJsZWQiLCAic3R5bGUiXSwgIm9wdGlvbmFsIjogdHJ1 ZSwgImRlc2NyaXB0aW9uIjogIlRoZSBwcm9wZXJ0eSBzdGF0dXM6IFwiYWN0aXZlXCIgKGltcGxp ZWQgaWYgYWJzZW50KSBpZiB0aGUgcHJvcGVydHkgaXMgZWZmZWN0aXZlIGluIHRoZSBzdHlsZSwg XCJpbmFjdGl2ZVwiIGlmIHRoZSBwcm9wZXJ0eSBpcyBvdmVycmlkZGVuIGJ5IGEgc2FtZS1uYW1l ZCBwcm9wZXJ0eSBpbiB0aGlzIHN0eWxlIGxhdGVyIG9uLCBcImRpc2FibGVkXCIgaWYgdGhlIHBy b3BlcnR5IGlzIGRpc2FibGVkIGJ5IHRoZSB1c2VyLCBcInN0eWxlXCIgaWYgdGhlIHByb3BlcnR5 IGlzIHJlcG9ydGVkIGJ5IHRoZSBicm93c2VyIHJhdGhlciB0aGFuIGJ5IHRoZSBDU1Mgc291cmNl IHBhcnNlci4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic2hvcnRoYW5kTmFt ZSIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJUaGUgcmVsYXRlZCBzaG9ydGhh bmQgcHJvcGVydHkgbmFtZSAoYWJzZW50IGlmIHRoaXMgcHJvcGVydHkgaXMgbm90IGEgbG9uZ2hh bmQpLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzaG9ydGhhbmROYW1lIiwg InR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlRoZSBy ZWxhdGVkIHNob3J0aGFuZCBwcm9wZXJ0eSBuYW1lIChhYnNlbnQgaWYgdGhpcyBwcm9wZXJ0eSBp cyBub3QgYSBsb25naGFuZCkuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInJh bmdlIiwgIiRyZWYiOiAiU291cmNlUmFuZ2UiLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRp b24iOiAiVGhlIGVudGlyZSBwcm9wZXJ0eSByYW5nZSBpbiB0aGUgZW5jbG9zaW5nIHN0eWxlIGRl Y2xhcmF0aW9uIChpZiBhdmFpbGFibGUpLiIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAg ICAgICAgICAgImRlc2NyaXB0aW9uIjogIkNTUyBzdHlsZSBlZmZlY3RpdmUgdmlzdWFsIGRpbWVu c2lvbnMgYW5kIHNvdXJjZSBvZmZzZXRzLiIKQEAgLTE1NDYsNyArMTU1MSw3IEBACiAgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAidGV4dCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlw dGlvbiI6ICJNZWRpYSBxdWVyeSB0ZXh0LiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJzb3VyY2UiLCAidHlwZSI6ICJzdHJpbmciLCAiZW51bSI6IFsibWVkaWFSdWxlIiwgImlt cG9ydFJ1bGUiLCAic3R5bGVzaGVldCJdLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24i OiAiU291cmNlIG9mIHRoZSBtZWRpYSBxdWVyeTogXCJtZWRpYVJ1bGVcIiBpZiBzcGVjaWZpZWQg YnkgYSBAbWVkaWEgcnVsZSwgXCJpbXBvcnRSdWxlXCIgaWYgc3BlY2lmaWVkIGJ5IGFuIEBpbXBv cnQgcnVsZSwgXCJzdHlsZXNoZWV0XCIgKGltcGxpZWQgaWYgYWJzZW50KSBpZiBzcGVjaWZpZWQg YnkgYSBcIm1lZGlhXCIgYXR0cmlidXRlIGluIGEgc3R5bGVzaGVldCdzIExJTksgb3IgU1RZTEUg dGFnLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzb3VyY2VVUkwiLCAidHlw ZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiVVJMIG9mIHRo ZSBkb2N1bWVudCBjb250YWluaW5nIHRoZSBtZWRpYSBxdWVyeSBkZXNjcmlwdGlvbi4iIH0sCi0g ICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic291cmNlTGluZSIsICJ0eXBlIjogInN0cmlu ZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJMaW5lIGluIHRoZSBkb2N1bWVu dCBjb250YWluaW5nIHRoZSBtZWRpYSBxdWVyeSAobm90IGRlZmluZWQgZm9yIHRoZSBcInN0eWxl c2hlZXRcIiBzb3VyY2UpLiIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNvdXJj ZUxpbmUiLCAidHlwZSI6ICJpbnRlZ2VyIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9u IjogIkxpbmUgaW4gdGhlIGRvY3VtZW50IGNvbnRhaW5pbmcgdGhlIG1lZGlhIHF1ZXJ5IChub3Qg ZGVmaW5lZCBmb3IgdGhlIFwic3R5bGVzaGVldFwiIHNvdXJjZSkuIiB9CiAgICAgICAgICAgICAg ICAgXSwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiQ1NTIG1lZGlhIHF1ZXJ5IGRl c2NyaXB0b3IuIgogICAgICAgICAgICAgfQpAQCAtMTU4NSw3ICsxNTkwLDcgQEAKICAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJmb3JjZWRQc2V1ZG9DbGFzc2VzIiwgInR5cGUiOiAiYXJy YXkiLCAiaXRlbXMiOiB7ICJ0eXBlIjogInN0cmluZyIsICJlbnVtIjogWyJhY3RpdmUiLCAiZm9j dXMiLCAiaG92ZXIiLCAidmlzaXRlZCJdIH0sICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlv biI6ICJFbGVtZW50IHBzZXVkbyBjbGFzc2VzIHRvIGZvcmNlIHdoZW4gY29tcHV0aW5nIGFwcGxp Y2FibGUgc3R5bGUgcnVsZXMuIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAg ICAicmV0dXJucyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzdHlsZSIsICIk cmVmIjogIkNTU0NvbXB1dGVkU3R5bGUiLCAiZGVzY3JpcHRpb24iOiAiQ29tcHV0ZWQgc3R5bGUg Zm9yIHRoZSBzcGVjaWZpZWQgRE9NIG5vZGUuIiB9CisgICAgICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAiY29tcHV0ZWRTdHlsZSIsICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiI6 ICJDU1NDb21wdXRlZFN0eWxlUHJvcGVydHkiIH0sICJkZXNjcmlwdGlvbiI6ICJDb21wdXRlZCBz dHlsZSBmb3IgdGhlIHNwZWNpZmllZCBET00gbm9kZS4iIH0KICAgICAgICAgICAgICAgICBdLAog ICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJSZXR1cm5zIHRoZSBjb21wdXRlZCBzdHls ZSBmb3IgYSBET00gbm9kZSBpZGVudGlmaWVkIGJ5IDxjb2RlPm5vZGVJZDwvY29kZT4uIgogICAg ICAgICAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JDU1NBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdl bnQuY3BwCmluZGV4IGM1ZjQ1YTM5MjA4MzAxNTJjZjg4YWU2MzM5MzI3Mjc4ZGJlM2RmZWMuLjA4 NWFlM2MxY2RmMjVkYmUwMTViNjRmY2JmMzVlMDI3OGE1OGU2MDkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcApAQCAtMzE0LDcgKzMxNCw3IEBA IHZvaWQgSW5zcGVjdG9yQ1NTQWdlbnQ6OmdldElubGluZVN0eWxlc0Zvck5vZGUoRXJyb3JTdHJp bmcqIGVycm9yU3RyaW5nLCBpbnQgbm9kCiAgICAgKmF0dHJpYnV0ZXMgPSBidWlsZEFycmF5Rm9y QXR0cmlidXRlU3R5bGVzKGVsZW1lbnQpOwogfQogCi12b2lkIEluc3BlY3RvckNTU0FnZW50Ojpn ZXRDb21wdXRlZFN0eWxlRm9yTm9kZShFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGludCBub2Rl SWQsIGNvbnN0IFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qIGZvcmNlZFBzZXVkb0NsYXNzZXMsIFJl ZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiBzdHlsZSkKK3ZvaWQgSW5zcGVjdG9yQ1NTQWdlbnQ6Omdl dENvbXB1dGVkU3R5bGVGb3JOb2RlKEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgaW50IG5vZGVJ ZCwgY29uc3QgUmVmUHRyPEluc3BlY3RvckFycmF5PiogZm9yY2VkUHNldWRvQ2xhc3NlcywgUmVm UHRyPEluc3BlY3RvckFycmF5Piogc3R5bGUpCiB7CiAgICAgRWxlbWVudCogZWxlbWVudCA9IGVs ZW1lbnRGb3JJZChlcnJvclN0cmluZywgbm9kZUlkKTsKICAgICBpZiAoIWVsZW1lbnQpCkBAIC0z MjQsNyArMzI0LDcgQEAgdm9pZCBJbnNwZWN0b3JDU1NBZ2VudDo6Z2V0Q29tcHV0ZWRTdHlsZUZv ck5vZGUoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBpbnQgbm8KIAogICAgIFJlZlB0cjxDU1ND b21wdXRlZFN0eWxlRGVjbGFyYXRpb24+IGNvbXB1dGVkU3R5bGVJbmZvID0gY29tcHV0ZWRTdHls ZShlbGVtZW50LCB0cnVlKTsKICAgICBSZWZQdHI8SW5zcGVjdG9yU3R5bGU+IGluc3BlY3RvclN0 eWxlID0gSW5zcGVjdG9yU3R5bGU6OmNyZWF0ZShJbnNwZWN0b3JDU1NJZCgpLCBjb21wdXRlZFN0 eWxlSW5mbywgMCk7Ci0gICAgKnN0eWxlID0gaW5zcGVjdG9yU3R5bGUtPmJ1aWxkT2JqZWN0Rm9y U3R5bGUoKTsKKyAgICAqc3R5bGUgPSBpbnNwZWN0b3JTdHlsZS0+YnVpbGRBcnJheUZvckNvbXB1 dGVkU3R5bGUoKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JDU1NBZ2VudDo6Z2V0QWxsU3R5bGVTaGVl dHMoRXJyb3JTdHJpbmcqLCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiBzdHlsZUluZm9zKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmggYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuaAppbmRleCA2YzY3YWYw M2VlZWVhMGFmYTNjOTU4NGVjODNmOTEwMzA3ZjkzMTVmLi45MDY1YjY0YWY0ZGY1NzAzMTRmOTJh ZmJlNmUxNTNiZjdkMzM0ZDY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yQ1NTQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yQ1NTQWdlbnQuaApAQCAtNjQsNyArNjQsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBjbGVhckZy b250ZW5kKCk7CiAgICAgdm9pZCByZXNldCgpOwogCi0gICAgdm9pZCBnZXRDb21wdXRlZFN0eWxl Rm9yTm9kZShFcnJvclN0cmluZyosIGludCBub2RlSWQsIGNvbnN0IFJlZlB0cjxJbnNwZWN0b3JB cnJheT4qIGZvcmNlZFBzZXVkb0NsYXNzZXMsIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiBzdHls ZSk7CisgICAgdm9pZCBnZXRDb21wdXRlZFN0eWxlRm9yTm9kZShFcnJvclN0cmluZyosIGludCBu b2RlSWQsIGNvbnN0IFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qIGZvcmNlZFBzZXVkb0NsYXNzZXMs IFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qIHN0eWxlKTsKICAgICB2b2lkIGdldElubGluZVN0eWxl c0Zvck5vZGUoRXJyb3JTdHJpbmcqLCBpbnQgbm9kZUlkLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0 PiogaW5saW5lU3R5bGUsIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qIGF0dHJpYnV0ZXMpOwogICAg IHZvaWQgZ2V0TWF0Y2hlZFN0eWxlc0Zvck5vZGUoRXJyb3JTdHJpbmcqLCBpbnQgbm9kZUlkLCBj b25zdCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiBmb3JjZWRQc2V1ZG9DbGFzc2VzLCBib29sKiBp bmNsdWRlUHNldWRvLCBib29sKiBpbmNsdWRlSW5oZXJpdGVkLCBSZWZQdHI8SW5zcGVjdG9yQXJy YXk+KiBtYXRjaGVkQ1NTUnVsZXMsIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qIHBzZXVkb0lkUnVs ZXMsIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qIGluaGVyaXRlZEVudHJpZXMpOwogICAgIHZvaWQg Z2V0QWxsU3R5bGVTaGVldHMoRXJyb3JTdHJpbmcqLCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiBz dHlsZVNoZWV0SW5mb3MpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclN0eWxlU2hlZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv clN0eWxlU2hlZXQuY3BwCmluZGV4IDg0ZmM3YjY4MWY1NjA5NmQ2NTYwM2RlYTkwNDhiYzE1ZWIx YzAyMzkuLjRjNWQwODdlNjAzNGY2ZTRjNzU5NmMyYTY2NWU3YjYxMTg4N2RmNmIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5jcHAKQEAgLTI1 Nyw2ICsyNTcsMjMgQEAgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IEluc3BlY3RvclN0eWxl OjpidWlsZE9iamVjdEZvclN0eWxlKCkgY29uc3QKICAgICByZXR1cm4gcmVzdWx0LnJlbGVhc2Uo KTsKIH0KIAorUGFzc1JlZlB0cjxJbnNwZWN0b3JBcnJheT4gSW5zcGVjdG9yU3R5bGU6OmJ1aWxk QXJyYXlGb3JDb21wdXRlZFN0eWxlKCkgY29uc3QKK3sKKyAgICBSZWZQdHI8SW5zcGVjdG9yQXJy YXk+IHJlc3VsdCA9IEluc3BlY3RvckFycmF5OjpjcmVhdGUoKTsKKyAgICBWZWN0b3I8SW5zcGVj dG9yU3R5bGVQcm9wZXJ0eT4gcHJvcGVydGllczsKKyAgICBwb3B1bGF0ZUFsbFByb3BlcnRpZXMo JnByb3BlcnRpZXMpOworCisgICAgZm9yIChWZWN0b3I8SW5zcGVjdG9yU3R5bGVQcm9wZXJ0eT46 Oml0ZXJhdG9yIGl0ID0gcHJvcGVydGllcy5iZWdpbigpLCBpdEVuZCA9IHByb3BlcnRpZXMuZW5k KCk7IGl0ICE9IGl0RW5kOyArK2l0KSB7CisgICAgICAgIGNvbnN0IENTU1Byb3BlcnR5U291cmNl RGF0YSYgcHJvcGVydHlFbnRyeSA9IGl0LT5zb3VyY2VEYXRhOworICAgICAgICBSZWZQdHI8SW5z cGVjdG9yT2JqZWN0PiBlbnRyeSA9IEluc3BlY3Rvck9iamVjdDo6Y3JlYXRlKCk7CisgICAgICAg IGVudHJ5LT5zZXRTdHJpbmcoIm5hbWUiLCBwcm9wZXJ0eUVudHJ5Lm5hbWUpOworICAgICAgICBl bnRyeS0+c2V0U3RyaW5nKCJ2YWx1ZSIsIHByb3BlcnR5RW50cnkudmFsdWUpOworICAgICAgICBy ZXN1bHQtPnB1c2hPYmplY3QoZW50cnkpOworICAgIH0KKworICAgIHJldHVybiByZXN1bHQucmVs ZWFzZSgpOworfQorCiAvLyBUaGlzIG1ldGhvZCBkb2VzIHRoZSBmb2xsb3dpbmcgcHJlcHJvY2Vz c2luZyBvZiB8cHJvcGVydHlUZXh0fCB3aXRoIHxvdmVyd3JpdGV8ID09IGZhbHNlIGFuZCB8aW5k ZXh8IHBhc3QgdGhlIGxhc3QgYWN0aXZlIHByb3BlcnR5OgogLy8gLSBJZiB0aGUgbGFzdCBwcm9w ZXJ0eSAoaWYgcHJlc2VudCkgaGFzIG5vIGNsb3NpbmcgIjsiLCB0aGUgIjsiIGlzIHByZXBlbmRl ZCB0byB0aGUgY3VycmVudCB8cHJvcGVydHlUZXh0fCB2YWx1ZS4KIC8vIC0gQSBoZXVyaXN0aWMg Zm9ybWF0dGluZyBpcyBhdHRlbXB0ZWQgdG8gcmV0YWluIHRoZSBzdHlsZSBzdHJ1Y3R1cmUuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5o IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuaAppbmRleCBi ZWU0ZDk5NDkwODU5ZDBkYmIyNGIwZmUyYmY0MjQyZjc4ZjQwNjUyLi5hZjk2YzkzMmJiZDUyMmZj MDJjOWZiNmQ2YTA3ZmQxOWU0ODk0ZThkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JTdHlsZVNoZWV0LmgKQEAgLTEyOSw2ICsxMjksNyBAQCBwdWJsaWM6CiAKICAg ICBDU1NTdHlsZURlY2xhcmF0aW9uKiBjc3NTdHlsZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3R5bGUu Z2V0KCk7IH0KICAgICBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gYnVpbGRPYmplY3RGb3JT dHlsZSgpIGNvbnN0OworICAgIFBhc3NSZWZQdHI8SW5zcGVjdG9yQXJyYXk+IGJ1aWxkQXJyYXlG b3JDb21wdXRlZFN0eWxlKCkgY29uc3Q7CiAgICAgYm9vbCBoYXNEaXNhYmxlZFByb3BlcnRpZXMo KSBjb25zdCB7IHJldHVybiAhbV9kaXNhYmxlZFByb3BlcnRpZXMuaXNFbXB0eSgpOyB9CiAgICAg Ym9vbCBzZXRQcm9wZXJ0eVRleHQoRXJyb3JTdHJpbmcqLCB1bnNpZ25lZCBpbmRleCwgY29uc3Qg U3RyaW5nJiB0ZXh0LCBib29sIG92ZXJ3cml0ZSk7CiAgICAgYm9vbCB0b2dnbGVQcm9wZXJ0eShF cnJvclN0cmluZyosIHVuc2lnbmVkIGluZGV4LCBib29sIGRpc2FibGUpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCmluZGV4IDhl MWIyMzc4ODdjZmI1YmEwZWMyZGZkNjBiOGMwN2QxMWJlZjdiOWUuLjYyZDhlNGEzMThmNjQxY2Yw Mjg3NmNmMmMwOThlYjdjNzFhYjRkNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanMKQEAgLTEyMSw3ICsxMjEsNyBAQCBXZWJJ bnNwZWN0b3IuQ1NTU3R5bGVNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBpZiAoZXJy b3IgfHwgIWNvbXB1dGVkUGF5bG9hZCkKICAgICAgICAgICAgICAgICB1c2VyQ2FsbGJhY2sobnVs bCk7CiAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgdXNlckNhbGxiYWNrKFdlYklu c3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uLnBhcnNlUGF5bG9hZChjb21wdXRlZFBheWxvYWQp KTsKKyAgICAgICAgICAgICAgICB1c2VyQ2FsbGJhY2soV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVj bGFyYXRpb24ucGFyc2VDb21wdXRlZFN0eWxlUGF5bG9hZChjb21wdXRlZFBheWxvYWQpKTsKICAg ICAgICAgfQogCiAgICAgICAgIENTU0FnZW50LmdldENvbXB1dGVkU3R5bGVGb3JOb2RlKG5vZGVJ ZCwgZm9yY2VkUHNldWRvQ2xhc3NlcyB8fCBbXSwgY2FsbGJhY2suYmluZChudWxsLCB1c2VyQ2Fs bGJhY2spKTsKQEAgLTM0OSw2ICszNDksMTUgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFy YXRpb24ucGFyc2VQYXlsb2FkID0gZnVuY3Rpb24ocGF5bG9hZCkKICAgICByZXR1cm4gbmV3IFdl Ykluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uKHBheWxvYWQpOwogfQogCitXZWJJbnNwZWN0 b3IuQ1NTU3R5bGVEZWNsYXJhdGlvbi5wYXJzZUNvbXB1dGVkU3R5bGVQYXlsb2FkID0gZnVuY3Rp b24ocGF5bG9hZCkKK3sKKyAgICB2YXIgbmV3UGF5bG9hZCA9IHsgY3NzUHJvcGVydGllczogW10s IHNob3J0aGFuZEVudHJpZXM6IFtdLCB3aWR0aDogIiIsIGhlaWdodDogIiIgfTsKKyAgICBpZiAo cGF5bG9hZCkKKyAgICAgICAgbmV3UGF5bG9hZC5jc3NQcm9wZXJ0aWVzID0gcGF5bG9hZDsKKwor ICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb24obmV3UGF5bG9h ZCk7Cit9CisKIFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uLnByb3RvdHlwZSA9IHsK ICAgICBnZXQgYWxsUHJvcGVydGllcygpCiAgICAgewpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGRmZGEyOWY0ZmM4ZGE3MGUy ZmQyZjk5M2UyZjlhZDZkMzhhOTBiMmEuLmJjZjNiMTNkZTc2MzBhMjVhZjViZjBlNzYyNzBkNDhh MTY4YzBhZTIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxMS0xMS0yMSAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtw cm90b2NvbF0gYWN0dWFsIEpTT04gbWVzc2FnZXMgZG8gbm90IGNvbmZvcm0gdG8gSW5zcGVjdG9y Lmpzb24gaW4gQ1NTCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD03MjczMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogaW5zcGVjdG9yL3N0eWxlcy9zdHlsZXMtbmV3LUFQSS5odG1sOgorCiAyMDExLTExLTIx ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KIAogICAgICAgICBOb3QgcmV2 aWV3ZWQ6IHVwZGF0aW5nIGV4cGVjdGF0aW9ucyBmb3IgdGhlIGluc3BlY3RvciBjb25zb2xlIHRl c3QgKFF0IC0+IGFsbCkuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVz L3N0eWxlcy1uZXctQVBJLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL3N0eWxl cy1uZXctQVBJLmh0bWwKaW5kZXggZjAxZmU0MGE3YzlhYjE2YTgwNzI1ZjhjYzRiOTgyNWY2YWEx ZDJjZi4uODg1MmNhY2NlYmQwYmE3OWIzYjExOGExNWNkYzEzZjRhYmFkMjQ2ZiAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9zdHlsZXMtbmV3LUFQSS5odG1sCisrKyBi L0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvc3R5bGVzLW5ldy1BUEkuaHRtbApAQCAtMjAs NyArMjAsNyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgewogICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5hZGRSZXN1bHQoIiIpOwogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1 bHQoIj09PSBDb21wdXRlZCBzdHlsZSBwcm9wZXJ0eSBjb3VudCBmb3IgYm9keSA9PT0iKTsKLSAg ICAgICAgICAgIHZhciBwcm9wQ291bnQgPSBzdHlsZXMuY29tcHV0ZWRTdHlsZS5jc3NQcm9wZXJ0 aWVzLmxlbmd0aDsKKyAgICAgICAgICAgIHZhciBwcm9wQ291bnQgPSBzdHlsZXMuY29tcHV0ZWRT dHlsZS5sZW5ndGg7CiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdChwcm9wQ291 bnQgPiAyMDAgPyAiT0siIDogIkZBSUwgKCIgKyBwcm9wQ291bnQgKyAiKSIpOwogCiAgICAgICAg ICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiIik7Cg==