105823 2012-12-28 01:11:19 -0800 Web Inspector: rename distanceToWindow to distance 2012-12-28 01:27:20 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 yurys yurys apavlov keishi loislo pfeldman pmuellr rniwa vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 797811 0 yurys 2012-12-28 01:11:19 -0800 Node distance in heap profiler is going to be a distance to the DOMWindow object in case of JS and a distance to root in case of native heap snapshot. 797814 1 180855 yurys 2012-12-28 01:14:19 -0800 Created attachment 180855 Patch 797815 2 180855 webkit.review.bot 2012-12-28 01:24:10 -0800 Comment on attachment 180855 Patch Rejecting attachment 180855 from commit-queue. Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', u'--status-host=queues.webkit.org', ..." exit_code: 1 cwd: /mnt/git/webkit-commit-queue /mnt/git/webkit-commit-queue/LayoutTests/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://queues.webkit.org/results/15546821 797816 3 yurys 2012-12-28 01:27:20 -0800 Committed r138528: <http://trac.webkit.org/changeset/138528> 180855 2012-12-28 01:14:19 -0800 2012-12-28 01:24:10 -0800 Patch bug-105823-20121228131129.patch text/plain 23252 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NTIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDVhMmFhYjE3NzkxOWY4 MTk0MWQwZmMxZDA3NzY4M2E5YTlkYWZjOS4uNmYzNzQyZWViZTNmNWVhNTE2YmM3YTFmNWJlYWQ5 ZjBmYzdkYWRlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDEyLTEyLTI4ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHJlbmFtZSBkaXN0YW5jZVRvV2luZG93IHRvIGRpc3RhbmNlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDU4MjMKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWVkIGRpc3RhbmNlVG9XaW5kb3cg dG8gZGlzdGFuY2UuIEludHJvZHVjZWQgYSBtZXRob2Qgb24gSGVhcFNuYXBzaG90CisgICAgICAg IHRoYXQgYWxsb3dzIHRvIGNoZWNrIGlmIGdpdmVuIG5vZGUgc2hvdWxkIGJlIGRpc3BsYXllZCB0 byB0aGUgdXNlciBhcyBoYXZpbmcKKyAgICAgICAgZGlzdGFuY2UgMS4KKworICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkhlYXBTbmFwc2hvdEVkZ2UucHJvdG90eXBlLnNlcmlhbGl6ZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuSGVhcFNuYXBzaG90UmV0YWluZXJFZGdlLnByb3RvdHlwZS5zZXJpYWxpemUpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdE5vZGUucHJvdG90eXBlLmRpc3RhbmNlKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3ROb2RlLnByb3RvdHlwZS5zZXJpYWxp emUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUuX2luaXQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUuZGlzcG9zZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90LnByb3RvdHlwZS5jYW5IYXZlRGlz dGFuY2VPbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUu X2NhbGN1bGF0ZURpc3RhbmNlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90 LnByb3RvdHlwZS5fYmZzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3QucHJv dG90eXBlLl9idWlsZEFnZ3JlZ2F0ZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv SGVhcFNuYXBzaG90RGF0YUdyaWRzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFw c2hvdFJldGFpbm1lbnREYXRhR3JpZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBz aG90UmV0YWlubWVudERhdGFHcmlkLnByb3RvdHlwZS5fc29ydEZpZWxkcyk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Q29uc3RydWN0b3JzRGF0YUdyaWQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdENvbnN0cnVjdG9yc0RhdGFHcmlkLnByb3RvdHlwZS5f c29ydEZpZWxkcyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3RH cmlkTm9kZXMuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90R2VuZXJpY09i amVjdE5vZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdEdlbmVyaWNPYmpl Y3ROb2RlLnByb3RvdHlwZS5nZXQgZGF0YSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNu YXBzaG90T2JqZWN0Tm9kZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90T2Jq ZWN0Tm9kZS5wcm90b3R5cGUuY29tcGFyYXRvcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVh cFNuYXBzaG90T2JqZWN0Tm9kZS5wcm90b3R5cGUuX2VuaGFuY2VEYXRhKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5IZWFwU25hcHNob3RJbnN0YW5jZU5vZGUucHJvdG90eXBlLmNvbXBhcmF0b3Ip OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdENvbnN0cnVjdG9yTm9kZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Q29uc3RydWN0b3JOb2RlLnByb3RvdHlw ZS5jb21wYXJhdG9yKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RDb25zdHJ1 Y3Rvck5vZGUucHJvdG90eXBlLmdldCBkYXRhKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL0pTSGVhcFNuYXBzaG90LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkpTSGVhcFNuYXBz aG90LnByb3RvdHlwZS5jYW5IYXZlRGlzdGFuY2VPbmUpOgorCiAyMDEyLTEyLTI3ICBEaW1pdHJp IEdsYXprb3YgIDxkZ2xhemtvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgRml4IHN0eWxpbmcv Zm9ybWF0dGluZyBlcnJvcnMsIHBvaW50ZWQgb3V0IGJ5IERhcmluIEFkbGVyIHdoaWxlIHJldmll d2luZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFw U25hcHNob3QuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFw c2hvdC5qcwppbmRleCBkODk2OTJkMDEzMzNhY2Q1ZWIyY2FiMjgyMjg4MzQ2N2Q2ZGU4MDhlLi4y NDg3ZDhmYjA4YjFmZWYyNGIxZGFjYzc3YTU2M2YwNGM0NzJhM2UwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdC5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdC5qcwpAQCAtMTEyLDcg KzExMiw3IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RFZGdlLnByb3RvdHlwZSA9IHsKICAg ICAgICAgICAgIG5vZGU6IG5vZGUuc2VyaWFsaXplKCksCiAgICAgICAgICAgICBub2RlSW5kZXg6 IHRoaXMubm9kZUluZGV4KCksCiAgICAgICAgICAgICB0eXBlOiB0aGlzLnR5cGUoKSwKLSAgICAg ICAgICAgIGRpc3RhbmNlVG9XaW5kb3c6IG5vZGUuZGlzdGFuY2VUb1dpbmRvdygpCisgICAgICAg ICAgICBkaXN0YW5jZTogbm9kZS5kaXN0YW5jZSgpCiAgICAgICAgIH07CiAgICAgfSwKIApAQCAt MjU0LDcgKzI1NCw3IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RSZXRhaW5lckVkZ2UucHJv dG90eXBlID0gewogICAgICAgICAgICAgbm9kZTogbm9kZS5zZXJpYWxpemUoKSwKICAgICAgICAg ICAgIG5vZGVJbmRleDogdGhpcy5ub2RlSW5kZXgoKSwKICAgICAgICAgICAgIHR5cGU6IHRoaXMu dHlwZSgpLAotICAgICAgICAgICAgZGlzdGFuY2VUb1dpbmRvdzogbm9kZS5kaXN0YW5jZVRvV2lu ZG93KCkKKyAgICAgICAgICAgIGRpc3RhbmNlOiBub2RlLmRpc3RhbmNlKCkKICAgICAgICAgfTsK ICAgICB9LAogCkBAIC0zMjEsOSArMzIxLDkgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdE5v ZGUucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9LAogCi0gICAgZGlz dGFuY2VUb1dpbmRvdzogZnVuY3Rpb24oKQorICAgIGRpc3RhbmNlOiBmdW5jdGlvbigpCiAgICAg ewotICAgICAgICByZXR1cm4gdGhpcy5fc25hcHNob3QuX2Rpc3RhbmNlc1RvV2luZG93W3RoaXMu bm9kZUluZGV4IC8gdGhpcy5fc25hcHNob3QuX25vZGVGaWVsZENvdW50XTsKKyAgICAgICAgcmV0 dXJuIHRoaXMuX3NuYXBzaG90Ll9ub2RlRGlzdGFuY2VzW3RoaXMubm9kZUluZGV4IC8gdGhpcy5f c25hcHNob3QuX25vZGVGaWVsZENvdW50XTsKICAgICB9LAogCiAgICAgY2xhc3NOYW1lOiBmdW5j dGlvbigpCkBAIC0zOTksNyArMzk5LDcgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdE5vZGUu cHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gewogICAgICAgICAgICAgaWQ6IHRoaXMuaWQo KSwKICAgICAgICAgICAgIG5hbWU6IHRoaXMubmFtZSgpLAotICAgICAgICAgICAgZGlzdGFuY2VU b1dpbmRvdzogdGhpcy5kaXN0YW5jZVRvV2luZG93KCksCisgICAgICAgICAgICBkaXN0YW5jZTog dGhpcy5kaXN0YW5jZSgpLAogICAgICAgICAgICAgbm9kZUluZGV4OiB0aGlzLm5vZGVJbmRleCwK ICAgICAgICAgICAgIHJldGFpbmVkU2l6ZTogdGhpcy5yZXRhaW5lZFNpemUoKSwKICAgICAgICAg ICAgIHNlbGZTaXplOiB0aGlzLnNlbGZTaXplKCksCkBAIC01NjksNyArNTY5LDcgQEAgV2ViSW5z cGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX21hcmtJbnZp c2libGVFZGdlcygpOwogICAgICAgICB0aGlzLl9idWlsZFJldGFpbmVycygpOwogICAgICAgICB0 aGlzLl9jYWxjdWxhdGVGbGFncygpOwotICAgICAgICB0aGlzLl9jYWxjdWxhdGVPYmplY3RUb1dp bmRvd0Rpc3RhbmNlKCk7CisgICAgICAgIHRoaXMuX2NhbGN1bGF0ZURpc3RhbmNlcygpOwogICAg ICAgICB2YXIgcmVzdWx0ID0gdGhpcy5fYnVpbGRQb3N0T3JkZXJJbmRleCgpOwogICAgICAgICAv LyBBY3R1YWxseSBpdCBpcyBhcnJheSB0aGF0IG1hcHMgbm9kZSBvcmRpbmFsIG51bWJlciB0byBk b21pbmF0b3Igbm9kZSBvcmRpbmFsIG51bWJlci4KICAgICAgICAgdGhpcy5fZG9taW5hdG9yc1Ry ZWUgPSB0aGlzLl9idWlsZERvbWluYXRvclRyZWUocmVzdWx0LnBvc3RPcmRlckluZGV4Mk5vZGVP cmRpbmFsLCByZXN1bHQubm9kZU9yZGluYWwyUG9zdE9yZGVySW5kZXgpOwpAQCAtNjcwLDcgKzY3 MCw3IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3QucHJvdG90eXBlID0gewogICAgICAgICB9 CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9kb21pbmF0ZWROb2RlczsKICAgICAgICAgZGVsZXRlIHRo aXMuX2ZpcnN0RG9taW5hdGVkTm9kZUluZGV4OwotICAgICAgICBkZWxldGUgdGhpcy5fZGlzdGFu Y2VzVG9XaW5kb3c7CisgICAgICAgIGRlbGV0ZSB0aGlzLl9ub2RlRGlzdGFuY2VzOwogICAgICAg ICBkZWxldGUgdGhpcy5fZG9taW5hdG9yc1RyZWU7CiAgICAgfSwKIApAQCAtNzc1LDcgKzc3NSwx MiBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0 dXJuIHRoaXMuX2FnZ3JlZ2F0ZXNGb3JEaWZmOwogICAgIH0sCiAKLSAgICBfY2FsY3VsYXRlT2Jq ZWN0VG9XaW5kb3dEaXN0YW5jZTogZnVuY3Rpb24oKQorICAgIGNhbkhhdmVEaXN0YW5jZU9uZTog ZnVuY3Rpb24obm9kZSkKKyAgICB7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0sCisKKyAg ICBfY2FsY3VsYXRlRGlzdGFuY2VzOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB2YXIgbm9k ZUZpZWxkQ291bnQgPSB0aGlzLl9ub2RlRmllbGRDb3VudDsKICAgICAgICAgdmFyIGRpc3RhbmNl cyA9IG5ldyBVaW50MzJBcnJheSh0aGlzLm5vZGVDb3VudCk7CkBAIC03ODUsNyArNzkwLDcgQEAg V2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBub2Rl c1RvVmlzaXRMZW5ndGggPSAwOwogICAgICAgICBmb3IgKHZhciBpdGVyID0gdGhpcy5yb290Tm9k ZSgpLmVkZ2VzKCk7IGl0ZXIuaGFzTmV4dCgpOyBpdGVyLm5leHQoKSkgewogICAgICAgICAgICAg dmFyIG5vZGUgPSBpdGVyLmVkZ2Uubm9kZSgpOwotICAgICAgICAgICAgaWYgKG5vZGUuaXNXaW5k b3coKSkgeworICAgICAgICAgICAgaWYgKHRoaXMuY2FuSGF2ZURpc3RhbmNlT25lKG5vZGUpKSB7 CiAgICAgICAgICAgICAgICAgbm9kZXNUb1Zpc2l0W25vZGVzVG9WaXNpdExlbmd0aCsrXSA9IG5v ZGUubm9kZUluZGV4OwogICAgICAgICAgICAgICAgIGRpc3RhbmNlc1tub2RlLm5vZGVJbmRleCAv IG5vZGVGaWVsZENvdW50XSA9IDE7CiAgICAgICAgICAgICB9CkBAIC03OTcsNyArODAyLDcgQEAg V2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUgPSB7CiAgICAgICAgIG5vZGVzVG9W aXNpdFtub2Rlc1RvVmlzaXRMZW5ndGgrK10gPSB0aGlzLl9yb290Tm9kZUluZGV4OwogICAgICAg ICBkaXN0YW5jZXNbdGhpcy5fcm9vdE5vZGVJbmRleCAvIG5vZGVGaWVsZENvdW50XSA9IDE7CiAg ICAgICAgIHRoaXMuX2Jmcyhub2Rlc1RvVmlzaXQsIG5vZGVzVG9WaXNpdExlbmd0aCwgZGlzdGFu Y2VzKTsKLSAgICAgICAgdGhpcy5fZGlzdGFuY2VzVG9XaW5kb3cgPSBkaXN0YW5jZXM7CisgICAg ICAgIHRoaXMuX25vZGVEaXN0YW5jZXMgPSBkaXN0YW5jZXM7CiAgICAgfSwKIAogICAgIF9iZnM6 IGZ1bmN0aW9uKG5vZGVzVG9WaXNpdCwgbm9kZXNUb1Zpc2l0TGVuZ3RoLCBkaXN0YW5jZXMpCkBA IC04MTMsNyArODE4LDYgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUgPSB7 CiAgICAgICAgIHZhciBub2RlQ291bnQgPSB0aGlzLm5vZGVDb3VudDsKICAgICAgICAgdmFyIGNv bnRhaW5tZW50RWRnZXNMZW5ndGggPSBjb250YWlubWVudEVkZ2VzLmxlbmd0aDsKICAgICAgICAg dmFyIGVkZ2VXZWFrVHlwZSA9IHRoaXMuX2VkZ2VXZWFrVHlwZTsKLSAgICAgICAgdmFyIGVkZ2VT aG9ydGN1dFR5cGUgPSB0aGlzLl9lZGdlU2hvcnRjdXRUeXBlOwogCiAgICAgICAgIHZhciBpbmRl eCA9IDA7CiAgICAgICAgIHdoaWxlIChpbmRleCA8IG5vZGVzVG9WaXNpdExlbmd0aCkgewpAQCAt ODUzLDcgKzg1Nyw3IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3QucHJvdG90eXBlID0gewog ICAgICAgICB2YXIgc2VsZlNpemVPZmZzZXQgPSB0aGlzLl9ub2RlU2VsZlNpemVPZmZzZXQ7CiAg ICAgICAgIHZhciBub2RlVHlwZU9mZnNldCA9IHRoaXMuX25vZGVUeXBlT2Zmc2V0OwogICAgICAg ICB2YXIgbm9kZSA9IHRoaXMucm9vdE5vZGUoKTsKLSAgICAgICAgdmFyIGRpc3RhbmNlc1RvV2lu ZG93ID0gdGhpcy5fZGlzdGFuY2VzVG9XaW5kb3c7CisgICAgICAgIHZhciBub2RlRGlzdGFuY2Vz ID0gdGhpcy5fbm9kZURpc3RhbmNlczsKIAogICAgICAgICBmb3IgKHZhciBub2RlSW5kZXggPSAw OyBub2RlSW5kZXggPCBub2Rlc0xlbmd0aDsgbm9kZUluZGV4ICs9IG5vZGVGaWVsZENvdW50KSB7 CiAgICAgICAgICAgICB2YXIgbm9kZU9yZGluYWwgPSBub2RlSW5kZXggLyBub2RlRmllbGRDb3Vu dDsKQEAgLTg3MSw3ICs4NzUsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90LnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgICAgICB2YXIgbmFtZU1hdHRlcnMgPSBub2RlVHlwZSA9PT0gIm9i amVjdCIgfHwgbm9kZVR5cGUgPT09ICJuYXRpdmUiOwogICAgICAgICAgICAgICAgIHZhciB2YWx1 ZSA9IHsKICAgICAgICAgICAgICAgICAgICAgY291bnQ6IDEsCi0gICAgICAgICAgICAgICAgICAg IGRpc3RhbmNlVG9XaW5kb3c6IGRpc3RhbmNlc1RvV2luZG93W25vZGVPcmRpbmFsXSwKKyAgICAg ICAgICAgICAgICAgICAgZGlzdGFuY2U6IG5vZGVEaXN0YW5jZXNbbm9kZU9yZGluYWxdLAogICAg ICAgICAgICAgICAgICAgICBzZWxmOiBzZWxmU2l6ZSwKICAgICAgICAgICAgICAgICAgICAgbWF4 UmV0OiAwLAogICAgICAgICAgICAgICAgICAgICB0eXBlOiBub2RlVHlwZSwKQEAgLTg4Myw3ICs4 ODcsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90LnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgICAgICBhZ2dyZWdhdGVzQnlDbGFzc05hbWVbbm9kZS5jbGFzc05hbWUoKV0gPSB2YWx1ZTsK ICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgdmFyIGNsc3MgPSBhZ2dyZWdh dGVzW2NsYXNzSW5kZXhdOwotICAgICAgICAgICAgICAgIGNsc3MuZGlzdGFuY2VUb1dpbmRvdyA9 IE1hdGgubWluKGNsc3MuZGlzdGFuY2VUb1dpbmRvdywgZGlzdGFuY2VzVG9XaW5kb3dbbm9kZU9y ZGluYWxdKTsKKyAgICAgICAgICAgICAgICBjbHNzLmRpc3RhbmNlID0gTWF0aC5taW4oY2xzcy5k aXN0YW5jZSwgbm9kZURpc3RhbmNlc1tub2RlT3JkaW5hbF0pOwogICAgICAgICAgICAgICAgICsr Y2xzcy5jb3VudDsKICAgICAgICAgICAgICAgICBjbHNzLnNlbGYgKz0gc2VsZlNpemU7CiAgICAg ICAgICAgICAgICAgY2xzcy5pZHhzLnB1c2gobm9kZUluZGV4KTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90RGF0YUdyaWRzLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3REYXRhR3JpZHMu anMKaW5kZXggOGNkMjJkNjA4YTgxNzlmNTUwOTZkYzg2NzEyMzgyMWJmZDcxZjYyZi4uMTFiMzQ5 YTQxNTViYmY2ZDY3YjRhMmJjYTI1YzdlMDlhZjcwYjFiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3REYXRhR3JpZHMuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3REYXRhR3JpZHMu anMKQEAgLTQ2Nyw3ICs0NjcsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90UmV0YWlubWVu dERhdGFHcmlkID0gZnVuY3Rpb24oKQogICAgICAgICBvYmplY3Q6IHsgdGl0bGU6IFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiT2JqZWN0IiksIGRpc2Nsb3N1cmU6IHRydWUsIHNvcnRhYmxlOiB0cnVl IH0sCiAgICAgICAgIHNoYWxsb3dTaXplOiB7IHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlNoYWxsb3cgU2l6ZSIpLCB3aWR0aDogIjEyMHB4Iiwgc29ydGFibGU6IHRydWUgfSwKICAgICAg ICAgcmV0YWluZWRTaXplOiB7IHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJldGFpbmVk IFNpemUiKSwgd2lkdGg6ICIxMjBweCIsIHNvcnRhYmxlOiB0cnVlIH0sCi0gICAgICAgIGRpc3Rh bmNlVG9XaW5kb3c6IHsgdGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGlzdGFuY2UiKSwg d2lkdGg6ICI4MHB4Iiwgc29ydGFibGU6IHRydWUsIHNvcnQ6ICJhc2NlbmRpbmciIH0KKyAgICAg ICAgZGlzdGFuY2U6IHsgdGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGlzdGFuY2UiKSwg d2lkdGg6ICI4MHB4Iiwgc29ydGFibGU6IHRydWUsIHNvcnQ6ICJhc2NlbmRpbmciIH0KICAgICB9 OwogICAgIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RDb250YWlubWVudERhdGFHcmlkLmNhbGwo dGhpcywgY29sdW1ucyk7CiB9CkBAIC00ODAsNyArNDgwLDcgQEAgV2ViSW5zcGVjdG9yLkhlYXBT bmFwc2hvdFJldGFpbm1lbnREYXRhR3JpZC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBjb3Vu dDogWyJfY291bnQiLCBzb3J0QXNjZW5kaW5nLCAiX25hbWUiLCB0cnVlXSwKICAgICAgICAgICAg IHNoYWxsb3dTaXplOiBbIl9zaGFsbG93U2l6ZSIsIHNvcnRBc2NlbmRpbmcsICJfbmFtZSIsIHRy dWVdLAogICAgICAgICAgICAgcmV0YWluZWRTaXplOiBbIl9yZXRhaW5lZFNpemUiLCBzb3J0QXNj ZW5kaW5nLCAiX25hbWUiLCB0cnVlXSwKLSAgICAgICAgICAgIGRpc3RhbmNlVG9XaW5kb3c6IFsi X2Rpc3RhbmNlVG9XaW5kb3ciLCBzb3J0QXNjZW5kaW5nLCAiX25hbWUiLCB0cnVlXQorICAgICAg ICAgICAgZGlzdGFuY2U6IFsiX2Rpc3RhbmNlIiwgc29ydEFzY2VuZGluZywgIl9uYW1lIiwgdHJ1 ZV0KICAgICAgICAgfVtzb3J0Q29sdW1uXTsKICAgICB9LAogCkBAIC01MDIsNyArNTAyLDcgQEAg V2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdENvbnN0cnVjdG9yc0RhdGFHcmlkID0gZnVuY3Rpb24o KQogewogICAgIHZhciBjb2x1bW5zID0gewogICAgICAgICBvYmplY3Q6IHsgdGl0bGU6IFdlYklu c3BlY3Rvci5VSVN0cmluZygiQ29uc3RydWN0b3IiKSwgZGlzY2xvc3VyZTogdHJ1ZSwgc29ydGFi bGU6IHRydWUgfSwKLSAgICAgICAgZGlzdGFuY2VUb1dpbmRvdzogeyB0aXRsZTogV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJEaXN0YW5jZSIpLCB3aWR0aDogIjkwcHgiLCBzb3J0YWJsZTogdHJ1ZSB9 LAorICAgICAgICBkaXN0YW5jZTogeyB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEaXN0 YW5jZSIpLCB3aWR0aDogIjkwcHgiLCBzb3J0YWJsZTogdHJ1ZSB9LAogICAgICAgICBjb3VudDog eyB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJPYmplY3RzIENvdW50IiksIHdpZHRoOiAi OTBweCIsIHNvcnRhYmxlOiB0cnVlIH0sCiAgICAgICAgIHNoYWxsb3dTaXplOiB7IHRpdGxlOiBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNoYWxsb3cgU2l6ZSIpLCB3aWR0aDogIjEyMHB4Iiwgc29y dGFibGU6IHRydWUgfSwKICAgICAgICAgcmV0YWluZWRTaXplOiB7IHRpdGxlOiBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIlJldGFpbmVkIFNpemUiKSwgd2lkdGg6ICIxMjBweCIsIHNvcnQ6ICJkZXNj ZW5kaW5nIiwgc29ydGFibGU6IHRydWUgfQpAQCAtNTE5LDcgKzUxOSw3IEBAIFdlYkluc3BlY3Rv ci5IZWFwU25hcHNob3RDb25zdHJ1Y3RvcnNEYXRhR3JpZC5wcm90b3R5cGUgPSB7CiAgICAgewog ICAgICAgICByZXR1cm4gewogICAgICAgICAgICAgb2JqZWN0OiBbIl9uYW1lIiwgc29ydEFzY2Vu ZGluZywgIl9jb3VudCIsIGZhbHNlXSwKLSAgICAgICAgICAgIGRpc3RhbmNlVG9XaW5kb3c6IFsi X2Rpc3RhbmNlVG9XaW5kb3ciLCBzb3J0QXNjZW5kaW5nLCAiX3JldGFpbmVkU2l6ZSIsIHRydWVd LAorICAgICAgICAgICAgZGlzdGFuY2U6IFsiX2Rpc3RhbmNlIiwgc29ydEFzY2VuZGluZywgIl9y ZXRhaW5lZFNpemUiLCB0cnVlXSwKICAgICAgICAgICAgIGNvdW50OiBbIl9jb3VudCIsIHNvcnRB c2NlbmRpbmcsICJfbmFtZSIsIHRydWVdLAogICAgICAgICAgICAgc2hhbGxvd1NpemU6IFsiX3No YWxsb3dTaXplIiwgc29ydEFzY2VuZGluZywgIl9uYW1lIiwgdHJ1ZV0sCiAgICAgICAgICAgICBy ZXRhaW5lZFNpemU6IFsiX3JldGFpbmVkU2l6ZSIsIHNvcnRBc2NlbmRpbmcsICJfbmFtZSIsIHRy dWVdCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBT bmFwc2hvdEdyaWROb2Rlcy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv SGVhcFNuYXBzaG90R3JpZE5vZGVzLmpzCmluZGV4IDFjOWU5N2E5ZjZiNzJiNzRiZjcwZjUyMzcz MjFlYWFkOWQyZDBkMDguLjY1MGNhYTJiOGM3Nzg0YTE3MGI0ZDFhZTE3ZDE2OWQ5YjY2YjVmNzcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBz aG90R3JpZE5vZGVzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv SGVhcFNuYXBzaG90R3JpZE5vZGVzLmpzCkBAIC0zNTEsNyArMzUxLDcgQEAgV2ViSW5zcGVjdG9y LkhlYXBTbmFwc2hvdEdlbmVyaWNPYmplY3ROb2RlID0gZnVuY3Rpb24odHJlZSwgbm9kZSkKICAg ICAgICAgcmV0dXJuOwogICAgIHRoaXMuX25hbWUgPSBub2RlLm5hbWU7CiAgICAgdGhpcy5fdHlw ZSA9IG5vZGUudHlwZTsKLSAgICB0aGlzLl9kaXN0YW5jZVRvV2luZG93ID0gbm9kZS5kaXN0YW5j ZVRvV2luZG93OworICAgIHRoaXMuX2Rpc3RhbmNlID0gbm9kZS5kaXN0YW5jZTsKICAgICB0aGlz Ll9zaGFsbG93U2l6ZSA9IG5vZGUuc2VsZlNpemU7CiAgICAgdGhpcy5fcmV0YWluZWRTaXplID0g bm9kZS5yZXRhaW5lZFNpemU7CiAgICAgdGhpcy5zbmFwc2hvdE5vZGVJZCA9IG5vZGUuaWQ7CkBA IC00NDQsNyArNDQ0LDcgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdEdlbmVyaWNPYmplY3RO b2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHZhbHVlU3R5bGUgKz0gIiBkZXRhY2hlZC1k b20tdHJlZS1ub2RlIjsKICAgICAgICAgZGF0YVsib2JqZWN0Il0gPSB7IHZhbHVlU3R5bGU6IHZh bHVlU3R5bGUsIHZhbHVlOiB2YWx1ZSwgbm9kZUlkOiB0aGlzLnNuYXBzaG90Tm9kZUlkIH07CiAK LSAgICAgICAgZGF0YVsiZGlzdGFuY2VUb1dpbmRvdyJdID0gIHRoaXMuX2Rpc3RhbmNlVG9XaW5k b3c7CisgICAgICAgIGRhdGFbImRpc3RhbmNlIl0gPSAgdGhpcy5fZGlzdGFuY2U7CiAgICAgICAg IGRhdGFbInNoYWxsb3dTaXplIl0gPSBOdW1iZXIud2l0aFRob3VzYW5kc1NlcGFyYXRvcih0aGlz Ll9zaGFsbG93U2l6ZSk7CiAgICAgICAgIGRhdGFbInJldGFpbmVkU2l6ZSJdID0gTnVtYmVyLndp dGhUaG91c2FuZHNTZXBhcmF0b3IodGhpcy5fcmV0YWluZWRTaXplKTsKICAgICAgICAgZGF0YVsi c2hhbGxvd1NpemUtcGVyY2VudCJdID0gdGhpcy5fdG9QZXJjZW50U3RyaW5nKHRoaXMuX3NoYWxs b3dTaXplUGVyY2VudCk7CkBAIC01MjEsNyArNTIxLDcgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFw c2hvdE9iamVjdE5vZGUgPSBmdW5jdGlvbih0cmVlLCBpc0Zyb21CYXNlU25hcHNob3QsIGVkZ2Us IHAKICAgICBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90R2VuZXJpY09iamVjdE5vZGUuY2FsbCh0 aGlzLCB0cmVlLCBlZGdlLm5vZGUpOwogICAgIHRoaXMuX3JlZmVyZW5jZU5hbWUgPSBlZGdlLm5h bWU7CiAgICAgdGhpcy5fcmVmZXJlbmNlVHlwZSA9IGVkZ2UudHlwZTsKLSAgICB0aGlzLl9kaXN0 YW5jZVRvV2luZG93ID0gZWRnZS5kaXN0YW5jZVRvV2luZG93OworICAgIHRoaXMuX2Rpc3RhbmNl ID0gZWRnZS5kaXN0YW5jZTsKICAgICB0aGlzLnNob3dSZXRhaW5pbmdFZGdlcyA9IHRyZWUuc2hv d1JldGFpbmluZ0VkZ2VzOwogICAgIHRoaXMuX2lzRnJvbUJhc2VTbmFwc2hvdCA9IGlzRnJvbUJh c2VTbmFwc2hvdDsKIApAQCAtNTg4LDcgKzU4OCw3IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNo b3RPYmplY3ROb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGNvdW50OiBbIiFlZGdlTmFt ZSIsIHRydWUsICJyZXRhaW5lZFNpemUiLCBmYWxzZV0sCiAgICAgICAgICAgICBzaGFsbG93U2l6 ZTogWyJzZWxmU2l6ZSIsIHNvcnRBc2NlbmRpbmcsICIhZWRnZU5hbWUiLCB0cnVlXSwKICAgICAg ICAgICAgIHJldGFpbmVkU2l6ZTogWyJyZXRhaW5lZFNpemUiLCBzb3J0QXNjZW5kaW5nLCAiIWVk Z2VOYW1lIiwgdHJ1ZV0sCi0gICAgICAgICAgICBkaXN0YW5jZVRvV2luZG93OiBbImRpc3RhbmNl VG9XaW5kb3ciLCBzb3J0QXNjZW5kaW5nLCAiX25hbWUiLCB0cnVlXQorICAgICAgICAgICAgZGlz dGFuY2U6IFsiZGlzdGFuY2UiLCBzb3J0QXNjZW5kaW5nLCAiX25hbWUiLCB0cnVlXQogICAgICAg ICB9W3NvcnRDb2x1bW5JZGVudGlmaWVyXSB8fCBbIiFlZGdlTmFtZSIsIHRydWUsICJyZXRhaW5l ZFNpemUiLCBmYWxzZV07CiAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90 RmlsdGVyZWRPcmRlcmVkSXRlcmF0b3IucHJvdG90eXBlLmNyZWF0ZUNvbXBhcmF0b3Ioc29ydEZp ZWxkcyk7CiAgICAgfSwKQEAgLTYxNyw3ICs2MTcsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBz aG90T2JqZWN0Tm9kZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICAgICAgZGF0YVsib2Jq ZWN0Il0ubmFtZUNsYXNzID0gbmFtZUNsYXNzOwogICAgICAgICBkYXRhWyJvYmplY3QiXS5uYW1l ID0gbmFtZTsKLSAgICAgICAgZGF0YVsiZGlzdGFuY2VUb1dpbmRvdyJdID0gdGhpcy5fZGlzdGFu Y2VUb1dpbmRvdzsKKyAgICAgICAgZGF0YVsiZGlzdGFuY2UiXSA9IHRoaXMuX2Rpc3RhbmNlOwog ICAgICAgICByZXR1cm4gZGF0YTsKICAgICB9LAogCkBAIC02ODUsNyArNjg1LDcgQEAgV2ViSW5z cGVjdG9yLkhlYXBTbmFwc2hvdEluc3RhbmNlTm9kZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZh ciBzb3J0Q29sdW1uSWRlbnRpZmllciA9IHRoaXMuX2RhdGFHcmlkLnNvcnRDb2x1bW5JZGVudGlm aWVyOwogICAgICAgICB2YXIgc29ydEZpZWxkcyA9IHsKICAgICAgICAgICAgIG9iamVjdDogWyIh ZWRnZU5hbWUiLCBzb3J0QXNjZW5kaW5nLCAicmV0YWluZWRTaXplIiwgZmFsc2VdLAotICAgICAg ICAgICAgZGlzdGFuY2VUb1dpbmRvdzogWyJkaXN0YW5jZVRvV2luZG93Iiwgc29ydEFzY2VuZGlu ZywgInJldGFpbmVkU2l6ZSIsIGZhbHNlXSwKKyAgICAgICAgICAgIGRpc3RhbmNlOiBbImRpc3Rh bmNlIiwgc29ydEFzY2VuZGluZywgInJldGFpbmVkU2l6ZSIsIGZhbHNlXSwKICAgICAgICAgICAg IGNvdW50OiBbIiFlZGdlTmFtZSIsIHRydWUsICJyZXRhaW5lZFNpemUiLCBmYWxzZV0sCiAgICAg ICAgICAgICBhZGRlZFNpemU6IFsic2VsZlNpemUiLCBzb3J0QXNjZW5kaW5nLCAiIWVkZ2VOYW1l IiwgdHJ1ZV0sCiAgICAgICAgICAgICByZW1vdmVkU2l6ZTogWyJzZWxmU2l6ZSIsIHNvcnRBc2Nl bmRpbmcsICIhZWRnZU5hbWUiLCB0cnVlXSwKQEAgLTczMyw3ICs3MzMsNyBAQCBXZWJJbnNwZWN0 b3IuSGVhcFNuYXBzaG90Q29uc3RydWN0b3JOb2RlID0gZnVuY3Rpb24odHJlZSwgY2xhc3NOYW1l LCBhZ2dyZWdhdGUsCiAgICAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdEdyaWROb2RlLmNhbGwo dGhpcywgdHJlZSwgYWdncmVnYXRlLmNvdW50ID4gMCk7CiAgICAgdGhpcy5fbmFtZSA9IGNsYXNz TmFtZTsKICAgICB0aGlzLl9hZ2dyZWdhdGVzS2V5ID0gYWdncmVnYXRlc0tleTsKLSAgICB0aGlz Ll9kaXN0YW5jZVRvV2luZG93ID0gYWdncmVnYXRlLmRpc3RhbmNlVG9XaW5kb3c7CisgICAgdGhp cy5fZGlzdGFuY2UgPSBhZ2dyZWdhdGUuZGlzdGFuY2U7CiAgICAgdGhpcy5fY291bnQgPSBhZ2dy ZWdhdGUuY291bnQ7CiAgICAgdGhpcy5fc2hhbGxvd1NpemUgPSBhZ2dyZWdhdGUuc2VsZjsKICAg ICB0aGlzLl9yZXRhaW5lZFNpemUgPSBhZ2dyZWdhdGUubWF4UmV0OwpAQCAtODA0LDcgKzgwNCw3 IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RDb25zdHJ1Y3Rvck5vZGUucHJvdG90eXBlID0g ewogICAgICAgICB2YXIgc29ydENvbHVtbklkZW50aWZpZXIgPSB0aGlzLl9kYXRhR3JpZC5zb3J0 Q29sdW1uSWRlbnRpZmllcjsKICAgICAgICAgdmFyIHNvcnRGaWVsZHMgPSB7CiAgICAgICAgICAg ICBvYmplY3Q6IFsiaWQiLCBzb3J0QXNjZW5kaW5nLCAicmV0YWluZWRTaXplIiwgZmFsc2VdLAot ICAgICAgICAgICAgZGlzdGFuY2VUb1dpbmRvdzogWyJkaXN0YW5jZVRvV2luZG93IiwgdHJ1ZSwg InJldGFpbmVkU2l6ZSIsIGZhbHNlXSwKKyAgICAgICAgICAgIGRpc3RhbmNlOiBbImRpc3RhbmNl IiwgdHJ1ZSwgInJldGFpbmVkU2l6ZSIsIGZhbHNlXSwKICAgICAgICAgICAgIGNvdW50OiBbImlk IiwgdHJ1ZSwgInJldGFpbmVkU2l6ZSIsIGZhbHNlXSwKICAgICAgICAgICAgIHNoYWxsb3dTaXpl OiBbInNlbGZTaXplIiwgc29ydEFzY2VuZGluZywgImlkIiwgdHJ1ZV0sCiAgICAgICAgICAgICBy ZXRhaW5lZFNpemU6IFsicmV0YWluZWRTaXplIiwgc29ydEFzY2VuZGluZywgImlkIiwgdHJ1ZV0K QEAgLTgyNiw3ICs4MjYsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Q29uc3RydWN0b3JO b2RlLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHZhciBkYXRhID0geyBvYmplY3Q6IHRo aXMuX25hbWUgfTsKICAgICAgICAgZGF0YVsiY291bnQiXSA9ICBOdW1iZXIud2l0aFRob3VzYW5k c1NlcGFyYXRvcih0aGlzLl9jb3VudCk7Ci0gICAgICAgIGRhdGFbImRpc3RhbmNlVG9XaW5kb3ci XSA9ICB0aGlzLl9kaXN0YW5jZVRvV2luZG93OworICAgICAgICBkYXRhWyJkaXN0YW5jZSJdID0g IHRoaXMuX2Rpc3RhbmNlOwogICAgICAgICBkYXRhWyJzaGFsbG93U2l6ZSJdID0gTnVtYmVyLndp dGhUaG91c2FuZHNTZXBhcmF0b3IodGhpcy5fc2hhbGxvd1NpemUpOwogICAgICAgICBkYXRhWyJy ZXRhaW5lZFNpemUiXSA9IE51bWJlci53aXRoVGhvdXNhbmRzU2VwYXJhdG9yKHRoaXMuX3JldGFp bmVkU2l6ZSk7CiAgICAgICAgIGRhdGFbImNvdW50LXBlcmNlbnQiXSA9ICB0aGlzLl90b1BlcmNl bnRTdHJpbmcodGhpcy5fY291bnRQZXJjZW50KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvSlNIZWFwU25hcHNob3QuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0pTSGVhcFNuYXBzaG90LmpzCmluZGV4IDk0MTY2OTBmYzZjZDIz NGE5MjA3NmFlOWYzY2Y2MjRkYTJlZThmYWMuLjk0ODBiYTM0OTkwMmRiMzhhYjkyMTMyNGJmNjI2 NGM1NzYzMTlmMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvSlNIZWFwU25hcHNob3QuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9KU0hlYXBTbmFwc2hvdC5qcwpAQCAtMTAyLDYgKzEwMiwxMSBAQCBXZWJJbnNwZWN0b3Iu SlNIZWFwU25hcHNob3QucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9tYXJrUGFnZU93bmVk Tm9kZXMoKTsKICAgICB9LAogCisgICAgY2FuSGF2ZURpc3RhbmNlT25lOiBmdW5jdGlvbihub2Rl KQorICAgIHsKKyAgICAgICAgcmV0dXJuIG5vZGUuaXNXaW5kb3coKTsKKyAgICB9LAorCiAgICAg dXNlck9iamVjdHNNYXBBbmRGbGFnOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICByZXR1cm4g ewpAQCAtMjY3LDExICsyNzIsNiBAQCBXZWJJbnNwZWN0b3IuSlNIZWFwU25hcHNob3ROb2RlLnBy b3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuICEhKGZsYWdzICYgdGhpcy5fc25hcHNob3QuX25v ZGVGbGFncy5wYWdlT2JqZWN0KTsKICAgICB9LAogCi0gICAgZGlzdGFuY2VUb1dpbmRvdzogZnVu Y3Rpb24oKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3NuYXBzaG90Ll9kaXN0YW5jZXNU b1dpbmRvd1t0aGlzLm5vZGVJbmRleCAvIHRoaXMuX3NuYXBzaG90Ll9ub2RlRmllbGRDb3VudF07 Ci0gICAgfSwKLQogICAgIGNsYXNzTmFtZTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdmFy IHR5cGUgPSB0aGlzLnR5cGUoKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjNDI4ZmY0MTlkMWUyY2JiZTlhYzI0YjBkNGU0 NmMyM2IwYjY3OThiLi43NmE2ZDRhMjc5YTUwMDliOWE1MWEwNzlmYmNjNTUwN2UyOWRjYjRmIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMTItMjggIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5 c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcmVuYW1lIGRpc3RhbmNl VG9XaW5kb3cgdG8gZGlzdGFuY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwNTgyMworCisgICAgICAgIFVwZGF0ZWQgdGVzdHMgYWZ0ZXIgcmVuYW1p bmcgZGlzdGFuY2VUb1dpbmRvdyB0byBkaXN0YW5jZS4KKworICAgICAgICAqIGluc3BlY3Rvci9w cm9maWxlci9oZWFwLXNuYXBzaG90LXN1bW1hcnktc29ydGluZy1maWVsZHMuaHRtbDoKKyAgICAg ICAgKiBpbnNwZWN0b3IvcHJvZmlsZXIvaGVhcC1zbmFwc2hvdC1zdW1tYXJ5LXNvcnRpbmctaW5z dGFuY2VzLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL3Byb2ZpbGVyL2hlYXAtc25hcHNob3Qt c3VtbWFyeS1zb3J0aW5nLmh0bWw6CisKIDIwMTItMTItMjcgIE1pa2UgV2VzdCAgPG1rd3N0QGNo cm9taXVtLm9yZz4KIAogICAgICAgICBBZGQgY29udGV4dCB0byB0aGUgY29uc29sZSBtZXNzYWdl IGdlbmVyYXRlZCBieSBEb2N1bWVudDo6cHJpbnROYXZpZ2F0aW9uRXJyb3JNZXNzYWdlLgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb2ZpbGVyL2hlYXAtc25hcHNob3Qtc3Vt bWFyeS1zb3J0aW5nLWZpZWxkcy5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb2ZpbGVy L2hlYXAtc25hcHNob3Qtc3VtbWFyeS1zb3J0aW5nLWZpZWxkcy5odG1sCmluZGV4IDgyMGRiZTBj ZDNiNWEwODQwOWYxNTk2ZDljZjAwYzg4MzE0NTZlZWEuLmEzMmVkNDU4NmU1MTc0ZTkzMTMwNDdj Y2Y1MTU5ODJmNzY0YWQ4NzcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm9m aWxlci9oZWFwLXNuYXBzaG90LXN1bW1hcnktc29ydGluZy1maWVsZHMuaHRtbAorKysgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvcHJvZmlsZXIvaGVhcC1zbmFwc2hvdC1zdW1tYXJ5LXNvcnRpbmct ZmllbGRzLmh0bWwKQEAgLTY1LDcgKzY1LDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgICAg ICAgICAgdmFyIGNvbHVtbk5hbWUgPSBjb2x1bW5zW2N1cnJlbnRDb2x1bW5dLmlkZW50aWZpZXI7 CiAgICAgICAgICAgICAgICAgdmFyIGNvbnRlbnRzID0gd2luZG93Um93LmNoaWxkcmVuLm1hcChm dW5jdGlvbihvYmopIHsgcmV0dXJuIEpTT04uc3RyaW5naWZ5KG9iai5kYXRhW2NvbHVtbk5hbWVd KTsgfSk7CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoaW5zdGFu Y2VDb3VudCwgY29udGVudHMubGVuZ3RoLCAiY29sdW1uIGNvbnRlbnRzIik7Ci0gICAgICAgICAg ICAgICAgdmFyIHNvcnRUeXBlcyA9IHsgb2JqZWN0OiAidGV4dCIsIGRpc3RhbmNlVG9XaW5kb3c6 ICJudW1iZXIiLCBjb3VudDogIm51bWJlciIsIHNoYWxsb3dTaXplOiAic2l6ZSIsIHJldGFpbmVk U2l6ZTogInNpemUiIH07CisgICAgICAgICAgICAgICAgdmFyIHNvcnRUeXBlcyA9IHsgb2JqZWN0 OiAidGV4dCIsIGRpc3RhbmNlOiAibnVtYmVyIiwgY291bnQ6ICJudW1iZXIiLCBzaGFsbG93U2l6 ZTogInNpemUiLCByZXRhaW5lZFNpemU6ICJzaXplIiB9OwogICAgICAgICAgICAgICAgIEluc3Bl Y3RvclRlc3QuYXNzZXJ0RXF1YWxzKHRydWUsICEhc29ydFR5cGVzW2NvbHVtbnNbY3VycmVudENv bHVtbl0uaWRlbnRpZmllcl0sICJzb3J0IGJ5IGlkZW50aWZpZXIiKTsKICAgICAgICAgICAgICAg ICBJbnNwZWN0b3JUZXN0LmNoZWNrQXJyYXlJc1NvcnRlZChjb250ZW50cywgc29ydFR5cGVzW2Nv bHVtbnNbY3VycmVudENvbHVtbl0uaWRlbnRpZmllcl0sIGNvbHVtbnNbY3VycmVudENvbHVtbl0u c29ydCk7CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm9maWxlci9oZWFw LXNuYXBzaG90LXN1bW1hcnktc29ydGluZy1pbnN0YW5jZXMuaHRtbCBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci9wcm9maWxlci9oZWFwLXNuYXBzaG90LXN1bW1hcnktc29ydGluZy1pbnN0YW5jZXMu aHRtbAppbmRleCA0YjNjODRhNGQyNDVmMzNjNTQwMDYzMzUzN2EyZjBlZGE2YWVkM2Y1Li4wYTI1 NTU5MjM4ZjU1NTk5MmYxZTJmOTAxMjgxYmU4ZjM4ODkzNWM1IDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvcHJvZmlsZXIvaGVhcC1zbmFwc2hvdC1zdW1tYXJ5LXNvcnRpbmctaW5z dGFuY2VzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb2ZpbGVyL2hlYXAtc25h cHNob3Qtc3VtbWFyeS1zb3J0aW5nLWluc3RhbmNlcy5odG1sCkBAIC01OSw3ICs1OSw3IEBAIGZ1 bmN0aW9uIHRlc3QoKQogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxz KHRydWUsICEhcm93LCAiXCJCXCIgcm93Iik7CiAgICAgICAgICAgICAgICAgdmFyIGNvbnRlbnRz ID0gcm93LmNoaWxkcmVuLm1hcChmdW5jdGlvbihvYmopIHsgcmV0dXJuIEpTT04uc3RyaW5naWZ5 KG9iai5kYXRhW2NvbHVtbk5hbWVdKTsgfSk7CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5hc3NlcnRFcXVhbHMoaW5zdGFuY2VDb3VudCwgY29udGVudHMubGVuZ3RoLCAiY29sdW1uIGNv bnRlbnRzIik7Ci0gICAgICAgICAgICAgICAgdmFyIHNvcnRUeXBlcyA9IHsgb2JqZWN0OiAidGV4 dCIsIGRpc3RhbmNlVG9XaW5kb3c6ICJudW1iZXIiLCBjb3VudDogIm51bWJlciIsIHNoYWxsb3dT aXplOiAic2l6ZSIsIHJldGFpbmVkU2l6ZTogInNpemUiIH07CisgICAgICAgICAgICAgICAgdmFy IHNvcnRUeXBlcyA9IHsgb2JqZWN0OiAidGV4dCIsIGRpc3RhbmNlOiAibnVtYmVyIiwgY291bnQ6 ICJudW1iZXIiLCBzaGFsbG93U2l6ZTogInNpemUiLCByZXRhaW5lZFNpemU6ICJzaXplIiB9Owog ICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxzKHRydWUsICEhc29ydFR5 cGVzW2NvbHVtbnNbY3VycmVudENvbHVtbl0uaWRlbnRpZmllcl0sICJzb3J0IGJ5IGlkZW50aWZp ZXIiKTsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmNoZWNrQXJyYXlJc1NvcnRlZChj b250ZW50cywgc29ydFR5cGVzW2NvbHVtbnNbY3VycmVudENvbHVtbl0uaWRlbnRpZmllcl0sIGNv bHVtbnNbY3VycmVudENvbHVtbl0uc29ydCk7CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci9wcm9maWxlci9oZWFwLXNuYXBzaG90LXN1bW1hcnktc29ydGluZy5odG1sIGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL3Byb2ZpbGVyL2hlYXAtc25hcHNob3Qtc3VtbWFyeS1zb3J0aW5n Lmh0bWwKaW5kZXggZDZjMTIzNTljNDU1Mjc2OTJlMzM5MGVmYTY0MzlmODBlNjliNTA4MS4uYWRh ZjI2OTc2Y2M4ZDM3NDgxNGFmNDg1NzZkZjFhYzVhNThiMjhmNyAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL3Byb2ZpbGVyL2hlYXAtc25hcHNob3Qtc3VtbWFyeS1zb3J0aW5nLmh0 bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb2ZpbGVyL2hlYXAtc25hcHNob3Qtc3Vt bWFyeS1zb3J0aW5nLmh0bWwKQEAgLTQ5LDcgKzQ5LDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAg ICAgICAgICAgICAgY29sdW1uc1tjdXJyZW50Q29sdW1uXSA9IG5ld0NvbHVtblN0YXRlOwogICAg ICAgICAgICAgICAgIHZhciBjb250ZW50cyA9IEluc3BlY3RvclRlc3QuY29sdW1uQ29udGVudHMo Y29sdW1uc1tjdXJyZW50Q29sdW1uXSk7CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5h c3NlcnRFcXVhbHModHJ1ZSwgISFjb250ZW50cy5sZW5ndGgsICJjb2x1bW4gY29udGVudHMiKTsK LSAgICAgICAgICAgICAgICB2YXIgc29ydFR5cGVzID0geyBvYmplY3Q6ICJ0ZXh0IiwgZGlzdGFu Y2VUb1dpbmRvdzogIm51bWJlciIsIGNvdW50OiAibnVtYmVyIiwgc2hhbGxvd1NpemU6ICJzaXpl IiwgcmV0YWluZWRTaXplOiAic2l6ZSIgfTsKKyAgICAgICAgICAgICAgICB2YXIgc29ydFR5cGVz ID0geyBvYmplY3Q6ICJ0ZXh0IiwgZGlzdGFuY2U6ICJudW1iZXIiLCBjb3VudDogIm51bWJlciIs IHNoYWxsb3dTaXplOiAic2l6ZSIsIHJldGFpbmVkU2l6ZTogInNpemUiIH07CiAgICAgICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHModHJ1ZSwgISFzb3J0VHlwZXNbY29sdW1u c1tjdXJyZW50Q29sdW1uXS5pZGVudGlmaWVyXSwgInNvcnQgYnkgaWRlbnRpZmllciIpOwogICAg ICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuY2hlY2tBcnJheUlzU29ydGVkKGNvbnRlbnRzLCBz b3J0VHlwZXNbY29sdW1uc1tjdXJyZW50Q29sdW1uXS5pZGVudGlmaWVyXSwgY29sdW1uc1tjdXJy ZW50Q29sdW1uXS5zb3J0KTsKIApkaWZmIC0tZ2l0IGEvUGVyZm9ybWFuY2VUZXN0cy9DaGFuZ2VM b2cgYi9QZXJmb3JtYW5jZVRlc3RzL0NoYW5nZUxvZwppbmRleCA3MzliOWRmOGRkNmJiOWU2ZDE5 MzI2OWFlMTIzMTE5MzQ1YmEyYmQ5Li5iZTVmY2E2NDk2NzM5MmZhMGM1YWM0ZTQ5ZmUyNjAzYTQ4 YmFhZmRiIDEwMDY0NAotLS0gYS9QZXJmb3JtYW5jZVRlc3RzL0NoYW5nZUxvZworKysgYi9QZXJm b3JtYW5jZVRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDEyLTEyLTI4ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHJlbmFtZSBkaXN0YW5jZVRvV2luZG93IHRvIGRpc3RhbmNlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDU4MjMKKworICAgICAgICBVcGRhdGVk IGhlYXAgcHJvZmlsZXIgcGVyZm9ybWFuY2UgdGVzdCBhZnRlciByZW5hbWluZyBkaXN0YW5jZVRv V2luZG93IHRvIGRpc3RhbmNlLgorCisgICAgICAgICogaW5zcGVjdG9yL2hlYXAtc25hcHNob3Qt cGVyZm9ybWFuY2UtdGVzdC5qczoKKwogMjAxMi0xMi0xOCAgSGF5YXRvIEl0byAgPGhheWF0b0Bj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgVXNlIGVsZW1lbnQud2Via2l0Q3JlYXRlU2hhZG93Um9v dCBpbnN0ZWFkIG9mIFdlYktpdFNoYWRvd1Jvb3QgaW4gUGVyZm9ybWFuY2VUZXN0cy4KZGlmZiAt LWdpdCBhL1BlcmZvcm1hbmNlVGVzdHMvaW5zcGVjdG9yL2hlYXAtc25hcHNob3QtcGVyZm9ybWFu Y2UtdGVzdC5qcyBiL1BlcmZvcm1hbmNlVGVzdHMvaW5zcGVjdG9yL2hlYXAtc25hcHNob3QtcGVy Zm9ybWFuY2UtdGVzdC5qcwppbmRleCA2NDJjNzZkMGIyZGEzY2NiMmU0M2Y1ZWFiYmE0NTNiZTcx ZDZmMWFkLi4yMjg2NDg2ZTViOThhYzU3ZTA3NDg5YWRjNTdjOGI2MmUxNDE2NDcyIDEwMDY0NAot LS0gYS9QZXJmb3JtYW5jZVRlc3RzL2luc3BlY3Rvci9oZWFwLXNuYXBzaG90LXBlcmZvcm1hbmNl LXRlc3QuanMKKysrIGIvUGVyZm9ybWFuY2VUZXN0cy9pbnNwZWN0b3IvaGVhcC1zbmFwc2hvdC1w ZXJmb3JtYW5jZS10ZXN0LmpzCkBAIC03LDcgKzcsNyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICBJ bnNwZWN0b3JUZXN0Lm1lYXN1cmVGdW5jdGlvbihXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90LnBy b3RvdHlwZSwgIl9jYWxjdWxhdGVGbGFncyIpOwogICAgIEluc3BlY3RvclRlc3QubWVhc3VyZUZ1 bmN0aW9uKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3QucHJvdG90eXBlLCAiX2J1aWxkQWdncmVn YXRlcyIpOwogICAgIEluc3BlY3RvclRlc3QubWVhc3VyZUZ1bmN0aW9uKFdlYkluc3BlY3Rvci5I ZWFwU25hcHNob3QucHJvdG90eXBlLCAiX2NhbGN1bGF0ZUNsYXNzZXNSZXRhaW5lZFNpemUiKTsK LSAgICBJbnNwZWN0b3JUZXN0Lm1lYXN1cmVGdW5jdGlvbihXZWJJbnNwZWN0b3IuSGVhcFNuYXBz aG90LnByb3RvdHlwZSwgIl9jYWxjdWxhdGVPYmplY3RUb1dpbmRvd0Rpc3RhbmNlIik7CisgICAg SW5zcGVjdG9yVGVzdC5tZWFzdXJlRnVuY3Rpb24oV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5w cm90b3R5cGUsICJfY2FsY3VsYXRlRGlzdGFuY2VzIik7CiAgICAgSW5zcGVjdG9yVGVzdC5tZWFz dXJlRnVuY3Rpb24oV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUsICJfY2FsY3Vs YXRlUmV0YWluZWRTaXplcyIpOwogICAgIEluc3BlY3RvclRlc3QubWVhc3VyZUZ1bmN0aW9uKFdl Ykluc3BlY3Rvci5IZWFwU25hcHNob3QucHJvdG90eXBlLCAiX21hcmtEZXRhY2hlZERPTVRyZWVO b2RlcyIpOwogICAgIEluc3BlY3RvclRlc3QubWVhc3VyZUZ1bmN0aW9uKFdlYkluc3BlY3Rvci5I ZWFwU25hcHNob3QucHJvdG90eXBlLCAiX21hcmtRdWVyaWFibGVIZWFwT2JqZWN0cyIpOwo=