58240 2011-04-11 09:24:25 -0700 Web Inspector: document console domain, support cross-domain type references. 2011-04-12 04:36:24 -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 383209 0 pfeldman 2011-04-11 09:24:25 -0700 Patch to follow. 383213 1 89014 pfeldman 2011-04-11 09:29:40 -0700 Created attachment 89014 Patch 383928 2 89014 yurys 2011-04-12 04:33:33 -0700 Comment on attachment 89014 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=89014&action=review > Source/WebCore/inspector/ConsoleMessage.cpp:114 > + case NetworkErrorMessageType: return "networkError"; These constants need refactoring. Worth a separate change though. 383929 3 89014 pfeldman 2011-04-12 04:36:14 -0700 Comment on attachment 89014 Patch Clearing flags on attachment: 89014 Committed r83575: <http://trac.webkit.org/changeset/83575> 383930 4 pfeldman 2011-04-12 04:36:24 -0700 All reviewed patches have been landed. Closing bug. 89014 2011-04-11 09:29:40 -0700 2011-04-12 04:36:14 -0700 Patch bug-58240-20110411202937.patch text/plain 22461 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODM0MzUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA3ZjBmZTU3MmViMDUzZGQ0MGNmNTBi NDU5MTBhMTI2MDNkZjg1ZTliLi5lZDQxYTFkZmQ5ZmQ0YTA0NDRmMjQwZjcxODc5M2NhMGI4ZDM5 YjY1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDQtMTEgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGRvY3VtZW50IGNvbnNvbGUgZG9tYWluLCBzdXBw b3J0IGNyb3NzLWRvbWFpbiB0eXBlIHJlZmVyZW5jZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODI0MAorCisgICAgICAgICogaW5zcGVjdG9yL3By b3RvY29sL2NvbnNvbGUtYWdlbnQtZXhwZWN0ZWQudHh0OgorCiAyMDExLTA0LTExICBBbGVqYW5k cm8gRy4gQ2FzdHJvICA8YWxleEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFNraXBwZWQgYW5vdGhl ciB0ZXN0IHRoYXQgcmVxdWlyZXMgZHVtcFJlc291cmNlUmVzcG9uc2VNSU1FVHlwZXMuCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcHJvdG9jb2wvY29uc29sZS1hZ2VudC1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcHJvdG9jb2wvY29uc29sZS1hZ2VudC1l eHBlY3RlZC50eHQKaW5kZXggYjljM2M0YTcyMTAyOWZlZWY1YjUxZTQ1ODMzNTE0YzU2ZGQxOTBm Zi4uNDEyZDgyZDRlMTI1YmIzZjJjYzU1Nzg4MjM1ODlhMjkzZTlhZWI5MSAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb3RvY29sL2NvbnNvbGUtYWdlbnQtZXhwZWN0ZWQudHh0 CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm90b2NvbC9jb25zb2xlLWFnZW50LWV4cGVj dGVkLnR4dApAQCAtNTQsMTMgKzU0LDEzIEBAIGV2ZW50IENvbnNvbGVBZ2VudC5tZXNzYWdlQWRk ZWQKICAgICBtZXRob2QgOiAiQ29uc29sZS5tZXNzYWdlQWRkZWQiCiAgICAgcGFyYW1zIDogewog ICAgICAgICBtZXNzYWdlT2JqIDogewotICAgICAgICAgICAgc291cmNlIDogMwotICAgICAgICAg ICAgdHlwZSA6IDAKLSAgICAgICAgICAgIGxldmVsIDogMQorICAgICAgICAgICAgc291cmNlIDog ImphdmFzY3JpcHQiCisgICAgICAgICAgICB0eXBlIDogImxvZyIKKyAgICAgICAgICAgIGxldmVs IDogImxvZyIKICAgICAgICAgICAgIGxpbmUgOiAwCiAgICAgICAgICAgICB1cmwgOiAiIgogICAg ICAgICAgICAgcmVwZWF0Q291bnQgOiAxCi0gICAgICAgICAgICBtZXNzYWdlIDogInRlc3QiCisg ICAgICAgICAgICB0ZXh0IDogInRlc3QiCiAgICAgICAgICAgICBwYXJhbWV0ZXJzIDogewogICAg ICAgICAgICAgICAgIDAgOiB7CiAgICAgICAgICAgICAgICAgICAgIHR5cGUgOiAic3RyaW5nIgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IGEzZGE0NzgwZGI2NjE5MTg0ZjIwOGUxMmIyYWFiMThlNDRkNjJiYjYuLmRi ZGRkNjM3NDE3ZmQxODQwNmJjYjZlMmUzYWE4MDNjY2VkOGJiNzMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOCBAQAorMjAxMS0wNC0xMSAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Vi IEluc3BlY3RvcjogZG9jdW1lbnQgY29uc29sZSBkb21haW4sIHN1cHBvcnQgY3Jvc3MtZG9tYWlu IHR5cGUgcmVmZXJlbmNlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTU4MjQwCisKKyAgICAgICAgKiBpbnNwZWN0b3IvQ29uc29sZU1lc3NhZ2UuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6bWVzc2FnZVNvdXJjZVZhbHVlKToKKyAgICAgICAgKFdlYkNv cmU6Om1lc3NhZ2VUeXBlVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6bWVzc2FnZUxldmVsVmFs dWUpOgorICAgICAgICAoV2ViQ29yZTo6Q29uc29sZU1lc3NhZ2U6OmFkZFRvRnJvbnRlbmQpOgor ICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuanNvbjoKKyAgICAgICAgKiBpbnNwZWN0b3Iv U2NyaXB0Q2FsbEZyYW1lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdENhbGxGcmFtZTo6 YnVpbGRJbnNwZWN0b3JPYmplY3QpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29u c29sZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBl Ll9yZWdpc3RlckNvbnNvbGVEb21haW5EaXNwYXRjaGVyLmRpc3BhdGNoZXIubWVzc2FnZUFkZGVk KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UucHJvdG90eXBlLl9wb3B1bGF0ZVN0YWNrVHJhY2VUcmVl RWxlbWVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UucHJvdG90eXBl LmlzRXF1YWwpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlLnJl cXVlc3RXaWxsQmVTZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZ2VuZXJhdGUtaW5zcGVjdG9y LWlkbDoKKyAgICAgICAgKiBwYWdlL0NvbnNvbGUuaDoKKwogMjAxMS0wNC0xMSAgUGF2ZWwgRmVs ZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBZdXJ5 IFNlbWlraGF0c2t5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvbnNv bGVNZXNzYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db25zb2xlTWVzc2FnZS5j cHAKaW5kZXggOWJmODlmNDc3YWNjMGNmNzA5Y2RkNmM4NWZiNTNiYmEyNmFmODQzZS4uNWNlZDY5 YTRhOGMzMWY2MWE2ZGU0MTJmZmJiMDc4OGY4ZDQxMGQ1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvQ29uc29sZU1lc3NhZ2UuY3BwCkBAIC04NiwxOCArODYsNjAgQEAgQ29uc29sZU1l c3NhZ2U6On5Db25zb2xlTWVzc2FnZSgpCiB7CiB9CiAKKy8vIEtlZXAgaW4gc3luYyB3aXRoIGlu c3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKK3N0YXRpYyBTdHJpbmcgbWVzc2FnZVNv dXJjZVZhbHVlKE1lc3NhZ2VTb3VyY2Ugc291cmNlKQoreworICAgIHN3aXRjaCAoc291cmNlKSB7 CisgICAgY2FzZSBIVE1MTWVzc2FnZVNvdXJjZTogcmV0dXJuICJodG1sIjsKKyAgICBjYXNlIFdN TE1lc3NhZ2VTb3VyY2U6IHJldHVybiAid21sIjsKKyAgICBjYXNlIFhNTE1lc3NhZ2VTb3VyY2U6 IHJldHVybiAieG1sIjsKKyAgICBjYXNlIEpTTWVzc2FnZVNvdXJjZTogcmV0dXJuICJqYXZhc2Ny aXB0IjsKKyAgICBjYXNlIENTU01lc3NhZ2VTb3VyY2U6IHJldHVybiAiY3NzIjsKKyAgICBjYXNl IE90aGVyTWVzc2FnZVNvdXJjZTogcmV0dXJuICJvdGhlciI7CisgICAgfQorICAgIHJldHVybiAi b3RoZXIiOworfQorCitzdGF0aWMgU3RyaW5nIG1lc3NhZ2VUeXBlVmFsdWUoTWVzc2FnZVR5cGUg dHlwZSkKK3sKKyAgICBzd2l0Y2ggKHR5cGUpIHsKKyAgICBjYXNlIExvZ01lc3NhZ2VUeXBlOiBy ZXR1cm4gImxvZyI7CisgICAgY2FzZSBPYmplY3RNZXNzYWdlVHlwZTogcmV0dXJuICJvdGhlciI7 CisgICAgY2FzZSBUcmFjZU1lc3NhZ2VUeXBlOiByZXR1cm4gInRyYWNlIjsKKyAgICBjYXNlIFN0 YXJ0R3JvdXBNZXNzYWdlVHlwZTogcmV0dXJuICJzdGFydEdyb3VwIjsKKyAgICBjYXNlIFN0YXJ0 R3JvdXBDb2xsYXBzZWRNZXNzYWdlVHlwZTogcmV0dXJuICJzdGFydEdyb3VwQ29sbGFwc2VkIjsK KyAgICBjYXNlIEVuZEdyb3VwTWVzc2FnZVR5cGU6IHJldHVybiAiZW5kR3JvdXAiOworICAgIGNh c2UgQXNzZXJ0TWVzc2FnZVR5cGU6IHJldHVybiAiYXNzZXJ0IjsKKyAgICBjYXNlIFVuY2F1Z2h0 RXhjZXB0aW9uTWVzc2FnZVR5cGU6IHJldHVybiAidW5jYXVnaHRFeGNlcHRpb24iOworICAgIGNh c2UgTmV0d29ya0Vycm9yTWVzc2FnZVR5cGU6IHJldHVybiAibmV0d29ya0Vycm9yIjsKKyAgICB9 CisgICAgcmV0dXJuICJvdGhlciI7Cit9CisKK3N0YXRpYyBTdHJpbmcgbWVzc2FnZUxldmVsVmFs dWUoTWVzc2FnZUxldmVsIGxldmVsKQoreworICAgIHN3aXRjaCAobGV2ZWwpIHsKKyAgICBjYXNl IFRpcE1lc3NhZ2VMZXZlbDogcmV0dXJuICJ0aXAiOworICAgIGNhc2UgTG9nTWVzc2FnZUxldmVs OiByZXR1cm4gImxvZyI7CisgICAgY2FzZSBXYXJuaW5nTWVzc2FnZUxldmVsOiByZXR1cm4gIndh cm5pbmciOworICAgIGNhc2UgRXJyb3JNZXNzYWdlTGV2ZWw6IHJldHVybiAiZXJyb3IiOworICAg IGNhc2UgRGVidWdNZXNzYWdlTGV2ZWw6IHJldHVybiAiZGVidWciOworICAgIH0KKyAgICByZXR1 cm4gImxvZyI7Cit9CisKIHZvaWQgQ29uc29sZU1lc3NhZ2U6OmFkZFRvRnJvbnRlbmQoSW5zcGVj dG9yRnJvbnRlbmQ6OkNvbnNvbGUqIGZyb250ZW5kLCBJbmplY3RlZFNjcmlwdE1hbmFnZXIqIGlu amVjdGVkU2NyaXB0TWFuYWdlcikKIHsKICAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBqc29u T2JqID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsKLSAgICBqc29uT2JqLT5zZXROdW1iZXIo InNvdXJjZSIsIHN0YXRpY19jYXN0PGludD4obV9zb3VyY2UpKTsKLSAgICBqc29uT2JqLT5zZXRO dW1iZXIoInR5cGUiLCBzdGF0aWNfY2FzdDxpbnQ+KG1fdHlwZSkpOwotICAgIGpzb25PYmotPnNl dE51bWJlcigibGV2ZWwiLCBzdGF0aWNfY2FzdDxpbnQ+KG1fbGV2ZWwpKTsKKyAgICBqc29uT2Jq LT5zZXRTdHJpbmcoInNvdXJjZSIsIG1lc3NhZ2VTb3VyY2VWYWx1ZShtX3NvdXJjZSkpOworICAg IGpzb25PYmotPnNldFN0cmluZygidHlwZSIsIG1lc3NhZ2VUeXBlVmFsdWUobV90eXBlKSk7Cisg ICAganNvbk9iai0+c2V0U3RyaW5nKCJsZXZlbCIsIG1lc3NhZ2VMZXZlbFZhbHVlKG1fbGV2ZWwp KTsKICAgICBqc29uT2JqLT5zZXROdW1iZXIoImxpbmUiLCBzdGF0aWNfY2FzdDxpbnQ+KG1fbGlu ZSkpOwogICAgIGpzb25PYmotPnNldFN0cmluZygidXJsIiwgbV91cmwpOwogICAgIGpzb25PYmot PnNldE51bWJlcigicmVwZWF0Q291bnQiLCBzdGF0aWNfY2FzdDxpbnQ+KG1fcmVwZWF0Q291bnQp KTsKLSAgICBqc29uT2JqLT5zZXRTdHJpbmcoIm1lc3NhZ2UiLCBtX21lc3NhZ2UpOworICAgIGpz b25PYmotPnNldFN0cmluZygidGV4dCIsIG1fbWVzc2FnZSk7CiAgICAgaWYgKG1fdHlwZSA9PSBO ZXR3b3JrRXJyb3JNZXNzYWdlVHlwZSkgCi0gICAgICAgIGpzb25PYmotPnNldE51bWJlcigicmVx dWVzdElkIiwgbV9yZXF1ZXN0SWQpOworICAgICAgICBqc29uT2JqLT5zZXROdW1iZXIoIm5ldHdv cmtJZGVudGlmaWVyIiwgbV9yZXF1ZXN0SWQpOwogICAgIGlmIChtX2FyZ3VtZW50cyAmJiBtX2Fy Z3VtZW50cy0+YXJndW1lbnRDb3VudCgpKSB7CiAgICAgICAgIEluamVjdGVkU2NyaXB0IGluamVj dGVkU2NyaXB0ID0gaW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLT5pbmplY3RlZFNjcmlwdEZvcihtX2Fy Z3VtZW50cy0+Z2xvYmFsU3RhdGUoKSk7CiAgICAgICAgIGlmICghaW5qZWN0ZWRTY3JpcHQuaGFz Tm9WYWx1ZSgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXgg OGRjNGJhOGVjMWUyMTcxMGE3MDMzZmVmY2QyZjhlMDBmMjI5ZmY5ZS4uYWM3NzM3MGUyMDRhNzdm OWVmNGFmM2E0NzEzY2U2Mjk4NWY4YTdjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3Rvci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3IuanNvbgpAQCAtMTg5LDQ4ICsxODksODYgQEAKICAgICB9LAogICAgIHsKICAgICAgICAg ImRvbWFpbiI6ICJDb25zb2xlIiwKLSAgICAgICAgInR5cGVzIjogW10sCisgICAgICAgICJkZXNj cmlwdGlvbiI6ICJDb25zb2xlIGRvbWFpbiBkZWZpbmVzIG1ldGhvZHMgYW5kIGV2ZW50cyBmb3Ig aW50ZXJhY3Rpb24gd2l0aCB0aGUgSmF2YVNjcmlwdCBjb25zb2xlLiBPbmUgbmVlZHMgdG8gZW5h YmxlIHRoaXMgZG9tYWluIHVzaW5nIDxjb2RlPmVuYWJsZTwvY29kZT4gZnVuY3Rpb24gaW4gb3Jk ZXIgdG8gc3RhcnQgcmVjZWl2aW5nIHRoZSBjb25zb2xlIG1lc3NhZ2VzLiIsICAKKyAgICAgICAg InR5cGVzIjogWworICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICJpZCI6ICJDb25zb2xl TWVzc2FnZSIsCisgICAgICAgICAgICAgICAgInR5cGUiOiAib2JqZWN0IiwKKyAgICAgICAgICAg ICAgICAiZGVzY3JpcHRpb24iOiAiQ29uc29sZSBtZXNzYWdlLiIsCisgICAgICAgICAgICAgICAg InByb3BlcnRpZXMiOiB7CisgICAgICAgICAgICAgICAgICAgICJzb3VyY2UiOiB7ICJ0eXBlIjog InN0cmluZyIsICJlbnVtIjogWyJodG1sIiwgIndtbCIsICJ4bWwiLCAiamF2YXNjcmlwdCIsICJj c3MiLCAib3RoZXIiXSwgImRlc2NyaXB0aW9uIjogIk1lc3NhZ2Ugc291cmNlLiIgfSwKKyAgICAg ICAgICAgICAgICAgICAgInR5cGUiOiB7ICJ0eXBlIjogInN0cmluZyIsICJlbnVtIjogWyJsb2ci LCAib3RoZXIiLCAidHJhY2UiLCAic3RhcnRHcm91cCIsICJzdGFydEdyb3VwQ29sbGFwc2VkIiwg ImVuZEdyb3VwIiwgImFzc2VydCIsICJ1bmNhdWdodEV4Y2VwdGlvbiIsICJuZXR3b3JrRXJyb3Ii LCAicmVzdWx0Il0sICJkZXNjcmlwdGlvbiI6ICJNZXNzYWdlIHR5cGUuIiB9LAorICAgICAgICAg ICAgICAgICAgICAibGV2ZWwiOiB7ICJ0eXBlIjogInN0cmluZyIsICJlbnVtIjogWyJ0aXAiLCAi bG9nIiwgIndhcm5pbmciLCAiZXJyb3IiLCAiZGVidWciXSwgImRlc2NyaXB0aW9uIjogIk1lc3Nh Z2Ugc2V2ZXJpdHkuIiB9LAorICAgICAgICAgICAgICAgICAgICAibGluZSI6IHsgInR5cGUiOiAi aW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJKYXZhU2NyaXB0IHNvdXJjZSBsaW5lIHRoYXQgY3Jl YXRlZCBjb25zb2xlIG1lc3NhZ2UuIiB9LAorICAgICAgICAgICAgICAgICAgICAidXJsIjogeyAi dHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiSmF2YVNjcmlwdCBzb3VyY2UgdXJsIHRo YXQgY3JlYXRlZCBjb25zb2xlIG1lc3NhZ2UuIiB9LAorICAgICAgICAgICAgICAgICAgICAicmVw ZWF0Q291bnQiOiB7ICJ0eXBlIjogImludGVnZXIiLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3Jp cHRpb24iOiAiUmVwZWF0IGNvdW50IGZvciByZXBlYXRlZCBtZXNzYWdlcy4iIH0sCisgICAgICAg ICAgICAgICAgICAgICJ0ZXh0IjogeyAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAi TWVzc2FnZSB0ZXh0LiIgfSwKKyAgICAgICAgICAgICAgICAgICAgIm5ldHdvcmtJZGVudGlmaWVy IjogeyAidHlwZSI6ICJpbnRlZ2VyIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjog IklkZW50aWZpZXIgb2YgdGhlIG5ldHdvcmsgcmVxdWVzdCBhc3NvY2lhdGVkIHdpdGggdGhlIGNv bnNvbGUgbWVzc2FnZS4iIH0sCisgICAgICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogeyAi dHlwZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgIiRyZWYiOiAiUnVudGltZU9iamVjdCIgfSwgImRl c2NyaXB0aW9uIjogIk1lc3NhZ2UgcGFyYW1ldGVycyBpbiBjYXNlIG9mIHRoZSBmb3JtYXR0ZWQg bWVzc2FnZS4iIH0sCisgICAgICAgICAgICAgICAgICAgICJzdGFja1RyYWNlIjogeyAidHlwZSI6 ICJhcnJheSIsICJvcHRpb25hbCI6IHRydWUsICJpdGVtcyI6IHsgIiRyZWYiOiAiQ2FsbEZyYW1l IiB9LCAiZGVzY3JpcHRpb24iOiAiQ2FsbCBmcmFtZXMgZm9yIGFzc2VydCBhbmQgZXJyb3IgbWVz c2FnZXMuIiB9CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfSwKKyAgICAgICAgICAg IHsKKyAgICAgICAgICAgICAgICAiaWQiOiAiQ2FsbEZyYW1lIiwKKyAgICAgICAgICAgICAgICAi dHlwZSI6ICJvYmplY3QiLAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJTdGFjayBl bnRyeSBmb3IgY29uc29sZSBlcnJvcnMgYW5kIGFzc2VydGlvbnMuIiwKKyAgICAgICAgICAgICAg ICAicHJvcGVydGllcyI6IHsKKyAgICAgICAgICAgICAgICAgICAgImZ1bmN0aW9uTmFtZSI6IHsg InR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIkphdmFTY3JpcHQgZnVuY3Rpb24gbmFt ZS4iIH0sCisgICAgICAgICAgICAgICAgICAgICJ1cmwiOiB7ICJ0eXBlIjogInN0cmluZyIsICJk ZXNjcmlwdGlvbiI6ICJKYXZhU2NyaXB0IHNvdXJjZSBuYW1lIC8gdXJsLiIgfSwKKyAgICAgICAg ICAgICAgICAgICAgImxpbmVOdW1iZXIiOiB7ICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlv biI6ICJKYXZhU2NyaXB0IHNvdXJjZSBsaW5lIG51bWJlci4iIH0sCisgICAgICAgICAgICAgICAg ICAgICJjb2x1bW5OdW1iZXIiOiB7ICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJK YXZhU2NyaXB0IHNvdXJjZSBjb2x1bW4gbnVtYmVyLiIgfQorICAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgIH0KKyAgICAgICAgXSwKICAgICAgICAgImNvbW1hbmRzIjogWwogICAgICAgICAg ICAgewogICAgICAgICAgICAgICAgICJuYW1lIjogImVuYWJsZSIsCiAgICAgICAgICAgICAgICAg InJldHVybnMiOiBbCi0gICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJleHBpcmVkTWVzc2Fn ZXNDb3VudCIsICJ0eXBlIjogImludGVnZXIiIH0KLSAgICAgICAgICAgICAgICBdCisgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAiZXhwaXJlZE1lc3NhZ2VzQ291bnQiLCAidHlwZSI6ICJp bnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIk51bWJlciBvZiBtZXNzYWdlcyBjbGVhcmVkIGR1ZSB0 byBtZXNzYWdlIHRocmVhc2hvbGQgb3ZlcmZsb3cuIiB9CisgICAgICAgICAgICAgICAgXSwKKyAg ICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRW5hYmxlcyBjb25zb2xlIGRvbWFpbiwgc2Vu ZHMgYWxsIHRoZSBtZXNzYWdlcyBjb2xsZWN0ZWQgc28gZmFyIHRvIHRoZSBjbGllbnQuIiAKICAg ICAgICAgICAgIH0sCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgIm5hbWUiOiAiZGlz YWJsZSIKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJkaXNhYmxlIiwKKyAgICAgICAgICAgICAg ICAiZGVzY3JpcHRpb24iOiAiRGlzYWJsZXMgY29uc29sZSBkb21haW4sIHByZXZlbnRzIGZ1cnRo ZXIgY29uc29sZSBtZXNzYWdlcyBmcm9tIGJlaW5nIHNlbnQgdG8gdGhlIGNsaWVudC4iIAogICAg ICAgICAgICAgfSwKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAibmFtZSI6ICJjbGVh ckNvbnNvbGVNZXNzYWdlcyIKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJjbGVhckNvbnNvbGVN ZXNzYWdlcyIsCisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkNsZWFycyBjb2xsZWN0 ZWQgY29uc29sZSBtZXNzYWdlcy4iIAogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHsKICAg ICAgICAgICAgICAgICAibmFtZSI6ICJzZXRNb25pdG9yaW5nWEhSRW5hYmxlZCIsCiAgICAgICAg ICAgICAgICAgInBhcmFtZXRlcnMiOiBbCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi ZW5hYmxlZCIsICJ0eXBlIjogImJvb2xlYW4iIH0KLSAgICAgICAgICAgICAgICBdCisgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAiZW5hYmxlZCIsICJ0eXBlIjogImJvb2xlYW4iLCAiZGVz Y3JpcHRpb24iOiAiTW9uaXRvcmluZyBlbmFibGVkIHN0YXRlLiIgfQorICAgICAgICAgICAgICAg IF0sCisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZXMgbW9uaXRvcmluZyBv ZiBYTUxIdHRwUmVxdWVzdC4gSWYgPGNvZGU+dHJ1ZTwvY29kZT4sIGNvbnNvbGUgd2lsbCByZWNl aXZlIG1lc3NhZ2VzIHVwb24gZWFjaCBYSFIgaXNzdWVkLiIgCiAgICAgICAgICAgICB9LAogICAg ICAgICAgICAgewogICAgICAgICAgICAgICAgICJuYW1lIjogImFkZEluc3BlY3RlZE5vZGUiLAog ICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAgICB7ICJu YW1lIjogIm5vZGVJZCIsICJ0eXBlIjogImludGVnZXIiIH0KLSAgICAgICAgICAgICAgICBdCisg ICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibm9kZUlkIiwgInR5cGUiOiAiaW50ZWdlciIs ICJkZXNjcmlwdGlvbiI6ICJET00gbm9kZSBpZCB0byBiZSBhY2Nlc3NpYmxlIGJ5IG1lYW5zIG9m ICR4IGNvbW1hbmQgbGluZSBBUEkuIiB9CisgICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAg ICAgICAiZGVzY3JpcHRpb24iOiAiRW5hYmxlcyBjb25zb2xlIHRvIHJlZmVyIHRvIHRoZSBub2Rl IHdpdGggZ2l2ZW4gaWQgdmlhICR4IChzZWUgQ29tbWFuZCBMaW5lIEFQSSBmb3IgbW9yZSBkZXRh aWxzICR4IGZ1bmN0aW9ucykuIiAKICAgICAgICAgICAgIH0KICAgICAgICAgXSwKICAgICAgICAg ImV2ZW50cyI6IFsKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAibmFtZSI6ICJtZXNz YWdlQWRkZWQiLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogIm1lc3NhZ2VPYmoiLCAiJHJlZiI6ICJDb25zb2xlTWVzc2FnZSIg fQotICAgICAgICAgICAgICAgIF0KKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJtZXNz YWdlT2JqIiwgIiRyZWYiOiAiQ29uc29sZU1lc3NhZ2UiLCAiZGVzY3JpcHRpb24iOiAiQ29uc29s ZSBtZXNzYWdlIHRoYXQgaGFzIGJlZW4gYWRkZWQuIiB9CisgICAgICAgICAgICAgICAgXSwKKyAg ICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiSXNzdWVkIGZvciBlYWNoIGNvbnNvbGUgbWVz c2FnZSBhZGRlZC4iCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewogICAgICAgICAgICAg ICAgICJuYW1lIjogIm1lc3NhZ2VSZXBlYXRDb3VudFVwZGF0ZWQiLAogICAgICAgICAgICAgICAg ICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImNvdW50Iiwg InR5cGUiOiAiaW50ZWdlciIgfQotICAgICAgICAgICAgICAgIF0KKyAgICAgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJjb3VudCIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAi TmV3IHJlcGVhdCBjb3VudCB2YWx1ZS4iIH0KKyAgICAgICAgICAgICAgICBdLAorICAgICAgICAg ICAgICAgICJkZXNjcmlwdGlvbiI6ICJJbiBjYXNlIG9mIHN1YnNlcXVlbnQgbWVzc2FnZSBiZWlu ZyBlcXVhbCB0byB0aGUgcHJldmlvdXMgb25lLCBvbmx5IHJlcGVhdCBjb3VudCBpcyBiZWluZyB1 cGRhdGVkLiIKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAg Im5hbWUiOiAibWVzc2FnZXNDbGVhcmVkIgorICAgICAgICAgICAgICAgICJuYW1lIjogIm1lc3Nh Z2VzQ2xlYXJlZCIsCisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIklzc3VlZCB3aGVu IGNvbnNvbGUgaXMgY2xlYXJlZC4iCiAgICAgICAgICAgICB9CiAgICAgICAgIF0KICAgICB9LApA QCAtMzg4LDcgKzQyNiw3IEBACiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVxdWVz dCIsICIkcmVmIjogIlJlc291cmNlUmVxdWVzdCIsICJkZXNjcmlwdGlvbiI6ICJSZXF1ZXN0IGRh dGEuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInJlZGlyZWN0UmVzcG9uc2Ui LCAib3B0aW9uYWwiOiB0cnVlLCAiJHJlZiI6ICJSZXNvdXJjZVJlc3BvbnNlIiwgImRlc2NyaXB0 aW9uIjogIlJlZGlyZWN0IHJlc3BvbnNlIGRhdGEuIiB9LAogICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogInRpbWUiLCAidHlwZSI6ICJudW1iZXIiLCAiZGVzY3JpcHRpb24iOiAiVGltZXN0 YW1wLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjYWxsU3RhY2siLCAidHlw ZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgIiRyZWYiIDogIkRlYnVnZ2VyU3RhY2tGcmFtZSJ9LCAi ZGVzY3JpcHRpb24iOiAiSmF2YVNjcmlwdCBzdGFjayB0cmFjZSB1cG9uIGlzc3VpbmcgdGhpcyBy ZXF1ZXN0LiIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInN0YWNrVHJhY2UiLCAi dHlwZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgIiRyZWYiIDogIkNvbnNvbGUuQ2FsbEZyYW1lIn0s ICJkZXNjcmlwdGlvbiI6ICJKYXZhU2NyaXB0IHN0YWNrIHRyYWNlIHVwb24gaXNzdWluZyB0aGlz IHJlcXVlc3QuIiB9CiAgICAgICAgICAgICAgICAgXQogICAgICAgICAgICAgfSwKICAgICAgICAg ICAgIHsKQEAgLTEyNTMsNyArMTI5MSw3IEBACiAgICAgICAgICAgICAgICAgInByb3BlcnRpZXMi OiB7CiAgICAgICAgICAgICAgICAgICAgICJ0eXBlIjogeyAidHlwZSI6ICJzdHJpbmciLCAgImVu dW0iOiBbImdsb2JhbCIsICJsb2NhbCIsICJ3aXRoIiwgImNsb3N1cmUiLCAiY2F0Y2giXSwgImRl c2NyaXB0aW9uIjogIlNjb3BlIHR5cGUuIiB9LAogICAgICAgICAgICAgICAgICAgICAib2JqZWN0 IjogeyAiJHJlZiI6ICJSZW1vdGVPYmplY3QiLCAiZGVzY3JpcHRpb24iOiAiT2JqZWN0IHJlcHJl c2VudGluZyB0aGUgc2NvcGUuIiB9LAotICAgICAgICAgICAgICAgICAgICAidGhpcyI6IHsgIiRy ZWYiOiAiUmVtb3RlT2JqZWN0IiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIjxj b2RlPnRoaXM8L2NvZGU+IG9iamVjdCBmb3IgbG9jYWwgc2NvcGUuIiB9LAorICAgICAgICAgICAg ICAgICAgICAidGhpcyI6IHsgIiRyZWYiOiAiUmVtb3RlT2JqZWN0IiwgIm9wdGlvbmFsIjogdHJ1 ZSwgImRlc2NyaXB0aW9uIjogIjxjb2RlPnRoaXM8L2NvZGU+IG9iamVjdCBmb3IgbG9jYWwgc2Nv cGUuIiB9CiAgICAgICAgICAgICAgICAgfSwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24i OiAiRGVidWdnZXIgY2FsbCBmcmFtZS4gQXJyYXkgb2YgY2FsbCBmcmFtZXMgZm9ybSBjYWxsIHN0 YWNrLiIKICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9TY3JpcHRDYWxsRnJhbWUuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdENh bGxGcmFtZS5jcHAKaW5kZXggMGI1MjA0Yjg2YTdjNzRhMTM0OWExNmJiZWRjY2I3ZmJiNWQ5OGUy NC4uNjQxZDE5MjNlMjI3ZGM5MDg3YTM5Nzc0NzM1YjIyMzk4OWQyNDIyYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdENhbGxGcmFtZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdENhbGxGcmFtZS5jcHAKQEAgLTYwLDkgKzYwLDkgQEAg UGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IFNjcmlwdENhbGxGcmFtZTo6YnVpbGRJbnNwZWN0 b3JPYmplY3QoKSBjb25zdAogewogICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGZyYW1lID0g SW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsKICAgICBmcmFtZS0+c2V0U3RyaW5nKCJmdW5jdGlv bk5hbWUiLCBtX2Z1bmN0aW9uTmFtZSk7Ci0gICAgZnJhbWUtPnNldFN0cmluZygic2NyaXB0TmFt ZSIsIG1fc2NyaXB0TmFtZSk7CisgICAgZnJhbWUtPnNldFN0cmluZygidXJsIiwgbV9zY3JpcHRO YW1lKTsKICAgICBmcmFtZS0+c2V0TnVtYmVyKCJsaW5lTnVtYmVyIiwgbV9saW5lTnVtYmVyKTsK LSAgICBmcmFtZS0+c2V0TnVtYmVyKCJjb2x1bW4iLCBtX2NvbHVtbik7CisgICAgZnJhbWUtPnNl dE51bWJlcigiY29sdW1uTnVtYmVyIiwgbV9jb2x1bW4pOwogICAgIHJldHVybiBmcmFtZTsKIH0K ICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D b25zb2xlVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29s ZVZpZXcuanMKaW5kZXggOWM3MDk0MWQ4ODAxMjQ5YmIyOTZmOGQ2YTY2NGFlNDU5MjEzZTUxYy4u NGFiMTZkOWUxOTQzMzZhNmE0YzMwZmZjZThmNzZhMjYzOTdmMTE0MyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCkBAIC0xMTQsMTAg KzExNCwxMCBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAgICAg ICAgICAgICAgICAgICBwYXlsb2FkLmxpbmUsCiAgICAgICAgICAgICAgICAgICAgIHBheWxvYWQu dXJsLAogICAgICAgICAgICAgICAgICAgICBwYXlsb2FkLnJlcGVhdENvdW50LAotICAgICAgICAg ICAgICAgICAgICBwYXlsb2FkLm1lc3NhZ2UsCisgICAgICAgICAgICAgICAgICAgIHBheWxvYWQu dGV4dCwKICAgICAgICAgICAgICAgICAgICAgcGF5bG9hZC5wYXJhbWV0ZXJzLAogICAgICAgICAg ICAgICAgICAgICBwYXlsb2FkLnN0YWNrVHJhY2UsCi0gICAgICAgICAgICAgICAgICAgIHBheWxv YWQucmVxdWVzdElkKTsKKyAgICAgICAgICAgICAgICAgICAgcGF5bG9hZC5uZXR3b3JrSWRlbnRp Zmllcik7CiAgICAgICAgICAgICAgICAgY29uc29sZS5hZGRNZXNzYWdlKGNvbnNvbGVNZXNzYWdl KTsKICAgICAgICAgICAgIH0sCiAKQEAgLTY5MSw3ICs2OTEsNyBAQCBXZWJJbnNwZWN0b3IuQ29u c29sZU1lc3NhZ2UgPSBmdW5jdGlvbihzb3VyY2UsIHR5cGUsIGxldmVsLCBsaW5lLCB1cmwsIHJl cGVhdENvdQogICAgIGlmIChzdGFja1RyYWNlICYmIHN0YWNrVHJhY2UubGVuZ3RoKSB7CiAgICAg ICAgIHZhciB0b3BDYWxsRnJhbWUgPSBzdGFja1RyYWNlWzBdOwogICAgICAgICBpZiAoIXRoaXMu dXJsKQotICAgICAgICAgICAgdGhpcy51cmwgPSB0b3BDYWxsRnJhbWUuc2NyaXB0TmFtZTsKKyAg ICAgICAgICAgIHRoaXMudXJsID0gdG9wQ2FsbEZyYW1lLnVybDsKICAgICAgICAgaWYgKCF0aGlz LmxpbmUpCiAgICAgICAgICAgICB0aGlzLmxpbmUgPSB0b3BDYWxsRnJhbWUubGluZU51bWJlcjsK ICAgICB9CkBAIC05MjMsNyArOTIzLDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnBy b3RvdHlwZSA9IHsKICAgICAgICAgICAgIG1lc3NhZ2VUZXh0RWxlbWVudC5hcHBlbmRDaGlsZChk b2N1bWVudC5jcmVhdGVUZXh0Tm9kZShmdW5jdGlvbk5hbWUpKTsKICAgICAgICAgICAgIGNvbnRl bnQuYXBwZW5kQ2hpbGQobWVzc2FnZVRleHRFbGVtZW50KTsKIAotICAgICAgICAgICAgdmFyIHVy bEVsZW1lbnQgPSBXZWJJbnNwZWN0b3IubGlua2lmeVJlc291cmNlQXNOb2RlKGZyYW1lLnNjcmlw dE5hbWUsICJzY3JpcHRzIiwgZnJhbWUubGluZU51bWJlciwgImNvbnNvbGUtbWVzc2FnZS11cmwi KTsKKyAgICAgICAgICAgIHZhciB1cmxFbGVtZW50ID0gV2ViSW5zcGVjdG9yLmxpbmtpZnlSZXNv dXJjZUFzTm9kZShmcmFtZS51cmwsICJzY3JpcHRzIiwgZnJhbWUubGluZU51bWJlciwgImNvbnNv bGUtbWVzc2FnZS11cmwiKTsKICAgICAgICAgICAgIGNvbnRlbnQuYXBwZW5kQ2hpbGQodXJsRWxl bWVudCk7CiAKICAgICAgICAgICAgIHZhciB0cmVlRWxlbWVudCA9IG5ldyBUcmVlRWxlbWVudChj b250ZW50KTsKQEAgLTEwMjcsMTAgKzEwMjcsMTAgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNz YWdlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHZhciBsID0gdGhpcy5fc3RhY2tUcmFjZTsK ICAgICAgICAgICAgIHZhciByID0gbXNnLl9zdGFja1RyYWNlOwogICAgICAgICAgICAgZm9yICh2 YXIgaSA9IDA7IGkgPCBsLmxlbmd0aDsgaSsrKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGxbaV0u c2NyaXB0TmFtZSAhPT0gcltpXS5zY3JpcHROYW1lIHx8CisgICAgICAgICAgICAgICAgaWYgKGxb aV0udXJsICE9PSByW2ldLnVybCB8fAogICAgICAgICAgICAgICAgICAgICBsW2ldLmZ1bmN0aW9u TmFtZSAhPT0gcltpXS5mdW5jdGlvbk5hbWUgfHwKICAgICAgICAgICAgICAgICAgICAgbFtpXS5s aW5lTnVtYmVyICE9PSByW2ldLmxpbmVOdW1iZXIgfHwKLSAgICAgICAgICAgICAgICAgICAgbFtp XS5jb2x1bW4gIT09IHJbaV0uY29sdW1uKQorICAgICAgICAgICAgICAgICAgICBsW2ldLmNvbHVt bk51bWJlciAhPT0gcltpXS5jb2x1bW5OdW1iZXIpCiAgICAgICAgICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpAQCAtMTA0NywzMyArMTA0NywzMyBA QCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UucHJvdG90eXBlID0gewogCiAvLyBOb3RlOiBL ZWVwIHRoZXNlIGNvbnN0YW50cyBpbiBzeW5jIHdpdGggdGhlIG9uZXMgaW4gQ29uc29sZS5oCiBX ZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZSA9IHsKLSAgICBIVE1MOiAw LAotICAgIFdNTDogMSwKLSAgICBYTUw6IDIsCi0gICAgSlM6IDMsCi0gICAgQ1NTOiA0LAotICAg IE90aGVyOiA1CisgICAgSFRNTDogImh0bWwiLAorICAgIFdNTDogIndtbCIsCisgICAgWE1MOiAi eG1sIiwKKyAgICBKUzogImphdmFzY3JpcHQiLAorICAgIENTUzogImNzcyIsCisgICAgT3RoZXI6 ICJvdGhlciIKIH0KIAogV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlID0g ewotICAgIExvZzogMCwKLSAgICBPYmplY3Q6IDEsCi0gICAgVHJhY2U6IDIsCi0gICAgU3RhcnRH cm91cDogMywKLSAgICBTdGFydEdyb3VwQ29sbGFwc2VkOiA0LAotICAgIEVuZEdyb3VwOiA1LAot ICAgIEFzc2VydDogNiwKLSAgICBVbmNhdWdodEV4Y2VwdGlvbjogNywKLSAgICBOZXR3b3JrRXJy b3I6OCwKLSAgICBSZXN1bHQ6IDkKKyAgICBMb2c6ICJsb2ciLAorICAgIE9iamVjdDogIm90aGVy IiwKKyAgICBUcmFjZTogInRyYWNlIiwKKyAgICBTdGFydEdyb3VwOiAic3RhcnRHcm91cCIsCisg ICAgU3RhcnRHcm91cENvbGxhcHNlZDogInN0YXJ0R3JvdXBDb2xsYXBzZWQiLAorICAgIEVuZEdy b3VwOiAiZW5kR3JvdXAiLAorICAgIEFzc2VydDogImFzc2VydCIsCisgICAgVW5jYXVnaHRFeGNl cHRpb246ICJ1bmNhdWdodEV4Y2VwdGlvbiIsCisgICAgTmV0d29ya0Vycm9yOiAibmV0d29ya0Vy cm9yIiwKKyAgICBSZXN1bHQ6ICJyZXN1bHQiCiB9CiAKIFdlYkluc3BlY3Rvci5Db25zb2xlTWVz c2FnZS5NZXNzYWdlTGV2ZWwgPSB7Ci0gICAgVGlwOiAwLAotICAgIExvZzogMSwKLSAgICBXYXJu aW5nOiAyLAotICAgIEVycm9yOiAzLAotICAgIERlYnVnOiA0CisgICAgVGlwOiAidGlwIiwKKyAg ICBMb2c6ICJsb2ciLAorICAgIFdhcm5pbmc6ICJ3YXJuaW5nIiwKKyAgICBFcnJvcjogImVycm9y IiwKKyAgICBEZWJ1ZzogImRlYnVnIgogfQogCiBXZWJJbnNwZWN0b3IuQ29uc29sZUNvbW1hbmQg PSBmdW5jdGlvbihjb21tYW5kKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMKaW5kZXggOTE4NWNhNjFmMzQyNjM1ZGQzNzdlNzky ZTNiZTE4ZDBiOTBlMjIwMS4uODM5YzgwMzEwYWQ0NzNhN2U2ZDAzZWY2Y2MzMDJlY2MzYmRiYjgw OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3Jr TWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdv cmtNYW5hZ2VyLmpzCkBAIC0xMTIsMTQgKzExMiwxNCBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0Rp c3BhdGNoZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl91cGRhdGVSZXNvdXJjZVdpdGhS ZXNwb25zZShyZXNvdXJjZSwgY2FjaGVkUmVzb3VyY2UucmVzcG9uc2UpOwogICAgIH0sCiAKLSAg ICByZXF1ZXN0V2lsbEJlU2VudDogZnVuY3Rpb24oaWRlbnRpZmllciwgZnJhbWVJZCwgbG9hZGVy SWQsIGRvY3VtZW50VVJMLCByZXF1ZXN0LCByZWRpcmVjdFJlc3BvbnNlLCB0aW1lLCBjYWxsU3Rh Y2spCisgICAgcmVxdWVzdFdpbGxCZVNlbnQ6IGZ1bmN0aW9uKGlkZW50aWZpZXIsIGZyYW1lSWQs IGxvYWRlcklkLCBkb2N1bWVudFVSTCwgcmVxdWVzdCwgcmVkaXJlY3RSZXNwb25zZSwgdGltZSwg c3RhY2tUcmFjZSkKICAgICB7CiAgICAgICAgIHZhciByZXNvdXJjZSA9IHRoaXMuX2luZmxpZ2h0 UmVzb3VyY2VzQnlJZFtpZGVudGlmaWVyXTsKICAgICAgICAgaWYgKHJlc291cmNlKSB7CiAgICAg ICAgICAgICB0aGlzLnJlc3BvbnNlUmVjZWl2ZWQoaWRlbnRpZmllciwgdGltZSwgIk90aGVyIiwg cmVkaXJlY3RSZXNwb25zZSk7CiAgICAgICAgICAgICByZXNvdXJjZSA9IHRoaXMuX2FwcGVuZFJl ZGlyZWN0KGlkZW50aWZpZXIsIHRpbWUsIHJlcXVlc3QudXJsKTsKICAgICAgICAgfSBlbHNlCi0g ICAgICAgICAgICByZXNvdXJjZSA9IHRoaXMuX2NyZWF0ZVJlc291cmNlKGlkZW50aWZpZXIsIGZy YW1lSWQsIGxvYWRlcklkLCByZXF1ZXN0LnVybCwgZG9jdW1lbnRVUkwsIGNhbGxTdGFjayk7Cisg ICAgICAgICAgICByZXNvdXJjZSA9IHRoaXMuX2NyZWF0ZVJlc291cmNlKGlkZW50aWZpZXIsIGZy YW1lSWQsIGxvYWRlcklkLCByZXF1ZXN0LnVybCwgZG9jdW1lbnRVUkwsIHN0YWNrVHJhY2UpOwog ICAgICAgICB0aGlzLl91cGRhdGVSZXNvdXJjZVdpdGhSZXF1ZXN0KHJlc291cmNlLCByZXF1ZXN0 KTsKICAgICAgICAgcmVzb3VyY2Uuc3RhcnRUaW1lID0gdGltZTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2dlbmVyYXRlLWluc3BlY3Rvci1pZGwgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZ2VuZXJhdGUtaW5zcGVjdG9yLWlkbAppbmRleCAzOGRkMGRiZDk1MmU1 ODg5ZWQ0NjVlODIxYjI3MDRjYjVkZWI0OWMxLi5iNWVjYjc4ZWE4NmE0ZGU5OGQzOGM5ZmFhYjFl ZjBjYjUwYzU0N2QxIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZ2VuZXJh dGUtaW5zcGVjdG9yLWlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZ2VuZXJhdGUt aW5zcGVjdG9yLWlkbApAQCAtOTIsMTEgKzkyLDE3IEBAIG1hY3JvX3RyYWl0cyA9IHsKICAgICAi UHJvZmlsZXIiOiAiSkFWQVNDUklQVF9ERUJVR0dFUiIKIH0KIAotZGVmIHBhcmFtX3R5cGUocGFy YW0pOgorZGVmIGZ1bGxfcXVhbGlmaWVkX3R5cGVfaWQoZG9tYWluX25hbWUsIHR5cGVfaWQpOgor ICAgIGlmIHR5cGVfaWQuZmluZCgiLiIpID09IC0xOgorICAgICAgIHJldHVybiAiJXMuJXMiICUg KGRvbWFpbl9uYW1lLCB0eXBlX2lkKQorICAgIHJldHVybiB0eXBlX2lkCisgICAgCisKK2RlZiBw YXJhbV90eXBlKGRvbWFpbl9uYW1lLCBwYXJhbSk6CiAgICAgaWYgInR5cGUiIGluIHBhcmFtOgog ICAgICAgICByZXR1cm4gdHlwZV90cmFpdHNbcGFyYW1bInR5cGUiXV0KICAgICBpZiAiJHJlZiIg aW4gcGFyYW06Ci0gICAgICAgIHR5cGVfaWQgPSBwYXJhbVsiJHJlZiJdCisgICAgICAgIHR5cGVf aWQgPSBmdWxsX3F1YWxpZmllZF90eXBlX2lkKGRvbWFpbl9uYW1lLCBwYXJhbVsiJHJlZiJdKQog ICAgICAgICBpZiB0eXBlX2lkIGluIHJlZl90eXBlczoKICAgICAgICAgICAgIHJlZl90eXBlID0g cmVmX3R5cGVzW3R5cGVfaWRdCiAgICAgICAgICAgICByZXR1cm4gdHlwZV90cmFpdHNbcmVmX3R5 cGVbInR5cGUiXV0KQEAgLTEwOCw5ICsxMTQsMTIgQEAgZm9yIGRvbWFpbiBpbiBqc29uX2FwaToK ICAgICBpZiBkb21haW5fbmFtZSBpbiBtYWNyb190cmFpdHM6CiAgICAgICAgIG91dHB1dF9maWxl LndyaXRlKCJcbiNpZiBkZWZpbmVkKEVOQUJMRV8lcykgJiYgRU5BQkxFXyVzIiAlIChtYWNyb190 cmFpdHNbZG9tYWluX25hbWVdLCBtYWNyb190cmFpdHNbZG9tYWluX25hbWVdKSkKICAgICBvdXRw dXRfZmlsZS53cml0ZSgiXG4gICAgaW50ZXJmYWNlIFtDb25kaXRpb25hbD1JTlNQRUNUT1JdICVz IHsiICUgZG9tYWluX25hbWUpCisKICAgICBpZiAidHlwZXMiIGluIGRvbWFpbjoKICAgICAgICAg Zm9yIHR5cGUgaW4gZG9tYWluWyJ0eXBlcyJdOgotICAgICAgICAgICAgcmVmX3R5cGVzW3R5cGVb ImlkIl1dID0gdHlwZQorICAgICAgICAgICAgdHlwZV9pZCA9IGZ1bGxfcXVhbGlmaWVkX3R5cGVf aWQoZG9tYWluX25hbWUsIHR5cGVbImlkIl0pCisgICAgICAgICAgICByZWZfdHlwZXNbdHlwZV9p ZF0gPSB0eXBlOworCiAgICAgaWYgImNvbW1hbmRzIiBpbiBkb21haW46CiAgICAgICAgIGZvciBj b21tYW5kIGluIGRvbWFpblsiY29tbWFuZHMiXToKICAgICAgICAgICAgIHBhcmFtcyA9IFtdCkBA IC0xMjAsMTEgKzEyOSwxMiBAQCBmb3IgZG9tYWluIGluIGpzb25fYXBpOgogICAgICAgICAgICAg ICAgICAgICAgICAgb3B0aW9uYWwgPSAiIFtvcHRpb25hbF0iCiAgICAgICAgICAgICAgICAgICAg IGVsc2U6CiAgICAgICAgICAgICAgICAgICAgICAgICBvcHRpb25hbCA9ICIiCi0gICAgICAgICAg ICAgICAgICAgIHBhcmFtcy5hcHBlbmQoImluJXMgJXMgJXMiICUgKG9wdGlvbmFsLCBwYXJhbV90 eXBlKGluX3BhcmFtKSwgaW5fcGFyYW1bIm5hbWUiXSkpCisgICAgICAgICAgICAgICAgICAgIHBh cmFtcy5hcHBlbmQoImluJXMgJXMgJXMiICUgKG9wdGlvbmFsLCBwYXJhbV90eXBlKGRvbWFpbl9u YW1lLCBpbl9wYXJhbSksIGluX3BhcmFtWyJuYW1lIl0pKQogICAgICAgICAgICAgaWYgKCJyZXR1 cm5zIiBpbiBjb21tYW5kKToKICAgICAgICAgICAgICAgICBmb3Igb3V0X3BhcmFtIGluIGNvbW1h bmRbInJldHVybnMiXToKLSAgICAgICAgICAgICAgICAgICAgcGFyYW1zLmFwcGVuZCgib3V0ICVz ICVzIiAlIChwYXJhbV90eXBlKG91dF9wYXJhbSksIG91dF9wYXJhbVsibmFtZSJdKSkKKyAgICAg ICAgICAgICAgICAgICAgcGFyYW1zLmFwcGVuZCgib3V0ICVzICVzIiAlIChwYXJhbV90eXBlKGRv bWFpbl9uYW1lLCBvdXRfcGFyYW0pLCBvdXRfcGFyYW1bIm5hbWUiXSkpCiAgICAgICAgICAgICBv dXRwdXRfZmlsZS53cml0ZSgiXG4gICAgICAgIHZvaWQgJXMoJXMpOyIgJSAoY29tbWFuZFsibmFt ZSJdLCAiLCAiLmpvaW4ocGFyYW1zKSkpCisKICAgICBpZiAiZXZlbnRzIiBpbiBkb21haW46CiAg ICAgICAgIGZvciBldmVudCBpbiBkb21haW5bImV2ZW50cyJdOgogICAgICAgICAgICAgcGFyYW1z ID0gW10KQEAgLTEzNCw4ICsxNDQsOSBAQCBmb3IgZG9tYWluIGluIGpzb25fYXBpOgogICAgICAg ICAgICAgICAgICAgICAgICAgb3B0aW9uYWwgPSAiIFtvcHRpb25hbF0iCiAgICAgICAgICAgICAg ICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAgICAgICAgICBvcHRpb25hbCA9ICIiCi0gICAg ICAgICAgICAgICAgICAgIHBhcmFtcy5hcHBlbmQoIm91dCVzICVzICVzIiAlIChvcHRpb25hbCwg cGFyYW1fdHlwZShpbl9wYXJhbSksIGluX3BhcmFtWyJuYW1lIl0pKQorICAgICAgICAgICAgICAg ICAgICBwYXJhbXMuYXBwZW5kKCJvdXQlcyAlcyAlcyIgJSAob3B0aW9uYWwsIHBhcmFtX3R5cGUo ZG9tYWluX25hbWUsIGluX3BhcmFtKSwgaW5fcGFyYW1bIm5hbWUiXSkpCiAgICAgICAgICAgICBv dXRwdXRfZmlsZS53cml0ZSgiXG4gICAgICAgIFtldmVudF0gdm9pZCAlcyglcyk7IiAlIChldmVu dFsibmFtZSJdLCAiLCAiLmpvaW4ocGFyYW1zKSkpCisKICAgICBvdXRwdXRfZmlsZS53cml0ZSgi XG4gICAgfTsiKQogICAgIGlmIGRvbWFpblsiZG9tYWluIl0gaW4gbWFjcm9fdHJhaXRzOgogICAg ICAgICBvdXRwdXRfZmlsZS53cml0ZSgiXG4jZW5kaWYgLy8gRU5BQkxFXyVzIiAlIG1hY3JvX3Ry YWl0c1tkb21haW5bImRvbWFpbiJdXSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv Q29uc29sZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db25zb2xlLmgKaW5kZXggY2VlZmIzODcy ZWIwM2FkZWM5MzQ3YTk5N2YzNjM5MTNlYmFjZDlmOC4uYmZkY2FhN2E2NDEzYWRkOGYzM2M2Zjg0 YmZjN2QwNDkyOTYzNDgzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9Db25zb2xl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db25zb2xlLmgKQEAgLTUwLDcgKzUwLDYgQEAg Y2xhc3MgRnJhbWU7CiBjbGFzcyBQYWdlOwogY2xhc3MgU2NyaXB0Q2FsbFN0YWNrOwogCi0vLyBL ZWVwIGluIHN5bmMgd2l0aCBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGUuanMKIGVudW0gTWVz c2FnZVNvdXJjZSB7CiAgICAgSFRNTE1lc3NhZ2VTb3VyY2UsCiAgICAgV01MTWVzc2FnZVNvdXJj ZSwK