62701 2011-06-15 00:45:27 -0700 Web Inspector: script select can be too wide. 2011-06-15 08:19:02 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 62728 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 421085 0 podivilov 2011-06-15 00:45:27 -0700 Web Inspector: script select can be too wide. We should truncate script name in options text (tooltip still displays the whole url). 421086 1 97245 podivilov 2011-06-15 00:46:06 -0700 Created attachment 97245 Patch. 421088 2 97246 podivilov 2011-06-15 00:47:35 -0700 Created attachment 97246 Patch. 421118 3 97246 yurys 2011-06-15 01:41:35 -0700 Comment on attachment 97246 Patch. View in context: https://bugs.webkit.org/attachment.cgi?id=97246&action=review > LayoutTests/inspector/debugger/scripts-panel-expected.txt:19 > +text: very_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooon..., tooltip: very_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_url Is result the same on all platforms? 421127 4 97246 yurys 2011-06-15 01:48:15 -0700 Comment on attachment 97246 Patch. View in context: https://bugs.webkit.org/attachment.cgi?id=97246&action=review > Source/WebCore/inspector/front-end/ScriptsPanel.js:304 > + WebInspector.log(displayName.length); Remove this line. > Source/WebCore/inspector/front-end/ScriptsPanel.js:306 > + displayName = displayName.substring(0, 100) + "..."; Ignore my previous comment about test expectations I thought you were truncating the display name based on the screen width which we probably should do instead of specifying 100 limit for all resolutions. 421130 5 97259 podivilov 2011-06-15 01:53:44 -0700 Created attachment 97259 Patch. 421136 6 podivilov 2011-06-15 02:02:53 -0700 (In reply to comment #4) > (From update of attachment 97246 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=97246&action=review > > > Source/WebCore/inspector/front-end/ScriptsPanel.js:304 > > + WebInspector.log(displayName.length); > > Remove this line. Done. 421167 7 podivilov 2011-06-15 03:39:15 -0700 Committed r88916: <http://trac.webkit.org/changeset/88916> 421308 8 podivilov 2011-06-15 08:19:02 -0700 Committed r88936: <http://trac.webkit.org/changeset/88936> 97245 2011-06-15 00:46:06 -0700 2011-06-15 00:47:35 -0700 Patch. patch text/plain 10551 podivilov ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1NzExMGNmLi42ZjA5MWIzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDYt MTUgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjogc2Ny aXB0IHNlbGVjdCBjYW4gYmUgdG9vIHdpZGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD02MjcwMQorCisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2Vy L3NjcmlwdHMtcGFuZWwtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dl ci9zY3JpcHRzLXBhbmVsLmh0bWw6CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9l eHBlY3RhdGlvbnMudHh0OgorCiAyMDExLTA2LTE0ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJr aXQub3JnPgogCiAgICAgICAgIFNraXAgZWRpdGluZy9pbnNlcnRpbmcvcmV0dXJuLWtleS1zcGFu LXN0YXJ0Lmh0bWwgYWRkZWQgYnkgcjg4ODkwIG9uIE1hYyBXZWJLaXQyCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC1leHBlY3RlZC50eHQg Yi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC1leHBlY3RlZC50 eHQKaW5kZXggNzk3NzBhZS4uNDAzNTEyMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLWV4cGVjdGVkLnR4dApAQCAtMTAsMTMg KzEwLDE2IEBAIFJ1bm5pbmc6IHRlc3RTb3VyY2VGcmFtZXNDb3VudAogUGFnZSByZWxvYWRlZC4K IAogUnVubmluZzogdGVzdEZpbGVzU2VsZWN0Ci10ZXh0OiBzY3JpcHQuanMsIHRvb2x0aXA6IC4u LmZvby9iYXIvc2NyaXB0LmpzCi10ZXh0OiBzY3JpcHQuanMsIHRvb2x0aXA6IC4uLmZvby9iYXIv c2NyaXB0LmpzP2E9MQotdGV4dDogc2NyaXB0LmpzLCB0b29sdGlwOiAuLi5mb28vYmFyL3Njcmlw dC5qcz9hPTIKLXRleHQ6IHNjcmlwdC5qcywgdG9vbHRpcDogLi4uZm9vL2Jhei9zY3JpcHQuanMK LXRleHQ6IENvbnRlbnQgc2NyaXB0cywgdG9vbHRpcDogLi4uCi10ZXh0OiBjb250ZW50U2NyaXB0 LmpzLCB0b29sdGlwOiAuLi5mb28vYmFyL2NvbnRlbnRTY3JpcHQuanM/YT0xCi10ZXh0OiBjb250 ZW50U2NyaXB0LmpzLCB0b29sdGlwOiAuLi5mb28vYmFyL2NvbnRlbnRTY3JpcHQuanM/YT0yCi10 ZXh0OiBjb250ZW50U2NyaXB0Mi5qcywgdG9vbHRpcDogLi4uZm9vL2Jhci9jb250ZW50U2NyaXB0 Mi5qcz9hPTEKK3RleHQ6ID9hPWIsIHRvb2x0aXA6ID9hPWIKK3RleHQ6IGV4YW1wbGUuY29tLywg dG9vbHRpcDogaHR0cDovL2V4YW1wbGUuY29tLz9hPWIKK3RleHQ6IHNjcmlwdC5qcywgdG9vbHRp cDogPHJvb3Q+L2Zvby9iYXIvc2NyaXB0LmpzCit0ZXh0OiBzY3JpcHQuanMsIHRvb2x0aXA6IDxy b290Pi9mb28vYmFyL3NjcmlwdC5qcz9hPTEKK3RleHQ6IHNjcmlwdC5qcywgdG9vbHRpcDogPHJv b3Q+L2Zvby9iYXIvc2NyaXB0LmpzP2E9MgordGV4dDogc2NyaXB0LmpzLCB0b29sdGlwOiA8cm9v dD4vZm9vL2Jhei9zY3JpcHQuanMKK3RleHQ6IHZlcnlfbG9vb29vb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb24uLi4sIHRvb2x0aXA6IHZlcnlfbG9vb29vb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb25nX3VybAordGV4dDogQ29udGVudCBzY3JpcHRzLCB0b29sdGlwOiAKK3Rl eHQ6IGNvbnRlbnRTY3JpcHQuanMsIHRvb2x0aXA6IDxyb290Pi9mb28vYmFyL2NvbnRlbnRTY3Jp cHQuanM/YT0xCit0ZXh0OiBjb250ZW50U2NyaXB0LmpzLCB0b29sdGlwOiA8cm9vdD4vZm9vL2Jh ci9jb250ZW50U2NyaXB0LmpzP2E9MgordGV4dDogY29udGVudFNjcmlwdDIuanMsIHRvb2x0aXA6 IDxyb290Pi9mb28vYmFyL2NvbnRlbnRTY3JpcHQyLmpzP2E9MQogRGVidWdnZXIgd2FzIGRpc2Fi bGVkLgogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0 cy1wYW5lbC5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFu ZWwuaHRtbAppbmRleCBlZDZkZTg0Li4yYWFlNWQ1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC5odG1sCisrKyBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLmh0bWwKQEAgLTEyOSwyOSArMTI5LDI1IEBA IGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICAgICAgdmFyIHBhbmVsID0gbmV3IFdlYkluc3BlY3Rv ci5TY3JpcHRzUGFuZWwoKTsKICAgICAgICAgICAgIHZhciByb290VVJMID0gV2ViSW5zcGVjdG9y Lm1haW5SZXNvdXJjZS51cmwuc3Vic3RyaW5nKDAsIFdlYkluc3BlY3Rvci5tYWluUmVzb3VyY2Uu dXJsLmxhc3RJbmRleE9mKCIvIikgKyAxKTsKICAgICAgICAgICAgIHZhciBuZXh0SWQgPSAwOwot CiAgICAgICAgICAgICBmdW5jdGlvbiBhZGRPcHRpb24odXJsLCBpc0NvbnRlbnRTY3JpcHQpCiAg ICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgdmFyIGRpc3BsYXlOYW1lID0gdXJsOwotICAg ICAgICAgICAgICAgIHZhciBpbmRleE9mUXVlcnkgPSBkaXNwbGF5TmFtZS5pbmRleE9mKCI/Iik7 Ci0gICAgICAgICAgICAgICAgaWYgKGluZGV4T2ZRdWVyeSAhPT0gLTEpCi0gICAgICAgICAgICAg ICAgICAgIGRpc3BsYXlOYW1lID0gZGlzcGxheU5hbWUuc3Vic3RyaW5nKDAsIGluZGV4T2ZRdWVy eSk7Ci0gICAgICAgICAgICAgICAgdmFyIGxhc3RTbGFzaEluZGV4ID0gZGlzcGxheU5hbWUubGFz dEluZGV4T2YoIi8iKTsKLSAgICAgICAgICAgICAgICBpZiAobGFzdFNsYXNoSW5kZXggIT09IC0x KQotICAgICAgICAgICAgICAgICAgICBkaXNwbGF5TmFtZSA9IGRpc3BsYXlOYW1lLnN1YnN0cmlu ZyhsYXN0U2xhc2hJbmRleCArIDEpOwotICAgICAgICAgICAgICAgIHBhbmVsLl9hZGRPcHRpb25U b0ZpbGVzU2VsZWN0KHsgaWQ6IG5leHRJZCsrLCB1cmw6IHJvb3RVUkwgKyB1cmwsIGRpc3BsYXlO YW1lOiBkaXNwbGF5TmFtZSwgaXNDb250ZW50U2NyaXB0OiBpc0NvbnRlbnRTY3JpcHQgfSk7Cisg ICAgICAgICAgICAgICAgcGFuZWwuX2FkZE9wdGlvblRvRmlsZXNTZWxlY3QoeyBpZDogbmV4dElk KyssIHVybDogdXJsLCBpc0NvbnRlbnRTY3JpcHQ6IGlzQ29udGVudFNjcmlwdCB9KTsKICAgICAg ICAgICAgIH0KLSAgICAgICAgICAgIGFkZE9wdGlvbigiZm9vL2Jhci9zY3JpcHQuanMiLCBmYWxz ZSk7Ci0gICAgICAgICAgICBhZGRPcHRpb24oImZvby9iYXIvY29udGVudFNjcmlwdDIuanM/YT0x IiwgdHJ1ZSk7Ci0gICAgICAgICAgICBhZGRPcHRpb24oImZvby9iYXIvc2NyaXB0LmpzP2E9MiIs IGZhbHNlKTsKLSAgICAgICAgICAgIGFkZE9wdGlvbigiZm9vL2Jhci9jb250ZW50U2NyaXB0Lmpz P2E9MiIsIHRydWUpOwotICAgICAgICAgICAgYWRkT3B0aW9uKCJmb28vYmFyL3NjcmlwdC5qcz9h PTEiLCBmYWxzZSk7Ci0gICAgICAgICAgICBhZGRPcHRpb24oImZvby9iYXovc2NyaXB0LmpzIiwg ZmFsc2UpOwotICAgICAgICAgICAgYWRkT3B0aW9uKCJmb28vYmFyL2NvbnRlbnRTY3JpcHQuanM/ YT0xIiwgdHJ1ZSk7CisgICAgICAgICAgICBhZGRPcHRpb24ocm9vdFVSTCArICJmb28vYmFyL3Nj cmlwdC5qcyIsIGZhbHNlKTsKKyAgICAgICAgICAgIGFkZE9wdGlvbihyb290VVJMICsgImZvby9i YXIvY29udGVudFNjcmlwdDIuanM/YT0xIiwgdHJ1ZSk7CisgICAgICAgICAgICBhZGRPcHRpb24o cm9vdFVSTCArICJmb28vYmFyL3NjcmlwdC5qcz9hPTIiLCBmYWxzZSk7CisgICAgICAgICAgICBh ZGRPcHRpb24ocm9vdFVSTCArICJmb28vYmFyL2NvbnRlbnRTY3JpcHQuanM/YT0yIiwgdHJ1ZSk7 CisgICAgICAgICAgICBhZGRPcHRpb24ocm9vdFVSTCArICJmb28vYmFyL3NjcmlwdC5qcz9hPTEi LCBmYWxzZSk7CisgICAgICAgICAgICBhZGRPcHRpb24ocm9vdFVSTCArICJmb28vYmF6L3Njcmlw dC5qcyIsIGZhbHNlKTsKKyAgICAgICAgICAgIGFkZE9wdGlvbihyb290VVJMICsgImZvby9iYXIv Y29udGVudFNjcmlwdC5qcz9hPTEiLCB0cnVlKTsKKyAgICAgICAgICAgIGFkZE9wdGlvbigiaHR0 cDovL2V4YW1wbGUuY29tLz9hPWIiLCBmYWxzZSk7CisgICAgICAgICAgICBhZGRPcHRpb24oIj9h PWIiLCBmYWxzZSk7CisgICAgICAgICAgICBhZGRPcHRpb24oInZlcnlfbG9vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb25nX3VybCIsIGZhbHNlKTsKKwogICAgICAgICAgICAgdmFy IHNlbGVjdCA9IHBhbmVsLl9maWxlc1NlbGVjdEVsZW1lbnQ7CiAgICAgICAgICAgICBmb3IgKHZh ciBpID0gMDsgaSA8IHNlbGVjdC5sZW5ndGg7ICsraSkgewogICAgICAgICAgICAgICAgIHZhciBv cHRpb24gPSBzZWxlY3RbaV07Ci0gICAgICAgICAgICAgICAgdmFyIHRvb2x0aXAgPSAiLi4uIiAr IG9wdGlvbi50aXRsZS5zdWJzdHJpbmcocm9vdFVSTC5sZW5ndGgpOworICAgICAgICAgICAgICAg IHZhciB0b29sdGlwID0gb3B0aW9uLnRpdGxlLnJlcGxhY2Uocm9vdFVSTCwgIjxyb290Pi8iKTsK ICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgidGV4dDogIiArIG9wdGlv bi50ZXh0ICsgIiwgdG9vbHRpcDogIiArIHRvb2x0aXApOwogICAgICAgICAgICAgfQogICAgICAg ICAgICAgbmV4dCgpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0v dGVzdF9leHBlY3RhdGlvbnMudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vdGVz dF9leHBlY3RhdGlvbnMudHh0CmluZGV4IDVhYTM2ZTguLjY0ODI2MDEgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dAorKysgYi9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQKQEAgLTM4 ODcsNyArMzg4Nyw3IEBAIEJVR0NSODM4MzMgV0lOIDogbWh0bWwvc2ltcGxlX3BhZ2VfdW5taHQu bWh0ID0gTUlTU0lORwogLy8gTmV3IHRlc3QgYWRkZWQgaW4gcjg3MzI0CiBCVUdDUjgzOTk0IFdJ TiA6IHBsYXRmb3JtL3dpbi9wbHVnaW5zL2NhbGwtamF2YXNjcmlwdC10aGF0LWRlc3Ryb3lzLXBs dWdpbi5odG1sID0gQ1JBU0gKIAotQlVHV0s2MTUxOSBXSU4gTElOVVggOiBpbnNwZWN0b3IvZGVi dWdnZXIvc2NyaXB0cy1wYW5lbC5odG1sID0gVEVYVCBUSU1FT1VUIFBBU1MKKy8vQlVHV0s2MTUx OSBXSU4gTElOVVggOiBpbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC5odG1sID0gVEVY VCBUSU1FT1VUIFBBU1MKIEJVR0NSODQwMzEgTUFDIExJTlVYIDogc3RvcmFnZS9kb21zdG9yYWdl L3Nlc3Npb25zdG9yYWdlL2RlbGV0ZS1yZW1vdmFsLmh0bWwgPSBUSU1FT1VUIFBBU1MKIEJVR0NS ODQwMzIgV0lOIENQVSA6IGZhc3QvZG9tL29iamVjdC1wbHVnaW4taGlkZXMtcHJvcGVydGllcy5o dG1sID0gVElNRU9VVCBQQVNTCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmMDk5NDI5Li42ZDkyYjhkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDYtMTUgIFBhdmVsIFBvZGl2aWxvdiAgPHBv ZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjogc2NyaXB0IHNlbGVjdCBjYW4gYmUgdG9vIHdp ZGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02Mjcw MQorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fZGlzcGxheU5hbWVGb3JT Y3JpcHRVUkwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUu X2NyZWF0ZVNvdXJjZUZyYW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURl bGVnYXRlRm9yU2NyaXB0c1BhbmVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFt ZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5zdWdnZXN0ZWRGaWxlTmFtZSk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGaWxlLmpzOgorCiAyMDExLTA2LTE0 ICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBIYWppbWUgTW9yaXRhLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCBiMzRmYTdmLi5kNWMzY2UwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAtMjUy LDcgKzI1Miw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAg IHsKICAgICAgICAgdmFyIHNlbGVjdCA9IHRoaXMuX2ZpbGVzU2VsZWN0RWxlbWVudDsKICAgICAg ICAgdmFyIG9wdGlvbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9wdGlvbiIpOwotICAgICAg ICBvcHRpb24udGV4dCA9IHNvdXJjZUZpbGUuZGlzcGxheU5hbWU7CisgICAgICAgIG9wdGlvbi50 ZXh0ID0gdGhpcy5fZGlzcGxheU5hbWVGb3JTY3JpcHRVUkwoc291cmNlRmlsZS51cmwpIHx8IFdl Ykluc3BlY3Rvci5VSVN0cmluZygiKHByb2dyYW0pIik7CiAgICAgICAgIG9wdGlvbi50aXRsZSA9 IHNvdXJjZUZpbGUudXJsOwogICAgICAgICBvcHRpb24uaXNDb250ZW50U2NyaXB0ID0gc291cmNl RmlsZS5pc0NvbnRlbnRTY3JpcHQ7CiAgICAgICAgIGlmIChzb3VyY2VGaWxlLmlzQ29udGVudFNj cmlwdCkKQEAgLTI5Miw2ICsyOTIsMjEgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3NvdXJjZUZpbGVJZFRvRmlsZXNTZWxlY3RPcHRpb25b c291cmNlRmlsZS5pZF0gPSBvcHRpb247CiAgICAgfSwKIAorICAgIF9kaXNwbGF5TmFtZUZvclNj cmlwdFVSTDogZnVuY3Rpb24odXJsKQorICAgIHsKKyAgICAgICAgdmFyIGRpc3BsYXlOYW1lID0g dXJsOworICAgICAgICB2YXIgaW5kZXhPZlF1ZXJ5ID0gZGlzcGxheU5hbWUuaW5kZXhPZigiPyIp OworICAgICAgICBpZiAoaW5kZXhPZlF1ZXJ5ID4gMCkKKyAgICAgICAgICAgIGRpc3BsYXlOYW1l ID0gZGlzcGxheU5hbWUuc3Vic3RyaW5nKDAsIGluZGV4T2ZRdWVyeSk7CisgICAgICAgIHZhciBm cm9tSW5kZXggPSBkaXNwbGF5TmFtZS5sYXN0SW5kZXhPZigiLyIsIGRpc3BsYXlOYW1lLmxlbmd0 aCAtIDIpOworICAgICAgICBpZiAoZnJvbUluZGV4ICE9PSAtMSkKKyAgICAgICAgICAgIGRpc3Bs YXlOYW1lID0gZGlzcGxheU5hbWUuc3Vic3RyaW5nKGZyb21JbmRleCArIDEpOworICAgICAgICBX ZWJJbnNwZWN0b3IubG9nKGRpc3BsYXlOYW1lLmxlbmd0aCk7CisgICAgICAgIGlmIChkaXNwbGF5 TmFtZS5sZW5ndGggPiAxMDApCisgICAgICAgICAgICBkaXNwbGF5TmFtZSA9IGRpc3BsYXlOYW1l LnN1YnN0cmluZygwLCAxMDApICsgIi4uLiI7CisgICAgICAgIHJldHVybiBkaXNwbGF5TmFtZTsK KyAgICB9LAorCiAgICAgc2V0U2NyaXB0U291cmNlSXNCZWluZ0VkaXRlZDogZnVuY3Rpb24oc291 cmNlRmlsZUlkLCBpbkVkaXRNb2RlKQogICAgIHsKICAgICAgICAgdmFyIG9wdGlvbiA9IHRoaXMu X3NvdXJjZUZpbGVJZFRvRmlsZXNTZWxlY3RPcHRpb25bc291cmNlRmlsZUlkXTsKQEAgLTU3OSw3 ICs1OTQsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICBf Y3JlYXRlU291cmNlRnJhbWU6IGZ1bmN0aW9uKHNvdXJjZUZpbGVJZCkKICAgICB7CiAgICAgICAg IHZhciBzb3VyY2VGaWxlID0gdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuc291cmNlRmlsZShzb3Vy Y2VGaWxlSWQpOwotICAgICAgICB2YXIgZGVsZWdhdGUgPSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJj ZUZyYW1lRGVsZWdhdGVGb3JTY3JpcHRzUGFuZWwodGhpcy5fcHJlc2VudGF0aW9uTW9kZWwsIHNv dXJjZUZpbGVJZCwgc291cmNlRmlsZS5kaXNwbGF5TmFtZSk7CisgICAgICAgIHZhciBkZWxlZ2F0 ZSA9IG5ldyBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbCh0 aGlzLl9wcmVzZW50YXRpb25Nb2RlbCwgc291cmNlRmlsZUlkKTsKICAgICAgICAgdmFyIHNvdXJj ZUZyYW1lID0gbmV3IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZShkZWxlZ2F0ZSwgc291cmNlRmls ZS51cmwpOwogICAgICAgICBzb3VyY2VGcmFtZS5fc291cmNlRmlsZUlkID0gc291cmNlRmlsZUlk OwogICAgICAgICBzb3VyY2VGcmFtZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5Tb3Vy Y2VGcmFtZS5FdmVudHMuTG9hZGVkLCB0aGlzLl9zb3VyY2VGcmFtZUxvYWRlZCwgdGhpcyk7CkBA IC0xMDQ0LDEzICsxMDU5LDEyIEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBl ID0gewogV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX19wcm90b19fID0gV2Vi SW5zcGVjdG9yLlBhbmVsLnByb3RvdHlwZTsKIAogCi1XZWJJbnNwZWN0b3IuU291cmNlRnJhbWVE ZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9uKG1vZGVsLCBzb3VyY2VGaWxlSWQsIHNj cmlwdE5hbWUpCitXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5l bCA9IGZ1bmN0aW9uKG1vZGVsLCBzb3VyY2VGaWxlSWQpCiB7CiAgICAgV2ViSW5zcGVjdG9yLlNv dXJjZUZyYW1lRGVsZWdhdGUuY2FsbCh0aGlzKTsKICAgICB0aGlzLl9tb2RlbCA9IG1vZGVsOwog ICAgIHRoaXMuX3NvdXJjZUZpbGVJZCA9IHNvdXJjZUZpbGVJZDsKICAgICB0aGlzLl9wb3BvdmVy T2JqZWN0R3JvdXAgPSAicG9wb3ZlciI7Ci0gICAgdGhpcy5fc2NyaXB0TmFtZSA9IHNjcmlwdE5h bWU7CiB9CiAKIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVs LnByb3RvdHlwZSA9IHsKQEAgLTExMjQsNyArMTEzOCw4IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VG cmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIHN1Z2dlc3Rl ZEZpbGVOYW1lOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICByZXR1cm4gdGhpcy5fc2NyaXB0 TmFtZTsKKyAgICAgICAgdmFyIHNvdXJjZUZpbGUgPSB0aGlzLl9tb2RlbC5zb3VyY2VGaWxlKHRo aXMuX3NvdXJjZUZpbGVJZCk7CisgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IucGFuZWxzLnNj cmlwdHMuX2Rpc3BsYXlOYW1lRm9yU2NyaXB0VVJMKHNvdXJjZUZpbGUudXJsKSB8fCAidW50aXRs ZWQuanMiOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Tb3VyY2VGaWxlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Tb3VyY2VGaWxlLmpzCmluZGV4IGVkZTAzNzAuLjNlODMwYWEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRmlsZS5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZpbGUuanMKQEAgLTYzLDExICs2 Myw2IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGaWxlLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhp cy5fcmVxdWVzdENvbnRlbnQoKTsKICAgICB9LAogCi0gICAgZ2V0IGRpc3BsYXlOYW1lKCkKLSAg ICB7Ci0gICAgICAgIHJldHVybiB0aGlzLnVybCA/IFdlYkluc3BlY3Rvci5kaXNwbGF5TmFtZUZv clVSTCh0aGlzLnVybCkgOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIihwcm9ncmFtKSIpOwotICAg IH0sCi0KICAgICBnZXQgY29udGVudCgpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fY29u dGVudDsK 97246 2011-06-15 00:47:35 -0700 2011-06-15 01:53:44 -0700 Patch. patch text/plain 9694 podivilov ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1NzExMGNmLi44MDBlMGJhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDYt MTUgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjogc2Ny aXB0IHNlbGVjdCBjYW4gYmUgdG9vIHdpZGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD02MjcwMQorCisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2Vy L3NjcmlwdHMtcGFuZWwtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dl ci9zY3JpcHRzLXBhbmVsLmh0bWw6CisKIDIwMTEtMDYtMTQgIFJ5b3N1a2UgTml3YSAgPHJuaXdh QHdlYmtpdC5vcmc+CiAKICAgICAgICAgU2tpcCBlZGl0aW5nL2luc2VydGluZy9yZXR1cm4ta2V5 LXNwYW4tc3RhcnQuaHRtbCBhZGRlZCBieSByODg4OTAgb24gTWFjIFdlYktpdDIKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLWV4cGVj dGVkLnR4dAppbmRleCA3OTc3MGFlLi40MDM1MTIzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwtZXhwZWN0ZWQudHh0CkBAIC0x MCwxMyArMTAsMTYgQEAgUnVubmluZzogdGVzdFNvdXJjZUZyYW1lc0NvdW50CiBQYWdlIHJlbG9h ZGVkLgogCiBSdW5uaW5nOiB0ZXN0RmlsZXNTZWxlY3QKLXRleHQ6IHNjcmlwdC5qcywgdG9vbHRp cDogLi4uZm9vL2Jhci9zY3JpcHQuanMKLXRleHQ6IHNjcmlwdC5qcywgdG9vbHRpcDogLi4uZm9v L2Jhci9zY3JpcHQuanM/YT0xCi10ZXh0OiBzY3JpcHQuanMsIHRvb2x0aXA6IC4uLmZvby9iYXIv c2NyaXB0LmpzP2E9MgotdGV4dDogc2NyaXB0LmpzLCB0b29sdGlwOiAuLi5mb28vYmF6L3Njcmlw dC5qcwotdGV4dDogQ29udGVudCBzY3JpcHRzLCB0b29sdGlwOiAuLi4KLXRleHQ6IGNvbnRlbnRT Y3JpcHQuanMsIHRvb2x0aXA6IC4uLmZvby9iYXIvY29udGVudFNjcmlwdC5qcz9hPTEKLXRleHQ6 IGNvbnRlbnRTY3JpcHQuanMsIHRvb2x0aXA6IC4uLmZvby9iYXIvY29udGVudFNjcmlwdC5qcz9h PTIKLXRleHQ6IGNvbnRlbnRTY3JpcHQyLmpzLCB0b29sdGlwOiAuLi5mb28vYmFyL2NvbnRlbnRT Y3JpcHQyLmpzP2E9MQordGV4dDogP2E9YiwgdG9vbHRpcDogP2E9YgordGV4dDogZXhhbXBsZS5j b20vLCB0b29sdGlwOiBodHRwOi8vZXhhbXBsZS5jb20vP2E9YgordGV4dDogc2NyaXB0LmpzLCB0 b29sdGlwOiA8cm9vdD4vZm9vL2Jhci9zY3JpcHQuanMKK3RleHQ6IHNjcmlwdC5qcywgdG9vbHRp cDogPHJvb3Q+L2Zvby9iYXIvc2NyaXB0LmpzP2E9MQordGV4dDogc2NyaXB0LmpzLCB0b29sdGlw OiA8cm9vdD4vZm9vL2Jhci9zY3JpcHQuanM/YT0yCit0ZXh0OiBzY3JpcHQuanMsIHRvb2x0aXA6 IDxyb290Pi9mb28vYmF6L3NjcmlwdC5qcwordGV4dDogdmVyeV9sb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vbi4uLiwgdG9vbHRpcDogdmVyeV9sb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vbmdfdXJsCit0ZXh0OiBDb250ZW50IHNjcmlwdHMsIHRvb2x0aXA6 IAordGV4dDogY29udGVudFNjcmlwdC5qcywgdG9vbHRpcDogPHJvb3Q+L2Zvby9iYXIvY29udGVu dFNjcmlwdC5qcz9hPTEKK3RleHQ6IGNvbnRlbnRTY3JpcHQuanMsIHRvb2x0aXA6IDxyb290Pi9m b28vYmFyL2NvbnRlbnRTY3JpcHQuanM/YT0yCit0ZXh0OiBjb250ZW50U2NyaXB0Mi5qcywgdG9v bHRpcDogPHJvb3Q+L2Zvby9iYXIvY29udGVudFNjcmlwdDIuanM/YT0xCiBEZWJ1Z2dlciB3YXMg ZGlzYWJsZWQuCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9z Y3JpcHRzLXBhbmVsLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0 cy1wYW5lbC5odG1sCmluZGV4IGVkNmRlODQuLjJhYWU1ZDUgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLmh0bWwKKysrIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwuaHRtbApAQCAtMTI5LDI5ICsxMjks MjUgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgICAgICB2YXIgcGFuZWwgPSBuZXcgV2ViSW5z cGVjdG9yLlNjcmlwdHNQYW5lbCgpOwogICAgICAgICAgICAgdmFyIHJvb3RVUkwgPSBXZWJJbnNw ZWN0b3IubWFpblJlc291cmNlLnVybC5zdWJzdHJpbmcoMCwgV2ViSW5zcGVjdG9yLm1haW5SZXNv dXJjZS51cmwubGFzdEluZGV4T2YoIi8iKSArIDEpOwogICAgICAgICAgICAgdmFyIG5leHRJZCA9 IDA7Ci0KICAgICAgICAgICAgIGZ1bmN0aW9uIGFkZE9wdGlvbih1cmwsIGlzQ29udGVudFNjcmlw dCkKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICB2YXIgZGlzcGxheU5hbWUgPSB1cmw7 Ci0gICAgICAgICAgICAgICAgdmFyIGluZGV4T2ZRdWVyeSA9IGRpc3BsYXlOYW1lLmluZGV4T2Yo Ij8iKTsKLSAgICAgICAgICAgICAgICBpZiAoaW5kZXhPZlF1ZXJ5ICE9PSAtMSkKLSAgICAgICAg ICAgICAgICAgICAgZGlzcGxheU5hbWUgPSBkaXNwbGF5TmFtZS5zdWJzdHJpbmcoMCwgaW5kZXhP ZlF1ZXJ5KTsKLSAgICAgICAgICAgICAgICB2YXIgbGFzdFNsYXNoSW5kZXggPSBkaXNwbGF5TmFt ZS5sYXN0SW5kZXhPZigiLyIpOwotICAgICAgICAgICAgICAgIGlmIChsYXN0U2xhc2hJbmRleCAh PT0gLTEpCi0gICAgICAgICAgICAgICAgICAgIGRpc3BsYXlOYW1lID0gZGlzcGxheU5hbWUuc3Vi c3RyaW5nKGxhc3RTbGFzaEluZGV4ICsgMSk7Ci0gICAgICAgICAgICAgICAgcGFuZWwuX2FkZE9w dGlvblRvRmlsZXNTZWxlY3QoeyBpZDogbmV4dElkKyssIHVybDogcm9vdFVSTCArIHVybCwgZGlz cGxheU5hbWU6IGRpc3BsYXlOYW1lLCBpc0NvbnRlbnRTY3JpcHQ6IGlzQ29udGVudFNjcmlwdCB9 KTsKKyAgICAgICAgICAgICAgICBwYW5lbC5fYWRkT3B0aW9uVG9GaWxlc1NlbGVjdCh7IGlkOiBu ZXh0SWQrKywgdXJsOiB1cmwsIGlzQ29udGVudFNjcmlwdDogaXNDb250ZW50U2NyaXB0IH0pOwog ICAgICAgICAgICAgfQotICAgICAgICAgICAgYWRkT3B0aW9uKCJmb28vYmFyL3NjcmlwdC5qcyIs IGZhbHNlKTsKLSAgICAgICAgICAgIGFkZE9wdGlvbigiZm9vL2Jhci9jb250ZW50U2NyaXB0Mi5q cz9hPTEiLCB0cnVlKTsKLSAgICAgICAgICAgIGFkZE9wdGlvbigiZm9vL2Jhci9zY3JpcHQuanM/ YT0yIiwgZmFsc2UpOwotICAgICAgICAgICAgYWRkT3B0aW9uKCJmb28vYmFyL2NvbnRlbnRTY3Jp cHQuanM/YT0yIiwgdHJ1ZSk7Ci0gICAgICAgICAgICBhZGRPcHRpb24oImZvby9iYXIvc2NyaXB0 LmpzP2E9MSIsIGZhbHNlKTsKLSAgICAgICAgICAgIGFkZE9wdGlvbigiZm9vL2Jhei9zY3JpcHQu anMiLCBmYWxzZSk7Ci0gICAgICAgICAgICBhZGRPcHRpb24oImZvby9iYXIvY29udGVudFNjcmlw dC5qcz9hPTEiLCB0cnVlKTsKKyAgICAgICAgICAgIGFkZE9wdGlvbihyb290VVJMICsgImZvby9i YXIvc2NyaXB0LmpzIiwgZmFsc2UpOworICAgICAgICAgICAgYWRkT3B0aW9uKHJvb3RVUkwgKyAi Zm9vL2Jhci9jb250ZW50U2NyaXB0Mi5qcz9hPTEiLCB0cnVlKTsKKyAgICAgICAgICAgIGFkZE9w dGlvbihyb290VVJMICsgImZvby9iYXIvc2NyaXB0LmpzP2E9MiIsIGZhbHNlKTsKKyAgICAgICAg ICAgIGFkZE9wdGlvbihyb290VVJMICsgImZvby9iYXIvY29udGVudFNjcmlwdC5qcz9hPTIiLCB0 cnVlKTsKKyAgICAgICAgICAgIGFkZE9wdGlvbihyb290VVJMICsgImZvby9iYXIvc2NyaXB0Lmpz P2E9MSIsIGZhbHNlKTsKKyAgICAgICAgICAgIGFkZE9wdGlvbihyb290VVJMICsgImZvby9iYXov c2NyaXB0LmpzIiwgZmFsc2UpOworICAgICAgICAgICAgYWRkT3B0aW9uKHJvb3RVUkwgKyAiZm9v L2Jhci9jb250ZW50U2NyaXB0LmpzP2E9MSIsIHRydWUpOworICAgICAgICAgICAgYWRkT3B0aW9u KCJodHRwOi8vZXhhbXBsZS5jb20vP2E9YiIsIGZhbHNlKTsKKyAgICAgICAgICAgIGFkZE9wdGlv bigiP2E9YiIsIGZhbHNlKTsKKyAgICAgICAgICAgIGFkZE9wdGlvbigidmVyeV9sb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29vbmdfdXJsIiwgZmFsc2UpOworCiAgICAgICAgICAg ICB2YXIgc2VsZWN0ID0gcGFuZWwuX2ZpbGVzU2VsZWN0RWxlbWVudDsKICAgICAgICAgICAgIGZv ciAodmFyIGkgPSAwOyBpIDwgc2VsZWN0Lmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICAgICAg dmFyIG9wdGlvbiA9IHNlbGVjdFtpXTsKLSAgICAgICAgICAgICAgICB2YXIgdG9vbHRpcCA9ICIu Li4iICsgb3B0aW9uLnRpdGxlLnN1YnN0cmluZyhyb290VVJMLmxlbmd0aCk7CisgICAgICAgICAg ICAgICAgdmFyIHRvb2x0aXAgPSBvcHRpb24udGl0bGUucmVwbGFjZShyb290VVJMLCAiPHJvb3Q+ LyIpOwogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJ0ZXh0OiAiICsg b3B0aW9uLnRleHQgKyAiLCB0b29sdGlwOiAiICsgdG9vbHRpcCk7CiAgICAgICAgICAgICB9CiAg ICAgICAgICAgICBuZXh0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjA5OTQyOS4uNmQ5MmI4ZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDExLTA2LTE1ICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rp dmlsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHNjcmlwdCBzZWxlY3QgY2FuIGJlIHRvbyB3aWRl LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjI3MDEK KworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX2Rpc3BsYXlOYW1lRm9yU2Ny aXB0VVJMKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9j cmVhdGVTb3VyY2VGcmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxl Z2F0ZUZvclNjcmlwdHNQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVE ZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbC5wcm90b3R5cGUuc3VnZ2VzdGVkRmlsZU5hbWUpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRmlsZS5qczoKKwogMjAxMS0wNi0xNCAg S2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg SGFqaW1lIE1vcml0YS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggYjM0ZmE3Zi4uZDVjM2NlMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAgLTI1Miw3 ICsyNTIsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICB7 CiAgICAgICAgIHZhciBzZWxlY3QgPSB0aGlzLl9maWxlc1NlbGVjdEVsZW1lbnQ7CiAgICAgICAg IHZhciBvcHRpb24gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJvcHRpb24iKTsKLSAgICAgICAg b3B0aW9uLnRleHQgPSBzb3VyY2VGaWxlLmRpc3BsYXlOYW1lOworICAgICAgICBvcHRpb24udGV4 dCA9IHRoaXMuX2Rpc3BsYXlOYW1lRm9yU2NyaXB0VVJMKHNvdXJjZUZpbGUudXJsKSB8fCBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIihwcm9ncmFtKSIpOwogICAgICAgICBvcHRpb24udGl0bGUgPSBz b3VyY2VGaWxlLnVybDsKICAgICAgICAgb3B0aW9uLmlzQ29udGVudFNjcmlwdCA9IHNvdXJjZUZp bGUuaXNDb250ZW50U2NyaXB0OwogICAgICAgICBpZiAoc291cmNlRmlsZS5pc0NvbnRlbnRTY3Jp cHQpCkBAIC0yOTIsNiArMjkyLDIxIEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90 eXBlID0gewogICAgICAgICB0aGlzLl9zb3VyY2VGaWxlSWRUb0ZpbGVzU2VsZWN0T3B0aW9uW3Nv dXJjZUZpbGUuaWRdID0gb3B0aW9uOwogICAgIH0sCiAKKyAgICBfZGlzcGxheU5hbWVGb3JTY3Jp cHRVUkw6IGZ1bmN0aW9uKHVybCkKKyAgICB7CisgICAgICAgIHZhciBkaXNwbGF5TmFtZSA9IHVy bDsKKyAgICAgICAgdmFyIGluZGV4T2ZRdWVyeSA9IGRpc3BsYXlOYW1lLmluZGV4T2YoIj8iKTsK KyAgICAgICAgaWYgKGluZGV4T2ZRdWVyeSA+IDApCisgICAgICAgICAgICBkaXNwbGF5TmFtZSA9 IGRpc3BsYXlOYW1lLnN1YnN0cmluZygwLCBpbmRleE9mUXVlcnkpOworICAgICAgICB2YXIgZnJv bUluZGV4ID0gZGlzcGxheU5hbWUubGFzdEluZGV4T2YoIi8iLCBkaXNwbGF5TmFtZS5sZW5ndGgg LSAyKTsKKyAgICAgICAgaWYgKGZyb21JbmRleCAhPT0gLTEpCisgICAgICAgICAgICBkaXNwbGF5 TmFtZSA9IGRpc3BsYXlOYW1lLnN1YnN0cmluZyhmcm9tSW5kZXggKyAxKTsKKyAgICAgICAgV2Vi SW5zcGVjdG9yLmxvZyhkaXNwbGF5TmFtZS5sZW5ndGgpOworICAgICAgICBpZiAoZGlzcGxheU5h bWUubGVuZ3RoID4gMTAwKQorICAgICAgICAgICAgZGlzcGxheU5hbWUgPSBkaXNwbGF5TmFtZS5z dWJzdHJpbmcoMCwgMTAwKSArICIuLi4iOworICAgICAgICByZXR1cm4gZGlzcGxheU5hbWU7Cisg ICAgfSwKKwogICAgIHNldFNjcmlwdFNvdXJjZUlzQmVpbmdFZGl0ZWQ6IGZ1bmN0aW9uKHNvdXJj ZUZpbGVJZCwgaW5FZGl0TW9kZSkKICAgICB7CiAgICAgICAgIHZhciBvcHRpb24gPSB0aGlzLl9z b3VyY2VGaWxlSWRUb0ZpbGVzU2VsZWN0T3B0aW9uW3NvdXJjZUZpbGVJZF07CkBAIC01NzksNyAr NTk0LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgX2Ny ZWF0ZVNvdXJjZUZyYW1lOiBmdW5jdGlvbihzb3VyY2VGaWxlSWQpCiAgICAgewogICAgICAgICB2 YXIgc291cmNlRmlsZSA9IHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLnNvdXJjZUZpbGUoc291cmNl RmlsZUlkKTsKLSAgICAgICAgdmFyIGRlbGVnYXRlID0gbmV3IFdlYkluc3BlY3Rvci5Tb3VyY2VG cmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsKHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLCBzb3Vy Y2VGaWxlSWQsIHNvdXJjZUZpbGUuZGlzcGxheU5hbWUpOworICAgICAgICB2YXIgZGVsZWdhdGUg PSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGVGb3JTY3JpcHRzUGFuZWwodGhp cy5fcHJlc2VudGF0aW9uTW9kZWwsIHNvdXJjZUZpbGVJZCk7CiAgICAgICAgIHZhciBzb3VyY2VG cmFtZSA9IG5ldyBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUoZGVsZWdhdGUsIHNvdXJjZUZpbGUu dXJsKTsKICAgICAgICAgc291cmNlRnJhbWUuX3NvdXJjZUZpbGVJZCA9IHNvdXJjZUZpbGVJZDsK ICAgICAgICAgc291cmNlRnJhbWUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuU291cmNl RnJhbWUuRXZlbnRzLkxvYWRlZCwgdGhpcy5fc291cmNlRnJhbWVMb2FkZWQsIHRoaXMpOwpAQCAt MTA0NCwxMyArMTA1OSwxMiBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9 IHsKIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYklu c3BlY3Rvci5QYW5lbC5wcm90b3R5cGU7CiAKIAotV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVs ZWdhdGVGb3JTY3JpcHRzUGFuZWwgPSBmdW5jdGlvbihtb2RlbCwgc291cmNlRmlsZUlkLCBzY3Jp cHROYW1lKQorV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGVGb3JTY3JpcHRzUGFuZWwg PSBmdW5jdGlvbihtb2RlbCwgc291cmNlRmlsZUlkKQogewogICAgIFdlYkluc3BlY3Rvci5Tb3Vy Y2VGcmFtZURlbGVnYXRlLmNhbGwodGhpcyk7CiAgICAgdGhpcy5fbW9kZWwgPSBtb2RlbDsKICAg ICB0aGlzLl9zb3VyY2VGaWxlSWQgPSBzb3VyY2VGaWxlSWQ7CiAgICAgdGhpcy5fcG9wb3Zlck9i amVjdEdyb3VwID0gInBvcG92ZXIiOwotICAgIHRoaXMuX3NjcmlwdE5hbWUgPSBzY3JpcHROYW1l OwogfQogCiBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbC5w cm90b3R5cGUgPSB7CkBAIC0xMTI0LDcgKzExMzgsOCBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJh bWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICBzdWdnZXN0ZWRG aWxlTmFtZTogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3NjcmlwdE5h bWU7CisgICAgICAgIHZhciBzb3VyY2VGaWxlID0gdGhpcy5fbW9kZWwuc291cmNlRmlsZSh0aGlz Ll9zb3VyY2VGaWxlSWQpOworICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLnBhbmVscy5zY3Jp cHRzLl9kaXNwbGF5TmFtZUZvclNjcmlwdFVSTChzb3VyY2VGaWxlLnVybCkgfHwgInVudGl0bGVk LmpzIjsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU291cmNlRmlsZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU291cmNlRmlsZS5qcwppbmRleCBlZGUwMzcwLi4zZTgzMGFhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZpbGUuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGaWxlLmpzCkBAIC02MywxMSArNjMs NiBAQCBXZWJJbnNwZWN0b3IuU291cmNlRmlsZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMu X3JlcXVlc3RDb250ZW50KCk7CiAgICAgfSwKIAotICAgIGdldCBkaXNwbGF5TmFtZSgpCi0gICAg ewotICAgICAgICByZXR1cm4gdGhpcy51cmwgPyBXZWJJbnNwZWN0b3IuZGlzcGxheU5hbWVGb3JV UkwodGhpcy51cmwpIDogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIocHJvZ3JhbSkiKTsKLSAgICB9 LAotCiAgICAgZ2V0IGNvbnRlbnQoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2NvbnRl bnQ7Cg== 97259 2011-06-15 01:53:44 -0700 2011-06-15 02:09:44 -0700 Patch. patch text/plain 9647 podivilov ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1NzExMGNmLi44MDBlMGJhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDYt MTUgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjogc2Ny aXB0IHNlbGVjdCBjYW4gYmUgdG9vIHdpZGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD02MjcwMQorCisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2Vy L3NjcmlwdHMtcGFuZWwtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dl ci9zY3JpcHRzLXBhbmVsLmh0bWw6CisKIDIwMTEtMDYtMTQgIFJ5b3N1a2UgTml3YSAgPHJuaXdh QHdlYmtpdC5vcmc+CiAKICAgICAgICAgU2tpcCBlZGl0aW5nL2luc2VydGluZy9yZXR1cm4ta2V5 LXNwYW4tc3RhcnQuaHRtbCBhZGRlZCBieSByODg4OTAgb24gTWFjIFdlYktpdDIKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLWV4cGVj dGVkLnR4dAppbmRleCA3OTc3MGFlLi40MDM1MTIzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwtZXhwZWN0ZWQudHh0CkBAIC0x MCwxMyArMTAsMTYgQEAgUnVubmluZzogdGVzdFNvdXJjZUZyYW1lc0NvdW50CiBQYWdlIHJlbG9h ZGVkLgogCiBSdW5uaW5nOiB0ZXN0RmlsZXNTZWxlY3QKLXRleHQ6IHNjcmlwdC5qcywgdG9vbHRp cDogLi4uZm9vL2Jhci9zY3JpcHQuanMKLXRleHQ6IHNjcmlwdC5qcywgdG9vbHRpcDogLi4uZm9v L2Jhci9zY3JpcHQuanM/YT0xCi10ZXh0OiBzY3JpcHQuanMsIHRvb2x0aXA6IC4uLmZvby9iYXIv c2NyaXB0LmpzP2E9MgotdGV4dDogc2NyaXB0LmpzLCB0b29sdGlwOiAuLi5mb28vYmF6L3Njcmlw dC5qcwotdGV4dDogQ29udGVudCBzY3JpcHRzLCB0b29sdGlwOiAuLi4KLXRleHQ6IGNvbnRlbnRT Y3JpcHQuanMsIHRvb2x0aXA6IC4uLmZvby9iYXIvY29udGVudFNjcmlwdC5qcz9hPTEKLXRleHQ6 IGNvbnRlbnRTY3JpcHQuanMsIHRvb2x0aXA6IC4uLmZvby9iYXIvY29udGVudFNjcmlwdC5qcz9h PTIKLXRleHQ6IGNvbnRlbnRTY3JpcHQyLmpzLCB0b29sdGlwOiAuLi5mb28vYmFyL2NvbnRlbnRT Y3JpcHQyLmpzP2E9MQordGV4dDogP2E9YiwgdG9vbHRpcDogP2E9YgordGV4dDogZXhhbXBsZS5j b20vLCB0b29sdGlwOiBodHRwOi8vZXhhbXBsZS5jb20vP2E9YgordGV4dDogc2NyaXB0LmpzLCB0 b29sdGlwOiA8cm9vdD4vZm9vL2Jhci9zY3JpcHQuanMKK3RleHQ6IHNjcmlwdC5qcywgdG9vbHRp cDogPHJvb3Q+L2Zvby9iYXIvc2NyaXB0LmpzP2E9MQordGV4dDogc2NyaXB0LmpzLCB0b29sdGlw OiA8cm9vdD4vZm9vL2Jhci9zY3JpcHQuanM/YT0yCit0ZXh0OiBzY3JpcHQuanMsIHRvb2x0aXA6 IDxyb290Pi9mb28vYmF6L3NjcmlwdC5qcwordGV4dDogdmVyeV9sb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vbi4uLiwgdG9vbHRpcDogdmVyeV9sb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vbmdfdXJsCit0ZXh0OiBDb250ZW50IHNjcmlwdHMsIHRvb2x0aXA6 IAordGV4dDogY29udGVudFNjcmlwdC5qcywgdG9vbHRpcDogPHJvb3Q+L2Zvby9iYXIvY29udGVu dFNjcmlwdC5qcz9hPTEKK3RleHQ6IGNvbnRlbnRTY3JpcHQuanMsIHRvb2x0aXA6IDxyb290Pi9m b28vYmFyL2NvbnRlbnRTY3JpcHQuanM/YT0yCit0ZXh0OiBjb250ZW50U2NyaXB0Mi5qcywgdG9v bHRpcDogPHJvb3Q+L2Zvby9iYXIvY29udGVudFNjcmlwdDIuanM/YT0xCiBEZWJ1Z2dlciB3YXMg ZGlzYWJsZWQuCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9z Y3JpcHRzLXBhbmVsLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0 cy1wYW5lbC5odG1sCmluZGV4IGVkNmRlODQuLjJhYWU1ZDUgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLmh0bWwKKysrIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwuaHRtbApAQCAtMTI5LDI5ICsxMjks MjUgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgICAgICB2YXIgcGFuZWwgPSBuZXcgV2ViSW5z cGVjdG9yLlNjcmlwdHNQYW5lbCgpOwogICAgICAgICAgICAgdmFyIHJvb3RVUkwgPSBXZWJJbnNw ZWN0b3IubWFpblJlc291cmNlLnVybC5zdWJzdHJpbmcoMCwgV2ViSW5zcGVjdG9yLm1haW5SZXNv dXJjZS51cmwubGFzdEluZGV4T2YoIi8iKSArIDEpOwogICAgICAgICAgICAgdmFyIG5leHRJZCA9 IDA7Ci0KICAgICAgICAgICAgIGZ1bmN0aW9uIGFkZE9wdGlvbih1cmwsIGlzQ29udGVudFNjcmlw dCkKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICB2YXIgZGlzcGxheU5hbWUgPSB1cmw7 Ci0gICAgICAgICAgICAgICAgdmFyIGluZGV4T2ZRdWVyeSA9IGRpc3BsYXlOYW1lLmluZGV4T2Yo Ij8iKTsKLSAgICAgICAgICAgICAgICBpZiAoaW5kZXhPZlF1ZXJ5ICE9PSAtMSkKLSAgICAgICAg ICAgICAgICAgICAgZGlzcGxheU5hbWUgPSBkaXNwbGF5TmFtZS5zdWJzdHJpbmcoMCwgaW5kZXhP ZlF1ZXJ5KTsKLSAgICAgICAgICAgICAgICB2YXIgbGFzdFNsYXNoSW5kZXggPSBkaXNwbGF5TmFt ZS5sYXN0SW5kZXhPZigiLyIpOwotICAgICAgICAgICAgICAgIGlmIChsYXN0U2xhc2hJbmRleCAh PT0gLTEpCi0gICAgICAgICAgICAgICAgICAgIGRpc3BsYXlOYW1lID0gZGlzcGxheU5hbWUuc3Vi c3RyaW5nKGxhc3RTbGFzaEluZGV4ICsgMSk7Ci0gICAgICAgICAgICAgICAgcGFuZWwuX2FkZE9w dGlvblRvRmlsZXNTZWxlY3QoeyBpZDogbmV4dElkKyssIHVybDogcm9vdFVSTCArIHVybCwgZGlz cGxheU5hbWU6IGRpc3BsYXlOYW1lLCBpc0NvbnRlbnRTY3JpcHQ6IGlzQ29udGVudFNjcmlwdCB9 KTsKKyAgICAgICAgICAgICAgICBwYW5lbC5fYWRkT3B0aW9uVG9GaWxlc1NlbGVjdCh7IGlkOiBu ZXh0SWQrKywgdXJsOiB1cmwsIGlzQ29udGVudFNjcmlwdDogaXNDb250ZW50U2NyaXB0IH0pOwog ICAgICAgICAgICAgfQotICAgICAgICAgICAgYWRkT3B0aW9uKCJmb28vYmFyL3NjcmlwdC5qcyIs IGZhbHNlKTsKLSAgICAgICAgICAgIGFkZE9wdGlvbigiZm9vL2Jhci9jb250ZW50U2NyaXB0Mi5q cz9hPTEiLCB0cnVlKTsKLSAgICAgICAgICAgIGFkZE9wdGlvbigiZm9vL2Jhci9zY3JpcHQuanM/ YT0yIiwgZmFsc2UpOwotICAgICAgICAgICAgYWRkT3B0aW9uKCJmb28vYmFyL2NvbnRlbnRTY3Jp cHQuanM/YT0yIiwgdHJ1ZSk7Ci0gICAgICAgICAgICBhZGRPcHRpb24oImZvby9iYXIvc2NyaXB0 LmpzP2E9MSIsIGZhbHNlKTsKLSAgICAgICAgICAgIGFkZE9wdGlvbigiZm9vL2Jhei9zY3JpcHQu anMiLCBmYWxzZSk7Ci0gICAgICAgICAgICBhZGRPcHRpb24oImZvby9iYXIvY29udGVudFNjcmlw dC5qcz9hPTEiLCB0cnVlKTsKKyAgICAgICAgICAgIGFkZE9wdGlvbihyb290VVJMICsgImZvby9i YXIvc2NyaXB0LmpzIiwgZmFsc2UpOworICAgICAgICAgICAgYWRkT3B0aW9uKHJvb3RVUkwgKyAi Zm9vL2Jhci9jb250ZW50U2NyaXB0Mi5qcz9hPTEiLCB0cnVlKTsKKyAgICAgICAgICAgIGFkZE9w dGlvbihyb290VVJMICsgImZvby9iYXIvc2NyaXB0LmpzP2E9MiIsIGZhbHNlKTsKKyAgICAgICAg ICAgIGFkZE9wdGlvbihyb290VVJMICsgImZvby9iYXIvY29udGVudFNjcmlwdC5qcz9hPTIiLCB0 cnVlKTsKKyAgICAgICAgICAgIGFkZE9wdGlvbihyb290VVJMICsgImZvby9iYXIvc2NyaXB0Lmpz P2E9MSIsIGZhbHNlKTsKKyAgICAgICAgICAgIGFkZE9wdGlvbihyb290VVJMICsgImZvby9iYXov c2NyaXB0LmpzIiwgZmFsc2UpOworICAgICAgICAgICAgYWRkT3B0aW9uKHJvb3RVUkwgKyAiZm9v L2Jhci9jb250ZW50U2NyaXB0LmpzP2E9MSIsIHRydWUpOworICAgICAgICAgICAgYWRkT3B0aW9u KCJodHRwOi8vZXhhbXBsZS5jb20vP2E9YiIsIGZhbHNlKTsKKyAgICAgICAgICAgIGFkZE9wdGlv bigiP2E9YiIsIGZhbHNlKTsKKyAgICAgICAgICAgIGFkZE9wdGlvbigidmVyeV9sb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29v b29vb29vb29vb29vb29vb29vb29vb29vb29vbmdfdXJsIiwgZmFsc2UpOworCiAgICAgICAgICAg ICB2YXIgc2VsZWN0ID0gcGFuZWwuX2ZpbGVzU2VsZWN0RWxlbWVudDsKICAgICAgICAgICAgIGZv ciAodmFyIGkgPSAwOyBpIDwgc2VsZWN0Lmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICAgICAg dmFyIG9wdGlvbiA9IHNlbGVjdFtpXTsKLSAgICAgICAgICAgICAgICB2YXIgdG9vbHRpcCA9ICIu Li4iICsgb3B0aW9uLnRpdGxlLnN1YnN0cmluZyhyb290VVJMLmxlbmd0aCk7CisgICAgICAgICAg ICAgICAgdmFyIHRvb2x0aXAgPSBvcHRpb24udGl0bGUucmVwbGFjZShyb290VVJMLCAiPHJvb3Q+ LyIpOwogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJ0ZXh0OiAiICsg b3B0aW9uLnRleHQgKyAiLCB0b29sdGlwOiAiICsgdG9vbHRpcCk7CiAgICAgICAgICAgICB9CiAg ICAgICAgICAgICBuZXh0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjA5OTQyOS4uNmQ5MmI4ZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDExLTA2LTE1ICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rp dmlsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHNjcmlwdCBzZWxlY3QgY2FuIGJlIHRvbyB3aWRl LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjI3MDEK KworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX2Rpc3BsYXlOYW1lRm9yU2Ny aXB0VVJMKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9j cmVhdGVTb3VyY2VGcmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxl Z2F0ZUZvclNjcmlwdHNQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVE ZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbC5wcm90b3R5cGUuc3VnZ2VzdGVkRmlsZU5hbWUpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRmlsZS5qczoKKwogMjAxMS0wNi0xNCAg S2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg SGFqaW1lIE1vcml0YS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggYjM0ZmE3Zi4uZDVjM2NlMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAgLTI1Miw3 ICsyNTIsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICB7 CiAgICAgICAgIHZhciBzZWxlY3QgPSB0aGlzLl9maWxlc1NlbGVjdEVsZW1lbnQ7CiAgICAgICAg IHZhciBvcHRpb24gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJvcHRpb24iKTsKLSAgICAgICAg b3B0aW9uLnRleHQgPSBzb3VyY2VGaWxlLmRpc3BsYXlOYW1lOworICAgICAgICBvcHRpb24udGV4 dCA9IHRoaXMuX2Rpc3BsYXlOYW1lRm9yU2NyaXB0VVJMKHNvdXJjZUZpbGUudXJsKSB8fCBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIihwcm9ncmFtKSIpOwogICAgICAgICBvcHRpb24udGl0bGUgPSBz b3VyY2VGaWxlLnVybDsKICAgICAgICAgb3B0aW9uLmlzQ29udGVudFNjcmlwdCA9IHNvdXJjZUZp bGUuaXNDb250ZW50U2NyaXB0OwogICAgICAgICBpZiAoc291cmNlRmlsZS5pc0NvbnRlbnRTY3Jp cHQpCkBAIC0yOTIsNiArMjkyLDIxIEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90 eXBlID0gewogICAgICAgICB0aGlzLl9zb3VyY2VGaWxlSWRUb0ZpbGVzU2VsZWN0T3B0aW9uW3Nv dXJjZUZpbGUuaWRdID0gb3B0aW9uOwogICAgIH0sCiAKKyAgICBfZGlzcGxheU5hbWVGb3JTY3Jp cHRVUkw6IGZ1bmN0aW9uKHVybCkKKyAgICB7CisgICAgICAgIHZhciBkaXNwbGF5TmFtZSA9IHVy bDsKKyAgICAgICAgdmFyIGluZGV4T2ZRdWVyeSA9IGRpc3BsYXlOYW1lLmluZGV4T2YoIj8iKTsK KyAgICAgICAgaWYgKGluZGV4T2ZRdWVyeSA+IDApCisgICAgICAgICAgICBkaXNwbGF5TmFtZSA9 IGRpc3BsYXlOYW1lLnN1YnN0cmluZygwLCBpbmRleE9mUXVlcnkpOworICAgICAgICB2YXIgZnJv bUluZGV4ID0gZGlzcGxheU5hbWUubGFzdEluZGV4T2YoIi8iLCBkaXNwbGF5TmFtZS5sZW5ndGgg LSAyKTsKKyAgICAgICAgaWYgKGZyb21JbmRleCAhPT0gLTEpCisgICAgICAgICAgICBkaXNwbGF5 TmFtZSA9IGRpc3BsYXlOYW1lLnN1YnN0cmluZyhmcm9tSW5kZXggKyAxKTsKKyAgICAgICAgaWYg KGRpc3BsYXlOYW1lLmxlbmd0aCA+IDEwMCkKKyAgICAgICAgICAgIGRpc3BsYXlOYW1lID0gZGlz cGxheU5hbWUuc3Vic3RyaW5nKDAsIDEwMCkgKyAiLi4uIjsKKyAgICAgICAgcmV0dXJuIGRpc3Bs YXlOYW1lOworICAgIH0sCisKICAgICBzZXRTY3JpcHRTb3VyY2VJc0JlaW5nRWRpdGVkOiBmdW5j dGlvbihzb3VyY2VGaWxlSWQsIGluRWRpdE1vZGUpCiAgICAgewogICAgICAgICB2YXIgb3B0aW9u ID0gdGhpcy5fc291cmNlRmlsZUlkVG9GaWxlc1NlbGVjdE9wdGlvbltzb3VyY2VGaWxlSWRdOwpA QCAtNTc5LDcgKzU5NCw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0g ewogICAgIF9jcmVhdGVTb3VyY2VGcmFtZTogZnVuY3Rpb24oc291cmNlRmlsZUlkKQogICAgIHsK ICAgICAgICAgdmFyIHNvdXJjZUZpbGUgPSB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5zb3VyY2VG aWxlKHNvdXJjZUZpbGVJZCk7Ci0gICAgICAgIHZhciBkZWxlZ2F0ZSA9IG5ldyBXZWJJbnNwZWN0 b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbCh0aGlzLl9wcmVzZW50YXRpb25N b2RlbCwgc291cmNlRmlsZUlkLCBzb3VyY2VGaWxlLmRpc3BsYXlOYW1lKTsKKyAgICAgICAgdmFy IGRlbGVnYXRlID0gbmV3IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0 c1BhbmVsKHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLCBzb3VyY2VGaWxlSWQpOwogICAgICAgICB2 YXIgc291cmNlRnJhbWUgPSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lKGRlbGVnYXRlLCBz b3VyY2VGaWxlLnVybCk7CiAgICAgICAgIHNvdXJjZUZyYW1lLl9zb3VyY2VGaWxlSWQgPSBzb3Vy Y2VGaWxlSWQ7CiAgICAgICAgIHNvdXJjZUZyYW1lLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVj dG9yLlNvdXJjZUZyYW1lLkV2ZW50cy5Mb2FkZWQsIHRoaXMuX3NvdXJjZUZyYW1lTG9hZGVkLCB0 aGlzKTsKQEAgLTEwNDQsMTMgKzEwNTksMTIgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5w cm90b3R5cGUgPSB7CiBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fX3Byb3Rv X18gPSBXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlOwogCiAKLVdlYkluc3BlY3Rvci5Tb3Vy Y2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsID0gZnVuY3Rpb24obW9kZWwsIHNvdXJjZUZp bGVJZCwgc2NyaXB0TmFtZSkKK1dlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2Ny aXB0c1BhbmVsID0gZnVuY3Rpb24obW9kZWwsIHNvdXJjZUZpbGVJZCkKIHsKICAgICBXZWJJbnNw ZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZS5jYWxsKHRoaXMpOwogICAgIHRoaXMuX21vZGVsID0g bW9kZWw7CiAgICAgdGhpcy5fc291cmNlRmlsZUlkID0gc291cmNlRmlsZUlkOwogICAgIHRoaXMu X3BvcG92ZXJPYmplY3RHcm91cCA9ICJwb3BvdmVyIjsKLSAgICB0aGlzLl9zY3JpcHROYW1lID0g c2NyaXB0TmFtZTsKIH0KIAogV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGVGb3JTY3Jp cHRzUGFuZWwucHJvdG90eXBlID0gewpAQCAtMTEyNCw3ICsxMTM4LDggQEAgV2ViSW5zcGVjdG9y LlNvdXJjZUZyYW1lRGVsZWdhdGVGb3JTY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAg c3VnZ2VzdGVkRmlsZU5hbWU6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlz Ll9zY3JpcHROYW1lOworICAgICAgICB2YXIgc291cmNlRmlsZSA9IHRoaXMuX21vZGVsLnNvdXJj ZUZpbGUodGhpcy5fc291cmNlRmlsZUlkKTsKKyAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5w YW5lbHMuc2NyaXB0cy5fZGlzcGxheU5hbWVGb3JTY3JpcHRVUkwoc291cmNlRmlsZS51cmwpIHx8 ICJ1bnRpdGxlZC5qcyI7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZpbGUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NvdXJjZUZpbGUuanMKaW5kZXggZWRlMDM3MC4uM2U4MzBhYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGaWxlLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRmlsZS5qcwpAQCAt NjMsMTEgKzYzLDYgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZpbGUucHJvdG90eXBlID0gewogICAg ICAgICB0aGlzLl9yZXF1ZXN0Q29udGVudCgpOwogICAgIH0sCiAKLSAgICBnZXQgZGlzcGxheU5h bWUoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMudXJsID8gV2ViSW5zcGVjdG9yLmRpc3Bs YXlOYW1lRm9yVVJMKHRoaXMudXJsKSA6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiKHByb2dyYW0p Iik7Ci0gICAgfSwKLQogICAgIGdldCBjb250ZW50KCkKICAgICB7CiAgICAgICAgIHJldHVybiB0 aGlzLl9jb250ZW50Owo=