65601 2011-08-03 03:05:20 -0700 Web Inspector: files from different domains are mixed in the file selector in Scripts panel 2011-08-09 09:09:17 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yurys pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 445782 0 yurys 2011-08-03 03:05:20 -0700 Open a page with several iframes from different domains and look at the file selector in Scripts panel. Files from different domains should be grouped by domain name, not only by path. Also top level folders should be displayed as "/" instead of "(program)". 448599 1 103363 pfeldman 2011-08-09 08:18:17 -0700 Created attachment 103363 Patch 448616 2 pfeldman 2011-08-09 09:09:17 -0700 Committed r92688: <http://trac.webkit.org/changeset/92688> 103363 2011-08-09 08:18:17 -0700 2011-08-09 08:50:07 -0700 Patch bug-65601-20110809191815.patch text/plain 9547 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTI2ODMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA0ODU4NGQxYjYwZjA4NjlmZjYzYTNj YTE4NWU5YzI3NWE0MTQ1NDYxLi5kMDVlNGVlYmU2Yzk0MTIxY2VhODFkYzRlMzBiYzU1MmY5OGFh YmNhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUgQEAKIDIwMTEtMDgtMDkgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGZpbGVzIGZyb20g ZGlmZmVyZW50IGRvbWFpbnMgYXJlIG1peGVkIGluIHRoZSBmaWxlIHNlbGVjdG9yIGluIFNjcmlw dHMgcGFuZWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTY1NjAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBpbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC1leHBlY3RlZC50eHQ6CisgICAgICAg ICogcGxhdGZvcm0vY2hyb21pdW0vaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtc29ydGluZy1l eHBlY3RlZC50eHQ6CisKKzIwMTEtMDgtMDkgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29n bGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHByb3ZpZGUgYSB3YXkgdG8gaGlkZSB1 c2VyIGFnZW50IHN0eWxlcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9Mzc3NjYKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVn Z2VyL3NjcmlwdHMtcGFuZWwtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Rl YnVnZ2VyL3NjcmlwdHMtcGFuZWwtZXhwZWN0ZWQudHh0CmluZGV4IGMwYzNlZjIzNDIxNTc5Y2I3 MmJkZGQ3OTQzOTAwNzg0NmEwNDY2Y2YuLjYxYzI0ZmE4NzAxOWFlYzAzZGM1ZjU0YWI5MzIxNzE0 MjYxYTc0NzggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3Jp cHRzLXBhbmVsLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdn ZXIvc2NyaXB0cy1wYW5lbC1leHBlY3RlZC50eHQKQEAgLTEwLDE4ICsxMCwxOSBAQCBSdW5uaW5n OiB0ZXN0U291cmNlRnJhbWVzQ291bnQKIFBhZ2UgcmVsb2FkZWQuCiAKIFJ1bm5pbmc6IHRlc3RG aWxlc1NlbGVjdAotdGV4dDogwqDCoMKgwqA/YT1iLCB0b29sdGlwOiA/YT1iCi10ZXh0OiDCoMKg wqDCoD9hPWIsIHRvb2x0aXA6IGh0dHA6Ly9leGFtcGxlLmNvbS8/YT1iCi10ZXh0OiDCoMKgwqDC oOKApm9vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vbmdfdXJsLCB0b29sdGlwOiB2ZXJ5X2xvb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29uZ191cmwKK3RleHQ6IMKgwqDCoMKgwqDCoMKgwqA/YT1i LCB0b29sdGlwOiA/YT1iCit0ZXh0OiDCoMKgwqDCoMKgwqDCoMKg4oCmb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29v b29uZ191cmwsIHRvb2x0aXA6IHZlcnlfbG9vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29v b29vb25nX3VybAordGV4dDogZXhhbXBsZS5jb20sIHRvb2x0aXA6IAordGV4dDogwqDCoMKgwqDC oMKgwqDCoD9hPWIsIHRvb2x0aXA6IGh0dHA6Ly9leGFtcGxlLmNvbS8/YT1iCiB0ZXh0OiBMYXlv dXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvZm9vL2JhciwgdG9vbHRpcDogCi10ZXh0OiDCoMKg wqDCoHNjcmlwdC5qcywgdG9vbHRpcDogPHJvb3Q+L2Zvby9iYXIvc2NyaXB0LmpzCi10ZXh0OiDC oMKgwqDCoHNjcmlwdC5qcz9hPTEsIHRvb2x0aXA6IDxyb290Pi9mb28vYmFyL3NjcmlwdC5qcz9h PTEKLXRleHQ6IMKgwqDCoMKgc2NyaXB0LmpzP2E9MiwgdG9vbHRpcDogPHJvb3Q+L2Zvby9iYXIv c2NyaXB0LmpzP2E9MgordGV4dDogwqDCoMKgwqDCoMKgwqDCoHNjcmlwdC5qcywgdG9vbHRpcDog PHJvb3Q+L2Zvby9iYXIvc2NyaXB0LmpzCit0ZXh0OiDCoMKgwqDCoMKgwqDCoMKgc2NyaXB0Lmpz P2E9MSwgdG9vbHRpcDogPHJvb3Q+L2Zvby9iYXIvc2NyaXB0LmpzP2E9MQordGV4dDogwqDCoMKg wqDCoMKgwqDCoHNjcmlwdC5qcz9hPTIsIHRvb2x0aXA6IDxyb290Pi9mb28vYmFyL3NjcmlwdC5q cz9hPTIKIHRleHQ6IExheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9mb28vYmF6LCB0b29s dGlwOiAKLXRleHQ6IMKgwqDCoMKgc2NyaXB0LmpzLCB0b29sdGlwOiA8cm9vdD4vZm9vL2Jhei9z Y3JpcHQuanMKK3RleHQ6IMKgwqDCoMKgwqDCoMKgwqBzY3JpcHQuanMsIHRvb2x0aXA6IDxyb290 Pi9mb28vYmF6L3NjcmlwdC5qcwogdGV4dDogQ29udGVudCBzY3JpcHRzLCB0b29sdGlwOiAKLXRl eHQ6IMKgwqDCoMKgY29udGVudFNjcmlwdC5qcz9hPTEsIHRvb2x0aXA6IDxyb290Pi9mb28vYmFy L2NvbnRlbnRTY3JpcHQuanM/YT0xCi10ZXh0OiDCoMKgwqDCoGNvbnRlbnRTY3JpcHQuanM/YT0y LCB0b29sdGlwOiA8cm9vdD4vZm9vL2Jhci9jb250ZW50U2NyaXB0LmpzP2E9MgotdGV4dDogwqDC oMKgwqBjb250ZW50U2NyaXB0Mi5qcz9hPTEsIHRvb2x0aXA6IDxyb290Pi9mb28vYmFyL2NvbnRl bnRTY3JpcHQyLmpzP2E9MQordGV4dDogwqDCoMKgwqDCoMKgwqDCoGNvbnRlbnRTY3JpcHQuanM/ YT0xLCB0b29sdGlwOiA8cm9vdD4vZm9vL2Jhci9jb250ZW50U2NyaXB0LmpzP2E9MQordGV4dDog wqDCoMKgwqDCoMKgwqDCoGNvbnRlbnRTY3JpcHQuanM/YT0yLCB0b29sdGlwOiA8cm9vdD4vZm9v L2Jhci9jb250ZW50U2NyaXB0LmpzP2E9MgordGV4dDogwqDCoMKgwqDCoMKgwqDCoGNvbnRlbnRT Y3JpcHQyLmpzP2E9MSwgdG9vbHRpcDogPHJvb3Q+L2Zvby9iYXIvY29udGVudFNjcmlwdDIuanM/ YT0xCiBEZWJ1Z2dlciB3YXMgZGlzYWJsZWQuCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3Bs YXRmb3JtL2Nocm9taXVtL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXNvcnRpbmctZXhwZWN0 ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vaW5zcGVjdG9yL2RlYnVnZ2Vy L3NjcmlwdHMtc29ydGluZy1leHBlY3RlZC50eHQKaW5kZXggNjBmZGQ3ZGUwYjg3OGI1NTExMjYy MzQwYTNkNjk5ZGEyY2Y3M2Y0Yy4uMTFmOWRhYmRjZmM2MDNmMWU0YTM4OWFkODhkYTgxYzE3MDgw ZDI3OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vaW5zcGVjdG9y L2RlYnVnZ2VyL3NjcmlwdHMtc29ydGluZy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMv cGxhdGZvcm0vY2hyb21pdW0vaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtc29ydGluZy1leHBl Y3RlZC50eHQKQEAgLTEsMTggKzEsMTkgQEAKIFRlc3RzIHNjcmlwdHMgc29ydGluZyBpbiB0aGUg c2NyaXB0cyBwYW5lbC4KIAogRGVidWdnZXIgd2FzIGVuYWJsZWQuCi0gICAgKk5vbipVUkwqcGF0 aAotICAgIGJsb2NrLmpzP2Jsb2NrPWZvbwotICAgIGdhLmpzCi0gICAgbGVudGEuYmFuP3BnPTQ4 ODMmaWZyPTEKLSAgICBsZW50YS5iYW4/cGc9NTMwOSZpZnI9MQotICAgIHRvcDEwMC5qY24/ODA2 NzQKLS9fanMvcHJvZHVjdGlvbgotICAgIG1vdG9yLmpzPzEzMDg5Mjc0MzIKLS9pCi0gICAgeGdl bWl1cy5qcwotL2kvanMKLSAgICBqcXVlcnktMS41LjEubWluLmpzCi0gICAganF1ZXJ5LmNvb2tp ZS5qcworICAgICAgICAqTm9uKlVSTCpwYXRoCitmb28uY29tCisgICAgICAgIGJsb2NrLmpzP2Js b2NrPWZvbworICAgICAgICBnYS5qcworICAgICAgICBsZW50YS5iYW4/cGc9NDg4MyZpZnI9MQor ICAgICAgICBsZW50YS5iYW4/cGc9NTMwOSZpZnI9MQorICAgICAgICB0b3AxMDAuamNuPzgwNjc0 CisgICAgL19qcy9wcm9kdWN0aW9uCisgICAgICAgIG1vdG9yLmpzPzEzMDg5Mjc0MzIKKyAgICAv aQorICAgICAgICB4Z2VtaXVzLmpzCisgICAgL2kvanMKKyAgICAgICAganF1ZXJ5LTEuNS4xLm1p bi5qcworICAgICAgICBqcXVlcnkuY29va2llLmpzCiBEZWJ1Z2dlciB3YXMgZGlzYWJsZWQuCiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1NGU4ODU5ZmQzNDBmNDc0ZTE4Mzg5ZDM4NGNlZTMyOWYxMzJlNGI0Li45 MGEwNjBkYmFlNTc1MmQwYmZjMmVjNmZlZmIxMzJjNTRjNDVjYTE1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDUgKzEsMTkgQEAKIDIwMTEtMDgtMDkgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUu Y29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGZpbGVzIGZyb20gZGlmZmVyZW50IGRvbWFp bnMgYXJlIG1peGVkIGluIHRoZSBmaWxlIHNlbGVjdG9yIGluIFNjcmlwdHMgcGFuZWwKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1NjAxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFu ZWwucHJvdG90eXBlLl9hZGRPcHRpb25Ub0ZpbGVzU2VsZWN0KToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9mb2xkZXJBbmREaXNwbGF5TmFtZUZvclNjcmlw dFVSTCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5yZXNl dCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzOgorICAgICAg ICAoc2VsZWN0LnN0YXR1cy1iYXItaXRlbSk6CisKKzIwMTEtMDgtMDkgIFBhdmVsIEZlbGRtYW4g IDxwZmVsZG1hbkBnb29nbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHByb3ZpZGUg YSB3YXkgdG8gaGlkZSB1c2VyIGFnZW50IHN0eWxlcwogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzc3NjYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCA1ZTIyMTVlYWQwYzYxMzg3 ZmY4YTVhZDM4ZDc5ZjU3MzNkMDBkYjNlLi4zMTkzYTdkNzUzMGFkYTI3YTliNDg1OGE4MTc0YWNi NTBiNzQ1OTIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NjcmlwdHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NjcmlwdHNQYW5lbC5qcwpAQCAtMjU1LDYgKzI1NSw4IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRz UGFuZWwucHJvdG90eXBlID0gewogICAgIF9hZGRPcHRpb25Ub0ZpbGVzU2VsZWN0OiBmdW5jdGlv bihzb3VyY2VGaWxlKQogICAgIHsKICAgICAgICAgdmFyIHNlbGVjdCA9IHRoaXMuX2ZpbGVzU2Vs ZWN0RWxlbWVudDsKKyAgICAgICAgaWYgKCFzZWxlY3QuZG9tYWluT3B0aW9ucykKKyAgICAgICAg ICAgIHNlbGVjdC5kb21haW5PcHRpb25zID0ge307CiAgICAgICAgIGlmICghc2VsZWN0LmZvbGRl ck9wdGlvbnMpCiAgICAgICAgICAgICBzZWxlY3QuZm9sZGVyT3B0aW9ucyA9IHt9OwogCkBAIC0y NjIsOSArMjY0LDE2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewog ICAgICAgICB2YXIgcGFyc2VkVVJMID0gc291cmNlRmlsZS51cmwuYXNQYXJzZWRVUkwoKTsKIAog ICAgICAgICB2YXIgbmFtZXMgPSB0aGlzLl9mb2xkZXJBbmREaXNwbGF5TmFtZUZvclNjcmlwdFVS TChzb3VyY2VGaWxlLnVybCk7Ci0gICAgICAgIG9wdGlvbi50ZXh0ID0gbmFtZXMuZGlzcGxheU5h bWUgPyAiXHUwMGEwXHUwMGEwXHUwMGEwXHUwMGEwIiArIG5hbWVzLmRpc3BsYXlOYW1lIDogV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCIocHJvZ3JhbSkiKTsKKyAgICAgICAgY29uc3QgaW5kZW50ID0g Ilx1MDBhMFx1MDBhMFx1MDBhMFx1MDBhMCI7CisgICAgICAgIG9wdGlvbi50ZXh0ID0gbmFtZXMu ZGlzcGxheU5hbWUgPyBpbmRlbnQgKyBpbmRlbnQgKyBuYW1lcy5kaXNwbGF5TmFtZSA6IFdlYklu c3BlY3Rvci5VSVN0cmluZygiKHByb2dyYW0pIik7CiAgICAgICAgIG9wdGlvbi5zY3JpcHROYW1l Rm9yVGVzdCA9IG5hbWVzLmRpc3BsYXlOYW1lOwotICAgICAgICB2YXIgZm9sZGVyTmFtZUZvclNv cnRpbmcgPSAoc291cmNlRmlsZS5pc0NvbnRlbnRTY3JpcHQgPyAiMiIgOiAiMCIpICsgbmFtZXMu Zm9sZGVyTmFtZTsKKworICAgICAgICB2YXIgZm9sZGVyTmFtZUZvclNvcnRpbmc7CisgICAgICAg IGlmIChzb3VyY2VGaWxlLmlzQ29udGVudFNjcmlwdCkKKyAgICAgICAgICAgIGZvbGRlck5hbWVG b3JTb3J0aW5nID0gIjI6IiArIG5hbWVzLmZvbGRlck5hbWU7CisgICAgICAgIGVsc2UKKyAgICAg ICAgICAgIGZvbGRlck5hbWVGb3JTb3J0aW5nID0gIjA6IiArIChuYW1lcy5kb21haW4gPyBuYW1l cy5kb21haW4gKyAiXHRcdCIgOiAiIikgKyBuYW1lcy5mb2xkZXJOYW1lOworCiAgICAgICAgIG9w dGlvbi5uYW1lRm9yU29ydGluZyA9IGZvbGRlck5hbWVGb3JTb3J0aW5nICsgIlx0L1x0IiArIG5h bWVzLmRpc3BsYXlOYW1lOyAvLyBVc2UgJ1x0JyB0byBtYWtlIGZpbGVzIHN0aWNrIHRvIHRoZWly IGZvbGRlci4KICAgICAgICAgb3B0aW9uLnRpdGxlID0gc291cmNlRmlsZS51cmw7CiAgICAgICAg IGlmIChzb3VyY2VGaWxlLmlzQ29udGVudFNjcmlwdCkKQEAgLTI5MSw5ICszMDAsMTggQEAgV2Vi SW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBpbnNlcnRP cmRlcmVkKGNvbnRlbnRTY3JpcHRTZWN0aW9uKTsKICAgICAgICAgfQogCisgICAgICAgIGlmICgh c291cmNlRmlsZS5pc0NvbnRlbnRTY3JpcHQgJiYgbmFtZXMuZG9tYWluICYmICFzZWxlY3QuZG9t YWluT3B0aW9uc1tuYW1lcy5kb21haW5dKSB7CisgICAgICAgICAgICB2YXIgZG9tYWluT3B0aW9u ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgib3B0aW9uIik7CisgICAgICAgICAgICBkb21haW5P cHRpb24udGV4dCA9IG5hbWVzLmRvbWFpbjsKKyAgICAgICAgICAgIGRvbWFpbk9wdGlvbi5uYW1l Rm9yU29ydGluZyA9ICIwOiIgKyBuYW1lcy5kb21haW47CisgICAgICAgICAgICBkb21haW5PcHRp b24uZGlzYWJsZWQgPSB0cnVlOworICAgICAgICAgICAgc2VsZWN0LmRvbWFpbk9wdGlvbnNbbmFt ZXMuZG9tYWluXSA9IGRvbWFpbk9wdGlvbjsKKyAgICAgICAgICAgIGluc2VydE9yZGVyZWQoZG9t YWluT3B0aW9uKTsKKyAgICAgICAgfQorCiAgICAgICAgIGlmIChuYW1lcy5mb2xkZXJOYW1lICYm ICFzZWxlY3QuZm9sZGVyT3B0aW9uc1tuYW1lcy5mb2xkZXJOYW1lXSkgewogICAgICAgICAgICAg dmFyIGZvbGRlck9wdGlvbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9wdGlvbiIpOwotICAg ICAgICAgICAgZm9sZGVyT3B0aW9uLnRleHQgPSBuYW1lcy5mb2xkZXJOYW1lOworICAgICAgICAg ICAgZm9sZGVyT3B0aW9uLnRleHQgPSBpbmRlbnQgKyBuYW1lcy5mb2xkZXJOYW1lOwogICAgICAg ICAgICAgZm9sZGVyT3B0aW9uLm5hbWVGb3JTb3J0aW5nID0gZm9sZGVyTmFtZUZvclNvcnRpbmc7 CiAgICAgICAgICAgICBmb2xkZXJPcHRpb24uZGlzYWJsZWQgPSB0cnVlOwogICAgICAgICAgICAg c2VsZWN0LmZvbGRlck9wdGlvbnNbbmFtZXMuZm9sZGVyTmFtZV0gPSBmb2xkZXJPcHRpb247CkBA IC0zMjUsNyArMzQzLDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7 CiAgICAgICAgIGlmIChmb2xkZXJOYW1lLmxlbmd0aCA+IDgwKQogICAgICAgICAgICAgZm9sZGVy TmFtZSA9ICJcdTIwMjYiICsgZm9sZGVyTmFtZS5zdWJzdHJpbmcoZm9sZGVyTmFtZS5sZW5ndGgg LSA4MCk7CiAKLSAgICAgICAgcmV0dXJuIHsgZm9sZGVyTmFtZTogZm9sZGVyTmFtZSwgZGlzcGxh eU5hbWU6IGRpc3BsYXlOYW1lfTsKKyAgICAgICAgcmV0dXJuIHsgZG9tYWluOiAocGFyc2VkVVJM ID8gcGFyc2VkVVJMLmhvc3QgOiAiIiksIGZvbGRlck5hbWU6IGZvbGRlck5hbWUsIGRpc3BsYXlO YW1lOiBkaXNwbGF5TmFtZSB9OwogICAgIH0sCiAKICAgICBzZXRTY3JpcHRTb3VyY2VJc0JlaW5n RWRpdGVkOiBmdW5jdGlvbihzb3VyY2VGaWxlSWQsIGluRWRpdE1vZGUpCkBAIC01MTMsNiArNTMx LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRo aXMuX3NvdXJjZUZpbGVJZFRvRmlsZXNTZWxlY3RPcHRpb24gPSB7fTsKICAgICAgICAgdGhpcy5f ZmlsZXNTZWxlY3RFbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CiAgICAgICAgIHRoaXMuX2ZpbGVz U2VsZWN0RWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOworICAgICAgICB0aGlzLl9maWxlc1NlbGVj dEVsZW1lbnQuZG9tYWluT3B0aW9ucyA9IHt9OwogICAgICAgICB0aGlzLl9maWxlc1NlbGVjdEVs ZW1lbnQuZm9sZGVyT3B0aW9ucyA9IHt9OwogICAgICAgICBkZWxldGUgdGhpcy5fZmlsZXNTZWxl Y3RFbGVtZW50LmluaXRpYWxTZWxlY3Rpb25Qcm9jZXNzZWQ7CiAgICAgICAgIGRlbGV0ZSB0aGlz Ll9maWxlc1NlbGVjdEVsZW1lbnQuY29udGVudFNjcmlwdFNlY3Rpb247CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKaW5kZXggZmJkNjAzNjk1 MzQyYTU1MmM1ODc3MTUzZjA3YTNkNmEwNTc3OGUyNC4uNjQ5OTNmNWM5NWQxZTZlYmNlMDVmZDc3 ZmIyMjYzN2U0YjY3ZmVhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9pbnNwZWN0b3IuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvaW5zcGVjdG9yLmNzcwpAQCAtNDkxLDcgKzQ5MSw3IEBAIGJ1dHRvbi5zdGF0dXMtYmFy LWl0ZW06ZGlzYWJsZWQgewogc2VsZWN0LnN0YXR1cy1iYXItaXRlbSB7CiAgICAgbWluLXdpZHRo OiA0OHB4OwogICAgIGJvcmRlci13aWR0aDogMCAxN3B4IDAgMnB4OwotICAgIHBhZGRpbmc6IDAg MnB4IDAgNnB4OworICAgIHBhZGRpbmc6IDAgMnB4IDAgMDsKICAgICBmb250LXdlaWdodDogYm9s ZDsKICAgICBjb2xvcjogcmdiKDQ4LCA0OCwgNDgpOwogICAgIHRleHQtc2hhZG93OiByZ2JhKDI1 NSwgMjU1LCAyNTUsIDAuNzUpIDAgMXB4IDA7Cg==