94923 2012-08-24 04:50:26 -0700 Web Inspector: Incorrect property override computation when !important is involved 2012-08-27 02:35:51 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov apavlov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy vsevik yurys oldest_to_newest 703997 0 apavlov 2012-08-24 04:50:26 -0700 What steps will reproduce the problem? 1. Have an element with an !important css rule and a conflicting inline style 2. Inspect element What is the expected result? I'm expecting the element style to be crossed out as it is not the active style What happens instead? The element style is not crossed out. This can make it very hard to figure out what is going on, as the !important rule can be much farther down in the list of styles. Test case: <html> <head><style type="text/css"> p.foo { display: block !important } </style><body> <p class="foo bar" style="display:none">Hello, world!</p> </body></html> Upstreaming http://code.google.com/p/chromium/issues/detail?id=144209 704092 1 160421 apavlov 2012-08-24 07:35:18 -0700 Created attachment 160421 Patch 704135 2 160429 apavlov 2012-08-24 08:57:07 -0700 Created attachment 160429 Patch 704185 3 160429 vsevik 2012-08-24 09:59:08 -0700 Comment on attachment 160429 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160429&action=review > Source/WebCore/inspector/front-end/StylesSidebarPane.js:521 > + styleRule.importantProperties = {}; This could be a local variable, see below. > Source/WebCore/inspector/front-end/StylesSidebarPane.js:535 > + if (!isImportant && usedProperties.hasOwnProperty(canonicalName)) I would add || foundImportantProperties.hasOwnProperty(canonicalName) to the condition so that we don't need to store styleRule.importantProperties for the next loop iterations. > Source/WebCore/inspector/front-end/StylesSidebarPane.js:549 > + for (var j = 0; j < i; ++j) { As discussed we can avoid inner loop by using a map to remember the only rule from which this particular property is used. 704186 4 vsevik 2012-08-24 09:59:57 -0700 Please update bug title with a more generic description of this bug. 704200 5 160429 apavlov 2012-08-24 10:11:20 -0700 Comment on attachment 160429 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160429&action=review >> Source/WebCore/inspector/front-end/StylesSidebarPane.js:535 >> + if (!isImportant && usedProperties.hasOwnProperty(canonicalName)) > > I would add || foundImportantProperties.hasOwnProperty(canonicalName) to the condition so that we don't need to store styleRule.importantProperties for the next loop iterations. This check is done a lot earlier, on the line 529 above. We still need to store importantProperties unless we get a map in, as discussed. >> Source/WebCore/inspector/front-end/StylesSidebarPane.js:549 >> + for (var j = 0; j < i; ++j) { > > As discussed we can avoid inner loop by using a map to remember the only rule from which this particular property is used. Yes, will fix. 705061 6 160670 apavlov 2012-08-27 01:50:46 -0700 Created attachment 160670 Patch 705107 7 160670 vsevik 2012-08-27 02:32:49 -0700 Comment on attachment 160670 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160670&action=review > Source/WebCore/inspector/front-end/StylesSidebarPane.js:528 > + // No need to check any further if we know an !important value has already been seen. I don't think this comment is needed. > Source/WebCore/inspector/front-end/StylesSidebarPane.js:534 > + // Property is not important in this rule and has encountered earlier - do nothing. I don't think this comment is needed. 705108 8 apavlov 2012-08-27 02:35:51 -0700 Committed r126737: <http://trac.webkit.org/changeset/126737> 160421 2012-08-24 07:35:18 -0700 2012-08-24 08:57:01 -0700 Patch bug-94923-20120824183513.patch text/plain 9231 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2Y3ODc0MTQyZmFjN2E2 YzMwNGQ1Zjc1ZTAzMmIzNWZjZDUzYjVkNi4uN2Y5OWNhN2I0ZTY0MDhlMTYyZmM5Yjc3NDMzYTk4 YjJlM2JmMTEwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA4LTI0ICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogSW5jb3JyZWN0ICFpbXBvcnRhbnQgaGFuZGxpbmcgd2l0aCBpbmxpbmUgc3R5bGVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDkyMworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElubGluZSBzdHls ZSB1c2VkIHRvIGJlIHByb2Nlc3NlZCBhcyBpZiBpdCB3ZXJlIHRoZSBsYXN0IGFwcGxpY2FibGUg cnVsZSAoaW4gdGhlIHN0eWxlc2hlZXQpLAorICAgICAgICBzbyBpdCBkaWRuJ3QgcmVjZWl2ZSBu b3RpZmljYXRpb25zIG9mIGFueSBwcm9wZXJ0aWVzIGJlaW5nICFpbXBvcnRhbnQgaW4gb3RoZXIg cnVsZXMuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5l LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLnByb3RvdHlwZS5f cmVmcmVzaFN0eWxlUnVsZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQ YW5lLnByb3RvdHlwZS5fbWFya1VzZWRQcm9wZXJ0aWVzLnByb2Nlc3NQcm9wZXJ0eVByaW9yaXRp ZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLnByb3RvdHlwZS5f bWFya1VzZWRQcm9wZXJ0aWVzKToKKwogMjAxMi0wOC0yNCAgRGFuIENhcm5leSAgPGRjYXJuZXlA Z29vZ2xlLmNvbT4KIAogICAgICAgICBbVjhdIFJlZmFjdG9yIGF3YXkgSXNvbGF0ZWRXb3JsZApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRl YmFyUGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lk ZWJhclBhbmUuanMKaW5kZXggZjBmYmI0ODExMWNkYWM2YzYzZjA0NzdmNTI4N2UxNjIwMjExY2Uy ZS4uYmUxYTQxNjc4MzZiY2UyZGUyOWQxY2YzOGVlM2Q2YzVkZDc5NmYyYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5l LmpzCkBAIC00MTAsNyArNDEwLDcgQEAgV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLnBy b3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIGlmIChz ZWN0aW9uLmNvbXB1dGVkU3R5bGUpCiAgICAgICAgICAgICAgICAgc2VjdGlvbi5zdHlsZVJ1bGUu c3R5bGUgPSBub2RlQ29tcHV0ZWRTdHlsZTsKLSAgICAgICAgICAgIHZhciBzdHlsZVJ1bGUgPSB7 IHNlY3Rpb246IHNlY3Rpb24sIHN0eWxlOiBzZWN0aW9uLnN0eWxlUnVsZS5zdHlsZSwgY29tcHV0 ZWRTdHlsZTogc2VjdGlvbi5jb21wdXRlZFN0eWxlLCBydWxlOiBzZWN0aW9uLnJ1bGUsIGVkaXRh YmxlOiAhIShzZWN0aW9uLnN0eWxlUnVsZS5zdHlsZSAmJiBzZWN0aW9uLnN0eWxlUnVsZS5zdHls ZS5pZCkgfTsKKyAgICAgICAgICAgIHZhciBzdHlsZVJ1bGUgPSB7IHNlY3Rpb246IHNlY3Rpb24s IHN0eWxlOiBzZWN0aW9uLnN0eWxlUnVsZS5zdHlsZSwgY29tcHV0ZWRTdHlsZTogc2VjdGlvbi5j b21wdXRlZFN0eWxlLCBydWxlOiBzZWN0aW9uLnJ1bGUsIGVkaXRhYmxlOiAhIShzZWN0aW9uLnN0 eWxlUnVsZS5zdHlsZSAmJiBzZWN0aW9uLnN0eWxlUnVsZS5zdHlsZS5pZCksIGlzQXR0cmlidXRl OiBzZWN0aW9uLnN0eWxlUnVsZS5pc0F0dHJpYnV0ZSB9OwogICAgICAgICAgICAgc3R5bGVSdWxl cy5wdXNoKHN0eWxlUnVsZSk7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHN0eWxlUnVsZXM7 CkBAIC01MzksMzMgKzUzOSw0NSBAQCBXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUucHJv dG90eXBlID0gewogICAgICAgICAgICAgICAgIHVzZWRQcm9wZXJ0aWVzW2Nhbm9uaWNhbE5hbWVd ID0gdHJ1ZTsKICAgICAgICAgfQogCisgICAgICAgIGZ1bmN0aW9uIHByb2Nlc3NQcm9wZXJ0eVBy aW9yaXRpZXMoZm91bmRQcmlvcml0eVByb3BlcnRpZXMsIHN0eWxlUnVsZSwgaW5saW5lU3R5bGVT ZWNvbmRQYXNzKQorICAgICAgICB7CisgICAgICAgICAgICB2YXIgYWxsUHJvcGVydGllcyA9IHN0 eWxlUnVsZS5zdHlsZS5hbGxQcm9wZXJ0aWVzOworICAgICAgICAgICAgZm9yICh2YXIgaiA9IDA7 IGogPCBhbGxQcm9wZXJ0aWVzLmxlbmd0aDsgKytqKSB7CisgICAgICAgICAgICAgICAgdmFyIHBy b3BlcnR5ID0gYWxsUHJvcGVydGllc1tqXTsKKyAgICAgICAgICAgICAgICBpZiAoIXByb3BlcnR5 LmlzTGl2ZSkKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAg dmFyIGNhbm9uaWNhbE5hbWUgPSBXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUuY2Fub25p Y2FsUHJvcGVydHlOYW1lKHByb3BlcnR5Lm5hbWUpOworICAgICAgICAgICAgICAgIGlmIChwcm9w ZXJ0eS5wcmlvcml0eS5sZW5ndGgpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCEoY2Fub25p Y2FsTmFtZSBpbiBmb3VuZFByaW9yaXR5UHJvcGVydGllcykpCisgICAgICAgICAgICAgICAgICAg ICAgICBzdHlsZVJ1bGUudXNlZFByb3BlcnRpZXNbY2Fub25pY2FsTmFtZV0gPSB0cnVlOworICAg ICAgICAgICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIC8vIEFsd2F5 cyByZXRhaW4gIWltcG9ydGFudCBwcm9wZXJ0aWVzIGluIGlubGluZSBzdHlsZXMuCisgICAgICAg ICAgICAgICAgICAgICAgICBpZiAoIWlubGluZVN0eWxlU2Vjb25kUGFzcykKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICBkZWxldGUgc3R5bGVSdWxlLnVzZWRQcm9wZXJ0aWVzW2Nhbm9uaWNh bE5hbWVdOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIGZvdW5k UHJpb3JpdHlQcm9wZXJ0aWVzW2Nhbm9uaWNhbE5hbWVdID0gdHJ1ZTsKKyAgICAgICAgICAgICAg ICB9IGVsc2UgaWYgKGNhbm9uaWNhbE5hbWUgaW4gZm91bmRQcmlvcml0eVByb3BlcnRpZXMpCisg ICAgICAgICAgICAgICAgICAgIGRlbGV0ZSBzdHlsZVJ1bGUudXNlZFByb3BlcnRpZXNbY2Fub25p Y2FsTmFtZV07CisgICAgICAgICAgICB9CisgICAgICAgIH0KKwogICAgICAgICBpZiAocHJpb3Jp dHlVc2VkKSB7CiAgICAgICAgICAgICAvLyBXYWxrIHRoZSBwcm9wZXJ0aWVzIGFnYWluIGFuZCBh Y2NvdW50IGZvciAhaW1wb3J0YW50LgogICAgICAgICAgICAgdmFyIGZvdW5kUHJpb3JpdHlQcm9w ZXJ0aWVzID0ge307CisgICAgICAgICAgICB2YXIgaW5saW5lU3R5bGVSdWxlOwogCiAgICAgICAg ICAgICAvLyBXYWxrIGluIGRpcmVjdCBvcmRlciB0byBkZXRlY3QgdGhlIGFjdGl2ZS9tb3N0IHNw ZWNpZmljIHJ1bGUgcHJvdmlkaW5nIGEgcHJpb3JpdHkKICAgICAgICAgICAgIC8vIChpbiB0aGlz IGNhc2UgYWxsIHN1YnNlcXVlbnQgIWltcG9ydGFudCB2YWx1ZXMgZ2V0IGNhbmNlbGVkLikKICAg ICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgc3R5bGVSdWxlcy5sZW5ndGg7ICsraSkgewot ICAgICAgICAgICAgICAgIGlmIChzdHlsZVJ1bGVzW2ldLmNvbXB1dGVkU3R5bGUgfHwgc3R5bGVS dWxlc1tpXS5pc1N0eWxlU2VwYXJhdG9yKQorICAgICAgICAgICAgICAgIHZhciBzdHlsZVJ1bGUg PSBzdHlsZVJ1bGVzW2ldOworICAgICAgICAgICAgICAgIGlmIChzdHlsZVJ1bGUuY29tcHV0ZWRT dHlsZSB8fCBzdHlsZVJ1bGUuaXNTdHlsZVNlcGFyYXRvcikKICAgICAgICAgICAgICAgICAgICAg Y29udGludWU7Ci0KLSAgICAgICAgICAgICAgICB2YXIgc3R5bGUgPSBzdHlsZVJ1bGVzW2ldLnN0 eWxlOwotICAgICAgICAgICAgICAgIHZhciBhbGxQcm9wZXJ0aWVzID0gc3R5bGUuYWxsUHJvcGVy dGllczsKLSAgICAgICAgICAgICAgICBmb3IgKHZhciBqID0gMDsgaiA8IGFsbFByb3BlcnRpZXMu bGVuZ3RoOyArK2opIHsKLSAgICAgICAgICAgICAgICAgICAgdmFyIHByb3BlcnR5ID0gYWxsUHJv cGVydGllc1tqXTsKLSAgICAgICAgICAgICAgICAgICAgaWYgKCFwcm9wZXJ0eS5pc0xpdmUpCi0g ICAgICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgICAgICAgICAgdmFy IGNhbm9uaWNhbE5hbWUgPSBXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUuY2Fub25pY2Fs UHJvcGVydHlOYW1lKHByb3BlcnR5Lm5hbWUpOwotICAgICAgICAgICAgICAgICAgICBpZiAocHJv cGVydHkucHJpb3JpdHkubGVuZ3RoKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiAoIShj YW5vbmljYWxOYW1lIGluIGZvdW5kUHJpb3JpdHlQcm9wZXJ0aWVzKSkKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICBzdHlsZVJ1bGVzW2ldLnVzZWRQcm9wZXJ0aWVzW2Nhbm9uaWNhbE5hbWVd ID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICBkZWxldGUgc3R5bGVSdWxlc1tpXS51c2VkUHJvcGVydGllc1tjYW5vbmljYWxO YW1lXTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGZvdW5kUHJpb3JpdHlQcm9wZXJ0aWVzW2Nh bm9uaWNhbE5hbWVdID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICAgICAgfSBlbHNlIGlmIChjYW5v bmljYWxOYW1lIGluIGZvdW5kUHJpb3JpdHlQcm9wZXJ0aWVzKQotICAgICAgICAgICAgICAgICAg ICAgICAgZGVsZXRlIHN0eWxlUnVsZXNbaV0udXNlZFByb3BlcnRpZXNbY2Fub25pY2FsTmFtZV07 Ci0gICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGlmIChzdHlsZVJ1bGUuaXNBdHRy aWJ1dGUpCisgICAgICAgICAgICAgICAgICAgIGlubGluZVN0eWxlUnVsZSA9IHN0eWxlUnVsZTsK KyAgICAgICAgICAgICAgICBwcm9jZXNzUHJvcGVydHlQcmlvcml0aWVzKGZvdW5kUHJpb3JpdHlQ cm9wZXJ0aWVzLCBzdHlsZVJ1bGUpOwogICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKGlu bGluZVN0eWxlUnVsZSkKKyAgICAgICAgICAgICAgICBwcm9jZXNzUHJvcGVydHlQcmlvcml0aWVz KGZvdW5kUHJpb3JpdHlQcm9wZXJ0aWVzLCBpbmxpbmVTdHlsZVJ1bGUsIHRydWUpOwogICAgICAg ICB9CiAgICAgfSwKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDZkNzgyYWNhZGVhZDFkYmRjZDA2ZWJlNmFhOGFlNTA0OWIz M2Q2MzAuLjI1NTk2Yzc2ZWQ4OTljZGI4NzY5NWJlMTYwNWY5MzA2MmQyOTJlZTEgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNCBAQAorMjAxMi0wOC0yNCAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hy b21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEluY29ycmVjdCAhaW1wb3J0YW50 IGhhbmRsaW5nIHdpdGggaW5saW5lIHN0eWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ5MjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9lbGVtZW50cy9lbGVtZW50cy1wYW5lbC1z dHlsZXMtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9lbGVtZW50cy9yZXNvdXJj ZXMvZWxlbWVudHMtcGFuZWwtc3R5bGVzLmNzczoKKyAgICAgICAgKC5mb28sIC5mb286OmJlZm9y ZSk6CisKIDIwMTItMDgtMjQgIEt3YW5nWW9uZyBDaG9pICA8a3kwLmNob2lAc2Ftc3VuZy5jb20+ CiAKICAgICAgICAgW0VGTF0gQWRkZWQgbWlzc2luZyBTS0lQIGtleXdvcmQgdG8gcGxhdGZvcm0v ZWZsL1Rlc3RFeHBlY3RhdGlvbnMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9l bGVtZW50cy9lbGVtZW50cy1wYW5lbC1zdHlsZXMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL2VsZW1lbnRzL2VsZW1lbnRzLXBhbmVsLXN0eWxlcy1leHBlY3RlZC50eHQKaW5k ZXggOTFjZWE5NTlhMWVkZDQ4YmNiOWUzZGIyYjYxMjM4MWM5ZWFmNjQwNS4uYTI1YjdjYTBiNWE5 MzMyOGZmNDlkZWU2OTNjZTBlYjQ5Y2QyMjgwNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL2VsZW1lbnRzL2VsZW1lbnRzLXBhbmVsLXN0eWxlcy1leHBlY3RlZC50eHQKKysrIGIv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzL2VsZW1lbnRzLXBhbmVsLXN0eWxlcy1leHBl Y3RlZC50eHQKQEAgLTEsNSArMSw2IEBACiBUZXN0cyB0aGF0IGVsZW1lbnRzIHBhbmVsIHNob3dz IHByb3BlciBzdHlsZXMgaW4gdGhlIHNpZGViYXIgcGFuZWwuCiAKK0ZvbwogW2V4cGFuZGVkXSAK IC13ZWJraXQtZm9udC1zbW9vdGhpbmc6IHN1YnBpeGVsLWFudGlhbGlhc2VkOwogICAgIGVsZW1l bnQuc3R5bGUgLSBzdWJwaXhlbC1hbnRpYWxpYXNlZCAKQEAgLTE0LDggKzE1LDkgQEAgYm9yZGVy LXRvcC1yaWdodC1yYWRpdXM6IDVweDsKIGNvbG9yOiBibHVlOwogICAgIC5mb28sIC5mb286OmJl Zm9yZSAtIGJsdWUgZWxlbWVudHMtcGFuZWwtc3R5bGVzLmNzczoyMgogICAgIC8tLSBvdmVybG9h ZGVkIC0tLyAuZm9vIC0gYmxhY2sgZWxlbWVudHMtcGFuZWwtc3R5bGVzLmNzczoxNAotZGlzcGxh eTogbm9uZTsKLSAgICBlbGVtZW50LnN0eWxlIC0gbm9uZSAKK2Rpc3BsYXk6IGJsb2NrOworICAg IC8tLSBvdmVybG9hZGVkIC0tLyBlbGVtZW50LnN0eWxlIC0gbm9uZSAKKyAgICAuZm9vLCAuZm9v OjpiZWZvcmUgLSBibG9jayAhaW1wb3J0YW50IGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3M6MjIK ICAgICAvLS0gb3ZlcmxvYWRlZCAtLS8gZGl2IC0gYmxvY2sgdXNlciBhZ2VudCBzdHlsZXNoZWV0 CiBmb250LWZhbWlseTogc2VyaWY7CiAgICAgI2NvbnRhaW5lciAtIHNlcmlmIGVsZW1lbnRzLXBh bmVsLXN0eWxlcy5jc3M6NQpAQCAtMzgsNyArNDAsNyBAQCB0ZXh0LWFsaWduOiAtd2Via2l0LWxl ZnQ7CiAKIFtleHBhbmRlZF0gCiBlbGVtZW50LnN0eWxlICB7ICgpCi1kaXNwbGF5OiBub25lOwor Ly0tIG92ZXJsb2FkZWQgLS0vIGRpc3BsYXk6IG5vbmU7CiAtd2Via2l0LWZvbnQtc21vb3RoaW5n OiBzdWJwaXhlbC1hbnRpYWxpYXNlZDsKIAogPT09PT09PT0gTWF0Y2hlZCBDU1MgUnVsZXMgPT09 PT09PT0KQEAgLTQ3LDEyICs0OSwxMyBAQCBkaXNwbGF5OiBub25lOwogZm9udC1zdHlsZTogaXRh bGljICFpbXBvcnRhbnQ7CiAKIFtleHBhbmRlZF0gCi0uZm9vICB7IChlbGVtZW50cy1wYW5lbC1z dHlsZXMuY3NzOjQwKQorLmZvbyAgeyAoZWxlbWVudHMtcGFuZWwtc3R5bGVzLmNzczo0MSkKIAog W2V4cGFuZGVkXSAKIC5mb28sIC5mb286OmJlZm9yZSAgeyAoZWxlbWVudHMtcGFuZWwtc3R5bGVz LmNzczoyMikKIGNvbnRlbnQ6ICJbYmVmb3JlIEZvb10iOwogY29sb3I6IGJsdWU7CitkaXNwbGF5 OiBibG9jayAhaW1wb3J0YW50OwogCiBbZXhwYW5kZWRdIAogLmZvbyAgeyAoZWxlbWVudHMtcGFu ZWwtc3R5bGVzLmNzczoxNCkKQEAgLTkyLDI2ICs5NSwyNyBAQCBib2R5ICB7IChlbGVtZW50cy1w YW5lbC1zdHlsZXMuY3NzOjEpCiAKID09PT09PT09IFBzZXVkbyA6OmJlZm9yZSBlbGVtZW50ID09 PT09PT09CiBbZXhwYW5kZWRdIAotLmZvbzo6YmVmb3JlICB7IChlbGVtZW50cy1wYW5lbC1zdHls ZXMuY3NzOjQ0KQorLmZvbzo6YmVmb3JlICB7IChlbGVtZW50cy1wYW5lbC1zdHlsZXMuY3NzOjQ1 KQogCiBbZXhwYW5kZWRdIAotLmZvbzo6YmVmb3JlICB7IChlbGVtZW50cy1wYW5lbC1zdHlsZXMu Y3NzOjI3KQorLmZvbzo6YmVmb3JlICB7IChlbGVtZW50cy1wYW5lbC1zdHlsZXMuY3NzOjI4KQog Y29sb3I6IHJlZDsKIAogW2V4cGFuZGVkXSAKIC5mb28sIC5mb286OmJlZm9yZSAgeyAoZWxlbWVu dHMtcGFuZWwtc3R5bGVzLmNzczoyMikKIGNvbnRlbnQ6ICJbYmVmb3JlIEZvb10iOwogLy0tIG92 ZXJsb2FkZWQgLS0vIGNvbG9yOiBibHVlOworZGlzcGxheTogYmxvY2sgIWltcG9ydGFudDsKIAog CiA9PT09PT09PSBQc2V1ZG8gOjphZnRlciBlbGVtZW50ID09PT09PT09CiBbZXhwYW5kZWRdIAot LmZvbzo6YWZ0ZXIgIHsgKGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3M6MzUpCisuZm9vOjphZnRl ciAgeyAoZWxlbWVudHMtcGFuZWwtc3R5bGVzLmNzczozNikKIGZvbnQtZmFtaWx5OiBjb3VyaWVy OwogY29udGVudDogIlthZnRlciBGb28gMl0iOwogCiBbZXhwYW5kZWRdIAotLmZvbzo6YWZ0ZXIg IHsgKGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3M6MzEpCisuZm9vOjphZnRlciAgeyAoZWxlbWVu dHMtcGFuZWwtc3R5bGVzLmNzczozMikKIC8tLSBvdmVybG9hZGVkIC0tLyBjb250ZW50OiAiW2Fm dGVyIEZvb10iOwogY29sb3I6IGdyZWVuOwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZWxlbWVudHMvcmVzb3VyY2VzL2VsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3MgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMvcmVzb3VyY2VzL2VsZW1lbnRzLXBhbmVsLXN0eWxl cy5jc3MKaW5kZXggNGVkOTBhMDc5OGZlNzY0ODNhNjc4NGQ0MDU2MDFlMzQxNDI0MGZmMC4uODY4 ZDhhNzZiMTQyY2Y0ZGExMjhkNGU0ZDljYzE3NmNmMGRhYzRjMyAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzL3Jlc291cmNlcy9lbGVtZW50cy1wYW5lbC1zdHlsZXMu Y3NzCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy9yZXNvdXJjZXMvZWxlbWVu dHMtcGFuZWwtc3R5bGVzLmNzcwpAQCAtMjIsNiArMjIsNyBAQCBib2R5IHsKIC5mb28sIC5mb286 OmJlZm9yZSB7CiAgICAgY29udGVudDogIltiZWZvcmUgRm9vXSI7CiAgICAgY29sb3I6IGJsdWU7 CisgICAgZGlzcGxheTogYmxvY2sgIWltcG9ydGFudDsKIH0KIAogLmZvbzo6YmVmb3JlIHsK 160429 2012-08-24 08:57:07 -0700 2012-08-27 01:50:40 -0700 Patch bug-94923-20120824195702.patch text/plain 10631 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDI5YjdiMzA3ZGI5MTY2 ZWNiZTkzYjQ5OWRjNDNhODU2ZGM2YzI0OC4uMGEzZmNlZTBkYTlmMGUzY2NiOTM1MDYxN2EyM2Jh MjU0MjFjMWE4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA4LTI0ICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogSW5jb3JyZWN0ICFpbXBvcnRhbnQgaGFuZGxpbmcgd2l0aCBpbmxpbmUgc3R5bGVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDkyMworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBjYXNjYWRl IG9mICFpbXBvcnRhbnQgcHJvcGVydGllcyB3YXMgdG90YWxseSB3cm9uZyBpZiBhIHByb3BlcnR5 IHdhcyBsaXN0ZWQgYXMgIWltcG9ydGFudCBhbmQgdGhlbiBhcyBub24tIWltcG9ydGFudC4KKwor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUucHJvdG90eXBlLl9yZWZyZXNoU3R5 bGVSdWxlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUucHJvdG90 eXBlLl9tYXJrVXNlZFByb3BlcnRpZXMpOgorCiAyMDEyLTA4LTI0ICBKb3NodWEgTmV0dGVyZmll bGQgIDxqbmV0dGVyZmllbGRAcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gRXh0ZW5k IExheWVyRmlsdGVyUmVuZGVyZXIgaW4gcHJlcGFyYXRpb24gZm9yIENTUyBTaGFkZXJzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQ YW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFy UGFuZS5qcwppbmRleCBhMDBkMTVhY2JkMWQ4MDQ2MzkxOTlhNzI2Y2YxZTFkOTVmZWJiNzZlLi43 MTlkMGI4MmIxNmY2NWVkN2EwOTNiMDg4ZTYxMzk0ZjNlODU0ZTE3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMK QEAgLTQxMiw3ICs0MTIsNyBAQCBXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUucHJvdG90 eXBlID0gewogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgaWYgKHNlY3Rp b24uY29tcHV0ZWRTdHlsZSkKICAgICAgICAgICAgICAgICBzZWN0aW9uLnN0eWxlUnVsZS5zdHls ZSA9IG5vZGVDb21wdXRlZFN0eWxlOwotICAgICAgICAgICAgdmFyIHN0eWxlUnVsZSA9IHsgc2Vj dGlvbjogc2VjdGlvbiwgc3R5bGU6IHNlY3Rpb24uc3R5bGVSdWxlLnN0eWxlLCBjb21wdXRlZFN0 eWxlOiBzZWN0aW9uLmNvbXB1dGVkU3R5bGUsIHJ1bGU6IHNlY3Rpb24ucnVsZSwgZWRpdGFibGU6 ICEhKHNlY3Rpb24uc3R5bGVSdWxlLnN0eWxlICYmIHNlY3Rpb24uc3R5bGVSdWxlLnN0eWxlLmlk KSB9OworICAgICAgICAgICAgdmFyIHN0eWxlUnVsZSA9IHsgc2VjdGlvbjogc2VjdGlvbiwgc3R5 bGU6IHNlY3Rpb24uc3R5bGVSdWxlLnN0eWxlLCBjb21wdXRlZFN0eWxlOiBzZWN0aW9uLmNvbXB1 dGVkU3R5bGUsIHJ1bGU6IHNlY3Rpb24ucnVsZSwgZWRpdGFibGU6ICEhKHNlY3Rpb24uc3R5bGVS dWxlLnN0eWxlICYmIHNlY3Rpb24uc3R5bGVSdWxlLnN0eWxlLmlkKSwgaXNBdHRyaWJ1dGU6IHNl Y3Rpb24uc3R5bGVSdWxlLmlzQXR0cmlidXRlIH07CiAgICAgICAgICAgICBzdHlsZVJ1bGVzLnB1 c2goc3R5bGVSdWxlKTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gc3R5bGVSdWxlczsKQEAg LTUwNiw5ICs1MDYsNyBAQCBXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUucHJvdG90eXBl ID0gewogCiAgICAgX21hcmtVc2VkUHJvcGVydGllczogZnVuY3Rpb24oc3R5bGVSdWxlcywgdXNl ZFByb3BlcnRpZXMpCiAgICAgewotICAgICAgICB2YXIgcHJpb3JpdHlVc2VkID0gZmFsc2U7Ci0K LSAgICAgICAgLy8gV2FsayB0aGUgc3R5bGUgcnVsZXMgYW5kIG1ha2UgYSBsaXN0IG9mIGFsbCB1 c2VkIGFuZCBvdmVybG9hZGVkIHByb3BlcnRpZXMuCisgICAgICAgIHZhciBmb3VuZEltcG9ydGFu dFByb3BlcnRpZXMgPSB7fTsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzdHlsZVJ1bGVz Lmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICB2YXIgc3R5bGVSdWxlID0gc3R5bGVSdWxlc1tp XTsKICAgICAgICAgICAgIGlmIChzdHlsZVJ1bGUuY29tcHV0ZWRTdHlsZSB8fCBzdHlsZVJ1bGUu aXNTdHlsZVNlcGFyYXRvcikKQEAgLTUyMCw1MiArNTE4LDQyIEBAIFdlYkluc3BlY3Rvci5TdHls ZXNTaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgICAgIHZhciBzdHlsZSA9IHN0 eWxlUnVsZS5zdHlsZTsKICAgICAgICAgICAgIHZhciBhbGxQcm9wZXJ0aWVzID0gc3R5bGUuYWxs UHJvcGVydGllczsKKyAgICAgICAgICAgIHN0eWxlUnVsZS5pbXBvcnRhbnRQcm9wZXJ0aWVzID0g e307CiAgICAgICAgICAgICBmb3IgKHZhciBqID0gMDsgaiA8IGFsbFByb3BlcnRpZXMubGVuZ3Ro OyArK2opIHsKICAgICAgICAgICAgICAgICB2YXIgcHJvcGVydHkgPSBhbGxQcm9wZXJ0aWVzW2pd OwogICAgICAgICAgICAgICAgIGlmICghcHJvcGVydHkuaXNMaXZlIHx8ICFwcm9wZXJ0eS5wYXJz ZWRPaykKICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICAgICAgdmFy IGNhbm9uaWNhbE5hbWUgPSBXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUuY2Fub25pY2Fs UHJvcGVydHlOYW1lKHByb3BlcnR5Lm5hbWUpOwogCi0gICAgICAgICAgICAgICAgaWYgKCFwcmlv cml0eVVzZWQgJiYgcHJvcGVydHkucHJpb3JpdHkubGVuZ3RoKQotICAgICAgICAgICAgICAgICAg ICBwcmlvcml0eVVzZWQgPSB0cnVlOworICAgICAgICAgICAgICAgIC8vIE5vIG5lZWQgdG8gY2hl Y2sgYW55IGZ1cnRoZXIgaWYgd2Uga25vdyBhbiAhaW1wb3J0YW50IHZhbHVlIGhhcyBhbHJlYWR5 IGJlZW4gc2Vlbi4KKyAgICAgICAgICAgICAgICBpZiAoZm91bmRJbXBvcnRhbnRQcm9wZXJ0aWVz Lmhhc093blByb3BlcnR5KGNhbm9uaWNhbE5hbWUpKQorICAgICAgICAgICAgICAgICAgICBjb250 aW51ZTsKIAotICAgICAgICAgICAgICAgIC8vIElmIHRoZSBwcm9wZXJ0eSBuYW1lIGlzIGFscmVh ZHkgdXNlZCBieSBhbm90aGVyIHJ1bGUgdGhlbiB0aGlzIHJ1bGUncwotICAgICAgICAgICAgICAg IC8vIHByb3BlcnR5IGlzIG92ZXJsb2FkZWQsIHNvIGRvbid0IGFkZCBpdCB0byB0aGUgcnVsZSdz IHVzZWRQcm9wZXJ0aWVzLgotICAgICAgICAgICAgICAgIGlmICghKGNhbm9uaWNhbE5hbWUgaW4g dXNlZFByb3BlcnRpZXMpKQotICAgICAgICAgICAgICAgICAgICBzdHlsZVJ1bGUudXNlZFByb3Bl cnRpZXNbY2Fub25pY2FsTmFtZV0gPSB0cnVlOwotICAgICAgICAgICAgfQorICAgICAgICAgICAg ICAgIHZhciBpc0ltcG9ydGFudCA9IHByb3BlcnR5LnByaW9yaXR5Lmxlbmd0aDsKIAotICAgICAg ICAgICAgLy8gQWRkIGFsbCB0aGUgcHJvcGVydGllcyBmb3VuZCBpbiB0aGlzIHN0eWxlIHRvIHRo ZSB1c2VkIHByb3BlcnRpZXMgbGlzdC4KLSAgICAgICAgICAgIC8vIERvIHRoaXMgaGVyZSBzbyBv bmx5IGZ1dHVyZSBydWxlcyBhcmUgYWZmZWN0IGJ5IHByb3BlcnRpZXMgdXNlZCBpbiB0aGlzIHJ1 bGUuCi0gICAgICAgICAgICBmb3IgKHZhciBjYW5vbmljYWxOYW1lIGluIHN0eWxlUnVsZXNbaV0u dXNlZFByb3BlcnRpZXMpCi0gICAgICAgICAgICAgICAgdXNlZFByb3BlcnRpZXNbY2Fub25pY2Fs TmFtZV0gPSB0cnVlOwotICAgICAgICB9CisgICAgICAgICAgICAgICAgLy8gUHJvcGVydHkgaXMg bm90IGltcG9ydGFudCBpbiB0aGlzIHJ1bGUgYW5kIGhhcyBlbmNvdW50ZXJlZCBlYXJsaWVyIC0g ZG8gbm90aGluZy4KKyAgICAgICAgICAgICAgICBpZiAoIWlzSW1wb3J0YW50ICYmIHVzZWRQcm9w ZXJ0aWVzLmhhc093blByb3BlcnR5KGNhbm9uaWNhbE5hbWUpKQorICAgICAgICAgICAgICAgICAg ICBjb250aW51ZTsKIAotICAgICAgICBpZiAocHJpb3JpdHlVc2VkKSB7Ci0gICAgICAgICAgICAv LyBXYWxrIHRoZSBwcm9wZXJ0aWVzIGFnYWluIGFuZCBhY2NvdW50IGZvciAhaW1wb3J0YW50Lgot ICAgICAgICAgICAgdmFyIGZvdW5kUHJpb3JpdHlQcm9wZXJ0aWVzID0ge307CisgICAgICAgICAg ICAgICAgaWYgKGlzSW1wb3J0YW50KSB7CisgICAgICAgICAgICAgICAgICAgIHN0eWxlUnVsZS5p bXBvcnRhbnRQcm9wZXJ0aWVzW2Nhbm9uaWNhbE5hbWVdID0gdHJ1ZTsKKyAgICAgICAgICAgICAg ICAgICAgZm91bmRJbXBvcnRhbnRQcm9wZXJ0aWVzW2Nhbm9uaWNhbE5hbWVdID0gdHJ1ZTsKKyAg ICAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIC8vIFdhbGsgaW4gZGlyZWN0IG9yZGVyIHRv IGRldGVjdCB0aGUgYWN0aXZlL21vc3Qgc3BlY2lmaWMgcnVsZSBwcm92aWRpbmcgYSBwcmlvcml0 eQotICAgICAgICAgICAgLy8gKGluIHRoaXMgY2FzZSBhbGwgc3Vic2VxdWVudCAhaW1wb3J0YW50 IHZhbHVlcyBnZXQgY2FuY2VsZWQuKQotICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBz dHlsZVJ1bGVzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKHN0eWxlUnVsZXNb aV0uY29tcHV0ZWRTdHlsZSB8fCBzdHlsZVJ1bGVzW2ldLmlzU3R5bGVTZXBhcmF0b3IpCi0gICAg ICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAgIHN0eWxlUnVsZS51c2Vk UHJvcGVydGllc1tjYW5vbmljYWxOYW1lXSA9IHRydWU7CisgICAgICAgICAgICAgICAgdXNlZFBy b3BlcnRpZXNbY2Fub25pY2FsTmFtZV0gPSB0cnVlOworICAgICAgICAgICAgfQogCi0gICAgICAg ICAgICAgICAgdmFyIHN0eWxlID0gc3R5bGVSdWxlc1tpXS5zdHlsZTsKLSAgICAgICAgICAgICAg ICB2YXIgYWxsUHJvcGVydGllcyA9IHN0eWxlLmFsbFByb3BlcnRpZXM7Ci0gICAgICAgICAgICAg ICAgZm9yICh2YXIgaiA9IDA7IGogPCBhbGxQcm9wZXJ0aWVzLmxlbmd0aDsgKytqKSB7Ci0gICAg ICAgICAgICAgICAgICAgIHZhciBwcm9wZXJ0eSA9IGFsbFByb3BlcnRpZXNbal07Ci0gICAgICAg ICAgICAgICAgICAgIGlmICghcHJvcGVydHkuaXNMaXZlKQorICAgICAgICAgICAgLy8gUmVtb3Zl IGFsbCBpbXBvcnRhbnQgcHJvcGVydGllcyBmcm9tIHByZXZpb3VzIHJ1bGVzJyB1c2VkUHJvcGVy dGllcyB3aGVyZSB0aGV5IGFyZSBub3QgaW1wb3J0YW50LgorICAgICAgICAgICAgZm9yICh2YXIg aW1wb3J0YW50UHJvcGVydHkgaW4gc3R5bGVSdWxlLmltcG9ydGFudFByb3BlcnRpZXMpIHsKKyAg ICAgICAgICAgICAgICBmb3IgKHZhciBqID0gMDsgaiA8IGk7ICsraikgeworICAgICAgICAgICAg ICAgICAgICB2YXIgcnVsZSA9IHN0eWxlUnVsZXNbal07CisgICAgICAgICAgICAgICAgICAgIGlm IChydWxlLmNvbXB1dGVkU3R5bGUgfHwgcnVsZS5pc1N0eWxlU2VwYXJhdG9yKQogICAgICAgICAg ICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICAgICAgICAgIHZhciBjYW5vbmlj YWxOYW1lID0gV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLmNhbm9uaWNhbFByb3BlcnR5 TmFtZShwcm9wZXJ0eS5uYW1lKTsKLSAgICAgICAgICAgICAgICAgICAgaWYgKHByb3BlcnR5LnBy aW9yaXR5Lmxlbmd0aCkgewotICAgICAgICAgICAgICAgICAgICAgICAgaWYgKCEoY2Fub25pY2Fs TmFtZSBpbiBmb3VuZFByaW9yaXR5UHJvcGVydGllcykpCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgc3R5bGVSdWxlc1tpXS51c2VkUHJvcGVydGllc1tjYW5vbmljYWxOYW1lXSA9IHRydWU7 Ci0gICAgICAgICAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgZGVsZXRlIHN0eWxlUnVsZXNbaV0udXNlZFByb3BlcnRpZXNbY2Fub25pY2FsTmFtZV07Ci0g ICAgICAgICAgICAgICAgICAgICAgICBmb3VuZFByaW9yaXR5UHJvcGVydGllc1tjYW5vbmljYWxO YW1lXSA9IHRydWU7Ci0gICAgICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoY2Fub25pY2FsTmFt ZSBpbiBmb3VuZFByaW9yaXR5UHJvcGVydGllcykKLSAgICAgICAgICAgICAgICAgICAgICAgIGRl bGV0ZSBzdHlsZVJ1bGVzW2ldLnVzZWRQcm9wZXJ0aWVzW2Nhbm9uaWNhbE5hbWVdOworICAgICAg ICAgICAgICAgICAgICBpZiAocnVsZS5zZWN0aW9uICYmIHJ1bGUuc2VjdGlvbi5ub0FmZmVjdCkK KyAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAgICAgICBp ZiAoIXJ1bGUuaW1wb3J0YW50UHJvcGVydGllcy5oYXNPd25Qcm9wZXJ0eShpbXBvcnRhbnRQcm9w ZXJ0eSkpCisgICAgICAgICAgICAgICAgICAgICAgICBkZWxldGUgcnVsZS51c2VkUHJvcGVydGll c1tpbXBvcnRhbnRQcm9wZXJ0eV07CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQog ICAgICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggZjNlYmYxMDFiMDdhMGMwOGJkZjM4OTk4MTZjNzQyMTRkYmYzNGQ4 OS4uOTY1ODEyOWVhZWE1NzUyMTA1NzljMTIzYjJiN2JjOTRkNGFkZDRhZiAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSw1 ICsxLDE2IEBACiAyMDEyLTA4LTI0ICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1 bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSW5jb3JyZWN0ICFpbXBvcnRhbnQgaGFu ZGxpbmcgd2l0aCBpbmxpbmUgc3R5bGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD05NDkyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2VsZW1lbnRzL2VsZW1lbnRzLXBhbmVsLXN0eWxl cy1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL2VsZW1lbnRzL3Jlc291cmNlcy9l bGVtZW50cy1wYW5lbC1zdHlsZXMuY3NzOgorICAgICAgICAoLmZvbywgLmZvbzo6YmVmb3JlKToK KworMjAxMi0wOC0yNCAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgor CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFVucmV2aWV3ZWQsIGZpeCB0ZXN0IGZsYWtpbmVzcyBk dWUgdG8gdGhlIHJlY2VudGx5IGludHJvZHVjZWQgbGF6eSBwYW5lbCBsb2FkaW5nLgogCiAgICAg ICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtZmlsZS1zZWxlY3Rvci5odG1sOgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzL2VsZW1lbnRzLXBhbmVsLXN0 eWxlcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMvZWxlbWVu dHMtcGFuZWwtc3R5bGVzLWV4cGVjdGVkLnR4dAppbmRleCA5MWNlYTk1OWExZWRkNDhiY2I5ZTNk YjJiNjEyMzgxYzllYWY2NDA1Li5hMjViN2NhMGI1YTkzMzI4ZmY0OWRlZTY5M2NlMGViNDljZDIy ODA1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMvZWxlbWVudHMt cGFuZWwtc3R5bGVzLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxl bWVudHMvZWxlbWVudHMtcGFuZWwtc3R5bGVzLWV4cGVjdGVkLnR4dApAQCAtMSw1ICsxLDYgQEAK IFRlc3RzIHRoYXQgZWxlbWVudHMgcGFuZWwgc2hvd3MgcHJvcGVyIHN0eWxlcyBpbiB0aGUgc2lk ZWJhciBwYW5lbC4KIAorRm9vCiBbZXhwYW5kZWRdIAogLXdlYmtpdC1mb250LXNtb290aGluZzog c3VicGl4ZWwtYW50aWFsaWFzZWQ7CiAgICAgZWxlbWVudC5zdHlsZSAtIHN1YnBpeGVsLWFudGlh bGlhc2VkIApAQCAtMTQsOCArMTUsOSBAQCBib3JkZXItdG9wLXJpZ2h0LXJhZGl1czogNXB4Owog Y29sb3I6IGJsdWU7CiAgICAgLmZvbywgLmZvbzo6YmVmb3JlIC0gYmx1ZSBlbGVtZW50cy1wYW5l bC1zdHlsZXMuY3NzOjIyCiAgICAgLy0tIG92ZXJsb2FkZWQgLS0vIC5mb28gLSBibGFjayBlbGVt ZW50cy1wYW5lbC1zdHlsZXMuY3NzOjE0Ci1kaXNwbGF5OiBub25lOwotICAgIGVsZW1lbnQuc3R5 bGUgLSBub25lIAorZGlzcGxheTogYmxvY2s7CisgICAgLy0tIG92ZXJsb2FkZWQgLS0vIGVsZW1l bnQuc3R5bGUgLSBub25lIAorICAgIC5mb28sIC5mb286OmJlZm9yZSAtIGJsb2NrICFpbXBvcnRh bnQgZWxlbWVudHMtcGFuZWwtc3R5bGVzLmNzczoyMgogICAgIC8tLSBvdmVybG9hZGVkIC0tLyBk aXYgLSBibG9jayB1c2VyIGFnZW50IHN0eWxlc2hlZXQKIGZvbnQtZmFtaWx5OiBzZXJpZjsKICAg ICAjY29udGFpbmVyIC0gc2VyaWYgZWxlbWVudHMtcGFuZWwtc3R5bGVzLmNzczo1CkBAIC0zOCw3 ICs0MCw3IEBAIHRleHQtYWxpZ246IC13ZWJraXQtbGVmdDsKIAogW2V4cGFuZGVkXSAKIGVsZW1l bnQuc3R5bGUgIHsgKCkKLWRpc3BsYXk6IG5vbmU7CisvLS0gb3ZlcmxvYWRlZCAtLS8gZGlzcGxh eTogbm9uZTsKIC13ZWJraXQtZm9udC1zbW9vdGhpbmc6IHN1YnBpeGVsLWFudGlhbGlhc2VkOwog CiA9PT09PT09PSBNYXRjaGVkIENTUyBSdWxlcyA9PT09PT09PQpAQCAtNDcsMTIgKzQ5LDEzIEBA IGRpc3BsYXk6IG5vbmU7CiBmb250LXN0eWxlOiBpdGFsaWMgIWltcG9ydGFudDsKIAogW2V4cGFu ZGVkXSAKLS5mb28gIHsgKGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3M6NDApCisuZm9vICB7IChl bGVtZW50cy1wYW5lbC1zdHlsZXMuY3NzOjQxKQogCiBbZXhwYW5kZWRdIAogLmZvbywgLmZvbzo6 YmVmb3JlICB7IChlbGVtZW50cy1wYW5lbC1zdHlsZXMuY3NzOjIyKQogY29udGVudDogIltiZWZv cmUgRm9vXSI7CiBjb2xvcjogYmx1ZTsKK2Rpc3BsYXk6IGJsb2NrICFpbXBvcnRhbnQ7CiAKIFtl eHBhbmRlZF0gCiAuZm9vICB7IChlbGVtZW50cy1wYW5lbC1zdHlsZXMuY3NzOjE0KQpAQCAtOTIs MjYgKzk1LDI3IEBAIGJvZHkgIHsgKGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3M6MSkKIAogPT09 PT09PT0gUHNldWRvIDo6YmVmb3JlIGVsZW1lbnQgPT09PT09PT0KIFtleHBhbmRlZF0gCi0uZm9v OjpiZWZvcmUgIHsgKGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3M6NDQpCisuZm9vOjpiZWZvcmUg IHsgKGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3M6NDUpCiAKIFtleHBhbmRlZF0gCi0uZm9vOjpi ZWZvcmUgIHsgKGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3M6MjcpCisuZm9vOjpiZWZvcmUgIHsg KGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3M6MjgpCiBjb2xvcjogcmVkOwogCiBbZXhwYW5kZWRd IAogLmZvbywgLmZvbzo6YmVmb3JlICB7IChlbGVtZW50cy1wYW5lbC1zdHlsZXMuY3NzOjIyKQog Y29udGVudDogIltiZWZvcmUgRm9vXSI7CiAvLS0gb3ZlcmxvYWRlZCAtLS8gY29sb3I6IGJsdWU7 CitkaXNwbGF5OiBibG9jayAhaW1wb3J0YW50OwogCiAKID09PT09PT09IFBzZXVkbyA6OmFmdGVy IGVsZW1lbnQgPT09PT09PT0KIFtleHBhbmRlZF0gCi0uZm9vOjphZnRlciAgeyAoZWxlbWVudHMt cGFuZWwtc3R5bGVzLmNzczozNSkKKy5mb286OmFmdGVyICB7IChlbGVtZW50cy1wYW5lbC1zdHls ZXMuY3NzOjM2KQogZm9udC1mYW1pbHk6IGNvdXJpZXI7CiBjb250ZW50OiAiW2FmdGVyIEZvbyAy XSI7CiAKIFtleHBhbmRlZF0gCi0uZm9vOjphZnRlciAgeyAoZWxlbWVudHMtcGFuZWwtc3R5bGVz LmNzczozMSkKKy5mb286OmFmdGVyICB7IChlbGVtZW50cy1wYW5lbC1zdHlsZXMuY3NzOjMyKQog Ly0tIG92ZXJsb2FkZWQgLS0vIGNvbnRlbnQ6ICJbYWZ0ZXIgRm9vXSI7CiBjb2xvcjogZ3JlZW47 CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy9yZXNvdXJjZXMv ZWxlbWVudHMtcGFuZWwtc3R5bGVzLmNzcyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50 cy9yZXNvdXJjZXMvZWxlbWVudHMtcGFuZWwtc3R5bGVzLmNzcwppbmRleCA0ZWQ5MGEwNzk4ZmU3 NjQ4M2E2Nzg0ZDQwNTYwMWUzNDE0MjQwZmYwLi44NjhkOGE3NmIxNDJjZjRkYTEyOGQ0ZTRkOWNj MTc2Y2YwZGFjNGMzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMv cmVzb3VyY2VzL2VsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3MKKysrIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL2VsZW1lbnRzL3Jlc291cmNlcy9lbGVtZW50cy1wYW5lbC1zdHlsZXMuY3NzCkBAIC0y Miw2ICsyMiw3IEBAIGJvZHkgewogLmZvbywgLmZvbzo6YmVmb3JlIHsKICAgICBjb250ZW50OiAi W2JlZm9yZSBGb29dIjsKICAgICBjb2xvcjogYmx1ZTsKKyAgICBkaXNwbGF5OiBibG9jayAhaW1w b3J0YW50OwogfQogCiAuZm9vOjpiZWZvcmUgewo= 160670 2012-08-27 01:50:46 -0700 2012-08-27 02:32:49 -0700 Patch bug-94923-20120827125038.patch text/plain 9808 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGU2ZGE5YTBhMjk2YmUz NmQ1ODU1YjRjNmMwNmUyODYwNWYzYjYwMi4uYmExODI4MWNhZTNiOGU0NmE0MGViYjBhMTljNTg3 MWE1OGRkOTFjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA4LTI0ICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogSW5jb3JyZWN0IHByb3BlcnR5IG92ZXJyaWRlIGNvbXB1dGF0aW9uIHdoZW4gIWltcG9y dGFudCBpcyBpbnZvbHZlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTQ5MjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUaGUgY2FzY2FkZSBvZiAhaW1wb3J0YW50IHByb3BlcnRpZXMgd2FzIHRvdGFsbHkg d3JvbmcgaWYgYSBwcm9wZXJ0eSB3YXMgbGlzdGVkIGFzICFpbXBvcnRhbnQgZmlyc3QgYW5kIGFz IG5vbi0haW1wb3J0YW50IGxhdGVyIG9uLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9TdHlsZXNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZXNTaWRl YmFyUGFuZS5wcm90b3R5cGUuX3JlZnJlc2hTdHlsZVJ1bGVzKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5wcm90b3R5cGUuX21hcmtVc2VkUHJvcGVydGllcyk6CisK IDIwMTItMDgtMjcgIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgog CiAgICAgICAgIFtRdF0gUkVHUkVTU0lPTihyMTI2Njk0KTogSXQgYnJva2UgdGhlIGRlYnVnIGJ1 aWxkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxl c1NpZGViYXJQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHls ZXNTaWRlYmFyUGFuZS5qcwppbmRleCBhMDBkMTVhY2JkMWQ4MDQ2MzkxOTlhNzI2Y2YxZTFkOTVm ZWJiNzZlLi44Njk1NmU0YTIyMjQ4ZGVkMjg2YTAxYzdhNDZkZWU5YzBmMzM2ZGZjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5l LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJh clBhbmUuanMKQEAgLTQxMiw3ICs0MTIsNyBAQCBXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBh bmUucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAg aWYgKHNlY3Rpb24uY29tcHV0ZWRTdHlsZSkKICAgICAgICAgICAgICAgICBzZWN0aW9uLnN0eWxl UnVsZS5zdHlsZSA9IG5vZGVDb21wdXRlZFN0eWxlOwotICAgICAgICAgICAgdmFyIHN0eWxlUnVs ZSA9IHsgc2VjdGlvbjogc2VjdGlvbiwgc3R5bGU6IHNlY3Rpb24uc3R5bGVSdWxlLnN0eWxlLCBj b21wdXRlZFN0eWxlOiBzZWN0aW9uLmNvbXB1dGVkU3R5bGUsIHJ1bGU6IHNlY3Rpb24ucnVsZSwg ZWRpdGFibGU6ICEhKHNlY3Rpb24uc3R5bGVSdWxlLnN0eWxlICYmIHNlY3Rpb24uc3R5bGVSdWxl LnN0eWxlLmlkKSB9OworICAgICAgICAgICAgdmFyIHN0eWxlUnVsZSA9IHsgc2VjdGlvbjogc2Vj dGlvbiwgc3R5bGU6IHNlY3Rpb24uc3R5bGVSdWxlLnN0eWxlLCBjb21wdXRlZFN0eWxlOiBzZWN0 aW9uLmNvbXB1dGVkU3R5bGUsIHJ1bGU6IHNlY3Rpb24ucnVsZSwgZWRpdGFibGU6ICEhKHNlY3Rp b24uc3R5bGVSdWxlLnN0eWxlICYmIHNlY3Rpb24uc3R5bGVSdWxlLnN0eWxlLmlkKSwgaXNBdHRy aWJ1dGU6IHNlY3Rpb24uc3R5bGVSdWxlLmlzQXR0cmlidXRlIH07CiAgICAgICAgICAgICBzdHls ZVJ1bGVzLnB1c2goc3R5bGVSdWxlKTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gc3R5bGVS dWxlczsKQEAgLTUwNiw5ICs1MDYsOCBAQCBXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUu cHJvdG90eXBlID0gewogCiAgICAgX21hcmtVc2VkUHJvcGVydGllczogZnVuY3Rpb24oc3R5bGVS dWxlcywgdXNlZFByb3BlcnRpZXMpCiAgICAgewotICAgICAgICB2YXIgcHJpb3JpdHlVc2VkID0g ZmFsc2U7Ci0KLSAgICAgICAgLy8gV2FsayB0aGUgc3R5bGUgcnVsZXMgYW5kIG1ha2UgYSBsaXN0 IG9mIGFsbCB1c2VkIGFuZCBvdmVybG9hZGVkIHByb3BlcnRpZXMuCisgICAgICAgIHZhciBmb3Vu ZEltcG9ydGFudFByb3BlcnRpZXMgPSB7fTsKKyAgICAgICAgdmFyIHByb3BlcnR5VG9FZmZlY3Rp dmVSdWxlID0ge307CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgc3R5bGVSdWxlcy5sZW5n dGg7ICsraSkgewogICAgICAgICAgICAgdmFyIHN0eWxlUnVsZSA9IHN0eWxlUnVsZXNbaV07CiAg ICAgICAgICAgICBpZiAoc3R5bGVSdWxlLmNvbXB1dGVkU3R5bGUgfHwgc3R5bGVSdWxlLmlzU3R5 bGVTZXBhcmF0b3IpCkBAIC01MjYsNDcgKzUyNSwyNSBAQCBXZWJJbnNwZWN0b3IuU3R5bGVzU2lk ZWJhclBhbmUucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAg ICAgICAgICAgICAgICB2YXIgY2Fub25pY2FsTmFtZSA9IFdlYkluc3BlY3Rvci5TdHlsZXNTaWRl YmFyUGFuZS5jYW5vbmljYWxQcm9wZXJ0eU5hbWUocHJvcGVydHkubmFtZSk7CiAKLSAgICAgICAg ICAgICAgICBpZiAoIXByaW9yaXR5VXNlZCAmJiBwcm9wZXJ0eS5wcmlvcml0eS5sZW5ndGgpCi0g ICAgICAgICAgICAgICAgICAgIHByaW9yaXR5VXNlZCA9IHRydWU7Ci0KLSAgICAgICAgICAgICAg ICAvLyBJZiB0aGUgcHJvcGVydHkgbmFtZSBpcyBhbHJlYWR5IHVzZWQgYnkgYW5vdGhlciBydWxl IHRoZW4gdGhpcyBydWxlJ3MKLSAgICAgICAgICAgICAgICAvLyBwcm9wZXJ0eSBpcyBvdmVybG9h ZGVkLCBzbyBkb24ndCBhZGQgaXQgdG8gdGhlIHJ1bGUncyB1c2VkUHJvcGVydGllcy4KLSAgICAg ICAgICAgICAgICBpZiAoIShjYW5vbmljYWxOYW1lIGluIHVzZWRQcm9wZXJ0aWVzKSkKLSAgICAg ICAgICAgICAgICAgICAgc3R5bGVSdWxlLnVzZWRQcm9wZXJ0aWVzW2Nhbm9uaWNhbE5hbWVdID0g dHJ1ZTsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgLy8gQWRkIGFsbCB0aGUgcHJvcGVy dGllcyBmb3VuZCBpbiB0aGlzIHN0eWxlIHRvIHRoZSB1c2VkIHByb3BlcnRpZXMgbGlzdC4KLSAg ICAgICAgICAgIC8vIERvIHRoaXMgaGVyZSBzbyBvbmx5IGZ1dHVyZSBydWxlcyBhcmUgYWZmZWN0 IGJ5IHByb3BlcnRpZXMgdXNlZCBpbiB0aGlzIHJ1bGUuCi0gICAgICAgICAgICBmb3IgKHZhciBj YW5vbmljYWxOYW1lIGluIHN0eWxlUnVsZXNbaV0udXNlZFByb3BlcnRpZXMpCi0gICAgICAgICAg ICAgICAgdXNlZFByb3BlcnRpZXNbY2Fub25pY2FsTmFtZV0gPSB0cnVlOwotICAgICAgICB9Cisg ICAgICAgICAgICAgICAgLy8gTm8gbmVlZCB0byBjaGVjayBhbnkgZnVydGhlciBpZiB3ZSBrbm93 IGFuICFpbXBvcnRhbnQgdmFsdWUgaGFzIGFscmVhZHkgYmVlbiBzZWVuLgorICAgICAgICAgICAg ICAgIGlmIChmb3VuZEltcG9ydGFudFByb3BlcnRpZXMuaGFzT3duUHJvcGVydHkoY2Fub25pY2Fs TmFtZSkpCisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIGlmIChwcmlv cml0eVVzZWQpIHsKLSAgICAgICAgICAgIC8vIFdhbGsgdGhlIHByb3BlcnRpZXMgYWdhaW4gYW5k IGFjY291bnQgZm9yICFpbXBvcnRhbnQuCi0gICAgICAgICAgICB2YXIgZm91bmRQcmlvcml0eVBy b3BlcnRpZXMgPSB7fTsKKyAgICAgICAgICAgICAgICB2YXIgaXNJbXBvcnRhbnQgPSBwcm9wZXJ0 eS5wcmlvcml0eS5sZW5ndGg7CiAKLSAgICAgICAgICAgIC8vIFdhbGsgaW4gZGlyZWN0IG9yZGVy IHRvIGRldGVjdCB0aGUgYWN0aXZlL21vc3Qgc3BlY2lmaWMgcnVsZSBwcm92aWRpbmcgYSBwcmlv cml0eQotICAgICAgICAgICAgLy8gKGluIHRoaXMgY2FzZSBhbGwgc3Vic2VxdWVudCAhaW1wb3J0 YW50IHZhbHVlcyBnZXQgY2FuY2VsZWQuKQotICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkg PCBzdHlsZVJ1bGVzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKHN0eWxlUnVs ZXNbaV0uY29tcHV0ZWRTdHlsZSB8fCBzdHlsZVJ1bGVzW2ldLmlzU3R5bGVTZXBhcmF0b3IpCisg ICAgICAgICAgICAgICAgLy8gUHJvcGVydHkgaXMgbm90IGltcG9ydGFudCBpbiB0aGlzIHJ1bGUg YW5kIGhhcyBlbmNvdW50ZXJlZCBlYXJsaWVyIC0gZG8gbm90aGluZy4KKyAgICAgICAgICAgICAg ICBpZiAoIWlzSW1wb3J0YW50ICYmIHVzZWRQcm9wZXJ0aWVzLmhhc093blByb3BlcnR5KGNhbm9u aWNhbE5hbWUpKQogICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICAgICAg ICAgIHZhciBzdHlsZSA9IHN0eWxlUnVsZXNbaV0uc3R5bGU7Ci0gICAgICAgICAgICAgICAgdmFy IGFsbFByb3BlcnRpZXMgPSBzdHlsZS5hbGxQcm9wZXJ0aWVzOwotICAgICAgICAgICAgICAgIGZv ciAodmFyIGogPSAwOyBqIDwgYWxsUHJvcGVydGllcy5sZW5ndGg7ICsraikgewotICAgICAgICAg ICAgICAgICAgICB2YXIgcHJvcGVydHkgPSBhbGxQcm9wZXJ0aWVzW2pdOwotICAgICAgICAgICAg ICAgICAgICBpZiAoIXByb3BlcnR5LmlzTGl2ZSkKLSAgICAgICAgICAgICAgICAgICAgICAgIGNv bnRpbnVlOwotICAgICAgICAgICAgICAgICAgICB2YXIgY2Fub25pY2FsTmFtZSA9IFdlYkluc3Bl Y3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5jYW5vbmljYWxQcm9wZXJ0eU5hbWUocHJvcGVydHkubmFt ZSk7Ci0gICAgICAgICAgICAgICAgICAgIGlmIChwcm9wZXJ0eS5wcmlvcml0eS5sZW5ndGgpIHsK LSAgICAgICAgICAgICAgICAgICAgICAgIGlmICghKGNhbm9uaWNhbE5hbWUgaW4gZm91bmRQcmlv cml0eVByb3BlcnRpZXMpKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0eWxlUnVsZXNb aV0udXNlZFByb3BlcnRpZXNbY2Fub25pY2FsTmFtZV0gPSB0cnVlOwotICAgICAgICAgICAgICAg ICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRlbGV0ZSBzdHlsZVJ1 bGVzW2ldLnVzZWRQcm9wZXJ0aWVzW2Nhbm9uaWNhbE5hbWVdOwotICAgICAgICAgICAgICAgICAg ICAgICAgZm91bmRQcmlvcml0eVByb3BlcnRpZXNbY2Fub25pY2FsTmFtZV0gPSB0cnVlOwotICAg ICAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKGNhbm9uaWNhbE5hbWUgaW4gZm91bmRQcmlvcml0 eVByb3BlcnRpZXMpCi0gICAgICAgICAgICAgICAgICAgICAgICBkZWxldGUgc3R5bGVSdWxlc1tp XS51c2VkUHJvcGVydGllc1tjYW5vbmljYWxOYW1lXTsKKyAgICAgICAgICAgICAgICBpZiAoaXNJ bXBvcnRhbnQpIHsKKyAgICAgICAgICAgICAgICAgICAgZm91bmRJbXBvcnRhbnRQcm9wZXJ0aWVz W2Nhbm9uaWNhbE5hbWVdID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHByb3BlcnR5 VG9FZmZlY3RpdmVSdWxlLmhhc093blByb3BlcnR5KGNhbm9uaWNhbE5hbWUpKQorICAgICAgICAg ICAgICAgICAgICAgICAgZGVsZXRlIHByb3BlcnR5VG9FZmZlY3RpdmVSdWxlW2Nhbm9uaWNhbE5h bWVdLnVzZWRQcm9wZXJ0aWVzW2Nhbm9uaWNhbE5hbWVdOwogICAgICAgICAgICAgICAgIH0KKwor ICAgICAgICAgICAgICAgIHN0eWxlUnVsZS51c2VkUHJvcGVydGllc1tjYW5vbmljYWxOYW1lXSA9 IHRydWU7CisgICAgICAgICAgICAgICAgdXNlZFByb3BlcnRpZXNbY2Fub25pY2FsTmFtZV0gPSB0 cnVlOworICAgICAgICAgICAgICAgIHByb3BlcnR5VG9FZmZlY3RpdmVSdWxlW2Nhbm9uaWNhbE5h bWVdID0gc3R5bGVSdWxlOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfSwKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl eCA1ODQ0ZjIzMDc4MzZiYzIxY2Y4ZDAwNTE2Mjg3MGI3NTZkYjk1ZjQ0Li42MDYxY2E2MWFjNzBj N2ZlMmY2ZDkxNjFmMmM5OTFjNWVmNjg2ODQ2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTIt MDgtMjQgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KKworICAgICAg ICBXZWIgSW5zcGVjdG9yOiBJbmNvcnJlY3QgcHJvcGVydHkgb3ZlcnJpZGUgY29tcHV0YXRpb24g d2hlbiAhaW1wb3J0YW50IGlzIGludm9sdmVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD05NDkyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2VsZW1lbnRzL2VsZW1lbnRzLXBhbmVsLXN0 eWxlcy1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL2VsZW1lbnRzL3Jlc291cmNl cy9lbGVtZW50cy1wYW5lbC1zdHlsZXMuY3NzOgorICAgICAgICAoLmZvbywgLmZvbzo6YmVmb3Jl KToKKwogMjAxMi0wOC0yNyAgQmFsYXpzIEFua2VzICA8YmFua0BpbmYudS1zemVnZWQuaHU+CiAK ICAgICAgICAgW1F0XSBOZXcgdGVzdCBpbnRyb2R1Y2VkIGluIHIxMjY2MTEgZmFpbHM6IGZhc3Qv Y3NzL2ltYWdlLXNldC1zZXR0aW5nLmh0bWwuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZWxlbWVudHMvZWxlbWVudHMtcGFuZWwtc3R5bGVzLWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy9lbGVtZW50cy1wYW5lbC1zdHlsZXMtZXhwZWN0ZWQu dHh0CmluZGV4IDkxY2VhOTU5YTFlZGQ0OGJjYjllM2RiMmI2MTIzODFjOWVhZjY0MDUuLmEyNWI3 Y2EwYjVhOTMzMjhmZjQ5ZGVlNjkzY2UwZWI0OWNkMjI4MDUgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2luc3BlY3Rvci9lbGVtZW50cy9lbGVtZW50cy1wYW5lbC1zdHlsZXMtZXhwZWN0ZWQudHh0 CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy9lbGVtZW50cy1wYW5lbC1zdHls ZXMtZXhwZWN0ZWQudHh0CkBAIC0xLDUgKzEsNiBAQAogVGVzdHMgdGhhdCBlbGVtZW50cyBwYW5l bCBzaG93cyBwcm9wZXIgc3R5bGVzIGluIHRoZSBzaWRlYmFyIHBhbmVsLgogCitGb28KIFtleHBh bmRlZF0gCiAtd2Via2l0LWZvbnQtc21vb3RoaW5nOiBzdWJwaXhlbC1hbnRpYWxpYXNlZDsKICAg ICBlbGVtZW50LnN0eWxlIC0gc3VicGl4ZWwtYW50aWFsaWFzZWQgCkBAIC0xNCw4ICsxNSw5IEBA IGJvcmRlci10b3AtcmlnaHQtcmFkaXVzOiA1cHg7CiBjb2xvcjogYmx1ZTsKICAgICAuZm9vLCAu Zm9vOjpiZWZvcmUgLSBibHVlIGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3M6MjIKICAgICAvLS0g b3ZlcmxvYWRlZCAtLS8gLmZvbyAtIGJsYWNrIGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3M6MTQK LWRpc3BsYXk6IG5vbmU7Ci0gICAgZWxlbWVudC5zdHlsZSAtIG5vbmUgCitkaXNwbGF5OiBibG9j azsKKyAgICAvLS0gb3ZlcmxvYWRlZCAtLS8gZWxlbWVudC5zdHlsZSAtIG5vbmUgCisgICAgLmZv bywgLmZvbzo6YmVmb3JlIC0gYmxvY2sgIWltcG9ydGFudCBlbGVtZW50cy1wYW5lbC1zdHlsZXMu Y3NzOjIyCiAgICAgLy0tIG92ZXJsb2FkZWQgLS0vIGRpdiAtIGJsb2NrIHVzZXIgYWdlbnQgc3R5 bGVzaGVldAogZm9udC1mYW1pbHk6IHNlcmlmOwogICAgICNjb250YWluZXIgLSBzZXJpZiBlbGVt ZW50cy1wYW5lbC1zdHlsZXMuY3NzOjUKQEAgLTM4LDcgKzQwLDcgQEAgdGV4dC1hbGlnbjogLXdl YmtpdC1sZWZ0OwogCiBbZXhwYW5kZWRdIAogZWxlbWVudC5zdHlsZSAgeyAoKQotZGlzcGxheTog bm9uZTsKKy8tLSBvdmVybG9hZGVkIC0tLyBkaXNwbGF5OiBub25lOwogLXdlYmtpdC1mb250LXNt b290aGluZzogc3VicGl4ZWwtYW50aWFsaWFzZWQ7CiAKID09PT09PT09IE1hdGNoZWQgQ1NTIFJ1 bGVzID09PT09PT09CkBAIC00NywxMiArNDksMTMgQEAgZGlzcGxheTogbm9uZTsKIGZvbnQtc3R5 bGU6IGl0YWxpYyAhaW1wb3J0YW50OwogCiBbZXhwYW5kZWRdIAotLmZvbyAgeyAoZWxlbWVudHMt cGFuZWwtc3R5bGVzLmNzczo0MCkKKy5mb28gIHsgKGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3M6 NDEpCiAKIFtleHBhbmRlZF0gCiAuZm9vLCAuZm9vOjpiZWZvcmUgIHsgKGVsZW1lbnRzLXBhbmVs LXN0eWxlcy5jc3M6MjIpCiBjb250ZW50OiAiW2JlZm9yZSBGb29dIjsKIGNvbG9yOiBibHVlOwor ZGlzcGxheTogYmxvY2sgIWltcG9ydGFudDsKIAogW2V4cGFuZGVkXSAKIC5mb28gIHsgKGVsZW1l bnRzLXBhbmVsLXN0eWxlcy5jc3M6MTQpCkBAIC05MiwyNiArOTUsMjcgQEAgYm9keSAgeyAoZWxl bWVudHMtcGFuZWwtc3R5bGVzLmNzczoxKQogCiA9PT09PT09PSBQc2V1ZG8gOjpiZWZvcmUgZWxl bWVudCA9PT09PT09PQogW2V4cGFuZGVkXSAKLS5mb286OmJlZm9yZSAgeyAoZWxlbWVudHMtcGFu ZWwtc3R5bGVzLmNzczo0NCkKKy5mb286OmJlZm9yZSAgeyAoZWxlbWVudHMtcGFuZWwtc3R5bGVz LmNzczo0NSkKIAogW2V4cGFuZGVkXSAKLS5mb286OmJlZm9yZSAgeyAoZWxlbWVudHMtcGFuZWwt c3R5bGVzLmNzczoyNykKKy5mb286OmJlZm9yZSAgeyAoZWxlbWVudHMtcGFuZWwtc3R5bGVzLmNz czoyOCkKIGNvbG9yOiByZWQ7CiAKIFtleHBhbmRlZF0gCiAuZm9vLCAuZm9vOjpiZWZvcmUgIHsg KGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3M6MjIpCiBjb250ZW50OiAiW2JlZm9yZSBGb29dIjsK IC8tLSBvdmVybG9hZGVkIC0tLyBjb2xvcjogYmx1ZTsKK2Rpc3BsYXk6IGJsb2NrICFpbXBvcnRh bnQ7CiAKIAogPT09PT09PT0gUHNldWRvIDo6YWZ0ZXIgZWxlbWVudCA9PT09PT09PQogW2V4cGFu ZGVkXSAKLS5mb286OmFmdGVyICB7IChlbGVtZW50cy1wYW5lbC1zdHlsZXMuY3NzOjM1KQorLmZv bzo6YWZ0ZXIgIHsgKGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3M6MzYpCiBmb250LWZhbWlseTog Y291cmllcjsKIGNvbnRlbnQ6ICJbYWZ0ZXIgRm9vIDJdIjsKIAogW2V4cGFuZGVkXSAKLS5mb286 OmFmdGVyICB7IChlbGVtZW50cy1wYW5lbC1zdHlsZXMuY3NzOjMxKQorLmZvbzo6YWZ0ZXIgIHsg KGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3M6MzIpCiAvLS0gb3ZlcmxvYWRlZCAtLS8gY29udGVu dDogIlthZnRlciBGb29dIjsKIGNvbG9yOiBncmVlbjsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2VsZW1lbnRzL3Jlc291cmNlcy9lbGVtZW50cy1wYW5lbC1zdHlsZXMuY3Nz IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzL3Jlc291cmNlcy9lbGVtZW50cy1wYW5l bC1zdHlsZXMuY3NzCmluZGV4IDRlZDkwYTA3OThmZTc2NDgzYTY3ODRkNDA1NjAxZTM0MTQyNDBm ZjAuLjg2OGQ4YTc2YjE0MmNmNGRhMTI4ZDRlNGQ5Y2MxNzZjZjBkYWM0YzMgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy9yZXNvdXJjZXMvZWxlbWVudHMtcGFuZWwt c3R5bGVzLmNzcworKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMvcmVzb3VyY2Vz L2VsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3MKQEAgLTIyLDYgKzIyLDcgQEAgYm9keSB7CiAuZm9v LCAuZm9vOjpiZWZvcmUgewogICAgIGNvbnRlbnQ6ICJbYmVmb3JlIEZvb10iOwogICAgIGNvbG9y OiBibHVlOworICAgIGRpc3BsYXk6IGJsb2NrICFpbXBvcnRhbnQ7CiB9CiAKIC5mb286OmJlZm9y ZSB7Cg==