66100 2011-08-11 14:41:35 -0700 Web Inspector: make folders optional in the Scripts' panel file selector. 2011-08-12 06:54:26 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 450045 0 pfeldman 2011-08-11 14:41:35 -0700 Upstreaming http://code.google.com/p/chromium/issues/detail?id=92516. 450410 1 103767 pfeldman 2011-08-12 06:43:18 -0700 Created attachment 103767 Patch 450413 2 pfeldman 2011-08-12 06:54:26 -0700 Committed r92958: <http://trac.webkit.org/changeset/92958> 103767 2011-08-12 06:43:18 -0700 2011-08-12 06:52:14 -0700 Patch bug-66100-20110812174316.patch text/plain 14470 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTI5NTYKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkYTMyYWI1NTM2MzA3ZTUxMjI2OTc1 ZDU1NDIxZDQ1MWRlMjgwNWRhLi4xMTYzZTA4OGJjMTkwOWEzYmY1OWZhOWMzZjFkNjA1YzM0MDkw MTBkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMTEtMDgtMTIgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1ha2UgZm9sZGVy cyBvcHRpb25hbCBpbiB0aGUgU2NyaXB0cycgcGFuZWwgZmlsZSBzZWxlY3Rvci4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MTAwCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL2luc3Bl Y3Rvci9kZWJ1Z2dlci10ZXN0LmpzOgorICAgICAgICAoaW5pdGlhbGl6ZV9EZWJ1Z2dlclRlc3Qp OgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXNvcnRpbmctZXhwZWN0ZWQu dHh0OgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXNvcnRpbmcuaHRtbDoK KyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1z b3J0aW5nLWV4cGVjdGVkLnR4dDoKKworMjAxMS0wOC0xMiAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxk bWFuQGdvb2dsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogY29uc29sZSBsb3NlcyBm b2N1cyB1cG9uIHJlbG9hZGluZyB0aGUgcGFnZSBmcm9tIHRoZSBpbnNwZWN0b3IuCiAgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NjA2OAogCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci10ZXN0LmpzIGIv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItdGVzdC5qcwppbmRleCBi MzM3NzIyMzNlMjhiMDRlNjFkNmI3MzUzNDhjYzc2MDZkMGI4MmY2Li40ZmRmMzU2MzY4ZTc4OTI4 ZDM2ZGM1ODVmODRkN2RjODkyZDk3ODFiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci10ZXN0LmpzCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVz dHMvaW5zcGVjdG9yL2RlYnVnZ2VyLXRlc3QuanMKQEAgLTE1OSw3ICsxNTksNyBAQCBJbnNwZWN0 b3JUZXN0LnNob3dTY3JpcHRTb3VyY2UgPSBmdW5jdGlvbihzY3JpcHROYW1lLCBjYWxsYmFjaykK IHsKICAgICB2YXIgZmlsZXNTZWxlY3QgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic2NyaXB0 cy1maWxlcyIpOwogICAgIGZvciAodmFyIGkgPSAwOyBpIDwgZmlsZXNTZWxlY3QubGVuZ3RoOyAr K2kpIHsKLSAgICAgICAgaWYgKGZpbGVzU2VsZWN0W2ldLnNjcmlwdE5hbWVGb3JUZXN0ID09PSBz Y3JpcHROYW1lKSB7CisgICAgICAgIGlmIChmaWxlc1NlbGVjdFtpXS5kaXNwbGF5TmFtZSA9PT0g c2NyaXB0TmFtZSkgewogICAgICAgICAgICAgZmlsZXNTZWxlY3Quc2VsZWN0ZWRJbmRleCA9IGk7 CiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMuX2ZpbGVzU2VsZWN0Q2hh bmdlZCgpOwogICAgICAgICAgICAgdmFyIHNvdXJjZUZyYW1lID0gV2ViSW5zcGVjdG9yLnBhbmVs cy5zY3JpcHRzLnZpc2libGVWaWV3OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RlYnVnZ2VyL3NjcmlwdHMtc29ydGluZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1zb3J0aW5nLWV4cGVjdGVkLnR4dAppbmRleCA2Y2Q5YmQw Nzg0YzZjNjJiMmFjNjAzN2VjNWVjODhjZGM0YjllOTM2Li5mOTg2MjgwOTg4ZjI0ZDk5ZmJlMmQ2 N2E4YmMzZTg3YzY3MTE4MTY1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVi dWdnZXIvc2NyaXB0cy1zb3J0aW5nLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1zb3J0aW5nLWV4cGVjdGVkLnR4dApAQCAtMSw1ICsxLDEx IEBACiBUZXN0cyBzY3JpcHRzIHNvcnRpbmcgaW4gdGhlIHNjcmlwdHMgcGFuZWwuCiAKIERlYnVn Z2VyIHdhcyBlbmFibGVkLgorCitXZWJJbnNwZWN0b3Iuc2V0dGluZ3Muc2hvd1NjcmlwdEZvbGRl cnMgPSB0cnVlCisKK1dlYkluc3BlY3Rvci5zZXR0aW5ncy5zaG93U2NyaXB0Rm9sZGVycyA9IGZh bHNlCisKK1dlYkluc3BlY3Rvci5zZXR0aW5ncy5zaG93U2NyaXB0Rm9sZGVycyA9IHRydWUKIERl YnVnZ2VyIHdhcyBkaXNhYmxlZC4KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RlYnVnZ2VyL3NjcmlwdHMtc29ydGluZy5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Rl YnVnZ2VyL3NjcmlwdHMtc29ydGluZy5odG1sCmluZGV4IGQzOGY0NWVhYWI3ZjI3NWViYTVmMzA4 NDg0Njg0MDQ1NjJlYjY0OTYuLmZmNzA3NTAzZjdkY2I4NDc4Y2QxZDUyMTU0N2EyMWIxNTI2ZjVj YzcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXNv cnRpbmcuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1z b3J0aW5nLmh0bWwKQEAgLTMwLDYgKzMwLDIxIEBAIGZ1bmN0aW9uIHRlc3QoKQogCiAgICAgZnVu Y3Rpb24gc3RlcDEoKQogICAgIHsKKyAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgIGR1bXBTY3Jp cHRzTGlzdCgpOworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdzLnNob3dTY3JpcHRG b2xkZXJzLnNldChmYWxzZSk7CisgICAgICAgICAgICBkdW1wU2NyaXB0c0xpc3QoKTsKKyAgICAg ICAgfSBmaW5hbGx5IHsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5zaG93U2Ny aXB0Rm9sZGVycy5zZXQodHJ1ZSk7CisgICAgICAgIH0KKyAgICAgICAgZHVtcFNjcmlwdHNMaXN0 KCk7CisgICAgICAgIEluc3BlY3RvclRlc3QuY29tcGxldGVEZWJ1Z2dlclRlc3QoKTsKKyAgICB9 CisKKyAgICBmdW5jdGlvbiBkdW1wU2NyaXB0c0xpc3QoKQorICAgIHsKKyAgICAgICAgSW5zcGVj dG9yVGVzdC5hZGRSZXN1bHQoIiIpOworICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgi V2ViSW5zcGVjdG9yLnNldHRpbmdzLnNob3dTY3JpcHRGb2xkZXJzID0gIiArIFdlYkluc3BlY3Rv ci5zZXR0aW5ncy5zaG93U2NyaXB0Rm9sZGVycy5nZXQoKSk7CiAgICAgICAgIHZhciBzZWxlY3Qg PSBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMuX2ZpbGVzU2VsZWN0RWxlbWVudDsKICAgICAg ICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzZWxlY3QubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAg IHZhciB0ZXh0ID0gc2VsZWN0W2ldLnRleHRDb250ZW50LnJlcGxhY2UoL1x1MDBhMC9nLCAiICIp OwpAQCAtMzcsNyArNTIsNiBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAgICAgICBjb250 aW51ZTsKICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KHRleHQpOwogICAgICAg ICB9Ci0gICAgICAgIEluc3BlY3RvclRlc3QuY29tcGxldGVEZWJ1Z2dlclRlc3QoKTsKICAgICB9 CiB9CiA8L3NjcmlwdD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVt L2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXNvcnRpbmctZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtc29ydGlu Zy1leHBlY3RlZC50eHQKaW5kZXggOTM3MmJkNWM1MDhhOTdlMjI4Y2E3YWZiZDJlZjhkN2NkNjNl YmM0My4uOTVhNzI2MGMyMTAyMjExZDdlZDNkNjcxYmU2MDhiMzE2OWI0MzhjNSAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vaW5zcGVjdG9yL2RlYnVnZ2VyL3Njcmlw dHMtc29ydGluZy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21p dW0vaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtc29ydGluZy1leHBlY3RlZC50eHQKQEAgLTEs NiArMSwzNiBAQAogVGVzdHMgc2NyaXB0cyBzb3J0aW5nIGluIHRoZSBzY3JpcHRzIHBhbmVsLgog CiBEZWJ1Z2dlciB3YXMgZW5hYmxlZC4KKworV2ViSW5zcGVjdG9yLnNldHRpbmdzLnNob3dTY3Jp cHRGb2xkZXJzID0gdHJ1ZQorICAgICpOb24qVVJMKnBhdGgKK+KAlCBmb28uY29tIOKAlAorICAg IGJsb2NrLmpzP2Jsb2NrPWZvbworICAgIGdhLmpzCisgICAgbGVudGEuYmFuP3BnPTQ4ODMmaWZy PTEKKyAgICBsZW50YS5iYW4/cGc9NTMwOSZpZnI9MQorICAgIHRvcDEwMC5qY24/ODA2NzQKKy9f anMvcHJvZHVjdGlvbgorICAgIG1vdG9yLmpzPzEzMDg5Mjc0MzIKKy9pCisgICAgeGdlbWl1cy5q cworL2kvanMKKyAgICBqcXVlcnktMS41LjEubWluLmpzCisgICAganF1ZXJ5LmNvb2tpZS5qcwor CitXZWJJbnNwZWN0b3Iuc2V0dGluZ3Muc2hvd1NjcmlwdEZvbGRlcnMgPSBmYWxzZQorKk5vbipV UkwqcGF0aAorYmxvY2suanM/YmxvY2s9Zm9vCitnYS5qcworanF1ZXJ5LTEuNS4xLm1pbi5qcwor anF1ZXJ5LmNvb2tpZS5qcworbGVudGEuYmFuP3BnPTQ4ODMmaWZyPTEKK2xlbnRhLmJhbj9wZz01 MzA5Jmlmcj0xCittb3Rvci5qcz8xMzA4OTI3NDMyCit0b3AxMDAuamNuPzgwNjc0Cit4Z2VtaXVz LmpzCisKK1dlYkluc3BlY3Rvci5zZXR0aW5ncy5zaG93U2NyaXB0Rm9sZGVycyA9IHRydWUKICAg ICAqTm9uKlVSTCpwYXRoCiDigJQgZm9vLmNvbSDigJQKICAgICBibG9jay5qcz9ibG9jaz1mb28K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2NjliNjA1ZTAwNWMxNDZmYjk3Y2Y2ZmZhYWFjYTQ0ZThhMmJlY2NkLi4y ZWU2ZDdiODk1NTMyNzM0ZmFmMTM2OWZlN2U1MTcxYjc3MTAwMzgxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDUgKzEsMjUgQEAKIDIwMTEtMDgtMTIgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUu Y29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1ha2UgZm9sZGVycyBvcHRpb25hbCBpbiB0 aGUgU2NyaXB0cycgcGFuZWwgZmlsZSBzZWxlY3Rvci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MTAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBFbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3Mu anM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fc2hvd1NjcmlwdEZvbGRl cnNTZXR0aW5nQ2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnBy b3RvdHlwZS5fYWRkT3B0aW9uVG9GaWxlc1NlbGVjdC5pbnNlcnRPcmRlcmVkLm9wdGlvbkNvbXBh cmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX2FkZE9w dGlvblRvRmlsZXNTZWxlY3QuaW5zZXJ0T3JkZXJlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fYWRkT3B0aW9uVG9GaWxlc1NlbGVjdCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5yZXNldCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fcmVzZXRGaWxlc1NlbGVjdCk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TZXR0aW5ncyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5n c1NjcmVlbi5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZXR0aW5nc1NjcmVlbik6CisKKzIw MTEtMDgtMTIgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IGNvbnNvbGUgbG9zZXMgZm9jdXMgdXBvbiByZWxvYWRpbmcgdGhlIHBh Z2UgZnJvbSB0aGUgaW5zcGVjdG9yLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjYwNjgKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvRW5nbGlz aC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDkxOTFmYzhlNTRmNjdlYjk0NmRmZjZlNjJlMjJi YTE4MTgwODgwMjEuLmExYmIyMWRiNjU4ZGNkZDVjMGFkNTBkMDY0MTgxYThmNDBmNjQ3NmYgMTAw NjQ0CkdJVCBiaW5hcnkgcGF0Y2gKZGVsdGEgNzkKemNtYUYmZiUoSG48XyZwMkNlUHdqb3ZjNVpP U3FVSm5XMmF3bGM5ajJnaDdFSmpVa15RWFI/Qnw9O1lwZVQjOHVhClI3KlpIZ2YkRURIbG8rZlR4 QnhCUzcxalUlCgpkZWx0YSA5ClFjbWV6SGtAPypSPF8mcDIwM0ojTyt5RFJvCgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCA5 NjAxNGQzNDcwYzliNDUxYmNmYTJmMDcwNDM2NzA0YjI2Zjc1MjIwLi42NDNlMzBkYzQ0NGZlMDU4 ZGZlMzhhMDlkODQzZWY1OWZkMmU3M2FlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAtMTY5LDYgKzE2OSw4IEBAIFdlYklu c3BlY3Rvci5TY3JpcHRzUGFuZWwgPSBmdW5jdGlvbihwcmVzZW50YXRpb25Nb2RlbCkKICAgICB2 YXIgZW5hYmxlRGVidWdnZXIgPSBQcmVmZXJlbmNlcy5kZWJ1Z2dlckFsd2F5c0VuYWJsZWQgfHwg V2ViSW5zcGVjdG9yLnNldHRpbmdzLmRlYnVnZ2VyRW5hYmxlZC5nZXQoKTsKICAgICBpZiAoZW5h YmxlRGVidWdnZXIpCiAgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmVuYWJsZURl YnVnZ2VyKCk7CisKKyAgICBXZWJJbnNwZWN0b3Iuc2V0dGluZ3Muc2hvd1NjcmlwdEZvbGRlcnMu YWRkQ2hhbmdlTGlzdGVuZXIodGhpcy5fc2hvd1NjcmlwdEZvbGRlcnNTZXR0aW5nQ2hhbmdlZC5i aW5kKHRoaXMpKTsKIH0KIAogLy8gS2VlcCB0aGVzZSBpbiBzeW5jIHdpdGggV2ViQ29yZTo6U2Ny aXB0RGVidWdTZXJ2ZXIKQEAgLTI1NCw4ICsyNTYsMjggQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQ YW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9zaG93U291cmNlRnJhbWVBbmRB ZGRUb0hpc3Rvcnkoc291cmNlRmlsZS5pZCk7CiAgICAgfSwKIAorICAgIF9zaG93U2NyaXB0Rm9s ZGVyc1NldHRpbmdDaGFuZ2VkOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB2YXIgc2VsZWN0 ZWRPcHRpb24gPSB0aGlzLl9maWxlc1NlbGVjdEVsZW1lbnRbdGhpcy5fZmlsZXNTZWxlY3RFbGVt ZW50LnNlbGVjdGVkSW5kZXhdOworICAgICAgICB2YXIgc291cmNlRmlsZUlkID0gc2VsZWN0ZWRP cHRpb24uX3NvdXJjZUZpbGVJZDsKKworICAgICAgICB2YXIgb3B0aW9ucyA9IEFycmF5LnByb3Rv dHlwZS5zbGljZS5jYWxsKHRoaXMuX2ZpbGVzU2VsZWN0RWxlbWVudCk7CisgICAgICAgIHRoaXMu X3Jlc2V0RmlsZXNTZWxlY3QoKTsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBvcHRpb25z Lmxlbmd0aDsgKytpKSB7CisgICAgICAgICAgICBpZiAob3B0aW9uc1tpXS5fc291cmNlRmlsZSkK KyAgICAgICAgICAgICAgICB0aGlzLl9hZGRPcHRpb25Ub0ZpbGVzU2VsZWN0KG9wdGlvbnNbaV0u X3NvdXJjZUZpbGUpOworICAgICAgICB9CisKKyAgICAgICAgaWYgKHNvdXJjZUZpbGVJZCkgewor ICAgICAgICAgICAgdmFyIGluZGV4ID0gdGhpcy5fc291cmNlRmlsZUlkVG9GaWxlc1NlbGVjdE9w dGlvbltzb3VyY2VGaWxlSWRdLmluZGV4OworICAgICAgICAgICAgdGhpcy5fZmlsZXNTZWxlY3RF bGVtZW50LnNlbGVjdGVkSW5kZXggPSBpbmRleDsKKyAgICAgICAgfQorICAgIH0sCisKICAgICBf YWRkT3B0aW9uVG9GaWxlc1NlbGVjdDogZnVuY3Rpb24oc291cmNlRmlsZSkKICAgICB7CisgICAg ICAgIHZhciBzaG93U2NyaXB0Rm9sZGVycyA9IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5zaG93U2Ny aXB0Rm9sZGVycy5nZXQoKTsKKwogICAgICAgICB2YXIgc2VsZWN0ID0gdGhpcy5fZmlsZXNTZWxl Y3RFbGVtZW50OwogICAgICAgICBpZiAoIXNlbGVjdC5kb21haW5PcHRpb25zKQogICAgICAgICAg ICAgc2VsZWN0LmRvbWFpbk9wdGlvbnMgPSB7fTsKQEAgLTI2MywxMiArMjg1LDEzIEBAIFdlYklu c3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgc2VsZWN0LmZv bGRlck9wdGlvbnMgPSB7fTsKIAogICAgICAgICB2YXIgb3B0aW9uID0gZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgib3B0aW9uIik7CisgICAgICAgIG9wdGlvbi5fc291cmNlRmlsZSA9IHNvdXJjZUZp bGU7CiAgICAgICAgIHZhciBwYXJzZWRVUkwgPSBzb3VyY2VGaWxlLnVybC5hc1BhcnNlZFVSTCgp OwogCiAgICAgICAgIHZhciBuYW1lcyA9IHRoaXMuX2ZvbGRlckFuZERpc3BsYXlOYW1lRm9yU2Ny aXB0VVJMKHNvdXJjZUZpbGUudXJsKTsKLSAgICAgICAgY29uc3QgaW5kZW50ID0gV2ViSW5zcGVj dG9yLmlzTWFjKCkgPyAiIiA6ICJcdTAwYTBcdTAwYTBcdTAwYTBcdTAwYTAiOworICAgICAgICBj b25zdCBpbmRlbnQgPSAoIXNob3dTY3JpcHRGb2xkZXJzIHx8IFdlYkluc3BlY3Rvci5pc01hYygp KSA/ICIiIDogIlx1MDBhMFx1MDBhMFx1MDBhMFx1MDBhMCI7CiAgICAgICAgIG9wdGlvbi50ZXh0 ID0gaW5kZW50ICsgKG5hbWVzLmRpc3BsYXlOYW1lID8gbmFtZXMuZGlzcGxheU5hbWUgOiBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIihwcm9ncmFtKSIpKTsKLSAgICAgICAgb3B0aW9uLnNjcmlwdE5h bWVGb3JUZXN0ID0gbmFtZXMuZGlzcGxheU5hbWU7CisgICAgICAgIG9wdGlvbi5kaXNwbGF5TmFt ZSA9IG5hbWVzLmRpc3BsYXlOYW1lOwogCiAgICAgICAgIHZhciBmb2xkZXJOYW1lRm9yU29ydGlu ZzsKICAgICAgICAgaWYgKHNvdXJjZUZpbGUuaXNDb250ZW50U2NyaXB0KQpAQCAtMjg1LDcgKzMw OCwxMCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAg ewogICAgICAgICAgICAgZnVuY3Rpb24gb3B0aW9uQ29tcGFyZShhLCBiKQogICAgICAgICAgICAg ewotICAgICAgICAgICAgICAgIHJldHVybiBhLm5hbWVGb3JTb3J0aW5nLmxvY2FsZUNvbXBhcmUo Yi5uYW1lRm9yU29ydGluZyk7CisgICAgICAgICAgICAgICAgaWYgKHNob3dTY3JpcHRGb2xkZXJz KQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gYS5uYW1lRm9yU29ydGluZy5sb2NhbGVDb21w YXJlKGIubmFtZUZvclNvcnRpbmcpOworICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAg ICAgICAgICAgcmV0dXJuIGEuZGlzcGxheU5hbWUubG9jYWxlQ29tcGFyZShiLmRpc3BsYXlOYW1l KTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHZhciBpbnNlcnRpb25JbmRleCA9IGluc2Vy dGlvbkluZGV4Rm9yT2JqZWN0SW5MaXN0U29ydGVkQnlGdW5jdGlvbihvcHRpb24sIHNlbGVjdC5j aGlsZE5vZGVzLCBvcHRpb25Db21wYXJlKTsKICAgICAgICAgICAgIHNlbGVjdC5pbnNlcnRCZWZv cmUob3B0aW9uLCBpbnNlcnRpb25JbmRleCA8IDAgPyBudWxsIDogc2VsZWN0LmNoaWxkTm9kZXMu aXRlbShpbnNlcnRpb25JbmRleCkpOwpAQCAtMzAyLDcgKzMyOCw3IEBAIFdlYkluc3BlY3Rvci5T Y3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgaW5zZXJ0T3JkZXJlZChjb250 ZW50U2NyaXB0U2VjdGlvbik7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoIXNvdXJjZUZpbGUu aXNDb250ZW50U2NyaXB0ICYmIG5hbWVzLmRvbWFpbiAmJiAhc2VsZWN0LmRvbWFpbk9wdGlvbnNb bmFtZXMuZG9tYWluXSkgeworICAgICAgICBpZiAoc2hvd1NjcmlwdEZvbGRlcnMgJiYgIXNvdXJj ZUZpbGUuaXNDb250ZW50U2NyaXB0ICYmIG5hbWVzLmRvbWFpbiAmJiAhc2VsZWN0LmRvbWFpbk9w dGlvbnNbbmFtZXMuZG9tYWluXSkgewogICAgICAgICAgICAgdmFyIGRvbWFpbk9wdGlvbiA9IGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9wdGlvbiIpOwogICAgICAgICAgICAgZG9tYWluT3B0aW9u LnRleHQgPSAiXHUyMDE0ICIgKyBuYW1lcy5kb21haW4gKyAiIFx1MjAxNCI7CiAgICAgICAgICAg ICBkb21haW5PcHRpb24ubmFtZUZvclNvcnRpbmcgPSAiMDoiICsgbmFtZXMuZG9tYWluOwpAQCAt MzExLDcgKzMzNyw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewog ICAgICAgICAgICAgaW5zZXJ0T3JkZXJlZChkb21haW5PcHRpb24pOwogICAgICAgICB9CiAKLSAg ICAgICAgaWYgKG5hbWVzLmZvbGRlck5hbWUgJiYgIXNlbGVjdC5mb2xkZXJPcHRpb25zW25hbWVz LmZvbGRlck5hbWVdKSB7CisgICAgICAgIGlmIChzaG93U2NyaXB0Rm9sZGVycyAmJiBuYW1lcy5m b2xkZXJOYW1lICYmICFzZWxlY3QuZm9sZGVyT3B0aW9uc1tuYW1lcy5mb2xkZXJOYW1lXSkgewog ICAgICAgICAgICAgdmFyIGZvbGRlck9wdGlvbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9w dGlvbiIpOwogICAgICAgICAgICAgZm9sZGVyT3B0aW9uLnRleHQgPSBuYW1lcy5mb2xkZXJOYW1l OwogICAgICAgICAgICAgZm9sZGVyT3B0aW9uLm5hbWVGb3JTb3J0aW5nID0gZm9sZGVyTmFtZUZv clNvcnRpbmc7CkBAIC01MzAsMTMgKzU1Niw5IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwu cHJvdG90eXBlID0gewogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5fc291cmNlRmlsZUlkVG9T b3VyY2VGcmFtZSA9IHt9OwotICAgICAgICB0aGlzLl9zb3VyY2VGaWxlSWRUb0ZpbGVzU2VsZWN0 T3B0aW9uID0ge307Ci0gICAgICAgIHRoaXMuX2ZpbGVzU2VsZWN0RWxlbWVudC5yZW1vdmVDaGls ZHJlbigpOwotICAgICAgICB0aGlzLl9maWxlc1NlbGVjdEVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4o KTsKLSAgICAgICAgdGhpcy5fZmlsZXNTZWxlY3RFbGVtZW50LmRvbWFpbk9wdGlvbnMgPSB7fTsK LSAgICAgICAgdGhpcy5fZmlsZXNTZWxlY3RFbGVtZW50LmZvbGRlck9wdGlvbnMgPSB7fTsKKwor ICAgICAgICB0aGlzLl9yZXNldEZpbGVzU2VsZWN0KCk7CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9m aWxlc1NlbGVjdEVsZW1lbnQuaW5pdGlhbFNlbGVjdGlvblByb2Nlc3NlZDsKLSAgICAgICAgZGVs ZXRlIHRoaXMuX2ZpbGVzU2VsZWN0RWxlbWVudC5jb250ZW50U2NyaXB0U2VjdGlvbjsKIAogICAg ICAgICB0aGlzLmZ1bmN0aW9uc1NlbGVjdEVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKICAgICAg ICAgdGhpcy52aWV3c0NvbnRhaW5lckVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKQEAgLTU0Nyw2 ICs1NjksMTUgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAg ICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy53b3JrZXJzLnJlc2V0KCk7CiAgICAgfSwKIAorICAg IF9yZXNldEZpbGVzU2VsZWN0OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLl9zb3Vy Y2VGaWxlSWRUb0ZpbGVzU2VsZWN0T3B0aW9uID0ge307CisgICAgICAgIHRoaXMuX2ZpbGVzU2Vs ZWN0RWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOworICAgICAgICB0aGlzLl9maWxlc1NlbGVjdEVs ZW1lbnQuZG9tYWluT3B0aW9ucyA9IHt9OworICAgICAgICB0aGlzLl9maWxlc1NlbGVjdEVsZW1l bnQuZm9sZGVyT3B0aW9ucyA9IHt9OworICAgICAgICBkZWxldGUgdGhpcy5fZmlsZXNTZWxlY3RF bGVtZW50LmNvbnRlbnRTY3JpcHRTZWN0aW9uOworICAgIH0sCisKICAgICBnZXQgdmlzaWJsZVZp ZXcoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3Zpc2libGVWaWV3OwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKaW5kZXggOGI3YjA3Njlj YTMzNDhiYzU4N2M0NzRhYmJjZTZlYmIyNjFkMzIzNi4uZjE3NThmMzU4NzUzY2JkYzRmNDJkYWUw Y2NiNzgwZWRjM2ZiMDM2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TZXR0aW5ncy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NldHRpbmdzLmpzCkBAIC04NSw2ICs4NSw3IEBAIFdlYkluc3BlY3Rvci5TZXR0aW5ncyA9 IGZ1bmN0aW9uKCkKICAgICB0aGlzLmluc3RhbGxBcHBsaWNhdGlvblNldHRpbmcoInhockJyZWFr cG9pbnRzIiwgW10pOwogICAgIHRoaXMuaW5zdGFsbEFwcGxpY2F0aW9uU2V0dGluZygid29ya2Vy SW5zcGVjdGlvbkVuYWJsZWQiLCBbXSk7CiAgICAgdGhpcy5pbnN0YWxsQXBwbGljYXRpb25TZXR0 aW5nKCJjYWNoZURpc2FibGVkIiwgZmFsc2UpOworICAgIHRoaXMuaW5zdGFsbEFwcGxpY2F0aW9u U2V0dGluZygic2hvd1NjcmlwdEZvbGRlcnMiLCB0cnVlKTsKIAogICAgIC8vIElmIHRoZXJlIGFy ZSB0b28gbWFueSBicmVha3BvaW50cyBpbiBhIHN0b3JhZ2UsIGl0IGlzIGxpa2VseSBkdWUgdG8g YSByZWNlbnQgYnVnIHRoYXQgY2F1c2VkCiAgICAgLy8gcGVyaW9kaWNhbCBicmVha3BvaW50cyBk dXBsaWNhdGlvbiBsZWFkaW5nIHRvIGluc3BlY3RvciBzbG93bmVzcy4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3NTY3JlZW4uanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzU2NyZWVuLmpzCmluZGV4IGYx NGEzMGI1NmIyOWRkZjNiYjc0MjRhNDFlOTY5NDFhMzQ0OGQ0ZDcuLmM5Zjg3OThlYWFkZTRkZWVi MTk0NTNlZmZhOTUzNDY1NzZiOWMzNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU2V0dGluZ3NTY3JlZW4uanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TZXR0aW5nc1NjcmVlbi5qcwpAQCAtNDcsMTEgKzQ3LDE0IEBAIFdl Ykluc3BlY3Rvci5TZXR0aW5nc1NjcmVlbiA9IGZ1bmN0aW9uKCkKICAgICBwLmFwcGVuZENoaWxk KHRoaXMuX2NyZWF0ZUNoZWNrYm94U2V0dGluZyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNob3cg dXNlciBhZ2VudCBzdHlsZXMiKSwgV2ViSW5zcGVjdG9yLnNldHRpbmdzLnNob3dVc2VyQWdlbnRT dHlsZXMpKTsKIAogICAgIGlmIChQcmVmZXJlbmNlcy5jYW5EaXNhYmxlQ2FjaGUpIHsKLSAgICAg ICAgcCA9IHRoaXMuX2FwcGVuZFNlY3Rpb24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJOZXR3b3Jr IikpOworICAgICAgICBwID0gdGhpcy5fYXBwZW5kU2VjdGlvbihXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIk5ldHdvcmsiKSwgdHJ1ZSk7CiAgICAgICAgIHAuYXBwZW5kQ2hpbGQodGhpcy5fY3JlYXRl Q2hlY2tib3hTZXR0aW5nKFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGlzYWJsZSBjYWNoZSIpLCBX ZWJJbnNwZWN0b3Iuc2V0dGluZ3MuY2FjaGVEaXNhYmxlZCkpOwogICAgIH0KIAotICAgIHAgPSB0 aGlzLl9hcHBlbmRTZWN0aW9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ29uc29sZSIpKTsKKyAg ICBwID0gdGhpcy5fYXBwZW5kU2VjdGlvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNjcmlwdHMi KSwgdHJ1ZSk7CisgICAgcC5hcHBlbmRDaGlsZCh0aGlzLl9jcmVhdGVDaGVja2JveFNldHRpbmco V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaG93IHNjcmlwdCBmb2xkZXJzIiksIFdlYkluc3BlY3Rv ci5zZXR0aW5ncy5zaG93U2NyaXB0Rm9sZGVycykpOworCisgICAgcCA9IHRoaXMuX2FwcGVuZFNl Y3Rpb24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDb25zb2xlIiksIHRydWUpOwogICAgIHAuYXBw ZW5kQ2hpbGQodGhpcy5fY3JlYXRlQ2hlY2tib3hTZXR0aW5nKFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiTG9nIFhNTEh0dHBSZXF1ZXN0cyIpLCBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MubW9uaXRvcmlu Z1hIUkVuYWJsZWQpKTsKICAgICBwLmFwcGVuZENoaWxkKHRoaXMuX2NyZWF0ZUNoZWNrYm94U2V0 dGluZyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlByZXNlcnZlIGxvZyB1cG9uIG5hdmlnYXRpb24i KSwgV2ViSW5zcGVjdG9yLnNldHRpbmdzLnByZXNlcnZlQ29uc29sZUxvZykpOwogCg==