106696 2013-01-11 13:38:55 -0800 Allow nesting of at-rules 2013-01-14 01:51:26 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED WebExposed P2 Normal --- 104822 1 pf pf allan.jensen buildbot cmarcelo dglazkov koivisto macpherson menard ojan.autocc rniwa webkit.review.bot oldest_to_newest 805580 0 pf 2013-01-11 13:38:55 -0800 http://dev.w3.org/csswg/css3-conditional/#processing introduces the concept of grouping rules, and allows for them to be nested. In particular, this change affects @media (and is needed for @supports as well). 805634 1 182420 pf 2013-01-11 14:48:22 -0800 Created attachment 182420 Patch 805702 2 182420 buildbot 2013-01-11 15:49:52 -0800 Comment on attachment 182420 Patch Attachment 182420 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/15830071 805760 3 182420 webkit.review.bot 2013-01-11 17:01:41 -0800 Comment on attachment 182420 Patch Attachment 182420 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/15833079 New failing tests: fast/text/international/hindi-spacing.html 805773 4 182450 pf 2013-01-11 17:28:03 -0800 Created attachment 182450 Patch 806162 5 182450 allan.jensen 2013-01-14 01:40:54 -0800 Comment on attachment 182450 Patch Looks good, it even cleans up code duplication. 806167 6 182450 webkit.review.bot 2013-01-14 01:51:22 -0800 Comment on attachment 182450 Patch Clearing flags on attachment: 182450 Committed r139594: <http://trac.webkit.org/changeset/139594> 806168 7 webkit.review.bot 2013-01-14 01:51:26 -0800 All reviewed patches have been landed. Closing bug. 182420 2013-01-11 14:48:22 -0800 2013-01-11 17:28:00 -0800 Patch bug-106696-20130111144525.patch text/plain 13838 pf U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTA3M2JiZTMxOWY5NjM4 NTgxOTlmMjcyZDgwMDg5ZTMwMjMwMjViZC4uNGM3ZWNhMGIwZDY4Y2FkMGMzOGQ1MTVkZmI3NjE2 MmEzNDZmMWQyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTAxLTExICBQYWJs byBGbG91cmV0ICA8cGFibG9mQG1vdG9yb2xhLmNvbT4KKworICAgICAgICBBbGxvdyBuZXN0aW5n IG9mIGF0LXJ1bGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMDY2OTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBodHRwOi8vZGV2LnczLm9yZy9jc3N3Zy9jc3MzLWNvbmRpdGlvbmFsLyBpbnRyb2R1Y2Vz IHRoZQorICAgICAgICBjb25jZXB0IG9mIGdyb3VwaW5nIHJ1bGVzLCBhbmQgYWxsb3dzIGZvciB0 aGVtIHRvIGJlIG5lc3RlZC4gSW4KKyAgICAgICAgcGFydGljdWxhciwgdGhpcyBjaGFuZ2UgYWZm ZWN0cyBAbWVkaWEgKGFuZCBpcyBuZWVkZWQgZm9yIEBzdXBwb3J0cyBhcworICAgICAgICB3ZWxs KS4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy9uZXN0ZWQtYXQtcnVsZXMuaHRtbAorCisgICAg ICAgICogY3NzL1J1bGVTZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UnVsZVNldDo6YWRkUmVn aW9uUnVsZSk6CisgICAgICAgIChXZWJDb3JlOjpSdWxlU2V0OjphZGRDaGlsZFJ1bGVzKToKKyAg ICAgICAgKFdlYkNvcmU6OlJ1bGVTZXQ6OmFkZFJ1bGVzRnJvbVNoZWV0KToKKyAgICAgICAgKiBj c3MvUnVsZVNldC5oOgorICAgICAgICAgICAgUmlwIG91dCB0aGUgcnVsZS1hZGRpbmcgbG9vcCBp bnRvIGEgbmV3IG1ldGhvZCwgZm9yIGFkZGVkCisgICAgICAgICAgICBjbGVhbmxpbmVzcyBhbmQg cmVjdXJzaW5nLgorCiAyMDEzLTAxLTExICBUb255IEdlbnRpbGNvcmUgIDx0b255Z0BjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgV2Ugc2hvdWxkIGJlIGFibGUgdG8gY2hlY2twb2ludCBhbmQgcmVz dG9yZSB0aGUgSFRNTFRva2VuaXplciBhY3Jvc3MgdGhyZWFkcwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvY3NzL1J1bGVTZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1J1bGVTZXQuY3Bw CmluZGV4IGQ4NDAwNGQ5Y2NjMTQ4NDNlNGI0MGE2YmQ2MmFjNzJhOGRmYjIyZWIuLjg3YTA5YjBk YzNlNGNhM2I1ZDU5MjAzMTQyNTdlZjYzMGNmZjU4ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9SdWxlU2V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvUnVsZVNldC5jcHAK QEAgLTI1NSw2ICsyNTUsNyBAQCB2b2lkIFJ1bGVTZXQ6OmFkZFJlZ2lvblJ1bGUoU3R5bGVSdWxl UmVnaW9uKiByZWdpb25SdWxlLCBib29sIGhhc0RvY3VtZW50U2VjdXJpdAogICAgIHJlZ2lvblJ1 bGVTZXQtPm1fcnVsZUNvdW50ID0gbV9ydWxlQ291bnQ7CiAKICAgICAvLyBDb2xsZWN0IHRoZSBy ZWdpb24gcnVsZXMgaW50byBhIHJ1bGUgc2V0CisgICAgLy8gRklYTUU6IFNob3VsZCB0aGlzIGFk ZCBvdGhlciB0eXBlcyBvZiBydWxlcz8gKGkuZS4gdXNlIGFkZENoaWxkUnVsZXMoKSBkaXJlY3Rs eT8pCiAgICAgY29uc3QgVmVjdG9yPFJlZlB0cjxTdHlsZVJ1bGVCYXNlPiA+JiBjaGlsZFJ1bGVz ID0gcmVnaW9uUnVsZS0+Y2hpbGRSdWxlcygpOwogICAgIEFkZFJ1bGVGbGFncyBhZGRSdWxlRmxh Z3MgPSBoYXNEb2N1bWVudFNlY3VyaXR5T3JpZ2luID8gUnVsZUhhc0RvY3VtZW50U2VjdXJpdHlP cmlnaW4gOiBSdWxlSGFzTm9TcGVjaWFsU3RhdGU7CiAgICAgYWRkUnVsZUZsYWdzID0gc3RhdGlj X2Nhc3Q8QWRkUnVsZUZsYWdzPihhZGRSdWxlRmxhZ3MgfCBSdWxlQ2FuVXNlRmFzdENoZWNrU2Vs ZWN0b3IgfCBSdWxlSXNJblJlZ2lvblJ1bGUpOwpAQCAtMjY5LDcwICsyNzAsMjEgQEAgdm9pZCBS dWxlU2V0OjphZGRSZWdpb25SdWxlKFN0eWxlUnVsZVJlZ2lvbiogcmVnaW9uUnVsZSwgYm9vbCBo YXNEb2N1bWVudFNlY3VyaXQKICAgICBtX3JlZ2lvblNlbGVjdG9yc0FuZFJ1bGVTZXRzLmFwcGVu ZChSdWxlU2V0U2VsZWN0b3JQYWlyKHJlZ2lvblJ1bGUtPnNlbGVjdG9yTGlzdCgpLmZpcnN0KCks IHJlZ2lvblJ1bGVTZXQucmVsZWFzZSgpKSk7CiB9CiAKLXZvaWQgUnVsZVNldDo6YWRkUnVsZXNG cm9tU2hlZXQoU3R5bGVTaGVldENvbnRlbnRzKiBzaGVldCwgY29uc3QgTWVkaWFRdWVyeUV2YWx1 YXRvciYgbWVkaXVtLCBTdHlsZVJlc29sdmVyKiByZXNvbHZlciwgY29uc3QgQ29udGFpbmVyTm9k ZSogc2NvcGUpCit2b2lkIFJ1bGVTZXQ6OmFkZENoaWxkUnVsZXMoY29uc3QgVmVjdG9yPFJlZlB0 cjxTdHlsZVJ1bGVCYXNlPiA+JiBydWxlcywgY29uc3QgTWVkaWFRdWVyeUV2YWx1YXRvciYgbWVk aXVtLCBTdHlsZVJlc29sdmVyKiByZXNvbHZlciwgY29uc3QgQ29udGFpbmVyTm9kZSogc2NvcGUs IGJvb2wgaGFzRG9jdW1lbnRTZWN1cml0eU9yaWdpbiwgQWRkUnVsZUZsYWdzIGFkZFJ1bGVGbGFn cywgYm9vbCBpc1dpdGhpbk5lc3RlZFJ1bGUpCiB7Ci0gICAgQVNTRVJUKHNoZWV0KTsKLSAgICAK LSAgICBjb25zdCBWZWN0b3I8UmVmUHRyPFN0eWxlUnVsZUltcG9ydD4gPiYgaW1wb3J0UnVsZXMg PSBzaGVldC0+aW1wb3J0UnVsZXMoKTsKLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgaW1w b3J0UnVsZXMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgU3R5bGVSdWxlSW1wb3J0KiBpbXBvcnRS dWxlID0gaW1wb3J0UnVsZXNbaV0uZ2V0KCk7Ci0gICAgICAgIGlmIChpbXBvcnRSdWxlLT5zdHls ZVNoZWV0KCkgJiYgKCFpbXBvcnRSdWxlLT5tZWRpYVF1ZXJpZXMoKSB8fCBtZWRpdW0uZXZhbChp bXBvcnRSdWxlLT5tZWRpYVF1ZXJpZXMoKSwgcmVzb2x2ZXIpKSkKLSAgICAgICAgICAgIGFkZFJ1 bGVzRnJvbVNoZWV0KGltcG9ydFJ1bGUtPnN0eWxlU2hlZXQoKSwgbWVkaXVtLCByZXNvbHZlciwg c2NvcGUpOwotICAgIH0KLSAgICBib29sIGhhc0RvY3VtZW50U2VjdXJpdHlPcmlnaW4gPSByZXNv bHZlciAmJiByZXNvbHZlci0+ZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKS0+Y2FuUmVxdWVz dChzaGVldC0+YmFzZVVSTCgpKTsKLSAgICBBZGRSdWxlRmxhZ3MgYWRkUnVsZUZsYWdzID0gc3Rh dGljX2Nhc3Q8QWRkUnVsZUZsYWdzPigoaGFzRG9jdW1lbnRTZWN1cml0eU9yaWdpbiA/IFJ1bGVI YXNEb2N1bWVudFNlY3VyaXR5T3JpZ2luIDogMCkgfCAoIXNjb3BlID8gUnVsZUNhblVzZUZhc3RD aGVja1NlbGVjdG9yIDogMCkpOwotCi0gICAgY29uc3QgVmVjdG9yPFJlZlB0cjxTdHlsZVJ1bGVC YXNlPiA+JiBydWxlcyA9IHNoZWV0LT5jaGlsZFJ1bGVzKCk7CiAgICAgZm9yICh1bnNpZ25lZCBp ID0gMDsgaSA8IHJ1bGVzLnNpemUoKTsgKytpKSB7CiAgICAgICAgIFN0eWxlUnVsZUJhc2UqIHJ1 bGUgPSBydWxlc1tpXS5nZXQoKTsKIAotICAgICAgICBBU1NFUlQoIXJ1bGUtPmlzSW1wb3J0UnVs ZSgpKTsKKyAgICAgICAgQVNTRVJUKGlzV2l0aGluTmVzdGVkUnVsZSB8fCAhcnVsZS0+aXNJbXBv cnRSdWxlKCkpOworCiAgICAgICAgIGlmIChydWxlLT5pc1N0eWxlUnVsZSgpKQogICAgICAgICAg ICAgYWRkU3R5bGVSdWxlKHN0YXRpY19jYXN0PFN0eWxlUnVsZSo+KHJ1bGUpLCBhZGRSdWxlRmxh Z3MpOwogICAgICAgICBlbHNlIGlmIChydWxlLT5pc1BhZ2VSdWxlKCkpCiAgICAgICAgICAgICBh ZGRQYWdlUnVsZShzdGF0aWNfY2FzdDxTdHlsZVJ1bGVQYWdlKj4ocnVsZSkpOwogICAgICAgICBl bHNlIGlmIChydWxlLT5pc01lZGlhUnVsZSgpKSB7CiAgICAgICAgICAgICBTdHlsZVJ1bGVNZWRp YSogbWVkaWFSdWxlID0gc3RhdGljX2Nhc3Q8U3R5bGVSdWxlTWVkaWEqPihydWxlKTsKLQotICAg ICAgICAgICAgaWYgKCghbWVkaWFSdWxlLT5tZWRpYVF1ZXJpZXMoKSB8fCBtZWRpdW0uZXZhbCht ZWRpYVJ1bGUtPm1lZGlhUXVlcmllcygpLCByZXNvbHZlcikpKSB7Ci0gICAgICAgICAgICAgICAg Ly8gVHJhdmVyc2UgY2hpbGQgZWxlbWVudHMgb2YgdGhlIEBtZWRpYSBydWxlLgotICAgICAgICAg ICAgICAgIGNvbnN0IFZlY3RvcjxSZWZQdHI8U3R5bGVSdWxlQmFzZT4gPiYgY2hpbGRSdWxlcyA9 IG1lZGlhUnVsZS0+Y2hpbGRSdWxlcygpOwotICAgICAgICAgICAgICAgIGZvciAodW5zaWduZWQg aiA9IDA7IGogPCBjaGlsZFJ1bGVzLnNpemUoKTsgKytqKSB7Ci0gICAgICAgICAgICAgICAgICAg IFN0eWxlUnVsZUJhc2UqIGNoaWxkUnVsZSA9IGNoaWxkUnVsZXNbal0uZ2V0KCk7Ci0gICAgICAg ICAgICAgICAgICAgIGlmIChjaGlsZFJ1bGUtPmlzU3R5bGVSdWxlKCkpCi0gICAgICAgICAgICAg ICAgICAgICAgICBhZGRTdHlsZVJ1bGUoc3RhdGljX2Nhc3Q8U3R5bGVSdWxlKj4oY2hpbGRSdWxl KSwgYWRkUnVsZUZsYWdzKTsKLSAgICAgICAgICAgICAgICAgICAgZWxzZSBpZiAoY2hpbGRSdWxl LT5pc1BhZ2VSdWxlKCkpCi0gICAgICAgICAgICAgICAgICAgICAgICBhZGRQYWdlUnVsZShzdGF0 aWNfY2FzdDxTdHlsZVJ1bGVQYWdlKj4oY2hpbGRSdWxlKSk7Ci0gICAgICAgICAgICAgICAgICAg IGVsc2UgaWYgKGNoaWxkUnVsZS0+aXNGb250RmFjZVJ1bGUoKSAmJiByZXNvbHZlcikgewotICAg ICAgICAgICAgICAgICAgICAgICAgLy8gQWRkIHRoaXMgZm9udCBmYWNlIHRvIG91ciBzZXQuCi0g ICAgICAgICAgICAgICAgICAgICAgICAvLyBGSVhNRShCVUcgNzI0NjEpOiBXZSBkb24ndCBhZGQg QGZvbnQtZmFjZSBydWxlcyBvZiBzY29wZWQgc3R5bGUgc2hlZXRzIGZvciB0aGUgbW9tZW50Lgot ICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHNjb3BlKQotICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgU3R5bGVSdWxl Rm9udEZhY2UqIGZvbnRGYWNlUnVsZSA9IHN0YXRpY19jYXN0PFN0eWxlUnVsZUZvbnRGYWNlKj4o Y2hpbGRSdWxlKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIHJlc29sdmVyLT5mb250U2VsZWN0 b3IoKS0+YWRkRm9udEZhY2VSdWxlKGZvbnRGYWNlUnVsZSk7Ci0gICAgICAgICAgICAgICAgICAg ICAgICByZXNvbHZlci0+aW52YWxpZGF0ZU1hdGNoZWRQcm9wZXJ0aWVzQ2FjaGUoKTsKLSAgICAg ICAgICAgICAgICAgICAgfSBlbHNlIGlmIChjaGlsZFJ1bGUtPmlzS2V5ZnJhbWVzUnVsZSgpICYm IHJlc29sdmVyKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAvLyBBZGQgdGhpcyBrZXlmcmFt ZSBydWxlIHRvIG91ciBzZXQuCi0gICAgICAgICAgICAgICAgICAgICAgICAvLyBGSVhNRShCVUcg NzI0NjIpOiBXZSBkb24ndCBhZGQgQGtleWZyYW1lIHJ1bGVzIG9mIHNjb3BlZCBzdHlsZSBzaGVl dHMgZm9yIHRoZSBtb21lbnQuCi0gICAgICAgICAgICAgICAgICAgICAgICBpZiAoc2NvcGUpCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICAgICAgICAg ICAgICByZXNvbHZlci0+YWRkS2V5ZnJhbWVTdHlsZShzdGF0aWNfY2FzdDxTdHlsZVJ1bGVLZXlm cmFtZXMqPihjaGlsZFJ1bGUpKTsKLSAgICAgICAgICAgICAgICAgICAgfSBlbHNlIGlmIChjaGls ZFJ1bGUtPmlzUmVnaW9uUnVsZSgpICYmIHJlc29sdmVyKSB7Ci0gICAgICAgICAgICAgICAgICAg ICAgICAvLyBGSVhNRSAoQlVHIDcyNDcyKTogV2UgZG9uJ3QgYWRkIEAtd2Via2l0LXJlZ2lvbiBy dWxlcyBvZiBzY29wZWQgc3R5bGUgc2hlZXRzIGZvciB0aGUgbW9tZW50LgotICAgICAgICAgICAg ICAgICAgICAgICAgaWYgKHNjb3BlKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRp bnVlOwotICAgICAgICAgICAgICAgICAgICAgICAgYWRkUmVnaW9uUnVsZShzdGF0aWNfY2FzdDxT dHlsZVJ1bGVSZWdpb24qPihjaGlsZFJ1bGUpLCBoYXNEb2N1bWVudFNlY3VyaXR5T3JpZ2luKTsK LSAgICAgICAgICAgICAgICAgICAgfQotI2lmIEVOQUJMRShDU1NfREVWSUNFX0FEQVBUQVRJT04p Ci0gICAgICAgICAgICAgICAgICAgIGVsc2UgaWYgKGNoaWxkUnVsZS0+aXNWaWV3cG9ydFJ1bGUo KSAmJiByZXNvbHZlciAmJiAhcmVzb2x2ZXItPmFmZmVjdGVkQnlWaWV3cG9ydENoYW5nZSgpKSB7 Ci0gICAgICAgICAgICAgICAgICAgICAgICAvLyBAdmlld3BvcnQgc2hvdWxkIG5vdCBiZSBzY29w ZWQuCi0gICAgICAgICAgICAgICAgICAgICAgICBpZiAoc2NvcGUpCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICAgICAgICAgICAgICByZXNvbHZlci0+ dmlld3BvcnRTdHlsZVJlc29sdmVyKCktPmFkZFZpZXdwb3J0UnVsZShzdGF0aWNfY2FzdDxTdHls ZVJ1bGVWaWV3cG9ydCo+KGNoaWxkUnVsZSkpOwotICAgICAgICAgICAgICAgICAgICB9Ci0jZW5k aWYKLSAgICAgICAgICAgICAgICB9IC8vIGZvciBydWxlcwotICAgICAgICAgICAgfSAvLyBpZiBy dWxlcworICAgICAgICAgICAgaWYgKCghbWVkaWFSdWxlLT5tZWRpYVF1ZXJpZXMoKSB8fCBtZWRp dW0uZXZhbChtZWRpYVJ1bGUtPm1lZGlhUXVlcmllcygpLCByZXNvbHZlcikpKQorICAgICAgICAg ICAgICAgIGFkZENoaWxkUnVsZXMobWVkaWFSdWxlLT5jaGlsZFJ1bGVzKCksIG1lZGl1bSwgcmVz b2x2ZXIsIHNjb3BlLCBoYXNEb2N1bWVudFNlY3VyaXR5T3JpZ2luLCBhZGRSdWxlRmxhZ3MsIHRy dWUpOwogICAgICAgICB9IGVsc2UgaWYgKHJ1bGUtPmlzRm9udEZhY2VSdWxlKCkgJiYgcmVzb2x2 ZXIpIHsKICAgICAgICAgICAgIC8vIEFkZCB0aGlzIGZvbnQgZmFjZSB0byBvdXIgc2V0LgogICAg ICAgICAgICAgLy8gRklYTUUoQlVHIDcyNDYxKTogV2UgZG9uJ3QgYWRkIEBmb250LWZhY2UgcnVs ZXMgb2Ygc2NvcGVkIHN0eWxlIHNoZWV0cyBmb3IgdGhlIG1vbWVudC4KQEAgLTM2OCw2ICszMjAs MjQgQEAgdm9pZCBSdWxlU2V0OjphZGRSdWxlc0Zyb21TaGVldChTdHlsZVNoZWV0Q29udGVudHMq IHNoZWV0LCBjb25zdCBNZWRpYVF1ZXJ5RXZhbHUKICAgICAgICAgfQogI2VuZGlmCiAgICAgfQor fQorCit2b2lkIFJ1bGVTZXQ6OmFkZFJ1bGVzRnJvbVNoZWV0KFN0eWxlU2hlZXRDb250ZW50cyog c2hlZXQsIGNvbnN0IE1lZGlhUXVlcnlFdmFsdWF0b3ImIG1lZGl1bSwgU3R5bGVSZXNvbHZlciog cmVzb2x2ZXIsIGNvbnN0IENvbnRhaW5lck5vZGUqIHNjb3BlKQoreworICAgIEFTU0VSVChzaGVl dCk7CisKKyAgICBjb25zdCBWZWN0b3I8UmVmUHRyPFN0eWxlUnVsZUltcG9ydD4gPiYgaW1wb3J0 UnVsZXMgPSBzaGVldC0+aW1wb3J0UnVsZXMoKTsKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBp IDwgaW1wb3J0UnVsZXMuc2l6ZSgpOyArK2kpIHsKKyAgICAgICAgU3R5bGVSdWxlSW1wb3J0KiBp bXBvcnRSdWxlID0gaW1wb3J0UnVsZXNbaV0uZ2V0KCk7CisgICAgICAgIGlmIChpbXBvcnRSdWxl LT5zdHlsZVNoZWV0KCkgJiYgKCFpbXBvcnRSdWxlLT5tZWRpYVF1ZXJpZXMoKSB8fCBtZWRpdW0u ZXZhbChpbXBvcnRSdWxlLT5tZWRpYVF1ZXJpZXMoKSwgcmVzb2x2ZXIpKSkKKyAgICAgICAgICAg IGFkZFJ1bGVzRnJvbVNoZWV0KGltcG9ydFJ1bGUtPnN0eWxlU2hlZXQoKSwgbWVkaXVtLCByZXNv bHZlciwgc2NvcGUpOworICAgIH0KKworICAgIGJvb2wgaGFzRG9jdW1lbnRTZWN1cml0eU9yaWdp biA9IHJlc29sdmVyICYmIHJlc29sdmVyLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLT5j YW5SZXF1ZXN0KHNoZWV0LT5iYXNlVVJMKCkpOworICAgIEFkZFJ1bGVGbGFncyBhZGRSdWxlRmxh Z3MgPSBzdGF0aWNfY2FzdDxBZGRSdWxlRmxhZ3M+KChoYXNEb2N1bWVudFNlY3VyaXR5T3JpZ2lu ID8gUnVsZUhhc0RvY3VtZW50U2VjdXJpdHlPcmlnaW4gOiAwKSB8ICghc2NvcGUgPyBSdWxlQ2Fu VXNlRmFzdENoZWNrU2VsZWN0b3IgOiAwKSk7CisKKyAgICBhZGRDaGlsZFJ1bGVzKHNoZWV0LT5j aGlsZFJ1bGVzKCksIG1lZGl1bSwgcmVzb2x2ZXIsIHNjb3BlLCBoYXNEb2N1bWVudFNlY3VyaXR5 T3JpZ2luLCBhZGRSdWxlRmxhZ3MsIGZhbHNlKTsKKwogICAgIGlmIChtX2F1dG9TaHJpbmtUb0Zp dEVuYWJsZWQpCiAgICAgICAgIHNocmlua1RvRml0KCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvUnVsZVNldC5oIGIvU291cmNlL1dlYkNvcmUvY3NzL1J1bGVTZXQuaAppbmRl eCA4MzRiYWI5M2E4ODFkZWYzNjM0MjA1OWM4ODZjNzIxYTQ1NmI3MjQ5Li45Y2E3N2FmOTM5NzM5 OGJjZGJjNjg3MjYwYTIzYTNjNDEzYjRlZjMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j c3MvUnVsZVNldC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9SdWxlU2V0LmgKQEAgLTEyOSw2 ICsxMjksOSBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHJlcG9ydE1lbW9yeVVzYWdlKE1lbW9yeU9i amVjdEluZm8qKSBjb25zdDsKIAorcHJpdmF0ZToKKyAgICB2b2lkIGFkZENoaWxkUnVsZXMoY29u c3QgVmVjdG9yPFJlZlB0cjxTdHlsZVJ1bGVCYXNlPiA+JiwgY29uc3QgTWVkaWFRdWVyeUV2YWx1 YXRvciYgbWVkaXVtLCBTdHlsZVJlc29sdmVyKiwgY29uc3QgQ29udGFpbmVyTm9kZSogc2NvcGUs IGJvb2wgaGFzRG9jdW1lbnRTZWN1cml0eU9yaWdpbiwgQWRkUnVsZUZsYWdzLCBib29sIGlzV2l0 aGluTmVzdGVkUnVsZSk7CisKIHB1YmxpYzoKICAgICBSdWxlU2V0KCk7CiAKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAxOGE3 YzMyODI5MWQxYmM3ZDc5M2Q4MjhjMzhjNWM2NDdhNTYyZGNiLi5lZDEzMTUyNzkxMWUyYzk0Yjg4 NzJhYmQ0ZTdlNTk2ZmY2YmU2ZDc4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTMtMDEtMTEg IFBhYmxvIEZsb3VyZXQgIDxwYWJsb2ZAbW90b3JvbGEuY29tPgorCisgICAgICAgIEFsbG93IG5l c3Rpbmcgb2YgYXQtcnVsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwNjY5NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogZmFzdC9jc3MvbmVzdGVkLWF0LXJ1bGVzLWV4cGVjdGVkLnR4dDogQWRkZWQu CisgICAgICAgICogZmFzdC9jc3MvbmVzdGVkLWF0LXJ1bGVzLmh0bWw6IEFkZGVkLgorCiAyMDEz LTAxLTExICBEb21pbmljIE1henpvbmkgIDxkbWF6em9uaUBnb29nbGUuY29tPgogCiAgICAgICAg IFtDaHJvbWl1bV0gdW5uZWNlc3NhcnkgZXhwZWN0YXRpb25zIGluIHBsYXRmb3JtL2Nocm9taXVt L2FjY2Vzc2liaWxpdHkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL25lc3RlZC1h dC1ydWxlcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9uZXN0ZWQtYXQtcnVs ZXMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjIyOGE3OGIxOWM3MzEyMWY4NDhmNGY3YmIyYTAx OGU0OTVhZWU3ZmYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9uZXN0 ZWQtYXQtcnVsZXMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMzEgQEAKK1Rlc3QgbmVzdGVkIGF0 LXJ1bGVzLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1l c3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworcnVsZXMgPSBkb2N1bWVu dC5zdHlsZVNoZWV0c1sxXS5jc3NSdWxlcworUEFTUyBydWxlcy5sZW5ndGggaXMgMgorUEFTUyBy dWxlc1swXS50eXBlIGlzIENTU1J1bGUuU1RZTEVfUlVMRQorUEFTUyBydWxlc1sxXS50eXBlIGlz IENTU1J1bGUuTUVESUFfUlVMRQorUEFTUyBydWxlc1sxXS5jc3NSdWxlcy5sZW5ndGggaXMgMgor UEFTUyBydWxlc1sxXS5jc3NSdWxlc1swXS50eXBlIGlzIENTU1J1bGUuTUVESUFfUlVMRQorUEFT UyBydWxlc1sxXS5jc3NSdWxlc1swXS5jc3NSdWxlcy5sZW5ndGggaXMgMworUEFTUyBydWxlc1sx XS5jc3NSdWxlc1swXS5jc3NSdWxlc1swXS50eXBlIGlzIENTU1J1bGUuRk9OVF9GQUNFX1JVTEUK K1BBU1MgcnVsZXNbMV0uY3NzUnVsZXNbMF0uY3NzUnVsZXNbMV0udHlwZSBpcyBDU1NSdWxlLlBB R0VfUlVMRQorUEFTUyBydWxlc1sxXS5jc3NSdWxlc1swXS5jc3NSdWxlc1syXS50eXBlIGlzIENT U1J1bGUuU1RZTEVfUlVMRQorUEFTUyBydWxlc1sxXS5jc3NSdWxlc1swXS5jc3NSdWxlc1swXS5w YXJlbnRTdHlsZVNoZWV0IGlzIGRvY3VtZW50LnN0eWxlU2hlZXRzWzFdCitQQVNTIHJ1bGVzWzFd LmNzc1J1bGVzWzBdLmNzc1J1bGVzWzFdLnBhcmVudFN0eWxlU2hlZXQgaXMgZG9jdW1lbnQuc3R5 bGVTaGVldHNbMV0KK1BBU1MgcnVsZXNbMV0uY3NzUnVsZXNbMF0uY3NzUnVsZXNbMl0ucGFyZW50 U3R5bGVTaGVldCBpcyBkb2N1bWVudC5zdHlsZVNoZWV0c1sxXQorUEFTUyBydWxlc1sxXS5jc3NS dWxlc1sxXS50eXBlIGlzIENTU1J1bGUuTUVESUFfUlVMRQorUEFTUyBydWxlc1sxXS5jc3NSdWxl c1sxXS5jc3NSdWxlcy5sZW5ndGggaXMgMQorUEFTUyBydWxlc1sxXS5jc3NSdWxlc1sxXS5jc3NS dWxlc1swXS50eXBlIGlzIENTU1J1bGUuTUVESUFfUlVMRQorcnVsZXNbMV0uY3NzUnVsZXNbMV0u aW5zZXJ0UnVsZSgnQG1lZGlhIGFsbCB7IEBwYWdlIDpsZWZ0IHsgdG9wOiAwOyB9IH0nLCAxKQor UEFTUyBydWxlc1sxXS5jc3NSdWxlc1sxXS5jc3NSdWxlcy5sZW5ndGggaXMgMgorUEFTUyBydWxl c1sxXS5jc3NSdWxlc1sxXS5jc3NSdWxlc1sxXS50eXBlIGlzIENTU1J1bGUuTUVESUFfUlVMRQor UEFTUyBydWxlc1sxXS5jc3NSdWxlc1sxXS5jc3NSdWxlc1sxXS5jc3NSdWxlc1swXS50eXBlIGlz IENTU1J1bGUuUEFHRV9SVUxFCitQQVNTIGdldENvbXB1dGVkU3R5bGUoZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoJ3QwJykpLmNvbnRlbnQgaXMgIkFQUExJRUQiCitQQVNTIGdldENvbXB1dGVkU3R5 bGUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3QxJykpLmNvbnRlbnQgaXMgIlVOVE9VQ0hFRCIK K1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9uZXN0ZWQtYXQtcnVsZXMuaHRtbCBiL0xheW91 dFRlc3RzL2Zhc3QvY3NzL25lc3RlZC1hdC1ydWxlcy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjdkMjg3MTk5 ZDE2MGMyZjhiZDUyYWE5NTI3YzJhOWRhZGMwMmQyODYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9mYXN0L2Nzcy9uZXN0ZWQtYXQtcnVsZXMuaHRtbApAQCAtMCwwICsxLDYzIEBACis8 aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5q cyI+PC9zY3JpcHQ+Cis8c3R5bGU+CisudGVzdCB7CisgICAgY29udGVudDogIlVOVE9VQ0hFRCI7 Cit9CisKK0BtZWRpYSBhbGwgeworICAgIEBtZWRpYSBhbGwgeworICAgICAgICBAZm9udC1mYWNl IHsKKyAgICAgICAgICAgIHNyYzogbG9jYWwoJ0NvdXJpZXInKTsKKyAgICAgICAgICAgIGZvbnQt ZmFtaWx5OiBDb3VyaWVyOworICAgICAgICB9CisKKyAgICAgICAgQHBhZ2UgOmxlZnQgeyB0b3A6 IDAgfQorCisgICAgICAgICN0MCB7IGNvbnRlbnQ6ICJBUFBMSUVEIiB9CisKKyAgICAgICAgQGlt cG9ydCB1cmwoIi4uLy4uL2Nzc29tL3Jlc291cmNlcy9pbXBvcnQuY3NzIik7CisgICAgICAgIEBj aGFyc2V0ICJVVEYtOCI7CisgICAgICAgIEBuYW1lc3BhY2UgIiI7CisgICAgfQorICAgIEBtZWRp YSBhbGwgeworICAgICAgICBAbWVkaWEgbm9uZSB7CisgICAgICAgICAgICAjdDEgeyBjb250ZW50 OiAiQVBQTElFRCIgfQorICAgICAgICB9CisgICAgfQorfQorPC9zdHlsZT4KKzxib2R5PgorPHNw YW4gaWQ9dDAgY2xhc3M9dGVzdD48L3NwYW4+Cis8c3BhbiBpZD10MSBjbGFzcz10ZXN0Pjwvc3Bh bj4KKzxzY3JpcHQ+CitkZXNjcmlwdGlvbigiVGVzdCBuZXN0ZWQgYXQtcnVsZXMuIik7CisKK2V2 YWxBbmRMb2coInJ1bGVzID0gZG9jdW1lbnQuc3R5bGVTaGVldHNbMV0uY3NzUnVsZXMiKTsKK3No b3VsZEV2YWx1YXRlVG8oInJ1bGVzLmxlbmd0aCIsIDIpOworCitzaG91bGRCZSgicnVsZXNbMF0u dHlwZSIsICJDU1NSdWxlLlNUWUxFX1JVTEUiKTsKK3Nob3VsZEJlKCJydWxlc1sxXS50eXBlIiwg IkNTU1J1bGUuTUVESUFfUlVMRSIpOworc2hvdWxkRXZhbHVhdGVUbygicnVsZXNbMV0uY3NzUnVs ZXMubGVuZ3RoIiwgMik7CitzaG91bGRCZSgicnVsZXNbMV0uY3NzUnVsZXNbMF0udHlwZSIsICJD U1NSdWxlLk1FRElBX1JVTEUiKTsKK3Nob3VsZEV2YWx1YXRlVG8oInJ1bGVzWzFdLmNzc1J1bGVz WzBdLmNzc1J1bGVzLmxlbmd0aCIsIDMpOworc2hvdWxkQmUoInJ1bGVzWzFdLmNzc1J1bGVzWzBd LmNzc1J1bGVzWzBdLnR5cGUiLCAiQ1NTUnVsZS5GT05UX0ZBQ0VfUlVMRSIpOworc2hvdWxkQmUo InJ1bGVzWzFdLmNzc1J1bGVzWzBdLmNzc1J1bGVzWzFdLnR5cGUiLCAiQ1NTUnVsZS5QQUdFX1JV TEUiKTsKK3Nob3VsZEJlKCJydWxlc1sxXS5jc3NSdWxlc1swXS5jc3NSdWxlc1syXS50eXBlIiwg IkNTU1J1bGUuU1RZTEVfUlVMRSIpOworc2hvdWxkQmUoInJ1bGVzWzFdLmNzc1J1bGVzWzBdLmNz c1J1bGVzWzBdLnBhcmVudFN0eWxlU2hlZXQiLCAiZG9jdW1lbnQuc3R5bGVTaGVldHNbMV0iKTsK K3Nob3VsZEJlKCJydWxlc1sxXS5jc3NSdWxlc1swXS5jc3NSdWxlc1sxXS5wYXJlbnRTdHlsZVNo ZWV0IiwgImRvY3VtZW50LnN0eWxlU2hlZXRzWzFdIik7CitzaG91bGRCZSgicnVsZXNbMV0uY3Nz UnVsZXNbMF0uY3NzUnVsZXNbMl0ucGFyZW50U3R5bGVTaGVldCIsICJkb2N1bWVudC5zdHlsZVNo ZWV0c1sxXSIpOworCitzaG91bGRCZSgicnVsZXNbMV0uY3NzUnVsZXNbMV0udHlwZSIsICJDU1NS dWxlLk1FRElBX1JVTEUiKTsKK3Nob3VsZEV2YWx1YXRlVG8oInJ1bGVzWzFdLmNzc1J1bGVzWzFd LmNzc1J1bGVzLmxlbmd0aCIsIDEpOworc2hvdWxkQmUoInJ1bGVzWzFdLmNzc1J1bGVzWzFdLmNz c1J1bGVzWzBdLnR5cGUiLCAiQ1NTUnVsZS5NRURJQV9SVUxFIik7CitldmFsQW5kTG9nKCJydWxl c1sxXS5jc3NSdWxlc1sxXS5pbnNlcnRSdWxlKCdAbWVkaWEgYWxsIHsgQHBhZ2UgOmxlZnQgeyB0 b3A6IDA7IH0gfScsIDEpIik7CitzaG91bGRFdmFsdWF0ZVRvKCJydWxlc1sxXS5jc3NSdWxlc1sx XS5jc3NSdWxlcy5sZW5ndGgiLCAyKTsKK3Nob3VsZEJlKCJydWxlc1sxXS5jc3NSdWxlc1sxXS5j c3NSdWxlc1sxXS50eXBlIiwgIkNTU1J1bGUuTUVESUFfUlVMRSIpOworc2hvdWxkQmUoInJ1bGVz WzFdLmNzc1J1bGVzWzFdLmNzc1J1bGVzWzFdLmNzc1J1bGVzWzBdLnR5cGUiLCAiQ1NTUnVsZS5Q QUdFX1JVTEUiKTsKKworc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJnZXRDb21wdXRlZFN0eWxlKGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCd0MCcpKS5jb250ZW50IiwgIkFQUExJRUQiKTsKK3Nob3Vs ZEJlRXF1YWxUb1N0cmluZygiZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgndDEnKSkuY29udGVudCIsICJVTlRPVUNIRUQiKTsKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9 Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0Pgo= 182450 2013-01-11 17:28:03 -0800 2013-01-14 01:51:22 -0800 Patch bug-106696-20130111172506.patch text/plain 14359 pf U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTA3M2JiZTMxOWY5NjM4 NTgxOTlmMjcyZDgwMDg5ZTMwMjMwMjViZC4uMWMxYTNjZTFmYzEwOGI5NmYwNDA4ZGFmNjc1NDg2 ZTczZGE2NzA3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTAxLTExICBQYWJs byBGbG91cmV0ICA8cGFibG9mQG1vdG9yb2xhLmNvbT4KKworICAgICAgICBBbGxvdyBuZXN0aW5n IG9mIGF0LXJ1bGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMDY2OTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBodHRwOi8vZGV2LnczLm9yZy9jc3N3Zy9jc3MzLWNvbmRpdGlvbmFsLyBpbnRyb2R1Y2Vz IHRoZQorICAgICAgICBjb25jZXB0IG9mIGdyb3VwaW5nIHJ1bGVzLCBhbmQgYWxsb3dzIGZvciB0 aGVtIHRvIGJlIG5lc3RlZC4gSW4KKyAgICAgICAgcGFydGljdWxhciwgdGhpcyBjaGFuZ2UgYWZm ZWN0cyBAbWVkaWEgKGFuZCBpcyBuZWVkZWQgZm9yIEBzdXBwb3J0cyBhcworICAgICAgICB3ZWxs KS4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy9uZXN0ZWQtYXQtcnVsZXMuaHRtbAorCisgICAg ICAgICogY3NzL0NTU0dyYW1tYXIueS5pbjoKKyAgICAgICAgICAgIE1vdmUgbWVkaWEgdG8gdGhl IGJsb2NrX3ZhbGlkX3J1bGUgbGlzdC4KKworICAgICAgICAqIGNzcy9SdWxlU2V0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJ1bGVTZXQ6OmFkZFJlZ2lvblJ1bGUpOgorICAgICAgICAoV2ViQ29y ZTo6UnVsZVNldDo6YWRkQ2hpbGRSdWxlcyk6CisgICAgICAgIChXZWJDb3JlOjpSdWxlU2V0Ojph ZGRSdWxlc0Zyb21TaGVldCk6CisgICAgICAgICogY3NzL1J1bGVTZXQuaDoKKyAgICAgICAgICAg IFJpcCBvdXQgdGhlIHJ1bGUtYWRkaW5nIGxvb3AgaW50byBhIG5ldyBtZXRob2QsIGZvciBhZGRl ZAorICAgICAgICAgICAgY2xlYW5saW5lc3MgYW5kIHJlY3Vyc2luZy4KKwogMjAxMy0wMS0xMSAg VG9ueSBHZW50aWxjb3JlICA8dG9ueWdAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlIHNob3Vs ZCBiZSBhYmxlIHRvIGNoZWNrcG9pbnQgYW5kIHJlc3RvcmUgdGhlIEhUTUxUb2tlbml6ZXIgYWNy b3NzIHRocmVhZHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NHcmFtbWFyLnku aW4gYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTR3JhbW1hci55LmluCmluZGV4IDFmZDQ1ZTQ5NWNl OTZhNWFhNDVjNjRiMWRlOWJiZjYwYzBmZTc0YzMuLjU2ODE0Y2RjNmJlMDg0MTJjMjQ2NDFkZDIw ZWRjYmJiNjc4Yzg1N2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NHcmFtbWFy LnkuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0dyYW1tYXIueS5pbgpAQCAtNDYyLDYg KzQ2Miw3IEBAIGJsb2NrX3ZhbGlkX3J1bGU6CiAgICAgcnVsZXNldAogICB8IHBhZ2UKICAgfCBm b250X2ZhY2UKKyAgfCBtZWRpYQogICB8IGtleWZyYW1lcwogI2lmIEVOQUJMRV9DU1NfREVWSUNF X0FEQVBUQVRJT04KICAgfCB2aWV3cG9ydApAQCAtNDc0LDcgKzQ3NSw2IEBAIGJsb2NrX3J1bGU6 CiAgIHwgaW52YWxpZF9hdAogICB8IG5hbWVzcGFjZQogICB8IGltcG9ydAotICB8IG1lZGlhCiAg IHwgcmVnaW9uCiAjaWYgRU5BQkxFX0NTUzNfQ09ORElUSU9OQUxfUlVMRVMKICAgfCBzdXBwb3J0 cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1J1bGVTZXQuY3BwIGIvU291cmNlL1dl YkNvcmUvY3NzL1J1bGVTZXQuY3BwCmluZGV4IGQ4NDAwNGQ5Y2NjMTQ4NDNlNGI0MGE2YmQ2MmFj NzJhOGRmYjIyZWIuLjRiOTFhM2YyNjQxMTI3MDU3OTZlMDk3ZjQ5ZTVhNTExMWRlMDI1NjUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9SdWxlU2V0LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvUnVsZVNldC5jcHAKQEAgLTI1NSw2ICsyNTUsNyBAQCB2b2lkIFJ1bGVTZXQ6OmFk ZFJlZ2lvblJ1bGUoU3R5bGVSdWxlUmVnaW9uKiByZWdpb25SdWxlLCBib29sIGhhc0RvY3VtZW50 U2VjdXJpdAogICAgIHJlZ2lvblJ1bGVTZXQtPm1fcnVsZUNvdW50ID0gbV9ydWxlQ291bnQ7CiAK ICAgICAvLyBDb2xsZWN0IHRoZSByZWdpb24gcnVsZXMgaW50byBhIHJ1bGUgc2V0CisgICAgLy8g RklYTUU6IFNob3VsZCB0aGlzIGFkZCBvdGhlciB0eXBlcyBvZiBydWxlcz8gKGkuZS4gdXNlIGFk ZENoaWxkUnVsZXMoKSBkaXJlY3RseT8pCiAgICAgY29uc3QgVmVjdG9yPFJlZlB0cjxTdHlsZVJ1 bGVCYXNlPiA+JiBjaGlsZFJ1bGVzID0gcmVnaW9uUnVsZS0+Y2hpbGRSdWxlcygpOwogICAgIEFk ZFJ1bGVGbGFncyBhZGRSdWxlRmxhZ3MgPSBoYXNEb2N1bWVudFNlY3VyaXR5T3JpZ2luID8gUnVs ZUhhc0RvY3VtZW50U2VjdXJpdHlPcmlnaW4gOiBSdWxlSGFzTm9TcGVjaWFsU3RhdGU7CiAgICAg YWRkUnVsZUZsYWdzID0gc3RhdGljX2Nhc3Q8QWRkUnVsZUZsYWdzPihhZGRSdWxlRmxhZ3MgfCBS dWxlQ2FuVXNlRmFzdENoZWNrU2VsZWN0b3IgfCBSdWxlSXNJblJlZ2lvblJ1bGUpOwpAQCAtMjY5 LDcwICsyNzAsMTkgQEAgdm9pZCBSdWxlU2V0OjphZGRSZWdpb25SdWxlKFN0eWxlUnVsZVJlZ2lv biogcmVnaW9uUnVsZSwgYm9vbCBoYXNEb2N1bWVudFNlY3VyaXQKICAgICBtX3JlZ2lvblNlbGVj dG9yc0FuZFJ1bGVTZXRzLmFwcGVuZChSdWxlU2V0U2VsZWN0b3JQYWlyKHJlZ2lvblJ1bGUtPnNl bGVjdG9yTGlzdCgpLmZpcnN0KCksIHJlZ2lvblJ1bGVTZXQucmVsZWFzZSgpKSk7CiB9CiAKLXZv aWQgUnVsZVNldDo6YWRkUnVsZXNGcm9tU2hlZXQoU3R5bGVTaGVldENvbnRlbnRzKiBzaGVldCwg Y29uc3QgTWVkaWFRdWVyeUV2YWx1YXRvciYgbWVkaXVtLCBTdHlsZVJlc29sdmVyKiByZXNvbHZl ciwgY29uc3QgQ29udGFpbmVyTm9kZSogc2NvcGUpCit2b2lkIFJ1bGVTZXQ6OmFkZENoaWxkUnVs ZXMoY29uc3QgVmVjdG9yPFJlZlB0cjxTdHlsZVJ1bGVCYXNlPiA+JiBydWxlcywgY29uc3QgTWVk aWFRdWVyeUV2YWx1YXRvciYgbWVkaXVtLCBTdHlsZVJlc29sdmVyKiByZXNvbHZlciwgY29uc3Qg Q29udGFpbmVyTm9kZSogc2NvcGUsIGJvb2wgaGFzRG9jdW1lbnRTZWN1cml0eU9yaWdpbiwgQWRk UnVsZUZsYWdzIGFkZFJ1bGVGbGFncykKIHsKLSAgICBBU1NFUlQoc2hlZXQpOwotICAgIAotICAg IGNvbnN0IFZlY3RvcjxSZWZQdHI8U3R5bGVSdWxlSW1wb3J0PiA+JiBpbXBvcnRSdWxlcyA9IHNo ZWV0LT5pbXBvcnRSdWxlcygpOwotICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBpbXBvcnRS dWxlcy5zaXplKCk7ICsraSkgewotICAgICAgICBTdHlsZVJ1bGVJbXBvcnQqIGltcG9ydFJ1bGUg PSBpbXBvcnRSdWxlc1tpXS5nZXQoKTsKLSAgICAgICAgaWYgKGltcG9ydFJ1bGUtPnN0eWxlU2hl ZXQoKSAmJiAoIWltcG9ydFJ1bGUtPm1lZGlhUXVlcmllcygpIHx8IG1lZGl1bS5ldmFsKGltcG9y dFJ1bGUtPm1lZGlhUXVlcmllcygpLCByZXNvbHZlcikpKQotICAgICAgICAgICAgYWRkUnVsZXNG cm9tU2hlZXQoaW1wb3J0UnVsZS0+c3R5bGVTaGVldCgpLCBtZWRpdW0sIHJlc29sdmVyLCBzY29w ZSk7Ci0gICAgfQotICAgIGJvb2wgaGFzRG9jdW1lbnRTZWN1cml0eU9yaWdpbiA9IHJlc29sdmVy ICYmIHJlc29sdmVyLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLT5jYW5SZXF1ZXN0KHNo ZWV0LT5iYXNlVVJMKCkpOwotICAgIEFkZFJ1bGVGbGFncyBhZGRSdWxlRmxhZ3MgPSBzdGF0aWNf Y2FzdDxBZGRSdWxlRmxhZ3M+KChoYXNEb2N1bWVudFNlY3VyaXR5T3JpZ2luID8gUnVsZUhhc0Rv Y3VtZW50U2VjdXJpdHlPcmlnaW4gOiAwKSB8ICghc2NvcGUgPyBSdWxlQ2FuVXNlRmFzdENoZWNr U2VsZWN0b3IgOiAwKSk7Ci0KLSAgICBjb25zdCBWZWN0b3I8UmVmUHRyPFN0eWxlUnVsZUJhc2U+ ID4mIHJ1bGVzID0gc2hlZXQtPmNoaWxkUnVsZXMoKTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAw OyBpIDwgcnVsZXMuc2l6ZSgpOyArK2kpIHsKICAgICAgICAgU3R5bGVSdWxlQmFzZSogcnVsZSA9 IHJ1bGVzW2ldLmdldCgpOwogCi0gICAgICAgIEFTU0VSVCghcnVsZS0+aXNJbXBvcnRSdWxlKCkp OwogICAgICAgICBpZiAocnVsZS0+aXNTdHlsZVJ1bGUoKSkKICAgICAgICAgICAgIGFkZFN0eWxl UnVsZShzdGF0aWNfY2FzdDxTdHlsZVJ1bGUqPihydWxlKSwgYWRkUnVsZUZsYWdzKTsKICAgICAg ICAgZWxzZSBpZiAocnVsZS0+aXNQYWdlUnVsZSgpKQogICAgICAgICAgICAgYWRkUGFnZVJ1bGUo c3RhdGljX2Nhc3Q8U3R5bGVSdWxlUGFnZSo+KHJ1bGUpKTsKICAgICAgICAgZWxzZSBpZiAocnVs ZS0+aXNNZWRpYVJ1bGUoKSkgewogICAgICAgICAgICAgU3R5bGVSdWxlTWVkaWEqIG1lZGlhUnVs ZSA9IHN0YXRpY19jYXN0PFN0eWxlUnVsZU1lZGlhKj4ocnVsZSk7Ci0KLSAgICAgICAgICAgIGlm ICgoIW1lZGlhUnVsZS0+bWVkaWFRdWVyaWVzKCkgfHwgbWVkaXVtLmV2YWwobWVkaWFSdWxlLT5t ZWRpYVF1ZXJpZXMoKSwgcmVzb2x2ZXIpKSkgewotICAgICAgICAgICAgICAgIC8vIFRyYXZlcnNl IGNoaWxkIGVsZW1lbnRzIG9mIHRoZSBAbWVkaWEgcnVsZS4KLSAgICAgICAgICAgICAgICBjb25z dCBWZWN0b3I8UmVmUHRyPFN0eWxlUnVsZUJhc2U+ID4mIGNoaWxkUnVsZXMgPSBtZWRpYVJ1bGUt PmNoaWxkUnVsZXMoKTsKLSAgICAgICAgICAgICAgICBmb3IgKHVuc2lnbmVkIGogPSAwOyBqIDwg Y2hpbGRSdWxlcy5zaXplKCk7ICsraikgewotICAgICAgICAgICAgICAgICAgICBTdHlsZVJ1bGVC YXNlKiBjaGlsZFJ1bGUgPSBjaGlsZFJ1bGVzW2pdLmdldCgpOwotICAgICAgICAgICAgICAgICAg ICBpZiAoY2hpbGRSdWxlLT5pc1N0eWxlUnVsZSgpKQotICAgICAgICAgICAgICAgICAgICAgICAg YWRkU3R5bGVSdWxlKHN0YXRpY19jYXN0PFN0eWxlUnVsZSo+KGNoaWxkUnVsZSksIGFkZFJ1bGVG bGFncyk7Ci0gICAgICAgICAgICAgICAgICAgIGVsc2UgaWYgKGNoaWxkUnVsZS0+aXNQYWdlUnVs ZSgpKQotICAgICAgICAgICAgICAgICAgICAgICAgYWRkUGFnZVJ1bGUoc3RhdGljX2Nhc3Q8U3R5 bGVSdWxlUGFnZSo+KGNoaWxkUnVsZSkpOwotICAgICAgICAgICAgICAgICAgICBlbHNlIGlmIChj aGlsZFJ1bGUtPmlzRm9udEZhY2VSdWxlKCkgJiYgcmVzb2x2ZXIpIHsKLSAgICAgICAgICAgICAg ICAgICAgICAgIC8vIEFkZCB0aGlzIGZvbnQgZmFjZSB0byBvdXIgc2V0LgotICAgICAgICAgICAg ICAgICAgICAgICAgLy8gRklYTUUoQlVHIDcyNDYxKTogV2UgZG9uJ3QgYWRkIEBmb250LWZhY2Ug cnVsZXMgb2Ygc2NvcGVkIHN0eWxlIHNoZWV0cyBmb3IgdGhlIG1vbWVudC4KLSAgICAgICAgICAg ICAgICAgICAgICAgIGlmIChzY29wZSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb250 aW51ZTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFN0eWxlUnVsZUZvbnRGYWNlKiBm b250RmFjZVJ1bGUgPSBzdGF0aWNfY2FzdDxTdHlsZVJ1bGVGb250RmFjZSo+KGNoaWxkUnVsZSk7 Ci0gICAgICAgICAgICAgICAgICAgICAgICByZXNvbHZlci0+Zm9udFNlbGVjdG9yKCktPmFkZEZv bnRGYWNlUnVsZShmb250RmFjZVJ1bGUpOwotICAgICAgICAgICAgICAgICAgICAgICAgcmVzb2x2 ZXItPmludmFsaWRhdGVNYXRjaGVkUHJvcGVydGllc0NhY2hlKCk7Ci0gICAgICAgICAgICAgICAg ICAgIH0gZWxzZSBpZiAoY2hpbGRSdWxlLT5pc0tleWZyYW1lc1J1bGUoKSAmJiByZXNvbHZlcikg ewotICAgICAgICAgICAgICAgICAgICAgICAgLy8gQWRkIHRoaXMga2V5ZnJhbWUgcnVsZSB0byBv dXIgc2V0LgotICAgICAgICAgICAgICAgICAgICAgICAgLy8gRklYTUUoQlVHIDcyNDYyKTogV2Ug ZG9uJ3QgYWRkIEBrZXlmcmFtZSBydWxlcyBvZiBzY29wZWQgc3R5bGUgc2hlZXRzIGZvciB0aGUg bW9tZW50LgotICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHNjb3BlKQotICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgICAgICAgICAgICAgcmVzb2x2 ZXItPmFkZEtleWZyYW1lU3R5bGUoc3RhdGljX2Nhc3Q8U3R5bGVSdWxlS2V5ZnJhbWVzKj4oY2hp bGRSdWxlKSk7Ci0gICAgICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoY2hpbGRSdWxlLT5pc1Jl Z2lvblJ1bGUoKSAmJiByZXNvbHZlcikgewotICAgICAgICAgICAgICAgICAgICAgICAgLy8gRklY TUUgKEJVRyA3MjQ3Mik6IFdlIGRvbid0IGFkZCBALXdlYmtpdC1yZWdpb24gcnVsZXMgb2Ygc2Nv cGVkIHN0eWxlIHNoZWV0cyBmb3IgdGhlIG1vbWVudC4KLSAgICAgICAgICAgICAgICAgICAgICAg IGlmIChzY29wZSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAg ICAgICAgICAgICAgICAgICAgIGFkZFJlZ2lvblJ1bGUoc3RhdGljX2Nhc3Q8U3R5bGVSdWxlUmVn aW9uKj4oY2hpbGRSdWxlKSwgaGFzRG9jdW1lbnRTZWN1cml0eU9yaWdpbik7Ci0gICAgICAgICAg ICAgICAgICAgIH0KLSNpZiBFTkFCTEUoQ1NTX0RFVklDRV9BREFQVEFUSU9OKQotICAgICAgICAg ICAgICAgICAgICBlbHNlIGlmIChjaGlsZFJ1bGUtPmlzVmlld3BvcnRSdWxlKCkgJiYgcmVzb2x2 ZXIgJiYgIXJlc29sdmVyLT5hZmZlY3RlZEJ5Vmlld3BvcnRDaGFuZ2UoKSkgewotICAgICAgICAg ICAgICAgICAgICAgICAgLy8gQHZpZXdwb3J0IHNob3VsZCBub3QgYmUgc2NvcGVkLgotICAgICAg ICAgICAgICAgICAgICAgICAgaWYgKHNjb3BlKQotICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnRpbnVlOwotICAgICAgICAgICAgICAgICAgICAgICAgcmVzb2x2ZXItPnZpZXdwb3J0U3R5 bGVSZXNvbHZlcigpLT5hZGRWaWV3cG9ydFJ1bGUoc3RhdGljX2Nhc3Q8U3R5bGVSdWxlVmlld3Bv cnQqPihjaGlsZFJ1bGUpKTsKLSAgICAgICAgICAgICAgICAgICAgfQotI2VuZGlmCi0gICAgICAg ICAgICAgICAgfSAvLyBmb3IgcnVsZXMKLSAgICAgICAgICAgIH0gLy8gaWYgcnVsZXMKKyAgICAg ICAgICAgIGlmICgoIW1lZGlhUnVsZS0+bWVkaWFRdWVyaWVzKCkgfHwgbWVkaXVtLmV2YWwobWVk aWFSdWxlLT5tZWRpYVF1ZXJpZXMoKSwgcmVzb2x2ZXIpKSkKKyAgICAgICAgICAgICAgICBhZGRD aGlsZFJ1bGVzKG1lZGlhUnVsZS0+Y2hpbGRSdWxlcygpLCBtZWRpdW0sIHJlc29sdmVyLCBzY29w ZSwgaGFzRG9jdW1lbnRTZWN1cml0eU9yaWdpbiwgYWRkUnVsZUZsYWdzKTsKICAgICAgICAgfSBl bHNlIGlmIChydWxlLT5pc0ZvbnRGYWNlUnVsZSgpICYmIHJlc29sdmVyKSB7CiAgICAgICAgICAg ICAvLyBBZGQgdGhpcyBmb250IGZhY2UgdG8gb3VyIHNldC4KICAgICAgICAgICAgIC8vIEZJWE1F KEJVRyA3MjQ2MSk6IFdlIGRvbid0IGFkZCBAZm9udC1mYWNlIHJ1bGVzIG9mIHNjb3BlZCBzdHls ZSBzaGVldHMgZm9yIHRoZSBtb21lbnQuCkBAIC0zNjgsNiArMzE4LDI0IEBAIHZvaWQgUnVsZVNl dDo6YWRkUnVsZXNGcm9tU2hlZXQoU3R5bGVTaGVldENvbnRlbnRzKiBzaGVldCwgY29uc3QgTWVk aWFRdWVyeUV2YWx1CiAgICAgICAgIH0KICNlbmRpZgogICAgIH0KK30KKwordm9pZCBSdWxlU2V0 OjphZGRSdWxlc0Zyb21TaGVldChTdHlsZVNoZWV0Q29udGVudHMqIHNoZWV0LCBjb25zdCBNZWRp YVF1ZXJ5RXZhbHVhdG9yJiBtZWRpdW0sIFN0eWxlUmVzb2x2ZXIqIHJlc29sdmVyLCBjb25zdCBD b250YWluZXJOb2RlKiBzY29wZSkKK3sKKyAgICBBU1NFUlQoc2hlZXQpOworCisgICAgY29uc3Qg VmVjdG9yPFJlZlB0cjxTdHlsZVJ1bGVJbXBvcnQ+ID4mIGltcG9ydFJ1bGVzID0gc2hlZXQtPmlt cG9ydFJ1bGVzKCk7CisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGltcG9ydFJ1bGVzLnNp emUoKTsgKytpKSB7CisgICAgICAgIFN0eWxlUnVsZUltcG9ydCogaW1wb3J0UnVsZSA9IGltcG9y dFJ1bGVzW2ldLmdldCgpOworICAgICAgICBpZiAoaW1wb3J0UnVsZS0+c3R5bGVTaGVldCgpICYm ICghaW1wb3J0UnVsZS0+bWVkaWFRdWVyaWVzKCkgfHwgbWVkaXVtLmV2YWwoaW1wb3J0UnVsZS0+ bWVkaWFRdWVyaWVzKCksIHJlc29sdmVyKSkpCisgICAgICAgICAgICBhZGRSdWxlc0Zyb21TaGVl dChpbXBvcnRSdWxlLT5zdHlsZVNoZWV0KCksIG1lZGl1bSwgcmVzb2x2ZXIsIHNjb3BlKTsKKyAg ICB9CisKKyAgICBib29sIGhhc0RvY3VtZW50U2VjdXJpdHlPcmlnaW4gPSByZXNvbHZlciAmJiBy ZXNvbHZlci0+ZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKS0+Y2FuUmVxdWVzdChzaGVldC0+ YmFzZVVSTCgpKTsKKyAgICBBZGRSdWxlRmxhZ3MgYWRkUnVsZUZsYWdzID0gc3RhdGljX2Nhc3Q8 QWRkUnVsZUZsYWdzPigoaGFzRG9jdW1lbnRTZWN1cml0eU9yaWdpbiA/IFJ1bGVIYXNEb2N1bWVu dFNlY3VyaXR5T3JpZ2luIDogMCkgfCAoIXNjb3BlID8gUnVsZUNhblVzZUZhc3RDaGVja1NlbGVj dG9yIDogMCkpOworCisgICAgYWRkQ2hpbGRSdWxlcyhzaGVldC0+Y2hpbGRSdWxlcygpLCBtZWRp dW0sIHJlc29sdmVyLCBzY29wZSwgaGFzRG9jdW1lbnRTZWN1cml0eU9yaWdpbiwgYWRkUnVsZUZs YWdzKTsKKwogICAgIGlmIChtX2F1dG9TaHJpbmtUb0ZpdEVuYWJsZWQpCiAgICAgICAgIHNocmlu a1RvRml0KCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvUnVsZVNldC5oIGIv U291cmNlL1dlYkNvcmUvY3NzL1J1bGVTZXQuaAppbmRleCA4MzRiYWI5M2E4ODFkZWYzNjM0MjA1 OWM4ODZjNzIxYTQ1NmI3MjQ5Li5lZGZlZmQzNzhlYjQ4YzVmZGUyNzFiZTIzY2U1YTYyYmEwMDVj NjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvUnVsZVNldC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9SdWxlU2V0LmgKQEAgLTEyOSw2ICsxMjksOSBAQCBwdWJsaWM6CiAKICAg ICB2b2lkIHJlcG9ydE1lbW9yeVVzYWdlKE1lbW9yeU9iamVjdEluZm8qKSBjb25zdDsKIAorcHJp dmF0ZToKKyAgICB2b2lkIGFkZENoaWxkUnVsZXMoY29uc3QgVmVjdG9yPFJlZlB0cjxTdHlsZVJ1 bGVCYXNlPiA+JiwgY29uc3QgTWVkaWFRdWVyeUV2YWx1YXRvciYgbWVkaXVtLCBTdHlsZVJlc29s dmVyKiwgY29uc3QgQ29udGFpbmVyTm9kZSogc2NvcGUsIGJvb2wgaGFzRG9jdW1lbnRTZWN1cml0 eU9yaWdpbiwgQWRkUnVsZUZsYWdzKTsKKwogcHVibGljOgogICAgIFJ1bGVTZXQoKTsKIApkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmlu ZGV4IDE4YTdjMzI4MjkxZDFiYzdkNzkzZDgyOGMzOGM1YzY0N2E1NjJkY2IuLmVkMTMxNTI3OTEx ZTJjOTRiODg3MmFiZDRlN2U1OTZmZjZiZTZkNzggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0No YW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAx My0wMS0xMSAgUGFibG8gRmxvdXJldCAgPHBhYmxvZkBtb3Rvcm9sYS5jb20+CisKKyAgICAgICAg QWxsb3cgbmVzdGluZyBvZiBhdC1ydWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTA2Njk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBmYXN0L2Nzcy9uZXN0ZWQtYXQtcnVsZXMtZXhwZWN0ZWQudHh0 OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nzcy9uZXN0ZWQtYXQtcnVsZXMuaHRtbDogQWRkZWQu CisKIDIwMTMtMDEtMTEgIERvbWluaWMgTWF6em9uaSAgPGRtYXp6b25pQGdvb2dsZS5jb20+CiAK ICAgICAgICAgW0Nocm9taXVtXSB1bm5lY2Vzc2FyeSBleHBlY3RhdGlvbnMgaW4gcGxhdGZvcm0v Y2hyb21pdW0vYWNjZXNzaWJpbGl0eQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3Mv bmVzdGVkLWF0LXJ1bGVzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL25lc3Rl ZC1hdC1ydWxlcy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMjI4YTc4YjE5YzczMTIxZjg0OGY0 ZjdiYjJhMDE4ZTQ5NWFlZTdmZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qv Y3NzL25lc3RlZC1hdC1ydWxlcy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwzMSBAQAorVGVzdCBu ZXN0ZWQgYXQtcnVsZXMuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAi UEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitydWxlcyA9 IGRvY3VtZW50LnN0eWxlU2hlZXRzWzFdLmNzc1J1bGVzCitQQVNTIHJ1bGVzLmxlbmd0aCBpcyAy CitQQVNTIHJ1bGVzWzBdLnR5cGUgaXMgQ1NTUnVsZS5TVFlMRV9SVUxFCitQQVNTIHJ1bGVzWzFd LnR5cGUgaXMgQ1NTUnVsZS5NRURJQV9SVUxFCitQQVNTIHJ1bGVzWzFdLmNzc1J1bGVzLmxlbmd0 aCBpcyAyCitQQVNTIHJ1bGVzWzFdLmNzc1J1bGVzWzBdLnR5cGUgaXMgQ1NTUnVsZS5NRURJQV9S VUxFCitQQVNTIHJ1bGVzWzFdLmNzc1J1bGVzWzBdLmNzc1J1bGVzLmxlbmd0aCBpcyAzCitQQVNT IHJ1bGVzWzFdLmNzc1J1bGVzWzBdLmNzc1J1bGVzWzBdLnR5cGUgaXMgQ1NTUnVsZS5GT05UX0ZB Q0VfUlVMRQorUEFTUyBydWxlc1sxXS5jc3NSdWxlc1swXS5jc3NSdWxlc1sxXS50eXBlIGlzIENT U1J1bGUuUEFHRV9SVUxFCitQQVNTIHJ1bGVzWzFdLmNzc1J1bGVzWzBdLmNzc1J1bGVzWzJdLnR5 cGUgaXMgQ1NTUnVsZS5TVFlMRV9SVUxFCitQQVNTIHJ1bGVzWzFdLmNzc1J1bGVzWzBdLmNzc1J1 bGVzWzBdLnBhcmVudFN0eWxlU2hlZXQgaXMgZG9jdW1lbnQuc3R5bGVTaGVldHNbMV0KK1BBU1Mg cnVsZXNbMV0uY3NzUnVsZXNbMF0uY3NzUnVsZXNbMV0ucGFyZW50U3R5bGVTaGVldCBpcyBkb2N1 bWVudC5zdHlsZVNoZWV0c1sxXQorUEFTUyBydWxlc1sxXS5jc3NSdWxlc1swXS5jc3NSdWxlc1sy XS5wYXJlbnRTdHlsZVNoZWV0IGlzIGRvY3VtZW50LnN0eWxlU2hlZXRzWzFdCitQQVNTIHJ1bGVz WzFdLmNzc1J1bGVzWzFdLnR5cGUgaXMgQ1NTUnVsZS5NRURJQV9SVUxFCitQQVNTIHJ1bGVzWzFd LmNzc1J1bGVzWzFdLmNzc1J1bGVzLmxlbmd0aCBpcyAxCitQQVNTIHJ1bGVzWzFdLmNzc1J1bGVz WzFdLmNzc1J1bGVzWzBdLnR5cGUgaXMgQ1NTUnVsZS5NRURJQV9SVUxFCitydWxlc1sxXS5jc3NS dWxlc1sxXS5pbnNlcnRSdWxlKCdAbWVkaWEgYWxsIHsgQHBhZ2UgOmxlZnQgeyB0b3A6IDA7IH0g fScsIDEpCitQQVNTIHJ1bGVzWzFdLmNzc1J1bGVzWzFdLmNzc1J1bGVzLmxlbmd0aCBpcyAyCitQ QVNTIHJ1bGVzWzFdLmNzc1J1bGVzWzFdLmNzc1J1bGVzWzFdLnR5cGUgaXMgQ1NTUnVsZS5NRURJ QV9SVUxFCitQQVNTIHJ1bGVzWzFdLmNzc1J1bGVzWzFdLmNzc1J1bGVzWzFdLmNzc1J1bGVzWzBd LnR5cGUgaXMgQ1NTUnVsZS5QQUdFX1JVTEUKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgndDAnKSkuY29udGVudCBpcyAiQVBQTElFRCIKK1BBU1MgZ2V0Q29t cHV0ZWRTdHlsZShkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndDEnKSkuY29udGVudCBpcyAiVU5U T1VDSEVEIgorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRF CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL25lc3RlZC1hdC1ydWxlcy5odG1s IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvbmVzdGVkLWF0LXJ1bGVzLmh0bWwKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u N2QyODcxOTlkMTYwYzJmOGJkNTJhYTk1MjdjMmE5ZGFkYzAyZDI4NgotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL25lc3RlZC1hdC1ydWxlcy5odG1sCkBAIC0wLDAgKzEs NjMgQEAKKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vanMvcmVzb3VyY2VzL2pzLXRl c3QtcHJlLmpzIj48L3NjcmlwdD4KKzxzdHlsZT4KKy50ZXN0IHsKKyAgICBjb250ZW50OiAiVU5U T1VDSEVEIjsKK30KKworQG1lZGlhIGFsbCB7CisgICAgQG1lZGlhIGFsbCB7CisgICAgICAgIEBm b250LWZhY2UgeworICAgICAgICAgICAgc3JjOiBsb2NhbCgnQ291cmllcicpOworICAgICAgICAg ICAgZm9udC1mYW1pbHk6IENvdXJpZXI7CisgICAgICAgIH0KKworICAgICAgICBAcGFnZSA6bGVm dCB7IHRvcDogMCB9CisKKyAgICAgICAgI3QwIHsgY29udGVudDogIkFQUExJRUQiIH0KKworICAg ICAgICBAaW1wb3J0IHVybCgiLi4vLi4vY3Nzb20vcmVzb3VyY2VzL2ltcG9ydC5jc3MiKTsKKyAg ICAgICAgQGNoYXJzZXQgIlVURi04IjsKKyAgICAgICAgQG5hbWVzcGFjZSAiIjsKKyAgICB9Cisg ICAgQG1lZGlhIGFsbCB7CisgICAgICAgIEBtZWRpYSBub25lIHsKKyAgICAgICAgICAgICN0MSB7 IGNvbnRlbnQ6ICJBUFBMSUVEIiB9CisgICAgICAgIH0KKyAgICB9Cit9Cis8L3N0eWxlPgorPGJv ZHk+Cis8c3BhbiBpZD10MCBjbGFzcz10ZXN0Pjwvc3Bhbj4KKzxzcGFuIGlkPXQxIGNsYXNzPXRl c3Q+PC9zcGFuPgorPHNjcmlwdD4KK2Rlc2NyaXB0aW9uKCJUZXN0IG5lc3RlZCBhdC1ydWxlcy4i KTsKKworZXZhbEFuZExvZygicnVsZXMgPSBkb2N1bWVudC5zdHlsZVNoZWV0c1sxXS5jc3NSdWxl cyIpOworc2hvdWxkRXZhbHVhdGVUbygicnVsZXMubGVuZ3RoIiwgMik7CisKK3Nob3VsZEJlKCJy dWxlc1swXS50eXBlIiwgIkNTU1J1bGUuU1RZTEVfUlVMRSIpOworc2hvdWxkQmUoInJ1bGVzWzFd LnR5cGUiLCAiQ1NTUnVsZS5NRURJQV9SVUxFIik7CitzaG91bGRFdmFsdWF0ZVRvKCJydWxlc1sx XS5jc3NSdWxlcy5sZW5ndGgiLCAyKTsKK3Nob3VsZEJlKCJydWxlc1sxXS5jc3NSdWxlc1swXS50 eXBlIiwgIkNTU1J1bGUuTUVESUFfUlVMRSIpOworc2hvdWxkRXZhbHVhdGVUbygicnVsZXNbMV0u Y3NzUnVsZXNbMF0uY3NzUnVsZXMubGVuZ3RoIiwgMyk7CitzaG91bGRCZSgicnVsZXNbMV0uY3Nz UnVsZXNbMF0uY3NzUnVsZXNbMF0udHlwZSIsICJDU1NSdWxlLkZPTlRfRkFDRV9SVUxFIik7Citz aG91bGRCZSgicnVsZXNbMV0uY3NzUnVsZXNbMF0uY3NzUnVsZXNbMV0udHlwZSIsICJDU1NSdWxl LlBBR0VfUlVMRSIpOworc2hvdWxkQmUoInJ1bGVzWzFdLmNzc1J1bGVzWzBdLmNzc1J1bGVzWzJd LnR5cGUiLCAiQ1NTUnVsZS5TVFlMRV9SVUxFIik7CitzaG91bGRCZSgicnVsZXNbMV0uY3NzUnVs ZXNbMF0uY3NzUnVsZXNbMF0ucGFyZW50U3R5bGVTaGVldCIsICJkb2N1bWVudC5zdHlsZVNoZWV0 c1sxXSIpOworc2hvdWxkQmUoInJ1bGVzWzFdLmNzc1J1bGVzWzBdLmNzc1J1bGVzWzFdLnBhcmVu dFN0eWxlU2hlZXQiLCAiZG9jdW1lbnQuc3R5bGVTaGVldHNbMV0iKTsKK3Nob3VsZEJlKCJydWxl c1sxXS5jc3NSdWxlc1swXS5jc3NSdWxlc1syXS5wYXJlbnRTdHlsZVNoZWV0IiwgImRvY3VtZW50 LnN0eWxlU2hlZXRzWzFdIik7CisKK3Nob3VsZEJlKCJydWxlc1sxXS5jc3NSdWxlc1sxXS50eXBl IiwgIkNTU1J1bGUuTUVESUFfUlVMRSIpOworc2hvdWxkRXZhbHVhdGVUbygicnVsZXNbMV0uY3Nz UnVsZXNbMV0uY3NzUnVsZXMubGVuZ3RoIiwgMSk7CitzaG91bGRCZSgicnVsZXNbMV0uY3NzUnVs ZXNbMV0uY3NzUnVsZXNbMF0udHlwZSIsICJDU1NSdWxlLk1FRElBX1JVTEUiKTsKK2V2YWxBbmRM b2coInJ1bGVzWzFdLmNzc1J1bGVzWzFdLmluc2VydFJ1bGUoJ0BtZWRpYSBhbGwgeyBAcGFnZSA6 bGVmdCB7IHRvcDogMDsgfSB9JywgMSkiKTsKK3Nob3VsZEV2YWx1YXRlVG8oInJ1bGVzWzFdLmNz c1J1bGVzWzFdLmNzc1J1bGVzLmxlbmd0aCIsIDIpOworc2hvdWxkQmUoInJ1bGVzWzFdLmNzc1J1 bGVzWzFdLmNzc1J1bGVzWzFdLnR5cGUiLCAiQ1NTUnVsZS5NRURJQV9SVUxFIik7CitzaG91bGRC ZSgicnVsZXNbMV0uY3NzUnVsZXNbMV0uY3NzUnVsZXNbMV0uY3NzUnVsZXNbMF0udHlwZSIsICJD U1NSdWxlLlBBR0VfUlVMRSIpOworCitzaG91bGRCZUVxdWFsVG9TdHJpbmcoImdldENvbXB1dGVk U3R5bGUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3QwJykpLmNvbnRlbnQiLCAiQVBQTElFRCIp Oworc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJnZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCd0MScpKS5jb250ZW50IiwgIlVOVE9VQ0hFRCIpOworPC9zY3JpcHQ+Cis8c2Ny aXB0IHNyYz0iLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cg==