68530 2011-09-21 07:03:28 -0700 Web Inspector: introduce Page.enable and Page.disable 2011-09-21 09:12:58 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 470767 0 pfeldman 2011-09-21 07:03:28 -0700 Patch to follow. 470770 1 108151 pfeldman 2011-09-21 07:05:23 -0700 Created attachment 108151 Patch 470844 2 108151 yurys 2011-09-21 09:01:07 -0700 Comment on attachment 108151 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=108151&action=review > Source/WebCore/ChangeLog:5 > + Is it possible to describe this change in a few words here? > Source/WebCore/inspector/Inspector.json:147 > + { "name": "newWindow", "optional": true, "type": "boolean", "description": "If true, opens given URL in a new window or tab.", "hidden": true } Let's remove this method altogether since the same effect can be reached using the evaluate() command and there is no much sense in having a dedicated command for this functionality. > Source/WebCore/inspector/Inspector.json:548 > + "description": "Always send extra HTTP headers with the requests from this page.", style: should be something like "Specifies whether to always send..." for consistency with other descriptions. > Source/WebCore/inspector/InspectorController.cpp:355 > + m_pageAgent->restore(); Shouldn't this call go before m_domAgent->restore? 470854 3 pfeldman 2011-09-21 09:12:58 -0700 Committed r95636: <http://trac.webkit.org/changeset/95636> 108151 2011-09-21 07:05:23 -0700 2011-09-21 09:01:07 -0700 Patch bug-68530-20110921180521.patch text/plain 24077 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTU2MjIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxZjNjYzc4YThkNTZhMzk5 ZDdkNWY3YWI5ZWNhNWExMWYzNjJjYTg0Li5lNmQ3NjA4OWM5OGFiZTgzOTJiOWQ5MjliNzI1NzNi OTBlNGU1ZGZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTQgQEAKIDIwMTEtMDktMjEgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IGludHJvZHVjZSBQYWdlLmVuYWJsZSBhbmQgUGFnZS5kaXNhYmxlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODUzMAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5qc29u OgorCisyMDExLTA5LTIxICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKwog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBwYWludCBib3ggbW9kZWwgY29sb3JzIGluIE1ldHJpY3Mg c2lkZWJhciBhdCBhbGwgdGltZXMsIGRvIG5vdCBkcmF3IGJveCBvdXRsaW5lcy4KICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MjQwCiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbiBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRleCBmYTc5ODkyZWMxNDA5NWI2MjBkYTlm NjQwMWQ5YjA2Yjg0NzIzZmM5Li5hYmJhYTNjN2YzYTVkOTdjOTg2YjdjMTVkMzM2NDg2OTc2Mjhm NTIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24K KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCkBAIC0xMTUsNiAr MTE1LDE0IEBACiAgICAgICAgIF0sCiAgICAgICAgICJjb21tYW5kcyI6IFsKICAgICAgICAgICAg IHsKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJlbmFibGUiLAorICAgICAgICAgICAgICAgICJk ZXNjcmlwdGlvbiI6ICJFbmFibGVzIHBhZ2UgZG9tYWluIG5vdGlmaWNhdGlvbnMuIgorICAgICAg ICAgICAgfSwKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJkaXNhYmxl IiwKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRGlzYWJsZXMgcGFnZSBkb21haW4g bm90aWZpY2F0aW9ucy4iCisgICAgICAgICAgICB9LAorICAgICAgICAgICAgewogICAgICAgICAg ICAgICAgICJuYW1lIjogImFkZFNjcmlwdFRvRXZhbHVhdGVPbkxvYWQiLAogICAgICAgICAgICAg ICAgICJwYXJhbWV0ZXJzIjogWwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNjcmlw dFNvdXJjZSIsICJ0eXBlIjogInN0cmluZyIgfQpAQCAtMTM2LDcgKzE0NCw3IEBACiAgICAgICAg ICAgICAgICAgIm5hbWUiOiAib3BlbiIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBb CiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidXJsIiwgInR5cGUiOiAic3RyaW5nIiwg ImRlc2NyaXB0aW9uIjogIlVSTCB0byBvcGVuLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJuZXdXaW5kb3ciLCAib3B0aW9uYWwiOiB0cnVlLCAidHlwZSI6ICJib29sZWFuIiwg ImRlc2NyaXB0aW9uIjogIklmIFRydWUsIG9wZW5zIGdpdmVuIFVSTCBpbiBhIG5ldyB3aW5kb3cg b3IgdGFiLiIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm5ld1dpbmRvdyIsICJv cHRpb25hbCI6IHRydWUsICJ0eXBlIjogImJvb2xlYW4iLCAiZGVzY3JpcHRpb24iOiAiSWYgdHJ1 ZSwgb3BlbnMgZ2l2ZW4gVVJMIGluIGEgbmV3IHdpbmRvdyBvciB0YWIuIiwgImhpZGRlbiI6IHRy dWUgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjog Ik9wZW5zIGdpdmVuIFVSTCBlaXRoZXIgaW4gdGhlIGluc3BlY3RlZCBwYWdlIG9yIGluIGEgbmV3 IHRhYiAvIHdpbmRvdy4iCiAgICAgICAgICAgICB9LApAQCAtMjI3LDcgKzIzNSw3IEBACiAgICAg fSwKICAgICB7CiAgICAgICAgICJkb21haW4iOiAiUnVudGltZSIsCi0gICAgICAgICJkZXNjcmlw dGlvbiI6ICJSdW50aW1lIGRvbWFpbiBleHBvc2VzIEphdmFTY3JpcHQgcnVudGltZSBieSBtZWFu cyBvZiByZW1vdGUgZXZhbHVhdGlvbiBhbmQgbWlycm9yIG9iamVjdHMuIEV2YWx1YXRpb24gcmVz dWx0cyBhcmUgcmV0dXJuZWQgYXMgbWlycm9yIG9iamVjdCB0aGF0IGV4cG9zZSB0eXBlLCBzdHJp bmcgcmVwcmVzZW50YXRpb24gYW5kIHVuaXF1ZSBpZGVudGlmaWVyIHRoYXQgY2FuIGJlIHVzZWQg Zm9yIGZ1cnRoZXIgb2JqZWN0IGludGVyYWN0aW9uLiBPcmlnaW5hbCBvYmplY3RzIGFyZSBtYWlu dGFpbmVkIGluIG1lbW9yeSB1bmxlc3MgdGhleSBhcmUgZWl0aGVyIGV4cGxpY2l0bHkgcmVsZWFz ZWQgb3IgYXJlIHJlbGVhc2VkIGFsb25nIHdpdGggdGhlIG90aGVyIG9iamVjdHMgaW4gdGhlaXIg b2JqZWN0IGdyb3VwLiIsCisgICAgICAgICJkZXNjcmlwdGlvbiI6ICJSdW50aW1lIGRvbWFpbiBl eHBvc2VzIEphdmFTY3JpcHQgcnVudGltZSBieSBtZWFucyBvZiByZW1vdGUgZXZhbHVhdGlvbiBh bmQgbWlycm9yIG9iamVjdHMuIEV2YWx1YXRpb24gcmVzdWx0cyBhcmUgcmV0dXJuZWQgYXMgbWly cm9yIG9iamVjdCB0aGF0IGV4cG9zZSBvYmplY3QgdHlwZSwgc3RyaW5nIHJlcHJlc2VudGF0aW9u IGFuZCB1bmlxdWUgaWRlbnRpZmllciB0aGF0IGNhbiBiZSB1c2VkIGZvciBmdXJ0aGVyIG9iamVj dCByZWZlcmVuY2UuIE9yaWdpbmFsIG9iamVjdHMgYXJlIG1haW50YWluZWQgaW4gbWVtb3J5IHVu bGVzcyB0aGV5IGFyZSBlaXRoZXIgZXhwbGljaXRseSByZWxlYXNlZCBvciBhcmUgcmVsZWFzZWQg YWxvbmcgd2l0aCB0aGUgb3RoZXIgb2JqZWN0cyBpbiB0aGVpciBvYmplY3QgZ3JvdXAuIiwKICAg ICAgICAgInR5cGVzIjogWwogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICJpZCI6ICJS ZW1vdGVPYmplY3RJZCIsCkBAIC0zMDEsNyArMzA5LDcgQEAKICAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJyZXN1bHQiLCAiJHJlZiI6ICJSZW1vdGVPYmplY3QiLCAiZGVzY3JpcHRpb24i OiAiQ2FsbCByZXN1bHQuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIndhc1Ro cm93biIsICJ0eXBlIjogImJvb2xlYW4iLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24i OiAiVHJ1ZSBpZiB0aGUgcmVzdWx0IHdhcyB0aHJvd24gZHVyaW5nIHRoZSBldmFsdWF0aW9uLiIg fQogICAgICAgICAgICAgICAgIF0sCi0gICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkNh bGxzIGZ1bmN0aW9uIHdpdGggZ2l2ZW4gZGVjbGFyYXRpb24gb24gdGhlIGdpdmVuIG9iamVjdC4i CisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkNhbGxzIGZ1bmN0aW9uIHdpdGggZ2l2 ZW4gZGVjbGFyYXRpb24gb24gdGhlIGdpdmVuIG9iamVjdC4gT2JqZWN0IGdyb3VwIG9mIHRoZSBy ZXN1bHQgaXMgaW5oZXJpdGVkIGZyb20gdGhlIHRhcmdldCBvYmplY3QuIgogICAgICAgICAgICAg fSwKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAibmFtZSI6ICJnZXRQcm9wZXJ0aWVz IiwKQEAgLTMxMiw3ICszMjAsNyBAQAogICAgICAgICAgICAgICAgICJyZXR1cm5zIjogWwogICAg ICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInJlc3VsdCIsICJ0eXBlIjogImFycmF5IiwgIml0 ZW1zIjogeyAiJHJlZiI6ICJQcm9wZXJ0eURlc2NyaXB0b3IifSwgImRlc2NyaXB0aW9uIjogIk9i amVjdCBwcm9wZXJ0aWVzLiIgfQogICAgICAgICAgICAgICAgIF0sCi0gICAgICAgICAgICAgICAg ImRlc2NyaXB0aW9uIjogIlJldHVybnMgcHJvcGVydGllcyBvZiBhIGdpdmVuIG9iamVjdC4iCisg ICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIlJldHVybnMgcHJvcGVydGllcyBvZiBhIGdp dmVuIG9iamVjdC4gT2JqZWN0IGdyb3VwIG9mIHRoZSByZXN1bHQgaXMgaW5oZXJpdGVkIGZyb20g dGhlIHRhcmdldCBvYmplY3QuIgogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHsKICAgICAg ICAgICAgICAgICAibmFtZSI6ICJyZWxlYXNlT2JqZWN0IiwKQEAgLTQzOCw2ICs0NDYsMTYgQEAK ICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiVW5pcXVlIHJlcXVlc3QgaWRlbnRpZmll ci4iCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICJpZCI6 ICJUaW1lc3RhbXAiLAorICAgICAgICAgICAgICAgICJ0eXBlIjogIm51bWJlciIsCisgICAgICAg ICAgICAgICAgImRlc2NyaXB0aW9uIjogIk51bWJlciBvZiBzZWNvbmRzIHNpbmNlIGVwb2NoLiIK KyAgICAgICAgICAgIH0sCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgImlkIjogIkhl YWRlcnMiLAorICAgICAgICAgICAgICAgICJ0eXBlIjogIm9iamVjdCIsCisgICAgICAgICAgICAg ICAgImRlc2NyaXB0aW9uIjogIlJlcXVlc3QgLyByZXNwb25zZSBoZWFkZXJzIGFzIGtleXMgLyB2 YWx1ZXMgb2YgSlNPTiBvYmplY3QuIgorICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIHsKICAg ICAgICAgICAgICAgICAiaWQiOiAiUmVzb3VyY2VUaW1pbmciLAogICAgICAgICAgICAgICAgICJ0 eXBlIjogIm9iamVjdCIsCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIlRpbWluZyBp bmZvcm1hdGlvbiBmb3IgdGhlIHJlcXVlc3QuIiwKQEAgLTQ2Myw3ICs0ODEsNyBAQAogICAgICAg ICAgICAgICAgICJwcm9wZXJ0aWVzIjogWwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog InVybCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJSZXF1ZXN0IFVSTC4iIH0s CiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibWV0aG9kIiwgInR5cGUiOiAic3RyaW5n IiwgImRlc2NyaXB0aW9uIjogIkhUVFAgcmVxdWVzdCBtZXRob2QuIiB9LAotICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogImhlYWRlcnMiLCAidHlwZSI6ICJvYmplY3QiLCAiZGVzY3JpcHRp b24iOiAiSFRUUCByZXF1ZXN0IGhlYWRlcnMuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJu YW1lIjogImhlYWRlcnMiLCAiJHJlZiI6ICJIZWFkZXJzIiwgImRlc2NyaXB0aW9uIjogIkhUVFAg cmVxdWVzdCBoZWFkZXJzLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJwb3N0 RGF0YSIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6 ICJIVFRQIFBPU1QgcmVxdWVzdCBkYXRhLiIgfQogICAgICAgICAgICAgICAgIF0KICAgICAgICAg ICAgIH0sCkBAIC00NzUsMTAgKzQ5MywxMCBAQAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogInVybCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJSZXNwb25zZSBVUkwu IiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInN0YXR1cyIsICJ0eXBlIjogIm51 bWJlciIsICJkZXNjcmlwdGlvbiI6ICJIVFRQIHJlc3BvbnNlIHN0YXR1cyBjb2RlLiIgfSwKICAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzdGF0dXNUZXh0IiwgInR5cGUiOiAic3RyaW5n IiwgImRlc2NyaXB0aW9uIjogIkhUVFAgcmVzcG9uc2Ugc3RhdHVzIHRleHQuIiB9LAotICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogImhlYWRlcnMiLCAidHlwZSI6ICJvYmplY3QiLCAiZGVz Y3JpcHRpb24iOiAiSFRUUCByZXNwb25zZSBoZWFkZXJzLiIgfSwKKyAgICAgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJoZWFkZXJzIiwgIiRyZWYiOiAiSGVhZGVycyIsICJkZXNjcmlwdGlvbiI6 ICJIVFRQIHJlc3BvbnNlIGhlYWRlcnMuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogImhlYWRlcnNUZXh0IiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRl c2NyaXB0aW9uIjogIkhUVFAgcmVzcG9uc2UgaGVhZGVycyB0ZXh0LiIgfSwKICAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJtaW1lVHlwZSIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlw dGlvbiI6ICJSZXNvdXJjZSBtaW1lVHlwZSBhcyBkZXRlcm1pbmVkIGJ5IHRoZSBicm93c2VyLiIg fSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXF1ZXN0SGVhZGVycyIsICJ0eXBl IjogIm9iamVjdCIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJSZWZpbmVkIEhU VFAgcmVxdWVzdCBoZWFkZXJzIHRoYXQgd2VyZSBhY3R1YWxseSB0cmFuc21pdHRlZCBvdmVyIHRo ZSBuZXR3b3JrLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXF1ZXN0SGVh ZGVycyIsICIkcmVmIjogIkhlYWRlcnMiLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24i OiAiUmVmaW5lZCBIVFRQIHJlcXVlc3QgaGVhZGVycyB0aGF0IHdlcmUgYWN0dWFsbHkgdHJhbnNt aXR0ZWQgb3ZlciB0aGUgbmV0d29yay4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAicmVxdWVzdEhlYWRlcnNUZXh0IiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1 ZSwgImRlc2NyaXB0aW9uIjogIkhUVFAgcmVxdWVzdCBoZWFkZXJzIHRleHQuIiB9LAogICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogImNvbm5lY3Rpb25SZXVzZWQiLCAidHlwZSI6ICJib29s ZWFuIiwgImRlc2NyaXB0aW9uIjogIlNwZWNpZmllcyB3aGV0aGVyIHBoeXNpY2FsIGNvbm5lY3Rp b24gd2FzIGFjdHVhbGx5IHJldXNlZCBmb3IgdGhpcyByZXF1ZXN0LiIgfSwKICAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJjb25uZWN0aW9uSWQiLCAidHlwZSI6ICJudW1iZXIiLCAiZGVz Y3JpcHRpb24iOiAiUGh5c2ljYWwgY29ubmVjdGlvbiBpZCB0aGF0IHdhcyBhY3R1YWxseSB1c2Vk IGZvciB0aGlzIHJlcXVlc3QuIiB9LApAQCAtNTI3LDkgKzU0NSw5IEBACiAgICAgICAgICAgICB9 LAogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICJuYW1lIjogInNldEV4dHJhSFRUUEhl YWRlcnMiLAotICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJBbGxvd3Mgc2VuZGluZyBl eHRyYSBIVFRQIGhlYWRlcnMgd2l0aCB0aGUgcmVxdWVzdHMgZnJvbSB0aGlzIHBhZ2UuIiwKKyAg ICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiQWx3YXlzIHNlbmQgZXh0cmEgSFRUUCBoZWFk ZXJzIHdpdGggdGhlIHJlcXVlc3RzIGZyb20gdGhpcyBwYWdlLiIsCiAgICAgICAgICAgICAgICAg InBhcmFtZXRlcnMiOiBbCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaGVhZGVycyIs ICJ0eXBlIjogIm9iamVjdCIsICJkZXNjcmlwdGlvbiI6ICJNYXAgd2l0aCBleHRyYSBIVFRQIGhl YWRlcnMuIiB9CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaGVhZGVycyIsICIkcmVm IjogIkhlYWRlcnMiLCAiZGVzY3JpcHRpb24iOiAiTWFwIHdpdGggZXh0cmEgSFRUUCBoZWFkZXJz LiIgfQogICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7CkBA IC01NDAsNyArNTU4LDcgQEAKICAgICAgICAgICAgICAgICBdLAogICAgICAgICAgICAgICAgICJy ZXR1cm5zIjogWwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImJvZHkiLCAidHlwZSI6 ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiUmVzcG9uc2UgYm9keS4iIH0sCi0gICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAiYmFzZTY0RW5jb2RlZCIsICJ0eXBlIjogImJvb2xlYW4iLCAi ZGVzY3JpcHRpb24iOiAiVHJ1ZSwgaWYgY29udGVudCB3YXMgc2VydmVkIGFzIGJhc2U2NC4iIH0K KyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJiYXNlNjRFbmNvZGVkIiwgInR5cGUiOiAi Ym9vbGVhbiIsICJkZXNjcmlwdGlvbiI6ICJUcnVlLCBpZiBjb250ZW50IHdhcyBzZW50IGFzIGJh c2U2NC4iIH0KICAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAg ewpAQCAtNTY5LDcgKzU4Nyw3IEBACiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibG9h ZGVySWQiLCAiJHJlZiI6ICJMb2FkZXJJZCIsICJkZXNjcmlwdGlvbiI6ICJMb2FkZXIgaWRlbnRp Zmllci4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZG9jdW1lbnRVUkwiLCAi dHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiVVJMIG9mIHRoZSBkb2N1bWVudCB0aGlz IHJlcXVlc3QgaXMgbG9hZGVkIGZvci4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAicmVxdWVzdCIsICIkcmVmIjogIlJlcXVlc3QiLCAiZGVzY3JpcHRpb24iOiAiUmVxdWVzdCBk YXRhLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ0aW1lc3RhbXAiLCAidHlw ZSI6ICJudW1iZXIiLCAiZGVzY3JpcHRpb24iOiAiVGltZXN0YW1wLiIgfSwKKyAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJ0aW1lc3RhbXAiLCAiJHJlZiI6ICJUaW1lc3RhbXAiLCAiZGVz Y3JpcHRpb24iOiAiVGltZXN0YW1wLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJpbml0aWF0b3IiLCAiJHJlZiI6ICJJbml0aWF0b3IiLCAiZGVzY3JpcHRpb24iOiAiUmVxdWVz dCBpbml0aWF0b3IuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInN0YWNrVHJh Y2UiLCAiJHJlZiI6ICJDb25zb2xlLlN0YWNrVHJhY2UiLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVz Y3JpcHRpb24iOiAiSmF2YVNjcmlwdCBzdGFjayB0cmFjZSB1cG9uIGlzc3VpbmcgdGhpcyByZXF1 ZXN0LiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZWRpcmVjdFJlc3BvbnNl IiwgIm9wdGlvbmFsIjogdHJ1ZSwgIiRyZWYiOiAiUmVzcG9uc2UiLCAiZGVzY3JpcHRpb24iOiAi UmVkaXJlY3QgcmVzcG9uc2UgZGF0YS4iIH0KQEAgLTU4Nyw3ICs2MDUsNyBAQAogICAgICAgICAg ICAgICAgICJkZXNjcmlwdGlvbiI6ICJGaXJlZCB3aGVuIEhUVFAgcmVzcG9uc2UgaXMgYXZhaWxh YmxlLiIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAicmVxdWVzdElkIiwgIiRyZWYiOiAiUmVxdWVzdElkIiwgImRlc2NyaXB0 aW9uIjogIlJlcXVlc3QgaWRlbnRpZmllci4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAidGltZXN0YW1wIiwgInR5cGUiOiAibnVtYmVyIiwgImRlc2NyaXB0aW9uIjogIlRpbWVz dGFtcC4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidGltZXN0YW1wIiwgIiRy ZWYiOiAiVGltZXN0YW1wIiwgImRlc2NyaXB0aW9uIjogIlRpbWVzdGFtcC4iIH0sCiAgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAidHlwZSIsICIkcmVmIjogIlBhZ2UuUmVzb3VyY2VUeXBl IiwgImRlc2NyaXB0aW9uIjogIlJlc291cmNlIHR5cGUuIiB9LAogICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogInJlc3BvbnNlIiwgIiRyZWYiOiAiUmVzcG9uc2UiLCAiZGVzY3JpcHRpb24i OiAiUmVzcG9uc2UgZGF0YS4iIH0KICAgICAgICAgICAgICAgICBdCkBAIC01OTcsNyArNjE1LDcg QEAKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRmlyZWQgd2hlbiBkYXRhIGNodW5r IHdhcyByZWNlaXZlZCBvdmVyIHRoZSBuZXR3b3JrLiIsCiAgICAgICAgICAgICAgICAgInBhcmFt ZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVxdWVzdElkIiwgIiRy ZWYiOiAiUmVxdWVzdElkIiwgImRlc2NyaXB0aW9uIjogIlJlcXVlc3QgaWRlbnRpZmllci4iIH0s Ci0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidGltZXN0YW1wIiwgInR5cGUiOiAibnVt YmVyIiwgImRlc2NyaXB0aW9uIjogIlRpbWVzdGFtcC4iIH0sCisgICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAidGltZXN0YW1wIiwgIiRyZWYiOiAiVGltZXN0YW1wIiwgImRlc2NyaXB0aW9u IjogIlRpbWVzdGFtcC4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZGF0YUxl bmd0aCIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiRGF0YSBjaHVuayBsZW5n dGguIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImVuY29kZWREYXRhTGVuZ3Ro IiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJBY3R1YWwgYnl0ZXMgcmVjZWl2 ZWQgKG1pZ2h0IGJlIGxlc3MgdGhhbiBkYXRhTGVuZ3RoIGZvciBjb21wcmVzc2VkIGVuY29kaW5n cykuIiB9CiAgICAgICAgICAgICAgICAgXQpAQCAtNjA3LDcgKzYyNSw3IEBACiAgICAgICAgICAg ICAgICAgImRlc2NyaXB0aW9uIjogIkZpcmVkIHdoZW4gSFRUUCByZXF1ZXN0IGhhcyBmaW5pc2hl ZCBsb2FkaW5nLiIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAicmVxdWVzdElkIiwgIiRyZWYiOiAiUmVxdWVzdElkIiwgImRl c2NyaXB0aW9uIjogIlJlcXVlc3QgaWRlbnRpZmllci4iIH0sCi0gICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAidGltZXN0YW1wIiwgInR5cGUiOiAibnVtYmVyIiwgImRlc2NyaXB0aW9uIjog IlRpbWVzdGFtcC4iIH0KKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ0aW1lc3RhbXAi LCAiJHJlZiI6ICJUaW1lc3RhbXAiLCAiZGVzY3JpcHRpb24iOiAiVGltZXN0YW1wLiIgfQogICAg ICAgICAgICAgICAgIF0KICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7CkBAIC02MTUsNyAr NjMzLDcgQEAKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRmlyZWQgd2hlbiBIVFRQ IHJlcXVlc3QgaGFzIGZhaWxlZCB0byBsb2FkLiIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRl cnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVxdWVzdElkIiwgIiRyZWYi OiAiUmVxdWVzdElkIiwgImRlc2NyaXB0aW9uIjogIlJlcXVlc3QgaWRlbnRpZmllci4iIH0sCi0g ICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidGltZXN0YW1wIiwgInR5cGUiOiAibnVtYmVy IiwgImRlc2NyaXB0aW9uIjogIlRpbWVzdGFtcC4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAidGltZXN0YW1wIiwgIiRyZWYiOiAiVGltZXN0YW1wIiwgImRlc2NyaXB0aW9uIjog IlRpbWVzdGFtcC4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZXJyb3JUZXh0 IiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlVzZXIgZnJpZW5kbHkgZXJyb3Ig bWVzc2FnZS4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY2FuY2VsZWQiLCAi dHlwZSI6ICJib29sZWFuIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlRydWUg aWYgbG9hZGluZyB3YXMgY2FuY2VsZWQuIiB9CiAgICAgICAgICAgICAgICAgXQpAQCAtNjI4LDcg KzY0Niw3IEBACiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZnJhbWVJZCIsICJ0eXBl IjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJGcmFtZSBpZGVudGlmaWVyLiIsICJoaWRkZW4i OiB0cnVlIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibG9hZGVySWQiLCAiJHJl ZiI6ICJMb2FkZXJJZCIsICJkZXNjcmlwdGlvbiI6ICJMb2FkZXIgaWRlbnRpZmllci4iIH0sCiAg ICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZG9jdW1lbnRVUkwiLCAidHlwZSI6ICJzdHJp bmciLCAiZGVzY3JpcHRpb24iOiAiVVJMIG9mIHRoZSBkb2N1bWVudCB0aGlzIHJlcXVlc3QgaXMg bG9hZGVkIGZvci4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidGltZXN0YW1w IiwgInR5cGUiOiAibnVtYmVyIiwgImRlc2NyaXB0aW9uIjogIlRpbWVzdGFtcC4iIH0sCisgICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidGltZXN0YW1wIiwgIiRyZWYiOiAiVGltZXN0YW1w IiwgImRlc2NyaXB0aW9uIjogIlRpbWVzdGFtcC4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAiaW5pdGlhdG9yIiwgIiRyZWYiOiAiSW5pdGlhdG9yIiwgImRlc2NyaXB0aW9uIjog IlJlcXVlc3QgaW5pdGlhdG9yLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJy ZXNvdXJjZSIsICIkcmVmIjogIkNhY2hlZFJlc291cmNlIiwgImRlc2NyaXB0aW9uIjogIkNhY2hl ZCByZXNvdXJjZSBkYXRhLiIgfQogICAgICAgICAgICAgICAgIF0KQEAgLTYzOCw3ICs2NTYsNyBA QAogICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJGaXJlZCB3aGVuIFdlYlNvY2tldCBp cyBhYm91dCB0byBpbml0aWF0ZSBoYW5kc2hha2UuIiwKICAgICAgICAgICAgICAgICAicGFyYW1l dGVycyI6IFsKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXF1ZXN0SWQiLCAiJHJl ZiI6ICJSZXF1ZXN0SWQiLCAiZGVzY3JpcHRpb24iOiAiUmVxdWVzdCBpZGVudGlmaWVyLiIgfSwK LSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ0aW1lc3RhbXAiLCAidHlwZSI6ICJudW1i ZXIiLCAiZGVzY3JpcHRpb24iOiAiVGltZXN0YW1wLiIgfSwKKyAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJ0aW1lc3RhbXAiLCAiJHJlZiI6ICJUaW1lc3RhbXAiLCAiZGVzY3JpcHRpb24i OiAiVGltZXN0YW1wLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXF1ZXN0 IiwgInR5cGUiOiAib2JqZWN0IiwgImRlc2NyaXB0aW9uIjogIldlYlNvY2tldCByZXF1ZXN0IGRh dGEuIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAgICAiaGlkZGVuIjogdHJ1 ZQpAQCAtNjQ4LDcgKzY2Niw3IEBACiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkZp cmVkIHdoZW4gV2ViU29ja2V0IGhhbmRzaGFrZSByZXNwb25zZSBiZWNvbWVzIGF2YWlsYWJsZS4i LAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwogICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogInJlcXVlc3RJZCIsICIkcmVmIjogIlJlcXVlc3RJZCIsICJkZXNjcmlwdGlvbiI6 ICJSZXF1ZXN0IGlkZW50aWZpZXIuIiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog InRpbWVzdGFtcCIsICJ0eXBlIjogIm51bWJlciIsICJkZXNjcmlwdGlvbiI6ICJUaW1lc3RhbXAu IiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInRpbWVzdGFtcCIsICIkcmVmIjog IlRpbWVzdGFtcCIsICJkZXNjcmlwdGlvbiI6ICJUaW1lc3RhbXAuIiB9LAogICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogInJlc3BvbnNlIiwgInR5cGUiOiAib2JqZWN0IiwgImRlc2NyaXB0 aW9uIjogIldlYlNvY2tldCByZXNwb25zZSBkYXRhLiIgfQogICAgICAgICAgICAgICAgIF0sCiAg ICAgICAgICAgICAgICAgImhpZGRlbiI6IHRydWUKQEAgLTY2Nyw3ICs2ODUsNyBAQAogICAgICAg ICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJGaXJlZCB3aGVuIFdlYlNvY2tldCBpcyBjbG9zZWQu IiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKICAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJyZXF1ZXN0SWQiLCAiJHJlZiI6ICJSZXF1ZXN0SWQiLCAiZGVzY3JpcHRpb24i OiAiUmVxdWVzdCBpZGVudGlmaWVyLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJ0aW1lc3RhbXAiLCAidHlwZSI6ICJudW1iZXIiLCAiZGVzY3JpcHRpb24iOiAiVGltZXN0YW1w LiIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInRpbWVzdGFtcCIsICIkcmVmIjog IlRpbWVzdGFtcCIsICJkZXNjcmlwdGlvbiI6ICJUaW1lc3RhbXAuIiB9CiAgICAgICAgICAgICAg ICAgXSwKICAgICAgICAgICAgICAgICAiaGlkZGVuIjogdHJ1ZQogICAgICAgICAgICAgfQpAQCAt ODk3LDcgKzkxNSw3IEBACiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY29udGVudENv bG9yIiwgIiRyZWYiOiAiUkdCQSIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJU aGUgY29udGVudCBib3ggaGlnaGxpZ2h0IGZpbGwgY29sb3IgKGRlZmF1bHQ6IHRyYW5zcGFyZW50 KS4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicGFkZGluZ0NvbG9yIiwgIiRy ZWYiOiAiUkdCQSIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJUaGUgcGFkZGlu ZyBoaWdobGlnaHQgZmlsbCBjb2xvciAoZGVmYXVsdDogdHJhbnNwYXJlbnQpLiIgfSwKICAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJib3JkZXJDb2xvciIsICIkcmVmIjogIlJHQkEiLCAi b3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiVGhlIGJvcmRlciBoaWdobGlnaHQgZmls bCBjb2xvciAoZGVmYXVsdDogdHJhbnNwYXJlbnQpLiIgfSwKLSAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJtYXJnaW5Db2xvciIsICIkcmVmIjogIlJHQkEiLCAib3B0aW9uYWwiOiB0cnVl LCAiZGVzY3JpcHRpb24iOiAiVGhlIG1hcmdpbiBoaWdobGlnaHQgZmlsbCBjb2xvciAoZGVmYXVs dDogdHJhbnNwYXJlbnQpLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJtYXJn aW5Db2xvciIsICIkcmVmIjogIlJHQkEiLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24i OiAiVGhlIG1hcmdpbiBoaWdobGlnaHQgZmlsbCBjb2xvciAoZGVmYXVsdDogdHJhbnNwYXJlbnQp LiIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjog IkNvbmZpZ3VyYXRpb24gZGF0YSBmb3IgdGhlIGhpZ2hsaWdodGluZyBvZiBwYWdlIGVsZW1lbnRz LiIKICAgICAgICAgICAgIH0KQEAgLTE1MDMsMTEgKzE1MjEsMTMgQEAKICAgICAgICAgImV2ZW50 cyI6IFsKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAibmFtZSI6ICJzdGFydGVkIiwK LSAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRmlyZWQgd2hlbiB0aW1lbGluZSBoYXMg YmVlbiBzdGFydGVkLiIKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRmlyZWQgd2hl biB0aW1lbGluZSBoYXMgYmVlbiBzdGFydGVkLiIsCisgICAgICAgICAgICAgICAgImhpZGRlbiI6 IHRydWUKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgIm5h bWUiOiAic3RvcHBlZCIsCi0gICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkZpcmVkIHdo ZW4gdGltZWxpbmUgaGFzIGJlZW4gc3RvcHBlZC4iCisgICAgICAgICAgICAgICAgImRlc2NyaXB0 aW9uIjogIkZpcmVkIHdoZW4gdGltZWxpbmUgaGFzIGJlZW4gc3RvcHBlZC4iLAorICAgICAgICAg ICAgICAgICJoaWRkZW4iOiB0cnVlCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewogICAg ICAgICAgICAgICAgICJuYW1lIjogImV2ZW50UmVjb3JkZWQiLApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCmluZGV4IGVhMzFiOGM5YjMwZjFk OTRhYzYzOTRkNTY1NGY3NmVkMmUyODBlMmEuLmI0ZTBiOTNjZmE2N2JmYzQwYjYwM2U2NmRhZjc3 NjE1YTI2MmY4NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y Q29udHJvbGxlci5jcHAKQEAgLTk4LDcgKzk4LDcgQEAgSW5zcGVjdG9yQ29udHJvbGxlcjo6SW5z cGVjdG9yQ29udHJvbGxlcihQYWdlKiBwYWdlLCBJbnNwZWN0b3JDbGllbnQqIGluc3BlY3RvckMK ICAgICAsIG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKEluamVjdGVkU2NyaXB0TWFuYWdlcjo6Y3Jl YXRlRm9yUGFnZSgpKQogICAgICwgbV9zdGF0ZShhZG9wdFB0cihuZXcgSW5zcGVjdG9yU3RhdGUo aW5zcGVjdG9yQ2xpZW50KSkpCiAgICAgLCBtX2luc3BlY3RvckFnZW50KGFkb3B0UHRyKG5ldyBJ bnNwZWN0b3JBZ2VudChwYWdlLCBtX2luamVjdGVkU2NyaXB0TWFuYWdlci5nZXQoKSwgbV9pbnN0 cnVtZW50aW5nQWdlbnRzLmdldCgpKSkpCi0gICAgLCBtX3BhZ2VBZ2VudChJbnNwZWN0b3JQYWdl QWdlbnQ6OmNyZWF0ZShtX2luc3RydW1lbnRpbmdBZ2VudHMuZ2V0KCksIHBhZ2UsIG1faW5qZWN0 ZWRTY3JpcHRNYW5hZ2VyLmdldCgpKSkKKyAgICAsIG1fcGFnZUFnZW50KEluc3BlY3RvclBhZ2VB Z2VudDo6Y3JlYXRlKG1faW5zdHJ1bWVudGluZ0FnZW50cy5nZXQoKSwgcGFnZSwgbV9zdGF0ZS5n ZXQoKSwgbV9pbmplY3RlZFNjcmlwdE1hbmFnZXIuZ2V0KCkpKQogICAgICwgbV9kb21BZ2VudChJ bnNwZWN0b3JET01BZ2VudDo6Y3JlYXRlKG1faW5zdHJ1bWVudGluZ0FnZW50cy5nZXQoKSwgbV9w YWdlQWdlbnQuZ2V0KCksIGluc3BlY3RvckNsaWVudCwgbV9zdGF0ZS5nZXQoKSwgbV9pbmplY3Rl ZFNjcmlwdE1hbmFnZXIuZ2V0KCkpKQogICAgICwgbV9jc3NBZ2VudChhZG9wdFB0cihuZXcgSW5z cGVjdG9yQ1NTQWdlbnQobV9pbnN0cnVtZW50aW5nQWdlbnRzLmdldCgpLCBtX2RvbUFnZW50Lmdl dCgpKSkpCiAjaWYgRU5BQkxFKFNRTF9EQVRBQkFTRSkKQEAgLTM1Miw2ICszNTIsNyBAQCB2b2lk IEluc3BlY3RvckNvbnRyb2xsZXI6OnJlc3RvcmVJbnNwZWN0b3JTdGF0ZUZyb21Db29raWUoY29u c3QgU3RyaW5nJiBpbnNwZWN0bwogI2lmIEVOQUJMRShET01fU1RPUkFHRSkKICAgICBtX2RvbVN0 b3JhZ2VBZ2VudC0+cmVzdG9yZSgpOwogI2VuZGlmCisgICAgbV9wYWdlQWdlbnQtPnJlc3RvcmUo KTsKICNpZiBFTkFCTEUoV09SS0VSUykKICAgICBtX3dvcmtlckFnZW50LT5yZXN0b3JlKCk7CiAj ZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdl QWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5j cHAKaW5kZXggYmRkYmI1NGU0NzUzNDhmZmFkYmFkMjU0ZTY5OTI5MGIzMjM0ZGJjNi4uOTc5MmQw Y2FkYTk2ODZkMmY2NzlhYWUwMWU5NjMzMDFhOGQwOGRjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAKQEAgLTUwLDYgKzUwLDcgQEAKICNp bmNsdWRlICJJZGVudGlmaWVyc0ZhY3RvcnkuaCIKICNpbmNsdWRlICJJbmplY3RlZFNjcmlwdE1h bmFnZXIuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JGcm9udGVuZC5oIgorI2luY2x1ZGUgIkluc3Bl Y3RvclN0YXRlLmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9yVmFsdWVzLmgiCiAjaW5jbHVkZSAiSW5z dHJ1bWVudGluZ0FnZW50cy5oIgogI2luY2x1ZGUgIk1lbW9yeUNhY2hlLmgiCkBAIC03Miw2ICs3 MywxMCBAQCBuYW1lc3BhY2Ugewogc3RhdGljIGNvbnN0IGNoYXIgcmVnZXhTcGVjaWFsQ2hhcmFj dGVyc1tdID0gIltdKCl7fSstKi4sP1xcXiR8IjsKIH0KIAorbmFtZXNwYWNlIFBhZ2VBZ2VudFN0 YXRlIHsKK3N0YXRpYyBjb25zdCBjaGFyIHBhZ2VBZ2VudEVuYWJsZWRbXSA9ICJyZXNvdXJjZUFn ZW50RW5hYmxlZCI7Cit9CisKIHN0YXRpYyBib29sIGRlY29kZVNoYXJlZEJ1ZmZlcihQYXNzUmVm UHRyPFNoYXJlZEJ1ZmZlcj4gYnVmZmVyLCBjb25zdCBTdHJpbmcmIHRleHRFbmNvZGluZ05hbWUs IFN0cmluZyogcmVzdWx0KQogewogICAgIGlmIChidWZmZXIpIHsKQEAgLTE3MCw5ICsxNzUsOSBA QCBib29sIEluc3BlY3RvclBhZ2VBZ2VudDo6c2hhcmVkQnVmZmVyQ29udGVudChQYXNzUmVmUHRy PFNoYXJlZEJ1ZmZlcj4gYnVmZmVyLCBjbwogICAgIHJldHVybiBkZWNvZGVTaGFyZWRCdWZmZXIo YnVmZmVyLCB0ZXh0RW5jb2RpbmdOYW1lLCByZXN1bHQpOwogfQogCi1QYXNzT3duUHRyPEluc3Bl Y3RvclBhZ2VBZ2VudD4gSW5zcGVjdG9yUGFnZUFnZW50OjpjcmVhdGUoSW5zdHJ1bWVudGluZ0Fn ZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cywgUGFnZSogcGFnZSwgSW5qZWN0ZWRTY3JpcHRNYW5h Z2VyKiBpbmplY3RlZFNjcmlwdE1hbmFnZXIpCitQYXNzT3duUHRyPEluc3BlY3RvclBhZ2VBZ2Vu dD4gSW5zcGVjdG9yUGFnZUFnZW50OjpjcmVhdGUoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1 bWVudGluZ0FnZW50cywgUGFnZSogcGFnZSwgSW5zcGVjdG9yU3RhdGUqIHN0YXRlLCBJbmplY3Rl ZFNjcmlwdE1hbmFnZXIqIGluamVjdGVkU2NyaXB0TWFuYWdlcikKIHsKLSAgICByZXR1cm4gYWRv cHRQdHIobmV3IEluc3BlY3RvclBhZ2VBZ2VudChpbnN0cnVtZW50aW5nQWdlbnRzLCBwYWdlLCBp bmplY3RlZFNjcmlwdE1hbmFnZXIpKTsKKyAgICByZXR1cm4gYWRvcHRQdHIobmV3IEluc3BlY3Rv clBhZ2VBZ2VudChpbnN0cnVtZW50aW5nQWdlbnRzLCBwYWdlLCBzdGF0ZSwgaW5qZWN0ZWRTY3Jp cHRNYW5hZ2VyKSk7CiB9CiAKIC8vIHN0YXRpYwpAQCAtMjYyLDEwICsyNjcsMTEgQEAgU3RyaW5n IEluc3BlY3RvclBhZ2VBZ2VudDo6Y2FjaGVkUmVzb3VyY2VUeXBlU3RyaW5nKGNvbnN0IENhY2hl ZFJlc291cmNlJiBjYWNoZWQKICAgICByZXR1cm4gcmVzb3VyY2VUeXBlU3RyaW5nKGNhY2hlZFJl c291cmNlVHlwZShjYWNoZWRSZXNvdXJjZSkpOwogfQogCi1JbnNwZWN0b3JQYWdlQWdlbnQ6Oklu c3BlY3RvclBhZ2VBZ2VudChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRz LCBQYWdlKiBwYWdlLCBJbmplY3RlZFNjcmlwdE1hbmFnZXIqIGluamVjdGVkU2NyaXB0TWFuYWdl cikKK0luc3BlY3RvclBhZ2VBZ2VudDo6SW5zcGVjdG9yUGFnZUFnZW50KEluc3RydW1lbnRpbmdB Z2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMsIFBhZ2UqIHBhZ2UsIEluc3BlY3RvclN0YXRlKiBz dGF0ZSwgSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKiBpbmplY3RlZFNjcmlwdE1hbmFnZXIpCiAgICAg OiBtX2luc3RydW1lbnRpbmdBZ2VudHMoaW5zdHJ1bWVudGluZ0FnZW50cykKICAgICAsIG1fcGFn ZShwYWdlKQogICAgICwgbV9pbmplY3RlZFNjcmlwdE1hbmFnZXIoaW5qZWN0ZWRTY3JpcHRNYW5h Z2VyKQorICAgICwgbV9zdGF0ZShzdGF0ZSkKICAgICAsIG1fZnJvbnRlbmQoMCkKIHsKIH0KQEAg LTI3MywxNSArMjc5LDM1IEBAIEluc3BlY3RvclBhZ2VBZ2VudDo6SW5zcGVjdG9yUGFnZUFnZW50 KEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMsCiB2b2lkIEluc3BlY3Rv clBhZ2VBZ2VudDo6c2V0RnJvbnRlbmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kKQogewog ICAgIG1fZnJvbnRlbmQgPSBmcm9udGVuZC0+cGFnZSgpOwotICAgIG1faW5zdHJ1bWVudGluZ0Fn ZW50cy0+c2V0SW5zcGVjdG9yUGFnZUFnZW50KHRoaXMpOwogfQogCiB2b2lkIEluc3BlY3RvclBh Z2VBZ2VudDo6Y2xlYXJGcm9udGVuZCgpCiB7Ci0gICAgbV9pbnN0cnVtZW50aW5nQWdlbnRzLT5z ZXRJbnNwZWN0b3JQYWdlQWdlbnQoMCk7CisgICAgRXJyb3JTdHJpbmcgZXJyb3I7CisgICAgZGlz YWJsZSgmZXJyb3IpOwogICAgIG1fZnJvbnRlbmQgPSAwOwogfQogCit2b2lkIEluc3BlY3RvclBh Z2VBZ2VudDo6cmVzdG9yZSgpCit7CisgICAgaWYgKG1fc3RhdGUtPmdldEJvb2xlYW4oUGFnZUFn ZW50U3RhdGU6OnBhZ2VBZ2VudEVuYWJsZWQpKSB7CisgICAgICAgIEVycm9yU3RyaW5nIGVycm9y OworICAgICAgICBlbmFibGUoJmVycm9yKTsKKyAgICB9Cit9CisKK3ZvaWQgSW5zcGVjdG9yUGFn ZUFnZW50OjplbmFibGUoRXJyb3JTdHJpbmcqKQoreworICAgIG1fc3RhdGUtPnNldEJvb2xlYW4o UGFnZUFnZW50U3RhdGU6OnBhZ2VBZ2VudEVuYWJsZWQsIHRydWUpOworICAgIG1faW5zdHJ1bWVu dGluZ0FnZW50cy0+c2V0SW5zcGVjdG9yUGFnZUFnZW50KHRoaXMpOworfQorCit2b2lkIEluc3Bl Y3RvclBhZ2VBZ2VudDo6ZGlzYWJsZShFcnJvclN0cmluZyopCit7CisgICAgbV9zdGF0ZS0+c2V0 Qm9vbGVhbihQYWdlQWdlbnRTdGF0ZTo6cGFnZUFnZW50RW5hYmxlZCwgZmFsc2UpOworICAgIG1f aW5zdHJ1bWVudGluZ0FnZW50cy0+c2V0SW5zcGVjdG9yUGFnZUFnZW50KDApOworfQorCiB2b2lk IEluc3BlY3RvclBhZ2VBZ2VudDo6YWRkU2NyaXB0VG9FdmFsdWF0ZU9uTG9hZChFcnJvclN0cmlu ZyosIGNvbnN0IFN0cmluZyYgc291cmNlKQogewogICAgIG1fc2NyaXB0c1RvRXZhbHVhdGVPbkxv YWQuYXBwZW5kKHNvdXJjZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yUGFnZUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y UGFnZUFnZW50LmgKaW5kZXggYzhkZDBkZWQ4OTAxNzYzMTViZDExMzgwYjY4MjBkN2MyMGNlMjIx NS4uZGVmYTE1NjFjYmQ1M2ZhZWMxNWQwOTI1NTBiNzI3M2Y0ZWEzNjkyNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuaApAQCAtNTAsNiArNTAsNyBA QCBjbGFzcyBGcm9udGVuZDsKIGNsYXNzIEluamVjdGVkU2NyaXB0TWFuYWdlcjsKIGNsYXNzIElu c3BlY3RvckFycmF5OwogY2xhc3MgSW5zcGVjdG9yT2JqZWN0OworY2xhc3MgSW5zcGVjdG9yU3Rh dGU7CiBjbGFzcyBJbnN0cnVtZW50aW5nQWdlbnRzOwogY2xhc3MgS1VSTDsKIGNsYXNzIFBhZ2U7 CkBAIC03Myw3ICs3NCw3IEBAIHB1YmxpYzoKICAgICAgICAgT3RoZXJSZXNvdXJjZQogICAgIH07 CiAKLSAgICBzdGF0aWMgUGFzc093blB0cjxJbnNwZWN0b3JQYWdlQWdlbnQ+IGNyZWF0ZShJbnN0 cnVtZW50aW5nQWdlbnRzKiwgUGFnZSosIEluamVjdGVkU2NyaXB0TWFuYWdlciopOworICAgIHN0 YXRpYyBQYXNzT3duUHRyPEluc3BlY3RvclBhZ2VBZ2VudD4gY3JlYXRlKEluc3RydW1lbnRpbmdB Z2VudHMqLCBQYWdlKiwgSW5zcGVjdG9yU3RhdGUqLCBJbmplY3RlZFNjcmlwdE1hbmFnZXIqKTsK IAogICAgIHN0YXRpYyBib29sIGNhY2hlZFJlc291cmNlQ29udGVudChDYWNoZWRSZXNvdXJjZSos IFN0cmluZyogcmVzdWx0LCBib29sKiBiYXNlNjRFbmNvZGVkKTsKICAgICBzdGF0aWMgYm9vbCBz aGFyZWRCdWZmZXJDb250ZW50KFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiwgY29uc3QgU3RyaW5n JiB0ZXh0RW5jb2RpbmdOYW1lLCBib29sIHdpdGhCYXNlNjRFbmNvZGUsIFN0cmluZyogcmVzdWx0 KTsKQEAgLTg2LDYgKzg3LDggQEAgcHVibGljOgogICAgIHN0YXRpYyBTdHJpbmcgY2FjaGVkUmVz b3VyY2VUeXBlU3RyaW5nKGNvbnN0IENhY2hlZFJlc291cmNlJik7CiAKICAgICAvLyBQYWdlIEFQ SSBmb3IgSW5zcGVjdG9yRnJvbnRlbmQKKyAgICB2b2lkIGVuYWJsZShFcnJvclN0cmluZyopOwor ICAgIHZvaWQgZGlzYWJsZShFcnJvclN0cmluZyopOwogICAgIHZvaWQgYWRkU2NyaXB0VG9FdmFs dWF0ZU9uTG9hZChFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgc291cmNlKTsKICAgICB2b2lk IHJlbW92ZUFsbFNjcmlwdHNUb0V2YWx1YXRlT25Mb2FkKEVycm9yU3RyaW5nKik7CiAgICAgdm9p ZCByZWxvYWQoRXJyb3JTdHJpbmcqLCBjb25zdCBib29sKiBjb25zdCBvcHRpb25hbElnbm9yZUNh Y2hlKTsKQEAgLTEwNyw2ICsxMTAsNyBAQCBwdWJsaWM6CiAgICAgLy8gSW5zcGVjdG9yIENvbnRy b2xsZXIgQVBJCiAgICAgdm9pZCBzZXRGcm9udGVuZChJbnNwZWN0b3JGcm9udGVuZCopOwogICAg IHZvaWQgY2xlYXJGcm9udGVuZCgpOworICAgIHZvaWQgcmVzdG9yZSgpOwogCiAgICAgLy8gQ3Jv c3MtYWdlbnRzIEFQSQogICAgIEZyYW1lKiBtYWluRnJhbWUoKTsKQEAgLTExNiw3ICsxMjAsNyBA QCBwdWJsaWM6CiAgICAgU3RyaW5nIGxvYWRlcklkKERvY3VtZW50TG9hZGVyKik7CiAKIHByaXZh dGU6Ci0gICAgSW5zcGVjdG9yUGFnZUFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqLCBQYWdlKiwg SW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKik7CisgICAgSW5zcGVjdG9yUGFnZUFnZW50KEluc3RydW1l bnRpbmdBZ2VudHMqLCBQYWdlKiwgSW5zcGVjdG9yU3RhdGUqLCBJbmplY3RlZFNjcmlwdE1hbmFn ZXIqKTsKIAogICAgIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBidWlsZE9iamVjdEZvckZy YW1lKEZyYW1lKik7CiAgICAgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJ1aWxkT2JqZWN0 Rm9yRnJhbWVUcmVlKEZyYW1lKik7CkBAIC0xMjQsNiArMTI4LDcgQEAgcHJpdmF0ZToKICAgICBJ bnN0cnVtZW50aW5nQWdlbnRzKiBtX2luc3RydW1lbnRpbmdBZ2VudHM7CiAgICAgUGFnZSogbV9w YWdlOwogICAgIEluamVjdGVkU2NyaXB0TWFuYWdlciogbV9pbmplY3RlZFNjcmlwdE1hbmFnZXI7 CisgICAgSW5zcGVjdG9yU3RhdGUqIG1fc3RhdGU7CiAgICAgSW5zcGVjdG9yRnJvbnRlbmQ6OlBh Z2UqIG1fZnJvbnRlbmQ7CiAgICAgVmVjdG9yPFN0cmluZz4gbV9zY3JpcHRzVG9FdmFsdWF0ZU9u TG9hZDsKICAgICBIYXNoTWFwPEZyYW1lKiwgU3RyaW5nPiBtX2ZyYW1lVG9JZGVudGlmaWVyOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVRy ZWVNb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VU cmVlTW9kZWwuanMKaW5kZXggODk3NWYwY2YyYjFiNGQ3MWRkMWVkMjA2ZDIyZjYwMGViZDE2NmQz Ny4uNGEzZWM1NzRkZmUxYWM2Njc2MzQzY2RkNWNmMDVkYzQyMjZiZTNkZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVHJlZU1vZGVs LmpzCkBAIC00Miw2ICs0Miw4IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbCA9IGZ1 bmN0aW9uKG5ldHdvcmtNYW5hZ2VyKQogICAgIFdlYkluc3BlY3Rvci5jb25zb2xlLmFkZEV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkNvbnNvbGVNb2RlbC5FdmVudHMuUmVwZWF0Q291bnRVcGRh dGVkLCB0aGlzLl9jb25zb2xlTWVzc2FnZUFkZGVkLCB0aGlzKTsKICAgICBXZWJJbnNwZWN0b3Iu Y29uc29sZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5Db25zb2xlTW9kZWwuRXZlbnRz LkNvbnNvbGVDbGVhcmVkLCB0aGlzLl9jb25zb2xlQ2xlYXJlZCwgdGhpcyk7CiAKKyAgICBQYWdl QWdlbnQuZW5hYmxlKCk7CisKICAgICB0aGlzLmZyb250ZW5kUmV1c2VkKCk7CiAgICAgSW5zcGVj dG9yQmFja2VuZC5yZWdpc3RlclBhZ2VEaXNwYXRjaGVyKG5ldyBXZWJJbnNwZWN0b3IuUGFnZURp c3BhdGNoZXIodGhpcykpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvaW5zcGVjdG9yLmpzCmluZGV4IDNhNGJhZDg3NmY1YTRlNzU5ZGQwMTBjMzkyNDUyMWIxMTZh YzRmZjguLmMxZGY5N2E5YmJjZmM2Y2I1ZTE1MDc4Nzc4NTlkZTlhOTIzOTFjYWUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCkBAIC01NDcs NyArNTQ3LDYgQEAgV2ViSW5zcGVjdG9yLmRvTG9hZGVkRG9uZSA9IGZ1bmN0aW9uKCkKICAgICB0 aGlzLmV4dGVuc2lvblNlcnZlci5pbml0RXh0ZW5zaW9ucygpOwogCiAgICAgdGhpcy5jb25zb2xl LmVuYWJsZUFnZW50KCk7Ci0KICAgICBEYXRhYmFzZUFnZW50LmVuYWJsZSgpOwogICAgIERPTVN0 b3JhZ2VBZ2VudC5lbmFibGUoKTsKIAo=