138970 2014-11-21 10:27:57 -0800 [iOS] Regression(r176202): line-height is wrong on marco.org 2014-11-21 17:22:40 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez commit-queue dbates ddkilzer kling koivisto mmaxfield simon.fraser oldest_to_newest 1050487 0 cdumez 2014-11-21 10:27:57 -0800 line-height is wrong on marco.org after r176202, on iOS. Radar: <rdar://problem/19039387> 1050501 1 242052 cdumez 2014-11-21 10:59:59 -0800 Created attachment 242052 Patch 1050504 2 cdumez 2014-11-21 11:00:58 -0800 For reference, this was the code before: https://bugs.webkit.org/attachment.cgi?id=241714&action=review 1050507 3 242052 simon.fraser 2014-11-21 11:03:58 -0800 Comment on attachment 242052 Patch Please add a layout test. 1050544 4 242065 cdumez 2014-11-21 12:57:44 -0800 Created attachment 242065 Patch 1050545 5 cdumez 2014-11-21 13:08:01 -0800 @dbates: Is there a way I can explicitly NOT skip my new test on iOS (even though fast/css is skipped)? For e.g. Should I mark this specific test as [ Pass ] in the iphonesimulator TestExpectations file? 1050560 6 mmaxfield 2014-11-21 14:00:29 -0800 Yes. For an example, see LayoutTests/platform/mac/TestExpectations in https://bugs.webkit.org/attachment.cgi?id=242061&action=review 1050561 7 242070 cdumez 2014-11-21 14:05:33 -0800 Created attachment 242070 Patch 1050562 8 cdumez 2014-11-21 14:07:25 -0800 (In reply to comment #6) > Yes. For an example, see LayoutTests/platform/mac/TestExpectations in > https://bugs.webkit.org/attachment.cgi?id=242061&action=review Ok, done. 1050576 9 242070 simon.fraser 2014-11-21 15:06:07 -0800 Comment on attachment 242070 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=242070&action=review > Source/WebCore/ChangeLog:23 > + No new tests, iOS specific. Verified manually on marco.org > + using an iPhone 6 Plus. This is a lie! > Source/WebCore/css/StyleBuilderCustom.h:518 > +template <ApplyTextSizeMultiplierOrNot applyTextMultiplier> > inline bool convertLineHeight(StyleResolver& styleResolver, const CSSValue& value, Length& length, float multiplier = 1.f) Seems bloaty to generate 2 copies of this mostly-identical code. Why not just pass in a param, or just pass in styleResolver.style() or just get it from styleResolver? 1050586 10 242079 cdumez 2014-11-21 15:18:59 -0800 Created attachment 242079 Patch 1050593 11 mmaxfield 2014-11-21 15:24:53 -0800 Can't we make a real test? Perhaps that two lines with AHEM with a particular line height is the same as the same two lines except with a third blank line in between them? 1050595 12 cdumez 2014-11-21 15:26:59 -0800 (In reply to comment #11) > Can't we make a real test? Perhaps that two lines with AHEM with a > particular line height is the same as the same two lines except with a third > blank line in between them? The bug is in the CSS StyleBuilder, I am testing the StyleBuilder. 1050599 13 242081 cdumez 2014-11-21 15:29:26 -0800 Created attachment 242081 Patch 1050651 14 242081 commit-queue 2014-11-21 17:22:34 -0800 Comment on attachment 242081 Patch Clearing flags on attachment: 242081 Committed r176490: <http://trac.webkit.org/changeset/176490> 1050652 15 commit-queue 2014-11-21 17:22:40 -0800 All reviewed patches have been landed. Closing bug. 242052 2014-11-21 10:59:59 -0800 2014-11-21 12:57:40 -0800 Patch bug-138970-20141121110016.patch text/plain 4934 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2NDQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGM2ZjE5NmM0ODk2OTc3 Y2Y1YmI5NmJlOTI2NmM1ZDQ1NDhmZTg5My4uMzE0MWE3YWRmMDYyZmMzYjYyMjFkZWEyMzg3Y2Iy NmY5ZGRmZDUwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE0LTExLTIxICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gUmVncmVzc2lvbihy MTc2MjAyKTogbGluZS1oZWlnaHQgaXMgd3Jvbmcgb24gbWFyY28ub3JnCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg5NzAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZnRlciByMTc2MjAyLCBvbiBpT1Mg d2l0aCBJT1NfVEVYVF9BVVRPU0laSU5HIGVuYWJsZWQsIHdlIHdvdWxkCisgICAgICAgIG11bHRp cGx5IHRoZSBsaW5lSGVpZ2h0IGJ5IFJlbmRlclN0eWxlOjp0ZXh0U2l6ZUFkanVzdCgpOjptdWx0 aXBsaWVyKCkKKyAgICAgICAgdW5jb25kaXRpb25hbGx5LiBIb3dldmVyLCB3ZSdyZSBvbmx5IHN1 cHBvc2VkIHRvIGRvIHNvIGlmCisgICAgICAgIFJlbmRlclN0eWxlOjp0ZXh0U2l6ZUFkanVzdCgp Ojppc1BlcmNlbnRhZ2UoKSByZXR1cm5zIHRydWUuIFRoaXMKKyAgICAgICAgcGF0Y2ggcmVpbnRy b2R1Y2VzIHRoZSB0ZXh0U2l6ZUFkanVzdCgpLmlzUGVyY2VudGFnZSgpIGNoZWNrIHRoYXQgd2Fz CisgICAgICAgIGluYWR2ZXJ0ZW50bHkgZHJvcHBlZCB3aGVuIHJlZmFjdG9yaW5nIHRoZSBjb2Rl IHRvIGJlIHNoYXJlZCBiZXR3ZWVuCisgICAgICAgIGlPUyBhbmQgT1MgWC4KKworICAgICAgICBB ZGRpdGlvbmFsbHksIHRoZSBtdWx0aXBsaWVyIGlzIG9ubHkgc3VwcG9zZWQgdGhlIGJlIGFwcGxp ZWQgaWYgdGhlCisgICAgICAgIGlucHV0IENTU1ByaW1pdGl2ZVZhbHVlIGlzIGEgTGVuZ3RoIG9y IGEgTnVtYmVyLiBIb3dldmVyLCBhZnRlcgorICAgICAgICByMTc2MjAyLCB3ZSB3b3VsZCBhcHBs eSB0aGUgbXVsdGlwbGllciBpZiB0aGUgQ1NTUHJpbWl0aXZlVmFsdWUgaXMKKyAgICAgICAgYSBQ ZXJjZW50YWdlIG9yIGEgTnVtYmVyLiBUaGlzIHBhdGNoIHVwZGF0ZXMgdGhlIGNvZGUgdG8gbWF0 Y2ggdGhlCisgICAgICAgIGJlaGF2aW9yIHByaW9yIHRvIHIxNzYyMDIuCisKKyAgICAgICAgTm8g bmV3IHRlc3RzLCBpT1Mgc3BlY2lmaWMuIFZlcmlmaWVkIG1hbnVhbGx5IG9uIG1hcmNvLm9yZwor ICAgICAgICB1c2luZyBhbiBpUGhvbmUgNiBQbHVzLgorCisgICAgICAgICogY3NzL1N0eWxlQnVp bGRlckN1c3RvbS5oOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVCdWlsZGVyRnVuY3Rpb25zOjpj b252ZXJ0TGluZUhlaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJGdW5jdGlv bnM6OmFwcGx5VmFsdWVMaW5lSGVpZ2h0KToKKwogMjAxNC0xMS0yMSAgQ2hyaXMgRmxlaXphY2gg IDxjZmxlaXphY2hAYXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBNYXRoTUwgZXhwcmVzc2lvbnMg YXJlIG1pc3JlYWQgYnkgVm9pY2VPdmVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv U3R5bGVCdWlsZGVyQ3VzdG9tLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ3Vz dG9tLmgKaW5kZXggNmQ5MzBiNmNmNWNiYjllZjM1NmFjNDUxNmZkZTMwMGIwMGRiMWQwZi4uNWM5 Nzk0YTFmMjIzNzI5ZTBjZTU5OWQyMGEzMTc3ZTM3N2QwZjFkMCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckN1c3RvbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9TdHlsZUJ1aWxkZXJDdXN0b20uaApAQCAtNTEyLDYgKzUxMiw5IEBAIGlubGluZSBDU1NUb0xl bmd0aENvbnZlcnNpb25EYXRhIGNzc3RvTGVuZ3RoQ29udmVyc2lvbkRhdGFXaXRoVGV4dFpvb21G YWN0b3IoU3R5CiAgICAgcmV0dXJuIHN0eWxlUmVzb2x2ZXIuc3RhdGUoKS5jc3NUb0xlbmd0aENv bnZlcnNpb25EYXRhKCk7CiB9CiAKK2VudW0gQXBwbHlUZXh0U2l6ZU11bHRpcGxpZXJPck5vdCB7 IERvTm90QXBwbHlUZXh0TXVsdGlwbGllciwgQXBwbHlUZXh0TXVsdGlwbGllciB9OworCit0ZW1w bGF0ZSA8QXBwbHlUZXh0U2l6ZU11bHRpcGxpZXJPck5vdCBhcHBseVRleHRNdWx0aXBsaWVyPgog aW5saW5lIGJvb2wgY29udmVydExpbmVIZWlnaHQoU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZl ciwgY29uc3QgQ1NTVmFsdWUmIHZhbHVlLCBMZW5ndGgmIGxlbmd0aCwgZmxvYXQgbXVsdGlwbGll ciA9IDEuZikKIHsKICAgICBhdXRvJiBwcmltaXRpdmVWYWx1ZSA9IGRvd25jYXN0PENTU1ByaW1p dGl2ZVZhbHVlPih2YWx1ZSk7CkBAIC01MjEsMTYgKzUyNCwyMSBAQCBpbmxpbmUgYm9vbCBjb252 ZXJ0TGluZUhlaWdodChTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBjb25zdCBDU1NWYWx1 ZSYgdmFsdQogICAgIH0KICAgICBpZiAocHJpbWl0aXZlVmFsdWUuaXNMZW5ndGgoKSkgewogICAg ICAgICBsZW5ndGggPSBwcmltaXRpdmVWYWx1ZS5jb21wdXRlTGVuZ3RoPExlbmd0aD4oY3NzdG9M ZW5ndGhDb252ZXJzaW9uRGF0YVdpdGhUZXh0Wm9vbUZhY3RvcihzdHlsZVJlc29sdmVyKSk7Cisg ICAgICAgIGlmIChhcHBseVRleHRNdWx0aXBsaWVyKQorICAgICAgICAgICAgbGVuZ3RoID0gTGVu Z3RoKGxlbmd0aC52YWx1ZSgpICogbXVsdGlwbGllciwgRml4ZWQpOwogICAgICAgICByZXR1cm4g dHJ1ZTsKICAgICB9CiAgICAgaWYgKHByaW1pdGl2ZVZhbHVlLmlzUGVyY2VudGFnZSgpKSB7CiAg ICAgICAgIC8vIEZJWE1FOiBwZXJjZW50YWdlIHNob3VsZCBub3QgYmUgcmVzdHJpY3RlZCB0byBh biBpbnRlZ2VyIGhlcmUuCi0gICAgICAgIGxlbmd0aCA9IExlbmd0aCgoc3R5bGVSZXNvbHZlci5z dHlsZSgpLT5jb21wdXRlZEZvbnRTaXplKCkgKiBwcmltaXRpdmVWYWx1ZS5nZXRJbnRWYWx1ZSgp KSAqIG11bHRpcGxpZXIgLyAxMDAsIEZpeGVkKTsKKyAgICAgICAgbGVuZ3RoID0gTGVuZ3RoKChz dHlsZVJlc29sdmVyLnN0eWxlKCktPmNvbXB1dGVkRm9udFNpemUoKSAqIHByaW1pdGl2ZVZhbHVl LmdldEludFZhbHVlKCkpIC8gMTAwLCBGaXhlZCk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAg IH0KICAgICBpZiAocHJpbWl0aXZlVmFsdWUuaXNOdW1iZXIoKSkgewogICAgICAgICAvLyBGSVhN RTogbnVtYmVyIGFuZCBwZXJjZW50YWdlIHZhbHVlcyBzaG91bGQgcHJvZHVjZSB0aGUgc2FtZSB0 eXBlIG9mIExlbmd0aCAoaWUuIEZpeGVkIG9yIFBlcmNlbnQpLgotICAgICAgICBsZW5ndGggPSBM ZW5ndGgocHJpbWl0aXZlVmFsdWUuZ2V0RG91YmxlVmFsdWUoKSAqIG11bHRpcGxpZXIgKiAxMDAu MCwgUGVyY2VudCk7CisgICAgICAgIGlmIChhcHBseVRleHRNdWx0aXBsaWVyKQorICAgICAgICAg ICAgbGVuZ3RoID0gTGVuZ3RoKHByaW1pdGl2ZVZhbHVlLmdldERvdWJsZVZhbHVlKCkgKiBtdWx0 aXBsaWVyICogMTAwLjAsIFBlcmNlbnQpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBsZW5n dGggPSBMZW5ndGgocHJpbWl0aXZlVmFsdWUuZ2V0RG91YmxlVmFsdWUoKSAqIDEwMC4wLCBQZXJj ZW50KTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogICAgIHJldHVybiBmYWxzZTsKQEAg LTU3MSw3ICs1NzksMTMgQEAgaW5saW5lIHZvaWQgYXBwbHlJbml0aWFsTGluZUhlaWdodChTdHls ZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyKQogaW5saW5lIHZvaWQgYXBwbHlWYWx1ZUxpbmVIZWln aHQoU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlciwgQ1NTVmFsdWUmIHZhbHVlKQogewogICAg IExlbmd0aCBsaW5lSGVpZ2h0OwotICAgIGlmICghY29udmVydExpbmVIZWlnaHQoc3R5bGVSZXNv bHZlciwgdmFsdWUsIGxpbmVIZWlnaHQsIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+dGV4dFNpemVB ZGp1c3QoKS5tdWx0aXBsaWVyKCkpKQorICAgIGJvb2wgcmVzdWx0OworICAgIGlmIChzdHlsZVJl c29sdmVyLnN0eWxlKCktPnRleHRTaXplQWRqdXN0KCkuaXNQZXJjZW50YWdlKCkpCisgICAgICAg IHJlc3VsdCA9IGNvbnZlcnRMaW5lSGVpZ2h0PEFwcGx5VGV4dE11bHRpcGxpZXI+KHN0eWxlUmVz b2x2ZXIsIHZhbHVlLCBsaW5lSGVpZ2h0LCBzdHlsZVJlc29sdmVyLnN0eWxlKCktPnRleHRTaXpl QWRqdXN0KCkubXVsdGlwbGllcigpKTsKKyAgICBlbHNlCisgICAgICAgIHJlc3VsdCA9IGNvbnZl cnRMaW5lSGVpZ2h0PERvTm90QXBwbHlUZXh0TXVsdGlwbGllcj4oc3R5bGVSZXNvbHZlciwgdmFs dWUsIGxpbmVIZWlnaHQpOworCisgICAgaWYgKCFyZXN1bHQpCiAgICAgICAgIHJldHVybjsKIAog ICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0TGluZUhlaWdodChsaW5lSGVpZ2h0KTsKQEAg LTU4Myw3ICs1OTcsNyBAQCBpbmxpbmUgdm9pZCBhcHBseVZhbHVlTGluZUhlaWdodChTdHlsZVJl c29sdmVyJiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSYgdmFsdWUpCiBpbmxpbmUgdm9pZCBhcHBs eVZhbHVlTGluZUhlaWdodChTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSYg dmFsdWUpCiB7CiAgICAgTGVuZ3RoIGxpbmVIZWlnaHQ7Ci0gICAgaWYgKCFjb252ZXJ0TGluZUhl aWdodChzdHlsZVJlc29sdmVyLCB2YWx1ZSwgbGluZUhlaWdodCkpCisgICAgaWYgKCFjb252ZXJ0 TGluZUhlaWdodDxEb05vdEFwcGx5VGV4dE11bHRpcGxpZXI+KHN0eWxlUmVzb2x2ZXIsIHZhbHVl LCBsaW5lSGVpZ2h0KSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgc3R5bGVSZXNvbHZlci5zdHls ZSgpLT5zZXRMaW5lSGVpZ2h0KGxpbmVIZWlnaHQpOwo= 242065 2014-11-21 12:57:44 -0800 2014-11-21 14:05:27 -0800 Patch bug-138970-20141121125800.patch text/plain 12141 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2NDQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGM2ZjE5NmM0ODk2OTc3 Y2Y1YmI5NmJlOTI2NmM1ZDQ1NDhmZTg5My4uMDE5MWQ4NDNmZWVhMWViNGY2OWYxYjA5ZmZjYTA4 ODQzNDY3MTFlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE0LTExLTIxICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gUmVncmVzc2lvbihy MTc2MjAyKTogbGluZS1oZWlnaHQgaXMgd3Jvbmcgb24gbWFyY28ub3JnCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg5NzAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZnRlciByMTc2MjAyLCBvbiBpT1Mg d2l0aCBJT1NfVEVYVF9BVVRPU0laSU5HIGVuYWJsZWQsIHdlIHdvdWxkCisgICAgICAgIG11bHRp cGx5IHRoZSBsaW5lSGVpZ2h0IGJ5IFJlbmRlclN0eWxlOjp0ZXh0U2l6ZUFkanVzdCgpOjptdWx0 aXBsaWVyKCkKKyAgICAgICAgdW5jb25kaXRpb25hbGx5LiBIb3dldmVyLCB3ZSdyZSBvbmx5IHN1 cHBvc2VkIHRvIGRvIHNvIGlmCisgICAgICAgIFJlbmRlclN0eWxlOjp0ZXh0U2l6ZUFkanVzdCgp Ojppc1BlcmNlbnRhZ2UoKSByZXR1cm5zIHRydWUuIFRoaXMKKyAgICAgICAgcGF0Y2ggcmVpbnRy b2R1Y2VzIHRoZSB0ZXh0U2l6ZUFkanVzdCgpLmlzUGVyY2VudGFnZSgpIGNoZWNrIHRoYXQgd2Fz CisgICAgICAgIGluYWR2ZXJ0ZW50bHkgZHJvcHBlZCB3aGVuIHJlZmFjdG9yaW5nIHRoZSBjb2Rl IHRvIGJlIHNoYXJlZCBiZXR3ZWVuCisgICAgICAgIGlPUyBhbmQgT1MgWC4KKworICAgICAgICBB ZGRpdGlvbmFsbHksIHRoZSBtdWx0aXBsaWVyIGlzIG9ubHkgc3VwcG9zZWQgdGhlIGJlIGFwcGxp ZWQgaWYgdGhlCisgICAgICAgIGlucHV0IENTU1ByaW1pdGl2ZVZhbHVlIGlzIGEgTGVuZ3RoIG9y IGEgTnVtYmVyLiBIb3dldmVyLCBhZnRlcgorICAgICAgICByMTc2MjAyLCB3ZSB3b3VsZCBhcHBs eSB0aGUgbXVsdGlwbGllciBpZiB0aGUgQ1NTUHJpbWl0aXZlVmFsdWUgaXMKKyAgICAgICAgYSBQ ZXJjZW50YWdlIG9yIGEgTnVtYmVyLiBUaGlzIHBhdGNoIHVwZGF0ZXMgdGhlIGNvZGUgdG8gbWF0 Y2ggdGhlCisgICAgICAgIGJlaGF2aW9yIHByaW9yIHRvIHIxNzYyMDIuCisKKyAgICAgICAgTm8g bmV3IHRlc3RzLCBpT1Mgc3BlY2lmaWMuIFZlcmlmaWVkIG1hbnVhbGx5IG9uIG1hcmNvLm9yZwor ICAgICAgICB1c2luZyBhbiBpUGhvbmUgNiBQbHVzLgorCisgICAgICAgIFRlc3Q6IGZhc3QvY3Nz L2xpbmUtaGVpZ2h0LXRleHQtYXV0b3NpemluZy5odG1sCisKKyAgICAgICAgKiBjc3MvU3R5bGVC dWlsZGVyQ3VzdG9tLmg6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJGdW5jdGlvbnM6 OmNvbnZlcnRMaW5lSGVpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRlckZ1bmN0 aW9uczo6YXBwbHlWYWx1ZUxpbmVIZWlnaHQpOgorCiAyMDE0LTExLTIxICBDaHJpcyBGbGVpemFj aCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CiAKICAgICAgICAgQVg6IE1hdGhNTCBleHByZXNzaW9u cyBhcmUgbWlzcmVhZCBieSBWb2ljZU92ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9TdHlsZUJ1aWxkZXJDdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJD dXN0b20uaAppbmRleCA2ZDkzMGI2Y2Y1Y2JiOWVmMzU2YWM0NTE2ZmRlMzAwYjAwZGIxZDBmLi41 Yzk3OTRhMWYyMjM3MjllMGNlNTk5ZDIwYTMxNzdlMzc3ZDBmMWQwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgKKysrIGIvU291cmNlL1dlYkNvcmUv Y3NzL1N0eWxlQnVpbGRlckN1c3RvbS5oCkBAIC01MTIsNiArNTEyLDkgQEAgaW5saW5lIENTU1Rv TGVuZ3RoQ29udmVyc2lvbkRhdGEgY3NzdG9MZW5ndGhDb252ZXJzaW9uRGF0YVdpdGhUZXh0Wm9v bUZhY3RvcihTdHkKICAgICByZXR1cm4gc3R5bGVSZXNvbHZlci5zdGF0ZSgpLmNzc1RvTGVuZ3Ro Q29udmVyc2lvbkRhdGEoKTsKIH0KIAorZW51bSBBcHBseVRleHRTaXplTXVsdGlwbGllck9yTm90 IHsgRG9Ob3RBcHBseVRleHRNdWx0aXBsaWVyLCBBcHBseVRleHRNdWx0aXBsaWVyIH07CisKK3Rl bXBsYXRlIDxBcHBseVRleHRTaXplTXVsdGlwbGllck9yTm90IGFwcGx5VGV4dE11bHRpcGxpZXI+ CiBpbmxpbmUgYm9vbCBjb252ZXJ0TGluZUhlaWdodChTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29s dmVyLCBjb25zdCBDU1NWYWx1ZSYgdmFsdWUsIExlbmd0aCYgbGVuZ3RoLCBmbG9hdCBtdWx0aXBs aWVyID0gMS5mKQogewogICAgIGF1dG8mIHByaW1pdGl2ZVZhbHVlID0gZG93bmNhc3Q8Q1NTUHJp bWl0aXZlVmFsdWU+KHZhbHVlKTsKQEAgLTUyMSwxNiArNTI0LDIxIEBAIGlubGluZSBib29sIGNv bnZlcnRMaW5lSGVpZ2h0KFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIsIGNvbnN0IENTU1Zh bHVlJiB2YWx1CiAgICAgfQogICAgIGlmIChwcmltaXRpdmVWYWx1ZS5pc0xlbmd0aCgpKSB7CiAg ICAgICAgIGxlbmd0aCA9IHByaW1pdGl2ZVZhbHVlLmNvbXB1dGVMZW5ndGg8TGVuZ3RoPihjc3N0 b0xlbmd0aENvbnZlcnNpb25EYXRhV2l0aFRleHRab29tRmFjdG9yKHN0eWxlUmVzb2x2ZXIpKTsK KyAgICAgICAgaWYgKGFwcGx5VGV4dE11bHRpcGxpZXIpCisgICAgICAgICAgICBsZW5ndGggPSBM ZW5ndGgobGVuZ3RoLnZhbHVlKCkgKiBtdWx0aXBsaWVyLCBGaXhlZCk7CiAgICAgICAgIHJldHVy biB0cnVlOwogICAgIH0KICAgICBpZiAocHJpbWl0aXZlVmFsdWUuaXNQZXJjZW50YWdlKCkpIHsK ICAgICAgICAgLy8gRklYTUU6IHBlcmNlbnRhZ2Ugc2hvdWxkIG5vdCBiZSByZXN0cmljdGVkIHRv IGFuIGludGVnZXIgaGVyZS4KLSAgICAgICAgbGVuZ3RoID0gTGVuZ3RoKChzdHlsZVJlc29sdmVy LnN0eWxlKCktPmNvbXB1dGVkRm9udFNpemUoKSAqIHByaW1pdGl2ZVZhbHVlLmdldEludFZhbHVl KCkpICogbXVsdGlwbGllciAvIDEwMCwgRml4ZWQpOworICAgICAgICBsZW5ndGggPSBMZW5ndGgo KHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+Y29tcHV0ZWRGb250U2l6ZSgpICogcHJpbWl0aXZlVmFs dWUuZ2V0SW50VmFsdWUoKSkgLyAxMDAsIEZpeGVkKTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgfQogICAgIGlmIChwcmltaXRpdmVWYWx1ZS5pc051bWJlcigpKSB7CiAgICAgICAgIC8vIEZJ WE1FOiBudW1iZXIgYW5kIHBlcmNlbnRhZ2UgdmFsdWVzIHNob3VsZCBwcm9kdWNlIHRoZSBzYW1l IHR5cGUgb2YgTGVuZ3RoIChpZS4gRml4ZWQgb3IgUGVyY2VudCkuCi0gICAgICAgIGxlbmd0aCA9 IExlbmd0aChwcmltaXRpdmVWYWx1ZS5nZXREb3VibGVWYWx1ZSgpICogbXVsdGlwbGllciAqIDEw MC4wLCBQZXJjZW50KTsKKyAgICAgICAgaWYgKGFwcGx5VGV4dE11bHRpcGxpZXIpCisgICAgICAg ICAgICBsZW5ndGggPSBMZW5ndGgocHJpbWl0aXZlVmFsdWUuZ2V0RG91YmxlVmFsdWUoKSAqIG11 bHRpcGxpZXIgKiAxMDAuMCwgUGVyY2VudCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGxl bmd0aCA9IExlbmd0aChwcmltaXRpdmVWYWx1ZS5nZXREb3VibGVWYWx1ZSgpICogMTAwLjAsIFBl cmNlbnQpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgcmV0dXJuIGZhbHNlOwpA QCAtNTcxLDcgKzU3OSwxMyBAQCBpbmxpbmUgdm9pZCBhcHBseUluaXRpYWxMaW5lSGVpZ2h0KFN0 eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIpCiBpbmxpbmUgdm9pZCBhcHBseVZhbHVlTGluZUhl aWdodChTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSYgdmFsdWUpCiB7CiAg ICAgTGVuZ3RoIGxpbmVIZWlnaHQ7Ci0gICAgaWYgKCFjb252ZXJ0TGluZUhlaWdodChzdHlsZVJl c29sdmVyLCB2YWx1ZSwgbGluZUhlaWdodCwgc3R5bGVSZXNvbHZlci5zdHlsZSgpLT50ZXh0U2l6 ZUFkanVzdCgpLm11bHRpcGxpZXIoKSkpCisgICAgYm9vbCByZXN1bHQ7CisgICAgaWYgKHN0eWxl UmVzb2x2ZXIuc3R5bGUoKS0+dGV4dFNpemVBZGp1c3QoKS5pc1BlcmNlbnRhZ2UoKSkKKyAgICAg ICAgcmVzdWx0ID0gY29udmVydExpbmVIZWlnaHQ8QXBwbHlUZXh0TXVsdGlwbGllcj4oc3R5bGVS ZXNvbHZlciwgdmFsdWUsIGxpbmVIZWlnaHQsIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+dGV4dFNp emVBZGp1c3QoKS5tdWx0aXBsaWVyKCkpOworICAgIGVsc2UKKyAgICAgICAgcmVzdWx0ID0gY29u dmVydExpbmVIZWlnaHQ8RG9Ob3RBcHBseVRleHRNdWx0aXBsaWVyPihzdHlsZVJlc29sdmVyLCB2 YWx1ZSwgbGluZUhlaWdodCk7CisKKyAgICBpZiAoIXJlc3VsdCkKICAgICAgICAgcmV0dXJuOwog CiAgICAgc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRMaW5lSGVpZ2h0KGxpbmVIZWlnaHQpOwpA QCAtNTgzLDcgKzU5Nyw3IEBAIGlubGluZSB2b2lkIGFwcGx5VmFsdWVMaW5lSGVpZ2h0KFN0eWxl UmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIsIENTU1ZhbHVlJiB2YWx1ZSkKIGlubGluZSB2b2lkIGFw cGx5VmFsdWVMaW5lSGVpZ2h0KFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIsIENTU1ZhbHVl JiB2YWx1ZSkKIHsKICAgICBMZW5ndGggbGluZUhlaWdodDsKLSAgICBpZiAoIWNvbnZlcnRMaW5l SGVpZ2h0KHN0eWxlUmVzb2x2ZXIsIHZhbHVlLCBsaW5lSGVpZ2h0KSkKKyAgICBpZiAoIWNvbnZl cnRMaW5lSGVpZ2h0PERvTm90QXBwbHlUZXh0TXVsdGlwbGllcj4oc3R5bGVSZXNvbHZlciwgdmFs dWUsIGxpbmVIZWlnaHQpKQogICAgICAgICByZXR1cm47CiAKICAgICBzdHlsZVJlc29sdmVyLnN0 eWxlKCktPnNldExpbmVIZWlnaHQobGluZUhlaWdodCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOTNkOTAxNjM5ZDUzNWNk ODJkMGM2Y2FkMDkxMmQ2YjMxZTUzZjFjMC4uOGJhNDM1NzljOTM5NTE4NzE3MzQyNmI4MWMwYmJm NTlhMjEyNTBlNCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTExLTIxICBDaHJpcyBEdW1l eiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gUmVncmVzc2lvbihyMTc2MjAy KTogbGluZS1oZWlnaHQgaXMgd3Jvbmcgb24gbWFyY28ub3JnCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg5NzAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgbGF5b3V0IHRlc3QgdG8gY292ZXIgbGlu ZS1oZWlnaHQgQ1NTIHByb3BlcnR5IGFuZCBpdHMgaW50ZXJhY3Rpb24KKyAgICAgICAgd2l0aCAt d2Via2l0LXRleHQtc2l6ZS1hZGp1c3QuCisKKyAgICAgICAgKiBmYXN0L2Nzcy9saW5lLWhlaWdo dC10ZXh0LWF1dG9zaXppbmctZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nz cy9saW5lLWhlaWdodC10ZXh0LWF1dG9zaXppbmcuaHRtbDogQWRkZWQuCisgICAgICAgICogcGxh dGZvcm0vaW9zLXNpbXVsYXRvci9mYXN0L2Nzcy9saW5lLWhlaWdodC10ZXh0LWF1dG9zaXppbmct ZXhwZWN0ZWQudHh0OiBBZGRlZC4KKwogMjAxNC0xMS0yMSAgQ2hyaXMgRmxlaXphY2ggIDxjZmxl aXphY2hAYXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBNYXRoTUwgZXhwcmVzc2lvbnMgYXJlIG1p c3JlYWQgYnkgVm9pY2VPdmVyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9saW5l LWhlaWdodC10ZXh0LWF1dG9zaXppbmctZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9j c3MvbGluZS1oZWlnaHQtdGV4dC1hdXRvc2l6aW5nLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5j ZGY3YjAwZjIwMDA1OTg4ZjVmMTM1MWNjNWMzMDQxZjg0ZjBjZWU1Ci0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvbGluZS1oZWlnaHQtdGV4dC1hdXRvc2l6aW5nLWV4cGVj dGVkLnR4dApAQCAtMCwwICsxLDIxIEBACitUZXN0IHRoZSAnbGluZS1oZWlnaHQnIHByb3BlcnR5 IGludGVyYWN0aW9uIHdpdGggJy13ZWJraXQtdGV4dC1zaXplLWFkanVzdCcuCisKK09uIHN1Y2Nl c3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5 ICJURVNUIENPTVBMRVRFIi4KKworCitDYXNlIHdpdGhvdXQgdGV4dCBzaXplIGFkanVzdC4KK1BB U1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdERpdk5vQWRqdXN0KS5nZXRQcm9wZXJ0eVZh bHVlKCdsaW5lLWhlaWdodCcpIGlzICJub3JtYWwiCitQQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0 eWxlKHRlc3REaXZOb0FkanVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgnZm9udC1zaXplJykgaXMgIjIw cHgiCit0ZXN0RGl2Tm9BZGp1c3Quc3R5bGVbJ2xpbmUtaGVpZ2h0J10gPSAnMS42JworUEFTUyB3 aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0ZXN0RGl2Tm9BZGp1c3QpLmdldFByb3BlcnR5VmFsdWUo J2xpbmUtaGVpZ2h0JykgaXMgIjMycHgiCit0ZXN0RGl2Tm9BZGp1c3Quc3R5bGVbJ2xpbmUtaGVp Z2h0J10gPSAnODAlJworUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0ZXN0RGl2Tm9BZGp1 c3QpLmdldFByb3BlcnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykgaXMgIjE2cHgiCit0ZXN0RGl2Tm9B ZGp1c3Quc3R5bGVbJ2xpbmUtaGVpZ2h0J10gPSAnMTJweCcKK1BBU1Mgd2luZG93LmdldENvbXB1 dGVkU3R5bGUodGVzdERpdk5vQWRqdXN0KS5nZXRQcm9wZXJ0eVZhbHVlKCdsaW5lLWhlaWdodCcp IGlzICIxMnB4IgorQ2FzZSB3aXRoIHRleHQgc2l6ZSBhZGp1c3QuCitQbGF0Zm9ybSBkb2VzIG5v dCBzdXBwb3J0ICAtd2Via2l0LXRleHQtc2l6ZS1hZGp1c3QKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFy c2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorVGVzdAorVGVzdApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZmFzdC9jc3MvbGluZS1oZWlnaHQtdGV4dC1hdXRvc2l6aW5nLmh0bWwgYi9MYXlv dXRUZXN0cy9mYXN0L2Nzcy9saW5lLWhlaWdodC10ZXh0LWF1dG9zaXppbmcuaHRtbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi5hYTgxNjFiZjU5MjQ3YzdkYjRhN2ZlOWY2M2U4MjE1YzBkOGMwNGFhCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvbGluZS1oZWlnaHQtdGV4dC1hdXRvc2l6aW5n Lmh0bWwKQEAgLTAsMCArMSw1OCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgor PHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8 c3R5bGU+CisjdGVzdERpdkFkanVzdCB7CisgIC13ZWJraXQtdGV4dC1zaXplLWFkanVzdDogMTUw JTsKKyAgZm9udC1zaXplOiAyMHB4OworfQorI3Rlc3REaXZOb0FkanVzdCB7CisgIGZvbnQtc2l6 ZTogMjBweDsKK30KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9ieT4KKzxkaXYgaWQ9InRlc3REaXZO b0FkanVzdCI+VGVzdDwvZGl2PgorPGRpdiBpZD0idGVzdERpdkFkanVzdCI+VGVzdDwvZGl2Pgor PHNjcmlwdD4KK2Rlc2NyaXB0aW9uKCJUZXN0IHRoZSAnbGluZS1oZWlnaHQnIHByb3BlcnR5IGlu dGVyYWN0aW9uIHdpdGggJy13ZWJraXQtdGV4dC1zaXplLWFkanVzdCcuIik7CisKK2RlYnVnKCJD YXNlIHdpdGhvdXQgdGV4dCBzaXplIGFkanVzdC4iKTsKK3ZhciB0ZXN0RGl2Tm9BZGp1c3QgPSBk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgidGVzdERpdk5vQWRqdXN0Iik7CitzaG91bGRCZUVxdWFs VG9TdHJpbmcoIndpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZOb0FkanVzdCkuZ2V0UHJv cGVydHlWYWx1ZSgnbGluZS1oZWlnaHQnKSIsICJub3JtYWwiKTsKK3Nob3VsZEJlRXF1YWxUb1N0 cmluZygid2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdERpdk5vQWRqdXN0KS5nZXRQcm9wZXJ0 eVZhbHVlKCdmb250LXNpemUnKSIsICIyMHB4Iik7CitldmFsQW5kTG9nKCJ0ZXN0RGl2Tm9BZGp1 c3Quc3R5bGVbJ2xpbmUtaGVpZ2h0J10gPSAnMS42JyIpOworLy8gZm9udC1zaXplICogbGluZS1o ZWlnaHQgPT0gMjBweCAqIDEuNiA9PSAzMnB4CitzaG91bGRCZUVxdWFsVG9TdHJpbmcoIndpbmRv dy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZOb0FkanVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgnbGlu ZS1oZWlnaHQnKSIsICIzMnB4Iik7CitldmFsQW5kTG9nKCJ0ZXN0RGl2Tm9BZGp1c3Quc3R5bGVb J2xpbmUtaGVpZ2h0J10gPSAnODAlJyIpOworLy8gZm9udC1zaXplICogbGluZS1oZWlnaHQgPT0g MjBweCAqIDgwJSA9PSAxNnB4CitzaG91bGRCZUVxdWFsVG9TdHJpbmcoIndpbmRvdy5nZXRDb21w dXRlZFN0eWxlKHRlc3REaXZOb0FkanVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgnbGluZS1oZWlnaHQn KSIsICIxNnB4Iik7CitldmFsQW5kTG9nKCJ0ZXN0RGl2Tm9BZGp1c3Quc3R5bGVbJ2xpbmUtaGVp Z2h0J10gPSAnMTJweCciKTsKK3Nob3VsZEJlRXF1YWxUb1N0cmluZygid2luZG93LmdldENvbXB1 dGVkU3R5bGUodGVzdERpdk5vQWRqdXN0KS5nZXRQcm9wZXJ0eVZhbHVlKCdsaW5lLWhlaWdodCcp IiwgIjEycHgiKTsKKworZGVidWcoIkNhc2Ugd2l0aCB0ZXh0IHNpemUgYWRqdXN0LiIpOwordmFy IHRlc3REaXZBZGp1c3QgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidGVzdERpdkFkanVzdCIp OworaWYgKHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZBZGp1c3QpLmdldFByb3BlcnR5 VmFsdWUoJy13ZWJraXQtdGV4dC1zaXplLWFkanVzdCcpID09IG51bGwpIHsKKyAgZGVidWcoIlBs YXRmb3JtIGRvZXMgbm90IHN1cHBvcnQgIC13ZWJraXQtdGV4dC1zaXplLWFkanVzdCIpOworfSBl bHNlIHsKKyAgZGVidWcoIlBsYXRmb3JtIHN1cHBvcnRzIC13ZWJraXQtdGV4dC1zaXplLWFkanVz dCIpOworICBzaG91bGRCZUVxdWFsVG9TdHJpbmcoIndpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRl c3REaXZBZGp1c3QpLmdldFByb3BlcnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykiLCAibm9ybWFsIik7 CisgIC8vIGZvbnQtc2l6ZSAqIC13ZWJraXQtdGV4dC1zaXplLWFkanVzdCA9PSAyMHB4ICogMTUw JSA9PSAzMHB4CisgIHNob3VsZEJlRXF1YWxUb1N0cmluZygid2luZG93LmdldENvbXB1dGVkU3R5 bGUodGVzdERpdkFkanVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgnZm9udC1zaXplJykiLCAiMzBweCIp OworICBldmFsQW5kTG9nKCJ0ZXN0RGl2QWRqdXN0LnN0eWxlWydsaW5lLWhlaWdodCddID0gJzEu NiciKTsKKyAgLy8gZm9udC1zaXplICogbGluZS1oZWlnaHQgPT0gMzBweCAqIDEuNiA9PSA0OHB4 CisgIHNob3VsZEJlRXF1YWxUb1N0cmluZygid2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdERp dkFkanVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgnbGluZS1oZWlnaHQnKSIsICI0OHB4Iik7CisKKyAg ZXZhbEFuZExvZygidGVzdERpdkFkanVzdC5zdHlsZVsnbGluZS1oZWlnaHQnXSA9ICc4MCUnIik7 CisgIC8vIGZvbnQtc2l6ZSAqIGxpbmUtaGVpZ2h0ID09IDMwcHggKiA4MCUgPT0gMjRweAorICBz aG91bGRCZUVxdWFsVG9TdHJpbmcoIndpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZBZGp1 c3QpLmdldFByb3BlcnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykiLCAiMjRweCIpOworCisgIGV2YWxB bmRMb2coInRlc3REaXZBZGp1c3Quc3R5bGVbJ2xpbmUtaGVpZ2h0J10gPSAnMTJweCciKTsKKyAg Ly8gbGluZS1oZWlnaHQgKiAtd2Via2l0LXRleHQtc2l6ZS1hZGp1c3QgPT0gMTJweCAqIDE1MCUg PT0gMThweAorICBzaG91bGRCZUVxdWFsVG9TdHJpbmcoIndpbmRvdy5nZXRDb21wdXRlZFN0eWxl KHRlc3REaXZBZGp1c3QpLmdldFByb3BlcnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykiLCAiMThweCIp OworfQorPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9z dC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9pb3Mtc2ltdWxhdG9yL2Zhc3QvY3NzL2xpbmUtaGVpZ2h0LXRleHQtYXV0b3Np emluZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtc2ltdWxhdG9yL2Zh c3QvY3NzL2xpbmUtaGVpZ2h0LXRleHQtYXV0b3NpemluZy1leHBlY3RlZC50eHQKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uOGUzNWFkNDdmZDg3OGExMjVkODBmYTE1Zjc0ZTM3Y2Y0ZjdjMTIzYQotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy1zaW11bGF0b3IvZmFzdC9jc3MvbGluZS1o ZWlnaHQtdGV4dC1hdXRvc2l6aW5nLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDI5IEBACitUZXN0 IHRoZSAnbGluZS1oZWlnaHQnIHByb3BlcnR5IGludGVyYWN0aW9uIHdpdGggJy13ZWJraXQtdGV4 dC1zaXplLWFkanVzdCcuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAi UEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitDYXNlIHdp dGhvdXQgdGV4dCBzaXplIGFkanVzdC4KK1BBU1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUodGVz dERpdk5vQWRqdXN0KS5nZXRQcm9wZXJ0eVZhbHVlKCdsaW5lLWhlaWdodCcpIGlzICJub3JtYWwi CitQQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZOb0FkanVzdCkuZ2V0UHJvcGVy dHlWYWx1ZSgnZm9udC1zaXplJykgaXMgIjIwcHgiCit0ZXN0RGl2Tm9BZGp1c3Quc3R5bGVbJ2xp bmUtaGVpZ2h0J10gPSAnMS42JworUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0ZXN0RGl2 Tm9BZGp1c3QpLmdldFByb3BlcnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykgaXMgIjMycHgiCit0ZXN0 RGl2Tm9BZGp1c3Quc3R5bGVbJ2xpbmUtaGVpZ2h0J10gPSAnODAlJworUEFTUyB3aW5kb3cuZ2V0 Q29tcHV0ZWRTdHlsZSh0ZXN0RGl2Tm9BZGp1c3QpLmdldFByb3BlcnR5VmFsdWUoJ2xpbmUtaGVp Z2h0JykgaXMgIjE2cHgiCit0ZXN0RGl2Tm9BZGp1c3Quc3R5bGVbJ2xpbmUtaGVpZ2h0J10gPSAn MTJweCcKK1BBU1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdERpdk5vQWRqdXN0KS5nZXRQ cm9wZXJ0eVZhbHVlKCdsaW5lLWhlaWdodCcpIGlzICIxMnB4IgorQ2FzZSB3aXRoIHRleHQgc2l6 ZSBhZGp1c3QuCitQbGF0Zm9ybSBzdXBwb3J0cyAtd2Via2l0LXRleHQtc2l6ZS1hZGp1c3QKK1BB U1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdERpdkFkanVzdCkuZ2V0UHJvcGVydHlWYWx1 ZSgnbGluZS1oZWlnaHQnKSBpcyAibm9ybWFsIgorUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHls ZSh0ZXN0RGl2QWRqdXN0KS5nZXRQcm9wZXJ0eVZhbHVlKCdmb250LXNpemUnKSBpcyAiMzBweCIK K3Rlc3REaXZBZGp1c3Quc3R5bGVbJ2xpbmUtaGVpZ2h0J10gPSAnMS42JworUEFTUyB3aW5kb3cu Z2V0Q29tcHV0ZWRTdHlsZSh0ZXN0RGl2QWRqdXN0KS5nZXRQcm9wZXJ0eVZhbHVlKCdsaW5lLWhl aWdodCcpIGlzICI0OHB4IgordGVzdERpdkFkanVzdC5zdHlsZVsnbGluZS1oZWlnaHQnXSA9ICc4 MCUnCitQQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZBZGp1c3QpLmdldFByb3Bl cnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykgaXMgIjI0cHgiCit0ZXN0RGl2QWRqdXN0LnN0eWxlWyds aW5lLWhlaWdodCddID0gJzEycHgnCitQQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3RE aXZBZGp1c3QpLmdldFByb3BlcnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykgaXMgIjE4cHgiCitQQVNT IHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKK1Rlc3QKK1Rlc3QK 242070 2014-11-21 14:05:33 -0800 2014-11-21 15:18:56 -0800 Patch bug-138970-20141121140549.patch text/plain 12693 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2NDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWI1YmFiYjQwZjBjN2I0 NWY2OWJiMGQ1NjYwYmUzMGJlZDdiZWJmMy4uODg4ZTFmNTk1M2EwMmU1YmRmZmQ4N2JhNzA1NmUz ZjdmNjhlNWJmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE0LTExLTIxICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gUmVncmVzc2lvbihy MTc2MjAyKTogbGluZS1oZWlnaHQgaXMgd3Jvbmcgb24gbWFyY28ub3JnCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg5NzAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZnRlciByMTc2MjAyLCBvbiBpT1Mg d2l0aCBJT1NfVEVYVF9BVVRPU0laSU5HIGVuYWJsZWQsIHdlIHdvdWxkCisgICAgICAgIG11bHRp cGx5IHRoZSBsaW5lSGVpZ2h0IGJ5IFJlbmRlclN0eWxlOjp0ZXh0U2l6ZUFkanVzdCgpOjptdWx0 aXBsaWVyKCkKKyAgICAgICAgdW5jb25kaXRpb25hbGx5LiBIb3dldmVyLCB3ZSdyZSBvbmx5IHN1 cHBvc2VkIHRvIGRvIHNvIGlmCisgICAgICAgIFJlbmRlclN0eWxlOjp0ZXh0U2l6ZUFkanVzdCgp Ojppc1BlcmNlbnRhZ2UoKSByZXR1cm5zIHRydWUuIFRoaXMKKyAgICAgICAgcGF0Y2ggcmVpbnRy b2R1Y2VzIHRoZSB0ZXh0U2l6ZUFkanVzdCgpLmlzUGVyY2VudGFnZSgpIGNoZWNrIHRoYXQgd2Fz CisgICAgICAgIGluYWR2ZXJ0ZW50bHkgZHJvcHBlZCB3aGVuIHJlZmFjdG9yaW5nIHRoZSBjb2Rl IHRvIGJlIHNoYXJlZCBiZXR3ZWVuCisgICAgICAgIGlPUyBhbmQgT1MgWC4KKworICAgICAgICBB ZGRpdGlvbmFsbHksIHRoZSBtdWx0aXBsaWVyIGlzIG9ubHkgc3VwcG9zZWQgdGhlIGJlIGFwcGxp ZWQgaWYgdGhlCisgICAgICAgIGlucHV0IENTU1ByaW1pdGl2ZVZhbHVlIGlzIGEgTGVuZ3RoIG9y IGEgTnVtYmVyLiBIb3dldmVyLCBhZnRlcgorICAgICAgICByMTc2MjAyLCB3ZSB3b3VsZCBhcHBs eSB0aGUgbXVsdGlwbGllciBpZiB0aGUgQ1NTUHJpbWl0aXZlVmFsdWUgaXMKKyAgICAgICAgYSBQ ZXJjZW50YWdlIG9yIGEgTnVtYmVyLiBUaGlzIHBhdGNoIHVwZGF0ZXMgdGhlIGNvZGUgdG8gbWF0 Y2ggdGhlCisgICAgICAgIGJlaGF2aW9yIHByaW9yIHRvIHIxNzYyMDIuCisKKyAgICAgICAgTm8g bmV3IHRlc3RzLCBpT1Mgc3BlY2lmaWMuIFZlcmlmaWVkIG1hbnVhbGx5IG9uIG1hcmNvLm9yZwor ICAgICAgICB1c2luZyBhbiBpUGhvbmUgNiBQbHVzLgorCisgICAgICAgIFRlc3Q6IGZhc3QvY3Nz L2xpbmUtaGVpZ2h0LXRleHQtYXV0b3NpemluZy5odG1sCisKKyAgICAgICAgKiBjc3MvU3R5bGVC dWlsZGVyQ3VzdG9tLmg6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJGdW5jdGlvbnM6 OmNvbnZlcnRMaW5lSGVpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRlckZ1bmN0 aW9uczo6YXBwbHlWYWx1ZUxpbmVIZWlnaHQpOgorCiAyMDE0LTExLTIxICBBbmRlcnMgQ2FybHNz b24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgTW9yZSBidWlsZCBmaXhlcy4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaCBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaAppbmRleCA2ZDkzMGI2Y2Y1Y2JiOWVm MzU2YWM0NTE2ZmRlMzAwYjAwZGIxZDBmLi41Yzk3OTRhMWYyMjM3MjllMGNlNTk5ZDIwYTMxNzdl Mzc3ZDBmMWQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ3Vz dG9tLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckN1c3RvbS5oCkBAIC01 MTIsNiArNTEyLDkgQEAgaW5saW5lIENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEgY3NzdG9MZW5n dGhDb252ZXJzaW9uRGF0YVdpdGhUZXh0Wm9vbUZhY3RvcihTdHkKICAgICByZXR1cm4gc3R5bGVS ZXNvbHZlci5zdGF0ZSgpLmNzc1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEoKTsKIH0KIAorZW51bSBB cHBseVRleHRTaXplTXVsdGlwbGllck9yTm90IHsgRG9Ob3RBcHBseVRleHRNdWx0aXBsaWVyLCBB cHBseVRleHRNdWx0aXBsaWVyIH07CisKK3RlbXBsYXRlIDxBcHBseVRleHRTaXplTXVsdGlwbGll ck9yTm90IGFwcGx5VGV4dE11bHRpcGxpZXI+CiBpbmxpbmUgYm9vbCBjb252ZXJ0TGluZUhlaWdo dChTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBjb25zdCBDU1NWYWx1ZSYgdmFsdWUsIExl bmd0aCYgbGVuZ3RoLCBmbG9hdCBtdWx0aXBsaWVyID0gMS5mKQogewogICAgIGF1dG8mIHByaW1p dGl2ZVZhbHVlID0gZG93bmNhc3Q8Q1NTUHJpbWl0aXZlVmFsdWU+KHZhbHVlKTsKQEAgLTUyMSwx NiArNTI0LDIxIEBAIGlubGluZSBib29sIGNvbnZlcnRMaW5lSGVpZ2h0KFN0eWxlUmVzb2x2ZXIm IHN0eWxlUmVzb2x2ZXIsIGNvbnN0IENTU1ZhbHVlJiB2YWx1CiAgICAgfQogICAgIGlmIChwcmlt aXRpdmVWYWx1ZS5pc0xlbmd0aCgpKSB7CiAgICAgICAgIGxlbmd0aCA9IHByaW1pdGl2ZVZhbHVl LmNvbXB1dGVMZW5ndGg8TGVuZ3RoPihjc3N0b0xlbmd0aENvbnZlcnNpb25EYXRhV2l0aFRleHRa b29tRmFjdG9yKHN0eWxlUmVzb2x2ZXIpKTsKKyAgICAgICAgaWYgKGFwcGx5VGV4dE11bHRpcGxp ZXIpCisgICAgICAgICAgICBsZW5ndGggPSBMZW5ndGgobGVuZ3RoLnZhbHVlKCkgKiBtdWx0aXBs aWVyLCBGaXhlZCk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KICAgICBpZiAocHJpbWl0 aXZlVmFsdWUuaXNQZXJjZW50YWdlKCkpIHsKICAgICAgICAgLy8gRklYTUU6IHBlcmNlbnRhZ2Ug c2hvdWxkIG5vdCBiZSByZXN0cmljdGVkIHRvIGFuIGludGVnZXIgaGVyZS4KLSAgICAgICAgbGVu Z3RoID0gTGVuZ3RoKChzdHlsZVJlc29sdmVyLnN0eWxlKCktPmNvbXB1dGVkRm9udFNpemUoKSAq IHByaW1pdGl2ZVZhbHVlLmdldEludFZhbHVlKCkpICogbXVsdGlwbGllciAvIDEwMCwgRml4ZWQp OworICAgICAgICBsZW5ndGggPSBMZW5ndGgoKHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+Y29tcHV0 ZWRGb250U2l6ZSgpICogcHJpbWl0aXZlVmFsdWUuZ2V0SW50VmFsdWUoKSkgLyAxMDAsIEZpeGVk KTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogICAgIGlmIChwcmltaXRpdmVWYWx1ZS5p c051bWJlcigpKSB7CiAgICAgICAgIC8vIEZJWE1FOiBudW1iZXIgYW5kIHBlcmNlbnRhZ2UgdmFs dWVzIHNob3VsZCBwcm9kdWNlIHRoZSBzYW1lIHR5cGUgb2YgTGVuZ3RoIChpZS4gRml4ZWQgb3Ig UGVyY2VudCkuCi0gICAgICAgIGxlbmd0aCA9IExlbmd0aChwcmltaXRpdmVWYWx1ZS5nZXREb3Vi bGVWYWx1ZSgpICogbXVsdGlwbGllciAqIDEwMC4wLCBQZXJjZW50KTsKKyAgICAgICAgaWYgKGFw cGx5VGV4dE11bHRpcGxpZXIpCisgICAgICAgICAgICBsZW5ndGggPSBMZW5ndGgocHJpbWl0aXZl VmFsdWUuZ2V0RG91YmxlVmFsdWUoKSAqIG11bHRpcGxpZXIgKiAxMDAuMCwgUGVyY2VudCk7Cisg ICAgICAgIGVsc2UKKyAgICAgICAgICAgIGxlbmd0aCA9IExlbmd0aChwcmltaXRpdmVWYWx1ZS5n ZXREb3VibGVWYWx1ZSgpICogMTAwLjAsIFBlcmNlbnQpOwogICAgICAgICByZXR1cm4gdHJ1ZTsK ICAgICB9CiAgICAgcmV0dXJuIGZhbHNlOwpAQCAtNTcxLDcgKzU3OSwxMyBAQCBpbmxpbmUgdm9p ZCBhcHBseUluaXRpYWxMaW5lSGVpZ2h0KFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIpCiBp bmxpbmUgdm9pZCBhcHBseVZhbHVlTGluZUhlaWdodChTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29s dmVyLCBDU1NWYWx1ZSYgdmFsdWUpCiB7CiAgICAgTGVuZ3RoIGxpbmVIZWlnaHQ7Ci0gICAgaWYg KCFjb252ZXJ0TGluZUhlaWdodChzdHlsZVJlc29sdmVyLCB2YWx1ZSwgbGluZUhlaWdodCwgc3R5 bGVSZXNvbHZlci5zdHlsZSgpLT50ZXh0U2l6ZUFkanVzdCgpLm11bHRpcGxpZXIoKSkpCisgICAg Ym9vbCByZXN1bHQ7CisgICAgaWYgKHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+dGV4dFNpemVBZGp1 c3QoKS5pc1BlcmNlbnRhZ2UoKSkKKyAgICAgICAgcmVzdWx0ID0gY29udmVydExpbmVIZWlnaHQ8 QXBwbHlUZXh0TXVsdGlwbGllcj4oc3R5bGVSZXNvbHZlciwgdmFsdWUsIGxpbmVIZWlnaHQsIHN0 eWxlUmVzb2x2ZXIuc3R5bGUoKS0+dGV4dFNpemVBZGp1c3QoKS5tdWx0aXBsaWVyKCkpOworICAg IGVsc2UKKyAgICAgICAgcmVzdWx0ID0gY29udmVydExpbmVIZWlnaHQ8RG9Ob3RBcHBseVRleHRN dWx0aXBsaWVyPihzdHlsZVJlc29sdmVyLCB2YWx1ZSwgbGluZUhlaWdodCk7CisKKyAgICBpZiAo IXJlc3VsdCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5z ZXRMaW5lSGVpZ2h0KGxpbmVIZWlnaHQpOwpAQCAtNTgzLDcgKzU5Nyw3IEBAIGlubGluZSB2b2lk IGFwcGx5VmFsdWVMaW5lSGVpZ2h0KFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIsIENTU1Zh bHVlJiB2YWx1ZSkKIGlubGluZSB2b2lkIGFwcGx5VmFsdWVMaW5lSGVpZ2h0KFN0eWxlUmVzb2x2 ZXImIHN0eWxlUmVzb2x2ZXIsIENTU1ZhbHVlJiB2YWx1ZSkKIHsKICAgICBMZW5ndGggbGluZUhl aWdodDsKLSAgICBpZiAoIWNvbnZlcnRMaW5lSGVpZ2h0KHN0eWxlUmVzb2x2ZXIsIHZhbHVlLCBs aW5lSGVpZ2h0KSkKKyAgICBpZiAoIWNvbnZlcnRMaW5lSGVpZ2h0PERvTm90QXBwbHlUZXh0TXVs dGlwbGllcj4oc3R5bGVSZXNvbHZlciwgdmFsdWUsIGxpbmVIZWlnaHQpKQogICAgICAgICByZXR1 cm47CiAKICAgICBzdHlsZVJlc29sdmVyLnN0eWxlKCktPnNldExpbmVIZWlnaHQobGluZUhlaWdo dCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggNjEwZjBlNGE0M2I2MThmZjA0ZjdkZWNiNjc3OWIzNjVmNzJkNWE4Zi4uMWFh ZjgzOGJiOGQ1OTNjN2ExN2Q4NjUzNGE5YjM1ZGQwNjlhODNmZSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE0LTExLTIxICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAg ICAgW2lPU10gUmVncmVzc2lvbihyMTc2MjAyKTogbGluZS1oZWlnaHQgaXMgd3Jvbmcgb24gbWFy Y28ub3JnCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x Mzg5NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZGQgbGF5b3V0IHRlc3QgdG8gY292ZXIgbGluZS1oZWlnaHQgQ1NTIHByb3BlcnR5IGFuZCBpdHMg aW50ZXJhY3Rpb24KKyAgICAgICAgd2l0aCAtd2Via2l0LXRleHQtc2l6ZS1hZGp1c3QuCisKKyAg ICAgICAgKiBmYXN0L2Nzcy9saW5lLWhlaWdodC10ZXh0LWF1dG9zaXppbmctZXhwZWN0ZWQudHh0 OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nzcy9saW5lLWhlaWdodC10ZXh0LWF1dG9zaXppbmcu aHRtbDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vaW9zLXNpbXVsYXRvci9mYXN0L2Nzcy9s aW5lLWhlaWdodC10ZXh0LWF1dG9zaXppbmctZXhwZWN0ZWQudHh0OiBBZGRlZC4KKwogMjAxNC0x MS0yMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJ T04ocjE3NTI1OSkgU2ltcGxlIGxpbmUgbGF5b3V0IHRleHQgbWVhc3VyaW5nIGJlaGF2aW9yIGNo YW5nZWQuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9saW5lLWhlaWdodC10ZXh0 LWF1dG9zaXppbmctZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvbGluZS1oZWln aHQtdGV4dC1hdXRvc2l6aW5nLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jZGY3YjAwZjIwMDA1 OTg4ZjVmMTM1MWNjNWMzMDQxZjg0ZjBjZWU1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvZmFzdC9jc3MvbGluZS1oZWlnaHQtdGV4dC1hdXRvc2l6aW5nLWV4cGVjdGVkLnR4dApAQCAt MCwwICsxLDIxIEBACitUZXN0IHRoZSAnbGluZS1oZWlnaHQnIHByb3BlcnR5IGludGVyYWN0aW9u IHdpdGggJy13ZWJraXQtdGV4dC1zaXplLWFkanVzdCcuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxs IHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBM RVRFIi4KKworCitDYXNlIHdpdGhvdXQgdGV4dCBzaXplIGFkanVzdC4KK1BBU1Mgd2luZG93Lmdl dENvbXB1dGVkU3R5bGUodGVzdERpdk5vQWRqdXN0KS5nZXRQcm9wZXJ0eVZhbHVlKCdsaW5lLWhl aWdodCcpIGlzICJub3JtYWwiCitQQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZO b0FkanVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgnZm9udC1zaXplJykgaXMgIjIwcHgiCit0ZXN0RGl2 Tm9BZGp1c3Quc3R5bGVbJ2xpbmUtaGVpZ2h0J10gPSAnMS42JworUEFTUyB3aW5kb3cuZ2V0Q29t cHV0ZWRTdHlsZSh0ZXN0RGl2Tm9BZGp1c3QpLmdldFByb3BlcnR5VmFsdWUoJ2xpbmUtaGVpZ2h0 JykgaXMgIjMycHgiCit0ZXN0RGl2Tm9BZGp1c3Quc3R5bGVbJ2xpbmUtaGVpZ2h0J10gPSAnODAl JworUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0ZXN0RGl2Tm9BZGp1c3QpLmdldFByb3Bl cnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykgaXMgIjE2cHgiCit0ZXN0RGl2Tm9BZGp1c3Quc3R5bGVb J2xpbmUtaGVpZ2h0J10gPSAnMTJweCcKK1BBU1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUodGVz dERpdk5vQWRqdXN0KS5nZXRQcm9wZXJ0eVZhbHVlKCdsaW5lLWhlaWdodCcpIGlzICIxMnB4Igor Q2FzZSB3aXRoIHRleHQgc2l6ZSBhZGp1c3QuCitQbGF0Zm9ybSBkb2VzIG5vdCBzdXBwb3J0ICAt d2Via2l0LXRleHQtc2l6ZS1hZGp1c3QKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUK KworVEVTVCBDT01QTEVURQorVGVzdAorVGVzdApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9jc3MvbGluZS1oZWlnaHQtdGV4dC1hdXRvc2l6aW5nLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0 L2Nzcy9saW5lLWhlaWdodC10ZXh0LWF1dG9zaXppbmcuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5hYTgxNjFi ZjU5MjQ3YzdkYjRhN2ZlOWY2M2U4MjE1YzBkOGMwNGFhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC9jc3MvbGluZS1oZWlnaHQtdGV4dC1hdXRvc2l6aW5nLmh0bWwKQEAgLTAs MCArMSw1OCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9 Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8c3R5bGU+CisjdGVz dERpdkFkanVzdCB7CisgIC13ZWJraXQtdGV4dC1zaXplLWFkanVzdDogMTUwJTsKKyAgZm9udC1z aXplOiAyMHB4OworfQorI3Rlc3REaXZOb0FkanVzdCB7CisgIGZvbnQtc2l6ZTogMjBweDsKK30K Kzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9ieT4KKzxkaXYgaWQ9InRlc3REaXZOb0FkanVzdCI+VGVz dDwvZGl2PgorPGRpdiBpZD0idGVzdERpdkFkanVzdCI+VGVzdDwvZGl2PgorPHNjcmlwdD4KK2Rl c2NyaXB0aW9uKCJUZXN0IHRoZSAnbGluZS1oZWlnaHQnIHByb3BlcnR5IGludGVyYWN0aW9uIHdp dGggJy13ZWJraXQtdGV4dC1zaXplLWFkanVzdCcuIik7CisKK2RlYnVnKCJDYXNlIHdpdGhvdXQg dGV4dCBzaXplIGFkanVzdC4iKTsKK3ZhciB0ZXN0RGl2Tm9BZGp1c3QgPSBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgidGVzdERpdk5vQWRqdXN0Iik7CitzaG91bGRCZUVxdWFsVG9TdHJpbmcoIndp bmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZOb0FkanVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgn bGluZS1oZWlnaHQnKSIsICJub3JtYWwiKTsKK3Nob3VsZEJlRXF1YWxUb1N0cmluZygid2luZG93 LmdldENvbXB1dGVkU3R5bGUodGVzdERpdk5vQWRqdXN0KS5nZXRQcm9wZXJ0eVZhbHVlKCdmb250 LXNpemUnKSIsICIyMHB4Iik7CitldmFsQW5kTG9nKCJ0ZXN0RGl2Tm9BZGp1c3Quc3R5bGVbJ2xp bmUtaGVpZ2h0J10gPSAnMS42JyIpOworLy8gZm9udC1zaXplICogbGluZS1oZWlnaHQgPT0gMjBw eCAqIDEuNiA9PSAzMnB4CitzaG91bGRCZUVxdWFsVG9TdHJpbmcoIndpbmRvdy5nZXRDb21wdXRl ZFN0eWxlKHRlc3REaXZOb0FkanVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgnbGluZS1oZWlnaHQnKSIs ICIzMnB4Iik7CitldmFsQW5kTG9nKCJ0ZXN0RGl2Tm9BZGp1c3Quc3R5bGVbJ2xpbmUtaGVpZ2h0 J10gPSAnODAlJyIpOworLy8gZm9udC1zaXplICogbGluZS1oZWlnaHQgPT0gMjBweCAqIDgwJSA9 PSAxNnB4CitzaG91bGRCZUVxdWFsVG9TdHJpbmcoIndpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRl c3REaXZOb0FkanVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgnbGluZS1oZWlnaHQnKSIsICIxNnB4Iik7 CitldmFsQW5kTG9nKCJ0ZXN0RGl2Tm9BZGp1c3Quc3R5bGVbJ2xpbmUtaGVpZ2h0J10gPSAnMTJw eCciKTsKK3Nob3VsZEJlRXF1YWxUb1N0cmluZygid2luZG93LmdldENvbXB1dGVkU3R5bGUodGVz dERpdk5vQWRqdXN0KS5nZXRQcm9wZXJ0eVZhbHVlKCdsaW5lLWhlaWdodCcpIiwgIjEycHgiKTsK KworZGVidWcoIkNhc2Ugd2l0aCB0ZXh0IHNpemUgYWRqdXN0LiIpOwordmFyIHRlc3REaXZBZGp1 c3QgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidGVzdERpdkFkanVzdCIpOworaWYgKHdpbmRv dy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZBZGp1c3QpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJr aXQtdGV4dC1zaXplLWFkanVzdCcpID09IG51bGwpIHsKKyAgZGVidWcoIlBsYXRmb3JtIGRvZXMg bm90IHN1cHBvcnQgIC13ZWJraXQtdGV4dC1zaXplLWFkanVzdCIpOworfSBlbHNlIHsKKyAgZGVi dWcoIlBsYXRmb3JtIHN1cHBvcnRzIC13ZWJraXQtdGV4dC1zaXplLWFkanVzdCIpOworICBzaG91 bGRCZUVxdWFsVG9TdHJpbmcoIndpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZBZGp1c3Qp LmdldFByb3BlcnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykiLCAibm9ybWFsIik7CisgIC8vIGZvbnQt c2l6ZSAqIC13ZWJraXQtdGV4dC1zaXplLWFkanVzdCA9PSAyMHB4ICogMTUwJSA9PSAzMHB4Cisg IHNob3VsZEJlRXF1YWxUb1N0cmluZygid2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdERpdkFk anVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgnZm9udC1zaXplJykiLCAiMzBweCIpOworICBldmFsQW5k TG9nKCJ0ZXN0RGl2QWRqdXN0LnN0eWxlWydsaW5lLWhlaWdodCddID0gJzEuNiciKTsKKyAgLy8g Zm9udC1zaXplICogbGluZS1oZWlnaHQgPT0gMzBweCAqIDEuNiA9PSA0OHB4CisgIHNob3VsZEJl RXF1YWxUb1N0cmluZygid2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdERpdkFkanVzdCkuZ2V0 UHJvcGVydHlWYWx1ZSgnbGluZS1oZWlnaHQnKSIsICI0OHB4Iik7CisKKyAgZXZhbEFuZExvZygi dGVzdERpdkFkanVzdC5zdHlsZVsnbGluZS1oZWlnaHQnXSA9ICc4MCUnIik7CisgIC8vIGZvbnQt c2l6ZSAqIGxpbmUtaGVpZ2h0ID09IDMwcHggKiA4MCUgPT0gMjRweAorICBzaG91bGRCZUVxdWFs VG9TdHJpbmcoIndpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZBZGp1c3QpLmdldFByb3Bl cnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykiLCAiMjRweCIpOworCisgIGV2YWxBbmRMb2coInRlc3RE aXZBZGp1c3Quc3R5bGVbJ2xpbmUtaGVpZ2h0J10gPSAnMTJweCciKTsKKyAgLy8gbGluZS1oZWln aHQgKiAtd2Via2l0LXRleHQtc2l6ZS1hZGp1c3QgPT0gMTJweCAqIDE1MCUgPT0gMThweAorICBz aG91bGRCZUVxdWFsVG9TdHJpbmcoIndpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZBZGp1 c3QpLmdldFByb3BlcnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykiLCAiMThweCIpOworfQorPC9zY3Jp cHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3Jp cHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9p b3Mtc2ltdWxhdG9yL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mt c2ltdWxhdG9yL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMzczMTgzOTJhMzNmMGM5MmY2MTNhMWEw MGU0NTllNDFhNzM2MDllNy4uMGI1ZTJmNGJmZTY0YWI0ODM4YzhjMTQwZGY1MDhhNTcxNzg5NzY3 ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXNpbXVsYXRvci9UZXN0RXhw ZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy1zaW11bGF0b3IvVGVzdEV4 cGVjdGF0aW9ucwpAQCAtMTUxLDMgKzE1MSw4IEBAIHRyYW5zaXRpb25zCiB0cmF2ZXJzYWwKIHVz ZXJzY3JpcHRzCiB3ZWJhcmNoaXZlCisKKyMjIworIyBNYXJrIGFzIHBhc3Npbmcgc3BlY2lmaWMg dGVzdHMgaW4gZm9sZGVycyB0aGF0IHdlcmUgc2tpcHBlZCB0ZW1wb3JhcmlseSBhYm92ZS4KKyMj Cit3ZWJraXQub3JnL2IvMTM4OTcwIGZhc3QvY3NzL2xpbmUtaGVpZ2h0LXRleHQtYXV0b3Npemlu Zy5odG1sIFsgUGFzcyBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtc2lt dWxhdG9yL2Zhc3QvY3NzL2xpbmUtaGVpZ2h0LXRleHQtYXV0b3NpemluZy1leHBlY3RlZC50eHQg Yi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtc2ltdWxhdG9yL2Zhc3QvY3NzL2xpbmUtaGVpZ2h0 LXRleHQtYXV0b3NpemluZy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOGUzNWFkNDdmZDg3OGEx MjVkODBmYTE1Zjc0ZTM3Y2Y0ZjdjMTIzYQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L3BsYXRmb3JtL2lvcy1zaW11bGF0b3IvZmFzdC9jc3MvbGluZS1oZWlnaHQtdGV4dC1hdXRvc2l6 aW5nLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDI5IEBACitUZXN0IHRoZSAnbGluZS1oZWlnaHQn IHByb3BlcnR5IGludGVyYWN0aW9uIHdpdGggJy13ZWJraXQtdGV4dC1zaXplLWFkanVzdCcuCisK K09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZv bGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitDYXNlIHdpdGhvdXQgdGV4dCBzaXplIGFk anVzdC4KK1BBU1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdERpdk5vQWRqdXN0KS5nZXRQ cm9wZXJ0eVZhbHVlKCdsaW5lLWhlaWdodCcpIGlzICJub3JtYWwiCitQQVNTIHdpbmRvdy5nZXRD b21wdXRlZFN0eWxlKHRlc3REaXZOb0FkanVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgnZm9udC1zaXpl JykgaXMgIjIwcHgiCit0ZXN0RGl2Tm9BZGp1c3Quc3R5bGVbJ2xpbmUtaGVpZ2h0J10gPSAnMS42 JworUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0ZXN0RGl2Tm9BZGp1c3QpLmdldFByb3Bl cnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykgaXMgIjMycHgiCit0ZXN0RGl2Tm9BZGp1c3Quc3R5bGVb J2xpbmUtaGVpZ2h0J10gPSAnODAlJworUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0ZXN0 RGl2Tm9BZGp1c3QpLmdldFByb3BlcnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykgaXMgIjE2cHgiCit0 ZXN0RGl2Tm9BZGp1c3Quc3R5bGVbJ2xpbmUtaGVpZ2h0J10gPSAnMTJweCcKK1BBU1Mgd2luZG93 LmdldENvbXB1dGVkU3R5bGUodGVzdERpdk5vQWRqdXN0KS5nZXRQcm9wZXJ0eVZhbHVlKCdsaW5l LWhlaWdodCcpIGlzICIxMnB4IgorQ2FzZSB3aXRoIHRleHQgc2l6ZSBhZGp1c3QuCitQbGF0Zm9y bSBzdXBwb3J0cyAtd2Via2l0LXRleHQtc2l6ZS1hZGp1c3QKK1BBU1Mgd2luZG93LmdldENvbXB1 dGVkU3R5bGUodGVzdERpdkFkanVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgnbGluZS1oZWlnaHQnKSBp cyAibm9ybWFsIgorUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0ZXN0RGl2QWRqdXN0KS5n ZXRQcm9wZXJ0eVZhbHVlKCdmb250LXNpemUnKSBpcyAiMzBweCIKK3Rlc3REaXZBZGp1c3Quc3R5 bGVbJ2xpbmUtaGVpZ2h0J10gPSAnMS42JworUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0 ZXN0RGl2QWRqdXN0KS5nZXRQcm9wZXJ0eVZhbHVlKCdsaW5lLWhlaWdodCcpIGlzICI0OHB4Igor dGVzdERpdkFkanVzdC5zdHlsZVsnbGluZS1oZWlnaHQnXSA9ICc4MCUnCitQQVNTIHdpbmRvdy5n ZXRDb21wdXRlZFN0eWxlKHRlc3REaXZBZGp1c3QpLmdldFByb3BlcnR5VmFsdWUoJ2xpbmUtaGVp Z2h0JykgaXMgIjI0cHgiCit0ZXN0RGl2QWRqdXN0LnN0eWxlWydsaW5lLWhlaWdodCddID0gJzEy cHgnCitQQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZBZGp1c3QpLmdldFByb3Bl cnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykgaXMgIjE4cHgiCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNl ZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKK1Rlc3QKK1Rlc3QK 242079 2014-11-21 15:18:59 -0800 2014-11-21 15:29:22 -0800 Patch bug-138970-20141121151916.patch text/plain 11030 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2NDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWI1YmFiYjQwZjBjN2I0 NWY2OWJiMGQ1NjYwYmUzMGJlZDdiZWJmMy4uMWRiNjBkMzdjYzRhZTljNGVmNjRkNWVjMDM3MjY1 OWMwZjNjYjA5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE0LTExLTIxICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gUmVncmVzc2lvbihy MTc2MjAyKTogbGluZS1oZWlnaHQgaXMgd3Jvbmcgb24gbWFyY28ub3JnCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg5NzAKKworICAgICAgICBSZXZp ZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgQWZ0ZXIgcjE3NjIwMiwgb24gaU9TIHdp dGggSU9TX1RFWFRfQVVUT1NJWklORyBlbmFibGVkLCB3ZSB3b3VsZAorICAgICAgICBtdWx0aXBs eSB0aGUgbGluZUhlaWdodCBieSBSZW5kZXJTdHlsZTo6dGV4dFNpemVBZGp1c3QoKTo6bXVsdGlw bGllcigpCisgICAgICAgIHVuY29uZGl0aW9uYWxseS4gSG93ZXZlciwgd2UncmUgb25seSBzdXBw b3NlZCB0byBkbyBzbyBpZgorICAgICAgICBSZW5kZXJTdHlsZTo6dGV4dFNpemVBZGp1c3QoKTo6 aXNQZXJjZW50YWdlKCkgcmV0dXJucyB0cnVlLiBUaGlzCisgICAgICAgIHBhdGNoIHJlaW50cm9k dWNlcyB0aGUgdGV4dFNpemVBZGp1c3QoKS5pc1BlcmNlbnRhZ2UoKSBjaGVjayB0aGF0IHdhcwor ICAgICAgICBpbmFkdmVydGVudGx5IGRyb3BwZWQgd2hlbiByZWZhY3RvcmluZyB0aGUgY29kZSB0 byBiZSBzaGFyZWQgYmV0d2VlbgorICAgICAgICBpT1MgYW5kIE9TIFguCisKKyAgICAgICAgQWRk aXRpb25hbGx5LCB0aGUgbXVsdGlwbGllciBpcyBvbmx5IHN1cHBvc2VkIHRoZSBiZSBhcHBsaWVk IGlmIHRoZQorICAgICAgICBpbnB1dCBDU1NQcmltaXRpdmVWYWx1ZSBpcyBhIExlbmd0aCBvciBh IE51bWJlci4gSG93ZXZlciwgYWZ0ZXIKKyAgICAgICAgcjE3NjIwMiwgd2Ugd291bGQgYXBwbHkg dGhlIG11bHRpcGxpZXIgaWYgdGhlIENTU1ByaW1pdGl2ZVZhbHVlIGlzCisgICAgICAgIGEgUGVy Y2VudGFnZSBvciBhIE51bWJlci4gVGhpcyBwYXRjaCB1cGRhdGVzIHRoZSBjb2RlIHRvIG1hdGNo IHRoZQorICAgICAgICBiZWhhdmlvciBwcmlvciB0byByMTc2MjAyLgorCisgICAgICAgIFRlc3Q6 IGZhc3QvY3NzL2xpbmUtaGVpZ2h0LXRleHQtYXV0b3NpemluZy5odG1sCisKKyAgICAgICAgKiBj c3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmg6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJG dW5jdGlvbnM6OmNvbnZlcnRMaW5lSGVpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVp bGRlckZ1bmN0aW9uczo6YXBwbHlWYWx1ZUxpbmVIZWlnaHQpOgorCiAyMDE0LTExLTIxICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgTW9yZSBidWlsZCBm aXhlcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20u aCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaAppbmRleCA2ZDkzMGI2 Y2Y1Y2JiOWVmMzU2YWM0NTE2ZmRlMzAwYjAwZGIxZDBmLi5iNWM5N2FjZGMzNmMxMzEzZDcxNjMy MDk5NDVmZGQxN2FhYTdkYWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVC dWlsZGVyQ3VzdG9tLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckN1c3Rv bS5oCkBAIC01MjEsMTEgKzUyMSwxMyBAQCBpbmxpbmUgYm9vbCBjb252ZXJ0TGluZUhlaWdodChT dHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBjb25zdCBDU1NWYWx1ZSYgdmFsdQogICAgIH0K ICAgICBpZiAocHJpbWl0aXZlVmFsdWUuaXNMZW5ndGgoKSkgewogICAgICAgICBsZW5ndGggPSBw cmltaXRpdmVWYWx1ZS5jb21wdXRlTGVuZ3RoPExlbmd0aD4oY3NzdG9MZW5ndGhDb252ZXJzaW9u RGF0YVdpdGhUZXh0Wm9vbUZhY3RvcihzdHlsZVJlc29sdmVyKSk7CisgICAgICAgIGlmIChtdWx0 aXBsaWVyICE9IDEuZikKKyAgICAgICAgICAgIGxlbmd0aCA9IExlbmd0aChsZW5ndGgudmFsdWUo KSAqIG11bHRpcGxpZXIsIEZpeGVkKTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogICAg IGlmIChwcmltaXRpdmVWYWx1ZS5pc1BlcmNlbnRhZ2UoKSkgewogICAgICAgICAvLyBGSVhNRTog cGVyY2VudGFnZSBzaG91bGQgbm90IGJlIHJlc3RyaWN0ZWQgdG8gYW4gaW50ZWdlciBoZXJlLgot ICAgICAgICBsZW5ndGggPSBMZW5ndGgoKHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+Y29tcHV0ZWRG b250U2l6ZSgpICogcHJpbWl0aXZlVmFsdWUuZ2V0SW50VmFsdWUoKSkgKiBtdWx0aXBsaWVyIC8g MTAwLCBGaXhlZCk7CisgICAgICAgIGxlbmd0aCA9IExlbmd0aCgoc3R5bGVSZXNvbHZlci5zdHls ZSgpLT5jb21wdXRlZEZvbnRTaXplKCkgKiBwcmltaXRpdmVWYWx1ZS5nZXRJbnRWYWx1ZSgpKSAv IDEwMCwgRml4ZWQpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgaWYgKHByaW1p dGl2ZVZhbHVlLmlzTnVtYmVyKCkpIHsKQEAgLTU3MSw3ICs1NzMsOCBAQCBpbmxpbmUgdm9pZCBh cHBseUluaXRpYWxMaW5lSGVpZ2h0KFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIpCiBpbmxp bmUgdm9pZCBhcHBseVZhbHVlTGluZUhlaWdodChTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVy LCBDU1NWYWx1ZSYgdmFsdWUpCiB7CiAgICAgTGVuZ3RoIGxpbmVIZWlnaHQ7Ci0gICAgaWYgKCFj b252ZXJ0TGluZUhlaWdodChzdHlsZVJlc29sdmVyLCB2YWx1ZSwgbGluZUhlaWdodCwgc3R5bGVS ZXNvbHZlci5zdHlsZSgpLT50ZXh0U2l6ZUFkanVzdCgpLm11bHRpcGxpZXIoKSkpCisgICAgZmxv YXQgbXVsdGlwbGVyID0gc3R5bGVSZXNvbHZlci5zdHlsZSgpLT50ZXh0U2l6ZUFkanVzdCgpLmlz UGVyY2VudGFnZSgpID8gc3R5bGVSZXNvbHZlci5zdHlsZSgpLT50ZXh0U2l6ZUFkanVzdCgpLm11 bHRpcGxpZXIoKSA6IDEuZjsKKyAgICBpZiAoIWNvbnZlcnRMaW5lSGVpZ2h0KHN0eWxlUmVzb2x2 ZXIsIHZhbHVlLCBsaW5lSGVpZ2h0LCBtdWx0aXBsaWVyKSkKICAgICAgICAgcmV0dXJuOwogCiAg ICAgc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRMaW5lSGVpZ2h0KGxpbmVIZWlnaHQpOwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmlu ZGV4IDYxMGYwZTRhNDNiNjE4ZmYwNGY3ZGVjYjY3NzliMzY1ZjcyZDVhOGYuLjhmMTQ4NmZjYWM5 MmY4MTVmYTA3ZDdjNjM4NGY0MjM2YjY5NGRmOTUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0No YW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAx NC0xMS0yMSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1Nd IFJlZ3Jlc3Npb24ocjE3NjIwMik6IGxpbmUtaGVpZ2h0IGlzIHdyb25nIG9uIG1hcmNvLm9yZwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4OTcwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIEFkZCBsYXlvdXQg dGVzdCB0byBjb3ZlciBsaW5lLWhlaWdodCBDU1MgcHJvcGVydHkgYW5kIGl0cyBpbnRlcmFjdGlv bgorICAgICAgICB3aXRoIC13ZWJraXQtdGV4dC1zaXplLWFkanVzdC4KKworICAgICAgICAqIGZh c3QvY3NzL2xpbmUtaGVpZ2h0LXRleHQtYXV0b3NpemluZy1leHBlY3RlZC50eHQ6IEFkZGVkLgor ICAgICAgICAqIGZhc3QvY3NzL2xpbmUtaGVpZ2h0LXRleHQtYXV0b3NpemluZy5odG1sOiBBZGRl ZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9pb3Mtc2ltdWxhdG9yL2Zhc3QvY3NzL2xpbmUtaGVpZ2h0 LXRleHQtYXV0b3NpemluZy1leHBlY3RlZC50eHQ6IEFkZGVkLgorCiAyMDE0LTExLTIxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMTc1MjU5 KSBTaW1wbGUgbGluZSBsYXlvdXQgdGV4dCBtZWFzdXJpbmcgYmVoYXZpb3IgY2hhbmdlZC4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL2xpbmUtaGVpZ2h0LXRleHQtYXV0b3Npemlu Zy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9saW5lLWhlaWdodC10ZXh0LWF1 dG9zaXppbmctZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmNkZjdiMDBmMjAwMDU5ODhmNWYxMzUx Y2M1YzMwNDFmODRmMGNlZTUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nz cy9saW5lLWhlaWdodC10ZXh0LWF1dG9zaXppbmctZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMjEg QEAKK1Rlc3QgdGhlICdsaW5lLWhlaWdodCcgcHJvcGVydHkgaW50ZXJhY3Rpb24gd2l0aCAnLXdl YmtpdC10ZXh0LXNpemUtYWRqdXN0Jy4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2Vy aWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisK K0Nhc2Ugd2l0aG91dCB0ZXh0IHNpemUgYWRqdXN0LgorUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRT dHlsZSh0ZXN0RGl2Tm9BZGp1c3QpLmdldFByb3BlcnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykgaXMg Im5vcm1hbCIKK1BBU1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdERpdk5vQWRqdXN0KS5n ZXRQcm9wZXJ0eVZhbHVlKCdmb250LXNpemUnKSBpcyAiMjBweCIKK3Rlc3REaXZOb0FkanVzdC5z dHlsZVsnbGluZS1oZWlnaHQnXSA9ICcxLjYnCitQQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxl KHRlc3REaXZOb0FkanVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgnbGluZS1oZWlnaHQnKSBpcyAiMzJw eCIKK3Rlc3REaXZOb0FkanVzdC5zdHlsZVsnbGluZS1oZWlnaHQnXSA9ICc4MCUnCitQQVNTIHdp bmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZOb0FkanVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgn bGluZS1oZWlnaHQnKSBpcyAiMTZweCIKK3Rlc3REaXZOb0FkanVzdC5zdHlsZVsnbGluZS1oZWln aHQnXSA9ICcxMnB4JworUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0ZXN0RGl2Tm9BZGp1 c3QpLmdldFByb3BlcnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykgaXMgIjEycHgiCitDYXNlIHdpdGgg dGV4dCBzaXplIGFkanVzdC4KK1BsYXRmb3JtIGRvZXMgbm90IHN1cHBvcnQgIC13ZWJraXQtdGV4 dC1zaXplLWFkanVzdAorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENP TVBMRVRFCitUZXN0CitUZXN0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9saW5l LWhlaWdodC10ZXh0LWF1dG9zaXppbmcuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2xpbmUt aGVpZ2h0LXRleHQtYXV0b3NpemluZy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmFhODE2MWJmNTkyNDdjN2Ri NGE3ZmU5ZjYzZTgyMTVjMGQ4YzA0YWEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L2Nzcy9saW5lLWhlaWdodC10ZXh0LWF1dG9zaXppbmcuaHRtbApAQCAtMCwwICsxLDU4IEBA Cis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVz b3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxzdHlsZT4KKyN0ZXN0RGl2QWRqdXN0 IHsKKyAgLXdlYmtpdC10ZXh0LXNpemUtYWRqdXN0OiAxNTAlOworICBmb250LXNpemU6IDIwcHg7 Cit9CisjdGVzdERpdk5vQWRqdXN0IHsKKyAgZm9udC1zaXplOiAyMHB4OworfQorPC9zdHlsZT4K KzwvaGVhZD4KKzxib2J5PgorPGRpdiBpZD0idGVzdERpdk5vQWRqdXN0Ij5UZXN0PC9kaXY+Cis8 ZGl2IGlkPSJ0ZXN0RGl2QWRqdXN0Ij5UZXN0PC9kaXY+Cis8c2NyaXB0PgorZGVzY3JpcHRpb24o IlRlc3QgdGhlICdsaW5lLWhlaWdodCcgcHJvcGVydHkgaW50ZXJhY3Rpb24gd2l0aCAnLXdlYmtp dC10ZXh0LXNpemUtYWRqdXN0Jy4iKTsKKworZGVidWcoIkNhc2Ugd2l0aG91dCB0ZXh0IHNpemUg YWRqdXN0LiIpOwordmFyIHRlc3REaXZOb0FkanVzdCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJ0ZXN0RGl2Tm9BZGp1c3QiKTsKK3Nob3VsZEJlRXF1YWxUb1N0cmluZygid2luZG93LmdldENv bXB1dGVkU3R5bGUodGVzdERpdk5vQWRqdXN0KS5nZXRQcm9wZXJ0eVZhbHVlKCdsaW5lLWhlaWdo dCcpIiwgIm5vcm1hbCIpOworc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJ3aW5kb3cuZ2V0Q29tcHV0 ZWRTdHlsZSh0ZXN0RGl2Tm9BZGp1c3QpLmdldFByb3BlcnR5VmFsdWUoJ2ZvbnQtc2l6ZScpIiwg IjIwcHgiKTsKK2V2YWxBbmRMb2coInRlc3REaXZOb0FkanVzdC5zdHlsZVsnbGluZS1oZWlnaHQn XSA9ICcxLjYnIik7CisvLyBmb250LXNpemUgKiBsaW5lLWhlaWdodCA9PSAyMHB4ICogMS42ID09 IDMycHgKK3Nob3VsZEJlRXF1YWxUb1N0cmluZygid2luZG93LmdldENvbXB1dGVkU3R5bGUodGVz dERpdk5vQWRqdXN0KS5nZXRQcm9wZXJ0eVZhbHVlKCdsaW5lLWhlaWdodCcpIiwgIjMycHgiKTsK K2V2YWxBbmRMb2coInRlc3REaXZOb0FkanVzdC5zdHlsZVsnbGluZS1oZWlnaHQnXSA9ICc4MCUn Iik7CisvLyBmb250LXNpemUgKiBsaW5lLWhlaWdodCA9PSAyMHB4ICogODAlID09IDE2cHgKK3No b3VsZEJlRXF1YWxUb1N0cmluZygid2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdERpdk5vQWRq dXN0KS5nZXRQcm9wZXJ0eVZhbHVlKCdsaW5lLWhlaWdodCcpIiwgIjE2cHgiKTsKK2V2YWxBbmRM b2coInRlc3REaXZOb0FkanVzdC5zdHlsZVsnbGluZS1oZWlnaHQnXSA9ICcxMnB4JyIpOworc2hv dWxkQmVFcXVhbFRvU3RyaW5nKCJ3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0ZXN0RGl2Tm9BZGp1 c3QpLmdldFByb3BlcnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykiLCAiMTJweCIpOworCitkZWJ1Zygi Q2FzZSB3aXRoIHRleHQgc2l6ZSBhZGp1c3QuIik7Cit2YXIgdGVzdERpdkFkanVzdCA9IGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCJ0ZXN0RGl2QWRqdXN0Iik7CitpZiAod2luZG93LmdldENvbXB1 dGVkU3R5bGUodGVzdERpdkFkanVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC10ZXh0LXNp emUtYWRqdXN0JykgPT0gbnVsbCkgeworICBkZWJ1ZygiUGxhdGZvcm0gZG9lcyBub3Qgc3VwcG9y dCAgLXdlYmtpdC10ZXh0LXNpemUtYWRqdXN0Iik7Cit9IGVsc2UgeworICBkZWJ1ZygiUGxhdGZv cm0gc3VwcG9ydHMgLXdlYmtpdC10ZXh0LXNpemUtYWRqdXN0Iik7CisgIHNob3VsZEJlRXF1YWxU b1N0cmluZygid2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdERpdkFkanVzdCkuZ2V0UHJvcGVy dHlWYWx1ZSgnbGluZS1oZWlnaHQnKSIsICJub3JtYWwiKTsKKyAgLy8gZm9udC1zaXplICogLXdl YmtpdC10ZXh0LXNpemUtYWRqdXN0ID09IDIwcHggKiAxNTAlID09IDMwcHgKKyAgc2hvdWxkQmVF cXVhbFRvU3RyaW5nKCJ3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0ZXN0RGl2QWRqdXN0KS5nZXRQ cm9wZXJ0eVZhbHVlKCdmb250LXNpemUnKSIsICIzMHB4Iik7CisgIGV2YWxBbmRMb2coInRlc3RE aXZBZGp1c3Quc3R5bGVbJ2xpbmUtaGVpZ2h0J10gPSAnMS42JyIpOworICAvLyBmb250LXNpemUg KiBsaW5lLWhlaWdodCA9PSAzMHB4ICogMS42ID09IDQ4cHgKKyAgc2hvdWxkQmVFcXVhbFRvU3Ry aW5nKCJ3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0ZXN0RGl2QWRqdXN0KS5nZXRQcm9wZXJ0eVZh bHVlKCdsaW5lLWhlaWdodCcpIiwgIjQ4cHgiKTsKKworICBldmFsQW5kTG9nKCJ0ZXN0RGl2QWRq dXN0LnN0eWxlWydsaW5lLWhlaWdodCddID0gJzgwJSciKTsKKyAgLy8gZm9udC1zaXplICogbGlu ZS1oZWlnaHQgPT0gMzBweCAqIDgwJSA9PSAyNHB4CisgIHNob3VsZEJlRXF1YWxUb1N0cmluZygi d2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdERpdkFkanVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgn bGluZS1oZWlnaHQnKSIsICIyNHB4Iik7CisKKyAgZXZhbEFuZExvZygidGVzdERpdkFkanVzdC5z dHlsZVsnbGluZS1oZWlnaHQnXSA9ICcxMnB4JyIpOworICAvLyBsaW5lLWhlaWdodCAqIC13ZWJr aXQtdGV4dC1zaXplLWFkanVzdCA9PSAxMnB4ICogMTUwJSA9PSAxOHB4CisgIHNob3VsZEJlRXF1 YWxUb1N0cmluZygid2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdERpdkFkanVzdCkuZ2V0UHJv cGVydHlWYWx1ZSgnbGluZS1oZWlnaHQnKSIsICIxOHB4Iik7Cit9Cis8L3NjcmlwdD4KKzxzY3Jp cHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9k eT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy1zaW11bGF0 b3IvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy1zaW11bGF0b3Iv VGVzdEV4cGVjdGF0aW9ucwppbmRleCAzNzMxODM5MmEzM2YwYzkyZjYxM2ExYTAwZTQ1OWU0MWE3 MzYwOWU3Li4wYjVlMmY0YmZlNjRhYjQ4MzhjOGMxNDBkZjUwOGE1NzE3ODk3NjdmIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtc2ltdWxhdG9yL1Rlc3RFeHBlY3RhdGlvbnMK KysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXNpbXVsYXRvci9UZXN0RXhwZWN0YXRpb25z CkBAIC0xNTEsMyArMTUxLDggQEAgdHJhbnNpdGlvbnMKIHRyYXZlcnNhbAogdXNlcnNjcmlwdHMK IHdlYmFyY2hpdmUKKworIyMjCisjIE1hcmsgYXMgcGFzc2luZyBzcGVjaWZpYyB0ZXN0cyBpbiBm b2xkZXJzIHRoYXQgd2VyZSBza2lwcGVkIHRlbXBvcmFyaWx5IGFib3ZlLgorIyMKK3dlYmtpdC5v cmcvYi8xMzg5NzAgZmFzdC9jc3MvbGluZS1oZWlnaHQtdGV4dC1hdXRvc2l6aW5nLmh0bWwgWyBQ YXNzIF0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy1zaW11bGF0b3IvZmFz dC9jc3MvbGluZS1oZWlnaHQtdGV4dC1hdXRvc2l6aW5nLWV4cGVjdGVkLnR4dCBiL0xheW91dFRl c3RzL3BsYXRmb3JtL2lvcy1zaW11bGF0b3IvZmFzdC9jc3MvbGluZS1oZWlnaHQtdGV4dC1hdXRv c2l6aW5nLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44ZTM1YWQ0N2ZkODc4YTEyNWQ4MGZhMTVm NzRlMzdjZjRmN2MxMjNhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v aW9zLXNpbXVsYXRvci9mYXN0L2Nzcy9saW5lLWhlaWdodC10ZXh0LWF1dG9zaXppbmctZXhwZWN0 ZWQudHh0CkBAIC0wLDAgKzEsMjkgQEAKK1Rlc3QgdGhlICdsaW5lLWhlaWdodCcgcHJvcGVydHkg aW50ZXJhY3Rpb24gd2l0aCAnLXdlYmtpdC10ZXh0LXNpemUtYWRqdXN0Jy4KKworT24gc3VjY2Vz cywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkg IlRFU1QgQ09NUExFVEUiLgorCisKK0Nhc2Ugd2l0aG91dCB0ZXh0IHNpemUgYWRqdXN0LgorUEFT UyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0ZXN0RGl2Tm9BZGp1c3QpLmdldFByb3BlcnR5VmFs dWUoJ2xpbmUtaGVpZ2h0JykgaXMgIm5vcm1hbCIKK1BBU1Mgd2luZG93LmdldENvbXB1dGVkU3R5 bGUodGVzdERpdk5vQWRqdXN0KS5nZXRQcm9wZXJ0eVZhbHVlKCdmb250LXNpemUnKSBpcyAiMjBw eCIKK3Rlc3REaXZOb0FkanVzdC5zdHlsZVsnbGluZS1oZWlnaHQnXSA9ICcxLjYnCitQQVNTIHdp bmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZOb0FkanVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgn bGluZS1oZWlnaHQnKSBpcyAiMzJweCIKK3Rlc3REaXZOb0FkanVzdC5zdHlsZVsnbGluZS1oZWln aHQnXSA9ICc4MCUnCitQQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZOb0FkanVz dCkuZ2V0UHJvcGVydHlWYWx1ZSgnbGluZS1oZWlnaHQnKSBpcyAiMTZweCIKK3Rlc3REaXZOb0Fk anVzdC5zdHlsZVsnbGluZS1oZWlnaHQnXSA9ICcxMnB4JworUEFTUyB3aW5kb3cuZ2V0Q29tcHV0 ZWRTdHlsZSh0ZXN0RGl2Tm9BZGp1c3QpLmdldFByb3BlcnR5VmFsdWUoJ2xpbmUtaGVpZ2h0Jykg aXMgIjEycHgiCitDYXNlIHdpdGggdGV4dCBzaXplIGFkanVzdC4KK1BsYXRmb3JtIHN1cHBvcnRz IC13ZWJraXQtdGV4dC1zaXplLWFkanVzdAorUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0 ZXN0RGl2QWRqdXN0KS5nZXRQcm9wZXJ0eVZhbHVlKCdsaW5lLWhlaWdodCcpIGlzICJub3JtYWwi CitQQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZBZGp1c3QpLmdldFByb3BlcnR5 VmFsdWUoJ2ZvbnQtc2l6ZScpIGlzICIzMHB4IgordGVzdERpdkFkanVzdC5zdHlsZVsnbGluZS1o ZWlnaHQnXSA9ICcxLjYnCitQQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZBZGp1 c3QpLmdldFByb3BlcnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykgaXMgIjQ4cHgiCit0ZXN0RGl2QWRq dXN0LnN0eWxlWydsaW5lLWhlaWdodCddID0gJzgwJScKK1BBU1Mgd2luZG93LmdldENvbXB1dGVk U3R5bGUodGVzdERpdkFkanVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgnbGluZS1oZWlnaHQnKSBpcyAi MjRweCIKK3Rlc3REaXZBZGp1c3Quc3R5bGVbJ2xpbmUtaGVpZ2h0J10gPSAnMTJweCcKK1BBU1Mg d2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdERpdkFkanVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgn bGluZS1oZWlnaHQnKSBpcyAiMThweCIKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUK KworVEVTVCBDT01QTEVURQorVGVzdAorVGVzdAo= 242081 2014-11-21 15:29:26 -0800 2014-11-21 17:22:34 -0800 Patch bug-138970-20141121152943.patch text/plain 11031 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2NDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWI1YmFiYjQwZjBjN2I0 NWY2OWJiMGQ1NjYwYmUzMGJlZDdiZWJmMy4uMWRiNjBkMzdjYzRhZTljNGVmNjRkNWVjMDM3MjY1 OWMwZjNjYjA5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE0LTExLTIxICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gUmVncmVzc2lvbihy MTc2MjAyKTogbGluZS1oZWlnaHQgaXMgd3Jvbmcgb24gbWFyY28ub3JnCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg5NzAKKworICAgICAgICBSZXZp ZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgQWZ0ZXIgcjE3NjIwMiwgb24gaU9TIHdp dGggSU9TX1RFWFRfQVVUT1NJWklORyBlbmFibGVkLCB3ZSB3b3VsZAorICAgICAgICBtdWx0aXBs eSB0aGUgbGluZUhlaWdodCBieSBSZW5kZXJTdHlsZTo6dGV4dFNpemVBZGp1c3QoKTo6bXVsdGlw bGllcigpCisgICAgICAgIHVuY29uZGl0aW9uYWxseS4gSG93ZXZlciwgd2UncmUgb25seSBzdXBw b3NlZCB0byBkbyBzbyBpZgorICAgICAgICBSZW5kZXJTdHlsZTo6dGV4dFNpemVBZGp1c3QoKTo6 aXNQZXJjZW50YWdlKCkgcmV0dXJucyB0cnVlLiBUaGlzCisgICAgICAgIHBhdGNoIHJlaW50cm9k dWNlcyB0aGUgdGV4dFNpemVBZGp1c3QoKS5pc1BlcmNlbnRhZ2UoKSBjaGVjayB0aGF0IHdhcwor ICAgICAgICBpbmFkdmVydGVudGx5IGRyb3BwZWQgd2hlbiByZWZhY3RvcmluZyB0aGUgY29kZSB0 byBiZSBzaGFyZWQgYmV0d2VlbgorICAgICAgICBpT1MgYW5kIE9TIFguCisKKyAgICAgICAgQWRk aXRpb25hbGx5LCB0aGUgbXVsdGlwbGllciBpcyBvbmx5IHN1cHBvc2VkIHRoZSBiZSBhcHBsaWVk IGlmIHRoZQorICAgICAgICBpbnB1dCBDU1NQcmltaXRpdmVWYWx1ZSBpcyBhIExlbmd0aCBvciBh IE51bWJlci4gSG93ZXZlciwgYWZ0ZXIKKyAgICAgICAgcjE3NjIwMiwgd2Ugd291bGQgYXBwbHkg dGhlIG11bHRpcGxpZXIgaWYgdGhlIENTU1ByaW1pdGl2ZVZhbHVlIGlzCisgICAgICAgIGEgUGVy Y2VudGFnZSBvciBhIE51bWJlci4gVGhpcyBwYXRjaCB1cGRhdGVzIHRoZSBjb2RlIHRvIG1hdGNo IHRoZQorICAgICAgICBiZWhhdmlvciBwcmlvciB0byByMTc2MjAyLgorCisgICAgICAgIFRlc3Q6 IGZhc3QvY3NzL2xpbmUtaGVpZ2h0LXRleHQtYXV0b3NpemluZy5odG1sCisKKyAgICAgICAgKiBj c3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmg6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJG dW5jdGlvbnM6OmNvbnZlcnRMaW5lSGVpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVp bGRlckZ1bmN0aW9uczo6YXBwbHlWYWx1ZUxpbmVIZWlnaHQpOgorCiAyMDE0LTExLTIxICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgTW9yZSBidWlsZCBm aXhlcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20u aCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaAppbmRleCA2ZDkzMGI2 Y2Y1Y2JiOWVmMzU2YWM0NTE2ZmRlMzAwYjAwZGIxZDBmLi5lZWEzZWUzYmYzMTAzMzk2N2JmOGFi ZTA5MDU1YjZiYzA0NTZhYzEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVC dWlsZGVyQ3VzdG9tLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckN1c3Rv bS5oCkBAIC01MjEsMTEgKzUyMSwxMyBAQCBpbmxpbmUgYm9vbCBjb252ZXJ0TGluZUhlaWdodChT dHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBjb25zdCBDU1NWYWx1ZSYgdmFsdQogICAgIH0K ICAgICBpZiAocHJpbWl0aXZlVmFsdWUuaXNMZW5ndGgoKSkgewogICAgICAgICBsZW5ndGggPSBw cmltaXRpdmVWYWx1ZS5jb21wdXRlTGVuZ3RoPExlbmd0aD4oY3NzdG9MZW5ndGhDb252ZXJzaW9u RGF0YVdpdGhUZXh0Wm9vbUZhY3RvcihzdHlsZVJlc29sdmVyKSk7CisgICAgICAgIGlmIChtdWx0 aXBsaWVyICE9IDEuZikKKyAgICAgICAgICAgIGxlbmd0aCA9IExlbmd0aChsZW5ndGgudmFsdWUo KSAqIG11bHRpcGxpZXIsIEZpeGVkKTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogICAg IGlmIChwcmltaXRpdmVWYWx1ZS5pc1BlcmNlbnRhZ2UoKSkgewogICAgICAgICAvLyBGSVhNRTog cGVyY2VudGFnZSBzaG91bGQgbm90IGJlIHJlc3RyaWN0ZWQgdG8gYW4gaW50ZWdlciBoZXJlLgot ICAgICAgICBsZW5ndGggPSBMZW5ndGgoKHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+Y29tcHV0ZWRG b250U2l6ZSgpICogcHJpbWl0aXZlVmFsdWUuZ2V0SW50VmFsdWUoKSkgKiBtdWx0aXBsaWVyIC8g MTAwLCBGaXhlZCk7CisgICAgICAgIGxlbmd0aCA9IExlbmd0aCgoc3R5bGVSZXNvbHZlci5zdHls ZSgpLT5jb21wdXRlZEZvbnRTaXplKCkgKiBwcmltaXRpdmVWYWx1ZS5nZXRJbnRWYWx1ZSgpKSAv IDEwMCwgRml4ZWQpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgaWYgKHByaW1p dGl2ZVZhbHVlLmlzTnVtYmVyKCkpIHsKQEAgLTU3MSw3ICs1NzMsOCBAQCBpbmxpbmUgdm9pZCBh cHBseUluaXRpYWxMaW5lSGVpZ2h0KFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIpCiBpbmxp bmUgdm9pZCBhcHBseVZhbHVlTGluZUhlaWdodChTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVy LCBDU1NWYWx1ZSYgdmFsdWUpCiB7CiAgICAgTGVuZ3RoIGxpbmVIZWlnaHQ7Ci0gICAgaWYgKCFj b252ZXJ0TGluZUhlaWdodChzdHlsZVJlc29sdmVyLCB2YWx1ZSwgbGluZUhlaWdodCwgc3R5bGVS ZXNvbHZlci5zdHlsZSgpLT50ZXh0U2l6ZUFkanVzdCgpLm11bHRpcGxpZXIoKSkpCisgICAgZmxv YXQgbXVsdGlwbGllciA9IHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+dGV4dFNpemVBZGp1c3QoKS5p c1BlcmNlbnRhZ2UoKSA/IHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+dGV4dFNpemVBZGp1c3QoKS5t dWx0aXBsaWVyKCkgOiAxLmY7CisgICAgaWYgKCFjb252ZXJ0TGluZUhlaWdodChzdHlsZVJlc29s dmVyLCB2YWx1ZSwgbGluZUhlaWdodCwgbXVsdGlwbGllcikpCiAgICAgICAgIHJldHVybjsKIAog ICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0TGluZUhlaWdodChsaW5lSGVpZ2h0KTsKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp bmRleCA2MTBmMGU0YTQzYjYxOGZmMDRmN2RlY2I2Nzc5YjM2NWY3MmQ1YThmLi44ZjE0ODZmY2Fj OTJmODE1ZmEwN2Q3YzYzODRmNDIzNmI2OTRkZjk1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIw MTQtMTEtMjEgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9T XSBSZWdyZXNzaW9uKHIxNzYyMDIpOiBsaW5lLWhlaWdodCBpcyB3cm9uZyBvbiBtYXJjby5vcmcK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzODk3MAor CisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAgICAgICBBZGQgbGF5b3V0 IHRlc3QgdG8gY292ZXIgbGluZS1oZWlnaHQgQ1NTIHByb3BlcnR5IGFuZCBpdHMgaW50ZXJhY3Rp b24KKyAgICAgICAgd2l0aCAtd2Via2l0LXRleHQtc2l6ZS1hZGp1c3QuCisKKyAgICAgICAgKiBm YXN0L2Nzcy9saW5lLWhlaWdodC10ZXh0LWF1dG9zaXppbmctZXhwZWN0ZWQudHh0OiBBZGRlZC4K KyAgICAgICAgKiBmYXN0L2Nzcy9saW5lLWhlaWdodC10ZXh0LWF1dG9zaXppbmcuaHRtbDogQWRk ZWQuCisgICAgICAgICogcGxhdGZvcm0vaW9zLXNpbXVsYXRvci9mYXN0L2Nzcy9saW5lLWhlaWdo dC10ZXh0LWF1dG9zaXppbmctZXhwZWN0ZWQudHh0OiBBZGRlZC4KKwogMjAxNC0xMS0yMSAgWmFs YW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjE3NTI1 OSkgU2ltcGxlIGxpbmUgbGF5b3V0IHRleHQgbWVhc3VyaW5nIGJlaGF2aW9yIGNoYW5nZWQuCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9saW5lLWhlaWdodC10ZXh0LWF1dG9zaXpp bmctZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvbGluZS1oZWlnaHQtdGV4dC1h dXRvc2l6aW5nLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jZGY3YjAwZjIwMDA1OTg4ZjVmMTM1 MWNjNWMzMDQxZjg0ZjBjZWU1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9j c3MvbGluZS1oZWlnaHQtdGV4dC1hdXRvc2l6aW5nLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDIx IEBACitUZXN0IHRoZSAnbGluZS1oZWlnaHQnIHByb3BlcnR5IGludGVyYWN0aW9uIHdpdGggJy13 ZWJraXQtdGV4dC1zaXplLWFkanVzdCcuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNl cmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKwor CitDYXNlIHdpdGhvdXQgdGV4dCBzaXplIGFkanVzdC4KK1BBU1Mgd2luZG93LmdldENvbXB1dGVk U3R5bGUodGVzdERpdk5vQWRqdXN0KS5nZXRQcm9wZXJ0eVZhbHVlKCdsaW5lLWhlaWdodCcpIGlz ICJub3JtYWwiCitQQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZOb0FkanVzdCku Z2V0UHJvcGVydHlWYWx1ZSgnZm9udC1zaXplJykgaXMgIjIwcHgiCit0ZXN0RGl2Tm9BZGp1c3Qu c3R5bGVbJ2xpbmUtaGVpZ2h0J10gPSAnMS42JworUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHls ZSh0ZXN0RGl2Tm9BZGp1c3QpLmdldFByb3BlcnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykgaXMgIjMy cHgiCit0ZXN0RGl2Tm9BZGp1c3Quc3R5bGVbJ2xpbmUtaGVpZ2h0J10gPSAnODAlJworUEFTUyB3 aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0ZXN0RGl2Tm9BZGp1c3QpLmdldFByb3BlcnR5VmFsdWUo J2xpbmUtaGVpZ2h0JykgaXMgIjE2cHgiCit0ZXN0RGl2Tm9BZGp1c3Quc3R5bGVbJ2xpbmUtaGVp Z2h0J10gPSAnMTJweCcKK1BBU1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdERpdk5vQWRq dXN0KS5nZXRQcm9wZXJ0eVZhbHVlKCdsaW5lLWhlaWdodCcpIGlzICIxMnB4IgorQ2FzZSB3aXRo IHRleHQgc2l6ZSBhZGp1c3QuCitQbGF0Zm9ybSBkb2VzIG5vdCBzdXBwb3J0ICAtd2Via2l0LXRl eHQtc2l6ZS1hZGp1c3QKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBD T01QTEVURQorVGVzdAorVGVzdApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvbGlu ZS1oZWlnaHQtdGV4dC1hdXRvc2l6aW5nLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9saW5l LWhlaWdodC10ZXh0LWF1dG9zaXppbmcuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5hYTgxNjFiZjU5MjQ3Yzdk YjRhN2ZlOWY2M2U4MjE1YzBkOGMwNGFhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv ZmFzdC9jc3MvbGluZS1oZWlnaHQtdGV4dC1hdXRvc2l6aW5nLmh0bWwKQEAgLTAsMCArMSw1OCBA QAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uLy4uL3Jl c291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8c3R5bGU+CisjdGVzdERpdkFkanVz dCB7CisgIC13ZWJraXQtdGV4dC1zaXplLWFkanVzdDogMTUwJTsKKyAgZm9udC1zaXplOiAyMHB4 OworfQorI3Rlc3REaXZOb0FkanVzdCB7CisgIGZvbnQtc2l6ZTogMjBweDsKK30KKzwvc3R5bGU+ Cis8L2hlYWQ+Cis8Ym9ieT4KKzxkaXYgaWQ9InRlc3REaXZOb0FkanVzdCI+VGVzdDwvZGl2Pgor PGRpdiBpZD0idGVzdERpdkFkanVzdCI+VGVzdDwvZGl2PgorPHNjcmlwdD4KK2Rlc2NyaXB0aW9u KCJUZXN0IHRoZSAnbGluZS1oZWlnaHQnIHByb3BlcnR5IGludGVyYWN0aW9uIHdpdGggJy13ZWJr aXQtdGV4dC1zaXplLWFkanVzdCcuIik7CisKK2RlYnVnKCJDYXNlIHdpdGhvdXQgdGV4dCBzaXpl IGFkanVzdC4iKTsKK3ZhciB0ZXN0RGl2Tm9BZGp1c3QgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgidGVzdERpdk5vQWRqdXN0Iik7CitzaG91bGRCZUVxdWFsVG9TdHJpbmcoIndpbmRvdy5nZXRD b21wdXRlZFN0eWxlKHRlc3REaXZOb0FkanVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgnbGluZS1oZWln aHQnKSIsICJub3JtYWwiKTsKK3Nob3VsZEJlRXF1YWxUb1N0cmluZygid2luZG93LmdldENvbXB1 dGVkU3R5bGUodGVzdERpdk5vQWRqdXN0KS5nZXRQcm9wZXJ0eVZhbHVlKCdmb250LXNpemUnKSIs ICIyMHB4Iik7CitldmFsQW5kTG9nKCJ0ZXN0RGl2Tm9BZGp1c3Quc3R5bGVbJ2xpbmUtaGVpZ2h0 J10gPSAnMS42JyIpOworLy8gZm9udC1zaXplICogbGluZS1oZWlnaHQgPT0gMjBweCAqIDEuNiA9 PSAzMnB4CitzaG91bGRCZUVxdWFsVG9TdHJpbmcoIndpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRl c3REaXZOb0FkanVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgnbGluZS1oZWlnaHQnKSIsICIzMnB4Iik7 CitldmFsQW5kTG9nKCJ0ZXN0RGl2Tm9BZGp1c3Quc3R5bGVbJ2xpbmUtaGVpZ2h0J10gPSAnODAl JyIpOworLy8gZm9udC1zaXplICogbGluZS1oZWlnaHQgPT0gMjBweCAqIDgwJSA9PSAxNnB4Citz aG91bGRCZUVxdWFsVG9TdHJpbmcoIndpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZOb0Fk anVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgnbGluZS1oZWlnaHQnKSIsICIxNnB4Iik7CitldmFsQW5k TG9nKCJ0ZXN0RGl2Tm9BZGp1c3Quc3R5bGVbJ2xpbmUtaGVpZ2h0J10gPSAnMTJweCciKTsKK3No b3VsZEJlRXF1YWxUb1N0cmluZygid2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdERpdk5vQWRq dXN0KS5nZXRQcm9wZXJ0eVZhbHVlKCdsaW5lLWhlaWdodCcpIiwgIjEycHgiKTsKKworZGVidWco IkNhc2Ugd2l0aCB0ZXh0IHNpemUgYWRqdXN0LiIpOwordmFyIHRlc3REaXZBZGp1c3QgPSBkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgidGVzdERpdkFkanVzdCIpOworaWYgKHdpbmRvdy5nZXRDb21w dXRlZFN0eWxlKHRlc3REaXZBZGp1c3QpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtdGV4dC1z aXplLWFkanVzdCcpID09IG51bGwpIHsKKyAgZGVidWcoIlBsYXRmb3JtIGRvZXMgbm90IHN1cHBv cnQgIC13ZWJraXQtdGV4dC1zaXplLWFkanVzdCIpOworfSBlbHNlIHsKKyAgZGVidWcoIlBsYXRm b3JtIHN1cHBvcnRzIC13ZWJraXQtdGV4dC1zaXplLWFkanVzdCIpOworICBzaG91bGRCZUVxdWFs VG9TdHJpbmcoIndpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZBZGp1c3QpLmdldFByb3Bl cnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykiLCAibm9ybWFsIik7CisgIC8vIGZvbnQtc2l6ZSAqIC13 ZWJraXQtdGV4dC1zaXplLWFkanVzdCA9PSAyMHB4ICogMTUwJSA9PSAzMHB4CisgIHNob3VsZEJl RXF1YWxUb1N0cmluZygid2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdERpdkFkanVzdCkuZ2V0 UHJvcGVydHlWYWx1ZSgnZm9udC1zaXplJykiLCAiMzBweCIpOworICBldmFsQW5kTG9nKCJ0ZXN0 RGl2QWRqdXN0LnN0eWxlWydsaW5lLWhlaWdodCddID0gJzEuNiciKTsKKyAgLy8gZm9udC1zaXpl ICogbGluZS1oZWlnaHQgPT0gMzBweCAqIDEuNiA9PSA0OHB4CisgIHNob3VsZEJlRXF1YWxUb1N0 cmluZygid2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdERpdkFkanVzdCkuZ2V0UHJvcGVydHlW YWx1ZSgnbGluZS1oZWlnaHQnKSIsICI0OHB4Iik7CisKKyAgZXZhbEFuZExvZygidGVzdERpdkFk anVzdC5zdHlsZVsnbGluZS1oZWlnaHQnXSA9ICc4MCUnIik7CisgIC8vIGZvbnQtc2l6ZSAqIGxp bmUtaGVpZ2h0ID09IDMwcHggKiA4MCUgPT0gMjRweAorICBzaG91bGRCZUVxdWFsVG9TdHJpbmco IndpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZBZGp1c3QpLmdldFByb3BlcnR5VmFsdWUo J2xpbmUtaGVpZ2h0JykiLCAiMjRweCIpOworCisgIGV2YWxBbmRMb2coInRlc3REaXZBZGp1c3Qu c3R5bGVbJ2xpbmUtaGVpZ2h0J10gPSAnMTJweCciKTsKKyAgLy8gbGluZS1oZWlnaHQgKiAtd2Vi a2l0LXRleHQtc2l6ZS1hZGp1c3QgPT0gMTJweCAqIDE1MCUgPT0gMThweAorICBzaG91bGRCZUVx dWFsVG9TdHJpbmcoIndpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZBZGp1c3QpLmdldFBy b3BlcnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykiLCAiMThweCIpOworfQorPC9zY3JpcHQ+Cis8c2Ny aXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2Jv ZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtc2ltdWxh dG9yL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtc2ltdWxhdG9y L1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMzczMTgzOTJhMzNmMGM5MmY2MTNhMWEwMGU0NTllNDFh NzM2MDllNy4uMGI1ZTJmNGJmZTY0YWI0ODM4YzhjMTQwZGY1MDhhNTcxNzg5NzY3ZiAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXNpbXVsYXRvci9UZXN0RXhwZWN0YXRpb25z CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy1zaW11bGF0b3IvVGVzdEV4cGVjdGF0aW9u cwpAQCAtMTUxLDMgKzE1MSw4IEBAIHRyYW5zaXRpb25zCiB0cmF2ZXJzYWwKIHVzZXJzY3JpcHRz CiB3ZWJhcmNoaXZlCisKKyMjIworIyBNYXJrIGFzIHBhc3Npbmcgc3BlY2lmaWMgdGVzdHMgaW4g Zm9sZGVycyB0aGF0IHdlcmUgc2tpcHBlZCB0ZW1wb3JhcmlseSBhYm92ZS4KKyMjCit3ZWJraXQu b3JnL2IvMTM4OTcwIGZhc3QvY3NzL2xpbmUtaGVpZ2h0LXRleHQtYXV0b3NpemluZy5odG1sIFsg UGFzcyBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtc2ltdWxhdG9yL2Zh c3QvY3NzL2xpbmUtaGVpZ2h0LXRleHQtYXV0b3NpemluZy1leHBlY3RlZC50eHQgYi9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9pb3Mtc2ltdWxhdG9yL2Zhc3QvY3NzL2xpbmUtaGVpZ2h0LXRleHQtYXV0 b3NpemluZy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOGUzNWFkNDdmZDg3OGExMjVkODBmYTE1 Zjc0ZTM3Y2Y0ZjdjMTIzYQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3Jt L2lvcy1zaW11bGF0b3IvZmFzdC9jc3MvbGluZS1oZWlnaHQtdGV4dC1hdXRvc2l6aW5nLWV4cGVj dGVkLnR4dApAQCAtMCwwICsxLDI5IEBACitUZXN0IHRoZSAnbGluZS1oZWlnaHQnIHByb3BlcnR5 IGludGVyYWN0aW9uIHdpdGggJy13ZWJraXQtdGV4dC1zaXplLWFkanVzdCcuCisKK09uIHN1Y2Nl c3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5 ICJURVNUIENPTVBMRVRFIi4KKworCitDYXNlIHdpdGhvdXQgdGV4dCBzaXplIGFkanVzdC4KK1BB U1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUodGVzdERpdk5vQWRqdXN0KS5nZXRQcm9wZXJ0eVZh bHVlKCdsaW5lLWhlaWdodCcpIGlzICJub3JtYWwiCitQQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0 eWxlKHRlc3REaXZOb0FkanVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgnZm9udC1zaXplJykgaXMgIjIw cHgiCit0ZXN0RGl2Tm9BZGp1c3Quc3R5bGVbJ2xpbmUtaGVpZ2h0J10gPSAnMS42JworUEFTUyB3 aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0ZXN0RGl2Tm9BZGp1c3QpLmdldFByb3BlcnR5VmFsdWUo J2xpbmUtaGVpZ2h0JykgaXMgIjMycHgiCit0ZXN0RGl2Tm9BZGp1c3Quc3R5bGVbJ2xpbmUtaGVp Z2h0J10gPSAnODAlJworUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0ZXN0RGl2Tm9BZGp1 c3QpLmdldFByb3BlcnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykgaXMgIjE2cHgiCit0ZXN0RGl2Tm9B ZGp1c3Quc3R5bGVbJ2xpbmUtaGVpZ2h0J10gPSAnMTJweCcKK1BBU1Mgd2luZG93LmdldENvbXB1 dGVkU3R5bGUodGVzdERpdk5vQWRqdXN0KS5nZXRQcm9wZXJ0eVZhbHVlKCdsaW5lLWhlaWdodCcp IGlzICIxMnB4IgorQ2FzZSB3aXRoIHRleHQgc2l6ZSBhZGp1c3QuCitQbGF0Zm9ybSBzdXBwb3J0 cyAtd2Via2l0LXRleHQtc2l6ZS1hZGp1c3QKK1BBU1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUo dGVzdERpdkFkanVzdCkuZ2V0UHJvcGVydHlWYWx1ZSgnbGluZS1oZWlnaHQnKSBpcyAibm9ybWFs IgorUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0ZXN0RGl2QWRqdXN0KS5nZXRQcm9wZXJ0 eVZhbHVlKCdmb250LXNpemUnKSBpcyAiMzBweCIKK3Rlc3REaXZBZGp1c3Quc3R5bGVbJ2xpbmUt aGVpZ2h0J10gPSAnMS42JworUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0ZXN0RGl2QWRq dXN0KS5nZXRQcm9wZXJ0eVZhbHVlKCdsaW5lLWhlaWdodCcpIGlzICI0OHB4IgordGVzdERpdkFk anVzdC5zdHlsZVsnbGluZS1oZWlnaHQnXSA9ICc4MCUnCitQQVNTIHdpbmRvdy5nZXRDb21wdXRl ZFN0eWxlKHRlc3REaXZBZGp1c3QpLmdldFByb3BlcnR5VmFsdWUoJ2xpbmUtaGVpZ2h0JykgaXMg IjI0cHgiCit0ZXN0RGl2QWRqdXN0LnN0eWxlWydsaW5lLWhlaWdodCddID0gJzEycHgnCitQQVNT IHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRlc3REaXZBZGp1c3QpLmdldFByb3BlcnR5VmFsdWUo J2xpbmUtaGVpZ2h0JykgaXMgIjE4cHgiCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVl CisKK1RFU1QgQ09NUExFVEUKK1Rlc3QKK1Rlc3QK