152313 2015-12-15 13:19:45 -0800 Web Inspector: Localize "global code" and "eval code" strings 2015-12-15 16:24:37 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1149368 0 joepeck 2015-12-15 13:19:45 -0800 * SUMMARY Localize "global code" and "eval code" strings. 1149369 1 webkit-bug-importer 2015-12-15 13:20:02 -0800 <rdar://problem/23906914> 1149370 2 267389 joepeck 2015-12-15 13:20:38 -0800 Created attachment 267389 [PATCH] Proposed Fix 1149435 3 joepeck 2015-12-15 16:24:37 -0800 <http://trac.webkit.org/changeset/194123> 267389 2015-12-15 13:20:38 -0800 2015-12-15 15:13:42 -0800 [PATCH] Proposed Fix local.patch text/plain 10086 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwZjU3ZDk5Li40NDY4YjE3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTUtMTIt MTUgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIg SW5zcGVjdG9yOiBMb2NhbGl6ZSAiZ2xvYmFsIGNvZGUiIGFuZCAiZXZhbCBjb2RlIiBzdHJpbmdz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTIzMTMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3Bl Y3Rvci9kZWJ1Z2dlci9qcy1zdGFja3RyYWNlLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNw ZWN0b3IvZGVidWdnZXIvanMtc3RhY2t0cmFjZS5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9t b2RlbC9zdGFjay10cmFjZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGluc3BlY3Rv ci9tb2RlbC9zdGFjay10cmFjZS5odG1sOiBBZGRlZC4KKwogMjAxNS0xMi0xNCAgSm9zZXBoIFBl Y29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFN0 YWNrIHRyYWNlcyBpbiBjb25zb2xlIGluY29ycmVjdGx5IHNob3cgIihhbm9ueW1vdXMgZnVuY3Rp b24pIiBmb3IgZ2xvYmFsIGNvZGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9k ZWJ1Z2dlci9qcy1zdGFja3RyYWNlLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rv ci9kZWJ1Z2dlci9qcy1zdGFja3RyYWNlLWV4cGVjdGVkLnR4dAppbmRleCAzZjQ2NGFmLi5hZTk3 Y2Q5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvanMtc3RhY2t0 cmFjZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2pz LXN0YWNrdHJhY2UtZXhwZWN0ZWQudHh0CkBAIC0xOSw3ICsxOSw3IEBAIGNvbnNvbGUudHJhY2Uo KToKICAgICB7CiAgICAgICAgICJsaW5lTnVtYmVyIjogbnVsbCwKICAgICAgICAgImNvbHVtbk51 bWJlciI6IG51bGwsCi0gICAgICAgICJmdW5jdGlvbk5hbWUiOiAiZXZhbCBjb2RlIiwKKyAgICAg ICAgImZ1bmN0aW9uTmFtZSI6ICJFdmFsIENvZGUiLAogICAgICAgICAibmF0aXZlQ29kZSI6IHRy dWUsCiAgICAgICAgICJwcm9ncmFtQ29kZSI6IHRydWUKICAgICB9CkBAIC03Myw3ICs3Myw3IEBA IGNvbnNvbGUudHJhY2UoKToKICAgICB7CiAgICAgICAgICJsaW5lTnVtYmVyIjogbnVsbCwKICAg ICAgICAgImNvbHVtbk51bWJlciI6IG51bGwsCi0gICAgICAgICJmdW5jdGlvbk5hbWUiOiAiZXZh bCBjb2RlIiwKKyAgICAgICAgImZ1bmN0aW9uTmFtZSI6ICJFdmFsIENvZGUiLAogICAgICAgICAi bmF0aXZlQ29kZSI6IHRydWUsCiAgICAgICAgICJwcm9ncmFtQ29kZSI6IHRydWUKICAgICB9CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvanMtc3RhY2t0cmFjZS5o dG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2pzLXN0YWNrdHJhY2UuaHRtbApp bmRleCAxMDlkYTdlLi43NWY5NzA3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv ZGVidWdnZXIvanMtc3RhY2t0cmFjZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9k ZWJ1Z2dlci9qcy1zdGFja3RyYWNlLmh0bWwKQEAgLTExNCw3ICsxMTQsNyBAQCBmdW5jdGlvbiB0 ZXN0KCkKICAgICAgICAgdmFyIGluZGV4ID0gMDsKICAgICAgICAgZm9yICh2YXIgZnJhbWUgb2Yg c3RhY2tUcmFjZSkgewogICAgICAgICAgICAgaW5kZXgrKzsKLSAgICAgICAgICAgIGlmIChmcmFt ZS5uYXRpdmVDb2RlICYmIGZyYW1lLmZ1bmN0aW9uTmFtZSA9PT0gImV2YWwgY29kZSIpCisgICAg ICAgICAgICBpZiAoZnJhbWUucHJvZ3JhbUNvZGUpCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgIH0KICAgICAgICAgcmV0dXJuIHN0YWNrVHJhY2Uuc2xpY2UoMCwgaW5kZXgpOwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL21vZGVsL3N0YWNrLXRyYWNlLWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9tb2RlbC9zdGFjay10cmFjZS1leHBlY3RlZC50 eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOTkwYjY5NAotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9tb2RlbC9zdGFjay10cmFjZS1leHBlY3Rl ZC50eHQKQEAgLTAsMCArMSwyMyBAQAorVGVzdHMgZm9yIHRoZSBXZWJJbnNwZWN0b3IuU3RhY2tU cmFjZSBtb2RlbCBvYmplY3QuCisKKworPT0gUnVubmluZyB0ZXN0IHN1aXRlOiBXZWJJbnNwZWN0 b3IuU3RhY2tUcmFjZQorLS0gUnVubmluZyB0ZXN0IGNhc2U6IFdlYkluc3BlY3Rvci5Db25zb2xl TWVzc2FnZS5TdGFja1RyYWNlCitQQVNTOiBDb25zb2xlTWVzc2FnZSB0eXBlIHNob3VsZCBiZSBU cmFjZS4KK1BBU1M6IENvbnNvbGVNZXNzYWdlIHNob3VsZCBoYXZlIFN0YWNrVHJhY2UuCitQQVNT OiBDYWxsRnJhbWUgaW4gU3RhY2tUcmFjZSBoYXMgbm8gaWRlbnRpZmllci4KK1BBU1M6IENhbGxG cmFtZSBpbiBTdGFja1RyYWNlIGhhcyBubyB0aGlzT2JqZWN0LgorUEFTUzogQ2FsbEZyYW1lIGlu IFN0YWNrVHJhY2UgaGFzIG5vIHNjb3BlQ2hhaW4uCitTdGFja1RyYWNlOiAxMQorICAxOiBmb28g LSBuYXRpdmVDb2RlICh0cnVlKSBwcm9ncmFtQ29kZSAoZmFsc2UpCisgIDI6IEV2YWwgQ29kZSAt IG5hdGl2ZUNvZGUgKHRydWUpIHByb2dyYW1Db2RlICh0cnVlKQorICAzOiBldmFsIC0gbmF0aXZl Q29kZSAodHJ1ZSkgcHJvZ3JhbUNvZGUgKGZhbHNlKQorICA0OiBHbG9iYWwgQ29kZSAoc3RhY2st dHJhY2UuaHRtbDoyKSAtIG5hdGl2ZUNvZGUgKGZhbHNlKSBwcm9ncmFtQ29kZSAodHJ1ZSkKKyAg NTogYXBwZW5kQ2hpbGQgLSBuYXRpdmVDb2RlICh0cnVlKSBwcm9ncmFtQ29kZSAoZmFsc2UpCisg IDY6IHRyaWdnZXJDb25zb2xlTWVzc2FnZSAoc3RhY2stdHJhY2UuaHRtbDo5KSAtIG5hdGl2ZUNv ZGUgKGZhbHNlKSBwcm9ncmFtQ29kZSAoZmFsc2UpCisgIDc6IEV2YWwgQ29kZSAtIG5hdGl2ZUNv ZGUgKHRydWUpIHByb2dyYW1Db2RlICh0cnVlKQorICA4OiBldmFsIC0gbmF0aXZlQ29kZSAodHJ1 ZSkgcHJvZ3JhbUNvZGUgKGZhbHNlKQorICA5OiBfZXZhbHVhdGVPbiAtIG5hdGl2ZUNvZGUgKHRy dWUpIHByb2dyYW1Db2RlIChmYWxzZSkKKyAgMTA6IF9ldmFsdWF0ZUFuZFdyYXAgLSBuYXRpdmVD b2RlICh0cnVlKSBwcm9ncmFtQ29kZSAoZmFsc2UpCisgIDExOiBldmFsdWF0ZSAtIG5hdGl2ZUNv ZGUgKHRydWUpIHByb2dyYW1Db2RlIChmYWxzZSkKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL21vZGVsL3N0YWNrLXRyYWNlLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv bW9kZWwvc3RhY2stdHJhY2UuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw Li4wYmQ4MDlmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL21vZGVs L3N0YWNrLXRyYWNlLmh0bWwKQEAgLTAsMCArMSw2MCBAQAorPCFkb2N0eXBlIGh0bWw+Cis8aHRt bD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291 cmNlcy9pbnNwZWN0b3ItdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorZnVuY3Rpb24gdHJp Z2dlckNvbnNvbGVNZXNzYWdlKCkgeworICAgIGxldCBzY3JpcHQgPSBkb2N1bWVudC5jcmVhdGVF bGVtZW50KCJzY3JpcHQiKTsKKyAgICBzY3JpcHQudGV4dENvbnRlbnQgPSAiLy8jIHNvdXJjZVVS TD1pbmxpbmUtc2NyaXB0LmpzXG5ldmFsKCdmdW5jdGlvbiBmb28oKSB7IGNvbnNvbGUudHJhY2Uo KTsgfTsgZm9vKCk7JykiOworICAgIGRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQoc2NyaXB0KTsK K30KKworZnVuY3Rpb24gdGVzdCgpCit7CisgICAgZnVuY3Rpb24gbG9nU3RhY2tUcmFjZShzdGFj a1RyYWNlKSB7CisgICAgICAgIEluc3BlY3RvclRlc3QubG9nKGBTdGFja1RyYWNlOiAke3N0YWNr VHJhY2UuY2FsbEZyYW1lcy5sZW5ndGh9YCk7CisgICAgICAgIGZvciAobGV0IGkgPSAwOyBpIDwg c3RhY2tUcmFjZS5jYWxsRnJhbWVzLmxlbmd0aDsgKytpKSB7CisgICAgICAgICAgICBsZXQgY2Fs bEZyYW1lID0gc3RhY2tUcmFjZS5jYWxsRnJhbWVzW2ldOworICAgICAgICAgICAgbGV0IHN0cmlu ZyA9IGAgICR7aSArIDF9OiAke2NhbGxGcmFtZS5mdW5jdGlvbk5hbWV9YDsKKyAgICAgICAgICAg IGlmIChjYWxsRnJhbWUuc291cmNlQ29kZUxvY2F0aW9uKQorICAgICAgICAgICAgICAgIHN0cmlu ZyArPSBgICgke2NhbGxGcmFtZS5zb3VyY2VDb2RlTG9jYXRpb24ub3JpZ2luYWxMb2NhdGlvblN0 cmluZygpfSlgOworICAgICAgICAgICAgc3RyaW5nICs9ICIgLSI7CisgICAgICAgICAgICBzdHJp bmcgKz0gYCBuYXRpdmVDb2RlICgke2NhbGxGcmFtZS5uYXRpdmVDb2RlfSlgOworICAgICAgICAg ICAgc3RyaW5nICs9IGAgcHJvZ3JhbUNvZGUgKCR7Y2FsbEZyYW1lLnByb2dyYW1Db2RlfSlgOwor ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5sb2coc3RyaW5nKTsKKyAgICAgICAgfQorICAgIH0K KworICAgIGxldCBzdWl0ZSA9IEluc3BlY3RvclRlc3QuY3JlYXRlQXN5bmNTdWl0ZSgiV2ViSW5z cGVjdG9yLlN0YWNrVHJhY2UiKTsKKworICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKKyAgICAgICAg bmFtZTogIldlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5TdGFja1RyYWNlIiwKKyAgICAgICAg ZGVzY3JpcHRpb246ICJUZXN0IHdlIGNhbiBjcmVhdGUgYSBTdGFja1RyYWNlIGZyb20gY29uc29s ZSBtZXNzYWdlcyAoQ29uc29sZS5TdGFja1RyYWNlKS4iLAorICAgICAgICB0ZXN0OiAocmVzb2x2 ZSwgcmVqZWN0KSA9PiB7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdl KCJ0cmlnZ2VyQ29uc29sZU1lc3NhZ2UoKSIpOworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmxv Z01hbmFnZXIuc2luZ2xlRmlyZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkxvZ01hbmFnZXIu RXZlbnQuTWVzc2FnZUFkZGVkLCBmdW5jdGlvbiBhZGRMaXN0ZW5lcihldmVudCkgeworICAgICAg ICAgICAgICAgIC8vIFRyYWNlIG1lc3NhZ2Ugc2hvdWxkIGFsd2F5cyBoYXZlIGEgc3RhY2sgdHJh Y2UuCisgICAgICAgICAgICAgICAgbGV0IGNvbnNvbGVNZXNzYWdlID0gZXZlbnQuZGF0YS5tZXNz YWdlOworICAgICAgICAgICAgICAgIGxldCBzdGFja1RyYWNlID0gY29uc29sZU1lc3NhZ2Uuc3Rh Y2tUcmFjZTsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoY29uc29s ZU1lc3NhZ2UudHlwZSA9PT0gV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBl LlRyYWNlLCAiQ29uc29sZU1lc3NhZ2UgdHlwZSBzaG91bGQgYmUgVHJhY2UuIik7CisgICAgICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KHN0YWNrVHJhY2UgaW5zdGFuY2VvZiBX ZWJJbnNwZWN0b3IuU3RhY2tUcmFjZSwgIkNvbnNvbGVNZXNzYWdlIHNob3VsZCBoYXZlIFN0YWNr VHJhY2UuIik7CisKKyAgICAgICAgICAgICAgICAvLyBDb25zb2xlIG1lc3NhZ2Ugc3RhY2sgdHJh Y2UgY2FsbCBmcmFtZSdzIGRvIG5vdCBoYXZlIGRlYnVnZ2luZyBpbmZvcm1hdGlvbi4KKyAgICAg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoc3RhY2tUcmFjZS5jYWxsRnJhbWVz WzBdLmlkID09PSBudWxsLCAiQ2FsbEZyYW1lIGluIFN0YWNrVHJhY2UgaGFzIG5vIGlkZW50aWZp ZXIuIik7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KHN0YWNrVHJh Y2UuY2FsbEZyYW1lc1swXS50aGlzT2JqZWN0ID09PSBudWxsLCAiQ2FsbEZyYW1lIGluIFN0YWNr VHJhY2UgaGFzIG5vIHRoaXNPYmplY3QuIik7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5leHBlY3RUaGF0KCFzdGFja1RyYWNlLmNhbGxGcmFtZXNbMF0uc2NvcGVDaGFpbi5sZW5ndGgs ICJDYWxsRnJhbWUgaW4gU3RhY2tUcmFjZSBoYXMgbm8gc2NvcGVDaGFpbi4iKTsKKworICAgICAg ICAgICAgICAgIGxvZ1N0YWNrVHJhY2UoY29uc29sZU1lc3NhZ2Uuc3RhY2tUcmFjZSk7CisgICAg ICAgICAgICAgICAgcmVzb2x2ZSgpOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0KKyAgICB9 KTsKKworICAgIHN1aXRlLnJ1blRlc3RDYXNlc0FuZEZpbmlzaCgpOworfQorPC9zY3JpcHQ+Cis8 L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+Cis8cD5UZXN0cyBmb3IgdGhlIFdlYklu c3BlY3Rvci5TdGFja1RyYWNlIG1vZGVsIG9iamVjdC48L3A+Cis8L2JvZHk+Cis8L2h0bWw+CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYklu c3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBlYmY5NzdiLi5jZWFkMzI4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxNS0xMi0xNSAgSm9zZXBoIFBlY29yYXJv ICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IExvY2FsaXpl ICJnbG9iYWwgY29kZSIgYW5kICJldmFsIGNvZGUiIHN0cmluZ3MKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjMxMworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9s b2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL0NhbGxG cmFtZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DYWxsRnJhbWUuZnJvbVBheWxvYWQpOgor ICAgICAgICBMb2NhbGl6ZSB0aGUgc3RyaW5ncyBnaXZlbiB0byB1c2UgZnJvbSB0aGUgYmFja2Vu ZC4KKwogMjAxNS0xMi0xNCAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgog CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFN0YWNrIHRyYWNlcyBpbiBjb25zb2xlIGluY29ycmVj dGx5IHNob3cgIihhbm9ueW1vdXMgZnVuY3Rpb24pIiBmb3IgZ2xvYmFsIGNvZGUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXpl ZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IGM5NzRiYzMxNGU5YWI0MTJiNmMwYjdlM2RkOTBl ZTU1MWIyMzUwODAuLjhkMTkxNzk5MzM3ODZmZjdjYjY3YmVlZWMxNDhmOWUyM2ExNmYwMzEgMTAw NjQ0CkdJVCBiaW5hcnkgcGF0Y2gKZGVsdGEgMTM4CnpjbWV6S2pBaG5LbUpSI2M2JWBucThTKXVZ NypaTE83LUFVfDc7SiU5aU5UZWpqM0pSQjJncjd3KyF0WkVkMyQ/Pwp1NUlhPWk8YTR2NjhOdEdu KlUjZUhFSSo0dyFPJDBNTWshRTdEbzc2JjZWWChGTzt6NiZTX3VGaSVfQzwzCgpkZWx0YSAzMgpx Y21WKyowTj8rYj0+K2BkMWhCdHtsU195b2xZOCtCdnFPa0I2MF9UeTJxM2RYeUgkQStzU2s8KAoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9D YWxsRnJhbWUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMv Q2FsbEZyYW1lLmpzCmluZGV4IGM1OThlMTIuLmQzMzJkZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9DYWxsRnJhbWUuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NhbGxGcmFtZS5qcwpAQCAt MTEyLDMxICsxMTIsMzcgQEAgV2ViSW5zcGVjdG9yLkNhbGxGcmFtZSA9IGNsYXNzIENhbGxGcmFt ZSBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNz ZXJ0KHBheWxvYWQpOwogCi0gICAgICAgIHZhciB1cmwgPSBwYXlsb2FkLnVybDsKLSAgICAgICAg dmFyIG5hdGl2ZUNvZGUgPSBmYWxzZTsKLSAgICAgICAgdmFyIHByb2dyYW1Db2RlID0gZmFsc2U7 Ci0gICAgICAgIHZhciBzb3VyY2VDb2RlTG9jYXRpb24gPSBudWxsOworICAgICAgICBsZXQgdXJs ID0gcGF5bG9hZC51cmw7CisgICAgICAgIGxldCBuYXRpdmVDb2RlID0gZmFsc2U7CisgICAgICAg IGxldCBwcm9ncmFtQ29kZSA9IGZhbHNlOworICAgICAgICBsZXQgc291cmNlQ29kZUxvY2F0aW9u ID0gbnVsbDsKIAogICAgICAgICBpZiAoIXVybCB8fCB1cmwgPT09ICJbbmF0aXZlIGNvZGVdIikg ewogICAgICAgICAgICAgbmF0aXZlQ29kZSA9IHRydWU7CiAgICAgICAgICAgICB1cmwgPSBudWxs OwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgdmFyIHNvdXJjZUNvZGUgPSBXZWJJbnNw ZWN0b3IuZnJhbWVSZXNvdXJjZU1hbmFnZXIucmVzb3VyY2VGb3JVUkwodXJsKTsKKyAgICAgICAg ICAgIGxldCBzb3VyY2VDb2RlID0gV2ViSW5zcGVjdG9yLmZyYW1lUmVzb3VyY2VNYW5hZ2VyLnJl c291cmNlRm9yVVJMKHVybCk7CiAgICAgICAgICAgICBpZiAoIXNvdXJjZUNvZGUpCiAgICAgICAg ICAgICAgICAgc291cmNlQ29kZSA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIuc2NyaXB0 c0ZvclVSTCh1cmwpWzBdOwogCiAgICAgICAgICAgICBpZiAoc291cmNlQ29kZSkgewogICAgICAg ICAgICAgICAgIC8vIFRoZSBsaW5lTnVtYmVyIGlzIDEtYmFzZWQsIGJ1dCB3ZSBleHBlY3QgMC1i YXNlZC4KLSAgICAgICAgICAgICAgICB2YXIgbGluZU51bWJlciA9IHBheWxvYWQubGluZU51bWJl ciAtIDE7CisgICAgICAgICAgICAgICAgbGV0IGxpbmVOdW1iZXIgPSBwYXlsb2FkLmxpbmVOdW1i ZXIgLSAxOwogICAgICAgICAgICAgICAgIHNvdXJjZUNvZGVMb2NhdGlvbiA9IHNvdXJjZUNvZGUu Y3JlYXRlTGF6eVNvdXJjZUNvZGVMb2NhdGlvbihsaW5lTnVtYmVyLCBwYXlsb2FkLmNvbHVtbk51 bWJlcik7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAgICB2YXIgZnVuY3Rpb25O YW1lID0gcGF5bG9hZC5mdW5jdGlvbk5hbWU7Ci0gICAgICAgIGlmIChwYXlsb2FkLmZ1bmN0aW9u TmFtZSA9PT0gImdsb2JhbCBjb2RlIgotICAgICAgICAgICAgfHwgcGF5bG9hZC5mdW5jdGlvbk5h bWUgPT09ICJldmFsIGNvZGUiCi0gICAgICAgICAgICB8fCBwYXlsb2FkLmZ1bmN0aW9uTmFtZSA9 PT0gIm1vZHVsZSBjb2RlIikKKyAgICAgICAgbGV0IGZ1bmN0aW9uTmFtZSA9IHBheWxvYWQuZnVu Y3Rpb25OYW1lOworICAgICAgICBpZiAocGF5bG9hZC5mdW5jdGlvbk5hbWUgPT09ICJnbG9iYWwg Y29kZSIpIHsKKyAgICAgICAgICAgIGZ1bmN0aW9uTmFtZSA9IFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiR2xvYmFsIENvZGUiKTsKICAgICAgICAgICAgIHByb2dyYW1Db2RlID0gdHJ1ZTsKKyAgICAg ICAgfSBlbHNlIGlmIChwYXlsb2FkLmZ1bmN0aW9uTmFtZSA9PT0gImV2YWwgY29kZSIpIHsKKyAg ICAgICAgICAgIGZ1bmN0aW9uTmFtZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRXZhbCBDb2Rl Iik7CisgICAgICAgICAgICBwcm9ncmFtQ29kZSA9IHRydWU7CisgICAgICAgIH0gZWxzZSBpZiAo cGF5bG9hZC5mdW5jdGlvbk5hbWUgPT09ICJtb2R1bGUgY29kZSIpIHsKKyAgICAgICAgICAgIGZ1 bmN0aW9uTmFtZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiTW9kdWxlIENvZGUiKTsKKyAgICAg ICAgICAgIHByb2dyYW1Db2RlID0gdHJ1ZTsKKyAgICAgICAgfQogCiAgICAgICAgIHJldHVybiBu ZXcgV2ViSW5zcGVjdG9yLkNhbGxGcmFtZShudWxsLCBzb3VyY2VDb2RlTG9jYXRpb24sIGZ1bmN0 aW9uTmFtZSwgbnVsbCwgbnVsbCwgbmF0aXZlQ29kZSwgcHJvZ3JhbUNvZGUpOwogICAgIH0K