57761 2011-04-04 09:56:12 -0700 Web Inspector: add support for the enumerated types in the protocol. 2011-04-04 11:01:16 -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 378840 0 pfeldman 2011-04-04 09:56:12 -0700 Patch to follow. 378847 1 88072 pfeldman 2011-04-04 10:05:42 -0700 Created attachment 88072 Patch 378853 2 88072 yurys 2011-04-04 10:16:14 -0700 Comment on attachment 88072 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=88072&action=review > Source/WebCore/inspector/InspectorDebuggerAgent.cpp:307 > + if (stringPauseState == "none") Would be nice to have these constants generated from the protocol scheme. 378888 3 pfeldman 2011-04-04 11:01:16 -0700 Committed r82847: <http://trac.webkit.org/changeset/82847> 88072 2011-04-04 10:05:42 -0700 2011-04-04 10:16:13 -0700 Patch bug-57761-20110404210540.patch text/plain 23646 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODI4NDEKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkMzU5MDllZTFmMTU0MjM3ODI3ZTdm MjA2MmJhZjA4YjU5ZjlhZTFjLi41MDY4MDAwZDdjOWE3MWQwZWQ4ZjBmNGQ0YzZhYWRkNTU1YTE2 MGI5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDQtMDQgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFkZCBzdXBwb3J0IGZvciB0aGUgZW51bWVyYXRl ZCB0eXBlcyBpbiB0aGUgcHJvdG9jb2wuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01Nzc2MQorCisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL2Rl YnVnZ2VyLWF1dG9jb250aW51ZS1vbi1zeW50YXgtZXJyb3IuaHRtbDoKKyAgICAgICAgKiBpbnNw ZWN0b3IvZGVidWdnZXIvZGVidWdnZXItcGF1c2Utb24tZXhjZXB0aW9uLmh0bWw6CisKIDIwMTEt MDQtMDQgIEplc3NpZSBCZXJsaW4gIDxqYmVybGluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1v dmUgYSB0ZXN0IGZyb20gdGhlIHdpbi13azIgc2tpcHBlZCBsaXN0IHRoYXQgZG9lcyBub3QgZXhp c3QuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvZGVidWdnZXIt YXV0b2NvbnRpbnVlLW9uLXN5bnRheC1lcnJvci5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RlYnVnZ2VyL2RlYnVnZ2VyLWF1dG9jb250aW51ZS1vbi1zeW50YXgtZXJyb3IuaHRtbAppbmRl eCBiYmNiODk2MDU1ZDdhMDllZDE0NzFlZTAwOWJhY2I1NDlmOGEwN2Q4Li5hYTNhMDUxOTM2YWNi NzVjMjgwZDgxZmE3OGY5ZDhmMTE0ODFmZTM0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZGVidWdnZXIvZGVidWdnZXItYXV0b2NvbnRpbnVlLW9uLXN5bnRheC1lcnJvci5odG1s CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9kZWJ1Z2dlci1hdXRvY29udGlu dWUtb24tc3ludGF4LWVycm9yLmh0bWwKQEAgLTE4LDcgKzE4LDcgQEAgZnVuY3Rpb24gdGVzdCgp CiAKICAgICBmdW5jdGlvbiBzdGVwMSgpCiAgICAgewotICAgICAgICBEZWJ1Z2dlckFnZW50LnNl dFBhdXNlT25FeGNlcHRpb25zU3RhdGUoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5QYXVzZU9u RXhjZXB0aW9uc1N0YXRlLlBhdXNlT25VbmNhdWdodEV4Y2VwdGlvbnMpOworICAgICAgICBEZWJ1 Z2dlckFnZW50LnNldFBhdXNlT25FeGNlcHRpb25zKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwu UGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZS5QYXVzZU9uVW5jYXVnaHRFeGNlcHRpb25zKTsKICAgICAg ICAgSW5zcGVjdG9yVGVzdC5hZGRTbmlmZmVyKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90 b3R5cGUsICJhZGRNZXNzYWdlIiwgc3RlcDIpOwogICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1 YXRlSW5QYWdlKCJsb2FkSWZyYW1lKCkiKTsKICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZGVidWdnZXIvZGVidWdnZXItcGF1c2Utb24tZXhjZXB0aW9uLmh0bWwgYi9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvZGVidWdnZXItcGF1c2Utb24tZXhjZXB0aW9u Lmh0bWwKaW5kZXggNGU3NGFkM2EzYThjODMxZWU5NTJhNmE5ZWUxYzkwOTNjZTYyMzViNS4uNWRk ZDY3NDkwNTM0YWZmMmYwYjg5ZmZhYmUxNjNmNzRkY2I4MmFkNSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2RlYnVnZ2VyLXBhdXNlLW9uLWV4Y2VwdGlvbi5odG1s CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9kZWJ1Z2dlci1wYXVzZS1vbi1l eGNlcHRpb24uaHRtbApAQCAtMjAsNyArMjAsNyBAQCB2YXIgdGVzdCA9IGZ1bmN0aW9uKCkKIAog ICAgIGZ1bmN0aW9uIHN0ZXAxKCkKICAgICB7Ci0gICAgICAgIERlYnVnZ2VyQWdlbnQuc2V0UGF1 c2VPbkV4Y2VwdGlvbnNTdGF0ZShXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLlBhdXNlT25FeGNl cHRpb25zU3RhdGUuUGF1c2VPblVuY2F1Z2h0RXhjZXB0aW9ucyk7CisgICAgICAgIERlYnVnZ2Vy QWdlbnQuc2V0UGF1c2VPbkV4Y2VwdGlvbnMoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5QYXVz ZU9uRXhjZXB0aW9uc1N0YXRlLlBhdXNlT25VbmNhdWdodEV4Y2VwdGlvbnMpOwogICAgICAgICBJ bnNwZWN0b3JUZXN0LnNob3dTY3JpcHRTb3VyY2UoImRlYnVnZ2VyLXBhdXNlLW9uLWV4Y2VwdGlv bi5odG1sIiwgc3RlcDIpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDE3OTVlNmM4YjMxYzg0ODk2 NGJjMDBhNjJiYmI2NTkwOWU3MjdjY2UuLjk0YjVhZjNmMjk5ZGMzYjExNWY3YzkzMDdhZDc2ZjQx NGIzYmE1MDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxMS0wNC0wNCAgUGF2ZWwg RmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIHN1cHBvcnQgZm9yIHRo ZSBlbnVtZXJhdGVkIHR5cGVzIGluIHRoZSBwcm90b2NvbC4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3NzYxCisKKyAgICAgICAgKiBpbnNwZWN0b3Iv SW5zcGVjdG9yLmpzb246CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdl bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6c2V0UGF1 c2VPbkV4Y2VwdGlvbnMpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFn ZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OnJlc291cmNlUmV0 cmlldmVkQnlYTUxIdHRwUmVxdWVzdEltcGwpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjpzY3JpcHRJbXBvcnRlZEltcGwpOgorICAgICAgICAqIGluc3BlY3Rv ci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNhY2hlZFJl c291cmNlVHlwZVN0cmluZyk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZUFn ZW50OjpkaWRSZWNlaXZlUmVzcG9uc2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUmVz b3VyY2VBZ2VudDo6c2V0SW5pdGlhbFNjcmlwdENvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6c2V0SW5pdGlhbFhIUkNvbnRlbnQpOgorICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgICogaW5zcGVjdG9yL2dlbmVyYXRl LWluc3BlY3Rvci1pZGw6CisKIDIwMTEtMDQtMDQgIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmls bGFyQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFydGluIFJvYmluc29uLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCmluZGV4IDZkYTBhNDI0NTZmMTIy MWY3MmE5N2ZhNjc1YjU0Y2YwNGNkNzU5YTMuLjc4YjVlOGM1NjU1MzZiZThjYjRkNTBiNDk5ZjNm NjY3ZWU5YmMzZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3IuanNvbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KQEAg LTE1OSw3ICsxNTksNyBAQAogICAgICAgICAgICAgICAgICJuYW1lIjogImdldFByb3BlcnRpZXMi LAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwogICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogIm9iamVjdElkIiwgInR5cGUiOiAic3RyaW5nIiB9LAotICAgICAgICAgICAgICAg ICAgICB7ICJuYW1lIjogImlnbm9yZUhhc093blByb3BlcnR5IiwgInR5cGUiOiAiYm9vbGVhbiIg fSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJpZ25vcmVIYXNPd25Qcm9wZXJ0eSIs ICJ0eXBlIjogImJvb2xlYW4iIH0KICAgICAgICAgICAgICAgICBdLAogICAgICAgICAgICAgICAg ICJyZXR1cm5zIjogWwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInJlc3VsdCIsICJ0 eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiIgOiAiUnVudGltZVByb3BlcnR5In0gfQpA QCAtMjg1LDEyICsyODUsMTggQEAKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9LAog ICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICJpZCI6ICJSZXNvdXJjZVR5cGUiLAorICAg ICAgICAgICAgICAgICJ0eXBlIjogInN0cmluZyIsCisgICAgICAgICAgICAgICAgImVudW0iOiBb IkRvY3VtZW50IiwgIlN0eWxlc2hlZXQiLCAiSW1hZ2UiLCAiRm9udCIsICJTY3JpcHQiLCAiWEhS IiwgIldlYlNvY2tldCIsICJPdGhlciJdLAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6 ICJSZXNvdXJjZSB0eXBlIGFzIGl0IHdhcyBwZXJjZWl2ZWQgYnkgdGhlIHJlbmRlcmluZyBlbmdp bmcuIgorICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAiaWQi OiAiQ2FjaGVkUmVzb3VyY2UiLAogICAgICAgICAgICAgICAgICJ0eXBlIjogIm9iamVjdCIsCiAg ICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkluZm9ybWF0aW9uIGFib3V0IHRoZSBjYWNo ZWQgcmVzb3VyY2UuIiwKICAgICAgICAgICAgICAgICAicHJvcGVydGllcyI6IHsKICAgICAgICAg ICAgICAgICAgICAgInVybCI6IHsgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlJl c291cmNlIFVSTC4iIH0sCi0gICAgICAgICAgICAgICAgICAgICJ0eXBlIjogeyAidHlwZSI6ICJz dHJpbmciLCAiZGVzY3JpcHRpb24iOiAiVHlwZSBvZiB0aGlzIHJlc291cmNlLiAvLyBGSVhNRSIg fSwKKyAgICAgICAgICAgICAgICAgICAgInR5cGUiOiB7ICIkcmVmIjogIlJlc291cmNlVHlwZSIs ICJkZXNjcmlwdGlvbiI6ICJUeXBlIG9mIHRoaXMgcmVzb3VyY2UuIiB9LAogICAgICAgICAgICAg ICAgICAgICAicmVzcG9uc2UiOiB7ICIkcmVmIjogIlJlc291cmNlUmVzcG9uc2UiLCAiZGVzY3Jp cHRpb24iOiAiQ2FjaGVkIHJlc3BvbnNlIGRhdGEuIiB9LAogICAgICAgICAgICAgICAgICAgICAi Ym9keVNpemUiOiB7ICJ0eXBlIjogIm51bWJlciIsICJkZXNjcmlwdGlvbiI6ICJDYWNoZWQgcmVz cG9uc2UgYm9keSBzaXplLiIgfQogICAgICAgICAgICAgICAgIH0KQEAgLTMxOSw3ICszMjUsNyBA QAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICJ0eXBlIjogIm9iamVjdCIsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgInByb3BlcnRpZXMiOiB7CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICJ1cmwiOiB7ICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJS ZXNvdXJjZSBVUkwuIiB9LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAidHlwZSI6 IHsgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlR5cGUgb2YgdGhpcyByZXNvdXJj ZS4gLy8gRklYTUUiIH0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInR5cGUiOiB7 ICIkcmVmIjogIlJlc291cmNlVHlwZSIsICJkZXNjcmlwdGlvbiI6ICJUeXBlIG9mIHRoaXMgcmVz b3VyY2UuIiB9CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAg ICAgICAgICAgfSwKICAgICAgICAgICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJJbmZv cm1hdGlvbiBhYm91dCBmcmFtZSByZXNvdXJjZXMuIgpAQCAtMzk4LDcgKzQwNCw3IEBACiAgICAg ICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAiaWRlbnRpZmllciIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiUmVxdWVz dCBpZGVudGlmaWVyLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ0aW1lIiwg InR5cGUiOiAibnVtYmVyIiwgImRlc2NyaXB0aW9uIjogIlRpbWVzdGFtcC4iIH0sCi0gICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVzb3VyY2VUeXBlIiwgInR5cGUiOiAic3RyaW5nIiwg ImRlc2NyaXB0aW9uIjogIlJlc291cmNlIHR5cGUuIC8vIEZJWE1FIiB9LAorICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogInR5cGUiLCAiJHJlZiI6ICJSZXNvdXJjZVR5cGUiLCAiZGVzY3Jp cHRpb24iOiAiUmVzb3VyY2UgdHlwZS4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAicmVzcG9uc2UiLCAiJHJlZiI6ICJSZXNvdXJjZVJlc3BvbnNlIiwgImRlc2NyaXB0aW9uIjog IlJlc3BvbnNlIGRhdGEuIiB9CiAgICAgICAgICAgICAgICAgXQogICAgICAgICAgICAgfSwKQEAg LTQ0Niw3ICs0NTIsNyBAQAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwogICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogImlkZW50aWZpZXIiLCAidHlwZSI6ICJpbnRlZ2VyIiwg ImRlc2NyaXB0aW9uIjogIlJlcXVlc3QgaWRlbnRpZmllci4iIH0sCiAgICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAiY29udGVudCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6 ICJSZXNvdXJjZSBjb250ZW50LiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ0 eXBlIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlJlc291cmNlIHR5cGUuIC8v IEZJWE1FIiB9CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidHlwZSIsICIkcmVmIjog IlJlc291cmNlVHlwZSIsICJkZXNjcmlwdGlvbiI6ICJSZXNvdXJjZSB0eXBlLiIgfQogICAgICAg ICAgICAgICAgIF0KICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7CkBAIC02NzgsNyArNjg0 LDcgQEAKICAgICAgICAgICAgICAgICAibmFtZSI6ICJxdWVyeVNlbGVjdG9yIiwKICAgICAgICAg ICAgICAgICAicGFyYW1ldGVycyI6IFsKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJu b2RlSWQiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIklkIG9mIHRoZSBub2Rl IHRvIHF1ZXJ5IHVwb24uIiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNlbGVj dG9ycyIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJTZWxlY3RvciBzdHJpbmcu IiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNlbGVjdG9ycyIsICJ0eXBlIjog InN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJTZWxlY3RvciBzdHJpbmcuIiB9CiAgICAgICAgICAg ICAgICAgXSwKICAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsKICAgICAgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJub2RlSWQiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjog IlF1ZXJ5IHNlbGVjdG9yIHJlc3VsdC4iIH0KQEAgLTY4OSw3ICs2OTUsNyBAQAogICAgICAgICAg ICAgICAgICJuYW1lIjogInF1ZXJ5U2VsZWN0b3JBbGwiLAogICAgICAgICAgICAgICAgICJwYXJh bWV0ZXJzIjogWwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm5vZGVJZCIsICJ0eXBl IjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiSWQgb2YgdGhlIG5vZGUgdG8gcXVlcnkgdXBv bi4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic2VsZWN0b3JzIiwgInR5cGUi OiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlNlbGVjdG9yIHN0cmluZy4iIH0sCisgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAic2VsZWN0b3JzIiwgInR5cGUiOiAic3RyaW5nIiwgImRl c2NyaXB0aW9uIjogIlNlbGVjdG9yIHN0cmluZy4iIH0KICAgICAgICAgICAgICAgICBdLAogICAg ICAgICAgICAgICAgICJyZXR1cm5zIjogWwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog Im5vZGVJZHMiLCAidHlwZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgInR5cGUiOiAiaW50ZWdlciIg fSwgImRlc2NyaXB0aW9uIjogIlF1ZXJ5IHNlbGVjdG9yIHJlc3VsdC4iIH0KQEAgLTEwMDIsNyAr MTAwOCw3IEBACiAgICAgICAgICAgICAgICAgICAgICJzZWxlY3RvclRleHQiOiB7ICJ0eXBlIjog InN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJSdWxlIHNlbGVjdG9yLiJ9LAogICAgICAgICAgICAg ICAgICAgICAic291cmNlVVJMIjogeyAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVl LCAiZGVzY3JpcHRpb24iOiAiUGFyZW50IHN0eWxlc2hlZXQgcmVzb3VyY2UgVVJMIChmb3IgcmVn dWxhciBydWxlcykuIn0sCiAgICAgICAgICAgICAgICAgICAgICJzb3VyY2VMaW5lIjogeyAidHlw ZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIkxpbmUgb3JkaW5hbCBvZiB0aGUgcnVsZSBz ZWxlY3RvciBzdGFydCBjaGFyYWN0ZXIgaW4gdGhlIHJlc291cmNlLiJ9LAotICAgICAgICAgICAg ICAgICAgICAib3JpZ2luIjogeyAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiVGhl IHBhcmVudCBzdHlsZXNoZWV0IHR5cGU6IFwidXNlclwiIGZvciB1c2VyIHN0eWxlc2hlZXRzLCBc InVzZXItYWdlbnRcIiBmb3IgdXNlci1hZ2VudCBzdHlsZXNoZWV0cywgXCJpbnNwZWN0b3JcIiBm b3Igc3R5bGVzaGVldHMgY3JlYXRlZCBieSB0aGUgaW5zcGVjdG9yIChpLmUuIHRob3NlIGhvbGRp bmcgbmV3IHJ1bGVzIGNyZWF0ZWQgd2l0aCA8Y29kZT5hZGRSdWxlKCk8L2NvZGU+KSwgXCJcIiBm b3IgcmVndWxhciBzdHlsZXNoZWV0cy4gLy8gRklYTUUifSwKKyAgICAgICAgICAgICAgICAgICAg Im9yaWdpbiI6IHsgInR5cGUiOiAic3RyaW5nIiwgImVudW0iOiBbInVzZXIiLCAidXNlci1hZ2Vu dCIsICJpbnNwZWN0b3IiLCAiIl0sICJkZXNjcmlwdGlvbiI6ICJUaGUgcGFyZW50IHN0eWxlc2hl ZXQgdHlwZTogXCJ1c2VyXCIgZm9yIHVzZXIgc3R5bGVzaGVldHMsIFwidXNlci1hZ2VudFwiIGZv ciB1c2VyLWFnZW50IHN0eWxlc2hlZXRzLCBcImluc3BlY3RvclwiIGZvciBzdHlsZXNoZWV0cyBj cmVhdGVkIGJ5IHRoZSBpbnNwZWN0b3IgKGkuZS4gdGhvc2UgaG9sZGluZyBuZXcgcnVsZXMgY3Jl YXRlZCB3aXRoIDxjb2RlPmFkZFJ1bGUoKTwvY29kZT4pLCBcIlwiIGZvciByZWd1bGFyIHN0eWxl c2hlZXRzLiJ9LAogICAgICAgICAgICAgICAgICAgICAic3R5bGUiOiB7ICIkcmVmIjogIkNTU1N0 eWxlIiwgImRlc2NyaXB0aW9uIjogIkFzc29jaWF0ZWQgc3R5bGUgZGVjbGFyYXRpb24uIiB9LAog ICAgICAgICAgICAgICAgICAgICAic2VsZWN0b3JSYW5nZSI6IHsgIiRyZWYiOiAiU291cmNlUmFu Z2UiLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiVGhlIHJ1bGUgc2VsZWN0b3Ig cmFuZ2UgaW4gdGhlIHVuZGVybHlpbmcgcmVzb3VyY2UgKGlmIGF2YWlsYWJsZSkuIiB9CiAgICAg ICAgICAgICAgICAgfSwKQEAgLTEwNDAsNyArMTA0Niw3IEBACiAgICAgICAgICAgICAgICAgICAg ICJwcmlvcml0eSI6IHsgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2Ny aXB0aW9uIjogIlRoZSBwcm9wZXJ0eSBwcmlvcml0eSAoaW1wbGllcyBcIlwiIGlmIGFic2VudCku IiB9LAogICAgICAgICAgICAgICAgICAgICAiaW1wbGljaXQiOiB7ICJ0eXBlIjogImJvb2xlYW4i LCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiV2hldGhlciB0aGUgcHJvcGVydHkg aXMgaW1wbGljaXQgKGltcGxpZXMgPGNvZGU+ZmFsc2U8L2NvZGU+IGlmIGFic2VudCkuIiB9LAog ICAgICAgICAgICAgICAgICAgICAicGFyc2VkT2siOiB7ICJ0eXBlIjogImJvb2xlYW4iLCAib3B0 aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiV2hldGhlciB0aGUgcHJvcGVydHkgaXMgdW5k ZXJzdG9vZCBieSB0aGUgYnJvd3NlciAoaW1wbGllcyA8Y29kZT50cnVlPC9jb2RlPiBpZiBhYnNl bnQpLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgInN0YXR1cyI6IHsgInR5cGUiOiAic3RyaW5n IiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlRoZSBwcm9wZXJ0eSBzdGF0dXM6 IFwiYWN0aXZlXCIgKGltcGxpZWQgaWYgYWJzZW50KSBpZiB0aGUgcHJvcGVydHkgaXMgZWZmZWN0 aXZlIGluIHRoZSBzdHlsZSwgXCJpbmFjdGl2ZVwiIGlmIHRoZSBwcm9wZXJ0eSBpcyBvdmVycmlk ZGVuIGJ5IGEgc2FtZS1uYW1lZCBwcm9wZXJ0eSBpbiB0aGlzIHN0eWxlIGxhdGVyIG9uLCBcImRp c2FibGVkXCIgaWYgdGhlIHByb3BlcnR5IGlzIGRpc2FibGVkIGJ5IHRoZSB1c2VyLCBcInN0eWxl XCIgaWYgdGhlIHByb3BlcnR5IGlzIHJlcG9ydGVkIGJ5IHRoZSBicm93c2VyIHJhdGhlciB0aGFu IGJ5IHRoZSBDU1Mgc291cmNlIHBhcnNlci4gLy8gRklYTUUiIH0sCisgICAgICAgICAgICAgICAg ICAgICJzdGF0dXMiOiB7ICJ0eXBlIjogInN0cmluZyIsICJlbnVtIjogWyJhY3RpdmUiLCAiaW5h Y3RpdmUiLCAiZGlzYWJsZWQiLCAic3R5bGUiXSwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0 aW9uIjogIlRoZSBwcm9wZXJ0eSBzdGF0dXM6IFwiYWN0aXZlXCIgKGltcGxpZWQgaWYgYWJzZW50 KSBpZiB0aGUgcHJvcGVydHkgaXMgZWZmZWN0aXZlIGluIHRoZSBzdHlsZSwgXCJpbmFjdGl2ZVwi IGlmIHRoZSBwcm9wZXJ0eSBpcyBvdmVycmlkZGVuIGJ5IGEgc2FtZS1uYW1lZCBwcm9wZXJ0eSBp biB0aGlzIHN0eWxlIGxhdGVyIG9uLCBcImRpc2FibGVkXCIgaWYgdGhlIHByb3BlcnR5IGlzIGRp c2FibGVkIGJ5IHRoZSB1c2VyLCBcInN0eWxlXCIgaWYgdGhlIHByb3BlcnR5IGlzIHJlcG9ydGVk IGJ5IHRoZSBicm93c2VyIHJhdGhlciB0aGFuIGJ5IHRoZSBDU1Mgc291cmNlIHBhcnNlci4iIH0s CiAgICAgICAgICAgICAgICAgICAgICJzaG9ydGhhbmROYW1lIjogeyAidHlwZSI6ICJzdHJpbmci LCAiZGVzY3JpcHRpb24iOiAiVGhlIHJlbGF0ZWQgc2hvcnRoYW5kIHByb3BlcnR5IG5hbWUgKGFi c2VudCBpZiB0aGlzIHByb3BlcnR5IGlzIG5vdCBhIGxvbmdoYW5kKS4iIH0sCiAgICAgICAgICAg ICAgICAgICAgICJyYW5nZSI6IHsgIiRyZWYiOiAiU291cmNlUmFuZ2UiLCAib3B0aW9uYWwiOiB0 cnVlLCAiZGVzY3JpcHRpb24iOiAiVGhlIGVudGlyZSBwcm9wZXJ0eSByYW5nZSBpbiB0aGUgZW5j bG9zaW5nIHN0eWxlIGRlY2xhcmF0aW9uIChpZiBhdmFpbGFibGUpLiIgfQogICAgICAgICAgICAg ICAgIH0sCkBAIC0xMzUwLDkgKzEzNTYsOSBAQAogICAgICAgICAgICAgICAgICJkZXNjcmlwdGlv biI6ICJSZXR1cm5zIHNvdXJjZSBmb3IgdGhlIHNjcmlwdCB3aXRoIGdpdmVuIElELiIKICAgICAg ICAgICAgIH0sCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgIm5hbWUiOiAic2V0UGF1 c2VPbkV4Y2VwdGlvbnNTdGF0ZSIsCisgICAgICAgICAgICAgICAgIm5hbWUiOiAic2V0UGF1c2VP bkV4Y2VwdGlvbnMiLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogInBhdXNlT25FeGNlcHRpb25zU3RhdGUiLCAidHlwZSI6ICJp bnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIlBhdXNlIG9uIGV4Y2VwdGlvbnMgbW9kZS4gLy8gRklY TUUsIG1ha2UgZW51bWVyYWJsZS4iIH0KKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJz dGF0ZSIsICJ0eXBlIjogInN0cmluZyIsICJlbnVtIjogWyJub25lIiwgInVuY2F1Z2h0IiwgImFs bCJdLCAiZGVzY3JpcHRpb24iOiAiUGF1c2Ugb24gZXhjZXB0aW9ucyBtb2RlLiIgfQogICAgICAg ICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkRlZmluZXMgcGF1 c2Ugb24gZXhjZXB0aW9ucyBzdGF0ZS4gQ2FuIGJlIHNldCB0byBzdG9wIG9uIGFsbCBleGNlcHRp b25zLCB1bmNhdWdodCBleGNlcHRpb25zIG9yIG5vIGV4Y2VwdGlvbnMuIgogICAgICAgICAgICAg fSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dl ckFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFn ZW50LmNwcAppbmRleCBkZTdjMWQ4ZGFlMDEzMTVhZTUxMTRhZjExZmNiM2Y3ZWQ0ZGFhMTNiLi5j YWM2NTQ2YTM1YTA1YzY3YzA0ODgwNGUzNDA1MjYxMDI4YWVkMGU0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCkBAIC0zMDEs OCArMzAxLDE5IEBAIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6c3RlcE91dChFcnJvclN0 cmluZyopCiAgICAgc2NyaXB0RGVidWdTZXJ2ZXIoKS5zdGVwT3V0T2ZGdW5jdGlvbigpOwogfQog Ci12b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnNldFBhdXNlT25FeGNlcHRpb25zU3RhdGUo RXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBpbnQgcGF1c2VTdGF0ZSkKLXsKK3ZvaWQgSW5zcGVj dG9yRGVidWdnZXJBZ2VudDo6c2V0UGF1c2VPbkV4Y2VwdGlvbnMoRXJyb3JTdHJpbmcqIGVycm9y U3RyaW5nLCBjb25zdCBTdHJpbmcmIHN0cmluZ1BhdXNlU3RhdGUpCit7CisgICAgU2NyaXB0RGVi dWdTZXJ2ZXI6OlBhdXNlT25FeGNlcHRpb25zU3RhdGUgcGF1c2VTdGF0ZTsKKyAgICBpZiAoc3Ry aW5nUGF1c2VTdGF0ZSA9PSAibm9uZSIpCisgICAgICAgIHBhdXNlU3RhdGUgPSBTY3JpcHREZWJ1 Z1NlcnZlcjo6RG9udFBhdXNlT25FeGNlcHRpb25zOworICAgIGVsc2UgaWYgKHN0cmluZ1BhdXNl U3RhdGUgPT0gImFsbCIpCisgICAgICAgIHBhdXNlU3RhdGUgPSBTY3JpcHREZWJ1Z1NlcnZlcjo6 UGF1c2VPbkFsbEV4Y2VwdGlvbnM7CisgICAgZWxzZSBpZiAoc3RyaW5nUGF1c2VTdGF0ZSA9PSAi dW5jYXVnaHQiKQorICAgICAgICBwYXVzZVN0YXRlID0gU2NyaXB0RGVidWdTZXJ2ZXI6OlBhdXNl T25VbmNhdWdodEV4Y2VwdGlvbnM7CisgICAgZWxzZSB7CisgICAgICAgICplcnJvclN0cmluZyA9 ICJVbmtub3duIHBhdXNlIG9uIGV4Y2VwdGlvbnMgbW9kZTogIiArIHN0cmluZ1BhdXNlU3RhdGU7 CisgICAgICAgIHJldHVybjsKKyAgICB9CiAgICAgc2NyaXB0RGVidWdTZXJ2ZXIoKS5zZXRQYXVz ZU9uRXhjZXB0aW9uc1N0YXRlKHN0YXRpY19jYXN0PFNjcmlwdERlYnVnU2VydmVyOjpQYXVzZU9u RXhjZXB0aW9uc1N0YXRlPihwYXVzZVN0YXRlKSk7CiAgICAgaWYgKHNjcmlwdERlYnVnU2VydmVy KCkucGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSgpICE9IHBhdXNlU3RhdGUpCiAgICAgICAgICplcnJv clN0cmluZyA9ICJJbnRlcm5hbCBlcnJvci4gQ291bGQgbm90IGNoYW5nZSBwYXVzZSBvbiBleGNl cHRpb25zIHN0YXRlIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JEZWJ1Z2dlckFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RGVidWdnZXJBZ2VudC5oCmluZGV4IDRlNmMwMWNjMDgxOTk1NzI1ZGFhOGFiM2MwY2I3M2ZiZGNl N2MzZGEuLjUxZDYzNzZkMWE3MjMyZjU2YWMwYmM0OWRmYWVkZDI2NGI0YTg2NzMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaApAQCAt OTQsNyArOTQsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzdGVwT3ZlcihFcnJvclN0cmluZyopOwog ICAgIHZvaWQgc3RlcEludG8oRXJyb3JTdHJpbmcqKTsKICAgICB2b2lkIHN0ZXBPdXQoRXJyb3JT dHJpbmcqKTsKLSAgICB2b2lkIHNldFBhdXNlT25FeGNlcHRpb25zU3RhdGUoRXJyb3JTdHJpbmcq LCBpbnQgcGF1c2VTdGF0ZSk7CisgICAgdm9pZCBzZXRQYXVzZU9uRXhjZXB0aW9ucyhFcnJvclN0 cmluZyosIGNvbnN0IFN0cmluZyYgcGF1c2VTdGF0ZSk7CiAgICAgdm9pZCBldmFsdWF0ZU9uQ2Fs bEZyYW1lKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBjYWxsRnJhbWVJZCwgY29uc3QgU3Ry aW5nJiBleHByZXNzaW9uLCBjb25zdCBTdHJpbmcmIG9iamVjdEdyb3VwLCBjb25zdCBib29sKiBj b25zdCBvcHRpb25hbEluY2x1ZGVDb21tYW5kTGluZUFQSSwgUmVmUHRyPEluc3BlY3Rvck9iamVj dD4qIHJlc3VsdCk7CiAKICAgICBjbGFzcyBMaXN0ZW5lciB7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCmluZGV4IDZkM2I0 YWRmZjg0NTVjZGUzMTQzOTM2NzNkMDc5ZjdjMGZmNzdlY2YuLmQyYjczZjQyNzY1OWY5NWRkMGFk MDY1Y2QwMjkxMjgzOTEyNGUzNjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCkBAIC00ODQsMTMgKzQ4NCwxMyBAQCB2 b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6cmVzb3VyY2VSZXRyaWV2ZWRCeVhNTEh0dHBS ZXF1ZXN0SW1wbChJbnNwZWN0b3JBZwogewogICAgIGluc3BlY3RvckFnZW50LT5jb25zb2xlQWdl bnQoKS0+cmVzb3VyY2VSZXRyaWV2ZWRCeVhNTEh0dHBSZXF1ZXN0KHVybCwgc2VuZFVSTCwgc2Vu ZExpbmVOdW1iZXIpOwogICAgIGlmIChJbnNwZWN0b3JSZXNvdXJjZUFnZW50KiByZXNvdXJjZUFn ZW50ID0gcmV0cmlldmVSZXNvdXJjZUFnZW50KGluc3BlY3RvckFnZW50KSkKLSAgICAgICAgcmVz b3VyY2VBZ2VudC0+c2V0SW5pdGlhbENvbnRlbnQoaWRlbnRpZmllciwgc291cmNlU3RyaW5nLCAi WEhSIik7CisgICAgICAgIHJlc291cmNlQWdlbnQtPnNldEluaXRpYWxYSFJDb250ZW50KGlkZW50 aWZpZXIsIHNvdXJjZVN0cmluZyk7CiB9CiAKIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u OjpzY3JpcHRJbXBvcnRlZEltcGwoSW5zcGVjdG9yQWdlbnQqIGluc3BlY3RvckFnZW50LCB1bnNp Z25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgc291cmNlU3RyaW5nKQogewogICAg IGlmIChJbnNwZWN0b3JSZXNvdXJjZUFnZW50KiByZXNvdXJjZUFnZW50ID0gcmV0cmlldmVSZXNv dXJjZUFnZW50KGluc3BlY3RvckFnZW50KSkKLSAgICAgICAgcmVzb3VyY2VBZ2VudC0+c2V0SW5p dGlhbENvbnRlbnQoaWRlbnRpZmllciwgc291cmNlU3RyaW5nLCAiU2NyaXB0Iik7CisgICAgICAg IHJlc291cmNlQWdlbnQtPnNldEluaXRpYWxTY3JpcHRDb250ZW50KGlkZW50aWZpZXIsIHNvdXJj ZVN0cmluZyk7CiB9CiAKIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkb21Db250ZW50 TG9hZGVkRXZlbnRGaXJlZEltcGwoSW5zcGVjdG9yQWdlbnQqIGluc3BlY3RvckFnZW50LCBGcmFt ZSogZnJhbWUsIGNvbnN0IEtVUkwmIHVybCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcAppbmRleCA3NTcxOWRhYmFkN2I3ZDcwMjgw ZTNkZjlkNzRiMjIyYjg0MzllYzEwLi5mMjczNzRmZTUwODY0NWRkNDU5MzZjM2QxZjRlYTliNjIy ZDMwMzFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVz b3VyY2VBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJl c291cmNlQWdlbnQuY3BwCkBAIC03NCw2ICs3NCwxNyBAQCBzdGF0aWMgY29uc3QgY2hhciByZXNv dXJjZUFnZW50RW5hYmxlZFtdID0gInJlc291cmNlQWdlbnRFbmFibGVkIjsKIHN0YXRpYyBjb25z dCBjaGFyIGV4dHJhUmVxdWVzdEhlYWRlcnNbXSA9ICJleHRyYVJlcXVlc3RIZWFkZXJzIjsKIH0K IAorbmFtZXNwYWNlIFJlc291cmNlVHlwZSB7CitzdGF0aWMgY29uc3QgY2hhciBkb2N1bWVudFtd ID0gIkRvY3VtZW50IjsKK3N0YXRpYyBjb25zdCBjaGFyIHN0eWxlc2hlZXRbXSA9ICJTdHlsZXNo ZWV0IjsKK3N0YXRpYyBjb25zdCBjaGFyIGltYWdlW10gPSAiSW1hZ2UiOworc3RhdGljIGNvbnN0 IGNoYXIgZm9udFtdID0gIkZvbnQiOworc3RhdGljIGNvbnN0IGNoYXIgc2NyaXB0W10gPSAiU2Ny aXB0IjsKK3N0YXRpYyBjb25zdCBjaGFyIHhocltdID0gIlhIUiI7CitzdGF0aWMgY29uc3QgY2hh ciB3ZWJzb2NrZXRbXSA9ICJXZWJTb2NrZXQiOworc3RhdGljIGNvbnN0IGNoYXIgb3RoZXJbXSA9 ICJPdGhlciI7Cit9CisKIHZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6c2V0RnJvbnRlbmQo SW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kKQogewogICAgIG1fZnJvbnRlbmQgPSBmcm9udGVu ZC0+bmV0d29yaygpOwpAQCAtMjM2LDIxICsyNDcsMjEgQEAgc3RhdGljIFN0cmluZyBjYWNoZWRS ZXNvdXJjZVR5cGVTdHJpbmcoY29uc3QgQ2FjaGVkUmVzb3VyY2UmIGNhY2hlZFJlc291cmNlKQog ewogICAgIHN3aXRjaCAoY2FjaGVkUmVzb3VyY2UudHlwZSgpKSB7CiAgICAgY2FzZSBDYWNoZWRS ZXNvdXJjZTo6SW1hZ2VSZXNvdXJjZToKLSAgICAgICAgcmV0dXJuICJJbWFnZSI7CisgICAgICAg IHJldHVybiBSZXNvdXJjZVR5cGU6OmltYWdlOwogICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OkZv bnRSZXNvdXJjZToKLSAgICAgICAgcmV0dXJuICJGb250IjsKKyAgICAgICAgcmV0dXJuIFJlc291 cmNlVHlwZTo6Zm9udDsKICAgICBjYXNlIENhY2hlZFJlc291cmNlOjpDU1NTdHlsZVNoZWV0Ogog ICAgICAgICAvLyBGYWxsIHRocm91Z2guCiAjaWYgRU5BQkxFKFhTTFQpCiAgICAgY2FzZSBDYWNo ZWRSZXNvdXJjZTo6WFNMU3R5bGVTaGVldDoKICNlbmRpZgotICAgICAgICByZXR1cm4gIlN0eWxl c2hlZXQiOworICAgICAgICByZXR1cm4gUmVzb3VyY2VUeXBlOjpzdHlsZXNoZWV0OwogICAgIGNh c2UgQ2FjaGVkUmVzb3VyY2U6OlNjcmlwdDoKLSAgICAgICAgcmV0dXJuICJTY3JpcHQiOworICAg ICAgICByZXR1cm4gUmVzb3VyY2VUeXBlOjpzY3JpcHQ7CiAgICAgZGVmYXVsdDoKICAgICAgICAg YnJlYWs7CiAgICAgfQotICAgIHJldHVybiAiT3RoZXIiOworICAgIHJldHVybiBSZXNvdXJjZVR5 cGU6Om90aGVyOwogfQogCiBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJ1aWxk T2JqZWN0Rm9yQ2FjaGVkUmVzb3VyY2UoY29uc3QgQ2FjaGVkUmVzb3VyY2UmIGNhY2hlZFJlc291 cmNlKQpAQCAtMzE0LDkgKzMyNSw5IEBAIHZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZGlk UmVjZWl2ZVJlc3BvbnNlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgRG9jdW1lCiAgICAgICAg ICAgICAgICAgcmVzb3VyY2VSZXNwb25zZS0+c2V0U3RyaW5nKCJtaW1lVHlwZSIsIGNhY2hlZFJl c291cmNlLT5yZXNwb25zZSgpLm1pbWVUeXBlKCkpOwogICAgICAgICB9CiAgICAgICAgIGlmIChl cXVhbElnbm9yaW5nRnJhZ21lbnRJZGVudGlmaWVyKHJlc3BvbnNlLnVybCgpLCBsb2FkZXItPmZy YW1lTG9hZGVyKCktPmljb25VUkwoKSkpCi0gICAgICAgICAgICB0eXBlID0gIkltYWdlIjsKKyAg ICAgICAgICAgIHR5cGUgPSBSZXNvdXJjZVR5cGU6OmltYWdlOwogICAgICAgICBlbHNlIGlmIChl cXVhbElnbm9yaW5nRnJhZ21lbnRJZGVudGlmaWVyKHJlc3BvbnNlLnVybCgpLCBsb2FkZXItPnVy bCgpKSAmJiB0eXBlID09ICJPdGhlciIpCi0gICAgICAgICAgICB0eXBlID0gIkRvY3VtZW50IjsK KyAgICAgICAgICAgIHR5cGUgPSBSZXNvdXJjZVR5cGU6OmRvY3VtZW50OwogICAgIH0KICAgICBt X2Zyb250ZW5kLT5yZXNwb25zZVJlY2VpdmVkKHN0YXRpY19jYXN0PGludD4oaWRlbnRpZmllciks IGN1cnJlbnRUaW1lKCksIHR5cGUsIHJlc291cmNlUmVzcG9uc2UpOwogICAgIC8vIElmIHdlIHJl dmFsaWRhdGVkIHRoZSByZXNvdXJjZSBhbmQgZ290IE5vdCBtb2RpZmllZCwgc2VuZCBjb250ZW50 IGxlbmd0aCBmb2xsb3dpbmcgZGlkUmVjZWl2ZVJlc3BvbnNlCkBAIC0zNDgsOSArMzU5LDE0IEBA IHZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZGlkTG9hZFJlc291cmNlRnJvbU1lbW9yeUNh Y2hlKERvY3VtZW50TG9hZGVyKiBsb2FkCiAgICAgbV9mcm9udGVuZC0+cmVzb3VyY2VMb2FkZWRG cm9tTWVtb3J5Q2FjaGUocG9pbnRlckFzSWQobG9hZGVyLT5mcmFtZSgpKSwgcG9pbnRlckFzSWQo bG9hZGVyKSwgbG9hZGVyLT51cmwoKS5zdHJpbmcoKSwgY3VycmVudFRpbWUoKSwgYnVpbGRPYmpl Y3RGb3JDYWNoZWRSZXNvdXJjZSgqcmVzb3VyY2UpKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JSZXNv dXJjZUFnZW50OjpzZXRJbml0aWFsQ29udGVudCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNv bnN0IFN0cmluZyYgc291cmNlU3RyaW5nLCBjb25zdCBTdHJpbmcmIHR5cGUpCit2b2lkIEluc3Bl Y3RvclJlc291cmNlQWdlbnQ6OnNldEluaXRpYWxTY3JpcHRDb250ZW50KHVuc2lnbmVkIGxvbmcg aWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBzb3VyY2VTdHJpbmcpCit7CisgICAgbV9mcm9udGVu ZC0+aW5pdGlhbENvbnRlbnRTZXQoc3RhdGljX2Nhc3Q8aW50PihpZGVudGlmaWVyKSwgc291cmNl U3RyaW5nLCBSZXNvdXJjZVR5cGU6OnNjcmlwdCk7Cit9CisKK3ZvaWQgSW5zcGVjdG9yUmVzb3Vy Y2VBZ2VudDo6c2V0SW5pdGlhbFhIUkNvbnRlbnQodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBj b25zdCBTdHJpbmcmIHNvdXJjZVN0cmluZykKIHsKLSAgICBtX2Zyb250ZW5kLT5pbml0aWFsQ29u dGVudFNldChzdGF0aWNfY2FzdDxpbnQ+KGlkZW50aWZpZXIpLCBzb3VyY2VTdHJpbmcsIHR5cGUp OworICAgIG1fZnJvbnRlbmQtPmluaXRpYWxDb250ZW50U2V0KHN0YXRpY19jYXN0PGludD4oaWRl bnRpZmllciksIHNvdXJjZVN0cmluZywgUmVzb3VyY2VUeXBlOjp4aHIpOwogfQogCiBzdGF0aWMg UGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJ1aWxkT2JqZWN0Rm9yRnJhbWUoRnJhbWUqIGZy YW1lKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291 cmNlQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFn ZW50LmgKaW5kZXggZTNiOWRmOTZhNTVkMTViY2JjMzdkMWUzNzNjZGQ1YWI5NjExM2MxNS4uMTJm MGZlMzg4YmFkZTRlNjg2MDM5MjQzMGNmMjY1OGUxYjY1NmZlMSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5oCkBAIC05NSw3ICs5NSw4 IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpZEZpbmlzaExvYWRpbmcodW5zaWduZWQgbG9uZyBpZGVu dGlmaWVyLCBkb3VibGUgZmluaXNoVGltZSk7CiAgICAgdm9pZCBkaWRGYWlsTG9hZGluZyh1bnNp Z25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlRXJyb3ImKTsKICAgICB2b2lkIGRp ZExvYWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZShEb2N1bWVudExvYWRlciosIGNvbnN0IENhY2hl ZFJlc291cmNlKik7Ci0gICAgdm9pZCBzZXRJbml0aWFsQ29udGVudCh1bnNpZ25lZCBsb25nIGlk ZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgc291cmNlU3RyaW5nLCBjb25zdCBTdHJpbmcmIHR5cGUp OworICAgIHZvaWQgc2V0SW5pdGlhbFNjcmlwdENvbnRlbnQodW5zaWduZWQgbG9uZyBpZGVudGlm aWVyLCBjb25zdCBTdHJpbmcmIHNvdXJjZVN0cmluZyk7CisgICAgdm9pZCBzZXRJbml0aWFsWEhS Q29udGVudCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgc291cmNlU3Ry aW5nKTsKICAgICB2b2lkIGRpZENvbW1pdExvYWQoRG9jdW1lbnRMb2FkZXIqKTsKICAgICB2b2lk IGZyYW1lRGV0YWNoZWRGcm9tUGFyZW50KEZyYW1lKik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggZmQ5NzU2ZTM5OWEy ZTUzZjVjYmUxYmI1YmExZmQwMTgzNmFmNWU0OS4uZDZkMmI5MDMzMzBkZjBhZDJkOTU0YzYxNmU3 MDNmYmE4MjA5OGUwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TY3JpcHRzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAgLTIwNCw5ICsyMDQsOSBAQCBXZWJJbnNwZWN0b3IuU2Ny aXB0c1BhbmVsID0gZnVuY3Rpb24oKQogCiAvLyBLZWVwIHRoZXNlIGluIHN5bmMgd2l0aCBXZWJD b3JlOjpTY3JpcHREZWJ1Z1NlcnZlcgogV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5QYXVzZU9u RXhjZXB0aW9uc1N0YXRlID0gewotICAgIERvbnRQYXVzZU9uRXhjZXB0aW9ucyA6IDAsCi0gICAg UGF1c2VPbkFsbEV4Y2VwdGlvbnMgOiAxLAotICAgIFBhdXNlT25VbmNhdWdodEV4Y2VwdGlvbnM6 IDIKKyAgICBEb250UGF1c2VPbkV4Y2VwdGlvbnMgOiAibm9uZSIsCisgICAgUGF1c2VPbkFsbEV4 Y2VwdGlvbnMgOiAiYWxsIiwKKyAgICBQYXVzZU9uVW5jYXVnaHRFeGNlcHRpb25zOiAidW5jYXVn aHQiCiB9OwogCiBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKQEAgLTY5 NSw3ICs2OTUsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAg ICAgICAgICAgIHRoaXMuX3BhdXNlT25FeGNlcHRpb25CdXR0b24uc3RhdGUgPSBwYXVzZU9uRXhj ZXB0aW9uc1N0YXRlOwogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdzLnBhdXNlT25F eGNlcHRpb25TdGF0ZSA9IHBhdXNlT25FeGNlcHRpb25zU3RhdGU7CiAgICAgICAgIH0KLSAgICAg ICAgRGVidWdnZXJBZ2VudC5zZXRQYXVzZU9uRXhjZXB0aW9uc1N0YXRlKHBhdXNlT25FeGNlcHRp b25zU3RhdGUsIGNhbGxiYWNrLmJpbmQodGhpcykpOworICAgICAgICBEZWJ1Z2dlckFnZW50LnNl dFBhdXNlT25FeGNlcHRpb25zKHBhdXNlT25FeGNlcHRpb25zU3RhdGUsIGNhbGxiYWNrLmJpbmQo dGhpcykpOwogICAgIH0sCiAKICAgICBfdXBkYXRlRGVidWdnZXJCdXR0b25zOiBmdW5jdGlvbigp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZ2VuZXJhdGUtaW5zcGVjdG9y LWlkbCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9nZW5lcmF0ZS1pbnNwZWN0b3ItaWRsCmlu ZGV4IDZiZGM2YjUzMGYyZDFkZWNkOGJiMzdjZDdjZmM3OTRlNjMzN2EzNGIuLjk2ZDNhYzViYmQ4 MDczNTFkOTJmMzFlY2QwNTc4NGEzMWMxODU0ZTggMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9nZW5lcmF0ZS1pbnNwZWN0b3ItaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9nZW5lcmF0ZS1pbnNwZWN0b3ItaWRsCkBAIC04MSw2ICs4MSw4IEBAIHR5cGVfdHJh aXRzID0gewogICAgICJvYmplY3QiOiAiT2JqZWN0IgogfQogCityZWZfdHlwZXMgPSB7fQorCiBt YWNyb190cmFpdHMgPSB7CiAgICAgIkRhdGFiYXNlIjogIkRBVEFCQVNFIiwKICAgICAiRE9NU3Rv cmFnZSI6ICJET01fU1RPUkFHRSIsCkBAIC05MiwxOCArOTQsMjYgQEAgbWFjcm9fdHJhaXRzID0g ewogCiBkZWYgcGFyYW1fdHlwZShwYXJhbSk6CiAgICAgaWYgInR5cGUiIGluIHBhcmFtOgotICAg ICAgICByZXR1cm4gdHlwZV90cmFpdHNbcGFyYW1bInR5cGUiXV07CisgICAgICAgIHJldHVybiB0 eXBlX3RyYWl0c1twYXJhbVsidHlwZSJdXQogICAgIGlmICIkcmVmIiBpbiBwYXJhbToKLSAgICAg ICAgcmV0dXJuICJPYmplY3QiCisgICAgICAgIHR5cGVfaWQgPSBwYXJhbVsiJHJlZiJdCisgICAg ICAgIGlmIHR5cGVfaWQgaW4gcmVmX3R5cGVzOgorICAgICAgICAgICAgcmVmX3R5cGUgPSByZWZf dHlwZXNbdHlwZV9pZF0KKyAgICAgICAgICAgIHJldHVybiB0eXBlX3RyYWl0c1tyZWZfdHlwZVsi dHlwZSJdXQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgcmV0dXJuICJPYmplY3QiCiAKIGZv ciBkb21haW4gaW4ganNvbl9hcGk6CiAgICAgZG9tYWluX25hbWUgPSBkb21haW5bImRvbWFpbiJd CiAgICAgaWYgZG9tYWluX25hbWUgaW4gbWFjcm9fdHJhaXRzOgogICAgICAgICBvdXRwdXRfZmls ZS53cml0ZSgiXG4jaWYgZGVmaW5lZChFTkFCTEVfJXMpICYmIEVOQUJMRV8lcyIgJSAobWFjcm9f dHJhaXRzW2RvbWFpbl9uYW1lXSwgbWFjcm9fdHJhaXRzW2RvbWFpbl9uYW1lXSkpCiAgICAgb3V0 cHV0X2ZpbGUud3JpdGUoIlxuICAgIGludGVyZmFjZSBbQ29uZGl0aW9uYWw9SU5TUEVDVE9SXSAl cyB7IiAlIGRvbWFpbl9uYW1lKQorICAgIGlmICJ0eXBlcyIgaW4gZG9tYWluOgorICAgICAgICBm b3IgdHlwZSBpbiBkb21haW5bInR5cGVzIl06CisgICAgICAgICAgICByZWZfdHlwZXNbdHlwZVsi aWQiXV0gPSB0eXBlCiAgICAgaWYgImNvbW1hbmRzIiBpbiBkb21haW46CiAgICAgICAgIGZvciBj b21tYW5kIGluIGRvbWFpblsiY29tbWFuZHMiXToKLSAgICAgICAgICAgIHBhcmFtcyA9IFtdOwor ICAgICAgICAgICAgcGFyYW1zID0gW10KICAgICAgICAgICAgIGlmICgicGFyYW1ldGVycyIgaW4g Y29tbWFuZCk6CiAgICAgICAgICAgICAgICAgZm9yIGluX3BhcmFtIGluIGNvbW1hbmRbInBhcmFt ZXRlcnMiXToKICAgICAgICAgICAgICAgICAgICAgaWYgKCJvcHRpb25hbCIgaW4gaW5fcGFyYW0p OgpAQCAtMTE3LDcgKzEyNyw3IEBAIGZvciBkb21haW4gaW4ganNvbl9hcGk6CiAgICAgICAgICAg ICBvdXRwdXRfZmlsZS53cml0ZSgiXG4gICAgICAgIHZvaWQgJXMoJXMpOyIgJSAoY29tbWFuZFsi bmFtZSJdLCAiLCAiLmpvaW4ocGFyYW1zKSkpCiAgICAgaWYgImV2ZW50cyIgaW4gZG9tYWluOgog ICAgICAgICBmb3IgZXZlbnQgaW4gZG9tYWluWyJldmVudHMiXToKLSAgICAgICAgICAgIHBhcmFt cyA9IFtdOworICAgICAgICAgICAgcGFyYW1zID0gW10KICAgICAgICAgICAgIGlmICgicGFyYW1l dGVycyIgaW4gZXZlbnQpOgogICAgICAgICAgICAgICAgIGZvciBpbl9wYXJhbSBpbiBldmVudFsi cGFyYW1ldGVycyJdOgogICAgICAgICAgICAgICAgICAgICBwYXJhbXMuYXBwZW5kKCJvdXQgJXMg JXMiICUgKHBhcmFtX3R5cGUoaW5fcGFyYW0pLCBpbl9wYXJhbVsibmFtZSJdKSkK