167255 2017-01-20 14:14:58 -0800 Styles should not show background-repeat-x/y, or -webkit-mask-repeat-x/y 2017-01-27 10:59:39 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser hi bburg commit-queue hi inspector-bugzilla-changes joepeck simon.fraser webkit-bug-importer oldest_to_newest 1268568 0 simon.fraser 2017-01-20 14:14:58 -0800 The styles sidebar shows the background-repeat-x/background-repeat-y properties, which are not real CSS properties. We only have them as CSSPropertyIDs to make parsing easier. They should never be exposed in the inspector; it should just show background-repeat and -webkit-mask-repeat. 1268591 1 joepeck 2017-01-20 14:40:37 -0800 This is probably my fault. I think I added them to the ComputedStyles list as I was gather a list of all the CSSPropertyIDs that were missing. 1268594 2 joepeck 2017-01-20 14:42:37 -0800 Hmm, no I didn't add them and they don't show up in the list I was thinking of (computedProperties in CSSComputedStyleDeclarations.cpp). 1268612 3 webkit-bug-importer 2017-01-20 15:18:57 -0800 <rdar://problem/30126160> 1269857 4 simon.fraser 2017-01-25 09:46:46 -0800 This is a hot topic in the css wg currently. Would be nice to fix this: https://github.com/w3c/csswg-drafts/issues/116 1270223 5 bburg 2017-01-26 10:27:46 -0800 @Simon/Myles, did this progress with recent change to make this not web-visible? 1270262 6 simon.fraser 2017-01-26 11:32:57 -0800 background-repeat-x/y were historically not web-visible. We temporarily made them visible by mistake, which I reverted yesterday. But I think the inspector has treated them as actual properties for a long time. 1270266 7 joepeck 2017-01-26 11:38:40 -0800 Yes, Devin pointed out that they show up in the CSS autocompletion for example because it show sup in CSS.getSupportedCSSProperties. We should be excluding it from that list. I believe Devin started looking at this already. 1270279 8 simon.fraser 2017-01-26 12:06:12 -0800 These properties have "internal-only": true in the JSON now, so you should key off of that to decide what to hide in the UI. 1270358 9 299857 hi 2017-01-26 14:42:33 -0800 Created attachment 299857 Patch 1270360 10 299857 joepeck 2017-01-26 14:54:34 -0800 Comment on attachment 299857 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=299857&action=review On the face, this looks good to me! Update the test and I'll give it a solid review. > Source/WebCore/css/makeprop.pl:145 > + Style: remove this blank line. > Source/WebCore/css/makeprop.pl:402 > +bool internalCSSProperty(const CSSPropertyID&); I'd name this "isInternalCSSProperty". And have it take a CSSPropertyID, not a reference. Since its just a numeric value. > LayoutTests/inspector/css/property-validity.html:13 > +<script> > +function test() { I'd like to see this rewritten to use the TestSuite code. It wouldn't need to change much and I suspect it would be easier to read. > LayoutTests/inspector/css/property-validity.html:72 > + <p>Testing that the author rules returned by CSSStyleManager.stylesForNode have lowercase property names regardless of CSS source formatting.</p> This description does not match the test. 1270406 11 299869 hi 2017-01-26 15:55:27 -0800 Created attachment 299869 Patch 1270502 12 299869 joepeck 2017-01-26 19:56:44 -0800 Comment on attachment 299869 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=299869&action=review r=me > Source/WebCore/css/makeprop.pl:260 > + print GPERF " case CSSPropertyID::CSSProperty" . $nameToId{$name} . ":\n"; Style: Perl indentation here should be 4 spaces. > LayoutTests/inspector/css/property-members.html:26 > + suite.addTestCase({ > + name: "CSSProperty.valid", This is beginning to look like an excellent unit test. Compare it to: LayoutTests/inspector/unit-tests/wrapped-promise.html We should follow that example and make this a unit-test for CSSProperty. Rename it to: (Keeping this in the css subdirectory because it depends on CSS domain behavior) LayoutTests/inspector/css/css-property.html Keep the suite name "CSSProperty" but name the individual test cases after the methods. So this one would be "CSSProperty.prototype.get valid". The `validateProperty` function can go inside of here, since if you were to test other CSSProperty.prototype methods. We can handle any other cleanup later when we start testing other CSSProperty methods. You may even want to test a slew of other CSSProperty.prototype methods while you are here! > LayoutTests/inspector/css/property-members.html:64 > + InspectorTest.log("DOM node not found."); Nit: While you're here this might as well be `InspectorTest.fail` instead of `InspectorTest.log`. > LayoutTests/inspector/css/property-members.html:73 > + <p>Testing that member values of CSSProperty are correct.</p> In the same spirit, just make this "Testing methods of CSSProperty." 1270598 13 299921 hi 2017-01-27 01:10:56 -0800 Created attachment 299921 Patch 1270689 14 299921 joepeck 2017-01-27 10:43:13 -0800 Comment on attachment 299921 Patch New tests look good for me! 1270698 15 299921 commit-queue 2017-01-27 10:59:33 -0800 Comment on attachment 299921 Patch Clearing flags on attachment: 299921 Committed r211289: <http://trac.webkit.org/changeset/211289> 1270699 16 commit-queue 2017-01-27 10:59:39 -0800 All reviewed patches have been landed. Closing bug. 299857 2017-01-26 14:42:33 -0800 2017-01-26 15:55:23 -0800 Patch bug-167255-20170126144030.patch text/plain 10483 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiYzQwYzQwMTlkYTY5NWVmZGJiY2RhZDVjNTA3OTIwYThkN2ZiN2MyLi42 ZjcxOTdmMDRiMzlmYTRjZjU3ZDFkODQ1N2I3ODgwNWU5NWYzMWEyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjMgQEAKKzIwMTctMDEtMjYgIERldmluIFJvdXNzbyAgPGRjcm91c3NvK3dlYmtpdEBn bWFpbC5jb20+CisKKyAgICAgICAgU3R5bGVzIHNob3VsZCBub3Qgc2hvdyBiYWNrZ3JvdW5kLXJl cGVhdC14L3ksIG9yIC13ZWJraXQtbWFzay1yZXBlYXQteC95CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjcyNTUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBpbnNwZWN0b3IvY3NzL3Byb3BlcnR5 LXZhbGlkaXR5Lmh0bWwKKworICAgICAgICAqIGNzcy9tYWtlcHJvcC5wbDoKKyAgICAgICAgKGFk ZFByb3BlcnR5KToKKyAgICAgICAgQWRkIGEgZ2VuZXJhdGVkIGZ1bmN0aW9uIGBpbnRlcm5hbENT U1Byb3BlcnR5YCB0aGF0IGNoZWNrcyB0aGUgZ2l2ZW4gQ1NTUHJvcGVydHlJRCBhZ2FpbnN0Cisg ICAgICAgIGEgZGVyaXZlZCBsaXN0IG9mIHByb3BlcnRpZXMgZnJvbSBDU1NQcm9wZXJ0aWVzLmpz b24gd2l0aCAiaW50ZXJuYWwtb25seSIuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y Q1NTQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ1NTQWdlbnQ6OmdldFN1 cHBvcnRlZENTU1Byb3BlcnRpZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JTdHls ZVNoZWV0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclN0eWxlOjpzdHlsZVdpdGhQ cm9wZXJ0aWVzKToKKyAgICAgICAgT25seSBwYXNzIENTUyBwcm9wZXJ0eSBwYXlsb2FkcyB0byB0 aGUgZnJvbnRlbmQgaWYgdGhleSBhcmUgbm90IGludGVybmFsLgorCiAyMDE3LTAxLTI1ICBSeW9z dWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIENyYXNoIHVuZGVyIERPTVNl bGVjdGlvbjo6ZGVsZXRlRnJvbURvY3VtZW50KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9tYWtlcHJvcC5wbCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9tYWtlcHJvcC5wbAppbmRleCBi NGIwOTY4OTZhODI4YWQ4NTVhMTkxZmI2YjU3YWU3MDFiYjBmZjdhLi4yYzczYjYwYmQ4MzM0Mjhk M2RhNmI5Y2UxOWQzNmMwNzBkYjE5ZjhjIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv bWFrZXByb3AucGwKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL21ha2Vwcm9wLnBsCkBAIC01OCw2 ICs1OCw3IEBAIGRpZSAiV2UndmUgcmVhY2hlZCBtb3JlIHRoYW4gMTAyNCBDU1MgcHJvcGVydGll cywgcGxlYXNlIG1ha2Ugc3VyZSB0byB1cGRhdGUgQ1NTCiBteSAlZGVmaW5lcyA9IG1hcCB7ICRf ID0+IDEgfSBzcGxpdCgvIC8sICRkZWZpbmVzKTsKIAogbXkgQG5hbWVzOworbXkgQGludGVybmFs UHJvcHJlcnRpZXM7CiBteSAkbnVtUHJlZGVmaW5lZFByb3BlcnRpZXMgPSAyOwogbXkgJW5hbWVJ c0luaGVyaXRlZDsKIG15ICVuYW1lSXNIaWdoUHJpb3JpdHk7CkBAIC0xNDAsNyArMTQxLDkgQEAg c3ViIGFkZFByb3BlcnR5KCQkKQogICAgICAgICAgICAgICAgIH0gZWxzaWYgKCRzdHlsZUJ1aWxk ZXJPcHRpb25zeyRjb2RlZ2VuT3B0aW9uTmFtZX0pIHsKICAgICAgICAgICAgICAgICAgICAgJHBy b3BlcnRpZXNXaXRoU3R5bGVCdWlsZGVyT3B0aW9uc3skbmFtZX17JGNvZGVnZW5PcHRpb25OYW1l fSA9ICRjb2RlZ2VuUHJvcGVydGllcy0+eyRjb2RlZ2VuT3B0aW9uTmFtZX07CiAgICAgICAgICAg ICAgICAgfSBlbHNpZiAoJGNvZGVnZW5PcHRpb25OYW1lIGVxICJpbnRlcm5hbC1vbmx5Iikgewot ICAgICAgICAgICAgICAgICAgICAjIGludGVybmFsLW9ubHkgcHJvcGVydGllcyBleGlzdCB0byBt YWtlIGl0IGVhc2llciB0byBwYXJzZSBjb21wb3VuZCBwcm9wZXJ0aWVzIChlLmcuIGJhY2tncm91 bmQtcmVwZWF0KSBhcyBpZiB0aGV5IHdlcmUgc2hvcnRoYW5kcy4gVGhpcyBkb2Vzbid0IGN1cnJl bnRseSBhZmZlY3QgY29kZWdlbi4KKyAgICAgICAgICAgICAgICAgICAgIyBpbnRlcm5hbC1vbmx5 IHByb3BlcnRpZXMgZXhpc3QgdG8gbWFrZSBpdCBlYXNpZXIgdG8gcGFyc2UgY29tcG91bmQgcHJv cGVydGllcyAoZS5nLiBiYWNrZ3JvdW5kLXJlcGVhdCkgYXMgaWYgdGhleSB3ZXJlIHNob3J0aGFu ZHMuCisKKyAgICAgICAgICAgICAgICAgICAgcHVzaCBAaW50ZXJuYWxQcm9wcmVydGllcywgJG5h bWUKICAgICAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgICAgICBkaWUgIlVu cmVjb2duaXplZCBjb2RlZ2VuIHByb3BlcnR5IFwiJG9wdGlvbk5hbWVcIiBmb3IgJG5hbWUgcHJv cGVydHkuIjsKICAgICAgICAgICAgICAgICB9CkBAIC0yNDIsMTMgKzI0NSwyOSBAQCBmb3IgbXkg JG5hbWUgKEBuYW1lcykgewogICAgIH0KIH0KIAotcHJpbnQgR1BFUkY8PCAiRU9GIjsKK3ByaW50 IEdQRVJGIDw8ICJFT0YiOwogJSUKIGNvbnN0IFByb3BlcnR5KiBmaW5kUHJvcGVydHkoY29uc3Qg Y2hhciogc3RyLCB1bnNpZ25lZCBpbnQgbGVuKQogewogICAgIHJldHVybiBDU1NQcm9wZXJ0eU5h bWVzSGFzaDo6ZmluZFByb3BlcnR5SW1wbChzdHIsIGxlbik7CiB9CiAKK2Jvb2wgaW50ZXJuYWxD U1NQcm9wZXJ0eShjb25zdCBDU1NQcm9wZXJ0eUlEJiBpZCkKK3sKKyAgICBzd2l0Y2ggKGlkKSB7 CitFT0YKKworZm9yZWFjaCBteSAkbmFtZSAoQGludGVybmFsUHJvcHJlcnRpZXMpIHsKKyAgcHJp bnQgR1BFUkYgIiAgICBjYXNlIENTU1Byb3BlcnR5SUQ6OkNTU1Byb3BlcnR5IiAuICRuYW1lVG9J ZHskbmFtZX0gLiAiOlxuIjsKK30KKworcHJpbnQgR1BFUkYgPDwgIkVPRiI7CisgICAgICAgIHJl dHVybiB0cnVlOworICAgIGRlZmF1bHQ6CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9Cit9 CisKIGNvbnN0IGNoYXIqIGdldFByb3BlcnR5TmFtZShDU1NQcm9wZXJ0eUlEIGlkKQogewogICAg IGlmIChpZCA8IGZpcnN0Q1NTUHJvcGVydHkpCkBAIC0zODAsNiArMzk5LDcgQEAgcHJpbnQgSEVB REVSICJjb25zdCBDU1NQcm9wZXJ0eUlEIGxhc3RIaWdoUHJpb3JpdHlQcm9wZXJ0eSA9IENTU1By b3BlcnR5IiAuICRuYW0KIAogcHJpbnQgSEVBREVSIDw8ICJFT0YiOwogCitib29sIGludGVybmFs Q1NTUHJvcGVydHkoY29uc3QgQ1NTUHJvcGVydHlJRCYpOwogY29uc3QgY2hhciogZ2V0UHJvcGVy dHlOYW1lKENTU1Byb3BlcnR5SUQpOwogY29uc3QgV1RGOjpBdG9taWNTdHJpbmcmIGdldFByb3Bl cnR5TmFtZUF0b21pY1N0cmluZyhDU1NQcm9wZXJ0eUlEIGlkKTsKIFdURjo6U3RyaW5nIGdldFBy b3BlcnR5TmFtZVN0cmluZyhDU1NQcm9wZXJ0eUlEIGlkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwCmluZGV4IDA1ODk0NzQ2NmZkN2M4ZDdkNTBj ZDZlZWJiNjYwODFjOTg3MjE1MmMuLjdmZjU1NDc1OWM0N2MxYWNhNzFmMjg0Y2MxYTI5YThiYTY2 NmQ0NzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NB Z2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50 LmNwcApAQCAtODQ1LDYgKzg0NSw5IEBAIHZvaWQgSW5zcGVjdG9yQ1NTQWdlbnQ6OmdldFN1cHBv cnRlZENTU1Byb3BlcnRpZXMoRXJyb3JTdHJpbmcmLCBSZWZQdHI8SW5zcGVjdG9yCiAgICAgYXV0 byBwcm9wZXJ0aWVzID0gSW5zcGVjdG9yOjpQcm90b2NvbDo6QXJyYXk8SW5zcGVjdG9yOjpQcm90 b2NvbDo6Q1NTOjpDU1NQcm9wZXJ0eUluZm8+OjpjcmVhdGUoKTsKICAgICBmb3IgKGludCBpID0g Zmlyc3RDU1NQcm9wZXJ0eTsgaSA8PSBsYXN0Q1NTUHJvcGVydHk7ICsraSkgewogICAgICAgICBD U1NQcm9wZXJ0eUlEIGlkID0gY29udmVydFRvQ1NTUHJvcGVydHlJRChpKTsKKyAgICAgICAgaWYg KGludGVybmFsQ1NTUHJvcGVydHkoaWQpKQorICAgICAgICAgICAgY29udGludWU7CisKICAgICAg ICAgYXV0byBwcm9wZXJ0eSA9IEluc3BlY3Rvcjo6UHJvdG9jb2w6OkNTUzo6Q1NTUHJvcGVydHlJ bmZvOjpjcmVhdGUoKQogICAgICAgICAgICAgLnNldE5hbWUoZ2V0UHJvcGVydHlOYW1lU3RyaW5n KGlkKSkKICAgICAgICAgICAgIC5yZWxlYXNlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5jcHAKaW5kZXggOTQ5MmM5Njk1YTlkODNlY2E2YWJm M2IyZjM4ZGNiMTk5NGIzM2I1ZS4uMGVkNmU4YjBmYTEwMjBjYWVkYzQ5Yzc0ODE4ODNjZjMwM2E3 ZDVlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxl U2hlZXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNo ZWV0LmNwcApAQCAtNjU0LDggKzY1NCwxMCBAQCBSZWY8SW5zcGVjdG9yOjpQcm90b2NvbDo6Q1NT OjpDU1NTdHlsZT4gSW5zcGVjdG9yU3R5bGU6OnN0eWxlV2l0aFByb3BlcnRpZXMoKSBjbwogCiAg ICAgICAgIHByb3BlcnRpZXNPYmplY3QtPmFkZEl0ZW0ocHJvcGVydHkuY29weVJlZigpKTsKIAor ICAgICAgICBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SWQgPSBjc3NQcm9wZXJ0eUlEKG5hbWUpOwor CiAgICAgICAgIC8vIERlZmF1bHQgInBhcnNlZE9rIiA9PSB0cnVlLgotICAgICAgICBpZiAoIXBy b3BlcnR5RW50cnkucGFyc2VkT2spCisgICAgICAgIGlmICghcHJvcGVydHlFbnRyeS5wYXJzZWRP ayB8fCBpbnRlcm5hbENTU1Byb3BlcnR5KHByb3BlcnR5SWQpKQogICAgICAgICAgICAgcHJvcGVy dHktPnNldFBhcnNlZE9rKGZhbHNlKTsKICAgICAgICAgaWYgKGl0LT5oYXNSYXdUZXh0KCkpCiAg ICAgICAgICAgICBwcm9wZXJ0eS0+c2V0VGV4dChpdC0+cmF3VGV4dCk7CkBAIC02NzgsNyArNjgw LDcgQEAgUmVmPEluc3BlY3Rvcjo6UHJvdG9jb2w6OkNTUzo6Q1NTU3R5bGU+IEluc3BlY3RvclN0 eWxlOjpzdHlsZVdpdGhQcm9wZXJ0aWVzKCkgY28KICAgICAgICAgICAgICAgICAvLyBQYXJzZWQg cHJvcGVydHkgb3ZlcnJpZGVzIGFueSBwcm9wZXJ0eSB3aXRoIHRoZSBzYW1lIG5hbWUuIE5vbi1w YXJzZWQgcHJvcGVydHkgb3ZlcnJpZGVzCiAgICAgICAgICAgICAgICAgLy8gcHJldmlvdXMgbm9u LXBhcnNlZCBwcm9wZXJ0eSB3aXRoIHRoZSBzYW1lIG5hbWUgKGlmIGFueSkuCiAgICAgICAgICAg ICAgICAgYm9vbCBzaG91bGRJbmFjdGl2YXRlID0gZmFsc2U7Ci0gICAgICAgICAgICAgICAgQ1NT UHJvcGVydHlJRCBwcm9wZXJ0eUlkID0gY3NzUHJvcGVydHlJRChuYW1lKTsKKwogICAgICAgICAg ICAgICAgIC8vIENhbm9uaWNhbGl6ZSBwcm9wZXJ0eSBuYW1lcyB0byB0cmVhdCBub24tcHJlZml4 ZWQgYW5kIHZlbmRvci1wcmVmaXhlZCBwcm9wZXJ0eSBuYW1lcyB0aGUgc2FtZSAob3BhY2l0eSB2 cy4gLXdlYmtpdC1vcGFjaXR5KS4KICAgICAgICAgICAgICAgICBTdHJpbmcgY2Fub25pY2FsUHJv cGVydHlOYW1lID0gcHJvcGVydHlJZCA/IGdldFByb3BlcnR5TmFtZVN0cmluZyhwcm9wZXJ0eUlk KSA6IG5hbWU7CiAgICAgICAgICAgICAgICAgSGFzaE1hcDxTdHJpbmcsIFJlZlB0cjxJbnNwZWN0 b3I6OlByb3RvY29sOjpDU1M6OkNTU1Byb3BlcnR5Pj46Oml0ZXJhdG9yIGFjdGl2ZUl0ID0gcHJv cGVydHlOYW1lVG9QcmV2aW91c0FjdGl2ZVByb3BlcnR5LmZpbmQoY2Fub25pY2FsUHJvcGVydHlO YW1lKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwppbmRleCAwNDc4NTk2Njk0MTJjZGRhZWY0NmFkNWI1MGM0Y2U0ZjAzOGNiOTlmLi42 NWZmYTQyZDMyOTkwOTQ2YzlmMjdkYWVjMjhlNTk1MjQzZTEzOGRkIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTUgQEAKKzIwMTctMDEtMjYgIERldmluIFJvdXNzbyAgPGRjcm91c3NvK3dlYmtpdEBnbWFpbC5j b20+CisKKyAgICAgICAgU3R5bGVzIHNob3VsZCBub3Qgc2hvdyBiYWNrZ3JvdW5kLXJlcGVhdC14 L3ksIG9yIC13ZWJraXQtbWFzay1yZXBlYXQteC95CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjcyNTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBDaGVja3MgdGhhdCBpbnRlcm5hbC1vbmx5IENTUyBwcm9w ZXJ0aWVzIGFyZSBtYXJrZWQgYXMgaW52YWxpZCB3aGVuIHBhc3NlZCB0byBXZWJJbnNwZWN0b3Iu CisKKyAgICAgICAgKiBpbnNwZWN0b3IvY3NzL3Byb3BlcnR5LXZhbGlkaXR5LWV4cGVjdGVkLnR4 dDogQWRkZWQuCisgICAgICAgICogaW5zcGVjdG9yL2Nzcy9wcm9wZXJ0eS12YWxpZGl0eS5odG1s OiBBZGRlZC4KKwogMjAxNy0wMS0yNSAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4K IAogICAgICAgICBDcmFzaCB1bmRlciBET01TZWxlY3Rpb246OmRlbGV0ZUZyb21Eb2N1bWVudCgp CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY3NzL3Byb3BlcnR5LXZhbGlkaXR5 LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jc3MvcHJvcGVydHktdmFsaWRp dHktZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjdmZDY2ODBiMzFmMTc2ODlhN2MwNjg0MDk2NDI0 ZTM1M2JlZjg0MzYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY3Nz L3Byb3BlcnR5LXZhbGlkaXR5LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDEyIEBACitUZXN0aW5n IHRoYXQgdGhlIGF1dGhvciBydWxlcyByZXR1cm5lZCBieSBDU1NTdHlsZU1hbmFnZXIuc3R5bGVz Rm9yTm9kZSBoYXZlIGxvd2VyY2FzZSBwcm9wZXJ0eSBuYW1lcyByZWdhcmRsZXNzIG9mIENTUyBz b3VyY2UgZm9ybWF0dGluZy4KKworUEFTUzogImJhY2tncm91bmQtcmVwZWF0IiBpcyBhIHZhbGlk IHByb3BlcnR5LgorUEFTUzogImJhY2tncm91bmQtcmVwZWF0IiBpcyBub3QgYW4gYW5vbnltb3Vz IHByb3BlcnR5LgorCitQQVNTOiAiYmFja2dyb3VuZC1yZXBlYXQteCIgaXMgYSBpbnZhbGlkIHBy b3BlcnR5LgorUEFTUzogImJhY2tncm91bmQtcmVwZWF0LXgiIGlzIG5vdCBhbiBhbm9ueW1vdXMg cHJvcGVydHkuCisKK1BBU1M6ICJiYWNrZ3JvdW5kLXJlcGVhdC1pbnZhbGlkIiBpcyBhIGludmFs aWQgcHJvcGVydHkuCitQQVNTOiAiYmFja2dyb3VuZC1yZXBlYXQtaW52YWxpZCIgaXMgbm90IGFu IGFub255bW91cyBwcm9wZXJ0eS4KKworCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvY3NzL3Byb3BlcnR5LXZhbGlkaXR5Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY3Nz L3Byb3BlcnR5LXZhbGlkaXR5Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZjQ3NTRkYzdlOGI1OGYzYmZiMjI1 MzIzNTQwYTdlYmUyNzliODRiOQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9jc3MvcHJvcGVydHktdmFsaWRpdHkuaHRtbApAQCAtMCwwICsxLDc2IEBACis8IURPQ1RZ UEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8c3R5bGU+CitkaXYjbm9kZTEgeworICAgIGJhY2tn cm91bmQtcmVwZWF0OiByZXBlYXQ7CisgICAgYmFja2dyb3VuZC1yZXBlYXQteDogcmVwZWF0Owor ICAgIGJhY2tncm91bmQtcmVwZWF0LWludmFsaWQ6IHJlcGVhdDsKK30KKzwvc3R5bGU+Cis8c2Ny aXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2VzL2luc3BlY3Rvci10 ZXN0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CitmdW5jdGlvbiB0ZXN0KCkgeworICAgIGxldCBu b2RlU3R5bGVzID0gbnVsbDsKKworICAgIGZ1bmN0aW9uIHZhbGlkYXRlUHJvcGVydHkocHJvcGVy dHksIGV4cGVjdGVkVmFsaWRWYWx1ZSkKKyAgICB7CisgICAgICAgIEluc3BlY3RvclRlc3QuZXhw ZWN0RXF1YWwocHJvcGVydHkudmFsaWQsIGV4cGVjdGVkVmFsaWRWYWx1ZSwgYCIke3Byb3BlcnR5 Lm5hbWV9IiBpcyBhICR7ZXhwZWN0ZWRWYWxpZFZhbHVlID8gInZhbGlkIiA6ICJpbnZhbGlkIn0g cHJvcGVydHkuYCk7CisgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RmFsc2UocHJvcGVydHku YW5vbnltb3VzLCBgIiR7cHJvcGVydHkubmFtZX0iIGlzIG5vdCBhbiBhbm9ueW1vdXMgcHJvcGVy dHkuYCk7CisgICAgICAgIEluc3BlY3RvclRlc3QubG9nKCIiKTsKKyAgICB9CisKKyAgICBmdW5j dGlvbiB2YWxpZGF0ZVN0eWxlcygpCisgICAgeworICAgICAgICBmb3IgKGxldCBydWxlIG9mIG5v ZGVTdHlsZXMubWF0Y2hlZFJ1bGVzKSB7CisgICAgICAgICAgICBpZiAocnVsZS5zZWxlY3RvclRl eHQgIT09ICJkaXYjbm9kZTEiKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAg ICAgICBmb3IgKGxldCBwcm9wZXJ0eSBvZiBydWxlLnN0eWxlLnByb3BlcnRpZXMpIHsKKyAgICAg ICAgICAgICAgICBzd2l0Y2ggKHByb3BlcnR5Lm5hbWUpIHsKKyAgICAgICAgICAgICAgICBjYXNl ICJiYWNrZ3JvdW5kLXJlcGVhdCI6CisgICAgICAgICAgICAgICAgICAgIHZhbGlkYXRlUHJvcGVy dHkocHJvcGVydHksIHRydWUpOworICAgICAgICAgICAgICAgICAgICBicmVhazsKKworICAgICAg ICAgICAgICAgIGNhc2UgImJhY2tncm91bmQtcmVwZWF0LXgiOgorICAgICAgICAgICAgICAgIGNh c2UgImJhY2tncm91bmQtcmVwZWF0LWludmFsaWQiOgorICAgICAgICAgICAgICAgICAgICB2YWxp ZGF0ZVByb3BlcnR5KHByb3BlcnR5LCBmYWxzZSk7CisgICAgICAgICAgICAgICAgICAgIGJyZWFr OworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorCisgICAgICAg IEluc3BlY3RvclRlc3QuY29tcGxldGVUZXN0KCk7CisgICAgfQorCisgICAgZnVuY3Rpb24gb25T dHlsZXNSZWZyZXNoZWQoKQorICAgIHsKKyAgICAgICAgbm9kZVN0eWxlcy5yZW1vdmVFdmVudExp c3RlbmVyKFdlYkluc3BlY3Rvci5ET01Ob2RlU3R5bGVzLkV2ZW50LlJlZnJlc2hlZCwgb25TdHls ZXNSZWZyZXNoZWQsIHRoaXMpOworICAgICAgICB2YWxpZGF0ZVN0eWxlcygpOworICAgIH0KKwor ICAgIFdlYkluc3BlY3Rvci5kb21UcmVlTWFuYWdlci5yZXF1ZXN0RG9jdW1lbnQoZnVuY3Rpb24o ZG9jdW1lbnROb2RlKSB7CisgICAgICAgIFdlYkluc3BlY3Rvci5kb21UcmVlTWFuYWdlci5xdWVy eVNlbGVjdG9yKGRvY3VtZW50Tm9kZS5pZCwgIiNub2RlMSIsIGZ1bmN0aW9uKGNvbnRlbnROb2Rl SWQpIHsKKyAgICAgICAgICAgIGlmIChjb250ZW50Tm9kZUlkKSB7CisgICAgICAgICAgICAgICAg bGV0IGRvbU5vZGUgPSBXZWJJbnNwZWN0b3IuZG9tVHJlZU1hbmFnZXIubm9kZUZvcklkKGNvbnRl bnROb2RlSWQpOworICAgICAgICAgICAgICAgIG5vZGVTdHlsZXMgPSBXZWJJbnNwZWN0b3IuY3Nz U3R5bGVNYW5hZ2VyLnN0eWxlc0Zvck5vZGUoZG9tTm9kZSk7CisKKyAgICAgICAgICAgICAgICBp ZiAobm9kZVN0eWxlcy5uZWVkc1JlZnJlc2gpCisgICAgICAgICAgICAgICAgICAgIG5vZGVTdHls ZXMuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRE9NTm9kZVN0eWxlcy5FdmVudC5SZWZy ZXNoZWQsIG9uU3R5bGVzUmVmcmVzaGVkLCB0aGlzKTsKKyAgICAgICAgICAgICAgICBlbHNlCisg ICAgICAgICAgICAgICAgICAgIHZhbGlkYXRlU3R5bGVzKCk7CisgICAgICAgICAgICB9IGVsc2Ug eworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QubG9nKCJET00gbm9kZSBub3QgZm91bmQu Iik7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5jb21wbGV0ZVRlc3QoKTsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgfSk7CisgICAgfSk7Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxi b2R5IG9ubG9hZD0icnVuVGVzdCgpIj4KKyAgICA8cD5UZXN0aW5nIHRoYXQgdGhlIGF1dGhvciBy dWxlcyByZXR1cm5lZCBieSBDU1NTdHlsZU1hbmFnZXIuc3R5bGVzRm9yTm9kZSBoYXZlIGxvd2Vy Y2FzZSBwcm9wZXJ0eSBuYW1lcyByZWdhcmRsZXNzIG9mIENTUyBzb3VyY2UgZm9ybWF0dGluZy48 L3A+CisKKyAgICA8ZGl2IGlkPSJub2RlMSI+PC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 299869 2017-01-26 15:55:27 -0800 2017-01-27 01:10:56 -0800 Patch bug-167255-20170126155324.patch text/plain 10561 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiYzQwYzQwMTlkYTY5NWVmZGJiY2RhZDVjNTA3OTIwYThkN2ZiN2MyLi44 OTYxMGJhOTgwNWUyZmE1NjhlMzkyNTc4MzQ1MTI5YTJmNDExYWZhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjMgQEAKKzIwMTctMDEtMjYgIERldmluIFJvdXNzbyAgPGRjcm91c3NvK3dlYmtpdEBn bWFpbC5jb20+CisKKyAgICAgICAgU3R5bGVzIHNob3VsZCBub3Qgc2hvdyBiYWNrZ3JvdW5kLXJl cGVhdC14L3ksIG9yIC13ZWJraXQtbWFzay1yZXBlYXQteC95CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjcyNTUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBpbnNwZWN0b3IvY3NzL3Byb3BlcnR5 LW1lbWJlcnMuaHRtbAorCisgICAgICAgICogY3NzL21ha2Vwcm9wLnBsOgorICAgICAgICAoYWRk UHJvcGVydHkpOgorICAgICAgICBBZGQgYSBnZW5lcmF0ZWQgZnVuY3Rpb24gYGlzSW50ZXJuYWxD U1NQcm9wZXJ0eWAgdGhhdCBjaGVja3MgdGhlIGdpdmVuIENTU1Byb3BlcnR5SUQgYWdhaW5zdAor ICAgICAgICBhIGRlcml2ZWQgbGlzdCBvZiBwcm9wZXJ0aWVzIGZyb20gQ1NTUHJvcGVydGllcy5q c29uIHdpdGggImludGVybmFsLW9ubHkiLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rv ckNTU0FnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNTU0FnZW50OjpnZXRT dXBwb3J0ZWRDU1NQcm9wZXJ0aWVzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yU3R5 bGVTaGVldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JTdHlsZTo6c3R5bGVXaXRo UHJvcGVydGllcyk6CisgICAgICAgIE9ubHkgcGFzcyBDU1MgcHJvcGVydHkgcGF5bG9hZHMgdG8g dGhlIGZyb250ZW5kIGlmIHRoZXkgYXJlIG5vdCBpbnRlcm5hbC4KKwogMjAxNy0wMS0yNSAgUnlv c3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBDcmFzaCB1bmRlciBET01T ZWxlY3Rpb246OmRlbGV0ZUZyb21Eb2N1bWVudCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9jc3MvbWFrZXByb3AucGwgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvbWFrZXByb3AucGwKaW5kZXgg YjRiMDk2ODk2YTgyOGFkODU1YTE5MWZiNmI1N2FlNzAxYmIwZmY3YS4uNTdiMDY5ZmExNDcwMTcx MDQwNGI1NmIyZTg1NDQ4YzNjMGYxMDFjYSAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvY3Nz L21ha2Vwcm9wLnBsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9tYWtlcHJvcC5wbApAQCAtNTgs NiArNTgsNyBAQCBkaWUgIldlJ3ZlIHJlYWNoZWQgbW9yZSB0aGFuIDEwMjQgQ1NTIHByb3BlcnRp ZXMsIHBsZWFzZSBtYWtlIHN1cmUgdG8gdXBkYXRlIENTUwogbXkgJWRlZmluZXMgPSBtYXAgeyAk XyA9PiAxIH0gc3BsaXQoLyAvLCAkZGVmaW5lcyk7CiAKIG15IEBuYW1lczsKK215IEBpbnRlcm5h bFByb3ByZXJ0aWVzOwogbXkgJG51bVByZWRlZmluZWRQcm9wZXJ0aWVzID0gMjsKIG15ICVuYW1l SXNJbmhlcml0ZWQ7CiBteSAlbmFtZUlzSGlnaFByaW9yaXR5OwpAQCAtMTQwLDcgKzE0MSw4IEBA IHN1YiBhZGRQcm9wZXJ0eSgkJCkKICAgICAgICAgICAgICAgICB9IGVsc2lmICgkc3R5bGVCdWls ZGVyT3B0aW9uc3skY29kZWdlbk9wdGlvbk5hbWV9KSB7CiAgICAgICAgICAgICAgICAgICAgICRw cm9wZXJ0aWVzV2l0aFN0eWxlQnVpbGRlck9wdGlvbnN7JG5hbWV9eyRjb2RlZ2VuT3B0aW9uTmFt ZX0gPSAkY29kZWdlblByb3BlcnRpZXMtPnskY29kZWdlbk9wdGlvbk5hbWV9OwogICAgICAgICAg ICAgICAgIH0gZWxzaWYgKCRjb2RlZ2VuT3B0aW9uTmFtZSBlcSAiaW50ZXJuYWwtb25seSIpIHsK LSAgICAgICAgICAgICAgICAgICAgIyBpbnRlcm5hbC1vbmx5IHByb3BlcnRpZXMgZXhpc3QgdG8g bWFrZSBpdCBlYXNpZXIgdG8gcGFyc2UgY29tcG91bmQgcHJvcGVydGllcyAoZS5nLiBiYWNrZ3Jv dW5kLXJlcGVhdCkgYXMgaWYgdGhleSB3ZXJlIHNob3J0aGFuZHMuIFRoaXMgZG9lc24ndCBjdXJy ZW50bHkgYWZmZWN0IGNvZGVnZW4uCisgICAgICAgICAgICAgICAgICAgICMgaW50ZXJuYWwtb25s eSBwcm9wZXJ0aWVzIGV4aXN0IHRvIG1ha2UgaXQgZWFzaWVyIHRvIHBhcnNlIGNvbXBvdW5kIHBy b3BlcnRpZXMgKGUuZy4gYmFja2dyb3VuZC1yZXBlYXQpIGFzIGlmIHRoZXkgd2VyZSBzaG9ydGhh bmRzLgorICAgICAgICAgICAgICAgICAgICBwdXNoIEBpbnRlcm5hbFByb3ByZXJ0aWVzLCAkbmFt ZQogICAgICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgIGRpZSAiVW5y ZWNvZ25pemVkIGNvZGVnZW4gcHJvcGVydHkgXCIkb3B0aW9uTmFtZVwiIGZvciAkbmFtZSBwcm9w ZXJ0eS4iOwogICAgICAgICAgICAgICAgIH0KQEAgLTI0MiwxMyArMjQ0LDI5IEBAIGZvciBteSAk bmFtZSAoQG5hbWVzKSB7CiAgICAgfQogfQogCi1wcmludCBHUEVSRjw8ICJFT0YiOworcHJpbnQg R1BFUkYgPDwgIkVPRiI7CiAlJQogY29uc3QgUHJvcGVydHkqIGZpbmRQcm9wZXJ0eShjb25zdCBj aGFyKiBzdHIsIHVuc2lnbmVkIGludCBsZW4pCiB7CiAgICAgcmV0dXJuIENTU1Byb3BlcnR5TmFt ZXNIYXNoOjpmaW5kUHJvcGVydHlJbXBsKHN0ciwgbGVuKTsKIH0KIAorYm9vbCBpc0ludGVybmFs Q1NTUHJvcGVydHkoY29uc3QgQ1NTUHJvcGVydHlJRCBpZCkKK3sKKyAgICBzd2l0Y2ggKGlkKSB7 CitFT0YKKworZm9yZWFjaCBteSAkbmFtZSAoQGludGVybmFsUHJvcHJlcnRpZXMpIHsKKyAgcHJp bnQgR1BFUkYgIiAgICBjYXNlIENTU1Byb3BlcnR5SUQ6OkNTU1Byb3BlcnR5IiAuICRuYW1lVG9J ZHskbmFtZX0gLiAiOlxuIjsKK30KKworcHJpbnQgR1BFUkYgPDwgIkVPRiI7CisgICAgICAgIHJl dHVybiB0cnVlOworICAgIGRlZmF1bHQ6CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9Cit9 CisKIGNvbnN0IGNoYXIqIGdldFByb3BlcnR5TmFtZShDU1NQcm9wZXJ0eUlEIGlkKQogewogICAg IGlmIChpZCA8IGZpcnN0Q1NTUHJvcGVydHkpCkBAIC0zODAsNiArMzk4LDcgQEAgcHJpbnQgSEVB REVSICJjb25zdCBDU1NQcm9wZXJ0eUlEIGxhc3RIaWdoUHJpb3JpdHlQcm9wZXJ0eSA9IENTU1By b3BlcnR5IiAuICRuYW0KIAogcHJpbnQgSEVBREVSIDw8ICJFT0YiOwogCitib29sIGlzSW50ZXJu YWxDU1NQcm9wZXJ0eShjb25zdCBDU1NQcm9wZXJ0eUlEKTsKIGNvbnN0IGNoYXIqIGdldFByb3Bl cnR5TmFtZShDU1NQcm9wZXJ0eUlEKTsKIGNvbnN0IFdURjo6QXRvbWljU3RyaW5nJiBnZXRQcm9w ZXJ0eU5hbWVBdG9taWNTdHJpbmcoQ1NTUHJvcGVydHlJRCBpZCk7CiBXVEY6OlN0cmluZyBnZXRQ cm9wZXJ0eU5hbWVTdHJpbmcoQ1NTUHJvcGVydHlJRCBpZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcAppbmRleCAwNTg5NDc0NjZmZDdjOGQ3ZDUw Y2Q2ZWViYjY2MDgxYzk4NzIxNTJjLi4xYTZjNzY4MDM3ZDNiY2U2NDdkMzA5Y2Y0ZGRhNTc2NzFj ZWExNTBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NT QWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2Vu dC5jcHAKQEAgLTg0NSw2ICs4NDUsOSBAQCB2b2lkIEluc3BlY3RvckNTU0FnZW50OjpnZXRTdXBw b3J0ZWRDU1NQcm9wZXJ0aWVzKEVycm9yU3RyaW5nJiwgUmVmUHRyPEluc3BlY3RvcgogICAgIGF1 dG8gcHJvcGVydGllcyA9IEluc3BlY3Rvcjo6UHJvdG9jb2w6OkFycmF5PEluc3BlY3Rvcjo6UHJv dG9jb2w6OkNTUzo6Q1NTUHJvcGVydHlJbmZvPjo6Y3JlYXRlKCk7CiAgICAgZm9yIChpbnQgaSA9 IGZpcnN0Q1NTUHJvcGVydHk7IGkgPD0gbGFzdENTU1Byb3BlcnR5OyArK2kpIHsKICAgICAgICAg Q1NTUHJvcGVydHlJRCBpZCA9IGNvbnZlcnRUb0NTU1Byb3BlcnR5SUQoaSk7CisgICAgICAgIGlm IChpc0ludGVybmFsQ1NTUHJvcGVydHkoaWQpKQorICAgICAgICAgICAgY29udGludWU7CisKICAg ICAgICAgYXV0byBwcm9wZXJ0eSA9IEluc3BlY3Rvcjo6UHJvdG9jb2w6OkNTUzo6Q1NTUHJvcGVy dHlJbmZvOjpjcmVhdGUoKQogICAgICAgICAgICAgLnNldE5hbWUoZ2V0UHJvcGVydHlOYW1lU3Ry aW5nKGlkKSkKICAgICAgICAgICAgIC5yZWxlYXNlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5jcHAKaW5kZXggOTQ5MmM5Njk1YTlkODNlY2E2 YWJmM2IyZjM4ZGNiMTk5NGIzM2I1ZS4uYjBjNzI1YWUyZmY0YTM0ZjcyZjA3OWM1ZDUyNjVkMjk2 ZmVjZDNlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0 eWxlU2hlZXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdHls ZVNoZWV0LmNwcApAQCAtNjU0LDggKzY1NCwxMCBAQCBSZWY8SW5zcGVjdG9yOjpQcm90b2NvbDo6 Q1NTOjpDU1NTdHlsZT4gSW5zcGVjdG9yU3R5bGU6OnN0eWxlV2l0aFByb3BlcnRpZXMoKSBjbwog CiAgICAgICAgIHByb3BlcnRpZXNPYmplY3QtPmFkZEl0ZW0ocHJvcGVydHkuY29weVJlZigpKTsK IAorICAgICAgICBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SWQgPSBjc3NQcm9wZXJ0eUlEKG5hbWUp OworCiAgICAgICAgIC8vIERlZmF1bHQgInBhcnNlZE9rIiA9PSB0cnVlLgotICAgICAgICBpZiAo IXByb3BlcnR5RW50cnkucGFyc2VkT2spCisgICAgICAgIGlmICghcHJvcGVydHlFbnRyeS5wYXJz ZWRPayB8fCBpc0ludGVybmFsQ1NTUHJvcGVydHkocHJvcGVydHlJZCkpCiAgICAgICAgICAgICBw cm9wZXJ0eS0+c2V0UGFyc2VkT2soZmFsc2UpOwogICAgICAgICBpZiAoaXQtPmhhc1Jhd1RleHQo KSkKICAgICAgICAgICAgIHByb3BlcnR5LT5zZXRUZXh0KGl0LT5yYXdUZXh0KTsKQEAgLTY3OCw3 ICs2ODAsNyBAQCBSZWY8SW5zcGVjdG9yOjpQcm90b2NvbDo6Q1NTOjpDU1NTdHlsZT4gSW5zcGVj dG9yU3R5bGU6OnN0eWxlV2l0aFByb3BlcnRpZXMoKSBjbwogICAgICAgICAgICAgICAgIC8vIFBh cnNlZCBwcm9wZXJ0eSBvdmVycmlkZXMgYW55IHByb3BlcnR5IHdpdGggdGhlIHNhbWUgbmFtZS4g Tm9uLXBhcnNlZCBwcm9wZXJ0eSBvdmVycmlkZXMKICAgICAgICAgICAgICAgICAvLyBwcmV2aW91 cyBub24tcGFyc2VkIHByb3BlcnR5IHdpdGggdGhlIHNhbWUgbmFtZSAoaWYgYW55KS4KICAgICAg ICAgICAgICAgICBib29sIHNob3VsZEluYWN0aXZhdGUgPSBmYWxzZTsKLSAgICAgICAgICAgICAg ICBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SWQgPSBjc3NQcm9wZXJ0eUlEKG5hbWUpOworCiAgICAg ICAgICAgICAgICAgLy8gQ2Fub25pY2FsaXplIHByb3BlcnR5IG5hbWVzIHRvIHRyZWF0IG5vbi1w cmVmaXhlZCBhbmQgdmVuZG9yLXByZWZpeGVkIHByb3BlcnR5IG5hbWVzIHRoZSBzYW1lIChvcGFj aXR5IHZzLiAtd2Via2l0LW9wYWNpdHkpLgogICAgICAgICAgICAgICAgIFN0cmluZyBjYW5vbmlj YWxQcm9wZXJ0eU5hbWUgPSBwcm9wZXJ0eUlkID8gZ2V0UHJvcGVydHlOYW1lU3RyaW5nKHByb3Bl cnR5SWQpIDogbmFtZTsKICAgICAgICAgICAgICAgICBIYXNoTWFwPFN0cmluZywgUmVmUHRyPElu c3BlY3Rvcjo6UHJvdG9jb2w6OkNTUzo6Q1NTUHJvcGVydHk+Pjo6aXRlcmF0b3IgYWN0aXZlSXQg PSBwcm9wZXJ0eU5hbWVUb1ByZXZpb3VzQWN0aXZlUHJvcGVydHkuZmluZChjYW5vbmljYWxQcm9w ZXJ0eU5hbWUpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCmluZGV4IDA0Nzg1OTY2OTQxMmNkZGFlZjQ2YWQ1YjUwYzRjZTRmMDM4Y2I5 OWYuLjMxZTQ5MTc1MGQ1ZWM2NzQ1YjZjZjdkYmU4NmY5ZjE2YzJiNDBmZmMgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxNy0wMS0yNiAgRGV2aW4gUm91c3NvICA8ZGNyb3Vzc28rd2Via2l0QGdt YWlsLmNvbT4KKworICAgICAgICBTdHlsZXMgc2hvdWxkIG5vdCBzaG93IGJhY2tncm91bmQtcmVw ZWF0LXgveSwgb3IgLXdlYmtpdC1tYXNrLXJlcGVhdC14L3kKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NzI1NQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoZWNrcyB0aGF0IGludGVybmFsLW9ubHkgQ1NT IHByb3BlcnRpZXMgYXJlIG1hcmtlZCBhcyBpbnZhbGlkIHdoZW4gcGFzc2VkIHRvIFdlYkluc3Bl Y3Rvci4KKworICAgICAgICAqIGluc3BlY3Rvci9jc3MvcHJvcGVydHktbWVtYmVycy1leHBlY3Rl ZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGluc3BlY3Rvci9jc3MvcHJvcGVydHktbWVtYmVycy5o dG1sOiBBZGRlZC4KKwogMjAxNy0wMS0yNSAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9y Zz4KIAogICAgICAgICBDcmFzaCB1bmRlciBET01TZWxlY3Rpb246OmRlbGV0ZUZyb21Eb2N1bWVu dCgpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY3NzL3Byb3BlcnR5LW1lbWJl cnMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Nzcy9wcm9wZXJ0eS1tZW1i ZXJzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zOTgxNTQxNmM5YWYxZGJhZTkxYjBlMmE4Zjgx MTNlNDMwOWY2OWIxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Nz cy9wcm9wZXJ0eS1tZW1iZXJzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDE1IEBACitUZXN0aW5n IHRoYXQgbWVtYmVyIHZhbHVlcyBvZiBDU1NQcm9wZXJ0eSBhcmUgY29ycmVjdC4KKworCis9PSBS dW5uaW5nIHRlc3Qgc3VpdGU6IENTU1Byb3BlcnR5CistLSBSdW5uaW5nIHRlc3QgY2FzZTogQ1NT UHJvcGVydHkudmFsaWQKK1BBU1M6ICJiYWNrZ3JvdW5kLXJlcGVhdCIgaXMgYSB2YWxpZCBwcm9w ZXJ0eS4KK1BBU1M6ICJiYWNrZ3JvdW5kLXJlcGVhdCIgaXMgbm90IGFuIGFub255bW91cyBwcm9w ZXJ0eS4KKworUEFTUzogImJhY2tncm91bmQtcmVwZWF0LXgiIGlzIGEgaW52YWxpZCBwcm9wZXJ0 eS4KK1BBU1M6ICJiYWNrZ3JvdW5kLXJlcGVhdC14IiBpcyBub3QgYW4gYW5vbnltb3VzIHByb3Bl cnR5LgorCitQQVNTOiAiYmFja2dyb3VuZC1yZXBlYXQtaW52YWxpZCIgaXMgYSBpbnZhbGlkIHBy b3BlcnR5LgorUEFTUzogImJhY2tncm91bmQtcmVwZWF0LWludmFsaWQiIGlzIG5vdCBhbiBhbm9u eW1vdXMgcHJvcGVydHkuCisKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Nz cy9wcm9wZXJ0eS1tZW1iZXJzLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY3NzL3Byb3Bl cnR5LW1lbWJlcnMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zYWYzNGQyY2UyMWVhZDc2N2QzZGRlNzhmMWRj ODQ2ODg2ZTVhZTczCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Nz cy9wcm9wZXJ0eS1tZW1iZXJzLmh0bWwKQEAgLTAsMCArMSw3NyBAQAorPCFET0NUWVBFIGh0bWw+ Cis8aHRtbD4KKzxoZWFkPgorPHN0eWxlPgorZGl2I25vZGUxIHsKKyAgICBiYWNrZ3JvdW5kLXJl cGVhdDogcmVwZWF0OworICAgIGJhY2tncm91bmQtcmVwZWF0LXg6IHJlcGVhdDsKKyAgICBiYWNr Z3JvdW5kLXJlcGVhdC1pbnZhbGlkOiByZXBlYXQ7Cit9Cis8L3N0eWxlPgorPHNjcmlwdCBzcmM9 Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlcy9pbnNwZWN0b3ItdGVzdC5qcyI+ PC9zY3JpcHQ+Cis8c2NyaXB0PgorZnVuY3Rpb24gdGVzdCgpIHsKKyAgICBsZXQgbm9kZVN0eWxl cyA9IG51bGw7CisKKyAgICBsZXQgc3VpdGUgPSBJbnNwZWN0b3JUZXN0LmNyZWF0ZUFzeW5jU3Vp dGUoIkNTU1Byb3BlcnR5Iik7CisKKyAgICBmdW5jdGlvbiB2YWxpZGF0ZVByb3BlcnR5KHByb3Bl cnR5LCBleHBlY3RlZFZhbGlkVmFsdWUpCisgICAgeworICAgICAgICBJbnNwZWN0b3JUZXN0LmV4 cGVjdEVxdWFsKHByb3BlcnR5LnZhbGlkLCBleHBlY3RlZFZhbGlkVmFsdWUsIGAiJHtwcm9wZXJ0 eS5uYW1lfSIgaXMgYSAke2V4cGVjdGVkVmFsaWRWYWx1ZSA/ICJ2YWxpZCIgOiAiaW52YWxpZCJ9 IHByb3BlcnR5LmApOworICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEZhbHNlKHByb3BlcnR5 LmFub255bW91cywgYCIke3Byb3BlcnR5Lm5hbWV9IiBpcyBub3QgYW4gYW5vbnltb3VzIHByb3Bl cnR5LmApOworICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZygiIik7CisgICAgfQorCisgICAgc3Vp dGUuYWRkVGVzdENhc2UoeworICAgICAgICBuYW1lOiAiQ1NTUHJvcGVydHkudmFsaWQiLAorICAg ICAgICBkZXNjcmlwdGlvbjogIkVuc3VyZSBpbnRlcm5hbC1vbmx5IGFuZCBub25leGlzdGVudCBw cm9wZXJ0aWVzIGFyZSBtYXJrZWQgYXMgaW52YWxpZC4iLAorICAgICAgICB0ZXN0KHJlc29sdmUs IHJlamVjdCkgeworICAgICAgICAgICAgZm9yIChsZXQgcnVsZSBvZiBub2RlU3R5bGVzLm1hdGNo ZWRSdWxlcykgeworICAgICAgICAgICAgICAgIGlmIChydWxlLnNlbGVjdG9yVGV4dCAhPT0gImRp diNub2RlMSIpCisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgICAgICAg ICAgZm9yIChsZXQgcHJvcGVydHkgb2YgcnVsZS5zdHlsZS5wcm9wZXJ0aWVzKSB7CisgICAgICAg ICAgICAgICAgICAgIHN3aXRjaCAocHJvcGVydHkubmFtZSkgeworICAgICAgICAgICAgICAgICAg ICBjYXNlICJiYWNrZ3JvdW5kLXJlcGVhdCI6CisgICAgICAgICAgICAgICAgICAgICAgICB2YWxp ZGF0ZVByb3BlcnR5KHByb3BlcnR5LCB0cnVlKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGJy ZWFrOworCisgICAgICAgICAgICAgICAgICAgIGNhc2UgImJhY2tncm91bmQtcmVwZWF0LXgiOgor ICAgICAgICAgICAgICAgICAgICBjYXNlICJiYWNrZ3JvdW5kLXJlcGVhdC1pbnZhbGlkIjoKKyAg ICAgICAgICAgICAgICAgICAgICAgIHZhbGlkYXRlUHJvcGVydHkocHJvcGVydHksIGZhbHNlKTsK KyAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgICAgICB9Cisg ICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorCisgICAgICAgICAgICByZXNvbHZlKCk7 CisgICAgICAgIH0KKyAgICB9KTsKKworICAgIFdlYkluc3BlY3Rvci5kb21UcmVlTWFuYWdlci5y ZXF1ZXN0RG9jdW1lbnQoKGRvY3VtZW50Tm9kZSkgPT4geworICAgICAgICBXZWJJbnNwZWN0b3Iu ZG9tVHJlZU1hbmFnZXIucXVlcnlTZWxlY3Rvcihkb2N1bWVudE5vZGUuaWQsICIjbm9kZTEiLCAo Y29udGVudE5vZGVJZCkgPT4geworICAgICAgICAgICAgaWYgKGNvbnRlbnROb2RlSWQpIHsKKyAg ICAgICAgICAgICAgICBsZXQgZG9tTm9kZSA9IFdlYkluc3BlY3Rvci5kb21UcmVlTWFuYWdlci5u b2RlRm9ySWQoY29udGVudE5vZGVJZCk7CisgICAgICAgICAgICAgICAgbm9kZVN0eWxlcyA9IFdl Ykluc3BlY3Rvci5jc3NTdHlsZU1hbmFnZXIuc3R5bGVzRm9yTm9kZShkb21Ob2RlKTsKKworICAg ICAgICAgICAgICAgIGlmIChub2RlU3R5bGVzLm5lZWRzUmVmcmVzaCkgeworICAgICAgICAgICAg ICAgICAgICBub2RlU3R5bGVzLnNpbmdsZUZpcmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5E T01Ob2RlU3R5bGVzLkV2ZW50LlJlZnJlc2hlZCwgKGV2ZW50KSA9PiB7CisgICAgICAgICAgICAg ICAgICAgICAgICBzdWl0ZS5ydW5UZXN0Q2FzZXNBbmRGaW5pc2goKQorICAgICAgICAgICAgICAg ICAgICB9KTsKKyAgICAgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICAgICAgICAgc3Vp dGUucnVuVGVzdENhc2VzQW5kRmluaXNoKCk7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAg ICAgICAgICAgIEluc3BlY3RvclRlc3QubG9nKCJET00gbm9kZSBub3QgZm91bmQuIik7CisgICAg ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5jb21wbGV0ZVRlc3QoKTsKKyAgICAgICAgICAgIH0K KyAgICAgICAgfSk7CisgICAgfSk7Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9ubG9h ZD0icnVuVGVzdCgpIj4KKyAgICA8cD5UZXN0aW5nIHRoYXQgbWVtYmVyIHZhbHVlcyBvZiBDU1NQ cm9wZXJ0eSBhcmUgY29ycmVjdC48L3A+CisKKyAgICA8ZGl2IGlkPSJub2RlMSI+PC9kaXY+Cis8 L2JvZHk+Cis8L2h0bWw+Cg== 299921 2017-01-27 01:10:56 -0800 2017-01-27 10:59:33 -0800 Patch 167255.diff text/plain 16936 hi ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwNDc4NTk2Li42ZWJhYzE1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTctMDEt MjcgIERldmluIFJvdXNzbyAgPGRjcm91c3NvK3dlYmtpdEBnbWFpbC5jb20+CisKKyAgICAgICAg U3R5bGVzIHNob3VsZCBub3Qgc2hvdyBiYWNrZ3JvdW5kLXJlcGVhdC14L3ksIG9yIC13ZWJraXQt bWFzay1yZXBlYXQteC95CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNjcyNTUKKworICAgICAgICBSZXZpZXdlZCBieSBKb3NlcGggUGVjb3Jhcm8uCisK KyAgICAgICAgQ2hlY2tzIHRoYXQgaW50ZXJuYWwtb25seSBDU1MgcHJvcGVydGllcyBhcmUgbWFy a2VkIGFzIGludmFsaWQgd2hlbiBwYXNzZWQgdG8gV2ViSW5zcGVjdG9yLgorCisgICAgICAgICog aW5zcGVjdG9yL2Nzcy9jc3MtcHJvcGVydHktZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAg KiBpbnNwZWN0b3IvY3NzL2Nzcy1wcm9wZXJ0eS5odG1sOiBBZGRlZC4KKwogMjAxNy0wMS0yNSAg Unlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBDcmFzaCB1bmRlciBE T01TZWxlY3Rpb246OmRlbGV0ZUZyb21Eb2N1bWVudCgpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvY3NzL2Nzcy1wcm9wZXJ0eS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvY3NzL2Nzcy1wcm9wZXJ0eS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMC4uNzIxYzVkYwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci9jc3MvY3NzLXByb3BlcnR5LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDM4IEBA CitUZXN0aW5nIG1ldGhvZHMgb2YgQ1NTUHJvcGVydHkuCisKKworPT0gUnVubmluZyB0ZXN0IHN1 aXRlOiBDU1NQcm9wZXJ0eQorLS0gUnVubmluZyB0ZXN0IGNhc2U6IENTU1Byb3BlcnR5LnByb3Rv dHlwZS5nZXQgdmFsaWQKK1BBU1M6ICJiYWNrZ3JvdW5kLXJlcGVhdCIgaXMgYSB2YWxpZCBwcm9w ZXJ0eS4KK1BBU1M6ICJiYWNrZ3JvdW5kLXJlcGVhdC14IiBpcyBhbiBpbnZhbGlkIHByb3BlcnR5 LgorUEFTUzogImJhY2tncm91bmQtcmVwZWF0LWludmFsaWQiIGlzIGFuIGludmFsaWQgcHJvcGVy dHkuCitQQVNTOiAiYmFja2dyb3VuZC1yZXBlYXQteSIgaXMgYW4gaW52YWxpZCBwcm9wZXJ0eS4K KworLS0gUnVubmluZyB0ZXN0IGNhc2U6IENTU1Byb3BlcnR5LnByb3RvdHlwZS5nZXQgYW5vbnlt b3VzCitQQVNTOiAiYmFja2dyb3VuZC1yZXBlYXQiIGlzIG5vdCBhbiBhbm9ueW1vdXMgQ1NTIHBy b3BlcnR5LgorUEFTUzogImJhY2tncm91bmQtcmVwZWF0LXgiIGlzIG5vdCBhbiBhbm9ueW1vdXMg Q1NTIHByb3BlcnR5LgorUEFTUzogImJhY2tncm91bmQtcmVwZWF0LWludmFsaWQiIGlzIG5vdCBh biBhbm9ueW1vdXMgQ1NTIHByb3BlcnR5LgorUEFTUzogImJhY2tncm91bmQtcmVwZWF0LXkiIGlz IGFuIGFub255bW91cyBDU1MgcHJvcGVydHkuCisKKy0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBDU1NQ cm9wZXJ0eS5wcm90b3R5cGUuZ2V0IGltcGxpY2l0CitQQVNTOiAiYmFja2dyb3VuZC1yZXBlYXQi IGlzIG5vdCBhbiBpbXBsaWNpdCBDU1MgcHJvcGVydHkuCitQQVNTOiAiYmFja2dyb3VuZC1yZXBl YXQteCIgaXMgbm90IGFuIGltcGxpY2l0IENTUyBwcm9wZXJ0eS4KK1BBU1M6ICJiYWNrZ3JvdW5k LXJlcGVhdC1pbnZhbGlkIiBpcyBub3QgYW4gaW1wbGljaXQgQ1NTIHByb3BlcnR5LgorUEFTUzog ImJhY2tncm91bmQtcmVwZWF0LXkiIGlzIGFuIGltcGxpY2l0IENTUyBwcm9wZXJ0eS4KKworLS0g UnVubmluZyB0ZXN0IGNhc2U6IENTU1Byb3BlcnR5LnByb3RvdHlwZS5nZXQgdmFsdWUKK1BBU1M6 ICJiYWNrZ3JvdW5kLXJlcGVhdCIgaGFzIHRoZSB2YWx1ZSAicmVwZWF0Ii4KK1BBU1M6ICJiYWNr Z3JvdW5kLXJlcGVhdC14IiBoYXMgdGhlIHZhbHVlICJyZXBlYXQiLgorUEFTUzogImJhY2tncm91 bmQtcmVwZWF0LWludmFsaWQiIGhhcyB0aGUgdmFsdWUgInJlcGVhdCIuCitQQVNTOiAiYmFja2dy b3VuZC1yZXBlYXQteSIgaGFzIHRoZSB2YWx1ZSAicmVwZWF0Ii4KKworLS0gUnVubmluZyB0ZXN0 IGNhc2U6IENTU1Byb3BlcnR5LnByb3RvdHlwZS5nZXQgdGV4dAorUEFTUzogImJhY2tncm91bmQt cmVwZWF0IiBoYXMgdGhlIHRleHQgImJhY2tncm91bmQtcmVwZWF0OiByZXBlYXQ7Ii4KK1BBU1M6 ICJiYWNrZ3JvdW5kLXJlcGVhdCIgaGFzIHRoZSBfdGV4dCAocHJpdmF0ZSkgImJhY2tncm91bmQt cmVwZWF0OiByZXBlYXQ7Ii4KK1BBU1M6ICJiYWNrZ3JvdW5kLXJlcGVhdC14IiBoYXMgdGhlIHRl eHQgImJhY2tncm91bmQtcmVwZWF0LXg6IHJlcGVhdDsiLgorUEFTUzogImJhY2tncm91bmQtcmVw ZWF0LXgiIGhhcyB0aGUgX3RleHQgKHByaXZhdGUpICJiYWNrZ3JvdW5kLXJlcGVhdC14OiByZXBl YXQ7Ii4KK1BBU1M6ICJiYWNrZ3JvdW5kLXJlcGVhdC1pbnZhbGlkIiBoYXMgdGhlIHRleHQgImJh Y2tncm91bmQtcmVwZWF0LWludmFsaWQ6IHJlcGVhdDsiLgorUEFTUzogImJhY2tncm91bmQtcmVw ZWF0LWludmFsaWQiIGhhcyB0aGUgX3RleHQgKHByaXZhdGUpICJiYWNrZ3JvdW5kLXJlcGVhdC1p bnZhbGlkOiByZXBlYXQ7Ii4KK1BBU1M6ICJiYWNrZ3JvdW5kLXJlcGVhdC15IiBoYXMgdGhlIHRl eHQgImJhY2tncm91bmQtcmVwZWF0LXk6IHJlcGVhdDsiLgorUEFTUzogImJhY2tncm91bmQtcmVw ZWF0LXkiIGhhcyB0aGUgX3RleHQgKHByaXZhdGUpICIiLgorCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvY3NzL2Nzcy1wcm9wZXJ0eS5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2Nzcy9jc3MtcHJvcGVydHkuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwLi5kMTQ5ZDliCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Nz cy9jc3MtcHJvcGVydHkuaHRtbApAQCAtMCwwICsxLDE4NCBAQAorPCFET0NUWVBFIGh0bWw+Cis8 aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jl c291cmNlcy9pbnNwZWN0b3ItdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorZnVuY3Rpb24g dGVzdCgpIHsKKyAgICBsZXQgbm9kZVN0eWxlcyA9IG51bGw7CisKKyAgICBsZXQgc3VpdGUgPSBJ bnNwZWN0b3JUZXN0LmNyZWF0ZUFzeW5jU3VpdGUoIkNTU1Byb3BlcnR5Iik7CisKKyAgICBzdWl0 ZS5hZGRUZXN0Q2FzZSh7CisgICAgICAgIG5hbWU6ICJDU1NQcm9wZXJ0eS5wcm90b3R5cGUuZ2V0 IHZhbGlkIiwKKyAgICAgICAgZGVzY3JpcHRpb246ICJFbnN1cmUgdmFsaWQsIGludmFsaWQsIGFu ZCBpbnRlcm5hbC1vbmx5IGhhdmUgY29ycmVjdCB2YWxpZCBzdGF0ZS4iLAorICAgICAgICB0ZXN0 KHJlc29sdmUsIHJlamVjdCkgeworICAgICAgICAgICAgZm9yIChsZXQgcnVsZSBvZiBub2RlU3R5 bGVzLm1hdGNoZWRSdWxlcykgeworICAgICAgICAgICAgICAgIGlmIChydWxlLnNlbGVjdG9yVGV4 dCAhPT0gImRpdiN4IikKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAg ICAgICAgICBmb3IgKGxldCBwcm9wZXJ0eSBvZiBydWxlLnN0eWxlLnByb3BlcnRpZXMpIHsKKyAg ICAgICAgICAgICAgICAgICAgc3dpdGNoIChwcm9wZXJ0eS5uYW1lKSB7CisgICAgICAgICAgICAg ICAgICAgIGNhc2UgImJhY2tncm91bmQtcmVwZWF0IjoKKyAgICAgICAgICAgICAgICAgICAgICAg IEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChwcm9wZXJ0eS52YWxpZCwgYCIke3Byb3BlcnR5Lm5h bWV9IiBpcyBhIHZhbGlkIHByb3BlcnR5LmApOworICAgICAgICAgICAgICAgICAgICAgICAgYnJl YWs7CisgICAgICAgICAgICAgICAgICAgIGNhc2UgImJhY2tncm91bmQtcmVwZWF0LXgiOgorICAg ICAgICAgICAgICAgICAgICBjYXNlICJiYWNrZ3JvdW5kLXJlcGVhdC15IjoKKyAgICAgICAgICAg ICAgICAgICAgY2FzZSAiYmFja2dyb3VuZC1yZXBlYXQtaW52YWxpZCI6CisgICAgICAgICAgICAg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEZhbHNlKHByb3BlcnR5LnZhbGlkLCBgIiR7 cHJvcGVydHkubmFtZX0iIGlzIGFuIGludmFsaWQgcHJvcGVydHkuYCk7CisgICAgICAgICAgICAg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgcmVzb2x2ZSgpOworICAgICAgICB9Cisg ICAgfSk7CisKKyAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CisgICAgICAgIG5hbWU6ICJDU1NQcm9w ZXJ0eS5wcm90b3R5cGUuZ2V0IGFub255bW91cyIsCisgICAgICAgIGRlc2NyaXB0aW9uOiAiRW5z dXJlIHZhbGlkLCBpbnZhbGlkLCBhbmQgaW50ZXJuYWwtb25seSBoYXZlIGNvcnJlY3QgYW5vbnlt b3VzIHN0YXRlLiIsCisgICAgICAgIHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7CisgICAgICAgICAg ICBmb3IgKGxldCBydWxlIG9mIG5vZGVTdHlsZXMubWF0Y2hlZFJ1bGVzKSB7CisgICAgICAgICAg ICAgICAgaWYgKHJ1bGUuc2VsZWN0b3JUZXh0ICE9PSAiZGl2I3giKQorICAgICAgICAgICAgICAg ICAgICBjb250aW51ZTsKKworICAgICAgICAgICAgICAgIGZvciAobGV0IHByb3BlcnR5IG9mIHJ1 bGUuc3R5bGUucHJvcGVydGllcykgeworICAgICAgICAgICAgICAgICAgICBzd2l0Y2ggKHByb3Bl cnR5Lm5hbWUpIHsKKyAgICAgICAgICAgICAgICAgICAgY2FzZSAiYmFja2dyb3VuZC1yZXBlYXQi OgorICAgICAgICAgICAgICAgICAgICBjYXNlICJiYWNrZ3JvdW5kLXJlcGVhdC14IjoKKyAgICAg ICAgICAgICAgICAgICAgY2FzZSAiYmFja2dyb3VuZC1yZXBlYXQtaW52YWxpZCI6CisgICAgICAg ICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEZhbHNlKHByb3BlcnR5LmFub255 bW91cywgYCIke3Byb3BlcnR5Lm5hbWV9IiBpcyBub3QgYW4gYW5vbnltb3VzIENTUyBwcm9wZXJ0 eS5gKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgICAg ICBjYXNlICJiYWNrZ3JvdW5kLXJlcGVhdC15IjoKKyAgICAgICAgICAgICAgICAgICAgICAgIElu c3BlY3RvclRlc3QuZXhwZWN0VGhhdChwcm9wZXJ0eS5hbm9ueW1vdXMsIGAiJHtwcm9wZXJ0eS5u YW1lfSIgaXMgYW4gYW5vbnltb3VzIENTUyBwcm9wZXJ0eS5gKTsKKyAgICAgICAgICAgICAgICAg ICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgfQor ICAgICAgICAgICAgfQorCisgICAgICAgICAgICByZXNvbHZlKCk7CisgICAgICAgIH0KKyAgICB9 KTsKKworICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKKyAgICAgICAgbmFtZTogIkNTU1Byb3BlcnR5 LnByb3RvdHlwZS5nZXQgaW1wbGljaXQiLAorICAgICAgICBkZXNjcmlwdGlvbjogIkVuc3VyZSB2 YWxpZCwgaW52YWxpZCwgYW5kIGludGVybmFsLW9ubHkgaGF2ZSBjb3JyZWN0IGltcGxpY2l0IHN0 YXRlLiIsCisgICAgICAgIHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7CisgICAgICAgICAgICBmb3Ig KGxldCBydWxlIG9mIG5vZGVTdHlsZXMubWF0Y2hlZFJ1bGVzKSB7CisgICAgICAgICAgICAgICAg aWYgKHJ1bGUuc2VsZWN0b3JUZXh0ICE9PSAiZGl2I3giKQorICAgICAgICAgICAgICAgICAgICBj b250aW51ZTsKKworICAgICAgICAgICAgICAgIGZvciAobGV0IHByb3BlcnR5IG9mIHJ1bGUuc3R5 bGUucHJvcGVydGllcykgeworICAgICAgICAgICAgICAgICAgICBzd2l0Y2ggKHByb3BlcnR5Lm5h bWUpIHsKKyAgICAgICAgICAgICAgICAgICAgY2FzZSAiYmFja2dyb3VuZC1yZXBlYXQiOgorICAg ICAgICAgICAgICAgICAgICBjYXNlICJiYWNrZ3JvdW5kLXJlcGVhdC14IjoKKyAgICAgICAgICAg ICAgICAgICAgY2FzZSAiYmFja2dyb3VuZC1yZXBlYXQtaW52YWxpZCI6CisgICAgICAgICAgICAg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEZhbHNlKHByb3BlcnR5LmltcGxpY2l0LCBg IiR7cHJvcGVydHkubmFtZX0iIGlzIG5vdCBhbiBpbXBsaWNpdCBDU1MgcHJvcGVydHkuYCk7Cisg ICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgY2FzZSAi YmFja2dyb3VuZC1yZXBlYXQteSI6CisgICAgICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JU ZXN0LmV4cGVjdFRoYXQocHJvcGVydHkuaW1wbGljaXQsIGAiJHtwcm9wZXJ0eS5uYW1lfSIgaXMg YW4gaW1wbGljaXQgQ1NTIHByb3BlcnR5LmApOworICAgICAgICAgICAgICAgICAgICAgICAgYnJl YWs7CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAg ICB9CisKKyAgICAgICAgICAgIHJlc29sdmUoKTsKKyAgICAgICAgfQorICAgIH0pOworCisgICAg c3VpdGUuYWRkVGVzdENhc2UoeworICAgICAgICBuYW1lOiAiQ1NTUHJvcGVydHkucHJvdG90eXBl LmdldCB2YWx1ZSIsCisgICAgICAgIGRlc2NyaXB0aW9uOiAiRW5zdXJlIHZhbGlkLCBpbnZhbGlk LCBhbmQgaW50ZXJuYWwtb25seSBoYXZlIGNvcnJlY3QgdmFsdWUuIiwKKyAgICAgICAgdGVzdChy ZXNvbHZlLCByZWplY3QpIHsKKyAgICAgICAgICAgIGZvciAobGV0IHJ1bGUgb2Ygbm9kZVN0eWxl cy5tYXRjaGVkUnVsZXMpIHsKKyAgICAgICAgICAgICAgICBpZiAocnVsZS5zZWxlY3RvclRleHQg IT09ICJkaXYjeCIpCisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgICAg ICAgICAgZm9yIChsZXQgcHJvcGVydHkgb2YgcnVsZS5zdHlsZS5wcm9wZXJ0aWVzKSB7CisgICAg ICAgICAgICAgICAgICAgIHN3aXRjaCAocHJvcGVydHkubmFtZSkgeworICAgICAgICAgICAgICAg ICAgICBjYXNlICJiYWNrZ3JvdW5kLXJlcGVhdCI6CisgICAgICAgICAgICAgICAgICAgIGNhc2Ug ImJhY2tncm91bmQtcmVwZWF0LXgiOgorICAgICAgICAgICAgICAgICAgICBjYXNlICJiYWNrZ3Jv dW5kLXJlcGVhdC15IjoKKyAgICAgICAgICAgICAgICAgICAgY2FzZSAiYmFja2dyb3VuZC1yZXBl YXQtaW52YWxpZCI6CisgICAgICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVj dEVxdWFsKHByb3BlcnR5LnZhbHVlLCAicmVwZWF0IiwgYCIke3Byb3BlcnR5Lm5hbWV9IiBoYXMg dGhlIHZhbHVlICJyZXBlYXQiLmApOworICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Cisg ICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9CisK KyAgICAgICAgICAgIHJlc29sdmUoKTsKKyAgICAgICAgfQorICAgIH0pOworCisgICAgc3VpdGUu YWRkVGVzdENhc2UoeworICAgICAgICBuYW1lOiAiQ1NTUHJvcGVydHkucHJvdG90eXBlLmdldCB0 ZXh0IiwKKyAgICAgICAgZGVzY3JpcHRpb246ICJFbnN1cmUgdmFsaWQsIGludmFsaWQsIGFuZCBp bnRlcm5hbC1vbmx5IGhhdmUgY29ycmVjdCB0ZXh0LiIsCisgICAgICAgIHRlc3QocmVzb2x2ZSwg cmVqZWN0KSB7CisgICAgICAgICAgICBmb3IgKGxldCBydWxlIG9mIG5vZGVTdHlsZXMubWF0Y2hl ZFJ1bGVzKSB7CisgICAgICAgICAgICAgICAgaWYgKHJ1bGUuc2VsZWN0b3JUZXh0ICE9PSAiZGl2 I3giKQorICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICAgICAgICAgIC8v IEl0IGlzIG5lY2Vzc2FyeSB0byB1c2UgIl90ZXh0IiBiZWNhdXNlIHRoZSBwdWJsaWMgInRleHQi IGdldHRlciB3aWxsIGF0dGVtcHQgdG8KKyAgICAgICAgICAgICAgICAvLyBzeW50aGVzaXplIGEg dmFsdWUgZm9yIHRoZSBDU1NQcm9wZXJ0eSBpZiBpdCBpcyBmYWxzeS4gIFRoaXMgaXMgdXNlZCBm b3IgY2FzZXMKKyAgICAgICAgICAgICAgICAvLyB3aGVyZSBhIHNob3J0aGFuZCBwcm9wZXJ0eSBp cyB3cml0dGVuIGluIHRoZSBzdHlsZSwgc2luY2UgdGhlIGxvbmdoYW5kIHByb3BlcnRpZXMKKyAg ICAgICAgICAgICAgICAvLyAod2l0aCBjb3JyZXNwb25kaW5nIHZhbHVlcykgYXJlIHN0aWxsIHNl bnQgdG8gdGhlIGZyb250ZW5kLgorICAgICAgICAgICAgICAgIGZvciAobGV0IHByb3BlcnR5IG9m IHJ1bGUuc3R5bGUucHJvcGVydGllcykgeworICAgICAgICAgICAgICAgICAgICBzd2l0Y2ggKHBy b3BlcnR5Lm5hbWUpIHsKKyAgICAgICAgICAgICAgICAgICAgY2FzZSAiYmFja2dyb3VuZC1yZXBl YXQiOgorICAgICAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChw cm9wZXJ0eS50ZXh0LCAiYmFja2dyb3VuZC1yZXBlYXQ6IHJlcGVhdDsiLCBgIiR7cHJvcGVydHku bmFtZX0iIGhhcyB0aGUgdGV4dCAiYmFja2dyb3VuZC1yZXBlYXQ6IHJlcGVhdDsiLmApOworICAg ICAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChwcm9wZXJ0eS5f dGV4dCwgImJhY2tncm91bmQtcmVwZWF0OiByZXBlYXQ7IiwgYCIke3Byb3BlcnR5Lm5hbWV9IiBo YXMgdGhlIF90ZXh0IChwcml2YXRlKSAiYmFja2dyb3VuZC1yZXBlYXQ6IHJlcGVhdDsiLmApOwor ICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgICAgIGNhc2Ug ImJhY2tncm91bmQtcmVwZWF0LXgiOgorICAgICAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9y VGVzdC5leHBlY3RFcXVhbChwcm9wZXJ0eS50ZXh0LCAiYmFja2dyb3VuZC1yZXBlYXQteDogcmVw ZWF0OyIsIGAiJHtwcm9wZXJ0eS5uYW1lfSIgaGFzIHRoZSB0ZXh0ICJiYWNrZ3JvdW5kLXJlcGVh dC14OiByZXBlYXQ7Ii5gKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3Qu ZXhwZWN0RXF1YWwocHJvcGVydHkuX3RleHQsICJiYWNrZ3JvdW5kLXJlcGVhdC14OiByZXBlYXQ7 IiwgYCIke3Byb3BlcnR5Lm5hbWV9IiBoYXMgdGhlIF90ZXh0IChwcml2YXRlKSAiYmFja2dyb3Vu ZC1yZXBlYXQteDogcmVwZWF0OyIuYCk7CisgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsK KyAgICAgICAgICAgICAgICAgICAgY2FzZSAiYmFja2dyb3VuZC1yZXBlYXQteSI6CisgICAgICAg ICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKHByb3BlcnR5LnRleHQs ICJiYWNrZ3JvdW5kLXJlcGVhdC15OiByZXBlYXQ7IiwgYCIke3Byb3BlcnR5Lm5hbWV9IiBoYXMg dGhlIHRleHQgImJhY2tncm91bmQtcmVwZWF0LXk6IHJlcGVhdDsiLmApOworICAgICAgICAgICAg ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChwcm9wZXJ0eS5fdGV4dCwgIiIs IGAiJHtwcm9wZXJ0eS5uYW1lfSIgaGFzIHRoZSBfdGV4dCAocHJpdmF0ZSkgIiIuYCk7CisgICAg ICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgY2FzZSAiYmFj a2dyb3VuZC1yZXBlYXQtaW52YWxpZCI6CisgICAgICAgICAgICAgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmV4cGVjdEVxdWFsKHByb3BlcnR5LnRleHQsICJiYWNrZ3JvdW5kLXJlcGVhdC1pbnZh bGlkOiByZXBlYXQ7IiwgYCIke3Byb3BlcnR5Lm5hbWV9IiBoYXMgdGhlIHRleHQgImJhY2tncm91 bmQtcmVwZWF0LWludmFsaWQ6IHJlcGVhdDsiLmApOworICAgICAgICAgICAgICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChwcm9wZXJ0eS5fdGV4dCwgImJhY2tncm91bmQtcmVw ZWF0LWludmFsaWQ6IHJlcGVhdDsiLCBgIiR7cHJvcGVydHkubmFtZX0iIGhhcyB0aGUgX3RleHQg KHByaXZhdGUpICJiYWNrZ3JvdW5kLXJlcGVhdC1pbnZhbGlkOiByZXBlYXQ7Ii5gKTsKKyAgICAg ICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAg ICAgICAgICAgfQorICAgICAgICAgICAgfQorCisgICAgICAgICAgICByZXNvbHZlKCk7CisgICAg ICAgIH0KKyAgICB9KTsKKworICAgIFdlYkluc3BlY3Rvci5kb21UcmVlTWFuYWdlci5yZXF1ZXN0 RG9jdW1lbnQoKGRvY3VtZW50Tm9kZSkgPT4geworICAgICAgICBXZWJJbnNwZWN0b3IuZG9tVHJl ZU1hbmFnZXIucXVlcnlTZWxlY3Rvcihkb2N1bWVudE5vZGUuaWQsICJkaXYjeCIsIChjb250ZW50 Tm9kZUlkKSA9PiB7CisgICAgICAgICAgICBpZiAoY29udGVudE5vZGVJZCkgeworICAgICAgICAg ICAgICAgIGxldCBkb21Ob2RlID0gV2ViSW5zcGVjdG9yLmRvbVRyZWVNYW5hZ2VyLm5vZGVGb3JJ ZChjb250ZW50Tm9kZUlkKTsKKyAgICAgICAgICAgICAgICBub2RlU3R5bGVzID0gV2ViSW5zcGVj dG9yLmNzc1N0eWxlTWFuYWdlci5zdHlsZXNGb3JOb2RlKGRvbU5vZGUpOworCisgICAgICAgICAg ICAgICAgaWYgKG5vZGVTdHlsZXMubmVlZHNSZWZyZXNoKSB7CisgICAgICAgICAgICAgICAgICAg IG5vZGVTdHlsZXMuc2luZ2xlRmlyZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRPTU5vZGVT dHlsZXMuRXZlbnQuUmVmcmVzaGVkLCAoZXZlbnQpID0+IHsKKyAgICAgICAgICAgICAgICAgICAg ICAgIHN1aXRlLnJ1blRlc3RDYXNlc0FuZEZpbmlzaCgpCisgICAgICAgICAgICAgICAgICAgIH0p OworICAgICAgICAgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgICAgICAgICBzdWl0ZS5ydW5U ZXN0Q2FzZXNBbmRGaW5pc2goKTsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAg ICAgSW5zcGVjdG9yVGVzdC5mYWlsKCJET00gbm9kZSBub3QgZm91bmQuIik7CisgICAgICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5jb21wbGV0ZVRlc3QoKTsKKyAgICAgICAgICAgIH0KKyAgICAg ICAgfSk7CisgICAgfSk7Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0icnVu VGVzdCgpIj4KKyAgICA8cD5UZXN0aW5nIG1ldGhvZHMgb2YgQ1NTUHJvcGVydHkuPC9wPgorCisg ICAgPHN0eWxlPgorICAgIGRpdiN4IHsKKyAgICAgICAgYmFja2dyb3VuZC1yZXBlYXQ6IHJlcGVh dDsKKyAgICAgICAgYmFja2dyb3VuZC1yZXBlYXQteDogcmVwZWF0OworICAgICAgICBiYWNrZ3Jv dW5kLXJlcGVhdC1pbnZhbGlkOiByZXBlYXQ7CisgICAgfQorICAgIDwvc3R5bGU+CisgICAgPGRp diBpZD0ieCI+PC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmM0MGM0MC4u NTIwNmM2MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxNy0wMS0yNyAgRGV2aW4g Um91c3NvICA8ZGNyb3Vzc28rd2Via2l0QGdtYWlsLmNvbT4KKworICAgICAgICBTdHlsZXMgc2hv dWxkIG5vdCBzaG93IGJhY2tncm91bmQtcmVwZWF0LXgveSwgb3IgLXdlYmtpdC1tYXNrLXJlcGVh dC14L3kKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2 NzI1NQorCisgICAgICAgIFJldmlld2VkIGJ5IEpvc2VwaCBQZWNvcmFyby4KKworICAgICAgICBU ZXN0OiBpbnNwZWN0b3IvY3NzL2Nzcy1wcm9wZXJ0eS5odG1sCisKKyAgICAgICAgKiBjc3MvbWFr ZXByb3AucGw6CisgICAgICAgIChhZGRQcm9wZXJ0eSk6CisgICAgICAgIEFkZCBhIGdlbmVyYXRl ZCBmdW5jdGlvbiBgaXNJbnRlcm5hbENTU1Byb3BlcnR5YCB0aGF0IGNoZWNrcyB0aGUgZ2l2ZW4g Q1NTUHJvcGVydHlJRCBhZ2FpbnN0CisgICAgICAgIGEgZGVyaXZlZCBsaXN0IG9mIHByb3BlcnRp ZXMgZnJvbSBDU1NQcm9wZXJ0aWVzLmpzb24gd2l0aCAiaW50ZXJuYWwtb25seSIuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yQ1NTQWdlbnQ6OmdldFN1cHBvcnRlZENTU1Byb3BlcnRpZXMpOgorICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3RvclN0eWxlOjpzdHlsZVdpdGhQcm9wZXJ0aWVzKToKKyAgICAgICAgT25seSBwYXNzIENT UyBwcm9wZXJ0eSBwYXlsb2FkcyB0byB0aGUgZnJvbnRlbmQgaWYgdGhleSBhcmUgbm90IGludGVy bmFsLgorCiAyMDE3LTAxLTI1ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAg ICAgICAgIENyYXNoIHVuZGVyIERPTVNlbGVjdGlvbjo6ZGVsZXRlRnJvbURvY3VtZW50KCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9tYWtlcHJvcC5wbCBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9tYWtlcHJvcC5wbAppbmRleCBiNGIwOTY4Li41N2IwNjlmIDEwMDc1NQotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvbWFrZXByb3AucGwKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL21ha2Vw cm9wLnBsCkBAIC01OCw2ICs1OCw3IEBAIGRpZSAiV2UndmUgcmVhY2hlZCBtb3JlIHRoYW4gMTAy NCBDU1MgcHJvcGVydGllcywgcGxlYXNlIG1ha2Ugc3VyZSB0byB1cGRhdGUgQ1NTCiBteSAlZGVm aW5lcyA9IG1hcCB7ICRfID0+IDEgfSBzcGxpdCgvIC8sICRkZWZpbmVzKTsKIAogbXkgQG5hbWVz OworbXkgQGludGVybmFsUHJvcHJlcnRpZXM7CiBteSAkbnVtUHJlZGVmaW5lZFByb3BlcnRpZXMg PSAyOwogbXkgJW5hbWVJc0luaGVyaXRlZDsKIG15ICVuYW1lSXNIaWdoUHJpb3JpdHk7CkBAIC0x NDAsNyArMTQxLDggQEAgc3ViIGFkZFByb3BlcnR5KCQkKQogICAgICAgICAgICAgICAgIH0gZWxz aWYgKCRzdHlsZUJ1aWxkZXJPcHRpb25zeyRjb2RlZ2VuT3B0aW9uTmFtZX0pIHsKICAgICAgICAg ICAgICAgICAgICAgJHByb3BlcnRpZXNXaXRoU3R5bGVCdWlsZGVyT3B0aW9uc3skbmFtZX17JGNv ZGVnZW5PcHRpb25OYW1lfSA9ICRjb2RlZ2VuUHJvcGVydGllcy0+eyRjb2RlZ2VuT3B0aW9uTmFt ZX07CiAgICAgICAgICAgICAgICAgfSBlbHNpZiAoJGNvZGVnZW5PcHRpb25OYW1lIGVxICJpbnRl cm5hbC1vbmx5IikgewotICAgICAgICAgICAgICAgICAgICAjIGludGVybmFsLW9ubHkgcHJvcGVy dGllcyBleGlzdCB0byBtYWtlIGl0IGVhc2llciB0byBwYXJzZSBjb21wb3VuZCBwcm9wZXJ0aWVz IChlLmcuIGJhY2tncm91bmQtcmVwZWF0KSBhcyBpZiB0aGV5IHdlcmUgc2hvcnRoYW5kcy4gVGhp cyBkb2Vzbid0IGN1cnJlbnRseSBhZmZlY3QgY29kZWdlbi4KKyAgICAgICAgICAgICAgICAgICAg IyBpbnRlcm5hbC1vbmx5IHByb3BlcnRpZXMgZXhpc3QgdG8gbWFrZSBpdCBlYXNpZXIgdG8gcGFy c2UgY29tcG91bmQgcHJvcGVydGllcyAoZS5nLiBiYWNrZ3JvdW5kLXJlcGVhdCkgYXMgaWYgdGhl eSB3ZXJlIHNob3J0aGFuZHMuCisgICAgICAgICAgICAgICAgICAgIHB1c2ggQGludGVybmFsUHJv cHJlcnRpZXMsICRuYW1lCiAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAg ICAgICAgZGllICJVbnJlY29nbml6ZWQgY29kZWdlbiBwcm9wZXJ0eSBcIiRvcHRpb25OYW1lXCIg Zm9yICRuYW1lIHByb3BlcnR5LiI7CiAgICAgICAgICAgICAgICAgfQpAQCAtMjQyLDEzICsyNDQs MjkgQEAgZm9yIG15ICRuYW1lIChAbmFtZXMpIHsKICAgICB9CiB9CiAKLXByaW50IEdQRVJGPDwg IkVPRiI7CitwcmludCBHUEVSRiA8PCAiRU9GIjsKICUlCiBjb25zdCBQcm9wZXJ0eSogZmluZFBy b3BlcnR5KGNvbnN0IGNoYXIqIHN0ciwgdW5zaWduZWQgaW50IGxlbikKIHsKICAgICByZXR1cm4g Q1NTUHJvcGVydHlOYW1lc0hhc2g6OmZpbmRQcm9wZXJ0eUltcGwoc3RyLCBsZW4pOwogfQogCiti b29sIGlzSW50ZXJuYWxDU1NQcm9wZXJ0eShjb25zdCBDU1NQcm9wZXJ0eUlEIGlkKQoreworICAg IHN3aXRjaCAoaWQpIHsKK0VPRgorCitmb3JlYWNoIG15ICRuYW1lIChAaW50ZXJuYWxQcm9wcmVy dGllcykgeworICBwcmludCBHUEVSRiAiICAgIGNhc2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJvcGVy dHkiIC4gJG5hbWVUb0lkeyRuYW1lfSAuICI6XG4iOworfQorCitwcmludCBHUEVSRiA8PCAiRU9G IjsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgZGVmYXVsdDoKKyAgICAgICAgcmV0dXJuIGZh bHNlOworICAgIH0KK30KKwogY29uc3QgY2hhciogZ2V0UHJvcGVydHlOYW1lKENTU1Byb3BlcnR5 SUQgaWQpCiB7CiAgICAgaWYgKGlkIDwgZmlyc3RDU1NQcm9wZXJ0eSkKQEAgLTM4MCw2ICszOTgs NyBAQCBwcmludCBIRUFERVIgImNvbnN0IENTU1Byb3BlcnR5SUQgbGFzdEhpZ2hQcmlvcml0eVBy b3BlcnR5ID0gQ1NTUHJvcGVydHkiIC4gJG5hbQogCiBwcmludCBIRUFERVIgPDwgIkVPRiI7CiAK K2Jvb2wgaXNJbnRlcm5hbENTU1Byb3BlcnR5KGNvbnN0IENTU1Byb3BlcnR5SUQpOwogY29uc3Qg Y2hhciogZ2V0UHJvcGVydHlOYW1lKENTU1Byb3BlcnR5SUQpOwogY29uc3QgV1RGOjpBdG9taWNT dHJpbmcmIGdldFByb3BlcnR5TmFtZUF0b21pY1N0cmluZyhDU1NQcm9wZXJ0eUlEIGlkKTsKIFdU Rjo6U3RyaW5nIGdldFByb3BlcnR5TmFtZVN0cmluZyhDU1NQcm9wZXJ0eUlEIGlkKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwCmluZGV4IDA1ODk0 NzQuLjFhNmM3NjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JDU1NBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNT U0FnZW50LmNwcApAQCAtODQ1LDYgKzg0NSw5IEBAIHZvaWQgSW5zcGVjdG9yQ1NTQWdlbnQ6Omdl dFN1cHBvcnRlZENTU1Byb3BlcnRpZXMoRXJyb3JTdHJpbmcmLCBSZWZQdHI8SW5zcGVjdG9yCiAg ICAgYXV0byBwcm9wZXJ0aWVzID0gSW5zcGVjdG9yOjpQcm90b2NvbDo6QXJyYXk8SW5zcGVjdG9y OjpQcm90b2NvbDo6Q1NTOjpDU1NQcm9wZXJ0eUluZm8+OjpjcmVhdGUoKTsKICAgICBmb3IgKGlu dCBpID0gZmlyc3RDU1NQcm9wZXJ0eTsgaSA8PSBsYXN0Q1NTUHJvcGVydHk7ICsraSkgewogICAg ICAgICBDU1NQcm9wZXJ0eUlEIGlkID0gY29udmVydFRvQ1NTUHJvcGVydHlJRChpKTsKKyAgICAg ICAgaWYgKGlzSW50ZXJuYWxDU1NQcm9wZXJ0eShpZCkpCisgICAgICAgICAgICBjb250aW51ZTsK KwogICAgICAgICBhdXRvIHByb3BlcnR5ID0gSW5zcGVjdG9yOjpQcm90b2NvbDo6Q1NTOjpDU1NQ cm9wZXJ0eUluZm86OmNyZWF0ZSgpCiAgICAgICAgICAgICAuc2V0TmFtZShnZXRQcm9wZXJ0eU5h bWVTdHJpbmcoaWQpKQogICAgICAgICAgICAgLnJlbGVhc2UoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmNwcAppbmRleCA5NDkyYzk2Li5iMGM3 MjVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVT aGVldC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hl ZXQuY3BwCkBAIC02NTQsOCArNjU0LDEwIEBAIFJlZjxJbnNwZWN0b3I6OlByb3RvY29sOjpDU1M6 OkNTU1N0eWxlPiBJbnNwZWN0b3JTdHlsZTo6c3R5bGVXaXRoUHJvcGVydGllcygpIGNvCiAKICAg ICAgICAgcHJvcGVydGllc09iamVjdC0+YWRkSXRlbShwcm9wZXJ0eS5jb3B5UmVmKCkpOwogCisg ICAgICAgIENTU1Byb3BlcnR5SUQgcHJvcGVydHlJZCA9IGNzc1Byb3BlcnR5SUQobmFtZSk7CisK ICAgICAgICAgLy8gRGVmYXVsdCAicGFyc2VkT2siID09IHRydWUuCi0gICAgICAgIGlmICghcHJv cGVydHlFbnRyeS5wYXJzZWRPaykKKyAgICAgICAgaWYgKCFwcm9wZXJ0eUVudHJ5LnBhcnNlZE9r IHx8IGlzSW50ZXJuYWxDU1NQcm9wZXJ0eShwcm9wZXJ0eUlkKSkKICAgICAgICAgICAgIHByb3Bl cnR5LT5zZXRQYXJzZWRPayhmYWxzZSk7CiAgICAgICAgIGlmIChpdC0+aGFzUmF3VGV4dCgpKQog ICAgICAgICAgICAgcHJvcGVydHktPnNldFRleHQoaXQtPnJhd1RleHQpOwpAQCAtNjc4LDcgKzY4 MCw3IEBAIFJlZjxJbnNwZWN0b3I6OlByb3RvY29sOjpDU1M6OkNTU1N0eWxlPiBJbnNwZWN0b3JT dHlsZTo6c3R5bGVXaXRoUHJvcGVydGllcygpIGNvCiAgICAgICAgICAgICAgICAgLy8gUGFyc2Vk IHByb3BlcnR5IG92ZXJyaWRlcyBhbnkgcHJvcGVydHkgd2l0aCB0aGUgc2FtZSBuYW1lLiBOb24t cGFyc2VkIHByb3BlcnR5IG92ZXJyaWRlcwogICAgICAgICAgICAgICAgIC8vIHByZXZpb3VzIG5v bi1wYXJzZWQgcHJvcGVydHkgd2l0aCB0aGUgc2FtZSBuYW1lIChpZiBhbnkpLgogICAgICAgICAg ICAgICAgIGJvb2wgc2hvdWxkSW5hY3RpdmF0ZSA9IGZhbHNlOwotICAgICAgICAgICAgICAgIENT U1Byb3BlcnR5SUQgcHJvcGVydHlJZCA9IGNzc1Byb3BlcnR5SUQobmFtZSk7CisKICAgICAgICAg ICAgICAgICAvLyBDYW5vbmljYWxpemUgcHJvcGVydHkgbmFtZXMgdG8gdHJlYXQgbm9uLXByZWZp eGVkIGFuZCB2ZW5kb3ItcHJlZml4ZWQgcHJvcGVydHkgbmFtZXMgdGhlIHNhbWUgKG9wYWNpdHkg dnMuIC13ZWJraXQtb3BhY2l0eSkuCiAgICAgICAgICAgICAgICAgU3RyaW5nIGNhbm9uaWNhbFBy b3BlcnR5TmFtZSA9IHByb3BlcnR5SWQgPyBnZXRQcm9wZXJ0eU5hbWVTdHJpbmcocHJvcGVydHlJ ZCkgOiBuYW1lOwogICAgICAgICAgICAgICAgIEhhc2hNYXA8U3RyaW5nLCBSZWZQdHI8SW5zcGVj dG9yOjpQcm90b2NvbDo6Q1NTOjpDU1NQcm9wZXJ0eT4+OjppdGVyYXRvciBhY3RpdmVJdCA9IHBy b3BlcnR5TmFtZVRvUHJldmlvdXNBY3RpdmVQcm9wZXJ0eS5maW5kKGNhbm9uaWNhbFByb3BlcnR5 TmFtZSk7Cg==