57226 2011-03-28 05:52:53 -0700 Web Inspector: rename network domain events from didHappenSomething to somethingHappened. 2011-03-28 06:44:36 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 374442 0 pfeldman 2011-03-28 05:52:53 -0700 Patch to follow. 374458 1 87136 pfeldman 2011-03-28 06:31:03 -0700 Created attachment 87136 Patch 374462 2 pfeldman 2011-03-28 06:44:36 -0700 Committed r82111: <http://trac.webkit.org/changeset/82111> 87136 2011-03-28 06:31:03 -0700 2011-03-28 06:35:05 -0700 Patch bug-57226-20110328173101.patch text/plain 21521 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODIxMDYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlNGY5MjI4Y2NmZmU0ZDdi ODFkYTNiNTUyMmNkODUzODc3NTg1MjNjLi4wODJkYmM1NWFiYTlkMGRjZDQ3ODZlNzU0YjhlZGNk MDkwYjNmNTg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDIgQEAKKzIwMTEtMDMtMjggIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcmVuYW1lIG5ldHdvcmsg ZG9tYWluIGV2ZW50cyBmcm9tIGRpZEhhcHBlblNvbWV0aGluZyB0byBzb21ldGhpbmdIYXBwZW5l ZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3MjI2 CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAgICogaW5zcGVj dG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yUmVzb3VyY2VBZ2VudDo6d2lsbFNlbmRSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3RvclJlc291cmNlQWdlbnQ6Om1hcmtSZXNvdXJjZUFzQ2FjaGVkKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvclJlc291cmNlQWdlbnQ6OmRpZFJlY2VpdmVSZXNwb25zZSk6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpkaWRSZWNlaXZlQ29udGVudExl bmd0aCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpkaWRGaW5p c2hMb2FkaW5nKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclJlc291cmNlQWdlbnQ6OmRp ZEZhaWxMb2FkaW5nKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclJlc291cmNlQWdlbnQ6 OmRpZExvYWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JSZXNvdXJjZUFnZW50OjpzZXRJbml0aWFsQ29udGVudCk6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpkaWRDb21taXRMb2FkKToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvclJlc291cmNlQWdlbnQ6OmZyYW1lRGV0YWNoZWRGcm9tUGFyZW50KToKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclJlc291cmNlQWdlbnQ6OmRpZENyZWF0ZVdlYlNvY2tl dCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZUFnZW50Ojp3aWxsU2VuZFdl YlNvY2tldEhhbmRzaGFrZVJlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUmVz b3VyY2VBZ2VudDo6ZGlkUmVjZWl2ZVdlYlNvY2tldEhhbmRzaGFrZVJlc3BvbnNlKToKKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3RvclJlc291cmNlQWdlbnQ6OmRpZENsb3NlV2ViU29ja2V0KToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnByb3RvdHlwZS5yZXF1ZXN0V2lsbEJl U2VudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBl LnJlc291cmNlTWFya2VkQXNDYWNoZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtE aXNwYXRjaGVyLnByb3RvdHlwZS5yZXNwb25zZVJlY2VpdmVkKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUuZGF0YVJlY2VpdmVkKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUubG9hZGluZ0ZpbmlzaGVk KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUubG9h ZGluZ0ZhaWxlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJv dG90eXBlLnJlc291cmNlTG9hZGVkRnJvbU1lbW9yeUNhY2hlKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUuZnJhbWVEZXRhY2hlZCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlLmluaXRpYWxDb250ZW50 U2V0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUu ZnJhbWVOYXZpZ2F0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVy LnByb3RvdHlwZS53ZWJTb2NrZXRDcmVhdGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3 b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUud2ViU29ja2V0V2lsbFNlbmRIYW5kc2hha2VSZXF1ZXN0 KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUud2Vi U29ja2V0SGFuZHNoYWtlUmVzcG9uc2VSZWNlaXZlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu TmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlLndlYlNvY2tldENsb3NlZCk6CisKIDIwMTEtMDMt MjcgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgWXVyeSBTZW1pa2hhdHNreS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3IuanNvbiBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3IuanNvbgppbmRleCBiNTFiN2JlOTZkNWZlNjk5ZDI1YjllNzRjYjg0YTI0MTdmNWE4ZGVhLi4z MGNhM2QxMmRiNDZhMDExMzEyN2U4OTY3MzlhMzdlYmVjZDczNTU2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCkBAIC0zNDQsMTQgKzM0NCwxNCBAQAogICAgICAgICBd LAogICAgICAgICAiZXZlbnRzIjogWwogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJu YW1lIjogImZyYW1lRGV0YWNoZWRGcm9tUGFyZW50IiwKKyAgICAgICAgICAgICAgICAibmFtZSI6 ICJmcmFtZURldGFjaGVkIiwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRmlyZWQg d2hlbiBmcmFtZSBoYXMgYmVlbiBkZXRhY2hlZCBmcm9tIGl0cyBwYXJlbnQuIiwKICAgICAgICAg ICAgICAgICAicGFyYW1ldGVycyI6IFsKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJm cmFtZUlkIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIklmIG9mIHRoZSBmcmFt ZSB0aGF0IGhhcyBiZWVuIGRldGFjaGVkLiIgfQogICAgICAgICAgICAgICAgIF0KICAgICAgICAg ICAgIH0sCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgIm5hbWUiOiAid2lsbFNlbmRS ZXF1ZXN0IiwKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJyZXF1ZXN0V2lsbEJlU2VudCIsCiAg ICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkZpcmVkIHdoZW4gcGFnZSBpcyBhYm91dCB0 byBzZW5kIEhUVFAgcmVxdWVzdC4iLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwog ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImlkZW50aWZpZXIiLCAidHlwZSI6ICJpbnRl Z2VyIiwgImRlc2NyaXB0aW9uIjogIlJlcXVlc3QgaWRlbnRpZmllci4iIH0sCkBAIC0zNjUsMTQg KzM2NSwxNCBAQAogICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgIH0sCiAgICAgICAgICAg ICB7Ci0gICAgICAgICAgICAgICAgIm5hbWUiOiAibWFya1Jlc291cmNlQXNDYWNoZWQiLAorICAg ICAgICAgICAgICAgICJuYW1lIjogInJlc291cmNlTWFya2VkQXNDYWNoZWQiLAogICAgICAgICAg ICAgICAgICJkZXNjcmlwdGlvbiI6ICJGaXJlZCB3aGVuIHJlcXVlc3QgaXMga25vd24gdG8gYmUg c2VydmVkIGZyb20gbWVtb3J5IGNhY2hlLiIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMi OiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaWRlbnRpZmllciIsICJ0eXBlIjog ImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiUmVxdWVzdCBpZGVudGlmaWVyLiIgfQogICAgICAg ICAgICAgICAgIF0KICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAg ICAgIm5hbWUiOiAiZGlkUmVjZWl2ZVJlc3BvbnNlIiwKKyAgICAgICAgICAgICAgICAibmFtZSI6 ICJyZXNwb25zZVJlY2VpdmVkIiwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRmly ZWQgd2hlbiBIVFRQIHJlc3BvbnNlIGlzIGF2YWlsYWJsZS4iLAogICAgICAgICAgICAgICAgICJw YXJhbWV0ZXJzIjogWwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImlkZW50aWZpZXIi LCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIlJlcXVlc3QgaWRlbnRpZmllci4i IH0sCkBAIC0zODIsNyArMzgyLDcgQEAKICAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9 LAogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIjogImRpZFJlY2VpdmVDb250 ZW50TGVuZ3RoIiwKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJkYXRhUmVjZWl2ZWQiLAogICAg ICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJGaXJlZCB3aGVuIGRhdGEgY2h1bmsgd2FzIHJl Y2VpdmVkIG92ZXIgdGhlIG5ldHdvcmsuIiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6 IFsKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJpZGVudGlmaWVyIiwgInR5cGUiOiAi aW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJSZXF1ZXN0IGlkZW50aWZpZXIuIiB9LApAQCAtMzky LDcgKzM5Miw3IEBACiAgICAgICAgICAgICAgICAgXQogICAgICAgICAgICAgfSwKICAgICAgICAg ICAgIHsKLSAgICAgICAgICAgICAgICAibmFtZSI6ICJkaWRGaW5pc2hMb2FkaW5nIiwKKyAgICAg ICAgICAgICAgICAibmFtZSI6ICJsb2FkaW5nRmluaXNoZWQiLAogICAgICAgICAgICAgICAgICJk ZXNjcmlwdGlvbiI6ICJGaXJlZCB3aGVuIEhUVFAgcmVxdWVzdCBoYXMgZmluaXNoZWQgbG9hZGlu Zy4iLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwogICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogImlkZW50aWZpZXIiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9u IjogIlJlcXVlc3QgaWRlbnRpZmllci4iIH0sCkBAIC00MDAsNyArNDAwLDcgQEAKICAgICAgICAg ICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewotICAgICAgICAgICAgICAg ICJuYW1lIjogImRpZEZhaWxMb2FkaW5nIiwKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJsb2Fk aW5nRmFpbGVkIiwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRmlyZWQgd2hlbiBI VFRQIHJlcXVlc3QgaGFzIGZhaWxlZCB0byBsb2FkLiIsCiAgICAgICAgICAgICAgICAgInBhcmFt ZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaWRlbnRpZmllciIsICJ0 eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiUmVxdWVzdCBpZGVudGlmaWVyLiIgfSwK QEAgLTQwOSw3ICs0MDksNyBAQAogICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgIH0sCiAg ICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgIm5hbWUiOiAiZGlkTG9hZFJlc291cmNlRnJv bU1lbW9yeUNhY2hlIiwKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJyZXNvdXJjZUxvYWRlZEZy b21NZW1vcnlDYWNoZSIsCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkZpcmVkIHdo ZW4gSFRUUCByZXF1ZXN0IGhhcyBiZWVuIHNlcnZlZCBmcm9tIG1lbW9yeSBjYWNoZS4iLAogICAg ICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogImZyYW1lSWQiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiRnJhbWUgaWRl bnRpZmllci4iIH0sCkBAIC00MjAsNyArNDIwLDcgQEAKICAgICAgICAgICAgICAgICBdCiAgICAg ICAgICAgICB9LAogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIjogInNldElu aXRpYWxDb250ZW50IiwKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJpbml0aWFsQ29udGVudFNl dCIsCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkZpcmVkIGZvciBYTUxIdHRwUmVx dWVzdHMgd2hlbiB0aGVpciBjb250ZW50IGJlY29tZXMgYXZhaWxhYmxlLiIsCiAgICAgICAgICAg ICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaWRl bnRpZmllciIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiUmVxdWVzdCBpZGVu dGlmaWVyLiIgfSwKQEAgLTQyOSw3ICs0MjksNyBAQAogICAgICAgICAgICAgICAgIF0KICAgICAg ICAgICAgIH0sCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgIm5hbWUiOiAiZGlkQ29t bWl0TG9hZEZvckZyYW1lIiwKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJmcmFtZU5hdmlnYXRl ZCIsCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkZpcmVkIG9uY2UgbmF2aWdhdGlv biBvZiB0aGUgZnJhbWUgaGFzIGNvbXBsZXRlZC4gRnJhbWUgaXMgbm93IGFzc29jaWF0ZWQgd2l0 aCB0aGUgbmV3IGxvYWRlci4iLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwogICAg ICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImZyYW1lIiwgIiRyZWYiOiAiRnJhbWUiLCAiZGVz Y3JpcHRpb24iOiAiRnJhbWUgaWRlbnRpZmllci4iIH0sCkBAIC00MzcsMTUgKzQzNyw3IEBACiAg ICAgICAgICAgICAgICAgXQogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHsKLSAgICAgICAg ICAgICAgICAibmFtZSI6ICJkaWRDcmVhdGVXZWJTb2NrZXQiLAotICAgICAgICAgICAgICAgICJk ZXNjcmlwdGlvbiI6ICJGaXJlZCB1cG9uIFdlYlNvY2tldCBjcmVhdGlvbi4iLAotICAgICAgICAg ICAgICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImlk ZW50aWZpZXIiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIlJlcXVlc3QgaWRl bnRpZmllci4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidXJsIiwgInR5cGUi OiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIldlYlNvY2tldCByZXF1ZXN0IFVSTC4iIH0KLSAg ICAgICAgICAgICAgICBdCi0gICAgICAgICAgICB9LAotICAgICAgICAgICAgewotICAgICAgICAg ICAgICAgICJuYW1lIjogIndpbGxTZW5kV2ViU29ja2V0SGFuZHNoYWtlUmVxdWVzdCIsCisgICAg ICAgICAgICAgICAgIm5hbWUiOiAid2ViU29ja2V0V2lsbFNlbmRIYW5kc2hha2VSZXF1ZXN0IiwK ICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRmlyZWQgd2hlbiBXZWJTb2NrZXQgaXMg YWJvdXQgdG8gaW5pdGlhdGUgaGFuZHNoYWtlLiIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRl cnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaWRlbnRpZmllciIsICJ0eXBl IjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiUmVxdWVzdCBpZGVudGlmaWVyLiIgfSwKQEAg LTQ1NCw3ICs0NDYsNyBAQAogICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgIH0sCiAgICAg ICAgICAgICB7Ci0gICAgICAgICAgICAgICAgIm5hbWUiOiAiZGlkUmVjZWl2ZVdlYlNvY2tldEhh bmRzaGFrZVJlc3BvbnNlIiwKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJ3ZWJTb2NrZXRIYW5k c2hha2VSZXNwb25zZVJlY2VpdmVkIiwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAi RmlyZWQgd2hlbiBXZWJTb2NrZXQgaGFuZHNoYWtlIHJlc3BvbnNlIGJlY29tZXMgYXZhaWxhYmxl LiIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAiaWRlbnRpZmllciIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24i OiAiUmVxdWVzdCBpZGVudGlmaWVyLiIgfSwKQEAgLTQ2Myw3ICs0NTUsMTUgQEAKICAgICAgICAg ICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewotICAgICAgICAgICAgICAg ICJuYW1lIjogImRpZENsb3NlV2ViU29ja2V0IiwKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJ3 ZWJTb2NrZXRDcmVhdGVkIiwKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRmlyZWQg dXBvbiBXZWJTb2NrZXQgY3JlYXRpb24uIiwKKyAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6 IFsKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJpZGVudGlmaWVyIiwgInR5cGUiOiAi aW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJSZXF1ZXN0IGlkZW50aWZpZXIuIiB9LAorICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogInVybCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlw dGlvbiI6ICJXZWJTb2NrZXQgcmVxdWVzdCBVUkwuIiB9CisgICAgICAgICAgICAgICAgXQorICAg ICAgICAgICAgfSwKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJ3ZWJT b2NrZXRDbG9zZWQiLAogICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJGaXJlZCB3aGVu IFdlYlNvY2tldCBpcyBjbG9zZWQuIiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsK ICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJpZGVudGlmaWVyIiwgInR5cGUiOiAiaW50 ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJSZXF1ZXN0IGlkZW50aWZpZXIuIiB9LApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwCmluZGV4 IDJlNzRmZGJmZjVjYjZiNzkwZWVkYjQxNWNiNTdlZjZjNDc0ZWM0OTguLjFlMmMxNmQ4YTkzN2Y3 NDliZmM3YmRkYjA3NmI4MmI3MTMxNjZmMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKQEAgLTI5MCwxMiArMjkwLDEyIEBA IHZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6d2lsbFNlbmRSZXF1ZXN0KHVuc2lnbmVkIGxv bmcgaWRlbnRpZmllciwgRG9jdW1lbnRMCiAgICAgICAgIGNhbGxTdGFja1ZhbHVlID0gY2FsbFN0 YWNrLT5idWlsZEluc3BlY3RvckFycmF5KCk7CiAgICAgZWxzZQogICAgICAgICBjYWxsU3RhY2tW YWx1ZSA9IEluc3BlY3RvckFycmF5OjpjcmVhdGUoKTsKLSAgICBtX2Zyb250ZW5kLT53aWxsU2Vu ZFJlcXVlc3Qoc3RhdGljX2Nhc3Q8aW50PihpZGVudGlmaWVyKSwgcG9pbnRlckFzSWQobG9hZGVy LT5mcmFtZSgpKSwgcG9pbnRlckFzSWQobG9hZGVyKSwgbG9hZGVyLT51cmwoKS5zdHJpbmcoKSwg YnVpbGRPYmplY3RGb3JSZXNvdXJjZVJlcXVlc3QocmVxdWVzdCksIGJ1aWxkT2JqZWN0Rm9yUmVz b3VyY2VSZXNwb25zZShyZWRpcmVjdFJlc3BvbnNlKSwgY3VycmVudFRpbWUoKSwgY2FsbFN0YWNr VmFsdWUpOworICAgIG1fZnJvbnRlbmQtPnJlcXVlc3RXaWxsQmVTZW50KHN0YXRpY19jYXN0PGlu dD4oaWRlbnRpZmllciksIHBvaW50ZXJBc0lkKGxvYWRlci0+ZnJhbWUoKSksIHBvaW50ZXJBc0lk KGxvYWRlciksIGxvYWRlci0+dXJsKCkuc3RyaW5nKCksIGJ1aWxkT2JqZWN0Rm9yUmVzb3VyY2VS ZXF1ZXN0KHJlcXVlc3QpLCBidWlsZE9iamVjdEZvclJlc291cmNlUmVzcG9uc2UocmVkaXJlY3RS ZXNwb25zZSksIGN1cnJlbnRUaW1lKCksIGNhbGxTdGFja1ZhbHVlKTsKIH0KIAogdm9pZCBJbnNw ZWN0b3JSZXNvdXJjZUFnZW50OjptYXJrUmVzb3VyY2VBc0NhY2hlZCh1bnNpZ25lZCBsb25nIGlk ZW50aWZpZXIpCiB7Ci0gICAgbV9mcm9udGVuZC0+bWFya1Jlc291cmNlQXNDYWNoZWQoc3RhdGlj X2Nhc3Q8aW50PihpZGVudGlmaWVyKSk7CisgICAgbV9mcm9udGVuZC0+cmVzb3VyY2VNYXJrZWRB c0NhY2hlZChzdGF0aWNfY2FzdDxpbnQ+KGlkZW50aWZpZXIpKTsKIH0KIAogdm9pZCBJbnNwZWN0 b3JSZXNvdXJjZUFnZW50OjpkaWRSZWNlaXZlUmVzcG9uc2UodW5zaWduZWQgbG9uZyBpZGVudGlm aWVyLCBEb2N1bWVudExvYWRlciogbG9hZGVyLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNw b25zZSkKQEAgLTMxOCw3ICszMTgsNyBAQCB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmRp ZFJlY2VpdmVSZXNwb25zZSh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIERvY3VtZQogICAgICAg ICBlbHNlIGlmIChlcXVhbElnbm9yaW5nRnJhZ21lbnRJZGVudGlmaWVyKHJlc3BvbnNlLnVybCgp LCBsb2FkZXItPnVybCgpKSAmJiB0eXBlID09ICJPdGhlciIpCiAgICAgICAgICAgICB0eXBlID0g IkRvY3VtZW50IjsKICAgICB9Ci0gICAgbV9mcm9udGVuZC0+ZGlkUmVjZWl2ZVJlc3BvbnNlKHN0 YXRpY19jYXN0PGludD4oaWRlbnRpZmllciksIGN1cnJlbnRUaW1lKCksIHR5cGUsIHJlc291cmNl UmVzcG9uc2UpOworICAgIG1fZnJvbnRlbmQtPnJlc3BvbnNlUmVjZWl2ZWQoc3RhdGljX2Nhc3Q8 aW50PihpZGVudGlmaWVyKSwgY3VycmVudFRpbWUoKSwgdHlwZSwgcmVzb3VyY2VSZXNwb25zZSk7 CiAgICAgLy8gSWYgd2UgcmV2YWxpZGF0ZWQgdGhlIHJlc291cmNlIGFuZCBnb3QgTm90IG1vZGlm aWVkLCBzZW5kIGNvbnRlbnQgbGVuZ3RoIGZvbGxvd2luZyBkaWRSZWNlaXZlUmVzcG9uc2UKICAg ICAvLyBhcyB0aGVyZSB3aWxsIGJlIG5vIGNhbGxzIHRvIGRpZFJlY2VpdmVDb250ZW50TGVuZ3Ro IGZyb20gdGhlIG5ldHdvcmsgc3RhY2suCiAgICAgaWYgKGNhY2hlZFJlc291cmNlU2l6ZSAmJiBy ZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpID09IDMwNCkKQEAgLTMyNyw3ICszMjcsNyBAQCB2b2lk IEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmRpZFJlY2VpdmVSZXNwb25zZSh1bnNpZ25lZCBsb25n IGlkZW50aWZpZXIsIERvY3VtZQogCiB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmRpZFJl Y2VpdmVDb250ZW50TGVuZ3RoKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgaW50IGRhdGFMZW5n dGgsIGludCBsZW5ndGhSZWNlaXZlZCkKIHsKLSAgICBtX2Zyb250ZW5kLT5kaWRSZWNlaXZlQ29u dGVudExlbmd0aChzdGF0aWNfY2FzdDxpbnQ+KGlkZW50aWZpZXIpLCBjdXJyZW50VGltZSgpLCBk YXRhTGVuZ3RoLCBsZW5ndGhSZWNlaXZlZCk7CisgICAgbV9mcm9udGVuZC0+ZGF0YVJlY2VpdmVk KHN0YXRpY19jYXN0PGludD4oaWRlbnRpZmllciksIGN1cnJlbnRUaW1lKCksIGRhdGFMZW5ndGgs IGxlbmd0aFJlY2VpdmVkKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpkaWRG aW5pc2hMb2FkaW5nKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgZG91YmxlIGZpbmlzaFRpbWUp CkBAIC0zMzUsMjIgKzMzNSwyMiBAQCB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmRpZEZp bmlzaExvYWRpbmcodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBkb3VibGUgZgogICAgIGlmICgh ZmluaXNoVGltZSkKICAgICAgICAgZmluaXNoVGltZSA9IGN1cnJlbnRUaW1lKCk7CiAKLSAgICBt X2Zyb250ZW5kLT5kaWRGaW5pc2hMb2FkaW5nKHN0YXRpY19jYXN0PGludD4oaWRlbnRpZmllciks IGZpbmlzaFRpbWUpOworICAgIG1fZnJvbnRlbmQtPmxvYWRpbmdGaW5pc2hlZChzdGF0aWNfY2Fz dDxpbnQ+KGlkZW50aWZpZXIpLCBmaW5pc2hUaW1lKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JSZXNv dXJjZUFnZW50OjpkaWRGYWlsTG9hZGluZyh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0 IFJlc291cmNlRXJyb3ImIGVycm9yKQogewotICAgIG1fZnJvbnRlbmQtPmRpZEZhaWxMb2FkaW5n KHN0YXRpY19jYXN0PGludD4oaWRlbnRpZmllciksIGN1cnJlbnRUaW1lKCksIGVycm9yLmxvY2Fs aXplZERlc2NyaXB0aW9uKCkpOworICAgIG1fZnJvbnRlbmQtPmxvYWRpbmdGYWlsZWQoc3RhdGlj X2Nhc3Q8aW50PihpZGVudGlmaWVyKSwgY3VycmVudFRpbWUoKSwgZXJyb3IubG9jYWxpemVkRGVz Y3JpcHRpb24oKSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZGlkTG9hZFJl c291cmNlRnJvbU1lbW9yeUNhY2hlKERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIGNvbnN0IENhY2hl ZFJlc291cmNlKiByZXNvdXJjZSkKIHsKLSAgICBtX2Zyb250ZW5kLT5kaWRMb2FkUmVzb3VyY2VG cm9tTWVtb3J5Q2FjaGUocG9pbnRlckFzSWQobG9hZGVyLT5mcmFtZSgpKSwgcG9pbnRlckFzSWQo bG9hZGVyKSwgbG9hZGVyLT51cmwoKS5zdHJpbmcoKSwgY3VycmVudFRpbWUoKSwgYnVpbGRPYmpl Y3RGb3JDYWNoZWRSZXNvdXJjZSgqcmVzb3VyY2UpKTsKKyAgICBtX2Zyb250ZW5kLT5yZXNvdXJj ZUxvYWRlZEZyb21NZW1vcnlDYWNoZShwb2ludGVyQXNJZChsb2FkZXItPmZyYW1lKCkpLCBwb2lu dGVyQXNJZChsb2FkZXIpLCBsb2FkZXItPnVybCgpLnN0cmluZygpLCBjdXJyZW50VGltZSgpLCBi dWlsZE9iamVjdEZvckNhY2hlZFJlc291cmNlKCpyZXNvdXJjZSkpOwogfQogCiB2b2lkIEluc3Bl Y3RvclJlc291cmNlQWdlbnQ6OnNldEluaXRpYWxDb250ZW50KHVuc2lnbmVkIGxvbmcgaWRlbnRp ZmllciwgY29uc3QgU3RyaW5nJiBzb3VyY2VTdHJpbmcsIGNvbnN0IFN0cmluZyYgdHlwZSkKIHsK LSAgICBtX2Zyb250ZW5kLT5zZXRJbml0aWFsQ29udGVudChzdGF0aWNfY2FzdDxpbnQ+KGlkZW50 aWZpZXIpLCBzb3VyY2VTdHJpbmcsIHR5cGUpOworICAgIG1fZnJvbnRlbmQtPmluaXRpYWxDb250 ZW50U2V0KHN0YXRpY19jYXN0PGludD4oaWRlbnRpZmllciksIHNvdXJjZVN0cmluZywgdHlwZSk7 CiB9CiAKIHN0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gYnVpbGRPYmplY3RGb3JG cmFtZShGcmFtZSogZnJhbWUpCkBAIC00MDEsMTIgKzQwMSwxMiBAQCBzdGF0aWMgUGFzc1JlZlB0 cjxJbnNwZWN0b3JPYmplY3Q+IGJ1aWxkT2JqZWN0Rm9yRnJhbWVUcmVlKEZyYW1lKiBmcmFtZSkK IAogdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpkaWRDb21taXRMb2FkKERvY3VtZW50TG9h ZGVyKiBsb2FkZXIpCiB7Ci0gICAgbV9mcm9udGVuZC0+ZGlkQ29tbWl0TG9hZEZvckZyYW1lKGJ1 aWxkT2JqZWN0Rm9yRnJhbWUobG9hZGVyLT5mcmFtZSgpKSwgcG9pbnRlckFzSWQobG9hZGVyKSk7 CisgICAgbV9mcm9udGVuZC0+ZnJhbWVOYXZpZ2F0ZWQoYnVpbGRPYmplY3RGb3JGcmFtZShsb2Fk ZXItPmZyYW1lKCkpLCBwb2ludGVyQXNJZChsb2FkZXIpKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JS ZXNvdXJjZUFnZW50OjpmcmFtZURldGFjaGVkRnJvbVBhcmVudChGcmFtZSogZnJhbWUpCiB7Ci0g ICAgbV9mcm9udGVuZC0+ZnJhbWVEZXRhY2hlZEZyb21QYXJlbnQocG9pbnRlckFzSWQoZnJhbWUp KTsKKyAgICBtX2Zyb250ZW5kLT5mcmFtZURldGFjaGVkKHBvaW50ZXJBc0lkKGZyYW1lKSk7CiB9 CiAKICNpZiBFTkFCTEUoV0VCX1NPQ0tFVFMpCkBAIC00MjgsNyArNDI4LDcgQEAgc3RhdGljIFN0 cmluZyBjcmVhdGVSZWFkYWJsZVN0cmluZ0Zyb21CaW5hcnkoY29uc3QgdW5zaWduZWQgY2hhciog dmFsdWUsIHNpemVfdAogCiB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmRpZENyZWF0ZVdl YlNvY2tldCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IEtVUkwmIHJlcXVlc3RVUkwp CiB7Ci0gICAgbV9mcm9udGVuZC0+ZGlkQ3JlYXRlV2ViU29ja2V0KHN0YXRpY19jYXN0PGludD4o aWRlbnRpZmllciksIHJlcXVlc3RVUkwuc3RyaW5nKCkpOworICAgIG1fZnJvbnRlbmQtPndlYlNv Y2tldENyZWF0ZWQoc3RhdGljX2Nhc3Q8aW50PihpZGVudGlmaWVyKSwgcmVxdWVzdFVSTC5zdHJp bmcoKSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6d2lsbFNlbmRXZWJTb2Nr ZXRIYW5kc2hha2VSZXF1ZXN0KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgV2ViU29j a2V0SGFuZHNoYWtlUmVxdWVzdCYgcmVxdWVzdCkKQEAgLTQzNiw3ICs0MzYsNyBAQCB2b2lkIElu c3BlY3RvclJlc291cmNlQWdlbnQ6OndpbGxTZW5kV2ViU29ja2V0SGFuZHNoYWtlUmVxdWVzdCh1 bnNpZ25lZCBsb25nIGlkZQogICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlcXVlc3RPYmpl Y3QgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwogICAgIHJlcXVlc3RPYmplY3QtPnNldE9i amVjdCgiaGVhZGVycyIsIGJ1aWxkT2JqZWN0Rm9ySGVhZGVycyhyZXF1ZXN0LmhlYWRlckZpZWxk cygpKSk7CiAgICAgcmVxdWVzdE9iamVjdC0+c2V0U3RyaW5nKCJyZXF1ZXN0S2V5MyIsIGNyZWF0 ZVJlYWRhYmxlU3RyaW5nRnJvbUJpbmFyeShyZXF1ZXN0LmtleTMoKS52YWx1ZSwgc2l6ZW9mKHJl cXVlc3Qua2V5MygpLnZhbHVlKSkpOwotICAgIG1fZnJvbnRlbmQtPndpbGxTZW5kV2ViU29ja2V0 SGFuZHNoYWtlUmVxdWVzdChzdGF0aWNfY2FzdDxpbnQ+KGlkZW50aWZpZXIpLCBjdXJyZW50VGlt ZSgpLCByZXF1ZXN0T2JqZWN0KTsKKyAgICBtX2Zyb250ZW5kLT53ZWJTb2NrZXRXaWxsU2VuZEhh bmRzaGFrZVJlcXVlc3Qoc3RhdGljX2Nhc3Q8aW50PihpZGVudGlmaWVyKSwgY3VycmVudFRpbWUo KSwgcmVxdWVzdE9iamVjdCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZGlk UmVjZWl2ZVdlYlNvY2tldEhhbmRzaGFrZVJlc3BvbnNlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmll ciwgY29uc3QgV2ViU29ja2V0SGFuZHNoYWtlUmVzcG9uc2UmIHJlc3BvbnNlKQpAQCAtNDQ2LDEy ICs0NDYsMTIgQEAgdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpkaWRSZWNlaXZlV2ViU29j a2V0SGFuZHNoYWtlUmVzcG9uc2UodW5zaWduZWQgbG9uZwogICAgIHJlc3BvbnNlT2JqZWN0LT5z ZXRTdHJpbmcoInN0YXR1c1RleHQiLCByZXNwb25zZS5zdGF0dXNUZXh0KCkpOwogICAgIHJlc3Bv bnNlT2JqZWN0LT5zZXRPYmplY3QoImhlYWRlcnMiLCBidWlsZE9iamVjdEZvckhlYWRlcnMocmVz cG9uc2UuaGVhZGVyRmllbGRzKCkpKTsKICAgICByZXNwb25zZU9iamVjdC0+c2V0U3RyaW5nKCJj aGFsbGVuZ2VSZXNwb25zZSIsIGNyZWF0ZVJlYWRhYmxlU3RyaW5nRnJvbUJpbmFyeShyZXNwb25z ZS5jaGFsbGVuZ2VSZXNwb25zZSgpLnZhbHVlLCBzaXplb2YocmVzcG9uc2UuY2hhbGxlbmdlUmVz cG9uc2UoKS52YWx1ZSkpKTsKLSAgICBtX2Zyb250ZW5kLT5kaWRSZWNlaXZlV2ViU29ja2V0SGFu ZHNoYWtlUmVzcG9uc2Uoc3RhdGljX2Nhc3Q8aW50PihpZGVudGlmaWVyKSwgY3VycmVudFRpbWUo KSwgcmVzcG9uc2VPYmplY3QpOworICAgIG1fZnJvbnRlbmQtPndlYlNvY2tldEhhbmRzaGFrZVJl c3BvbnNlUmVjZWl2ZWQoc3RhdGljX2Nhc3Q8aW50PihpZGVudGlmaWVyKSwgY3VycmVudFRpbWUo KSwgcmVzcG9uc2VPYmplY3QpOwogfQogCiB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmRp ZENsb3NlV2ViU29ja2V0KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcikKIHsKLSAgICBtX2Zyb250 ZW5kLT5kaWRDbG9zZVdlYlNvY2tldChzdGF0aWNfY2FzdDxpbnQ+KGlkZW50aWZpZXIpLCBjdXJy ZW50VGltZSgpKTsKKyAgICBtX2Zyb250ZW5kLT53ZWJTb2NrZXRDbG9zZWQoc3RhdGljX2Nhc3Q8 aW50PihpZGVudGlmaWVyKSwgY3VycmVudFRpbWUoKSk7CiB9CiAjZW5kaWYgLy8gRU5BQkxFKFdF Ql9TT0NLRVRTKQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL05ldHdvcmtNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9OZXR3b3JrTWFuYWdlci5qcwppbmRleCAzOTA1YWIzOTNhYWI5ZWU3NzgxOTEyNzkzNmRmZjdi M2I0ZmJjODNlLi45OGFhMDYwYmI0OTEzY2VhOWQwMTg1MzQyYWIwZGUwN2RkN2IxZGM3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2Vy LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFn ZXIuanMKQEAgLTExMiwxMSArMTEyLDExIEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hl ci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3VwZGF0ZVJlc291cmNlV2l0aFJlc3BvbnNl KHJlc291cmNlLCBjYWNoZWRSZXNvdXJjZS5yZXNwb25zZSk7CiAgICAgfSwKIAotICAgIHdpbGxT ZW5kUmVxdWVzdDogZnVuY3Rpb24oaWRlbnRpZmllciwgZnJhbWVJZCwgbG9hZGVySWQsIGRvY3Vt ZW50VVJMLCByZXF1ZXN0LCByZWRpcmVjdFJlc3BvbnNlLCB0aW1lLCBjYWxsU3RhY2spCisgICAg cmVxdWVzdFdpbGxCZVNlbnQ6IGZ1bmN0aW9uKGlkZW50aWZpZXIsIGZyYW1lSWQsIGxvYWRlcklk LCBkb2N1bWVudFVSTCwgcmVxdWVzdCwgcmVkaXJlY3RSZXNwb25zZSwgdGltZSwgY2FsbFN0YWNr KQogICAgIHsKICAgICAgICAgdmFyIHJlc291cmNlID0gdGhpcy5faW5mbGlnaHRSZXNvdXJjZXNC eUlkW2lkZW50aWZpZXJdOwogICAgICAgICBpZiAocmVzb3VyY2UpIHsKLSAgICAgICAgICAgIHRo aXMuZGlkUmVjZWl2ZVJlc3BvbnNlKGlkZW50aWZpZXIsIHRpbWUsICJPdGhlciIsIHJlZGlyZWN0 UmVzcG9uc2UpOworICAgICAgICAgICAgdGhpcy5yZXNwb25zZVJlY2VpdmVkKGlkZW50aWZpZXIs IHRpbWUsICJPdGhlciIsIHJlZGlyZWN0UmVzcG9uc2UpOwogICAgICAgICAgICAgcmVzb3VyY2Ug PSB0aGlzLl9hcHBlbmRSZWRpcmVjdChpZGVudGlmaWVyLCB0aW1lLCByZXF1ZXN0LnVybCk7CiAg ICAgICAgIH0gZWxzZQogICAgICAgICAgICAgcmVzb3VyY2UgPSB0aGlzLl9jcmVhdGVSZXNvdXJj ZShpZGVudGlmaWVyLCBmcmFtZUlkLCBsb2FkZXJJZCwgcmVxdWVzdC51cmwsIGRvY3VtZW50VVJM LCBjYWxsU3RhY2spOwpAQCAtMTI2LDcgKzEyNiw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGlz cGF0Y2hlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3N0YXJ0UmVzb3VyY2UocmVzb3Vy Y2UpOwogICAgIH0sCiAKLSAgICBtYXJrUmVzb3VyY2VBc0NhY2hlZDogZnVuY3Rpb24oaWRlbnRp ZmllcikKKyAgICByZXNvdXJjZU1hcmtlZEFzQ2FjaGVkOiBmdW5jdGlvbihpZGVudGlmaWVyKQog ICAgIHsKICAgICAgICAgdmFyIHJlc291cmNlID0gdGhpcy5faW5mbGlnaHRSZXNvdXJjZXNCeUlk W2lkZW50aWZpZXJdOwogICAgICAgICBpZiAoIXJlc291cmNlKQpAQCAtMTM2LDcgKzEzNiw3IEBA IFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRo aXMuX3VwZGF0ZVJlc291cmNlKHJlc291cmNlKTsKICAgICB9LAogCi0gICAgZGlkUmVjZWl2ZVJl c3BvbnNlOiBmdW5jdGlvbihpZGVudGlmaWVyLCB0aW1lLCByZXNvdXJjZVR5cGUsIHJlc3BvbnNl KQorICAgIHJlc3BvbnNlUmVjZWl2ZWQ6IGZ1bmN0aW9uKGlkZW50aWZpZXIsIHRpbWUsIHJlc291 cmNlVHlwZSwgcmVzcG9uc2UpCiAgICAgewogICAgICAgICB2YXIgcmVzb3VyY2UgPSB0aGlzLl9p bmZsaWdodFJlc291cmNlc0J5SWRbaWRlbnRpZmllcl07CiAgICAgICAgIGlmICghcmVzb3VyY2Up CkBAIC0xNTAsNyArMTUwLDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnByb3Rv dHlwZSA9IHsKICAgICAgICAgdGhpcy5fdXBkYXRlUmVzb3VyY2UocmVzb3VyY2UpOwogICAgIH0s CiAKLSAgICBkaWRSZWNlaXZlQ29udGVudExlbmd0aDogZnVuY3Rpb24oaWRlbnRpZmllciwgdGlt ZSwgZGF0YUxlbmd0aCwgbGVuZ3RoUmVjZWl2ZWQpCisgICAgZGF0YVJlY2VpdmVkOiBmdW5jdGlv bihpZGVudGlmaWVyLCB0aW1lLCBkYXRhTGVuZ3RoLCBsZW5ndGhSZWNlaXZlZCkKICAgICB7CiAg ICAgICAgIHZhciByZXNvdXJjZSA9IHRoaXMuX2luZmxpZ2h0UmVzb3VyY2VzQnlJZFtpZGVudGlm aWVyXTsKICAgICAgICAgaWYgKCFyZXNvdXJjZSkKQEAgLTE2NCw3ICsxNjQsNyBAQCBXZWJJbnNw ZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl91cGRh dGVSZXNvdXJjZShyZXNvdXJjZSk7CiAgICAgfSwKIAotICAgIGRpZEZpbmlzaExvYWRpbmc6IGZ1 bmN0aW9uKGlkZW50aWZpZXIsIGZpbmlzaFRpbWUpCisgICAgbG9hZGluZ0ZpbmlzaGVkOiBmdW5j dGlvbihpZGVudGlmaWVyLCBmaW5pc2hUaW1lKQogICAgIHsKICAgICAgICAgdmFyIHJlc291cmNl ID0gdGhpcy5faW5mbGlnaHRSZXNvdXJjZXNCeUlkW2lkZW50aWZpZXJdOwogICAgICAgICBpZiAo IXJlc291cmNlKQpAQCAtMTczLDcgKzE3Myw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0 Y2hlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2ZpbmlzaFJlc291cmNlKHJlc291cmNl LCBmaW5pc2hUaW1lKTsKICAgICB9LAogCi0gICAgZGlkRmFpbExvYWRpbmc6IGZ1bmN0aW9uKGlk ZW50aWZpZXIsIHRpbWUsIGxvY2FsaXplZERlc2NyaXB0aW9uKQorICAgIGxvYWRpbmdGYWlsZWQ6 IGZ1bmN0aW9uKGlkZW50aWZpZXIsIHRpbWUsIGxvY2FsaXplZERlc2NyaXB0aW9uKQogICAgIHsK ICAgICAgICAgdmFyIHJlc291cmNlID0gdGhpcy5faW5mbGlnaHRSZXNvdXJjZXNCeUlkW2lkZW50 aWZpZXJdOwogICAgICAgICBpZiAoIXJlc291cmNlKQpAQCAtMTg0LDcgKzE4NCw3IEBAIFdlYklu c3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2Zp bmlzaFJlc291cmNlKHJlc291cmNlLCB0aW1lKTsKICAgICB9LAogCi0gICAgZGlkTG9hZFJlc291 cmNlRnJvbU1lbW9yeUNhY2hlOiBmdW5jdGlvbihmcmFtZUlkLCBsb2FkZXJJZCwgZG9jdW1lbnRV UkwsIHRpbWUsIGNhY2hlZFJlc291cmNlKQorICAgIHJlc291cmNlTG9hZGVkRnJvbU1lbW9yeUNh Y2hlOiBmdW5jdGlvbihmcmFtZUlkLCBsb2FkZXJJZCwgZG9jdW1lbnRVUkwsIHRpbWUsIGNhY2hl ZFJlc291cmNlKQogICAgIHsKICAgICAgICAgdmFyIHJlc291cmNlID0gdGhpcy5fY3JlYXRlUmVz b3VyY2UoImNhY2hlZDoiICsgKyt0aGlzLl9sYXN0SWRlbnRpZmllckZvckNhY2hlZFJlc291cmNl LCBmcmFtZUlkLCBsb2FkZXJJZCwgY2FjaGVkUmVzb3VyY2UudXJsLCBkb2N1bWVudFVSTCk7CiAg ICAgICAgIHRoaXMuX3VwZGF0ZVJlc291cmNlV2l0aENhY2hlZFJlc291cmNlKHJlc291cmNlLCBj YWNoZWRSZXNvdXJjZSk7CkBAIC0xOTUsMTIgKzE5NSwxMiBAQCBXZWJJbnNwZWN0b3IuTmV0d29y a0Rpc3BhdGNoZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9maW5pc2hSZXNvdXJjZShy ZXNvdXJjZSwgdGltZSk7CiAgICAgfSwKIAotICAgIGZyYW1lRGV0YWNoZWRGcm9tUGFyZW50OiBm dW5jdGlvbihmcmFtZUlkKQorICAgIGZyYW1lRGV0YWNoZWQ6IGZ1bmN0aW9uKGZyYW1lSWQpCiAg ICAgewogICAgICAgICB0aGlzLl9kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9y Lk5ldHdvcmtNYW5hZ2VyLkV2ZW50VHlwZXMuRnJhbWVEZXRhY2hlZCwgZnJhbWVJZCk7CiAgICAg fSwKIAotICAgIHNldEluaXRpYWxDb250ZW50OiBmdW5jdGlvbihpZGVudGlmaWVyLCBzb3VyY2VT dHJpbmcsIHR5cGUpCisgICAgaW5pdGlhbENvbnRlbnRTZXQ6IGZ1bmN0aW9uKGlkZW50aWZpZXIs IHNvdXJjZVN0cmluZywgdHlwZSkKICAgICB7CiAgICAgICAgIHZhciByZXNvdXJjZSA9IFdlYklu c3BlY3Rvci5uZXR3b3JrUmVzb3VyY2VCeUlkKGlkZW50aWZpZXIpOwogICAgICAgICBpZiAoIXJl c291cmNlKQpAQCAtMjExLDE5ICsyMTEsMTkgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRj aGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fdXBkYXRlUmVzb3VyY2UocmVzb3VyY2Up OwogICAgIH0sCiAKLSAgICBkaWRDb21taXRMb2FkRm9yRnJhbWU6IGZ1bmN0aW9uKGZyYW1lLCBs b2FkZXJJZCkKKyAgICBmcmFtZU5hdmlnYXRlZDogZnVuY3Rpb24oZnJhbWUsIGxvYWRlcklkKQog ICAgIHsKICAgICAgICAgdGhpcy5fZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rv ci5OZXR3b3JrTWFuYWdlci5FdmVudFR5cGVzLkZyYW1lQ29tbWl0dGVkTG9hZCwgeyBmcmFtZTog ZnJhbWUsIGxvYWRlcklkOiBsb2FkZXJJZCB9KTsKICAgICB9LAogCi0gICAgZGlkQ3JlYXRlV2Vi U29ja2V0OiBmdW5jdGlvbihpZGVudGlmaWVyLCByZXF1ZXN0VVJMKQorICAgIHdlYlNvY2tldENy ZWF0ZWQ6IGZ1bmN0aW9uKGlkZW50aWZpZXIsIHJlcXVlc3RVUkwpCiAgICAgewogICAgICAgICB2 YXIgcmVzb3VyY2UgPSB0aGlzLl9jcmVhdGVSZXNvdXJjZShpZGVudGlmaWVyLCBudWxsLCBudWxs LCByZXF1ZXN0VVJMKTsKICAgICAgICAgcmVzb3VyY2UudHlwZSA9IFdlYkluc3BlY3Rvci5SZXNv dXJjZS5UeXBlLldlYlNvY2tldDsKICAgICAgICAgdGhpcy5fc3RhcnRSZXNvdXJjZShyZXNvdXJj ZSk7CiAgICAgfSwKIAotICAgIHdpbGxTZW5kV2ViU29ja2V0SGFuZHNoYWtlUmVxdWVzdDogZnVu Y3Rpb24oaWRlbnRpZmllciwgdGltZSwgcmVxdWVzdCkKKyAgICB3ZWJTb2NrZXRXaWxsU2VuZEhh bmRzaGFrZVJlcXVlc3Q6IGZ1bmN0aW9uKGlkZW50aWZpZXIsIHRpbWUsIHJlcXVlc3QpCiAgICAg ewogICAgICAgICB2YXIgcmVzb3VyY2UgPSB0aGlzLl9pbmZsaWdodFJlc291cmNlc0J5SWRbaWRl bnRpZmllcl07CiAgICAgICAgIGlmICghcmVzb3VyY2UpCkBAIC0yMzcsNyArMjM3LDcgQEAgV2Vi SW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5f dXBkYXRlUmVzb3VyY2UocmVzb3VyY2UpOwogICAgIH0sCiAKLSAgICBkaWRSZWNlaXZlV2ViU29j a2V0SGFuZHNoYWtlUmVzcG9uc2U6IGZ1bmN0aW9uKGlkZW50aWZpZXIsIHRpbWUsIHJlc3BvbnNl KQorICAgIHdlYlNvY2tldEhhbmRzaGFrZVJlc3BvbnNlUmVjZWl2ZWQ6IGZ1bmN0aW9uKGlkZW50 aWZpZXIsIHRpbWUsIHJlc3BvbnNlKQogICAgIHsKICAgICAgICAgdmFyIHJlc291cmNlID0gdGhp cy5faW5mbGlnaHRSZXNvdXJjZXNCeUlkW2lkZW50aWZpZXJdOwogICAgICAgICBpZiAoIXJlc291 cmNlKQpAQCAtMjUyLDcgKzI1Miw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5w cm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3VwZGF0ZVJlc291cmNlKHJlc291cmNlKTsKICAg ICB9LAogCi0gICAgZGlkQ2xvc2VXZWJTb2NrZXQ6IGZ1bmN0aW9uKGlkZW50aWZpZXIsIHRpbWUp CisgICAgd2ViU29ja2V0Q2xvc2VkOiBmdW5jdGlvbihpZGVudGlmaWVyLCB0aW1lKQogICAgIHsK ICAgICAgICAgdmFyIHJlc291cmNlID0gdGhpcy5faW5mbGlnaHRSZXNvdXJjZXNCeUlkW2lkZW50 aWZpZXJdOwogICAgICAgICBpZiAoIXJlc291cmNlKQo=