92497 2012-07-27 05:56:03 -0700 [CSS Regions] Region overset property is not properly computed when there is a region break 2013-02-28 02:17:13 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED AdobeTracked P2 Normal --- 104944 57312 0 andreionea3000 mmaerean abucur donggwan.kim eric esprehn+autocc ojan.autocc WebkitBugTracker webkit.review.bot oldest_to_newest 680504 0 154918 andreionea3000 2012-07-27 05:56:03 -0700 Created attachment 154918 repro case for bug In the attached repro case, the content is flowed in only the first region, yet the "regionoverset" property for the regions in the region chain are computed as "overflow", "fit" and "empty". According to the spec: http://www.w3.org/TR/css3-regions/#dom-region-regionoverset , they should be "fit", "empty" and "empty", since content is only flowed in the first region, and the second and third ones have no content flowing inside of them. "overflow" should only be valid for the last region in a region chain, if the content cannot be completely flowed inside it. 787797 1 abucur 2012-12-10 15:51:55 -0800 This seems to be related to the way we are handling margins in the context of forced breaks. The CSS Fragmentation spec [1] states: "When an unforced break occurs between block-level boxes, any margins adjoining the break are truncated. When a forced break occurs there, adjoining margins before the break are truncated, but margins after the break are preserved." It seems right now we are not truncating the before-break margins at all. [1] http://dev.w3.org/csswg/css3-break/#break-between 837418 2 189306 mmaerean 2013-02-20 06:32:56 -0800 Created attachment 189306 visually more intuitive test 842092 3 190307 mmaerean 2013-02-26 09:31:02 -0800 Created attachment 190307 patch 842105 4 190307 hyatt 2013-02-26 09:37:32 -0800 Comment on attachment 190307 patch r=me, although you should probably consider adding a test of columns and/or printing, since you are affecting their behavior by pulling this code out of the region-specific break check. 842976 5 190496 mmaerean 2013-02-27 05:41:28 -0800 Created attachment 190496 Incorporated Dave Hyatt's feedback to add a test of columns. 842985 6 190501 mmaerean 2013-02-27 06:08:43 -0800 Created attachment 190501 Incorporated Dave Hyatt's feedback to add a test of columns. Also Reviewed by David Hyatt in ChangeLogs. 843002 7 190508 mmaerean 2013-02-27 06:26:27 -0800 Created attachment 190508 Incorporated Dave Hyatt's feedback to add a test of columns. Indent using spaces instead of tabs in the html files. 843015 8 190508 webkit.review.bot 2013-02-27 06:52:15 -0800 Comment on attachment 190508 Incorporated Dave Hyatt's feedback to add a test of columns. Indent using spaces instead of tabs in the html files. Clearing flags on attachment: 190508 Committed r144178: <http://trac.webkit.org/changeset/144178> 154918 2012-07-27 05:56:03 -0700 2012-07-27 05:56:03 -0700 repro case for bug repro1.html text/html 678 andreionea3000 PGh0bWw+CjxoZWFkPgoJPHN0eWxlPgoJLmNvbnRlbnQgeyAtd2Via2l0LWZsb3ctaW50bzogZmxv dzsgLXdlYmtpdC1yZWdpb24tYnJlYWstYWZ0ZXI6IGFsd2F5czt9CgkuY29udGFpbmVyIHsgLXdl YmtpdC1mbG93LWZyb206IGZsb3c7IHdpZHRoOjEwMHB4OyBoZWlnaHQ6MTAwcHg7IGJvcmRlcjog MXB4IHNvbGlkIGJsYWNrOyB9Cgk8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5PgoJPHAgY2xhc3M9ImNv bnRlbnQiPlg8L3A+Cgk8ZGl2IGNsYXNzPSJjb250YWluZXIiIGlkPSJyMSI+PC9kaXY+Cgk8ZGl2 IGNsYXNzPSJjb250YWluZXIiIGlkPSJyMiI+PC9kaXY+Cgk8ZGl2IGNsYXNzPSJjb250YWluZXIi IGlkPSJyMyI+PC9kaXY+Cgk8c2NyaXB0PgoJCXZhciByMSA9IGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCJyMSIpLndlYmtpdFJlZ2lvbk92ZXJmbG93OwoJCXZhciByMiA9IGRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCJyMiIpLndlYmtpdFJlZ2lvbk92ZXJmbG93OwoJCXZhciByMyA9IGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCJyMyIpLndlYmtpdFJlZ2lvbk92ZXJmbG93OwoJCWlmIChyMSA9PSAi Zml0IiAmJiByMiA9PSAiZW1wdHkiICYmIHIzID09ICJlbXB0eSIpCgkJCWFsZXJ0KCJQQVNTIik7 CgkJZWxzZQoJCQlhbGVydCgiRkFJTCIpOwoJPC9zY3JpcHQ+CjwvYm9keT4KPC9odG1s 189306 2013-02-20 06:32:56 -0800 2013-02-20 06:32:56 -0800 visually more intuitive test test92497OversetBreak.html text/html 1429 mmaerean CjxodG1sPgoJPGhlYWQ+CgkJPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCQkJYm9keSB7Y29sb3I6 IzQ0NDt9CgkJCS5jb250ZW50IHsgLXdlYmtpdC1mbG93LWludG86IGZsb3c7IG1hcmdpbi1ib3R0 b206MWVtOyBib3JkZXI6IDJweCBkb3R0ZWQgIzY2NjsgYmFja2dyb3VuZC1jb2xvcjogI2VlZTsg fQoJCQkuY29udGVudCA+IHAgeyAtd2Via2l0LXJlZ2lvbi1icmVhay1hZnRlcjogYWx3YXlzOyB9 CgkJCS5jb250YWluZXIgeyAtd2Via2l0LWZsb3ctZnJvbTogZmxvdzsgd2lkdGg6MjUwcHg7IGhl aWdodDoxMjBweDsgYm9yZGVyOiAxcHggc29saWQgIzQ0NDsgbWFyZ2luLXRvcDogMWVtOyB9CgkJ CSNwYXNzIHsgY29sb3I6ICM0RDQ7IG1hcmdpbi10b3A6IDJlbTsgfQoJCQkjZmFpbCB7IGNvbG9y OiAjRDQ0OyBtYXJnaW4tdG9wOiAyZW07IH0KCQkJLmZhaWwgI3Bhc3MsIC5wYXNzICNmYWlsIHsg ZGlzcGxheTogbm9uZTsgfQoJCTwvc3R5bGU+Cgk8L2hlYWQ+Cgk8Ym9keT4KCQk8ZGl2IGNsYXNz PSJjb250ZW50Ij48cD5jb250ZW50IHdpdGggYnJlYWstYWZ0ZXI6IGFsd2F5czs8L3A+PC9kaXY+ CgkJPGRpdiBjbGFzcz0iY29udGFpbmVyIiBpZD0icjEiPjwvZGl2PjxkaXYgaWQ9Im92ZXJzZXQx Ij48L2Rpdj4KCQk8ZGl2IGNsYXNzPSJjb250YWluZXIiIGlkPSJyMiI+PC9kaXY+PGRpdiBpZD0i b3ZlcnNldDIiPjwvZGl2PgoJCTxkaXYgY2xhc3M9ImNvbnRhaW5lciIgaWQ9InIzIj48L2Rpdj48 ZGl2IGlkPSJvdmVyc2V0MyI+PC9kaXY+CgkJPGRpdiBpZD0icGFzcyI+UEFTUzwvZGl2PgoJCTxk aXYgaWQ9ImZhaWwiPkZBSUw8L2Rpdj4KCQk8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+ CgkJCWlmKHdpbmRvdy50ZXN0UnVubmVyKQoJCQkJdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CgkJ CXZhciByMSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJyMSIpLndlYmtpdFJlZ2lvbk92ZXJz ZXQ7CgkJCWRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJvdmVyc2V0MSIpLmlubmVySFRNTCA9IHIx ICsgIiB2cyBmaXQiOwoJCQl2YXIgcjIgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicjIiKS53 ZWJraXRSZWdpb25PdmVyc2V0OwoJCQlkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgib3ZlcnNldDIi KS5pbm5lckhUTUwgPSByMiArICIgdnMgZW1wdHkiOwoJCQl2YXIgcjMgPSBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgicjMiKS53ZWJraXRSZWdpb25PdmVyc2V0OwoJCQlkb2N1bWVudC5nZXRFbGVt ZW50QnlJZCgib3ZlcnNldDMiKS5pbm5lckhUTUwgPSByMyArICIgdnMgZW1wdHkiOwoJCQlkb2N1 bWVudC5ib2R5LmNsYXNzTmFtZSA9IChyMSA9PSAiZml0IiAmJiByMiA9PSAiZW1wdHkiICYmIHIz ID09ICJlbXB0eSIpID8gInBhc3MiIDogImZhaWwiOwoJCTwvc2NyaXB0PgoKCTwvYm9keT4KPC9o dG1sPg== 190307 2013-02-26 09:31:02 -0800 2013-02-26 09:37:32 -0800 patch patch92497OversetBreak.diff text/plain 11474 mmaerean ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2M2RjNTdlLi4wMTdjNjdhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTMtMDIt MjYgIE1paGFpIE1hZXJlYW4gIDxtbWFlcmVhbkBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBS ZWdpb25zXSBSZWdpb24gb3ZlcnNldCBwcm9wZXJ0eSBpcyBub3QgcHJvcGVybHkgY29tcHV0ZWQg d2hlbiB0aGVyZSBpcyBhIHJlZ2lvbiBicmVhaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI0OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFrLWV4cGVjdGVk LnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9yZWdpb25zL292ZXJzZXQtYnJlYWstbmVzdGVk LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9yZWdpb25zL292ZXJzZXQtYnJl YWstbmVzdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvcmVnaW9ucy9vdmVyc2V0LWJy ZWFrLXdpdGgtc2libGluZy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvcmVn aW9ucy9vdmVyc2V0LWJyZWFrLXdpdGgtc2libGluZy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBm YXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay5odG1sOiBBZGRlZC4KKwogMjAxMy0wMi0yMCAgVnNl dm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiBUYWJiZWRFZGl0b3JDb250YWluZXIgYW5kIE9wZW5SZXNvdXJjZURpYWxvZyBzaG91bGQg c2hvdyB1aVNvdXJjZUNvZGUgcGF0aCBhbmQgbmFtZSBpbnN0ZWFkIG9mIHBhcnNlZFVSTApkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL292ZXJzZXQtYnJlYWstZXhwZWN0ZWQu dHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL292ZXJzZXQtYnJlYWstZXhwZWN0ZWQudHh0 Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmRjZDdmNTgKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay1leHBlY3RlZC50 eHQKQEAgLTAsMCArMSw4IEBACitCdWcgOTI0OTcgLSBbQ1NTIFJlZ2lvbnNdIFJlZ2lvbiBvdmVy c2V0IHByb3BlcnR5IGlzIG5vdCBwcm9wZXJseSBjb21wdXRlZCB3aGVuIHRoZXJlIGlzIGEgcmVn aW9uIGJyZWFrCisKK2NvbnRlbnQgd2l0aCBicmVhay1hZnRlcjogYWx3YXlzOworCitQQVNTCitm aXQgdnMgZml0CitlbXB0eSB2cyBlbXB0eQorZW1wdHkgdnMgZW1wdHkKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFrLW5lc3RlZC1leHBlY3RlZC50eHQg Yi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay1uZXN0ZWQtZXhwZWN0ZWQu dHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmRjZDdmNTgKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay1uZXN0ZWQt ZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsOCBAQAorQnVnIDkyNDk3IC0gW0NTUyBSZWdpb25zXSBS ZWdpb24gb3ZlcnNldCBwcm9wZXJ0eSBpcyBub3QgcHJvcGVybHkgY29tcHV0ZWQgd2hlbiB0aGVy ZSBpcyBhIHJlZ2lvbiBicmVhaworCitjb250ZW50IHdpdGggYnJlYWstYWZ0ZXI6IGFsd2F5czsK KworUEFTUworZml0IHZzIGZpdAorZW1wdHkgdnMgZW1wdHkKK2VtcHR5IHZzIGVtcHR5CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay1uZXN0ZWQuaHRt bCBiL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFrLW5lc3RlZC5odG1sCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY2OGE5YWYKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay1uZXN0ZWQuaHRtbApA QCAtMCwwICsxLDUxIEBACisKKzxodG1sPgorCTxoZWFkPgorCQk8dGl0bGU+QnVnIDkyNDk3IC0g W0NTUyBSZWdpb25zXSBSZWdpb24gb3ZlcnNldCBwcm9wZXJ0eSBpcyBub3QgcHJvcGVybHkgY29t cHV0ZWQgd2hlbiB0aGVyZSBpcyBhIHJlZ2lvbiBicmVhazwvdGl0bGU+CisJCTxzdHlsZSB0eXBl PSJ0ZXh0L2NzcyI+CisJCQkuY29udGVudCB7CisJCQkJLXdlYmtpdC1mbG93LWludG86IGZsb3c7 CisJCQkJYmFja2dyb3VuZC1jb2xvcjogI2VlZTsKKwkJCX0KKworCQkJLmNvbnRlbnQgcDpmaXJz dC1jaGlsZCB7CisJCQkJLXdlYmtpdC1yZWdpb24tYnJlYWstYWZ0ZXI6IGFsd2F5czsKKwkJCQlt YXJnaW4tdG9wOiAxNnB4OworCQkJCW1hcmdpbi1ib3R0b206IDM2cHg7CisJCQl9CisKKwkJCS5j b250YWluZXIgeworCQkJCS13ZWJraXQtZmxvdy1mcm9tOiBmbG93OworCQkJCXdpZHRoOjI1MHB4 OworCQkJCWhlaWdodDoxMjBweDsKKwkJCQlib3JkZXI6IDFweCBzb2xpZCAjNDQ0OworCQkJCW1h cmdpbi10b3A6IDFlbTsKKwkJCX0KKworCQkJI3Bhc3MgeyBjb2xvcjogIzRBNDsgbWFyZ2luLXRv cDogMmVtOyB9CisJCQkjZmFpbCB7IGNvbG9yOiAjQTQ0OyBtYXJnaW4tdG9wOiAyZW07IH0KKwkJ CS5mYWlsICNwYXNzLCAucGFzcyAjZmFpbCB7IGRpc3BsYXk6IG5vbmU7IH0KKwkJPC9zdHlsZT4K Kwk8L2hlYWQ+CisJPGJvZHk+CisJCTxwPjxhIGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD05MjQ5NyI+QnVnIDkyNDk3PC9hPiAtIFtDU1MgUmVnaW9uc10gUmVn aW9uIG92ZXJzZXQgcHJvcGVydHkgaXMgbm90IHByb3Blcmx5IGNvbXB1dGVkIHdoZW4gdGhlcmUg aXMgYSByZWdpb24gYnJlYWs8L3A+CisJCTxkaXYgY2xhc3M9ImNvbnRlbnQiPjxkaXY+PGRpdj48 cD5jb250ZW50IHdpdGggYnJlYWstYWZ0ZXI6IGFsd2F5czs8L3A+PC9kaXY+PC9kaXY+PC9kaXY+ CisJCTxkaXYgaWQ9InBhc3MiPlBBU1M8L2Rpdj4KKwkJPGRpdiBpZD0iZmFpbCI+RkFJTDwvZGl2 PgorCQk8ZGl2IGNsYXNzPSJjb250YWluZXIiIGlkPSJyMSI+PC9kaXY+PGRpdiBpZD0ib3ZlcnNl dDEiPjwvZGl2PgorCQk8ZGl2IGNsYXNzPSJjb250YWluZXIiIGlkPSJyMiI+PC9kaXY+PGRpdiBp ZD0ib3ZlcnNldDIiPjwvZGl2PgorCQk8ZGl2IGNsYXNzPSJjb250YWluZXIiIGlkPSJyMyI+PC9k aXY+PGRpdiBpZD0ib3ZlcnNldDMiPjwvZGl2PgorCQk8c2NyaXB0IHR5cGU9InRleHQvamF2YXNj cmlwdCI+CisJCQlpZih3aW5kb3cudGVzdFJ1bm5lcikKKwkJCQl0ZXN0UnVubmVyLmR1bXBBc1Rl eHQoKTsKKwkJCXZhciByMSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJyMSIpLndlYmtpdFJl Z2lvbk92ZXJzZXQ7CisJCQlkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgib3ZlcnNldDEiKS5pbm5l ckhUTUwgPSByMSArICIgdnMgZml0IjsKKwkJCXZhciByMiA9IGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCJyMiIpLndlYmtpdFJlZ2lvbk92ZXJzZXQ7CisJCQlkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgib3ZlcnNldDIiKS5pbm5lckhUTUwgPSByMiArICIgdnMgZW1wdHkiOworCQkJdmFyIHIzID0g ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInIzIikud2Via2l0UmVnaW9uT3ZlcnNldDsKKwkJCWRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCJvdmVyc2V0MyIpLmlubmVySFRNTCA9IHIzICsgIiB2cyBl bXB0eSI7CisJCQlkb2N1bWVudC5ib2R5LmNsYXNzTmFtZSA9IChyMSA9PSAiZml0IiAmJiByMiA9 PSAiZW1wdHkiICYmIHIzID09ICJlbXB0eSIpID8gInBhc3MiIDogImZhaWwiOworCQk8L3Njcmlw dD4KKworCTwvYm9keT4KKzwvaHRtbD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay13aXRoLXNpYmxp bmctZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL292ZXJzZXQtYnJlYWst d2l0aC1zaWJsaW5nLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwLi45ZTg5MGExCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25z L292ZXJzZXQtYnJlYWstd2l0aC1zaWJsaW5nLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDEwIEBA CitCdWcgOTI0OTcgLSBbQ1NTIFJlZ2lvbnNdIFJlZ2lvbiBvdmVyc2V0IHByb3BlcnR5IGlzIG5v dCBwcm9wZXJseSBjb21wdXRlZCB3aGVuIHRoZXJlIGlzIGEgcmVnaW9uIGJyZWFrCisKK2NvbnRl bnQgd2l0aCBicmVhay1hZnRlcjogYWx3YXlzOworCisybmQgcAorCitQQVNTCitmaXQgdnMgZml0 CitmaXQgdnMgZml0CitlbXB0eSB2cyBlbXB0eQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9yZWdpb25zL292ZXJzZXQtYnJlYWstd2l0aC1zaWJsaW5nLmh0bWwgYi9MYXlvdXRUZXN0cy9m YXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay13aXRoLXNpYmxpbmcuaHRtbApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwLi43M2U2NzVlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9yZWdpb25zL292ZXJzZXQtYnJlYWstd2l0aC1zaWJsaW5nLmh0bWwKQEAgLTAs MCArMSw1MSBAQAorPCFkb2N0eXBlIGh0bWw+Cis8aHRtbD4KKwk8aGVhZD4KKwkJPHRpdGxlPkJ1 ZyA5MjQ5NyAtIFtDU1MgUmVnaW9uc10gUmVnaW9uIG92ZXJzZXQgcHJvcGVydHkgaXMgbm90IHBy b3Blcmx5IGNvbXB1dGVkIHdoZW4gdGhlcmUgaXMgYSByZWdpb24gYnJlYWs8L3RpdGxlPgorCQk8 c3R5bGUgdHlwZT0idGV4dC9jc3MiPgorCQkJLmNvbnRlbnQgeworCQkJCS13ZWJraXQtZmxvdy1p bnRvOiBmbG93OworCQkJCWJhY2tncm91bmQtY29sb3I6ICNlZWU7CisJCQl9CisKKwkJCS5jb250 ZW50IHAgeworCQkJCS13ZWJraXQtcmVnaW9uLWJyZWFrLWFmdGVyOiBhbHdheXM7CisJCQkJbWFy Z2luLXRvcDogMTZweDsKKwkJCQltYXJnaW4tYm90dG9tOiAxNnB4OworCQkJfQorCisJCQkuY29u dGFpbmVyIHsKKwkJCQktd2Via2l0LWZsb3ctZnJvbTogZmxvdzsKKwkJCQl3aWR0aDoyNTBweDsK KwkJCQloZWlnaHQ6MTIwcHg7CisJCQkJYm9yZGVyOiAxcHggc29saWQgIzQ0NDsKKwkJCQltYXJn aW4tdG9wOiAxZW07CisJCQl9CisKKwkJCSNwYXNzIHsgY29sb3I6ICM0QTQ7IG1hcmdpbi10b3A6 IDJlbTsgfQorCQkJI2ZhaWwgeyBjb2xvcjogI0E0NDsgbWFyZ2luLXRvcDogMmVtOyB9CisJCQku ZmFpbCAjcGFzcywgLnBhc3MgI2ZhaWwgeyBkaXNwbGF5OiBub25lOyB9CisJCTwvc3R5bGU+CisJ PC9oZWFkPgorCTxib2R5PgorCQk8cD48YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9OTI0OTciPkJ1ZyA5MjQ5NzwvYT4gLSBbQ1NTIFJlZ2lvbnNdIFJlZ2lv biBvdmVyc2V0IHByb3BlcnR5IGlzIG5vdCBwcm9wZXJseSBjb21wdXRlZCB3aGVuIHRoZXJlIGlz IGEgcmVnaW9uIGJyZWFrPC9wPgorCQk8ZGl2IGNsYXNzPSJjb250ZW50Ij48cD5jb250ZW50IHdp dGggYnJlYWstYWZ0ZXI6IGFsd2F5czs8L3A+PHA+Mm5kIHA8L3A+PC9kaXY+CisJCTxkaXYgaWQ9 InBhc3MiPlBBU1M8L2Rpdj4KKwkJPGRpdiBpZD0iZmFpbCI+RkFJTDwvZGl2PgorCQk8ZGl2IGNs YXNzPSJjb250YWluZXIiIGlkPSJyMSI+PC9kaXY+PGRpdiBpZD0ib3ZlcnNldDEiPjwvZGl2Pgor CQk8ZGl2IGNsYXNzPSJjb250YWluZXIiIGlkPSJyMiI+PC9kaXY+PGRpdiBpZD0ib3ZlcnNldDIi PjwvZGl2PgorCQk8ZGl2IGNsYXNzPSJjb250YWluZXIiIGlkPSJyMyI+PC9kaXY+PGRpdiBpZD0i b3ZlcnNldDMiPjwvZGl2PgorCQk8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+CisJCQlp Zih3aW5kb3cudGVzdFJ1bm5lcikKKwkJCQl0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKwkJCXZh ciByMSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJyMSIpLndlYmtpdFJlZ2lvbk92ZXJzZXQ7 CisJCQlkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgib3ZlcnNldDEiKS5pbm5lckhUTUwgPSByMSAr ICIgdnMgZml0IjsKKwkJCXZhciByMiA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJyMiIpLndl YmtpdFJlZ2lvbk92ZXJzZXQ7CisJCQlkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgib3ZlcnNldDIi KS5pbm5lckhUTUwgPSByMiArICIgdnMgZml0IjsKKwkJCXZhciByMyA9IGRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCJyMyIpLndlYmtpdFJlZ2lvbk92ZXJzZXQ7CisJCQlkb2N1bWVudC5nZXRFbGVt ZW50QnlJZCgib3ZlcnNldDMiKS5pbm5lckhUTUwgPSByMyArICIgdnMgZW1wdHkiOworCQkJZG9j dW1lbnQuYm9keS5jbGFzc05hbWUgPSAocjEgPT0gImZpdCIgJiYgcjIgPT0gImZpdCIgJiYgcjMg PT0gImVtcHR5IikgPyAicGFzcyIgOiAiZmFpbCI7CisJCTwvc2NyaXB0PgorCisJPC9ib2R5Pgor PC9odG1sPgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFrLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3Jl Z2lvbnMvb3ZlcnNldC1icmVhay5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAuLjY3MDk3MjMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMv b3ZlcnNldC1icmVhay5odG1sCkBAIC0wLDAgKzEsNTEgQEAKKzwhZG9jdHlwZSBodG1sPgorPGh0 bWw+CisJPGhlYWQ+CisJCTx0aXRsZT5CdWcgOTI0OTcgLSBbQ1NTIFJlZ2lvbnNdIFJlZ2lvbiBv dmVyc2V0IHByb3BlcnR5IGlzIG5vdCBwcm9wZXJseSBjb21wdXRlZCB3aGVuIHRoZXJlIGlzIGEg cmVnaW9uIGJyZWFrPC90aXRsZT4KKwkJPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KKwkJCS5jb250 ZW50IHsKKwkJCQktd2Via2l0LWZsb3ctaW50bzogZmxvdzsKKwkJCQliYWNrZ3JvdW5kLWNvbG9y OiAjZWVlOworCQkJfQorCisJCQkuY29udGVudCBwOmZpcnN0LWNoaWxkIHsKKwkJCQktd2Via2l0 LXJlZ2lvbi1icmVhay1hZnRlcjogYWx3YXlzOworCQkJCW1hcmdpbi10b3A6IDE2cHg7CisJCQkJ bWFyZ2luLWJvdHRvbTogMTZweDsKKwkJCX0KKworCQkJLmNvbnRhaW5lciB7CisJCQkJLXdlYmtp dC1mbG93LWZyb206IGZsb3c7CisJCQkJd2lkdGg6MjUwcHg7CisJCQkJaGVpZ2h0OjEyMHB4Owor CQkJCWJvcmRlcjogMXB4IHNvbGlkICM0NDQ7CisJCQkJbWFyZ2luLXRvcDogMWVtOworCQkJfQor CisJCQkjcGFzcyB7IGNvbG9yOiAjNEE0OyBtYXJnaW4tdG9wOiAyZW07IH0KKwkJCSNmYWlsIHsg Y29sb3I6ICNBNDQ7IG1hcmdpbi10b3A6IDJlbTsgfQorCQkJLmZhaWwgI3Bhc3MsIC5wYXNzICNm YWlsIHsgZGlzcGxheTogbm9uZTsgfQorCQk8L3N0eWxlPgorCTwvaGVhZD4KKwk8Ym9keT4KKwkJ PHA+PGEgaHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyNDk3 Ij5CdWcgOTI0OTc8L2E+IC0gW0NTUyBSZWdpb25zXSBSZWdpb24gb3ZlcnNldCBwcm9wZXJ0eSBp cyBub3QgcHJvcGVybHkgY29tcHV0ZWQgd2hlbiB0aGVyZSBpcyBhIHJlZ2lvbiBicmVhazwvcD4K KwkJPGRpdiBjbGFzcz0iY29udGVudCI+PHA+Y29udGVudCB3aXRoIGJyZWFrLWFmdGVyOiBhbHdh eXM7PC9wPjwvZGl2PgorCQk8ZGl2IGlkPSJwYXNzIj5QQVNTPC9kaXY+CisJCTxkaXYgaWQ9ImZh aWwiPkZBSUw8L2Rpdj4KKwkJPGRpdiBjbGFzcz0iY29udGFpbmVyIiBpZD0icjEiPjwvZGl2Pjxk aXYgaWQ9Im92ZXJzZXQxIj48L2Rpdj4KKwkJPGRpdiBjbGFzcz0iY29udGFpbmVyIiBpZD0icjIi PjwvZGl2PjxkaXYgaWQ9Im92ZXJzZXQyIj48L2Rpdj4KKwkJPGRpdiBjbGFzcz0iY29udGFpbmVy IiBpZD0icjMiPjwvZGl2PjxkaXYgaWQ9Im92ZXJzZXQzIj48L2Rpdj4KKwkJPHNjcmlwdCB0eXBl PSJ0ZXh0L2phdmFzY3JpcHQiPgorCQkJaWYod2luZG93LnRlc3RSdW5uZXIpCisJCQkJdGVzdFJ1 bm5lci5kdW1wQXNUZXh0KCk7CisJCQl2YXIgcjEgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgi cjEiKS53ZWJraXRSZWdpb25PdmVyc2V0OworCQkJZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm92 ZXJzZXQxIikuaW5uZXJIVE1MID0gcjEgKyAiIHZzIGZpdCI7CisJCQl2YXIgcjIgPSBkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgicjIiKS53ZWJraXRSZWdpb25PdmVyc2V0OworCQkJZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoIm92ZXJzZXQyIikuaW5uZXJIVE1MID0gcjIgKyAiIHZzIGVtcHR5IjsK KwkJCXZhciByMyA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJyMyIpLndlYmtpdFJlZ2lvbk92 ZXJzZXQ7CisJCQlkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgib3ZlcnNldDMiKS5pbm5lckhUTUwg PSByMyArICIgdnMgZW1wdHkiOworCQkJZG9jdW1lbnQuYm9keS5jbGFzc05hbWUgPSAocjEgPT0g ImZpdCIgJiYgcjIgPT0gImVtcHR5IiAmJiByMyA9PSAiZW1wdHkiKSA/ICJwYXNzIiA6ICJmYWls IjsKKwkJPC9zY3JpcHQ+CisKKwk8L2JvZHk+Cis8L2h0bWw+ClwgTm8gbmV3bGluZSBhdCBlbmQg b2YgZmlsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCmluZGV4IDc3MDYyNGMuLmExYjViZjcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMyBAQAorMjAxMy0wMi0yNiAgTWloYWkgTWFlcmVhbiAgPG1tYWVyZWFuQGFkb2JlLmNv bT4KKworICAgICAgICBbQ1NTIFJlZ2lvbnNdIFJlZ2lvbiBvdmVyc2V0IHByb3BlcnR5IGlzIG5v dCBwcm9wZXJseSBjb21wdXRlZCB3aGVuIHRoZXJlIGlzIGEgcmVnaW9uIGJyZWFrCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjQ5NworCisgICAgICAg IEZvciAicGFnaW5hdGVkIiBjb250ZW50IGluIHJlZ2lvbnMgdGhhdCBoYXMgLXdlYmtpdC1yZWdp b24tYnJlYWstYWZ0ZXI6YWx3YXlzLCB0aGUgYm90dG9tIG1hcmdpbiB3YXMgYmVpbmcgcGFzc2Vk CisgICAgICAgIGFsb25nIGZvciB0aGUgbmV4dCByZWdpb24gaW4gdGhlIGNoYWluLCB3aGljaCBz aG91bGRuJ3QgaGFwcGVuLgorCisgICAgICAgIFRoZSBmaXggaXMsIGF0IGxheW91dCwgdG8gY2xl YXIgdGhlIGJvdHRvbSBtYXJnaW4gZm9yIHRoZSBub2RlcyAoaW5zaWRlIHBhZ2luYXRlZCBjb250 ZXh0cykgdGhhdCBoYXZlCisgICAgICAgIC13ZWJraXQtcmVnaW9uLWJyZWFrLWFmdGVyOmFsd2F5 cy4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0 czogZmFzdC9yZWdpb25zL292ZXJzZXQtYnJlYWstbmVzdGVkLmh0bWwKKyAgICAgICAgICAgICAg IGZhc3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFrLXdpdGgtc2libGluZy5odG1sCisgICAgICAgICAg ICAgICBmYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay5odG1sCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmFwcGx5 QWZ0ZXJCcmVhayk6CisKIDIwMTMtMDItMjAgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogVGFiYmVkRWRpdG9yQ29udGFpbmVy IGFuZCBPcGVuUmVzb3VyY2VEaWFsb2cgc2hvdWxkIHNob3cgdWlTb3VyY2VDb2RlIHBhdGggYW5k IG5hbWUgaW5zdGVhZCBvZiBwYXJzZWRVUkwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9jay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2suY3BwCmluZGV4IDhjMWQxMWYuLjU3MTExMWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrLmNwcApAQCAtNzI2NiwxMSArNzI2NiwxNCBAQCBMYXlvdXRVbml0IFJl bmRlckJsb2NrOjphcHBseUFmdGVyQnJlYWsoUmVuZGVyQm94KiBjaGlsZCwgTGF5b3V0VW5pdCBs b2dpY2FsT2ZmcwogICAgIGJvb2wgY2hlY2tBZnRlckFsd2F5cyA9IChjaGVja0NvbHVtbkJyZWFr cyAmJiBjaGlsZC0+c3R5bGUoKS0+Y29sdW1uQnJlYWtBZnRlcigpID09IFBCQUxXQVlTKSB8fCAo Y2hlY2tQYWdlQnJlYWtzICYmIGNoaWxkLT5zdHlsZSgpLT5wYWdlQnJlYWtBZnRlcigpID09IFBC QUxXQVlTKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHx8IChjaGVja1JlZ2lvbkJyZWFr cyAmJiBjaGlsZC0+c3R5bGUoKS0+cmVnaW9uQnJlYWtBZnRlcigpID09IFBCQUxXQVlTKTsKICAg ICBpZiAoY2hlY2tBZnRlckFsd2F5cyAmJiBpbk5vcm1hbEZsb3coY2hpbGQpICYmIGhhc05leHRQ YWdlKGxvZ2ljYWxPZmZzZXQsIEluY2x1ZGVQYWdlQm91bmRhcnkpKSB7Ci0gICAgICAgIG1hcmdp bkluZm8uc2V0TWFyZ2luQWZ0ZXJRdWlyayh0cnVlKTsgLy8gQ2F1c2UgbWFyZ2lucyB0byBiZSBk aXNjYXJkZWQgZm9yIGFueSBmb2xsb3dpbmcgY29udGVudC4KKyAgICAgICAgTGF5b3V0VW5pdCBt YXJnaW5PZmZzZXQgPSBtYXJnaW5JbmZvLmNhbkNvbGxhcHNlV2l0aE1hcmdpbkJlZm9yZSgpID8g TGF5b3V0VW5pdCgpIDogbWFyZ2luSW5mby5tYXJnaW4oKTsKKworICAgICAgICAvLyBTbyBvdXIg bWFyZ2luIGRvZXNuJ3QgcGFydGljaXBhdGUgaW4gdGhlIG5leHQgY29sbGFwc2luZyBzdGVwcy4K KyAgICAgICAgbWFyZ2luSW5mby5jbGVhck1hcmdpbigpOworCiAgICAgICAgIGlmIChjaGVja0Nv bHVtbkJyZWFrcykKICAgICAgICAgICAgIHZpZXcoKS0+bGF5b3V0U3RhdGUoKS0+YWRkRm9yY2Vk Q29sdW1uQnJlYWsoY2hpbGQsIGxvZ2ljYWxPZmZzZXQpOwogICAgICAgICBpZiAoY2hlY2tSZWdp b25CcmVha3MpIHsKLSAgICAgICAgICAgIExheW91dFVuaXQgbWFyZ2luT2Zmc2V0ID0gbWFyZ2lu SW5mby5jYW5Db2xsYXBzZVdpdGhNYXJnaW5CZWZvcmUoKSA/IExheW91dFVuaXQoKSA6IG1hcmdp bkluZm8ubWFyZ2luKCk7CiAgICAgICAgICAgICBMYXlvdXRVbml0IG9mZnNldEJyZWFrQWRqdXN0 bWVudCA9IDA7CiAgICAgICAgICAgICBpZiAoZW5jbG9zaW5nUmVuZGVyRmxvd1RocmVhZCgpLT5h ZGRGb3JjZWRSZWdpb25CcmVhayhvZmZzZXRGcm9tTG9naWNhbFRvcE9mRmlyc3RQYWdlKCkgKyBs b2dpY2FsT2Zmc2V0ICsgbWFyZ2luT2Zmc2V0LCBjaGlsZCwgZmFsc2UsICZvZmZzZXRCcmVha0Fk anVzdG1lbnQpKQogICAgICAgICAgICAgICAgIHJldHVybiBsb2dpY2FsT2Zmc2V0ICsgb2Zmc2V0 QnJlYWtBZGp1c3RtZW50Owo= 190496 2013-02-27 05:41:28 -0800 2013-02-27 06:08:43 -0800 Incorporated Dave Hyatt's feedback to add a test of columns. patch92497OversetBreak.diff text/plain 13918 mmaerean ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2M2RjNTdlLi42YzNiNzA4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTMtMDIt MjcgIE1paGFpIE1hZXJlYW4gIDxtbWFlcmVhbkBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBS ZWdpb25zXSBSZWdpb24gb3ZlcnNldCBwcm9wZXJ0eSBpcyBub3QgcHJvcGVybHkgY29tcHV0ZWQg d2hlbiB0aGVyZSBpcyBhIHJlZ2lvbiBicmVhaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI0OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvbXVsdGljb2wvYnJlYWstYWZ0ZXItYWx3YXlzLWJv dHRvbS1tYXJnaW4tZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L211bHRpY29s L2JyZWFrLWFmdGVyLWFsd2F5cy1ib3R0b20tbWFyZ2luLmh0bWw6IEFkZGVkLgorICAgICAgICAq IGZhc3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFrLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAg ICogZmFzdC9yZWdpb25zL292ZXJzZXQtYnJlYWstbmVzdGVkLWV4cGVjdGVkLnR4dDogQWRkZWQu CisgICAgICAgICogZmFzdC9yZWdpb25zL292ZXJzZXQtYnJlYWstbmVzdGVkLmh0bWw6IEFkZGVk LgorICAgICAgICAqIGZhc3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFrLXdpdGgtc2libGluZy1leHBl Y3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFrLXdp dGgtc2libGluZy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3JlZ2lvbnMvb3ZlcnNldC1i cmVhay5odG1sOiBBZGRlZC4KKwogMjAxMy0wMi0yMCAgVnNldm9sb2QgVmxhc292ICA8dnNldmlr QGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBUYWJiZWRFZGl0b3JDb250 YWluZXIgYW5kIE9wZW5SZXNvdXJjZURpYWxvZyBzaG91bGQgc2hvdyB1aVNvdXJjZUNvZGUgcGF0 aCBhbmQgbmFtZSBpbnN0ZWFkIG9mIHBhcnNlZFVSTApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC9tdWx0aWNvbC9icmVhay1hZnRlci1hbHdheXMtYm90dG9tLW1hcmdpbi1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL2JyZWFrLWFmdGVyLWFsd2F5cy1ib3R0b20t bWFyZ2luLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43 Mzg5YTYxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9icmVh ay1hZnRlci1hbHdheXMtYm90dG9tLW1hcmdpbi1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw2IEBA CitUaGlzIGlzIHNvbWUgdGV4dCB3aXRoIGJvdHRvbSBtYXJnaW4gYW5kIGZvcmNlZCBicmVhayBh ZnRlci4KKworVGhpcyBwYXJhZ3JhcGggc2hvdWxkIGJlIGFsaWduZWQgd2l0aCB0aGUgb3RoZXIg cGFyYWdyYXBoIGJlY2F1c2UgdGhlIDFzdCBwYXJhZ3JhcGgncyBib3R0b20gbWFyZ2luIHNob3Vs ZG4ndCBzcGlsbCBvdmVyIHRoZSBmb3JjZWQgYnJlYWsuCisKK1BBU1MKK0J1ZyA5MjQ5NyAtIFtD U1MgUmVnaW9uc10gUmVnaW9uIG92ZXJzZXQgcHJvcGVydHkgaXMgbm90IHByb3Blcmx5IGNvbXB1 dGVkIHdoZW4gdGhlcmUgaXMgYSByZWdpb24gYnJlYWsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvbXVsdGljb2wvYnJlYWstYWZ0ZXItYWx3YXlzLWJvdHRvbS1tYXJnaW4uaHRtbCBiL0xh eW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvYnJlYWstYWZ0ZXItYWx3YXlzLWJvdHRvbS1tYXJnaW4u aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45YTRhMmIzCi0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9icmVhay1hZnRlci1hbHdheXMt Ym90dG9tLW1hcmdpbi5odG1sCkBAIC0wLDAgKzEsMzkgQEAKKzwhZG9jdHlwZSBodG1sPgorPGh0 bWw+CisJPGhlYWQ+CisJCTx0aXRsZT5CdWcgOTI0OTcgLSBbQ1NTIFJlZ2lvbnNdIFJlZ2lvbiBv dmVyc2V0IHByb3BlcnR5IGlzIG5vdCBwcm9wZXJseSBjb21wdXRlZCB3aGVuIHRoZXJlIGlzIGEg cmVnaW9uIGJyZWFrPC90aXRsZT4KKwkJPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KKworCQkJLmNv bHVtbnMgeworCQkJCS13ZWJraXQtY29sdW1uLWNvdW50OjI7CisJCQkJd2lkdGg6MjUwcHg7CisJ CQl9CisKKwkJCS5jb2x1bW5zIHA6Zmlyc3QtY2hpbGQgeworCQkJCS13ZWJraXQtY29sdW1uLWJy ZWFrLWFmdGVyOiBhbHdheXM7CisJCQkJbWFyZ2luLWJvdHRvbTogMTBlbTsgLypzaG91bGRuJ3Qg c3BpbGwgb3ZlciB0aGUgZm9yY2VkIGJyZWFrKi8KKwkJCX0KKworCQkJLmZhaWwgI3Bhc3MsIC5w YXNzICNmYWlsIHsgZGlzcGxheTogbm9uZTsgfQorCQk8L3N0eWxlPgorCTwvaGVhZD4KKworCTxi b2R5PgorCQk8ZGl2IGNsYXNzPSJjb2x1bW5zIj4KKwkJCTxwPlRoaXMgaXMgc29tZSB0ZXh0IHdp dGggYm90dG9tIG1hcmdpbiBhbmQgZm9yY2VkIGJyZWFrIGFmdGVyLjwvcD4KKwkJCTxwPlRoaXMg cGFyYWdyYXBoIHNob3VsZCBiZSBhbGlnbmVkIHdpdGggdGhlIG90aGVyIHBhcmFncmFwaCBiZWNh dXNlIHRoZSAxc3QgcGFyYWdyYXBoJ3MgYm90dG9tIG1hcmdpbiBzaG91bGRuJ3Qgc3BpbGwgb3Zl ciB0aGUgZm9yY2VkIGJyZWFrLjwvcD4KKwkJPC9kaXY+CisKKwkJPHNjcmlwdCB0eXBlPSJ0ZXh0 L2phdmFzY3JpcHQiPgorCQkJaWYod2luZG93LnRlc3RSdW5uZXIpCisJCQkJdGVzdFJ1bm5lci5k dW1wQXNUZXh0KCk7CisJCQlkb2N1bWVudC5ib2R5LmNsYXNzTmFtZSA9IGRvY3VtZW50LnF1ZXJ5 U2VsZWN0b3IoIi5jb2x1bW5zIHA6bnRoLWNoaWxkKDIpIikub2Zmc2V0VG9wID09IGRvY3VtZW50 LnF1ZXJ5U2VsZWN0b3IoIi5jb2x1bW5zIHA6Zmlyc3QtY2hpbGQiKS5vZmZzZXRUb3AgPyAicGFz cyIgOiAiZmFpbCI7CisJCTwvc2NyaXB0PgorCisJCTxkaXYgaWQ9InBhc3MiPlBBU1M8L2Rpdj4K KwkJPGRpdiBpZD0iZmFpbCI+RkFJTDwvZGl2PgorCisJCTxwPjxhIGhyZWY9Imh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjQ5NyI+QnVnIDkyNDk3PC9hPiAtIFtDU1Mg UmVnaW9uc10gUmVnaW9uIG92ZXJzZXQgcHJvcGVydHkgaXMgbm90IHByb3Blcmx5IGNvbXB1dGVk IHdoZW4gdGhlcmUgaXMgYSByZWdpb24gYnJlYWs8L3A+CisKKwk8L2JvZHk+Cis8L2h0bWw+Clwg Tm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9y ZWdpb25zL292ZXJzZXQtYnJlYWstZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdp b25zL292ZXJzZXQtYnJlYWstZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAuLjRiODI4N2QKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3Jl Z2lvbnMvb3ZlcnNldC1icmVhay1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw3IEBACitjb250ZW50 IHdpdGggYnJlYWstYWZ0ZXI6IGFsd2F5czsKKworZml0IHZzIGZpdAorZW1wdHkgdnMgZW1wdHkK K2VtcHR5IHZzIGVtcHR5CitQQVNTCitCdWcgOTI0OTcgLSBbQ1NTIFJlZ2lvbnNdIFJlZ2lvbiBv dmVyc2V0IHByb3BlcnR5IGlzIG5vdCBwcm9wZXJseSBjb21wdXRlZCB3aGVuIHRoZXJlIGlzIGEg cmVnaW9uIGJyZWFrCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNl dC1icmVhay1uZXN0ZWQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL292 ZXJzZXQtYnJlYWstbmVzdGVkLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwLi40YjgyODdkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9y ZWdpb25zL292ZXJzZXQtYnJlYWstbmVzdGVkLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDcgQEAK K2NvbnRlbnQgd2l0aCBicmVhay1hZnRlcjogYWx3YXlzOworCitmaXQgdnMgZml0CitlbXB0eSB2 cyBlbXB0eQorZW1wdHkgdnMgZW1wdHkKK1BBU1MKK0J1ZyA5MjQ5NyAtIFtDU1MgUmVnaW9uc10g UmVnaW9uIG92ZXJzZXQgcHJvcGVydHkgaXMgbm90IHByb3Blcmx5IGNvbXB1dGVkIHdoZW4gdGhl cmUgaXMgYSByZWdpb24gYnJlYWsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9u cy9vdmVyc2V0LWJyZWFrLW5lc3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL292 ZXJzZXQtYnJlYWstbmVzdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MC4uMGMwMDRmMwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9v dmVyc2V0LWJyZWFrLW5lc3RlZC5odG1sCkBAIC0wLDAgKzEsNTMgQEAKKworPGh0bWw+CisJPGhl YWQ+CisJCTx0aXRsZT5CdWcgOTI0OTcgLSBbQ1NTIFJlZ2lvbnNdIFJlZ2lvbiBvdmVyc2V0IHBy b3BlcnR5IGlzIG5vdCBwcm9wZXJseSBjb21wdXRlZCB3aGVuIHRoZXJlIGlzIGEgcmVnaW9uIGJy ZWFrPC90aXRsZT4KKwkJPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KKwkJCS5jb250ZW50IHsKKwkJ CQktd2Via2l0LWZsb3ctaW50bzogZmxvdzsKKwkJCQliYWNrZ3JvdW5kLWNvbG9yOiAjZGRkOwor CQkJfQorCisJCQkuY29udGVudCBwOmZpcnN0LWNoaWxkIHsKKwkJCQktd2Via2l0LXJlZ2lvbi1i cmVhay1hZnRlcjogYWx3YXlzOworCQkJCW1hcmdpbi1ib3R0b206IDRlbTsgLypzaG91bGRuJ3Qg c3BpbGwgb3ZlciB0aGUgZm9yY2VkIGJyZWFrKi8KKwkJCX0KKworCQkJLmNvbnRhaW5lciB7CisJ CQkJLXdlYmtpdC1mbG93LWZyb206IGZsb3c7CisJCQkJd2lkdGg6MjUwcHg7CisJCQkJaGVpZ2h0 OjEyMHB4OworCQkJCWJvcmRlcjogMXB4IHNvbGlkICM0NDQ7CisJCQkJbWFyZ2luLXRvcDogMWVt OworCQkJfQorCisJCQkuZmFpbCAjcGFzcywgLnBhc3MgI2ZhaWwgeyBkaXNwbGF5OiBub25lOyB9 CisJCTwvc3R5bGU+CisJPC9oZWFkPgorCisJPGJvZHk+CisJCTxkaXYgY2xhc3M9ImNvbnRlbnQi PjxkaXY+PGRpdj48cD5jb250ZW50IHdpdGggYnJlYWstYWZ0ZXI6IGFsd2F5czs8L3A+PC9kaXY+ PC9kaXY+PC9kaXY+CisKKwkJPGRpdiBjbGFzcz0iY29udGFpbmVyIiBpZD0icjEiPjwvZGl2PiA8 ZGl2IGlkPSJvdmVyc2V0MSI+ZXhwbGFuYXRpb24gZ29lcyBoZXJlPC9kaXY+CisJCTxkaXYgY2xh c3M9ImNvbnRhaW5lciIgaWQ9InIyIj48L2Rpdj4gPGRpdiBpZD0ib3ZlcnNldDIiPmV4cGxhbmF0 aW9uIGdvZXMgaGVyZTwvZGl2PgorCQk8ZGl2IGNsYXNzPSJjb250YWluZXIiIGlkPSJyMyI+PC9k aXY+IDxkaXYgaWQ9Im92ZXJzZXQzIj5leHBsYW5hdGlvbiBnb2VzIGhlcmU8L2Rpdj4KKworCQk8 c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+CisJCQlpZih3aW5kb3cudGVzdFJ1bm5lcikK KwkJCQl0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKwkJCXZhciByMSA9IGRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCJyMSIpLndlYmtpdFJlZ2lvbk92ZXJzZXQ7CisJCQlkb2N1bWVudC5nZXRFbGVt ZW50QnlJZCgib3ZlcnNldDEiKS5pbm5lckhUTUwgPSByMSArICIgdnMgZml0IjsKKwkJCXZhciBy MiA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJyMiIpLndlYmtpdFJlZ2lvbk92ZXJzZXQ7CisJ CQlkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgib3ZlcnNldDIiKS5pbm5lckhUTUwgPSByMiArICIg dnMgZW1wdHkiOworCQkJdmFyIHIzID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInIzIikud2Vi a2l0UmVnaW9uT3ZlcnNldDsKKwkJCWRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJvdmVyc2V0MyIp LmlubmVySFRNTCA9IHIzICsgIiB2cyBlbXB0eSI7CisJCQlkb2N1bWVudC5ib2R5LmNsYXNzTmFt ZSA9IChyMSA9PSAiZml0IiAmJiByMiA9PSAiZW1wdHkiICYmIHIzID09ICJlbXB0eSIpID8gInBh c3MiIDogImZhaWwiOworCQk8L3NjcmlwdD4KKworCQk8ZGl2IGlkPSJwYXNzIj5QQVNTPC9kaXY+ CisJCTxkaXYgaWQ9ImZhaWwiPkZBSUw8L2Rpdj4KKworCQk8cD48YSBocmVmPSJodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI0OTciPkJ1ZyA5MjQ5NzwvYT4gLSBbQ1NT IFJlZ2lvbnNdIFJlZ2lvbiBvdmVyc2V0IHByb3BlcnR5IGlzIG5vdCBwcm9wZXJseSBjb21wdXRl ZCB3aGVuIHRoZXJlIGlzIGEgcmVnaW9uIGJyZWFrPC9wPgorCisJPC9ib2R5PgorPC9odG1sPgpc IE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qv cmVnaW9ucy9vdmVyc2V0LWJyZWFrLXdpdGgtc2libGluZy1leHBlY3RlZC50eHQgYi9MYXlvdXRU ZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay13aXRoLXNpYmxpbmctZXhwZWN0ZWQudHh0 Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmE1OGYwZTMKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay13aXRoLXNpYmxp bmctZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsOSBAQAorY29udGVudCB3aXRoIGJyZWFrLWFmdGVy OiBhbHdheXM7CisKKzJuZCBwCisKK2ZpdCB2cyBmaXQKK2ZpdCB2cyBmaXQKK2VtcHR5IHZzIGVt cHR5CitQQVNTCitCdWcgOTI0OTcgLSBbQ1NTIFJlZ2lvbnNdIFJlZ2lvbiBvdmVyc2V0IHByb3Bl cnR5IGlzIG5vdCBwcm9wZXJseSBjb21wdXRlZCB3aGVuIHRoZXJlIGlzIGEgcmVnaW9uIGJyZWFr CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay13aXRo LXNpYmxpbmcuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFrLXdp dGgtc2libGluZy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmQyNzg4 MzAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1i cmVhay13aXRoLXNpYmxpbmcuaHRtbApAQCAtMCwwICsxLDUyIEBACis8IWRvY3R5cGUgaHRtbD4K KzxodG1sPgorCTxoZWFkPgorCQk8dGl0bGU+QnVnIDkyNDk3IC0gW0NTUyBSZWdpb25zXSBSZWdp b24gb3ZlcnNldCBwcm9wZXJ0eSBpcyBub3QgcHJvcGVybHkgY29tcHV0ZWQgd2hlbiB0aGVyZSBp cyBhIHJlZ2lvbiBicmVhazwvdGl0bGU+CisJCTxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CisJCQku Y29udGVudCB7CisJCQkJLXdlYmtpdC1mbG93LWludG86IGZsb3c7CisJCQkJYmFja2dyb3VuZC1j b2xvcjogI2RkZDsKKwkJCX0KKworCQkJLmNvbnRlbnQgcCB7CisJCQkJLXdlYmtpdC1yZWdpb24t YnJlYWstYWZ0ZXI6IGFsd2F5czsKKwkJCQltYXJnaW4tYm90dG9tOiA0ZW07IC8qc2hvdWxkbid0 IHNwaWxsIG92ZXIgdGhlIGZvcmNlZCBicmVhayovCisJCQl9CisKKwkJCS5jb250YWluZXIgewor CQkJCS13ZWJraXQtZmxvdy1mcm9tOiBmbG93OworCQkJCXdpZHRoOjI1MHB4OworCQkJCWhlaWdo dDoxMjBweDsKKwkJCQlib3JkZXI6IDFweCBzb2xpZCAjNDQ0OworCQkJCW1hcmdpbi10b3A6IDFl bTsKKwkJCX0KKworCQkJLmZhaWwgI3Bhc3MsIC5wYXNzICNmYWlsIHsgZGlzcGxheTogbm9uZTsg fQorCQk8L3N0eWxlPgorCTwvaGVhZD4KKwk8Ym9keT4KKwkJPGRpdiBjbGFzcz0iY29udGVudCI+ PHA+Y29udGVudCB3aXRoIGJyZWFrLWFmdGVyOiBhbHdheXM7PC9wPjxwPjJuZCBwPC9wPjwvZGl2 PgorCisJCTxkaXYgY2xhc3M9ImNvbnRhaW5lciIgaWQ9InIxIj48L2Rpdj4gPGRpdiBpZD0ib3Zl cnNldDEiPmV4cGxhbmF0aW9uIGdvZXMgaGVyZTwvZGl2PgorCQk8ZGl2IGNsYXNzPSJjb250YWlu ZXIiIGlkPSJyMiI+PC9kaXY+IDxkaXYgaWQ9Im92ZXJzZXQyIj5leHBsYW5hdGlvbiBnb2VzIGhl cmU8L2Rpdj4KKwkJPGRpdiBjbGFzcz0iY29udGFpbmVyIiBpZD0icjMiPjwvZGl2PiA8ZGl2IGlk PSJvdmVyc2V0MyI+ZXhwbGFuYXRpb24gZ29lcyBoZXJlPC9kaXY+CisKKwkJPHNjcmlwdCB0eXBl PSJ0ZXh0L2phdmFzY3JpcHQiPgorCQkJaWYod2luZG93LnRlc3RSdW5uZXIpCisJCQkJdGVzdFJ1 bm5lci5kdW1wQXNUZXh0KCk7CisJCQl2YXIgcjEgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgi cjEiKS53ZWJraXRSZWdpb25PdmVyc2V0OworCQkJZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm92 ZXJzZXQxIikuaW5uZXJIVE1MID0gcjEgKyAiIHZzIGZpdCI7CisJCQl2YXIgcjIgPSBkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgicjIiKS53ZWJraXRSZWdpb25PdmVyc2V0OworCQkJZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoIm92ZXJzZXQyIikuaW5uZXJIVE1MID0gcjIgKyAiIHZzIGZpdCI7CisJ CQl2YXIgcjMgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicjMiKS53ZWJraXRSZWdpb25PdmVy c2V0OworCQkJZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm92ZXJzZXQzIikuaW5uZXJIVE1MID0g cjMgKyAiIHZzIGVtcHR5IjsKKwkJCWRvY3VtZW50LmJvZHkuY2xhc3NOYW1lID0gKHIxID09ICJm aXQiICYmIHIyID09ICJmaXQiICYmIHIzID09ICJlbXB0eSIpID8gInBhc3MiIDogImZhaWwiOwor CQk8L3NjcmlwdD4KKworCQk8ZGl2IGlkPSJwYXNzIj5QQVNTPC9kaXY+CisJCTxkaXYgaWQ9ImZh aWwiPkZBSUw8L2Rpdj4KKworCQk8cD48YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9OTI0OTciPkJ1ZyA5MjQ5NzwvYT4gLSBbQ1NTIFJlZ2lvbnNdIFJlZ2lv biBvdmVyc2V0IHByb3BlcnR5IGlzIG5vdCBwcm9wZXJseSBjb21wdXRlZCB3aGVuIHRoZXJlIGlz IGEgcmVnaW9uIGJyZWFrPC9wPgorCisJPC9ib2R5PgorPC9odG1sPgpcIE5vIG5ld2xpbmUgYXQg ZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9vdmVyc2V0 LWJyZWFrLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay5odG1s Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjc1OTI2MGQKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay5odG1sCkBAIC0w LDAgKzEsNTMgQEAKKzwhZG9jdHlwZSBodG1sPgorPGh0bWw+CisJPGhlYWQ+CisJCTx0aXRsZT5C dWcgOTI0OTcgLSBbQ1NTIFJlZ2lvbnNdIFJlZ2lvbiBvdmVyc2V0IHByb3BlcnR5IGlzIG5vdCBw cm9wZXJseSBjb21wdXRlZCB3aGVuIHRoZXJlIGlzIGEgcmVnaW9uIGJyZWFrPC90aXRsZT4KKwkJ PHN0eWxlIHR5cGU9InRleHQvY3NzIj4KKwkJCS5jb250ZW50IHsKKwkJCQktd2Via2l0LWZsb3ct aW50bzogZmxvdzsKKwkJCQliYWNrZ3JvdW5kLWNvbG9yOiAjZGRkOworCQkJfQorCisJCQkuY29u dGVudCBwOmZpcnN0LWNoaWxkIHsKKwkJCQktd2Via2l0LXJlZ2lvbi1icmVhay1hZnRlcjogYWx3 YXlzOworCQkJCW1hcmdpbi1ib3R0b206IDRlbTsgLypzaG91bGRuJ3Qgc3BpbGwgb3ZlciB0aGUg Zm9yY2VkIGJyZWFrKi8KKwkJCX0KKworCQkJLmNvbnRhaW5lciB7CisJCQkJLXdlYmtpdC1mbG93 LWZyb206IGZsb3c7CisJCQkJd2lkdGg6MjUwcHg7CisJCQkJaGVpZ2h0OjEyMHB4OworCQkJCWJv cmRlcjogMXB4IHNvbGlkICM0NDQ7CisJCQkJbWFyZ2luLXRvcDogMWVtOworCQkJfQorCisJCQku ZmFpbCAjcGFzcywgLnBhc3MgI2ZhaWwgeyBkaXNwbGF5OiBub25lOyB9CisJCTwvc3R5bGU+CisJ PC9oZWFkPgorCisJPGJvZHk+CisJCTxkaXYgY2xhc3M9ImNvbnRlbnQiPjxwPmNvbnRlbnQgd2l0 aCBicmVhay1hZnRlcjogYWx3YXlzOzwvcD48L2Rpdj4KKworCQk8ZGl2IGNsYXNzPSJjb250YWlu ZXIiIGlkPSJyMSI+PC9kaXY+IDxkaXYgaWQ9Im92ZXJzZXQxIj5leHBsYW5hdGlvbiBnb2VzIGhl cmU8L2Rpdj4KKwkJPGRpdiBjbGFzcz0iY29udGFpbmVyIiBpZD0icjIiPjwvZGl2PiA8ZGl2IGlk PSJvdmVyc2V0MiI+ZXhwbGFuYXRpb24gZ29lcyBoZXJlPC9kaXY+CisJCTxkaXYgY2xhc3M9ImNv bnRhaW5lciIgaWQ9InIzIj48L2Rpdj4gPGRpdiBpZD0ib3ZlcnNldDMiPmV4cGxhbmF0aW9uIGdv ZXMgaGVyZTwvZGl2PgorCisJCTxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KKwkJCWlm KHdpbmRvdy50ZXN0UnVubmVyKQorCQkJCXRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworCQkJdmFy IHIxID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInIxIikud2Via2l0UmVnaW9uT3ZlcnNldDsK KwkJCWRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJvdmVyc2V0MSIpLmlubmVySFRNTCA9IHIxICsg IiB2cyBmaXQiOworCQkJdmFyIHIyID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInIyIikud2Vi a2l0UmVnaW9uT3ZlcnNldDsKKwkJCWRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJvdmVyc2V0MiIp LmlubmVySFRNTCA9IHIyICsgIiB2cyBlbXB0eSI7CisJCQl2YXIgcjMgPSBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgicjMiKS53ZWJraXRSZWdpb25PdmVyc2V0OworCQkJZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoIm92ZXJzZXQzIikuaW5uZXJIVE1MID0gcjMgKyAiIHZzIGVtcHR5IjsKKwkJCWRv Y3VtZW50LmJvZHkuY2xhc3NOYW1lID0gKHIxID09ICJmaXQiICYmIHIyID09ICJlbXB0eSIgJiYg cjMgPT0gImVtcHR5IikgPyAicGFzcyIgOiAiZmFpbCI7CisJCTwvc2NyaXB0PgorCisJCTxkaXYg aWQ9InBhc3MiPlBBU1M8L2Rpdj4KKwkJPGRpdiBpZD0iZmFpbCI+RkFJTDwvZGl2PgorCisJCTxw PjxhIGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjQ5NyI+ QnVnIDkyNDk3PC9hPiAtIFtDU1MgUmVnaW9uc10gUmVnaW9uIG92ZXJzZXQgcHJvcGVydHkgaXMg bm90IHByb3Blcmx5IGNvbXB1dGVkIHdoZW4gdGhlcmUgaXMgYSByZWdpb24gYnJlYWs8L3A+CisK Kwk8L2JvZHk+Cis8L2h0bWw+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IDc3MDYyNGMuLmNhNGE3ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMy0w Mi0yNyAgTWloYWkgTWFlcmVhbiAgPG1tYWVyZWFuQGFkb2JlLmNvbT4KKworICAgICAgICBbQ1NT IFJlZ2lvbnNdIFJlZ2lvbiBvdmVyc2V0IHByb3BlcnR5IGlzIG5vdCBwcm9wZXJseSBjb21wdXRl ZCB3aGVuIHRoZXJlIGlzIGEgcmVnaW9uIGJyZWFrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjQ5NworCisgICAgICAgIEZvciAicGFnaW5hdGVkIiBj b250ZW50IGluIHJlZ2lvbnMgdGhhdCBoYXMgLXdlYmtpdC1yZWdpb24tYnJlYWstYWZ0ZXI6YWx3 YXlzLCB0aGUgYm90dG9tIG1hcmdpbiB3YXMgYmVpbmcgcGFzc2VkCisgICAgICAgIGFsb25nIGZv ciB0aGUgbmV4dCByZWdpb24gaW4gdGhlIGNoYWluLCB3aGljaCBzaG91bGRuJ3QgaGFwcGVuLgor CisgICAgICAgIFRoZSBmaXggaXMsIGF0IGxheW91dCwgdG8gY2xlYXIgdGhlIGJvdHRvbSBtYXJn aW4gZm9yIHRoZSBub2RlcyAoaW5zaWRlIHBhZ2luYXRlZCBjb250ZXh0cykgdGhhdCBoYXZlCisg ICAgICAgIC13ZWJraXQtcmVnaW9uLWJyZWFrLWFmdGVyOmFsd2F5cy4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0czogZmFzdC9tdWx0aWNvbC9i cmVhay1hZnRlci1hbHdheXMtYm90dG9tLW1hcmdpbi5odG1sCisgICAgICAgICAgICAgICBmYXN0 L3JlZ2lvbnMvb3ZlcnNldC1icmVhay1uZXN0ZWQuaHRtbAorICAgICAgICAgICAgICAgZmFzdC9y ZWdpb25zL292ZXJzZXQtYnJlYWstd2l0aC1zaWJsaW5nLmh0bWwKKyAgICAgICAgICAgICAgIGZh c3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFrLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6YXBwbHlBZnRlckJy ZWFrKToKKwogMjAxMy0wMi0yMCAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBUYWJiZWRFZGl0b3JDb250YWluZXIgYW5kIE9w ZW5SZXNvdXJjZURpYWxvZyBzaG91bGQgc2hvdyB1aVNvdXJjZUNvZGUgcGF0aCBhbmQgbmFtZSBp bnN0ZWFkIG9mIHBhcnNlZFVSTApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5j cHAKaW5kZXggOGMxZDExZi4uNTcxMTExYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2suY3BwCkBAIC03MjY2LDExICs3MjY2LDE0IEBAIExheW91dFVuaXQgUmVuZGVyQmxv Y2s6OmFwcGx5QWZ0ZXJCcmVhayhSZW5kZXJCb3gqIGNoaWxkLCBMYXlvdXRVbml0IGxvZ2ljYWxP ZmZzCiAgICAgYm9vbCBjaGVja0FmdGVyQWx3YXlzID0gKGNoZWNrQ29sdW1uQnJlYWtzICYmIGNo aWxkLT5zdHlsZSgpLT5jb2x1bW5CcmVha0FmdGVyKCkgPT0gUEJBTFdBWVMpIHx8IChjaGVja1Bh Z2VCcmVha3MgJiYgY2hpbGQtPnN0eWxlKCktPnBhZ2VCcmVha0FmdGVyKCkgPT0gUEJBTFdBWVMp CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfHwgKGNoZWNrUmVnaW9uQnJlYWtzICYmIGNo aWxkLT5zdHlsZSgpLT5yZWdpb25CcmVha0FmdGVyKCkgPT0gUEJBTFdBWVMpOwogICAgIGlmIChj aGVja0FmdGVyQWx3YXlzICYmIGluTm9ybWFsRmxvdyhjaGlsZCkgJiYgaGFzTmV4dFBhZ2UobG9n aWNhbE9mZnNldCwgSW5jbHVkZVBhZ2VCb3VuZGFyeSkpIHsKLSAgICAgICAgbWFyZ2luSW5mby5z ZXRNYXJnaW5BZnRlclF1aXJrKHRydWUpOyAvLyBDYXVzZSBtYXJnaW5zIHRvIGJlIGRpc2NhcmRl ZCBmb3IgYW55IGZvbGxvd2luZyBjb250ZW50LgorICAgICAgICBMYXlvdXRVbml0IG1hcmdpbk9m ZnNldCA9IG1hcmdpbkluZm8uY2FuQ29sbGFwc2VXaXRoTWFyZ2luQmVmb3JlKCkgPyBMYXlvdXRV bml0KCkgOiBtYXJnaW5JbmZvLm1hcmdpbigpOworCisgICAgICAgIC8vIFNvIG91ciBtYXJnaW4g ZG9lc24ndCBwYXJ0aWNpcGF0ZSBpbiB0aGUgbmV4dCBjb2xsYXBzaW5nIHN0ZXBzLgorICAgICAg ICBtYXJnaW5JbmZvLmNsZWFyTWFyZ2luKCk7CisKICAgICAgICAgaWYgKGNoZWNrQ29sdW1uQnJl YWtzKQogICAgICAgICAgICAgdmlldygpLT5sYXlvdXRTdGF0ZSgpLT5hZGRGb3JjZWRDb2x1bW5C cmVhayhjaGlsZCwgbG9naWNhbE9mZnNldCk7CiAgICAgICAgIGlmIChjaGVja1JlZ2lvbkJyZWFr cykgewotICAgICAgICAgICAgTGF5b3V0VW5pdCBtYXJnaW5PZmZzZXQgPSBtYXJnaW5JbmZvLmNh bkNvbGxhcHNlV2l0aE1hcmdpbkJlZm9yZSgpID8gTGF5b3V0VW5pdCgpIDogbWFyZ2luSW5mby5t YXJnaW4oKTsKICAgICAgICAgICAgIExheW91dFVuaXQgb2Zmc2V0QnJlYWtBZGp1c3RtZW50ID0g MDsKICAgICAgICAgICAgIGlmIChlbmNsb3NpbmdSZW5kZXJGbG93VGhyZWFkKCktPmFkZEZvcmNl ZFJlZ2lvbkJyZWFrKG9mZnNldEZyb21Mb2dpY2FsVG9wT2ZGaXJzdFBhZ2UoKSArIGxvZ2ljYWxP ZmZzZXQgKyBtYXJnaW5PZmZzZXQsIGNoaWxkLCBmYWxzZSwgJm9mZnNldEJyZWFrQWRqdXN0bWVu dCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGxvZ2ljYWxPZmZzZXQgKyBvZmZzZXRCcmVha0Fk anVzdG1lbnQ7Cg== 190501 2013-02-27 06:08:43 -0800 2013-02-27 06:26:27 -0800 Incorporated Dave Hyatt's feedback to add a test of columns. Also Reviewed by David Hyatt in ChangeLogs. patch92497OversetBreak.diff text/plain 13912 mmaerean ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2M2RjNTdlLi4wNzg2OTE2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTMtMDIt MjcgIE1paGFpIE1hZXJlYW4gIDxtbWFlcmVhbkBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBS ZWdpb25zXSBSZWdpb24gb3ZlcnNldCBwcm9wZXJ0eSBpcyBub3QgcHJvcGVybHkgY29tcHV0ZWQg d2hlbiB0aGVyZSBpcyBhIHJlZ2lvbiBicmVhaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI0OTcKKworICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBI eWF0dC4KKworICAgICAgICAqIGZhc3QvbXVsdGljb2wvYnJlYWstYWZ0ZXItYWx3YXlzLWJvdHRv bS1tYXJnaW4tZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L211bHRpY29sL2Jy ZWFrLWFmdGVyLWFsd2F5cy1ib3R0b20tbWFyZ2luLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZh c3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFrLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICog ZmFzdC9yZWdpb25zL292ZXJzZXQtYnJlYWstbmVzdGVkLWV4cGVjdGVkLnR4dDogQWRkZWQuCisg ICAgICAgICogZmFzdC9yZWdpb25zL292ZXJzZXQtYnJlYWstbmVzdGVkLmh0bWw6IEFkZGVkLgor ICAgICAgICAqIGZhc3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFrLXdpdGgtc2libGluZy1leHBlY3Rl ZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFrLXdpdGgt c2libGluZy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVh ay5odG1sOiBBZGRlZC4KKwogMjAxMy0wMi0yMCAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBUYWJiZWRFZGl0b3JDb250YWlu ZXIgYW5kIE9wZW5SZXNvdXJjZURpYWxvZyBzaG91bGQgc2hvdyB1aVNvdXJjZUNvZGUgcGF0aCBh bmQgbmFtZSBpbnN0ZWFkIG9mIHBhcnNlZFVSTApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9tdWx0aWNvbC9icmVhay1hZnRlci1hbHdheXMtYm90dG9tLW1hcmdpbi1leHBlY3RlZC50eHQg Yi9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL2JyZWFrLWFmdGVyLWFsd2F5cy1ib3R0b20tbWFy Z2luLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43Mzg5 YTYxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9icmVhay1h ZnRlci1hbHdheXMtYm90dG9tLW1hcmdpbi1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw2IEBACitU aGlzIGlzIHNvbWUgdGV4dCB3aXRoIGJvdHRvbSBtYXJnaW4gYW5kIGZvcmNlZCBicmVhayBhZnRl ci4KKworVGhpcyBwYXJhZ3JhcGggc2hvdWxkIGJlIGFsaWduZWQgd2l0aCB0aGUgb3RoZXIgcGFy YWdyYXBoIGJlY2F1c2UgdGhlIDFzdCBwYXJhZ3JhcGgncyBib3R0b20gbWFyZ2luIHNob3VsZG4n dCBzcGlsbCBvdmVyIHRoZSBmb3JjZWQgYnJlYWsuCisKK1BBU1MKK0J1ZyA5MjQ5NyAtIFtDU1Mg UmVnaW9uc10gUmVnaW9uIG92ZXJzZXQgcHJvcGVydHkgaXMgbm90IHByb3Blcmx5IGNvbXB1dGVk IHdoZW4gdGhlcmUgaXMgYSByZWdpb24gYnJlYWsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvbXVsdGljb2wvYnJlYWstYWZ0ZXItYWx3YXlzLWJvdHRvbS1tYXJnaW4uaHRtbCBiL0xheW91 dFRlc3RzL2Zhc3QvbXVsdGljb2wvYnJlYWstYWZ0ZXItYWx3YXlzLWJvdHRvbS1tYXJnaW4uaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45YTRhMmIzCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9icmVhay1hZnRlci1hbHdheXMtYm90 dG9tLW1hcmdpbi5odG1sCkBAIC0wLDAgKzEsMzkgQEAKKzwhZG9jdHlwZSBodG1sPgorPGh0bWw+ CisJPGhlYWQ+CisJCTx0aXRsZT5CdWcgOTI0OTcgLSBbQ1NTIFJlZ2lvbnNdIFJlZ2lvbiBvdmVy c2V0IHByb3BlcnR5IGlzIG5vdCBwcm9wZXJseSBjb21wdXRlZCB3aGVuIHRoZXJlIGlzIGEgcmVn aW9uIGJyZWFrPC90aXRsZT4KKwkJPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KKworCQkJLmNvbHVt bnMgeworCQkJCS13ZWJraXQtY29sdW1uLWNvdW50OjI7CisJCQkJd2lkdGg6MjUwcHg7CisJCQl9 CisKKwkJCS5jb2x1bW5zIHA6Zmlyc3QtY2hpbGQgeworCQkJCS13ZWJraXQtY29sdW1uLWJyZWFr LWFmdGVyOiBhbHdheXM7CisJCQkJbWFyZ2luLWJvdHRvbTogMTBlbTsgLypzaG91bGRuJ3Qgc3Bp bGwgb3ZlciB0aGUgZm9yY2VkIGJyZWFrKi8KKwkJCX0KKworCQkJLmZhaWwgI3Bhc3MsIC5wYXNz ICNmYWlsIHsgZGlzcGxheTogbm9uZTsgfQorCQk8L3N0eWxlPgorCTwvaGVhZD4KKworCTxib2R5 PgorCQk8ZGl2IGNsYXNzPSJjb2x1bW5zIj4KKwkJCTxwPlRoaXMgaXMgc29tZSB0ZXh0IHdpdGgg Ym90dG9tIG1hcmdpbiBhbmQgZm9yY2VkIGJyZWFrIGFmdGVyLjwvcD4KKwkJCTxwPlRoaXMgcGFy YWdyYXBoIHNob3VsZCBiZSBhbGlnbmVkIHdpdGggdGhlIG90aGVyIHBhcmFncmFwaCBiZWNhdXNl IHRoZSAxc3QgcGFyYWdyYXBoJ3MgYm90dG9tIG1hcmdpbiBzaG91bGRuJ3Qgc3BpbGwgb3ZlciB0 aGUgZm9yY2VkIGJyZWFrLjwvcD4KKwkJPC9kaXY+CisKKwkJPHNjcmlwdCB0eXBlPSJ0ZXh0L2ph dmFzY3JpcHQiPgorCQkJaWYod2luZG93LnRlc3RSdW5uZXIpCisJCQkJdGVzdFJ1bm5lci5kdW1w QXNUZXh0KCk7CisJCQlkb2N1bWVudC5ib2R5LmNsYXNzTmFtZSA9IGRvY3VtZW50LnF1ZXJ5U2Vs ZWN0b3IoIi5jb2x1bW5zIHA6bnRoLWNoaWxkKDIpIikub2Zmc2V0VG9wID09IGRvY3VtZW50LnF1 ZXJ5U2VsZWN0b3IoIi5jb2x1bW5zIHA6Zmlyc3QtY2hpbGQiKS5vZmZzZXRUb3AgPyAicGFzcyIg OiAiZmFpbCI7CisJCTwvc2NyaXB0PgorCisJCTxkaXYgaWQ9InBhc3MiPlBBU1M8L2Rpdj4KKwkJ PGRpdiBpZD0iZmFpbCI+RkFJTDwvZGl2PgorCisJCTxwPjxhIGhyZWY9Imh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjQ5NyI+QnVnIDkyNDk3PC9hPiAtIFtDU1MgUmVn aW9uc10gUmVnaW9uIG92ZXJzZXQgcHJvcGVydHkgaXMgbm90IHByb3Blcmx5IGNvbXB1dGVkIHdo ZW4gdGhlcmUgaXMgYSByZWdpb24gYnJlYWs8L3A+CisKKwk8L2JvZHk+Cis8L2h0bWw+ClwgTm8g bmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9yZWdp b25zL292ZXJzZXQtYnJlYWstZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25z L292ZXJzZXQtYnJlYWstZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAuLjRiODI4N2QKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lv bnMvb3ZlcnNldC1icmVhay1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw3IEBACitjb250ZW50IHdp dGggYnJlYWstYWZ0ZXI6IGFsd2F5czsKKworZml0IHZzIGZpdAorZW1wdHkgdnMgZW1wdHkKK2Vt cHR5IHZzIGVtcHR5CitQQVNTCitCdWcgOTI0OTcgLSBbQ1NTIFJlZ2lvbnNdIFJlZ2lvbiBvdmVy c2V0IHByb3BlcnR5IGlzIG5vdCBwcm9wZXJseSBjb21wdXRlZCB3aGVuIHRoZXJlIGlzIGEgcmVn aW9uIGJyZWFrCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1i cmVhay1uZXN0ZWQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL292ZXJz ZXQtYnJlYWstbmVzdGVkLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwLi40YjgyODdkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdp b25zL292ZXJzZXQtYnJlYWstbmVzdGVkLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDcgQEAKK2Nv bnRlbnQgd2l0aCBicmVhay1hZnRlcjogYWx3YXlzOworCitmaXQgdnMgZml0CitlbXB0eSB2cyBl bXB0eQorZW1wdHkgdnMgZW1wdHkKK1BBU1MKK0J1ZyA5MjQ5NyAtIFtDU1MgUmVnaW9uc10gUmVn aW9uIG92ZXJzZXQgcHJvcGVydHkgaXMgbm90IHByb3Blcmx5IGNvbXB1dGVkIHdoZW4gdGhlcmUg aXMgYSByZWdpb24gYnJlYWsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9v dmVyc2V0LWJyZWFrLW5lc3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL292ZXJz ZXQtYnJlYWstbmVzdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4u MGMwMDRmMwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9vdmVy c2V0LWJyZWFrLW5lc3RlZC5odG1sCkBAIC0wLDAgKzEsNTMgQEAKKworPGh0bWw+CisJPGhlYWQ+ CisJCTx0aXRsZT5CdWcgOTI0OTcgLSBbQ1NTIFJlZ2lvbnNdIFJlZ2lvbiBvdmVyc2V0IHByb3Bl cnR5IGlzIG5vdCBwcm9wZXJseSBjb21wdXRlZCB3aGVuIHRoZXJlIGlzIGEgcmVnaW9uIGJyZWFr PC90aXRsZT4KKwkJPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KKwkJCS5jb250ZW50IHsKKwkJCQkt d2Via2l0LWZsb3ctaW50bzogZmxvdzsKKwkJCQliYWNrZ3JvdW5kLWNvbG9yOiAjZGRkOworCQkJ fQorCisJCQkuY29udGVudCBwOmZpcnN0LWNoaWxkIHsKKwkJCQktd2Via2l0LXJlZ2lvbi1icmVh ay1hZnRlcjogYWx3YXlzOworCQkJCW1hcmdpbi1ib3R0b206IDRlbTsgLypzaG91bGRuJ3Qgc3Bp bGwgb3ZlciB0aGUgZm9yY2VkIGJyZWFrKi8KKwkJCX0KKworCQkJLmNvbnRhaW5lciB7CisJCQkJ LXdlYmtpdC1mbG93LWZyb206IGZsb3c7CisJCQkJd2lkdGg6MjUwcHg7CisJCQkJaGVpZ2h0OjEy MHB4OworCQkJCWJvcmRlcjogMXB4IHNvbGlkICM0NDQ7CisJCQkJbWFyZ2luLXRvcDogMWVtOwor CQkJfQorCisJCQkuZmFpbCAjcGFzcywgLnBhc3MgI2ZhaWwgeyBkaXNwbGF5OiBub25lOyB9CisJ CTwvc3R5bGU+CisJPC9oZWFkPgorCisJPGJvZHk+CisJCTxkaXYgY2xhc3M9ImNvbnRlbnQiPjxk aXY+PGRpdj48cD5jb250ZW50IHdpdGggYnJlYWstYWZ0ZXI6IGFsd2F5czs8L3A+PC9kaXY+PC9k aXY+PC9kaXY+CisKKwkJPGRpdiBjbGFzcz0iY29udGFpbmVyIiBpZD0icjEiPjwvZGl2PiA8ZGl2 IGlkPSJvdmVyc2V0MSI+ZXhwbGFuYXRpb24gZ29lcyBoZXJlPC9kaXY+CisJCTxkaXYgY2xhc3M9 ImNvbnRhaW5lciIgaWQ9InIyIj48L2Rpdj4gPGRpdiBpZD0ib3ZlcnNldDIiPmV4cGxhbmF0aW9u IGdvZXMgaGVyZTwvZGl2PgorCQk8ZGl2IGNsYXNzPSJjb250YWluZXIiIGlkPSJyMyI+PC9kaXY+ IDxkaXYgaWQ9Im92ZXJzZXQzIj5leHBsYW5hdGlvbiBnb2VzIGhlcmU8L2Rpdj4KKworCQk8c2Ny aXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+CisJCQlpZih3aW5kb3cudGVzdFJ1bm5lcikKKwkJ CQl0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKwkJCXZhciByMSA9IGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCJyMSIpLndlYmtpdFJlZ2lvbk92ZXJzZXQ7CisJCQlkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgib3ZlcnNldDEiKS5pbm5lckhUTUwgPSByMSArICIgdnMgZml0IjsKKwkJCXZhciByMiA9 IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJyMiIpLndlYmtpdFJlZ2lvbk92ZXJzZXQ7CisJCQlk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgib3ZlcnNldDIiKS5pbm5lckhUTUwgPSByMiArICIgdnMg ZW1wdHkiOworCQkJdmFyIHIzID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInIzIikud2Via2l0 UmVnaW9uT3ZlcnNldDsKKwkJCWRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJvdmVyc2V0MyIpLmlu bmVySFRNTCA9IHIzICsgIiB2cyBlbXB0eSI7CisJCQlkb2N1bWVudC5ib2R5LmNsYXNzTmFtZSA9 IChyMSA9PSAiZml0IiAmJiByMiA9PSAiZW1wdHkiICYmIHIzID09ICJlbXB0eSIpID8gInBhc3Mi IDogImZhaWwiOworCQk8L3NjcmlwdD4KKworCQk8ZGl2IGlkPSJwYXNzIj5QQVNTPC9kaXY+CisJ CTxkaXYgaWQ9ImZhaWwiPkZBSUw8L2Rpdj4KKworCQk8cD48YSBocmVmPSJodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI0OTciPkJ1ZyA5MjQ5NzwvYT4gLSBbQ1NTIFJl Z2lvbnNdIFJlZ2lvbiBvdmVyc2V0IHByb3BlcnR5IGlzIG5vdCBwcm9wZXJseSBjb21wdXRlZCB3 aGVuIHRoZXJlIGlzIGEgcmVnaW9uIGJyZWFrPC9wPgorCisJPC9ib2R5PgorPC9odG1sPgpcIE5v IG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvcmVn aW9ucy9vdmVyc2V0LWJyZWFrLXdpdGgtc2libGluZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay13aXRoLXNpYmxpbmctZXhwZWN0ZWQudHh0Cm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmE1OGYwZTMKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay13aXRoLXNpYmxpbmct ZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsOSBAQAorY29udGVudCB3aXRoIGJyZWFrLWFmdGVyOiBh bHdheXM7CisKKzJuZCBwCisKK2ZpdCB2cyBmaXQKK2ZpdCB2cyBmaXQKK2VtcHR5IHZzIGVtcHR5 CitQQVNTCitCdWcgOTI0OTcgLSBbQ1NTIFJlZ2lvbnNdIFJlZ2lvbiBvdmVyc2V0IHByb3BlcnR5 IGlzIG5vdCBwcm9wZXJseSBjb21wdXRlZCB3aGVuIHRoZXJlIGlzIGEgcmVnaW9uIGJyZWFrCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay13aXRoLXNp YmxpbmcuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFrLXdpdGgt c2libGluZy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmQyNzg4MzAK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVh ay13aXRoLXNpYmxpbmcuaHRtbApAQCAtMCwwICsxLDUyIEBACis8IWRvY3R5cGUgaHRtbD4KKzxo dG1sPgorCTxoZWFkPgorCQk8dGl0bGU+QnVnIDkyNDk3IC0gW0NTUyBSZWdpb25zXSBSZWdpb24g b3ZlcnNldCBwcm9wZXJ0eSBpcyBub3QgcHJvcGVybHkgY29tcHV0ZWQgd2hlbiB0aGVyZSBpcyBh IHJlZ2lvbiBicmVhazwvdGl0bGU+CisJCTxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CisJCQkuY29u dGVudCB7CisJCQkJLXdlYmtpdC1mbG93LWludG86IGZsb3c7CisJCQkJYmFja2dyb3VuZC1jb2xv cjogI2RkZDsKKwkJCX0KKworCQkJLmNvbnRlbnQgcCB7CisJCQkJLXdlYmtpdC1yZWdpb24tYnJl YWstYWZ0ZXI6IGFsd2F5czsKKwkJCQltYXJnaW4tYm90dG9tOiA0ZW07IC8qc2hvdWxkbid0IHNw aWxsIG92ZXIgdGhlIGZvcmNlZCBicmVhayovCisJCQl9CisKKwkJCS5jb250YWluZXIgeworCQkJ CS13ZWJraXQtZmxvdy1mcm9tOiBmbG93OworCQkJCXdpZHRoOjI1MHB4OworCQkJCWhlaWdodDox MjBweDsKKwkJCQlib3JkZXI6IDFweCBzb2xpZCAjNDQ0OworCQkJCW1hcmdpbi10b3A6IDFlbTsK KwkJCX0KKworCQkJLmZhaWwgI3Bhc3MsIC5wYXNzICNmYWlsIHsgZGlzcGxheTogbm9uZTsgfQor CQk8L3N0eWxlPgorCTwvaGVhZD4KKwk8Ym9keT4KKwkJPGRpdiBjbGFzcz0iY29udGVudCI+PHA+ Y29udGVudCB3aXRoIGJyZWFrLWFmdGVyOiBhbHdheXM7PC9wPjxwPjJuZCBwPC9wPjwvZGl2Pgor CisJCTxkaXYgY2xhc3M9ImNvbnRhaW5lciIgaWQ9InIxIj48L2Rpdj4gPGRpdiBpZD0ib3ZlcnNl dDEiPmV4cGxhbmF0aW9uIGdvZXMgaGVyZTwvZGl2PgorCQk8ZGl2IGNsYXNzPSJjb250YWluZXIi IGlkPSJyMiI+PC9kaXY+IDxkaXYgaWQ9Im92ZXJzZXQyIj5leHBsYW5hdGlvbiBnb2VzIGhlcmU8 L2Rpdj4KKwkJPGRpdiBjbGFzcz0iY29udGFpbmVyIiBpZD0icjMiPjwvZGl2PiA8ZGl2IGlkPSJv dmVyc2V0MyI+ZXhwbGFuYXRpb24gZ29lcyBoZXJlPC9kaXY+CisKKwkJPHNjcmlwdCB0eXBlPSJ0 ZXh0L2phdmFzY3JpcHQiPgorCQkJaWYod2luZG93LnRlc3RSdW5uZXIpCisJCQkJdGVzdFJ1bm5l ci5kdW1wQXNUZXh0KCk7CisJCQl2YXIgcjEgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicjEi KS53ZWJraXRSZWdpb25PdmVyc2V0OworCQkJZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm92ZXJz ZXQxIikuaW5uZXJIVE1MID0gcjEgKyAiIHZzIGZpdCI7CisJCQl2YXIgcjIgPSBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgicjIiKS53ZWJraXRSZWdpb25PdmVyc2V0OworCQkJZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoIm92ZXJzZXQyIikuaW5uZXJIVE1MID0gcjIgKyAiIHZzIGZpdCI7CisJCQl2 YXIgcjMgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicjMiKS53ZWJraXRSZWdpb25PdmVyc2V0 OworCQkJZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm92ZXJzZXQzIikuaW5uZXJIVE1MID0gcjMg KyAiIHZzIGVtcHR5IjsKKwkJCWRvY3VtZW50LmJvZHkuY2xhc3NOYW1lID0gKHIxID09ICJmaXQi ICYmIHIyID09ICJmaXQiICYmIHIzID09ICJlbXB0eSIpID8gInBhc3MiIDogImZhaWwiOworCQk8 L3NjcmlwdD4KKworCQk8ZGl2IGlkPSJwYXNzIj5QQVNTPC9kaXY+CisJCTxkaXYgaWQ9ImZhaWwi PkZBSUw8L2Rpdj4KKworCQk8cD48YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTI0OTciPkJ1ZyA5MjQ5NzwvYT4gLSBbQ1NTIFJlZ2lvbnNdIFJlZ2lvbiBv dmVyc2V0IHByb3BlcnR5IGlzIG5vdCBwcm9wZXJseSBjb21wdXRlZCB3aGVuIHRoZXJlIGlzIGEg cmVnaW9uIGJyZWFrPC9wPgorCisJPC9ib2R5PgorPC9odG1sPgpcIE5vIG5ld2xpbmUgYXQgZW5k IG9mIGZpbGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9vdmVyc2V0LWJy ZWFrLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay5odG1sCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjc1OTI2MGQKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay5odG1sCkBAIC0wLDAg KzEsNTMgQEAKKzwhZG9jdHlwZSBodG1sPgorPGh0bWw+CisJPGhlYWQ+CisJCTx0aXRsZT5CdWcg OTI0OTcgLSBbQ1NTIFJlZ2lvbnNdIFJlZ2lvbiBvdmVyc2V0IHByb3BlcnR5IGlzIG5vdCBwcm9w ZXJseSBjb21wdXRlZCB3aGVuIHRoZXJlIGlzIGEgcmVnaW9uIGJyZWFrPC90aXRsZT4KKwkJPHN0 eWxlIHR5cGU9InRleHQvY3NzIj4KKwkJCS5jb250ZW50IHsKKwkJCQktd2Via2l0LWZsb3ctaW50 bzogZmxvdzsKKwkJCQliYWNrZ3JvdW5kLWNvbG9yOiAjZGRkOworCQkJfQorCisJCQkuY29udGVu dCBwOmZpcnN0LWNoaWxkIHsKKwkJCQktd2Via2l0LXJlZ2lvbi1icmVhay1hZnRlcjogYWx3YXlz OworCQkJCW1hcmdpbi1ib3R0b206IDRlbTsgLypzaG91bGRuJ3Qgc3BpbGwgb3ZlciB0aGUgZm9y Y2VkIGJyZWFrKi8KKwkJCX0KKworCQkJLmNvbnRhaW5lciB7CisJCQkJLXdlYmtpdC1mbG93LWZy b206IGZsb3c7CisJCQkJd2lkdGg6MjUwcHg7CisJCQkJaGVpZ2h0OjEyMHB4OworCQkJCWJvcmRl cjogMXB4IHNvbGlkICM0NDQ7CisJCQkJbWFyZ2luLXRvcDogMWVtOworCQkJfQorCisJCQkuZmFp bCAjcGFzcywgLnBhc3MgI2ZhaWwgeyBkaXNwbGF5OiBub25lOyB9CisJCTwvc3R5bGU+CisJPC9o ZWFkPgorCisJPGJvZHk+CisJCTxkaXYgY2xhc3M9ImNvbnRlbnQiPjxwPmNvbnRlbnQgd2l0aCBi cmVhay1hZnRlcjogYWx3YXlzOzwvcD48L2Rpdj4KKworCQk8ZGl2IGNsYXNzPSJjb250YWluZXIi IGlkPSJyMSI+PC9kaXY+IDxkaXYgaWQ9Im92ZXJzZXQxIj5leHBsYW5hdGlvbiBnb2VzIGhlcmU8 L2Rpdj4KKwkJPGRpdiBjbGFzcz0iY29udGFpbmVyIiBpZD0icjIiPjwvZGl2PiA8ZGl2IGlkPSJv dmVyc2V0MiI+ZXhwbGFuYXRpb24gZ29lcyBoZXJlPC9kaXY+CisJCTxkaXYgY2xhc3M9ImNvbnRh aW5lciIgaWQ9InIzIj48L2Rpdj4gPGRpdiBpZD0ib3ZlcnNldDMiPmV4cGxhbmF0aW9uIGdvZXMg aGVyZTwvZGl2PgorCisJCTxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KKwkJCWlmKHdp bmRvdy50ZXN0UnVubmVyKQorCQkJCXRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworCQkJdmFyIHIx ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInIxIikud2Via2l0UmVnaW9uT3ZlcnNldDsKKwkJ CWRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJvdmVyc2V0MSIpLmlubmVySFRNTCA9IHIxICsgIiB2 cyBmaXQiOworCQkJdmFyIHIyID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInIyIikud2Via2l0 UmVnaW9uT3ZlcnNldDsKKwkJCWRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJvdmVyc2V0MiIpLmlu bmVySFRNTCA9IHIyICsgIiB2cyBlbXB0eSI7CisJCQl2YXIgcjMgPSBkb2N1bWVudC5nZXRFbGVt ZW50QnlJZCgicjMiKS53ZWJraXRSZWdpb25PdmVyc2V0OworCQkJZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoIm92ZXJzZXQzIikuaW5uZXJIVE1MID0gcjMgKyAiIHZzIGVtcHR5IjsKKwkJCWRvY3Vt ZW50LmJvZHkuY2xhc3NOYW1lID0gKHIxID09ICJmaXQiICYmIHIyID09ICJlbXB0eSIgJiYgcjMg PT0gImVtcHR5IikgPyAicGFzcyIgOiAiZmFpbCI7CisJCTwvc2NyaXB0PgorCisJCTxkaXYgaWQ9 InBhc3MiPlBBU1M8L2Rpdj4KKwkJPGRpdiBpZD0iZmFpbCI+RkFJTDwvZGl2PgorCisJCTxwPjxh IGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjQ5NyI+QnVn IDkyNDk3PC9hPiAtIFtDU1MgUmVnaW9uc10gUmVnaW9uIG92ZXJzZXQgcHJvcGVydHkgaXMgbm90 IHByb3Blcmx5IGNvbXB1dGVkIHdoZW4gdGhlcmUgaXMgYSByZWdpb24gYnJlYWs8L3A+CisKKwk8 L2JvZHk+Cis8L2h0bWw+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4 IDc3MDYyNGMuLjA0OTM2YmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMy0wMi0y NyAgTWloYWkgTWFlcmVhbiAgPG1tYWVyZWFuQGFkb2JlLmNvbT4KKworICAgICAgICBbQ1NTIFJl Z2lvbnNdIFJlZ2lvbiBvdmVyc2V0IHByb3BlcnR5IGlzIG5vdCBwcm9wZXJseSBjb21wdXRlZCB3 aGVuIHRoZXJlIGlzIGEgcmVnaW9uIGJyZWFrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD05MjQ5NworCisgICAgICAgIEZvciAicGFnaW5hdGVkIiBjb250 ZW50IGluIHJlZ2lvbnMgdGhhdCBoYXMgLXdlYmtpdC1yZWdpb24tYnJlYWstYWZ0ZXI6YWx3YXlz LCB0aGUgYm90dG9tIG1hcmdpbiB3YXMgYmVpbmcgcGFzc2VkCisgICAgICAgIGFsb25nIGZvciB0 aGUgbmV4dCByZWdpb24gaW4gdGhlIGNoYWluLCB3aGljaCBzaG91bGRuJ3QgaGFwcGVuLgorCisg ICAgICAgIFRoZSBmaXggaXMsIGF0IGxheW91dCwgdG8gY2xlYXIgdGhlIGJvdHRvbSBtYXJnaW4g Zm9yIHRoZSBub2RlcyAoaW5zaWRlIHBhZ2luYXRlZCBjb250ZXh0cykgdGhhdCBoYXZlCisgICAg ICAgIC13ZWJraXQtcmVnaW9uLWJyZWFrLWFmdGVyOmFsd2F5cy4KKworICAgICAgICBSZXZpZXdl ZCBieSBEYXZpZCBIeWF0dC4KKworICAgICAgICBUZXN0czogZmFzdC9tdWx0aWNvbC9icmVhay1h ZnRlci1hbHdheXMtYm90dG9tLW1hcmdpbi5odG1sCisgICAgICAgICAgICAgICBmYXN0L3JlZ2lv bnMvb3ZlcnNldC1icmVhay1uZXN0ZWQuaHRtbAorICAgICAgICAgICAgICAgZmFzdC9yZWdpb25z L292ZXJzZXQtYnJlYWstd2l0aC1zaWJsaW5nLmh0bWwKKyAgICAgICAgICAgICAgIGZhc3QvcmVn aW9ucy9vdmVyc2V0LWJyZWFrLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9j ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6YXBwbHlBZnRlckJyZWFrKToK KwogMjAxMy0wMi0yMCAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBUYWJiZWRFZGl0b3JDb250YWluZXIgYW5kIE9wZW5SZXNv dXJjZURpYWxvZyBzaG91bGQgc2hvdyB1aVNvdXJjZUNvZGUgcGF0aCBhbmQgbmFtZSBpbnN0ZWFk IG9mIHBhcnNlZFVSTApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKaW5k ZXggOGMxZDExZi4uNTcxMTExYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2suY3BwCkBAIC03MjY2LDExICs3MjY2LDE0IEBAIExheW91dFVuaXQgUmVuZGVyQmxvY2s6OmFw cGx5QWZ0ZXJCcmVhayhSZW5kZXJCb3gqIGNoaWxkLCBMYXlvdXRVbml0IGxvZ2ljYWxPZmZzCiAg ICAgYm9vbCBjaGVja0FmdGVyQWx3YXlzID0gKGNoZWNrQ29sdW1uQnJlYWtzICYmIGNoaWxkLT5z dHlsZSgpLT5jb2x1bW5CcmVha0FmdGVyKCkgPT0gUEJBTFdBWVMpIHx8IChjaGVja1BhZ2VCcmVh a3MgJiYgY2hpbGQtPnN0eWxlKCktPnBhZ2VCcmVha0FmdGVyKCkgPT0gUEJBTFdBWVMpCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgfHwgKGNoZWNrUmVnaW9uQnJlYWtzICYmIGNoaWxkLT5z dHlsZSgpLT5yZWdpb25CcmVha0FmdGVyKCkgPT0gUEJBTFdBWVMpOwogICAgIGlmIChjaGVja0Fm dGVyQWx3YXlzICYmIGluTm9ybWFsRmxvdyhjaGlsZCkgJiYgaGFzTmV4dFBhZ2UobG9naWNhbE9m ZnNldCwgSW5jbHVkZVBhZ2VCb3VuZGFyeSkpIHsKLSAgICAgICAgbWFyZ2luSW5mby5zZXRNYXJn aW5BZnRlclF1aXJrKHRydWUpOyAvLyBDYXVzZSBtYXJnaW5zIHRvIGJlIGRpc2NhcmRlZCBmb3Ig YW55IGZvbGxvd2luZyBjb250ZW50LgorICAgICAgICBMYXlvdXRVbml0IG1hcmdpbk9mZnNldCA9 IG1hcmdpbkluZm8uY2FuQ29sbGFwc2VXaXRoTWFyZ2luQmVmb3JlKCkgPyBMYXlvdXRVbml0KCkg OiBtYXJnaW5JbmZvLm1hcmdpbigpOworCisgICAgICAgIC8vIFNvIG91ciBtYXJnaW4gZG9lc24n dCBwYXJ0aWNpcGF0ZSBpbiB0aGUgbmV4dCBjb2xsYXBzaW5nIHN0ZXBzLgorICAgICAgICBtYXJn aW5JbmZvLmNsZWFyTWFyZ2luKCk7CisKICAgICAgICAgaWYgKGNoZWNrQ29sdW1uQnJlYWtzKQog ICAgICAgICAgICAgdmlldygpLT5sYXlvdXRTdGF0ZSgpLT5hZGRGb3JjZWRDb2x1bW5CcmVhayhj aGlsZCwgbG9naWNhbE9mZnNldCk7CiAgICAgICAgIGlmIChjaGVja1JlZ2lvbkJyZWFrcykgewot ICAgICAgICAgICAgTGF5b3V0VW5pdCBtYXJnaW5PZmZzZXQgPSBtYXJnaW5JbmZvLmNhbkNvbGxh cHNlV2l0aE1hcmdpbkJlZm9yZSgpID8gTGF5b3V0VW5pdCgpIDogbWFyZ2luSW5mby5tYXJnaW4o KTsKICAgICAgICAgICAgIExheW91dFVuaXQgb2Zmc2V0QnJlYWtBZGp1c3RtZW50ID0gMDsKICAg ICAgICAgICAgIGlmIChlbmNsb3NpbmdSZW5kZXJGbG93VGhyZWFkKCktPmFkZEZvcmNlZFJlZ2lv bkJyZWFrKG9mZnNldEZyb21Mb2dpY2FsVG9wT2ZGaXJzdFBhZ2UoKSArIGxvZ2ljYWxPZmZzZXQg KyBtYXJnaW5PZmZzZXQsIGNoaWxkLCBmYWxzZSwgJm9mZnNldEJyZWFrQWRqdXN0bWVudCkpCiAg ICAgICAgICAgICAgICAgcmV0dXJuIGxvZ2ljYWxPZmZzZXQgKyBvZmZzZXRCcmVha0FkanVzdG1l bnQ7Cg== 190508 2013-02-27 06:26:27 -0800 2013-02-27 06:52:15 -0800 Incorporated Dave Hyatt's feedback to add a test of columns. Indent using spaces instead of tabs in the html files. patch92497OversetBreak.diff text/plain 15142 mmaerean ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2M2RjNTdlLi4wNzg2OTE2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTMtMDIt MjcgIE1paGFpIE1hZXJlYW4gIDxtbWFlcmVhbkBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBS ZWdpb25zXSBSZWdpb24gb3ZlcnNldCBwcm9wZXJ0eSBpcyBub3QgcHJvcGVybHkgY29tcHV0ZWQg d2hlbiB0aGVyZSBpcyBhIHJlZ2lvbiBicmVhaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI0OTcKKworICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBI eWF0dC4KKworICAgICAgICAqIGZhc3QvbXVsdGljb2wvYnJlYWstYWZ0ZXItYWx3YXlzLWJvdHRv bS1tYXJnaW4tZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L211bHRpY29sL2Jy ZWFrLWFmdGVyLWFsd2F5cy1ib3R0b20tbWFyZ2luLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZh c3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFrLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICog ZmFzdC9yZWdpb25zL292ZXJzZXQtYnJlYWstbmVzdGVkLWV4cGVjdGVkLnR4dDogQWRkZWQuCisg ICAgICAgICogZmFzdC9yZWdpb25zL292ZXJzZXQtYnJlYWstbmVzdGVkLmh0bWw6IEFkZGVkLgor ICAgICAgICAqIGZhc3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFrLXdpdGgtc2libGluZy1leHBlY3Rl ZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFrLXdpdGgt c2libGluZy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVh ay5odG1sOiBBZGRlZC4KKwogMjAxMy0wMi0yMCAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBUYWJiZWRFZGl0b3JDb250YWlu ZXIgYW5kIE9wZW5SZXNvdXJjZURpYWxvZyBzaG91bGQgc2hvdyB1aVNvdXJjZUNvZGUgcGF0aCBh bmQgbmFtZSBpbnN0ZWFkIG9mIHBhcnNlZFVSTApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9tdWx0aWNvbC9icmVhay1hZnRlci1hbHdheXMtYm90dG9tLW1hcmdpbi1leHBlY3RlZC50eHQg Yi9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL2JyZWFrLWFmdGVyLWFsd2F5cy1ib3R0b20tbWFy Z2luLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43Mzg5 YTYxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9icmVhay1h ZnRlci1hbHdheXMtYm90dG9tLW1hcmdpbi1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw2IEBACitU aGlzIGlzIHNvbWUgdGV4dCB3aXRoIGJvdHRvbSBtYXJnaW4gYW5kIGZvcmNlZCBicmVhayBhZnRl ci4KKworVGhpcyBwYXJhZ3JhcGggc2hvdWxkIGJlIGFsaWduZWQgd2l0aCB0aGUgb3RoZXIgcGFy YWdyYXBoIGJlY2F1c2UgdGhlIDFzdCBwYXJhZ3JhcGgncyBib3R0b20gbWFyZ2luIHNob3VsZG4n dCBzcGlsbCBvdmVyIHRoZSBmb3JjZWQgYnJlYWsuCisKK1BBU1MKK0J1ZyA5MjQ5NyAtIFtDU1Mg UmVnaW9uc10gUmVnaW9uIG92ZXJzZXQgcHJvcGVydHkgaXMgbm90IHByb3Blcmx5IGNvbXB1dGVk IHdoZW4gdGhlcmUgaXMgYSByZWdpb24gYnJlYWsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvbXVsdGljb2wvYnJlYWstYWZ0ZXItYWx3YXlzLWJvdHRvbS1tYXJnaW4uaHRtbCBiL0xheW91 dFRlc3RzL2Zhc3QvbXVsdGljb2wvYnJlYWstYWZ0ZXItYWx3YXlzLWJvdHRvbS1tYXJnaW4uaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5iOGIyMTExCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9icmVhay1hZnRlci1hbHdheXMtYm90 dG9tLW1hcmdpbi5odG1sCkBAIC0wLDAgKzEsMzkgQEAKKzwhZG9jdHlwZSBodG1sPgorPGh0bWw+ CisgICAgPGhlYWQ+CisgICAgICAgIDx0aXRsZT5CdWcgOTI0OTcgLSBbQ1NTIFJlZ2lvbnNdIFJl Z2lvbiBvdmVyc2V0IHByb3BlcnR5IGlzIG5vdCBwcm9wZXJseSBjb21wdXRlZCB3aGVuIHRoZXJl IGlzIGEgcmVnaW9uIGJyZWFrPC90aXRsZT4KKyAgICAgICAgPHN0eWxlIHR5cGU9InRleHQvY3Nz Ij4KKworICAgICAgICAgICAgLmNvbHVtbnMgeworICAgICAgICAgICAgICAgIC13ZWJraXQtY29s dW1uLWNvdW50OjI7CisgICAgICAgICAgICAgICAgd2lkdGg6MjUwcHg7CisgICAgICAgICAgICB9 CisKKyAgICAgICAgICAgIC5jb2x1bW5zIHA6Zmlyc3QtY2hpbGQgeworICAgICAgICAgICAgICAg IC13ZWJraXQtY29sdW1uLWJyZWFrLWFmdGVyOiBhbHdheXM7CisgICAgICAgICAgICAgICAgbWFy Z2luLWJvdHRvbTogMTBlbTsgLypzaG91bGRuJ3Qgc3BpbGwgb3ZlciB0aGUgZm9yY2VkIGJyZWFr Ki8KKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgLmZhaWwgI3Bhc3MsIC5wYXNzICNmYWls IHsgZGlzcGxheTogbm9uZTsgfQorICAgICAgICA8L3N0eWxlPgorICAgIDwvaGVhZD4KKworICAg IDxib2R5PgorICAgICAgICA8ZGl2IGNsYXNzPSJjb2x1bW5zIj4KKyAgICAgICAgICAgIDxwPlRo aXMgaXMgc29tZSB0ZXh0IHdpdGggYm90dG9tIG1hcmdpbiBhbmQgZm9yY2VkIGJyZWFrIGFmdGVy LjwvcD4KKyAgICAgICAgICAgIDxwPlRoaXMgcGFyYWdyYXBoIHNob3VsZCBiZSBhbGlnbmVkIHdp dGggdGhlIG90aGVyIHBhcmFncmFwaCBiZWNhdXNlIHRoZSAxc3QgcGFyYWdyYXBoJ3MgYm90dG9t IG1hcmdpbiBzaG91bGRuJ3Qgc3BpbGwgb3ZlciB0aGUgZm9yY2VkIGJyZWFrLjwvcD4KKyAgICAg ICAgPC9kaXY+CisKKyAgICAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorICAg ICAgICAgICAgaWYod2luZG93LnRlc3RSdW5uZXIpCisgICAgICAgICAgICAgICAgdGVzdFJ1bm5l ci5kdW1wQXNUZXh0KCk7CisgICAgICAgICAgICBkb2N1bWVudC5ib2R5LmNsYXNzTmFtZSA9IGRv Y3VtZW50LnF1ZXJ5U2VsZWN0b3IoIi5jb2x1bW5zIHA6bnRoLWNoaWxkKDIpIikub2Zmc2V0VG9w ID09IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoIi5jb2x1bW5zIHA6Zmlyc3QtY2hpbGQiKS5vZmZz ZXRUb3AgPyAicGFzcyIgOiAiZmFpbCI7CisgICAgICAgIDwvc2NyaXB0PgorCisgICAgICAgIDxk aXYgaWQ9InBhc3MiPlBBU1M8L2Rpdj4KKyAgICAgICAgPGRpdiBpZD0iZmFpbCI+RkFJTDwvZGl2 PgorCisgICAgICAgIDxwPjxhIGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD05MjQ5NyI+QnVnIDkyNDk3PC9hPiAtIFtDU1MgUmVnaW9uc10gUmVnaW9uIG92ZXJz ZXQgcHJvcGVydHkgaXMgbm90IHByb3Blcmx5IGNvbXB1dGVkIHdoZW4gdGhlcmUgaXMgYSByZWdp b24gYnJlYWs8L3A+CisKKyAgICA8L2JvZHk+Cis8L2h0bWw+ClwgTm8gbmV3bGluZSBhdCBlbmQg b2YgZmlsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL292ZXJzZXQtYnJl YWstZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL292ZXJzZXQtYnJlYWst ZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjRiODI4N2QK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVh ay1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw3IEBACitjb250ZW50IHdpdGggYnJlYWstYWZ0ZXI6 IGFsd2F5czsKKworZml0IHZzIGZpdAorZW1wdHkgdnMgZW1wdHkKK2VtcHR5IHZzIGVtcHR5CitQ QVNTCitCdWcgOTI0OTcgLSBbQ1NTIFJlZ2lvbnNdIFJlZ2lvbiBvdmVyc2V0IHByb3BlcnR5IGlz IG5vdCBwcm9wZXJseSBjb21wdXRlZCB3aGVuIHRoZXJlIGlzIGEgcmVnaW9uIGJyZWFrCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay1uZXN0ZWQtZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL292ZXJzZXQtYnJlYWstbmVzdGVk LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40YjgyODdk Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL292ZXJzZXQtYnJl YWstbmVzdGVkLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDcgQEAKK2NvbnRlbnQgd2l0aCBicmVh ay1hZnRlcjogYWx3YXlzOworCitmaXQgdnMgZml0CitlbXB0eSB2cyBlbXB0eQorZW1wdHkgdnMg ZW1wdHkKK1BBU1MKK0J1ZyA5MjQ5NyAtIFtDU1MgUmVnaW9uc10gUmVnaW9uIG92ZXJzZXQgcHJv cGVydHkgaXMgbm90IHByb3Blcmx5IGNvbXB1dGVkIHdoZW4gdGhlcmUgaXMgYSByZWdpb24gYnJl YWsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFrLW5l c3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL292ZXJzZXQtYnJlYWstbmVzdGVk Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOTljYjI0NQotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFrLW5lc3Rl ZC5odG1sCkBAIC0wLDAgKzEsNTMgQEAKKworPGh0bWw+CisgICAgPGhlYWQ+CisgICAgICAgIDx0 aXRsZT5CdWcgOTI0OTcgLSBbQ1NTIFJlZ2lvbnNdIFJlZ2lvbiBvdmVyc2V0IHByb3BlcnR5IGlz IG5vdCBwcm9wZXJseSBjb21wdXRlZCB3aGVuIHRoZXJlIGlzIGEgcmVnaW9uIGJyZWFrPC90aXRs ZT4KKyAgICAgICAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KKyAgICAgICAgICAgIC5jb250ZW50 IHsKKyAgICAgICAgICAgICAgICAtd2Via2l0LWZsb3ctaW50bzogZmxvdzsKKyAgICAgICAgICAg ICAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjZGRkOworICAgICAgICAgICAgfQorCisgICAgICAgICAg ICAuY29udGVudCBwOmZpcnN0LWNoaWxkIHsKKyAgICAgICAgICAgICAgICAtd2Via2l0LXJlZ2lv bi1icmVhay1hZnRlcjogYWx3YXlzOworICAgICAgICAgICAgICAgIG1hcmdpbi1ib3R0b206IDRl bTsgLypzaG91bGRuJ3Qgc3BpbGwgb3ZlciB0aGUgZm9yY2VkIGJyZWFrKi8KKyAgICAgICAgICAg IH0KKworICAgICAgICAgICAgLmNvbnRhaW5lciB7CisgICAgICAgICAgICAgICAgLXdlYmtpdC1m bG93LWZyb206IGZsb3c7CisgICAgICAgICAgICAgICAgd2lkdGg6MjUwcHg7CisgICAgICAgICAg ICAgICAgaGVpZ2h0OjEyMHB4OworICAgICAgICAgICAgICAgIGJvcmRlcjogMXB4IHNvbGlkICM0 NDQ7CisgICAgICAgICAgICAgICAgbWFyZ2luLXRvcDogMWVtOworICAgICAgICAgICAgfQorCisg ICAgICAgICAgICAuZmFpbCAjcGFzcywgLnBhc3MgI2ZhaWwgeyBkaXNwbGF5OiBub25lOyB9Cisg ICAgICAgIDwvc3R5bGU+CisgICAgPC9oZWFkPgorCisgICAgPGJvZHk+CisgICAgICAgIDxkaXYg Y2xhc3M9ImNvbnRlbnQiPjxkaXY+PGRpdj48cD5jb250ZW50IHdpdGggYnJlYWstYWZ0ZXI6IGFs d2F5czs8L3A+PC9kaXY+PC9kaXY+PC9kaXY+CisKKyAgICAgICAgPGRpdiBjbGFzcz0iY29udGFp bmVyIiBpZD0icjEiPjwvZGl2PiA8ZGl2IGlkPSJvdmVyc2V0MSI+ZXhwbGFuYXRpb24gZ29lcyBo ZXJlPC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9ImNvbnRhaW5lciIgaWQ9InIyIj48L2Rpdj4g PGRpdiBpZD0ib3ZlcnNldDIiPmV4cGxhbmF0aW9uIGdvZXMgaGVyZTwvZGl2PgorICAgICAgICA8 ZGl2IGNsYXNzPSJjb250YWluZXIiIGlkPSJyMyI+PC9kaXY+IDxkaXYgaWQ9Im92ZXJzZXQzIj5l eHBsYW5hdGlvbiBnb2VzIGhlcmU8L2Rpdj4KKworICAgICAgICA8c2NyaXB0IHR5cGU9InRleHQv amF2YXNjcmlwdCI+CisgICAgICAgICAgICBpZih3aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgICAg ICAgICAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKyAgICAgICAgICAgIHZhciByMSA9IGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCJyMSIpLndlYmtpdFJlZ2lvbk92ZXJzZXQ7CisgICAgICAg ICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgib3ZlcnNldDEiKS5pbm5lckhUTUwgPSByMSAr ICIgdnMgZml0IjsKKyAgICAgICAgICAgIHZhciByMiA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJyMiIpLndlYmtpdFJlZ2lvbk92ZXJzZXQ7CisgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVt ZW50QnlJZCgib3ZlcnNldDIiKS5pbm5lckhUTUwgPSByMiArICIgdnMgZW1wdHkiOworICAgICAg ICAgICAgdmFyIHIzID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInIzIikud2Via2l0UmVnaW9u T3ZlcnNldDsKKyAgICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJvdmVyc2V0MyIp LmlubmVySFRNTCA9IHIzICsgIiB2cyBlbXB0eSI7CisgICAgICAgICAgICBkb2N1bWVudC5ib2R5 LmNsYXNzTmFtZSA9IChyMSA9PSAiZml0IiAmJiByMiA9PSAiZW1wdHkiICYmIHIzID09ICJlbXB0 eSIpID8gInBhc3MiIDogImZhaWwiOworICAgICAgICA8L3NjcmlwdD4KKworICAgICAgICA8ZGl2 IGlkPSJwYXNzIj5QQVNTPC9kaXY+CisgICAgICAgIDxkaXYgaWQ9ImZhaWwiPkZBSUw8L2Rpdj4K KworICAgICAgICA8cD48YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9OTI0OTciPkJ1ZyA5MjQ5NzwvYT4gLSBbQ1NTIFJlZ2lvbnNdIFJlZ2lvbiBvdmVyc2V0 IHByb3BlcnR5IGlzIG5vdCBwcm9wZXJseSBjb21wdXRlZCB3aGVuIHRoZXJlIGlzIGEgcmVnaW9u IGJyZWFrPC9wPgorCisgICAgPC9ib2R5PgorPC9odG1sPgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9m IGZpbGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFr LXdpdGgtc2libGluZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvb3Zl cnNldC1icmVhay13aXRoLXNpYmxpbmctZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAuLmE1OGYwZTMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay13aXRoLXNpYmxpbmctZXhwZWN0ZWQudHh0CkBAIC0w LDAgKzEsOSBAQAorY29udGVudCB3aXRoIGJyZWFrLWFmdGVyOiBhbHdheXM7CisKKzJuZCBwCisK K2ZpdCB2cyBmaXQKK2ZpdCB2cyBmaXQKK2VtcHR5IHZzIGVtcHR5CitQQVNTCitCdWcgOTI0OTcg LSBbQ1NTIFJlZ2lvbnNdIFJlZ2lvbiBvdmVyc2V0IHByb3BlcnR5IGlzIG5vdCBwcm9wZXJseSBj b21wdXRlZCB3aGVuIHRoZXJlIGlzIGEgcmVnaW9uIGJyZWFrCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay13aXRoLXNpYmxpbmcuaHRtbCBiL0xheW91 dFRlc3RzL2Zhc3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFrLXdpdGgtc2libGluZy5odG1sCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjc3MzBmZTAKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay13aXRoLXNpYmxpbmcuaHRt bApAQCAtMCwwICsxLDUyIEBACis8IWRvY3R5cGUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgor ICAgICAgICA8dGl0bGU+QnVnIDkyNDk3IC0gW0NTUyBSZWdpb25zXSBSZWdpb24gb3ZlcnNldCBw cm9wZXJ0eSBpcyBub3QgcHJvcGVybHkgY29tcHV0ZWQgd2hlbiB0aGVyZSBpcyBhIHJlZ2lvbiBi cmVhazwvdGl0bGU+CisgICAgICAgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CisgICAgICAgICAg ICAuY29udGVudCB7CisgICAgICAgICAgICAgICAgLXdlYmtpdC1mbG93LWludG86IGZsb3c7Cisg ICAgICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogI2RkZDsKKyAgICAgICAgICAgIH0KKwor ICAgICAgICAgICAgLmNvbnRlbnQgcCB7CisgICAgICAgICAgICAgICAgLXdlYmtpdC1yZWdpb24t YnJlYWstYWZ0ZXI6IGFsd2F5czsKKyAgICAgICAgICAgICAgICBtYXJnaW4tYm90dG9tOiA0ZW07 IC8qc2hvdWxkbid0IHNwaWxsIG92ZXIgdGhlIGZvcmNlZCBicmVhayovCisgICAgICAgICAgICB9 CisKKyAgICAgICAgICAgIC5jb250YWluZXIgeworICAgICAgICAgICAgICAgIC13ZWJraXQtZmxv dy1mcm9tOiBmbG93OworICAgICAgICAgICAgICAgIHdpZHRoOjI1MHB4OworICAgICAgICAgICAg ICAgIGhlaWdodDoxMjBweDsKKyAgICAgICAgICAgICAgICBib3JkZXI6IDFweCBzb2xpZCAjNDQ0 OworICAgICAgICAgICAgICAgIG1hcmdpbi10b3A6IDFlbTsKKyAgICAgICAgICAgIH0KKworICAg ICAgICAgICAgLmZhaWwgI3Bhc3MsIC5wYXNzICNmYWlsIHsgZGlzcGxheTogbm9uZTsgfQorICAg ICAgICA8L3N0eWxlPgorICAgIDwvaGVhZD4KKyAgICA8Ym9keT4KKyAgICAgICAgPGRpdiBjbGFz cz0iY29udGVudCI+PHA+Y29udGVudCB3aXRoIGJyZWFrLWFmdGVyOiBhbHdheXM7PC9wPjxwPjJu ZCBwPC9wPjwvZGl2PgorCisgICAgICAgIDxkaXYgY2xhc3M9ImNvbnRhaW5lciIgaWQ9InIxIj48 L2Rpdj4gPGRpdiBpZD0ib3ZlcnNldDEiPmV4cGxhbmF0aW9uIGdvZXMgaGVyZTwvZGl2PgorICAg ICAgICA8ZGl2IGNsYXNzPSJjb250YWluZXIiIGlkPSJyMiI+PC9kaXY+IDxkaXYgaWQ9Im92ZXJz ZXQyIj5leHBsYW5hdGlvbiBnb2VzIGhlcmU8L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0iY29u dGFpbmVyIiBpZD0icjMiPjwvZGl2PiA8ZGl2IGlkPSJvdmVyc2V0MyI+ZXhwbGFuYXRpb24gZ29l cyBoZXJlPC9kaXY+CisKKyAgICAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgor ICAgICAgICAgICAgaWYod2luZG93LnRlc3RSdW5uZXIpCisgICAgICAgICAgICAgICAgdGVzdFJ1 bm5lci5kdW1wQXNUZXh0KCk7CisgICAgICAgICAgICB2YXIgcjEgPSBkb2N1bWVudC5nZXRFbGVt ZW50QnlJZCgicjEiKS53ZWJraXRSZWdpb25PdmVyc2V0OworICAgICAgICAgICAgZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoIm92ZXJzZXQxIikuaW5uZXJIVE1MID0gcjEgKyAiIHZzIGZpdCI7Cisg ICAgICAgICAgICB2YXIgcjIgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicjIiKS53ZWJraXRS ZWdpb25PdmVyc2V0OworICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm92ZXJz ZXQyIikuaW5uZXJIVE1MID0gcjIgKyAiIHZzIGZpdCI7CisgICAgICAgICAgICB2YXIgcjMgPSBk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgicjMiKS53ZWJraXRSZWdpb25PdmVyc2V0OworICAgICAg ICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm92ZXJzZXQzIikuaW5uZXJIVE1MID0gcjMg KyAiIHZzIGVtcHR5IjsKKyAgICAgICAgICAgIGRvY3VtZW50LmJvZHkuY2xhc3NOYW1lID0gKHIx ID09ICJmaXQiICYmIHIyID09ICJmaXQiICYmIHIzID09ICJlbXB0eSIpID8gInBhc3MiIDogImZh aWwiOworICAgICAgICA8L3NjcmlwdD4KKworICAgICAgICA8ZGl2IGlkPSJwYXNzIj5QQVNTPC9k aXY+CisgICAgICAgIDxkaXYgaWQ9ImZhaWwiPkZBSUw8L2Rpdj4KKworICAgICAgICA8cD48YSBo cmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI0OTciPkJ1ZyA5 MjQ5NzwvYT4gLSBbQ1NTIFJlZ2lvbnNdIFJlZ2lvbiBvdmVyc2V0IHByb3BlcnR5IGlzIG5vdCBw cm9wZXJseSBjb21wdXRlZCB3aGVuIHRoZXJlIGlzIGEgcmVnaW9uIGJyZWFrPC9wPgorCisgICAg PC9ib2R5PgorPC9odG1sPgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFrLmh0bWwgYi9MYXlvdXRUZXN0 cy9mYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAuLjMwNDY1MWQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0 L3JlZ2lvbnMvb3ZlcnNldC1icmVhay5odG1sCkBAIC0wLDAgKzEsNTMgQEAKKzwhZG9jdHlwZSBo dG1sPgorPGh0bWw+CisgICAgPGhlYWQ+CisgICAgICAgIDx0aXRsZT5CdWcgOTI0OTcgLSBbQ1NT IFJlZ2lvbnNdIFJlZ2lvbiBvdmVyc2V0IHByb3BlcnR5IGlzIG5vdCBwcm9wZXJseSBjb21wdXRl ZCB3aGVuIHRoZXJlIGlzIGEgcmVnaW9uIGJyZWFrPC90aXRsZT4KKyAgICAgICAgPHN0eWxlIHR5 cGU9InRleHQvY3NzIj4KKyAgICAgICAgICAgIC5jb250ZW50IHsKKyAgICAgICAgICAgICAgICAt d2Via2l0LWZsb3ctaW50bzogZmxvdzsKKyAgICAgICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9y OiAjZGRkOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICAuY29udGVudCBwOmZpcnN0LWNo aWxkIHsKKyAgICAgICAgICAgICAgICAtd2Via2l0LXJlZ2lvbi1icmVhay1hZnRlcjogYWx3YXlz OworICAgICAgICAgICAgICAgIG1hcmdpbi1ib3R0b206IDRlbTsgLypzaG91bGRuJ3Qgc3BpbGwg b3ZlciB0aGUgZm9yY2VkIGJyZWFrKi8KKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgLmNv bnRhaW5lciB7CisgICAgICAgICAgICAgICAgLXdlYmtpdC1mbG93LWZyb206IGZsb3c7CisgICAg ICAgICAgICAgICAgd2lkdGg6MjUwcHg7CisgICAgICAgICAgICAgICAgaGVpZ2h0OjEyMHB4Owor ICAgICAgICAgICAgICAgIGJvcmRlcjogMXB4IHNvbGlkICM0NDQ7CisgICAgICAgICAgICAgICAg bWFyZ2luLXRvcDogMWVtOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICAuZmFpbCAjcGFz cywgLnBhc3MgI2ZhaWwgeyBkaXNwbGF5OiBub25lOyB9CisgICAgICAgIDwvc3R5bGU+CisgICAg PC9oZWFkPgorCisgICAgPGJvZHk+CisgICAgICAgIDxkaXYgY2xhc3M9ImNvbnRlbnQiPjxwPmNv bnRlbnQgd2l0aCBicmVhay1hZnRlcjogYWx3YXlzOzwvcD48L2Rpdj4KKworICAgICAgICA8ZGl2 IGNsYXNzPSJjb250YWluZXIiIGlkPSJyMSI+PC9kaXY+IDxkaXYgaWQ9Im92ZXJzZXQxIj5leHBs YW5hdGlvbiBnb2VzIGhlcmU8L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0iY29udGFpbmVyIiBp ZD0icjIiPjwvZGl2PiA8ZGl2IGlkPSJvdmVyc2V0MiI+ZXhwbGFuYXRpb24gZ29lcyBoZXJlPC9k aXY+CisgICAgICAgIDxkaXYgY2xhc3M9ImNvbnRhaW5lciIgaWQ9InIzIj48L2Rpdj4gPGRpdiBp ZD0ib3ZlcnNldDMiPmV4cGxhbmF0aW9uIGdvZXMgaGVyZTwvZGl2PgorCisgICAgICAgIDxzY3Jp cHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KKyAgICAgICAgICAgIGlmKHdpbmRvdy50ZXN0UnVu bmVyKQorICAgICAgICAgICAgICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworICAgICAgICAg ICAgdmFyIHIxID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInIxIikud2Via2l0UmVnaW9uT3Zl cnNldDsKKyAgICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJvdmVyc2V0MSIpLmlu bmVySFRNTCA9IHIxICsgIiB2cyBmaXQiOworICAgICAgICAgICAgdmFyIHIyID0gZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoInIyIikud2Via2l0UmVnaW9uT3ZlcnNldDsKKyAgICAgICAgICAgIGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCJvdmVyc2V0MiIpLmlubmVySFRNTCA9IHIyICsgIiB2cyBl bXB0eSI7CisgICAgICAgICAgICB2YXIgcjMgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicjMi KS53ZWJraXRSZWdpb25PdmVyc2V0OworICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoIm92ZXJzZXQzIikuaW5uZXJIVE1MID0gcjMgKyAiIHZzIGVtcHR5IjsKKyAgICAgICAgICAg IGRvY3VtZW50LmJvZHkuY2xhc3NOYW1lID0gKHIxID09ICJmaXQiICYmIHIyID09ICJlbXB0eSIg JiYgcjMgPT0gImVtcHR5IikgPyAicGFzcyIgOiAiZmFpbCI7CisgICAgICAgIDwvc2NyaXB0Pgor CisgICAgICAgIDxkaXYgaWQ9InBhc3MiPlBBU1M8L2Rpdj4KKyAgICAgICAgPGRpdiBpZD0iZmFp bCI+RkFJTDwvZGl2PgorCisgICAgICAgIDxwPjxhIGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD05MjQ5NyI+QnVnIDkyNDk3PC9hPiAtIFtDU1MgUmVnaW9uc10g UmVnaW9uIG92ZXJzZXQgcHJvcGVydHkgaXMgbm90IHByb3Blcmx5IGNvbXB1dGVkIHdoZW4gdGhl cmUgaXMgYSByZWdpb24gYnJlYWs8L3A+CisKKyAgICA8L2JvZHk+Cis8L2h0bWw+ClwgTm8gbmV3 bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n IGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDc3MDYyNGMuLmNkMTNhNDAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMy0wMi0yNyAgTWloYWkgTWFlcmVhbiAgPG1tYWVy ZWFuQGFkb2JlLmNvbT4KKworICAgICAgICBbQ1NTIFJlZ2lvbnNdIFJlZ2lvbiBvdmVyc2V0IHBy b3BlcnR5IGlzIG5vdCBwcm9wZXJseSBjb21wdXRlZCB3aGVuIHRoZXJlIGlzIGEgcmVnaW9uIGJy ZWFrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjQ5 NworCisgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIEh5YXR0LgorCisgICAgICAgIEZvciAicGFn aW5hdGVkIiBjb250ZW50IGluIHJlZ2lvbnMgdGhhdCBoYXMgLXdlYmtpdC1yZWdpb24tYnJlYWst YWZ0ZXI6YWx3YXlzLCB0aGUgYm90dG9tIG1hcmdpbiB3YXMgYmVpbmcgcGFzc2VkCisgICAgICAg IGFsb25nIGZvciB0aGUgbmV4dCByZWdpb24gaW4gdGhlIGNoYWluLCB3aGljaCBzaG91bGRuJ3Qg aGFwcGVuLgorCisgICAgICAgIFRoZSBmaXggaXMsIGF0IGxheW91dCwgdG8gY2xlYXIgdGhlIGJv dHRvbSBtYXJnaW4gZm9yIHRoZSBub2RlcyAoaW5zaWRlIHBhZ2luYXRlZCBjb250ZXh0cykgdGhh dCBoYXZlCisgICAgICAgIC13ZWJraXQtcmVnaW9uLWJyZWFrLWFmdGVyOmFsd2F5cy4KKworICAg ICAgICBUZXN0czogZmFzdC9tdWx0aWNvbC9icmVhay1hZnRlci1hbHdheXMtYm90dG9tLW1hcmdp bi5odG1sCisgICAgICAgICAgICAgICBmYXN0L3JlZ2lvbnMvb3ZlcnNldC1icmVhay1uZXN0ZWQu aHRtbAorICAgICAgICAgICAgICAgZmFzdC9yZWdpb25zL292ZXJzZXQtYnJlYWstd2l0aC1zaWJs aW5nLmh0bWwKKyAgICAgICAgICAgICAgIGZhc3QvcmVnaW9ucy9vdmVyc2V0LWJyZWFrLmh0bWwK KworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCbG9jazo6YXBwbHlBZnRlckJyZWFrKToKKwogMjAxMy0wMi0yMCAgVnNldm9sb2Qg Vmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBU YWJiZWRFZGl0b3JDb250YWluZXIgYW5kIE9wZW5SZXNvdXJjZURpYWxvZyBzaG91bGQgc2hvdyB1 aVNvdXJjZUNvZGUgcGF0aCBhbmQgbmFtZSBpbnN0ZWFkIG9mIHBhcnNlZFVSTApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKaW5kZXggOGMxZDExZi4uNTcxMTExYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCkBAIC03MjY2LDExICs3MjY2 LDE0IEBAIExheW91dFVuaXQgUmVuZGVyQmxvY2s6OmFwcGx5QWZ0ZXJCcmVhayhSZW5kZXJCb3gq IGNoaWxkLCBMYXlvdXRVbml0IGxvZ2ljYWxPZmZzCiAgICAgYm9vbCBjaGVja0FmdGVyQWx3YXlz ID0gKGNoZWNrQ29sdW1uQnJlYWtzICYmIGNoaWxkLT5zdHlsZSgpLT5jb2x1bW5CcmVha0FmdGVy KCkgPT0gUEJBTFdBWVMpIHx8IChjaGVja1BhZ2VCcmVha3MgJiYgY2hpbGQtPnN0eWxlKCktPnBh Z2VCcmVha0FmdGVyKCkgPT0gUEJBTFdBWVMpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg fHwgKGNoZWNrUmVnaW9uQnJlYWtzICYmIGNoaWxkLT5zdHlsZSgpLT5yZWdpb25CcmVha0FmdGVy KCkgPT0gUEJBTFdBWVMpOwogICAgIGlmIChjaGVja0FmdGVyQWx3YXlzICYmIGluTm9ybWFsRmxv dyhjaGlsZCkgJiYgaGFzTmV4dFBhZ2UobG9naWNhbE9mZnNldCwgSW5jbHVkZVBhZ2VCb3VuZGFy eSkpIHsKLSAgICAgICAgbWFyZ2luSW5mby5zZXRNYXJnaW5BZnRlclF1aXJrKHRydWUpOyAvLyBD YXVzZSBtYXJnaW5zIHRvIGJlIGRpc2NhcmRlZCBmb3IgYW55IGZvbGxvd2luZyBjb250ZW50Lgor ICAgICAgICBMYXlvdXRVbml0IG1hcmdpbk9mZnNldCA9IG1hcmdpbkluZm8uY2FuQ29sbGFwc2VX aXRoTWFyZ2luQmVmb3JlKCkgPyBMYXlvdXRVbml0KCkgOiBtYXJnaW5JbmZvLm1hcmdpbigpOwor CisgICAgICAgIC8vIFNvIG91ciBtYXJnaW4gZG9lc24ndCBwYXJ0aWNpcGF0ZSBpbiB0aGUgbmV4 dCBjb2xsYXBzaW5nIHN0ZXBzLgorICAgICAgICBtYXJnaW5JbmZvLmNsZWFyTWFyZ2luKCk7CisK ICAgICAgICAgaWYgKGNoZWNrQ29sdW1uQnJlYWtzKQogICAgICAgICAgICAgdmlldygpLT5sYXlv dXRTdGF0ZSgpLT5hZGRGb3JjZWRDb2x1bW5CcmVhayhjaGlsZCwgbG9naWNhbE9mZnNldCk7CiAg ICAgICAgIGlmIChjaGVja1JlZ2lvbkJyZWFrcykgewotICAgICAgICAgICAgTGF5b3V0VW5pdCBt YXJnaW5PZmZzZXQgPSBtYXJnaW5JbmZvLmNhbkNvbGxhcHNlV2l0aE1hcmdpbkJlZm9yZSgpID8g TGF5b3V0VW5pdCgpIDogbWFyZ2luSW5mby5tYXJnaW4oKTsKICAgICAgICAgICAgIExheW91dFVu aXQgb2Zmc2V0QnJlYWtBZGp1c3RtZW50ID0gMDsKICAgICAgICAgICAgIGlmIChlbmNsb3NpbmdS ZW5kZXJGbG93VGhyZWFkKCktPmFkZEZvcmNlZFJlZ2lvbkJyZWFrKG9mZnNldEZyb21Mb2dpY2Fs VG9wT2ZGaXJzdFBhZ2UoKSArIGxvZ2ljYWxPZmZzZXQgKyBtYXJnaW5PZmZzZXQsIGNoaWxkLCBm YWxzZSwgJm9mZnNldEJyZWFrQWRqdXN0bWVudCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGxv Z2ljYWxPZmZzZXQgKyBvZmZzZXRCcmVha0FkanVzdG1lbnQ7Cg==