101462 2012-11-07 06:17:14 -0800 CSS3 Multicolumn: column-span should accept value 'none' (instead of '1') 2012-11-28 13:31:09 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED http://www.w3.org/TR/css3-multicol/#column-span WebExposed P2 Normal --- 1 cdumez cdumez cmarcelo darin eoconnor eric.carlson eric feature-media-reviews haraken hyatt jchaffraix kenneth kling koivisto macpherson menard ojan peter simon.fraser syoichi webkit.review.bot oldest_to_newest 760626 0 cdumez 2012-11-07 06:17:14 -0800 In http://www.w3.org/TR/2009/CR-css3-multicol-20091217/#column-span: column-span was accepting values: 1 | all but in http://www.w3.org/TR/2011/CR-css3-multicol-20110412/#column-span: possibles values are now: none | all There was no change in meaning but the value '1' was renamed to 'none'. We should update the WebKit implementation accordingly. 760658 1 172790 cdumez 2012-11-07 06:59:49 -0800 Created attachment 172790 Patch 760747 2 172790 buildbot 2012-11-07 08:53:44 -0800 Comment on attachment 172790 Patch Attachment 172790 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/14745695 New failing tests: fast/multicol/span/span-as-immediate-child-property-removal.html 760753 3 172819 cdumez 2012-11-07 09:08:03 -0800 Created attachment 172819 Patch Forgot to update the following test case: fast/multicol/span/span-as-immediate-child-property-removal.html 760978 4 172819 buildbot 2012-11-07 12:44:50 -0800 Comment on attachment 172819 Patch Attachment 172819 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/14765195 New failing tests: fast/multicol/span/span-as-immediate-child-property-removal.html 760994 5 172863 cdumez 2012-11-07 13:05:34 -0800 Created attachment 172863 Patch Second attempt to make mac-ews happy. 763234 6 cdumez 2012-11-09 12:26:55 -0800 Any feedback on this patch please? 768005 7 172863 haraken 2012-11-15 06:14:17 -0800 Comment on attachment 172863 Patch The implementation looks good but I'm not familiar with CSS stuff. CSS experts should look. 777022 8 cdumez 2012-11-27 11:29:35 -0800 Hopefully, people are back from Thanksgiving holiday now :) Could someone please review the patch? Is there anyone else I need to CC? 777149 9 172863 hyatt 2012-11-27 13:01:44 -0800 Comment on attachment 172863 Patch This will cause a compatibility issue. For the -webkit- prefix, we need to continue to support the value of 1. If you want to add, none and make it the default, I think that should be safe, but the explicit value of 1 needs to continue to work. When we implement unprefixed column properties, we can drop support for 1 at that time. 777199 10 176334 cdumez 2012-11-27 13:58:26 -0800 Created attachment 176334 Patch Take Dave Hyatt's feedback into consideration. This new patch keeps supporting 1 value for compatibility and maps it to none. 777222 11 176334 hyatt 2012-11-27 14:21:40 -0800 Comment on attachment 176334 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=176334&action=review Looking good. Just some minor suggestions now. > LayoutTests/fast/multicol/span/span-as-immediate-child-property-removal.html:135 > - spanners[i].style.webkitColumnSpan = 1; > + spanners[i].style.webkitColumnSpan = 'none'; You don't have to fix up this test now. I would suggest reverting this change so that we keep testing 1 as a possible value here. > Source/WebCore/css/CSSParser.cpp:2524 > + case CSSPropertyWebkitColumnSpan: // none | all | 1 Maybe mention that 1 will be removed when we drop the prefix. Something like: case CSSPropertyWebkitColumnSpan: // none | all | 1 (will be dropped in the unprefixed property) 777230 12 176339 cdumez 2012-11-27 14:29:01 -0800 Created attachment 176339 Patch Take Dave Hyatt's feedback into consideration. 778248 13 176339 hyatt 2012-11-28 13:04:47 -0800 Comment on attachment 176339 Patch r=me 778276 14 176339 webkit.review.bot 2012-11-28 13:31:03 -0800 Comment on attachment 176339 Patch Clearing flags on attachment: 176339 Committed r136053: <http://trac.webkit.org/changeset/136053> 778277 15 webkit.review.bot 2012-11-28 13:31:09 -0800 All reviewed patches have been landed. Closing bug. 172790 2012-11-07 06:59:49 -0800 2012-11-07 09:08:03 -0800 Patch 101462_css3_column_span.patch text/plain 9681 cdumez ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkZmE5ZmI5Li5mOTIzMjVmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMTEt MDcgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAg ICAgICBDU1MzIE11bHRpY29sdW1uOiBjb2x1bW4tc3BhbiBzaG91bGQgYWNjZXB0IHZhbHVlICdu b25lJyAoaW5zdGVhZCBvZiAnMScpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMDE0NjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBVcGRhdGUgZXhwZWN0ZWQgcmVzdWx0cyBmb3Igc2V2ZXJhbCB0ZXN0IGNh c2VzIG5vdyB0aGF0IHRoZQorICAgICAgICBkZWZhdWx0IHZhbHVlIGZvciBjb2x1bW4tc3BhbiBw cm9wZXJ0eSB3YXMgcmVuYW1lZCBmcm9tIDEKKyAgICAgICAgdG8gbm9uZS4KKworICAgICAgICAq IGZhc3QvY3NzL2dldENvbXB1dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtZXhwZWN0ZWQudHh0Ogor ICAgICAgICAqIGZhc3QvY3NzL2dldENvbXB1dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtd2l0aG91 dC1yZW5kZXJlci1leHBlY3RlZC50eHQ6CisgICAgICAgICogc3ZnL2Nzcy9nZXRDb21wdXRlZFN0 eWxlLWJhc2ljLWV4cGVjdGVkLnR4dDoKKwogMjAxMi0xMS0wNyAgVnNldm9sb2QgVmxhc292ICA8 dnNldmlrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkIGluc3BlY3RvciB0ZXN0 IHBvbGlzaC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL2dldENvbXB1dGVkU3R5 bGUvY29tcHV0ZWQtc3R5bGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZ2V0 Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS1leHBlY3RlZC50eHQKaW5kZXggY2UwNzA2My4u MDk3M2RmZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZ2V0Q29tcHV0ZWRTdHls ZS9jb21wdXRlZC1zdHlsZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3Mv Z2V0Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS1leHBlY3RlZC50eHQKQEAgLTE0MSw3ICsx NDEsNyBAQCB6b29tOiAxOwogLXdlYmtpdC1jb2x1bW4tcnVsZS1jb2xvcjogcmdiKDAsIDAsIDAp OwogLXdlYmtpdC1jb2x1bW4tcnVsZS1zdHlsZTogbm9uZTsKIC13ZWJraXQtY29sdW1uLXJ1bGUt d2lkdGg6IDBweDsKLS13ZWJraXQtY29sdW1uLXNwYW46IDE7Cistd2Via2l0LWNvbHVtbi1zcGFu OiBub25lOwogLXdlYmtpdC1jb2x1bW4td2lkdGg6IGF1dG87CiAtd2Via2l0LWFsaWduLWNvbnRl bnQ6IHN0cmV0Y2g7CiAtd2Via2l0LWFsaWduLWl0ZW1zOiBzdHJldGNoOwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvZmFzdC9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS13aXRo b3V0LXJlbmRlcmVyLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2dldENvbXB1 dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtd2l0aG91dC1yZW5kZXJlci1leHBlY3RlZC50eHQKaW5k ZXggNTVkMjhmZS4uN2MzNGZkMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZ2V0 Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS13aXRob3V0LXJlbmRlcmVyLWV4cGVjdGVkLnR4 dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1dGVkLXN0 eWxlLXdpdGhvdXQtcmVuZGVyZXItZXhwZWN0ZWQudHh0CkBAIC0xNDAsNyArMTQwLDcgQEAgem9v bTogMQogLXdlYmtpdC1jb2x1bW4tcnVsZS1jb2xvcjogcmdiKDAsIDAsIDApCiAtd2Via2l0LWNv bHVtbi1ydWxlLXN0eWxlOiBub25lCiAtd2Via2l0LWNvbHVtbi1ydWxlLXdpZHRoOiAwcHgKLS13 ZWJraXQtY29sdW1uLXNwYW46IDEKKy13ZWJraXQtY29sdW1uLXNwYW46IG5vbmUKIC13ZWJraXQt Y29sdW1uLXdpZHRoOiBhdXRvCiAtd2Via2l0LWFsaWduLWNvbnRlbnQ6IHN0cmV0Y2gKIC13ZWJr aXQtYWxpZ24taXRlbXM6IHN0cmV0Y2gKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3N2Zy9jc3Mv Z2V0Q29tcHV0ZWRTdHlsZS1iYXNpYy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9zdmcvY3Nz L2dldENvbXB1dGVkU3R5bGUtYmFzaWMtZXhwZWN0ZWQudHh0CmluZGV4IGU0ZWZiOWYuLmM3NDkz Y2QgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3N2Zy9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS1iYXNp Yy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvc3ZnL2Nzcy9nZXRDb21wdXRlZFN0eWxl LWJhc2ljLWV4cGVjdGVkLnR4dApAQCAtMjgwLDcgKzI4MCw3IEBAIHJlY3Q6IHN0eWxlLmdldFBy b3BlcnR5VmFsdWUoLXdlYmtpdC1jb2x1bW4tcnVsZS1zdHlsZSkgOiBub25lCiByZWN0OiBzdHls ZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtY29sdW1uLXJ1bGUtc3R5bGUpIDogW29iamVj dCBDU1NQcmltaXRpdmVWYWx1ZV0KIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtp dC1jb2x1bW4tcnVsZS13aWR0aCkgOiAwcHgKIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFs dWUoLXdlYmtpdC1jb2x1bW4tcnVsZS13aWR0aCkgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVl XQotcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LWNvbHVtbi1zcGFuKSA6IDEK K3JlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtpdC1jb2x1bW4tc3BhbikgOiBub25l CiByZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtY29sdW1uLXNwYW4pIDog W29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUo LXdlYmtpdC1jb2x1bW4td2lkdGgpIDogYXV0bwogcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlDU1NW YWx1ZSgtd2Via2l0LWNvbHVtbi13aWR0aCkgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQpA QCAtNzgyLDcgKzc4Miw3IEBAIGc6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtpdC1jb2x1 bW4tcnVsZS1zdHlsZSkgOiBub25lCiBnOiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJr aXQtY29sdW1uLXJ1bGUtc3R5bGUpIDogW29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KIGc6IHN0 eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtpdC1jb2x1bW4tcnVsZS13aWR0aCkgOiAwcHgKIGc6 IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1jb2x1bW4tcnVsZS13aWR0aCkgOiBb b2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQotZzogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Vi a2l0LWNvbHVtbi1zcGFuKSA6IDEKK2c6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtpdC1j b2x1bW4tc3BhbikgOiBub25lCiBnOiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQt Y29sdW1uLXNwYW4pIDogW29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KIGc6IHN0eWxlLmdldFBy b3BlcnR5VmFsdWUoLXdlYmtpdC1jb2x1bW4td2lkdGgpIDogYXV0bwogZzogc3R5bGUuZ2V0UHJv cGVydHlDU1NWYWx1ZSgtd2Via2l0LWNvbHVtbi13aWR0aCkgOiBbb2JqZWN0IENTU1ByaW1pdGl2 ZVZhbHVlXQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCmluZGV4IGNkM2I2MTAuLjRiODg1MTkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOSBAQAorMjAxMi0xMS0wNyAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVt ZXpAaW50ZWwuY29tPgorCisgICAgICAgIENTUzMgTXVsdGljb2x1bW46IGNvbHVtbi1zcGFuIHNo b3VsZCBhY2NlcHQgdmFsdWUgJ25vbmUnIChpbnN0ZWFkIG9mICcxJykKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTQ2MgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFjY29yZGluZyB0byB0aGUgbGF0ZXN0 IENTUzMgTXVsdGktY29sdW1uIHNwZWNpZmljYXRpb246CisgICAgICAgIGh0dHA6Ly93d3cudzMu b3JnL1RSLzIwMTEvQ1ItY3NzMy1tdWx0aWNvbC0yMDExMDQxMi8jY29sdW1uLXNwYW4KKworICAg ICAgICBjb2x1bW4tc3BhbiBzaG91bGQgYWNjZXB0IHZhbHVlcyBbIG5vbmUgfCBhbGwgXSwgaW5z dGVhZCBvZgorICAgICAgICBbIDEgfCBhbGwgXS4gVGhpcyBwYXRjaCB1cGRhdGVzIFdlYktpdCBp bXBsZW1lbnRhdGlvbiB0byByZWZsZWN0CisgICAgICAgIHRoaXMgY2hhbmdlIGluIHRoZSBzcGVj aWZpY2F0aW9uLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgYWxyZWFkeSBjb3ZlcmVkIGJ5IGV4 aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlv bi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb246Omdl dFByb3BlcnR5Q1NTVmFsdWUpOgorICAgICAgICAqIGNzcy9DU1NQYXJzZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Q1NTUGFyc2VyOjpwYXJzZVZhbHVlKToKKyAgICAgICAgKiBjc3MvQ1NTUHJp bWl0aXZlVmFsdWVNYXBwaW5ncy5oOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJpbWl0aXZlVmFs dWU6OkNTU1ByaW1pdGl2ZVZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1ByaW1pdGl2ZVZh bHVlOjpvcGVyYXRvciBDb2x1bW5TcGFuKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVu ZGVyU3R5bGUuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGVDb25zdGFu dHMuaDoKKwogMjAxMi0xMS0wNyAgRGFuIENhcm5leSAgPGRjYXJuZXlAZ29vZ2xlLmNvbT4KIAog ICAgICAgICBbVjhdIENsZWFudXAgVjhET01XcmFwcGVyOjpnZXRDYWNoZWRXcmFwcGVyCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCmlu ZGV4IDFlNmQyMDcuLjZhOWJmMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1ND b21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1ND b21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCkBAIC0xNzExLDkgKzE3MTEsNyBAQCBQYXNzUmVm UHRyPENTU1ZhbHVlPiBDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb246OmdldFByb3BlcnR5Q1NT VmFsdWUoQ1NTUHJvcGVydAogICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uUnVs ZVdpZHRoOgogICAgICAgICAgICAgcmV0dXJuIHpvb21BZGp1c3RlZFBpeGVsVmFsdWUoc3R5bGUt PmNvbHVtblJ1bGVXaWR0aCgpLCBzdHlsZS5nZXQoKSk7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVy dHlXZWJraXRDb2x1bW5TcGFuOgotICAgICAgICAgICAgaWYgKHN0eWxlLT5jb2x1bW5TcGFuKCkp Ci0gICAgICAgICAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZUlkZW50aWZpZXJW YWx1ZShDU1NWYWx1ZUFsbCk7Ci0gICAgICAgICAgICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3Jl YXRlVmFsdWUoMSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19OVU1CRVIpOworICAgICAgICAgICAg cmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShzdHlsZS0+Y29sdW1u U3BhbigpID8gQ1NTVmFsdWVBbGwgOiBDU1NWYWx1ZU5vbmUpOwogICAgICAgICBjYXNlIENTU1By b3BlcnR5V2Via2l0Q29sdW1uQnJlYWtBZnRlcjoKICAgICAgICAgICAgIHJldHVybiBjc3NWYWx1 ZVBvb2woKS5jcmVhdGVWYWx1ZShzdHlsZS0+Y29sdW1uQnJlYWtBZnRlcigpKTsKICAgICAgICAg Y2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVtbkJyZWFrQmVmb3JlOgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFy c2VyLmNwcAppbmRleCA4ZmY5N2I4Li5mNDg4YjExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9jc3MvQ1NTUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNw cApAQCAtMjQ5MSwxMSArMjQ5MSw5IEBAIGJvb2wgQ1NTUGFyc2VyOjpwYXJzZVZhbHVlKENTU1By b3BlcnR5SUQgcHJvcElkLCBib29sIGltcG9ydGFudCkKICAgICAgICAgaWYgKGlkID09IENTU1Zh bHVlTm9ybWFsIHx8IGlkID09IENTU1ZhbHVlUmV2ZXJzZSkKICAgICAgICAgICAgIHZhbGlkUHJp bWl0aXZlID0gdHJ1ZTsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtp dENvbHVtblNwYW46ICAgICAgICAvLyBhbGwgfCAxCi0gICAgICAgIGlmIChpZCA9PSBDU1NWYWx1 ZUFsbCkKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uU3BhbjogLy8gbm9uZSB8IGFs bAorICAgICAgICBpZiAoaWQgPT0gQ1NTVmFsdWVBbGwgfHwgaWQgPT0gQ1NTVmFsdWVOb25lKQog ICAgICAgICAgICAgdmFsaWRQcmltaXRpdmUgPSB0cnVlOwotICAgICAgICBlbHNlCi0gICAgICAg ICAgICB2YWxpZFByaW1pdGl2ZSA9IHZhbGlkVW5pdCh2YWx1ZSwgRk51bWJlciB8IEZOb25OZWcp ICYmIHZhbHVlLT5mVmFsdWUgPT0gMTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBDU1NQcm9w ZXJ0eVdlYmtpdENvbHVtbldpZHRoOiAgICAgICAgIC8vIGF1dG8gfCA8bGVuZ3RoPgogICAgICAg ICBpZiAoaWQgPT0gQ1NTVmFsdWVBdXRvKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3Nz L0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmlt aXRpdmVWYWx1ZU1hcHBpbmdzLmgKaW5kZXggOWIxOThhYS4uNThiMTMyNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oCkBAIC0xNDksMjYgKzE0 OSwyOCBAQCB0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6b3BlcmF0b3IgTGlu ZUNsYW1wVmFsdWUoKSBjb25zdAogdGVtcGxhdGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6 OkNTU1ByaW1pdGl2ZVZhbHVlKENvbHVtblNwYW4gY29sdW1uU3BhbikKICAgICA6IENTU1ZhbHVl KFByaW1pdGl2ZUNsYXNzKQogeworICAgIG1fcHJpbWl0aXZlVW5pdFR5cGUgPSBDU1NfSURFTlQ7 CiAgICAgc3dpdGNoIChjb2x1bW5TcGFuKSB7CiAgICAgY2FzZSBDb2x1bW5TcGFuQWxsOgotICAg ICAgICBtX3ByaW1pdGl2ZVVuaXRUeXBlID0gQ1NTX0lERU5UOwogICAgICAgICBtX3ZhbHVlLmlk ZW50ID0gQ1NTVmFsdWVBbGw7CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgQ29sdW1uU3Bhbk9u ZToKLSAgICAgICAgbV9wcmltaXRpdmVVbml0VHlwZSA9IENTU19OVU1CRVI7Ci0gICAgICAgIG1f dmFsdWUubnVtID0gMTsKKyAgICBjYXNlIENvbHVtblNwYW5Ob25lOgorICAgICAgICBtX3ZhbHVl LmlkZW50ID0gQ1NTVmFsdWVOb25lOwogICAgICAgICBicmVhazsKICAgICB9CiB9CiAKIHRlbXBs YXRlPD4gaW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpvcGVyYXRvciBDb2x1bW5TcGFuKCkgY29u c3QKIHsKLSAgICBpZiAobV9wcmltaXRpdmVVbml0VHlwZSA9PSBDU1NfSURFTlQgJiYgbV92YWx1 ZS5pZGVudCA9PSBDU1NWYWx1ZUFsbCkKKyAgICBzd2l0Y2ggKG1fdmFsdWUuaWRlbnQpIHsKKyAg ICBjYXNlIENTU1ZhbHVlQWxsOgogICAgICAgICByZXR1cm4gQ29sdW1uU3BhbkFsbDsKLSAgICBp ZiAobV9wcmltaXRpdmVVbml0VHlwZSA9PSBDU1NfTlVNQkVSICYmIG1fdmFsdWUubnVtID09IDEp Ci0gICAgICAgIHJldHVybiBDb2x1bW5TcGFuT25lOworICAgIGNhc2UgQ1NTVmFsdWVOb25lOgor ICAgICAgICByZXR1cm4gQ29sdW1uU3Bhbk5vbmU7CisgICAgfQorCiAgICAgQVNTRVJUX05PVF9S RUFDSEVEKCk7Ci0gICAgcmV0dXJuIENvbHVtblNwYW5PbmU7CisgICAgcmV0dXJuIENvbHVtblNw YW5Ob25lOwogfQogCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0 eWxlLmgKaW5kZXggZWJlOTFiNC4uOTc1OGQ4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKQEAgLTE2NjgsNyArMTY2OCw3IEBAIHB1YmxpYzoKICAg ICBzdGF0aWMgT3JkZXIgaW5pdGlhbFJUTE9yZGVyaW5nKCkgeyByZXR1cm4gTG9naWNhbE9yZGVy OyB9CiAgICAgc3RhdGljIGZsb2F0IGluaXRpYWxUZXh0U3Ryb2tlV2lkdGgoKSB7IHJldHVybiAw OyB9CiAgICAgc3RhdGljIHVuc2lnbmVkIHNob3J0IGluaXRpYWxDb2x1bW5Db3VudCgpIHsgcmV0 dXJuIDE7IH0KLSAgICBzdGF0aWMgQ29sdW1uU3BhbiBpbml0aWFsQ29sdW1uU3BhbigpIHsgcmV0 dXJuIENvbHVtblNwYW5PbmU7IH0KKyAgICBzdGF0aWMgQ29sdW1uU3BhbiBpbml0aWFsQ29sdW1u U3BhbigpIHsgcmV0dXJuIENvbHVtblNwYW5Ob25lOyB9CiAgICAgc3RhdGljIGNvbnN0IFRyYW5z Zm9ybU9wZXJhdGlvbnMmIGluaXRpYWxUcmFuc2Zvcm0oKSB7IERFRklORV9TVEFUSUNfTE9DQUwo VHJhbnNmb3JtT3BlcmF0aW9ucywgb3BzLCAoKSk7IHJldHVybiBvcHM7IH0KICAgICBzdGF0aWMg TGVuZ3RoIGluaXRpYWxUcmFuc2Zvcm1PcmlnaW5YKCkgeyByZXR1cm4gTGVuZ3RoKDUwLjAsIFBl cmNlbnQpOyB9CiAgICAgc3RhdGljIExlbmd0aCBpbml0aWFsVHJhbnNmb3JtT3JpZ2luWSgpIHsg cmV0dXJuIExlbmd0aCg1MC4wLCBQZXJjZW50KTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmggYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGVDb25zdGFudHMuaAppbmRleCBmOWYzMjA5Li4z Nzg0NTg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVy U3R5bGVDb25zdGFudHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVu ZGVyU3R5bGVDb25zdGFudHMuaApAQCAtODEsNyArODEsNyBAQCBlbnVtIFBzZXVkb0lkIHsKICAg ICBQVUJMSUNfUFNFVURPSURfTUFTSyA9ICgoMSA8PCBGSVJTVF9JTlRFUk5BTF9QU0VVRE9JRCkg LSAxKSAmIH4oKDEgPDwgRklSU1RfUFVCTElDX1BTRVVET0lEKSAtIDEpCiB9OwogCi1lbnVtIENv bHVtblNwYW4geyBDb2x1bW5TcGFuT25lID0gMCwgQ29sdW1uU3BhbkFsbH07CitlbnVtIENvbHVt blNwYW4geyBDb2x1bW5TcGFuTm9uZSA9IDAsIENvbHVtblNwYW5BbGwgfTsKIAogZW51bSBFQm9y ZGVyQ29sbGFwc2UgeyBCU0VQQVJBVEUgPSAwLCBCQ09MTEFQU0UgPSAxIH07CiAK 172819 2012-11-07 09:08:03 -0800 2012-11-07 13:05:34 -0800 Patch 101462_column_span_none.patch text/plain 10483 cdumez ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlY2FjYzM4Li4wNmFhZmJlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTItMTEt MDcgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAg ICAgICBDU1MzIE11bHRpY29sdW1uOiBjb2x1bW4tc3BhbiBzaG91bGQgYWNjZXB0IHZhbHVlICdu b25lJyAoaW5zdGVhZCBvZiAnMScpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMDE0NjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBVcGRhdGUgZXhwZWN0ZWQgcmVzdWx0cyBmb3Igc2V2ZXJhbCB0ZXN0IGNh c2VzIG5vdyB0aGF0IHRoZQorICAgICAgICBkZWZhdWx0IHZhbHVlIGZvciBjb2x1bW4tc3BhbiBw cm9wZXJ0eSB3YXMgcmVuYW1lZCBmcm9tIDEKKyAgICAgICAgdG8gbm9uZS4KKworICAgICAgICAq IGZhc3QvY3NzL2dldENvbXB1dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtZXhwZWN0ZWQudHh0Ogor ICAgICAgICAqIGZhc3QvY3NzL2dldENvbXB1dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtd2l0aG91 dC1yZW5kZXJlci1leHBlY3RlZC50eHQ6CisgICAgICAgICogZmFzdC9tdWx0aWNvbC9zcGFuL3Nw YW4tYXMtaW1tZWRpYXRlLWNoaWxkLXByb3BlcnR5LXJlbW92YWwuaHRtbDoKKyAgICAgICAgKiBz dmcvY3NzL2dldENvbXB1dGVkU3R5bGUtYmFzaWMtZXhwZWN0ZWQudHh0OgorCiAyMDEyLTExLTA3 ICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIExheW91 dCBUZXN0IGluc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHQtZm9ybWF0dGVyLWJyZWFrcG9pbnRzLmh0 bWwgaXMgZmFpbGluZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZ2V0Q29tcHV0 ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2Nz cy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1dGVkLXN0eWxlLWV4cGVjdGVkLnR4dAppbmRleCBjZTA3 MDYzLi4wOTczZGZlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRl ZFN0eWxlL2NvbXB1dGVkLXN0eWxlLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0 L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1dGVkLXN0eWxlLWV4cGVjdGVkLnR4dApAQCAtMTQx LDcgKzE0MSw3IEBAIHpvb206IDE7CiAtd2Via2l0LWNvbHVtbi1ydWxlLWNvbG9yOiByZ2IoMCwg MCwgMCk7CiAtd2Via2l0LWNvbHVtbi1ydWxlLXN0eWxlOiBub25lOwogLXdlYmtpdC1jb2x1bW4t cnVsZS13aWR0aDogMHB4OwotLXdlYmtpdC1jb2x1bW4tc3BhbjogMTsKKy13ZWJraXQtY29sdW1u LXNwYW46IG5vbmU7CiAtd2Via2l0LWNvbHVtbi13aWR0aDogYXV0bzsKIC13ZWJraXQtYWxpZ24t Y29udGVudDogc3RyZXRjaDsKIC13ZWJraXQtYWxpZ24taXRlbXM6IHN0cmV0Y2g7CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1dGVkLXN0eWxl LXdpdGhvdXQtcmVuZGVyZXItZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZ2V0 Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS13aXRob3V0LXJlbmRlcmVyLWV4cGVjdGVkLnR4 dAppbmRleCA1NWQyOGZlLi43YzM0ZmQyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Nz cy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1dGVkLXN0eWxlLXdpdGhvdXQtcmVuZGVyZXItZXhwZWN0 ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2dldENvbXB1dGVkU3R5bGUvY29tcHV0 ZWQtc3R5bGUtd2l0aG91dC1yZW5kZXJlci1leHBlY3RlZC50eHQKQEAgLTE0MCw3ICsxNDAsNyBA QCB6b29tOiAxCiAtd2Via2l0LWNvbHVtbi1ydWxlLWNvbG9yOiByZ2IoMCwgMCwgMCkKIC13ZWJr aXQtY29sdW1uLXJ1bGUtc3R5bGU6IG5vbmUKIC13ZWJraXQtY29sdW1uLXJ1bGUtd2lkdGg6IDBw eAotLXdlYmtpdC1jb2x1bW4tc3BhbjogMQorLXdlYmtpdC1jb2x1bW4tc3Bhbjogbm9uZQogLXdl YmtpdC1jb2x1bW4td2lkdGg6IGF1dG8KIC13ZWJraXQtYWxpZ24tY29udGVudDogc3RyZXRjaAog LXdlYmtpdC1hbGlnbi1pdGVtczogc3RyZXRjaApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9tdWx0aWNvbC9zcGFuL3NwYW4tYXMtaW1tZWRpYXRlLWNoaWxkLXByb3BlcnR5LXJlbW92YWwu aHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvc3Bhbi9zcGFuLWFzLWltbWVkaWF0ZS1j aGlsZC1wcm9wZXJ0eS1yZW1vdmFsLmh0bWwKaW5kZXggOWY2NTAwMy4uYzhmOGM2MCAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9zcGFuL3NwYW4tYXMtaW1tZWRpYXRlLWNo aWxkLXByb3BlcnR5LXJlbW92YWwuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29s L3NwYW4vc3Bhbi1hcy1pbW1lZGlhdGUtY2hpbGQtcHJvcGVydHktcmVtb3ZhbC5odG1sCkBAIC0x MzIsNyArMTMyLDcgQEAgc2l4Lmluc2VydEJlZm9yZShkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgn YmFzZScpLmNsb25lTm9kZSh0cnVlKSwgZG9jdW1lbnQuZ2V0RWwKIDxzY3JpcHQ+CiBzcGFubmVy cyA9IGRvY3VtZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCdoMicpOwogZm9yIChpID0gMDsgaSA8 IHNwYW5uZXJzLmxlbmd0aDsgaSsrKSB7Ci0gICAgc3Bhbm5lcnNbaV0uc3R5bGUud2Via2l0Q29s dW1uU3BhbiA9IDE7CisgICAgc3Bhbm5lcnNbaV0uc3R5bGUud2Via2l0Q29sdW1uU3BhbiA9IG5v bmU7CiB9CiA8L3NjcmlwdD4KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvc3ZnL2Nzcy9nZXRD b21wdXRlZFN0eWxlLWJhc2ljLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3N2Zy9jc3MvZ2V0 Q29tcHV0ZWRTdHlsZS1iYXNpYy1leHBlY3RlZC50eHQKaW5kZXggZTRlZmI5Zi4uYzc0OTNjZCAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvc3ZnL2Nzcy9nZXRDb21wdXRlZFN0eWxlLWJhc2ljLWV4 cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9zdmcvY3NzL2dldENvbXB1dGVkU3R5bGUtYmFz aWMtZXhwZWN0ZWQudHh0CkBAIC0yODAsNyArMjgwLDcgQEAgcmVjdDogc3R5bGUuZ2V0UHJvcGVy dHlWYWx1ZSgtd2Via2l0LWNvbHVtbi1ydWxlLXN0eWxlKSA6IG5vbmUKIHJlY3Q6IHN0eWxlLmdl dFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1jb2x1bW4tcnVsZS1zdHlsZSkgOiBbb2JqZWN0IENT U1ByaW1pdGl2ZVZhbHVlXQogcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LWNv bHVtbi1ydWxlLXdpZHRoKSA6IDBweAogcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgt d2Via2l0LWNvbHVtbi1ydWxlLXdpZHRoKSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCi1y ZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtY29sdW1uLXNwYW4pIDogMQorcmVj dDogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LWNvbHVtbi1zcGFuKSA6IG5vbmUKIHJl Y3Q6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1jb2x1bW4tc3BhbikgOiBbb2Jq ZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQogcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Vi a2l0LWNvbHVtbi13aWR0aCkgOiBhdXRvCiByZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVl KC13ZWJraXQtY29sdW1uLXdpZHRoKSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCkBAIC03 ODIsNyArNzgyLDcgQEAgZzogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LWNvbHVtbi1y dWxlLXN0eWxlKSA6IG5vbmUKIGc6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1j b2x1bW4tcnVsZS1zdHlsZSkgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQogZzogc3R5bGUu Z2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LWNvbHVtbi1ydWxlLXdpZHRoKSA6IDBweAogZzogc3R5 bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgtd2Via2l0LWNvbHVtbi1ydWxlLXdpZHRoKSA6IFtvYmpl Y3QgQ1NTUHJpbWl0aXZlVmFsdWVdCi1nOiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQt Y29sdW1uLXNwYW4pIDogMQorZzogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LWNvbHVt bi1zcGFuKSA6IG5vbmUKIGc6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1jb2x1 bW4tc3BhbikgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQogZzogc3R5bGUuZ2V0UHJvcGVy dHlWYWx1ZSgtd2Via2l0LWNvbHVtbi13aWR0aCkgOiBhdXRvCiBnOiBzdHlsZS5nZXRQcm9wZXJ0 eUNTU1ZhbHVlKC13ZWJraXQtY29sdW1uLXdpZHRoKSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFs dWVdCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKaW5kZXggNjNhMWY4NC4uYzMzMGVkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsx LDI5IEBACisyMDEyLTExLTA3ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBp bnRlbC5jb20+CisKKyAgICAgICAgQ1NTMyBNdWx0aWNvbHVtbjogY29sdW1uLXNwYW4gc2hvdWxk IGFjY2VwdCB2YWx1ZSAnbm9uZScgKGluc3RlYWQgb2YgJzEnKQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxNDYyCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWNjb3JkaW5nIHRvIHRoZSBsYXRlc3QgQ1NT MyBNdWx0aS1jb2x1bW4gc3BlY2lmaWNhdGlvbjoKKyAgICAgICAgaHR0cDovL3d3dy53My5vcmcv VFIvMjAxMS9DUi1jc3MzLW11bHRpY29sLTIwMTEwNDEyLyNjb2x1bW4tc3BhbgorCisgICAgICAg IGNvbHVtbi1zcGFuIHNob3VsZCBhY2NlcHQgdmFsdWVzIFsgbm9uZSB8IGFsbCBdLCBpbnN0ZWFk IG9mCisgICAgICAgIFsgMSB8IGFsbCBdLiBUaGlzIHBhdGNoIHVwZGF0ZXMgV2ViS2l0IGltcGxl bWVudGF0aW9uIHRvIHJlZmxlY3QKKyAgICAgICAgdGhpcyBjaGFuZ2UgaW4gdGhlIHNwZWNpZmlj YXRpb24uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBhbHJlYWR5IGNvdmVyZWQgYnkgZXhpc3Rp bmcgdGVzdHMuCisKKyAgICAgICAgKiBjc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbjo6Z2V0UHJv cGVydHlDU1NWYWx1ZSk6CisgICAgICAgICogY3NzL0NTU1BhcnNlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlVmFsdWUpOgorICAgICAgICAqIGNzcy9DU1NQcmltaXRp dmVWYWx1ZU1hcHBpbmdzLmg6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcmltaXRpdmVWYWx1ZTo6 Q1NTUHJpbWl0aXZlVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJpbWl0aXZlVmFsdWU6 Om9wZXJhdG9yIENvbHVtblNwYW4pOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9SZW5kZXJT dHlsZS5oOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5o OgorCiAyMDEyLTExLTA3ICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGln aWEuY29tPgogCiAgICAgICAgIFtRdF0gT3BlbiBsaW5rIGluIHRoaXMgd2luZG93IGFjdGlvbgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlv bi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNw cAppbmRleCAxZTZkMjA3Li42YTliZjA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcApAQCAtMTcxMSw5ICsxNzExLDcgQEAgUGFz c1JlZlB0cjxDU1NWYWx1ZT4gQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uOjpnZXRQcm9wZXJ0 eUNTU1ZhbHVlKENTU1Byb3BlcnQKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVt blJ1bGVXaWR0aDoKICAgICAgICAgICAgIHJldHVybiB6b29tQWRqdXN0ZWRQaXhlbFZhbHVlKHN0 eWxlLT5jb2x1bW5SdWxlV2lkdGgoKSwgc3R5bGUuZ2V0KCkpOwogICAgICAgICBjYXNlIENTU1By b3BlcnR5V2Via2l0Q29sdW1uU3BhbjoKLSAgICAgICAgICAgIGlmIChzdHlsZS0+Y29sdW1uU3Bh bigpKQotICAgICAgICAgICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVJZGVudGlm aWVyVmFsdWUoQ1NTVmFsdWVBbGwpOwotICAgICAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgp LmNyZWF0ZVZhbHVlKDEsIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfTlVNQkVSKTsKKyAgICAgICAg ICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoc3R5bGUtPmNv bHVtblNwYW4oKSA/IENTU1ZhbHVlQWxsIDogQ1NTVmFsdWVOb25lKTsKICAgICAgICAgY2FzZSBD U1NQcm9wZXJ0eVdlYmtpdENvbHVtbkJyZWFrQWZ0ZXI6CiAgICAgICAgICAgICByZXR1cm4gY3Nz VmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoc3R5bGUtPmNvbHVtbkJyZWFrQWZ0ZXIoKSk7CiAgICAg ICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5CcmVha0JlZm9yZToKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NT U1BhcnNlci5jcHAKaW5kZXggOGZmOTdiOC4uZjQ4OGIxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvY3NzL0NTU1BhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNl ci5jcHAKQEAgLTI0OTEsMTEgKzI0OTEsOSBAQCBib29sIENTU1BhcnNlcjo6cGFyc2VWYWx1ZShD U1NQcm9wZXJ0eUlEIHByb3BJZCwgYm9vbCBpbXBvcnRhbnQpCiAgICAgICAgIGlmIChpZCA9PSBD U1NWYWx1ZU5vcm1hbCB8fCBpZCA9PSBDU1NWYWx1ZVJldmVyc2UpCiAgICAgICAgICAgICB2YWxp ZFByaW1pdGl2ZSA9IHRydWU7CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgQ1NTUHJvcGVydHlX ZWJraXRDb2x1bW5TcGFuOiAgICAgICAgLy8gYWxsIHwgMQotICAgICAgICBpZiAoaWQgPT0gQ1NT VmFsdWVBbGwpCisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVtblNwYW46IC8vIG5vbmUg fCBhbGwKKyAgICAgICAgaWYgKGlkID09IENTU1ZhbHVlQWxsIHx8IGlkID09IENTU1ZhbHVlTm9u ZSkKICAgICAgICAgICAgIHZhbGlkUHJpbWl0aXZlID0gdHJ1ZTsKLSAgICAgICAgZWxzZQotICAg ICAgICAgICAgdmFsaWRQcmltaXRpdmUgPSB2YWxpZFVuaXQodmFsdWUsIEZOdW1iZXIgfCBGTm9u TmVnKSAmJiB2YWx1ZS0+ZlZhbHVlID09IDE7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQ1NT UHJvcGVydHlXZWJraXRDb2x1bW5XaWR0aDogICAgICAgICAvLyBhdXRvIHwgPGxlbmd0aD4KICAg ICAgICAgaWYgKGlkID09IENTU1ZhbHVlQXV0bykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT UHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oCmluZGV4IDliMTk4YWEuLjU4YjEzMjUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgKKysrIGIv U291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaApAQCAtMTQ5LDI2 ICsxNDksMjggQEAgdGVtcGxhdGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9y IExpbmVDbGFtcFZhbHVlKCkgY29uc3QKIHRlbXBsYXRlPD4gaW5saW5lIENTU1ByaW1pdGl2ZVZh bHVlOjpDU1NQcmltaXRpdmVWYWx1ZShDb2x1bW5TcGFuIGNvbHVtblNwYW4pCiAgICAgOiBDU1NW YWx1ZShQcmltaXRpdmVDbGFzcykKIHsKKyAgICBtX3ByaW1pdGl2ZVVuaXRUeXBlID0gQ1NTX0lE RU5UOwogICAgIHN3aXRjaCAoY29sdW1uU3BhbikgewogICAgIGNhc2UgQ29sdW1uU3BhbkFsbDoK LSAgICAgICAgbV9wcmltaXRpdmVVbml0VHlwZSA9IENTU19JREVOVDsKICAgICAgICAgbV92YWx1 ZS5pZGVudCA9IENTU1ZhbHVlQWxsOwogICAgICAgICBicmVhazsKLSAgICBjYXNlIENvbHVtblNw YW5PbmU6Ci0gICAgICAgIG1fcHJpbWl0aXZlVW5pdFR5cGUgPSBDU1NfTlVNQkVSOwotICAgICAg ICBtX3ZhbHVlLm51bSA9IDE7CisgICAgY2FzZSBDb2x1bW5TcGFuTm9uZToKKyAgICAgICAgbV92 YWx1ZS5pZGVudCA9IENTU1ZhbHVlTm9uZTsKICAgICAgICAgYnJlYWs7CiAgICAgfQogfQogCiB0 ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6b3BlcmF0b3IgQ29sdW1uU3Bhbigp IGNvbnN0CiB7Ci0gICAgaWYgKG1fcHJpbWl0aXZlVW5pdFR5cGUgPT0gQ1NTX0lERU5UICYmIG1f dmFsdWUuaWRlbnQgPT0gQ1NTVmFsdWVBbGwpCisgICAgc3dpdGNoIChtX3ZhbHVlLmlkZW50KSB7 CisgICAgY2FzZSBDU1NWYWx1ZUFsbDoKICAgICAgICAgcmV0dXJuIENvbHVtblNwYW5BbGw7Ci0g ICAgaWYgKG1fcHJpbWl0aXZlVW5pdFR5cGUgPT0gQ1NTX05VTUJFUiAmJiBtX3ZhbHVlLm51bSA9 PSAxKQotICAgICAgICByZXR1cm4gQ29sdW1uU3Bhbk9uZTsKKyAgICBjYXNlIENTU1ZhbHVlTm9u ZToKKyAgICAgICAgcmV0dXJuIENvbHVtblNwYW5Ob25lOworICAgIH0KKwogICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOwotICAgIHJldHVybiBDb2x1bW5TcGFuT25lOworICAgIHJldHVybiBDb2x1 bW5TcGFuTm9uZTsKIH0KIAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3R5bGUvUmVuZGVyU3R5bGUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5k ZXJTdHlsZS5oCmluZGV4IGViZTkxYjQuLjk3NThkOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCkBAIC0xNjY4LDcgKzE2NjgsNyBAQCBwdWJsaWM6 CiAgICAgc3RhdGljIE9yZGVyIGluaXRpYWxSVExPcmRlcmluZygpIHsgcmV0dXJuIExvZ2ljYWxP cmRlcjsgfQogICAgIHN0YXRpYyBmbG9hdCBpbml0aWFsVGV4dFN0cm9rZVdpZHRoKCkgeyByZXR1 cm4gMDsgfQogICAgIHN0YXRpYyB1bnNpZ25lZCBzaG9ydCBpbml0aWFsQ29sdW1uQ291bnQoKSB7 IHJldHVybiAxOyB9Ci0gICAgc3RhdGljIENvbHVtblNwYW4gaW5pdGlhbENvbHVtblNwYW4oKSB7 IHJldHVybiBDb2x1bW5TcGFuT25lOyB9CisgICAgc3RhdGljIENvbHVtblNwYW4gaW5pdGlhbENv bHVtblNwYW4oKSB7IHJldHVybiBDb2x1bW5TcGFuTm9uZTsgfQogICAgIHN0YXRpYyBjb25zdCBU cmFuc2Zvcm1PcGVyYXRpb25zJiBpbml0aWFsVHJhbnNmb3JtKCkgeyBERUZJTkVfU1RBVElDX0xP Q0FMKFRyYW5zZm9ybU9wZXJhdGlvbnMsIG9wcywgKCkpOyByZXR1cm4gb3BzOyB9CiAgICAgc3Rh dGljIExlbmd0aCBpbml0aWFsVHJhbnNmb3JtT3JpZ2luWCgpIHsgcmV0dXJuIExlbmd0aCg1MC4w LCBQZXJjZW50KTsgfQogICAgIHN0YXRpYyBMZW5ndGggaW5pdGlhbFRyYW5zZm9ybU9yaWdpblko KSB7IHJldHVybiBMZW5ndGgoNTAuMCwgUGVyY2VudCk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5oIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmgKaW5kZXggZjlmMzIw OS4uMzc4NDU4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1Jl bmRlclN0eWxlQ29uc3RhbnRzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxl L1JlbmRlclN0eWxlQ29uc3RhbnRzLmgKQEAgLTgxLDcgKzgxLDcgQEAgZW51bSBQc2V1ZG9JZCB7 CiAgICAgUFVCTElDX1BTRVVET0lEX01BU0sgPSAoKDEgPDwgRklSU1RfSU5URVJOQUxfUFNFVURP SUQpIC0gMSkgJiB+KCgxIDw8IEZJUlNUX1BVQkxJQ19QU0VVRE9JRCkgLSAxKQogfTsKIAotZW51 bSBDb2x1bW5TcGFuIHsgQ29sdW1uU3Bhbk9uZSA9IDAsIENvbHVtblNwYW5BbGx9OworZW51bSBD b2x1bW5TcGFuIHsgQ29sdW1uU3Bhbk5vbmUgPSAwLCBDb2x1bW5TcGFuQWxsIH07CiAKIGVudW0g RUJvcmRlckNvbGxhcHNlIHsgQlNFUEFSQVRFID0gMCwgQkNPTExBUFNFID0gMSB9OwogCg== 172863 2012-11-07 13:05:34 -0800 2012-11-27 13:58:26 -0800 Patch 101462_column_span_none.patch text/plain 10475 cdumez ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxNWIzODg4Li42MmQzM2IzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTItMTEt MDcgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAg ICAgICBDU1MzIE11bHRpY29sdW1uOiBjb2x1bW4tc3BhbiBzaG91bGQgYWNjZXB0IHZhbHVlICdu b25lJyAoaW5zdGVhZCBvZiAnMScpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMDE0NjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBVcGRhdGUgZXhwZWN0ZWQgcmVzdWx0cyBmb3Igc2V2ZXJhbCB0ZXN0IGNh c2VzIG5vdyB0aGF0IHRoZQorICAgICAgICBkZWZhdWx0IHZhbHVlIGZvciBjb2x1bW4tc3BhbiBw cm9wZXJ0eSB3YXMgcmVuYW1lZCBmcm9tIDEKKyAgICAgICAgdG8gbm9uZS4KKworICAgICAgICAq IGZhc3QvY3NzL2dldENvbXB1dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtZXhwZWN0ZWQudHh0Ogor ICAgICAgICAqIGZhc3QvY3NzL2dldENvbXB1dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtd2l0aG91 dC1yZW5kZXJlci1leHBlY3RlZC50eHQ6CisgICAgICAgICogZmFzdC9tdWx0aWNvbC9zcGFuL3Nw YW4tYXMtaW1tZWRpYXRlLWNoaWxkLXByb3BlcnR5LXJlbW92YWwuaHRtbDoKKyAgICAgICAgKiBz dmcvY3NzL2dldENvbXB1dGVkU3R5bGUtYmFzaWMtZXhwZWN0ZWQudHh0OgorCiAyMDEyLTExLTA3 ICBQaGlsaXAgUm9nZXJzICA8cGRyQGdvb2dsZS5jb20+CiAKICAgICAgICAgU2tpcCBTVkcgcmVw YWludCB0cmFja2luZyB3aGVuIHBhcmVudCBjb250YWluZXIgdHJhbnNmb3JtcwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS1l eHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1 dGVkLXN0eWxlLWV4cGVjdGVkLnR4dAppbmRleCBjZTA3MDYzLi4wOTczZGZlIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1dGVkLXN0eWxlLWV4 cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2Nv bXB1dGVkLXN0eWxlLWV4cGVjdGVkLnR4dApAQCAtMTQxLDcgKzE0MSw3IEBAIHpvb206IDE7CiAt d2Via2l0LWNvbHVtbi1ydWxlLWNvbG9yOiByZ2IoMCwgMCwgMCk7CiAtd2Via2l0LWNvbHVtbi1y dWxlLXN0eWxlOiBub25lOwogLXdlYmtpdC1jb2x1bW4tcnVsZS13aWR0aDogMHB4OwotLXdlYmtp dC1jb2x1bW4tc3BhbjogMTsKKy13ZWJraXQtY29sdW1uLXNwYW46IG5vbmU7CiAtd2Via2l0LWNv bHVtbi13aWR0aDogYXV0bzsKIC13ZWJraXQtYWxpZ24tY29udGVudDogc3RyZXRjaDsKIC13ZWJr aXQtYWxpZ24taXRlbXM6IHN0cmV0Y2g7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nz cy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1dGVkLXN0eWxlLXdpdGhvdXQtcmVuZGVyZXItZXhwZWN0 ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1z dHlsZS13aXRob3V0LXJlbmRlcmVyLWV4cGVjdGVkLnR4dAppbmRleCA1NWQyOGZlLi43YzM0ZmQy IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1 dGVkLXN0eWxlLXdpdGhvdXQtcmVuZGVyZXItZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3Rz L2Zhc3QvY3NzL2dldENvbXB1dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtd2l0aG91dC1yZW5kZXJl ci1leHBlY3RlZC50eHQKQEAgLTE0MCw3ICsxNDAsNyBAQCB6b29tOiAxCiAtd2Via2l0LWNvbHVt bi1ydWxlLWNvbG9yOiByZ2IoMCwgMCwgMCkKIC13ZWJraXQtY29sdW1uLXJ1bGUtc3R5bGU6IG5v bmUKIC13ZWJraXQtY29sdW1uLXJ1bGUtd2lkdGg6IDBweAotLXdlYmtpdC1jb2x1bW4tc3Bhbjog MQorLXdlYmtpdC1jb2x1bW4tc3Bhbjogbm9uZQogLXdlYmtpdC1jb2x1bW4td2lkdGg6IGF1dG8K IC13ZWJraXQtYWxpZ24tY29udGVudDogc3RyZXRjaAogLXdlYmtpdC1hbGlnbi1pdGVtczogc3Ry ZXRjaApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9zcGFuL3NwYW4tYXMt aW1tZWRpYXRlLWNoaWxkLXByb3BlcnR5LXJlbW92YWwuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qv bXVsdGljb2wvc3Bhbi9zcGFuLWFzLWltbWVkaWF0ZS1jaGlsZC1wcm9wZXJ0eS1yZW1vdmFsLmh0 bWwKaW5kZXggOWY2NTAwMy4uYjdhMjFiMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9t dWx0aWNvbC9zcGFuL3NwYW4tYXMtaW1tZWRpYXRlLWNoaWxkLXByb3BlcnR5LXJlbW92YWwuaHRt bAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL3NwYW4vc3Bhbi1hcy1pbW1lZGlhdGUt Y2hpbGQtcHJvcGVydHktcmVtb3ZhbC5odG1sCkBAIC0xMzIsNyArMTMyLDcgQEAgc2l4Lmluc2Vy dEJlZm9yZShkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnYmFzZScpLmNsb25lTm9kZSh0cnVlKSwg ZG9jdW1lbnQuZ2V0RWwKIDxzY3JpcHQ+CiBzcGFubmVycyA9IGRvY3VtZW50LmdldEVsZW1lbnRz QnlUYWdOYW1lKCdoMicpOwogZm9yIChpID0gMDsgaSA8IHNwYW5uZXJzLmxlbmd0aDsgaSsrKSB7 Ci0gICAgc3Bhbm5lcnNbaV0uc3R5bGUud2Via2l0Q29sdW1uU3BhbiA9IDE7CisgICAgc3Bhbm5l cnNbaV0uc3R5bGUud2Via2l0Q29sdW1uU3BhbiA9ICdub25lJzsKIH0KIDwvc2NyaXB0PgogCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9zdmcvY3NzL2dldENvbXB1dGVkU3R5bGUtYmFzaWMtZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvc3ZnL2Nzcy9nZXRDb21wdXRlZFN0eWxlLWJhc2ljLWV4 cGVjdGVkLnR4dAppbmRleCBlNGVmYjlmLi5jNzQ5M2NkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9zdmcvY3NzL2dldENvbXB1dGVkU3R5bGUtYmFzaWMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91 dFRlc3RzL3N2Zy9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS1iYXNpYy1leHBlY3RlZC50eHQKQEAgLTI4 MCw3ICsyODAsNyBAQCByZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtY29sdW1u LXJ1bGUtc3R5bGUpIDogbm9uZQogcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgtd2Vi a2l0LWNvbHVtbi1ydWxlLXN0eWxlKSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCiByZWN0 OiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtY29sdW1uLXJ1bGUtd2lkdGgpIDogMHB4 CiByZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtY29sdW1uLXJ1bGUtd2lk dGgpIDogW29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KLXJlY3Q6IHN0eWxlLmdldFByb3BlcnR5 VmFsdWUoLXdlYmtpdC1jb2x1bW4tc3BhbikgOiAxCityZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eVZh bHVlKC13ZWJraXQtY29sdW1uLXNwYW4pIDogbm9uZQogcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlD U1NWYWx1ZSgtd2Via2l0LWNvbHVtbi1zcGFuKSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVd CiByZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtY29sdW1uLXdpZHRoKSA6IGF1 dG8KIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1jb2x1bW4td2lkdGgp IDogW29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KQEAgLTc4Miw3ICs3ODIsNyBAQCBnOiBzdHls ZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtY29sdW1uLXJ1bGUtc3R5bGUpIDogbm9uZQogZzog c3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgtd2Via2l0LWNvbHVtbi1ydWxlLXN0eWxlKSA6IFtv YmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCiBnOiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJr aXQtY29sdW1uLXJ1bGUtd2lkdGgpIDogMHB4CiBnOiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVl KC13ZWJraXQtY29sdW1uLXJ1bGUtd2lkdGgpIDogW29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0K LWc6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtpdC1jb2x1bW4tc3BhbikgOiAxCitnOiBz dHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtY29sdW1uLXNwYW4pIDogbm9uZQogZzogc3R5 bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgtd2Via2l0LWNvbHVtbi1zcGFuKSA6IFtvYmplY3QgQ1NT UHJpbWl0aXZlVmFsdWVdCiBnOiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtY29sdW1u LXdpZHRoKSA6IGF1dG8KIGc6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1jb2x1 bW4td2lkdGgpIDogW29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5ODQ1 NmQ3Li4wZGI1ZGJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTItMTEtMDcgIENo cmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAgICAgICBD U1MzIE11bHRpY29sdW1uOiBjb2x1bW4tc3BhbiBzaG91bGQgYWNjZXB0IHZhbHVlICdub25lJyAo aW5zdGVhZCBvZiAnMScpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMDE0NjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBY2NvcmRpbmcgdG8gdGhlIGxhdGVzdCBDU1MzIE11bHRpLWNvbHVtbiBzcGVjaWZp Y2F0aW9uOgorICAgICAgICBodHRwOi8vd3d3LnczLm9yZy9UUi8yMDExL0NSLWNzczMtbXVsdGlj b2wtMjAxMTA0MTIvI2NvbHVtbi1zcGFuCisKKyAgICAgICAgY29sdW1uLXNwYW4gc2hvdWxkIGFj Y2VwdCB2YWx1ZXMgWyBub25lIHwgYWxsIF0sIGluc3RlYWQgb2YKKyAgICAgICAgWyAxIHwgYWxs IF0uIFRoaXMgcGF0Y2ggdXBkYXRlcyBXZWJLaXQgaW1wbGVtZW50YXRpb24gdG8gcmVmbGVjdAor ICAgICAgICB0aGlzIGNoYW5nZSBpbiB0aGUgc3BlY2lmaWNhdGlvbi4KKworICAgICAgICBObyBu ZXcgdGVzdHMsIGFscmVhZHkgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAq IGNzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uOjpnZXRQcm9wZXJ0eUNTU1ZhbHVlKToKKyAgICAg ICAgKiBjc3MvQ1NTUGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6cGFy c2VWYWx1ZSk6CisgICAgICAgICogY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaDoKKyAg ICAgICAgKFdlYkNvcmU6OkNTU1ByaW1pdGl2ZVZhbHVlOjpDU1NQcmltaXRpdmVWYWx1ZSk6Cisg ICAgICAgIChXZWJDb3JlOjpDU1NQcmltaXRpdmVWYWx1ZTo6b3BlcmF0b3IgQ29sdW1uU3Bhbik6 CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmg6CisgICAgICAgICogcmVu ZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmg6CisKIDIwMTItMTEtMDcgIEFkYW0g QmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBbVjhdIEludHJ1c2l2ZURPTVdy YXBwZXJNYXAgaXMgbm8gbG9uZ2VyIG5lZWRlZCBhbmQgY2FuIGJlIGRlbGV0ZWQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwIGIv U291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKaW5kZXgg MWU2ZDIwNy4uNmE5YmYwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1 dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1 dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKQEAgLTE3MTEsOSArMTcxMSw3IEBAIFBhc3NSZWZQdHI8 Q1NTVmFsdWU+IENTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbjo6Z2V0UHJvcGVydHlDU1NWYWx1 ZShDU1NQcm9wZXJ0CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5SdWxlV2lk dGg6CiAgICAgICAgICAgICByZXR1cm4gem9vbUFkanVzdGVkUGl4ZWxWYWx1ZShzdHlsZS0+Y29s dW1uUnVsZVdpZHRoKCksIHN0eWxlLmdldCgpKTsKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eVdl YmtpdENvbHVtblNwYW46Ci0gICAgICAgICAgICBpZiAoc3R5bGUtPmNvbHVtblNwYW4oKSkKLSAg ICAgICAgICAgICAgICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlSWRlbnRpZmllclZhbHVl KENTU1ZhbHVlQWxsKTsKLSAgICAgICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVW YWx1ZSgxLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX05VTUJFUik7CisgICAgICAgICAgICByZXR1 cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKHN0eWxlLT5jb2x1bW5TcGFu KCkgPyBDU1NWYWx1ZUFsbCA6IENTU1ZhbHVlTm9uZSk7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVy dHlXZWJraXRDb2x1bW5CcmVha0FmdGVyOgogICAgICAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9v bCgpLmNyZWF0ZVZhbHVlKHN0eWxlLT5jb2x1bW5CcmVha0FmdGVyKCkpOwogICAgICAgICBjYXNl IENTU1Byb3BlcnR5V2Via2l0Q29sdW1uQnJlYWtCZWZvcmU6CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIu Y3BwCmluZGV4IDhmZjk3YjguLmY0ODhiMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCkBA IC0yNDkxLDExICsyNDkxLDkgQEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNlVmFsdWUoQ1NTUHJvcGVy dHlJRCBwcm9wSWQsIGJvb2wgaW1wb3J0YW50KQogICAgICAgICBpZiAoaWQgPT0gQ1NTVmFsdWVO b3JtYWwgfHwgaWQgPT0gQ1NTVmFsdWVSZXZlcnNlKQogICAgICAgICAgICAgdmFsaWRQcmltaXRp dmUgPSB0cnVlOwogICAgICAgICBicmVhazsKLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29s dW1uU3BhbjogICAgICAgIC8vIGFsbCB8IDEKLSAgICAgICAgaWYgKGlkID09IENTU1ZhbHVlQWxs KQorICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5TcGFuOiAvLyBub25lIHwgYWxsCisg ICAgICAgIGlmIChpZCA9PSBDU1NWYWx1ZUFsbCB8fCBpZCA9PSBDU1NWYWx1ZU5vbmUpCiAgICAg ICAgICAgICB2YWxpZFByaW1pdGl2ZSA9IHRydWU7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAg IHZhbGlkUHJpbWl0aXZlID0gdmFsaWRVbml0KHZhbHVlLCBGTnVtYmVyIHwgRk5vbk5lZykgJiYg dmFsdWUtPmZWYWx1ZSA9PSAxOwogICAgICAgICBicmVhazsKICAgICBjYXNlIENTU1Byb3BlcnR5 V2Via2l0Q29sdW1uV2lkdGg6ICAgICAgICAgLy8gYXV0byB8IDxsZW5ndGg+CiAgICAgICAgIGlm IChpZCA9PSBDU1NWYWx1ZUF1dG8pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT UHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2 ZVZhbHVlTWFwcGluZ3MuaAppbmRleCA5YjE5OGFhLi41OGIxMzI1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgKQEAgLTE0OSwyNiArMTQ5LDI4 IEBAIHRlbXBsYXRlPD4gaW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpvcGVyYXRvciBMaW5lQ2xh bXBWYWx1ZSgpIGNvbnN0CiB0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NT UHJpbWl0aXZlVmFsdWUoQ29sdW1uU3BhbiBjb2x1bW5TcGFuKQogICAgIDogQ1NTVmFsdWUoUHJp bWl0aXZlQ2xhc3MpCiB7CisgICAgbV9wcmltaXRpdmVVbml0VHlwZSA9IENTU19JREVOVDsKICAg ICBzd2l0Y2ggKGNvbHVtblNwYW4pIHsKICAgICBjYXNlIENvbHVtblNwYW5BbGw6Ci0gICAgICAg IG1fcHJpbWl0aXZlVW5pdFR5cGUgPSBDU1NfSURFTlQ7CiAgICAgICAgIG1fdmFsdWUuaWRlbnQg PSBDU1NWYWx1ZUFsbDsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBDb2x1bW5TcGFuT25lOgot ICAgICAgICBtX3ByaW1pdGl2ZVVuaXRUeXBlID0gQ1NTX05VTUJFUjsKLSAgICAgICAgbV92YWx1 ZS5udW0gPSAxOworICAgIGNhc2UgQ29sdW1uU3Bhbk5vbmU6CisgICAgICAgIG1fdmFsdWUuaWRl bnQgPSBDU1NWYWx1ZU5vbmU7CiAgICAgICAgIGJyZWFrOwogICAgIH0KIH0KIAogdGVtcGxhdGU8 PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9yIENvbHVtblNwYW4oKSBjb25zdAog ewotICAgIGlmIChtX3ByaW1pdGl2ZVVuaXRUeXBlID09IENTU19JREVOVCAmJiBtX3ZhbHVlLmlk ZW50ID09IENTU1ZhbHVlQWxsKQorICAgIHN3aXRjaCAobV92YWx1ZS5pZGVudCkgeworICAgIGNh c2UgQ1NTVmFsdWVBbGw6CiAgICAgICAgIHJldHVybiBDb2x1bW5TcGFuQWxsOwotICAgIGlmICht X3ByaW1pdGl2ZVVuaXRUeXBlID09IENTU19OVU1CRVIgJiYgbV92YWx1ZS5udW0gPT0gMSkKLSAg ICAgICAgcmV0dXJuIENvbHVtblNwYW5PbmU7CisgICAgY2FzZSBDU1NWYWx1ZU5vbmU6CisgICAg ICAgIHJldHVybiBDb2x1bW5TcGFuTm9uZTsKKyAgICB9CisKICAgICBBU1NFUlRfTk9UX1JFQUNI RUQoKTsKLSAgICByZXR1cm4gQ29sdW1uU3Bhbk9uZTsKKyAgICByZXR1cm4gQ29sdW1uU3Bhbk5v bmU7CiB9CiAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1Jl bmRlclN0eWxlLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUu aAppbmRleCAyMjBjZWY1Li41NTBiNzhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3R5bGUvUmVuZGVyU3R5bGUuaApAQCAtMTY2OCw3ICsxNjY4LDcgQEAgcHVibGljOgogICAgIHN0 YXRpYyBPcmRlciBpbml0aWFsUlRMT3JkZXJpbmcoKSB7IHJldHVybiBMb2dpY2FsT3JkZXI7IH0K ICAgICBzdGF0aWMgZmxvYXQgaW5pdGlhbFRleHRTdHJva2VXaWR0aCgpIHsgcmV0dXJuIDA7IH0K ICAgICBzdGF0aWMgdW5zaWduZWQgc2hvcnQgaW5pdGlhbENvbHVtbkNvdW50KCkgeyByZXR1cm4g MTsgfQotICAgIHN0YXRpYyBDb2x1bW5TcGFuIGluaXRpYWxDb2x1bW5TcGFuKCkgeyByZXR1cm4g Q29sdW1uU3Bhbk9uZTsgfQorICAgIHN0YXRpYyBDb2x1bW5TcGFuIGluaXRpYWxDb2x1bW5TcGFu KCkgeyByZXR1cm4gQ29sdW1uU3Bhbk5vbmU7IH0KICAgICBzdGF0aWMgY29uc3QgVHJhbnNmb3Jt T3BlcmF0aW9ucyYgaW5pdGlhbFRyYW5zZm9ybSgpIHsgREVGSU5FX1NUQVRJQ19MT0NBTChUcmFu c2Zvcm1PcGVyYXRpb25zLCBvcHMsICgpKTsgcmV0dXJuIG9wczsgfQogICAgIHN0YXRpYyBMZW5n dGggaW5pdGlhbFRyYW5zZm9ybU9yaWdpblgoKSB7IHJldHVybiBMZW5ndGgoNTAuMCwgUGVyY2Vu dCk7IH0KICAgICBzdGF0aWMgTGVuZ3RoIGluaXRpYWxUcmFuc2Zvcm1PcmlnaW5ZKCkgeyByZXR1 cm4gTGVuZ3RoKDUwLjAsIFBlcmNlbnQpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGVDb25zdGFudHMuaCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5oCmluZGV4IGY5ZjMyMDkuLjM3ODQ1 ODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHls ZUNvbnN0YW50cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJT dHlsZUNvbnN0YW50cy5oCkBAIC04MSw3ICs4MSw3IEBAIGVudW0gUHNldWRvSWQgewogICAgIFBV QkxJQ19QU0VVRE9JRF9NQVNLID0gKCgxIDw8IEZJUlNUX0lOVEVSTkFMX1BTRVVET0lEKSAtIDEp ICYgfigoMSA8PCBGSVJTVF9QVUJMSUNfUFNFVURPSUQpIC0gMSkKIH07CiAKLWVudW0gQ29sdW1u U3BhbiB7IENvbHVtblNwYW5PbmUgPSAwLCBDb2x1bW5TcGFuQWxsfTsKK2VudW0gQ29sdW1uU3Bh biB7IENvbHVtblNwYW5Ob25lID0gMCwgQ29sdW1uU3BhbkFsbCB9OwogCiBlbnVtIEVCb3JkZXJD b2xsYXBzZSB7IEJTRVBBUkFURSA9IDAsIEJDT0xMQVBTRSA9IDEgfTsKIAo= 176334 2012-11-27 13:58:26 -0800 2012-11-27 14:29:01 -0800 Patch 101462_column_span_none2.patch text/plain 10533 cdumez ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0YWM2NWRlLi5mNWNmY2NkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTItMTEt MjcgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAg ICAgICBDU1MzIE11bHRpY29sdW1uOiBjb2x1bW4tc3BhbiBzaG91bGQgYWNjZXB0IHZhbHVlICdu b25lJyAoaW5zdGVhZCBvZiAnMScpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMDE0NjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBVcGRhdGUgZXhwZWN0ZWQgcmVzdWx0cyBmb3Igc2V2ZXJhbCB0ZXN0IGNh c2VzIG5vdyB0aGF0IHRoZQorICAgICAgICBkZWZhdWx0IHZhbHVlIGZvciBjb2x1bW4tc3BhbiBw cm9wZXJ0eSB3YXMgcmVuYW1lZCBmcm9tIDEKKyAgICAgICAgdG8gbm9uZS4KKworICAgICAgICAq IGZhc3QvY3NzL2dldENvbXB1dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtZXhwZWN0ZWQudHh0Ogor ICAgICAgICAqIGZhc3QvY3NzL2dldENvbXB1dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtd2l0aG91 dC1yZW5kZXJlci1leHBlY3RlZC50eHQ6CisgICAgICAgICogZmFzdC9tdWx0aWNvbC9zcGFuL3Nw YW4tYXMtaW1tZWRpYXRlLWNoaWxkLXByb3BlcnR5LXJlbW92YWwuaHRtbDoKKyAgICAgICAgKiBz dmcvY3NzL2dldENvbXB1dGVkU3R5bGUtYmFzaWMtZXhwZWN0ZWQudHh0OgorCiAyMDEyLTExLTI3 ICBBYXJvbiBDb2x3ZWxsICA8YWNvbHdlbGxAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVzZS1h ZnRlci1mcmVlIGluIG1lZGlhIHBsYXllciBoYW5kbGluZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvZmFzdC9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS1leHBlY3RlZC50eHQg Yi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1dGVkLXN0eWxlLWV4 cGVjdGVkLnR4dAppbmRleCBjZTA3MDYzLi4wOTczZGZlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1dGVkLXN0eWxlLWV4cGVjdGVkLnR4dAor KysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1dGVkLXN0eWxl LWV4cGVjdGVkLnR4dApAQCAtMTQxLDcgKzE0MSw3IEBAIHpvb206IDE7CiAtd2Via2l0LWNvbHVt bi1ydWxlLWNvbG9yOiByZ2IoMCwgMCwgMCk7CiAtd2Via2l0LWNvbHVtbi1ydWxlLXN0eWxlOiBu b25lOwogLXdlYmtpdC1jb2x1bW4tcnVsZS13aWR0aDogMHB4OwotLXdlYmtpdC1jb2x1bW4tc3Bh bjogMTsKKy13ZWJraXQtY29sdW1uLXNwYW46IG5vbmU7CiAtd2Via2l0LWNvbHVtbi13aWR0aDog YXV0bzsKIC13ZWJraXQtYWxpZ24tY29udGVudDogc3RyZXRjaDsKIC13ZWJraXQtYWxpZ24taXRl bXM6IHN0cmV0Y2g7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRl ZFN0eWxlL2NvbXB1dGVkLXN0eWxlLXdpdGhvdXQtcmVuZGVyZXItZXhwZWN0ZWQudHh0IGIvTGF5 b3V0VGVzdHMvZmFzdC9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS13aXRob3V0 LXJlbmRlcmVyLWV4cGVjdGVkLnR4dAppbmRleCA1NWQyOGZlLi43YzM0ZmQyIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1dGVkLXN0eWxlLXdp dGhvdXQtcmVuZGVyZXItZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2dl dENvbXB1dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtd2l0aG91dC1yZW5kZXJlci1leHBlY3RlZC50 eHQKQEAgLTE0MCw3ICsxNDAsNyBAQCB6b29tOiAxCiAtd2Via2l0LWNvbHVtbi1ydWxlLWNvbG9y OiByZ2IoMCwgMCwgMCkKIC13ZWJraXQtY29sdW1uLXJ1bGUtc3R5bGU6IG5vbmUKIC13ZWJraXQt Y29sdW1uLXJ1bGUtd2lkdGg6IDBweAotLXdlYmtpdC1jb2x1bW4tc3BhbjogMQorLXdlYmtpdC1j b2x1bW4tc3Bhbjogbm9uZQogLXdlYmtpdC1jb2x1bW4td2lkdGg6IGF1dG8KIC13ZWJraXQtYWxp Z24tY29udGVudDogc3RyZXRjaAogLXdlYmtpdC1hbGlnbi1pdGVtczogc3RyZXRjaApkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9zcGFuL3NwYW4tYXMtaW1tZWRpYXRlLWNo aWxkLXByb3BlcnR5LXJlbW92YWwuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvc3Bh bi9zcGFuLWFzLWltbWVkaWF0ZS1jaGlsZC1wcm9wZXJ0eS1yZW1vdmFsLmh0bWwKaW5kZXggOWY2 NTAwMy4uYjdhMjFiMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9zcGFu L3NwYW4tYXMtaW1tZWRpYXRlLWNoaWxkLXByb3BlcnR5LXJlbW92YWwuaHRtbAorKysgYi9MYXlv dXRUZXN0cy9mYXN0L211bHRpY29sL3NwYW4vc3Bhbi1hcy1pbW1lZGlhdGUtY2hpbGQtcHJvcGVy dHktcmVtb3ZhbC5odG1sCkBAIC0xMzIsNyArMTMyLDcgQEAgc2l4Lmluc2VydEJlZm9yZShkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgnYmFzZScpLmNsb25lTm9kZSh0cnVlKSwgZG9jdW1lbnQuZ2V0 RWwKIDxzY3JpcHQ+CiBzcGFubmVycyA9IGRvY3VtZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCdo MicpOwogZm9yIChpID0gMDsgaSA8IHNwYW5uZXJzLmxlbmd0aDsgaSsrKSB7Ci0gICAgc3Bhbm5l cnNbaV0uc3R5bGUud2Via2l0Q29sdW1uU3BhbiA9IDE7CisgICAgc3Bhbm5lcnNbaV0uc3R5bGUu d2Via2l0Q29sdW1uU3BhbiA9ICdub25lJzsKIH0KIDwvc2NyaXB0PgogCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9zdmcvY3NzL2dldENvbXB1dGVkU3R5bGUtYmFzaWMtZXhwZWN0ZWQudHh0IGIv TGF5b3V0VGVzdHMvc3ZnL2Nzcy9nZXRDb21wdXRlZFN0eWxlLWJhc2ljLWV4cGVjdGVkLnR4dApp bmRleCBlNGVmYjlmLi5jNzQ5M2NkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9zdmcvY3NzL2dl dENvbXB1dGVkU3R5bGUtYmFzaWMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL3N2Zy9j c3MvZ2V0Q29tcHV0ZWRTdHlsZS1iYXNpYy1leHBlY3RlZC50eHQKQEAgLTI4MCw3ICsyODAsNyBA QCByZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtY29sdW1uLXJ1bGUtc3R5bGUp IDogbm9uZQogcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgtd2Via2l0LWNvbHVtbi1y dWxlLXN0eWxlKSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCiByZWN0OiBzdHlsZS5nZXRQ cm9wZXJ0eVZhbHVlKC13ZWJraXQtY29sdW1uLXJ1bGUtd2lkdGgpIDogMHB4CiByZWN0OiBzdHls ZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtY29sdW1uLXJ1bGUtd2lkdGgpIDogW29iamVj dCBDU1NQcmltaXRpdmVWYWx1ZV0KLXJlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtp dC1jb2x1bW4tc3BhbikgOiAxCityZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQt Y29sdW1uLXNwYW4pIDogbm9uZQogcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgtd2Vi a2l0LWNvbHVtbi1zcGFuKSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCiByZWN0OiBzdHls ZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtY29sdW1uLXdpZHRoKSA6IGF1dG8KIHJlY3Q6IHN0 eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1jb2x1bW4td2lkdGgpIDogW29iamVjdCBD U1NQcmltaXRpdmVWYWx1ZV0KQEAgLTc4Miw3ICs3ODIsNyBAQCBnOiBzdHlsZS5nZXRQcm9wZXJ0 eVZhbHVlKC13ZWJraXQtY29sdW1uLXJ1bGUtc3R5bGUpIDogbm9uZQogZzogc3R5bGUuZ2V0UHJv cGVydHlDU1NWYWx1ZSgtd2Via2l0LWNvbHVtbi1ydWxlLXN0eWxlKSA6IFtvYmplY3QgQ1NTUHJp bWl0aXZlVmFsdWVdCiBnOiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtY29sdW1uLXJ1 bGUtd2lkdGgpIDogMHB4CiBnOiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtY29s dW1uLXJ1bGUtd2lkdGgpIDogW29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KLWc6IHN0eWxlLmdl dFByb3BlcnR5VmFsdWUoLXdlYmtpdC1jb2x1bW4tc3BhbikgOiAxCitnOiBzdHlsZS5nZXRQcm9w ZXJ0eVZhbHVlKC13ZWJraXQtY29sdW1uLXNwYW4pIDogbm9uZQogZzogc3R5bGUuZ2V0UHJvcGVy dHlDU1NWYWx1ZSgtd2Via2l0LWNvbHVtbi1zcGFuKSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFs dWVdCiBnOiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtY29sdW1uLXdpZHRoKSA6IGF1 dG8KIGc6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1jb2x1bW4td2lkdGgpIDog W29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3OTRlZDBkLi45OTczMDAy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTItMTEtMjcgIENocmlzdG9waGUgRHVt ZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAgICAgICBDU1MzIE11bHRpY29s dW1uOiBjb2x1bW4tc3BhbiBzaG91bGQgYWNjZXB0IHZhbHVlICdub25lJyAoaW5zdGVhZCBvZiAn MScpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDE0 NjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBY2Nv cmRpbmcgdG8gdGhlIGxhdGVzdCBDU1MzIE11bHRpLWNvbHVtbiBzcGVjaWZpY2F0aW9uOgorICAg ICAgICBodHRwOi8vd3d3LnczLm9yZy9UUi8yMDExL0NSLWNzczMtbXVsdGljb2wtMjAxMTA0MTIv I2NvbHVtbi1zcGFuCisKKyAgICAgICAgY29sdW1uLXNwYW4gc2hvdWxkIGFjY2VwdCB2YWx1ZXMg WyBub25lIHwgYWxsIF0sIGluc3RlYWQgb2YKKyAgICAgICAgWyAxIHwgYWxsIF0uIFRoaXMgcGF0 Y2ggdXBkYXRlcyBXZWJLaXQgaW1wbGVtZW50YXRpb24gdG8gcmVmbGVjdAorICAgICAgICB0aGlz IGNoYW5nZSBpbiB0aGUgc3BlY2lmaWNhdGlvbi4gVGhlIHZhbHVlIDEgaXMgc3RpbGwgc3VwcG9y dGVkCisgICAgICAgIGZvciBjb21wYXRpYmlsaXR5IHJlYXNvbnMgYW5kIGlzIG1hcHBlZCB0byBu b25lLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgYWxyZWFkeSBjb3ZlcmVkIGJ5IGV4aXN0aW5n IHRlc3RzLgorCisgICAgICAgICogY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb246OmdldFByb3Bl cnR5Q1NTVmFsdWUpOgorICAgICAgICAqIGNzcy9DU1NQYXJzZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Q1NTUGFyc2VyOjpwYXJzZVZhbHVlKToKKyAgICAgICAgKiBjc3MvQ1NTUHJpbWl0aXZl VmFsdWVNYXBwaW5ncy5oOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJpbWl0aXZlVmFsdWU6OkNT U1ByaW1pdGl2ZVZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1ByaW1pdGl2ZVZhbHVlOjpv cGVyYXRvciBDb2x1bW5TcGFuKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5 bGUuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGVDb25zdGFudHMuaDoK KwogMjAxMi0xMS0yNyAgQWFyb24gQ29sd2VsbCAgPGFjb2x3ZWxsQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBVc2UtYWZ0ZXItZnJlZSBpbiBtZWRpYSBwbGF5ZXIgaGFuZGxpbmcKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwIGIv U291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKaW5kZXgg YjEyN2FhOS4uNWQ2YmExYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1 dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1 dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKQEAgLTE3MTUsOSArMTcxNSw3IEBAIFBhc3NSZWZQdHI8 Q1NTVmFsdWU+IENTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbjo6Z2V0UHJvcGVydHlDU1NWYWx1 ZShDU1NQcm9wZXJ0CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5SdWxlV2lk dGg6CiAgICAgICAgICAgICByZXR1cm4gem9vbUFkanVzdGVkUGl4ZWxWYWx1ZShzdHlsZS0+Y29s dW1uUnVsZVdpZHRoKCksIHN0eWxlLmdldCgpKTsKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eVdl YmtpdENvbHVtblNwYW46Ci0gICAgICAgICAgICBpZiAoc3R5bGUtPmNvbHVtblNwYW4oKSkKLSAg ICAgICAgICAgICAgICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlSWRlbnRpZmllclZhbHVl KENTU1ZhbHVlQWxsKTsKLSAgICAgICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVW YWx1ZSgxLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX05VTUJFUik7CisgICAgICAgICAgICByZXR1 cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKHN0eWxlLT5jb2x1bW5TcGFu KCkgPyBDU1NWYWx1ZUFsbCA6IENTU1ZhbHVlTm9uZSk7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVy dHlXZWJraXRDb2x1bW5CcmVha0FmdGVyOgogICAgICAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9v bCgpLmNyZWF0ZVZhbHVlKHN0eWxlLT5jb2x1bW5CcmVha0FmdGVyKCkpOwogICAgICAgICBjYXNl IENTU1Byb3BlcnR5V2Via2l0Q29sdW1uQnJlYWtCZWZvcmU6CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIu Y3BwCmluZGV4IDBhMGYxZDQuLmM1NWViNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCkBA IC0yNTIxLDggKzI1MjEsOCBAQCBib29sIENTU1BhcnNlcjo6cGFyc2VWYWx1ZShDU1NQcm9wZXJ0 eUlEIHByb3BJZCwgYm9vbCBpbXBvcnRhbnQpCiAgICAgICAgIGlmIChpZCA9PSBDU1NWYWx1ZU5v cm1hbCB8fCBpZCA9PSBDU1NWYWx1ZVJldmVyc2UpCiAgICAgICAgICAgICB2YWxpZFByaW1pdGl2 ZSA9IHRydWU7CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1 bW5TcGFuOiAgICAgICAgLy8gYWxsIHwgMQotICAgICAgICBpZiAoaWQgPT0gQ1NTVmFsdWVBbGwp CisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVtblNwYW46IC8vIG5vbmUgfCBhbGwgfCAx CisgICAgICAgIGlmIChpZCA9PSBDU1NWYWx1ZUFsbCB8fCBpZCA9PSBDU1NWYWx1ZU5vbmUpCiAg ICAgICAgICAgICB2YWxpZFByaW1pdGl2ZSA9IHRydWU7CiAgICAgICAgIGVsc2UKICAgICAgICAg ICAgIHZhbGlkUHJpbWl0aXZlID0gdmFsaWRVbml0KHZhbHVlLCBGTnVtYmVyIHwgRk5vbk5lZykg JiYgdmFsdWUtPmZWYWx1ZSA9PSAxOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NT U1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRp dmVWYWx1ZU1hcHBpbmdzLmgKaW5kZXggMjJmOWZiNy4uZGIxMGFjYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oCkBAIC0xNDksMjYgKzE0OSwz MiBAQCB0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6b3BlcmF0b3IgTGluZUNs YW1wVmFsdWUoKSBjb25zdAogdGVtcGxhdGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6OkNT U1ByaW1pdGl2ZVZhbHVlKENvbHVtblNwYW4gY29sdW1uU3BhbikKICAgICA6IENTU1ZhbHVlKFBy aW1pdGl2ZUNsYXNzKQogeworICAgIG1fcHJpbWl0aXZlVW5pdFR5cGUgPSBDU1NfSURFTlQ7CiAg ICAgc3dpdGNoIChjb2x1bW5TcGFuKSB7CiAgICAgY2FzZSBDb2x1bW5TcGFuQWxsOgotICAgICAg ICBtX3ByaW1pdGl2ZVVuaXRUeXBlID0gQ1NTX0lERU5UOwogICAgICAgICBtX3ZhbHVlLmlkZW50 ID0gQ1NTVmFsdWVBbGw7CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgQ29sdW1uU3Bhbk9uZToK LSAgICAgICAgbV9wcmltaXRpdmVVbml0VHlwZSA9IENTU19OVU1CRVI7Ci0gICAgICAgIG1fdmFs dWUubnVtID0gMTsKKyAgICBjYXNlIENvbHVtblNwYW5Ob25lOgorICAgICAgICBtX3ZhbHVlLmlk ZW50ID0gQ1NTVmFsdWVOb25lOwogICAgICAgICBicmVhazsKICAgICB9CiB9CiAKIHRlbXBsYXRl PD4gaW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpvcGVyYXRvciBDb2x1bW5TcGFuKCkgY29uc3QK IHsKLSAgICBpZiAobV9wcmltaXRpdmVVbml0VHlwZSA9PSBDU1NfSURFTlQgJiYgbV92YWx1ZS5p ZGVudCA9PSBDU1NWYWx1ZUFsbCkKLSAgICAgICAgcmV0dXJuIENvbHVtblNwYW5BbGw7CisgICAg Ly8gTWFwIDEgdG8gbm9uZSBmb3IgY29tcGF0aWJpbGl0eSByZWFzb25zLgogICAgIGlmIChtX3By aW1pdGl2ZVVuaXRUeXBlID09IENTU19OVU1CRVIgJiYgbV92YWx1ZS5udW0gPT0gMSkKLSAgICAg ICAgcmV0dXJuIENvbHVtblNwYW5PbmU7CisgICAgICAgIHJldHVybiBDb2x1bW5TcGFuTm9uZTsK KworICAgIHN3aXRjaCAobV92YWx1ZS5pZGVudCkgeworICAgIGNhc2UgQ1NTVmFsdWVBbGw6Cisg ICAgICAgIHJldHVybiBDb2x1bW5TcGFuQWxsOworICAgIGNhc2UgQ1NTVmFsdWVOb25lOgorICAg ICAgICByZXR1cm4gQ29sdW1uU3Bhbk5vbmU7CisgICAgfQorCiAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7Ci0gICAgcmV0dXJuIENvbHVtblNwYW5PbmU7CisgICAgcmV0dXJuIENvbHVtblNwYW5O b25lOwogfQogCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9S ZW5kZXJTdHlsZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxl LmgKaW5kZXggMzE5OTZmYS4uMmY4YWU2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3N0eWxlL1JlbmRlclN0eWxlLmgKQEAgLTE2NzQsNyArMTY3NCw3IEBAIHB1YmxpYzoKICAgICBz dGF0aWMgT3JkZXIgaW5pdGlhbFJUTE9yZGVyaW5nKCkgeyByZXR1cm4gTG9naWNhbE9yZGVyOyB9 CiAgICAgc3RhdGljIGZsb2F0IGluaXRpYWxUZXh0U3Ryb2tlV2lkdGgoKSB7IHJldHVybiAwOyB9 CiAgICAgc3RhdGljIHVuc2lnbmVkIHNob3J0IGluaXRpYWxDb2x1bW5Db3VudCgpIHsgcmV0dXJu IDE7IH0KLSAgICBzdGF0aWMgQ29sdW1uU3BhbiBpbml0aWFsQ29sdW1uU3BhbigpIHsgcmV0dXJu IENvbHVtblNwYW5PbmU7IH0KKyAgICBzdGF0aWMgQ29sdW1uU3BhbiBpbml0aWFsQ29sdW1uU3Bh bigpIHsgcmV0dXJuIENvbHVtblNwYW5Ob25lOyB9CiAgICAgc3RhdGljIGNvbnN0IFRyYW5zZm9y bU9wZXJhdGlvbnMmIGluaXRpYWxUcmFuc2Zvcm0oKSB7IERFRklORV9TVEFUSUNfTE9DQUwoVHJh bnNmb3JtT3BlcmF0aW9ucywgb3BzLCAoKSk7IHJldHVybiBvcHM7IH0KICAgICBzdGF0aWMgTGVu Z3RoIGluaXRpYWxUcmFuc2Zvcm1PcmlnaW5YKCkgeyByZXR1cm4gTGVuZ3RoKDUwLjAsIFBlcmNl bnQpOyB9CiAgICAgc3RhdGljIExlbmd0aCBpbml0aWFsVHJhbnNmb3JtT3JpZ2luWSgpIHsgcmV0 dXJuIExlbmd0aCg1MC4wLCBQZXJjZW50KTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGVDb25zdGFudHMuaAppbmRleCA3MmUwYzRjLi5iZmMx YTVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5 bGVDb25zdGFudHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVy U3R5bGVDb25zdGFudHMuaApAQCAtODEsNyArODEsNyBAQCBlbnVtIFBzZXVkb0lkIHsKICAgICBQ VUJMSUNfUFNFVURPSURfTUFTSyA9ICgoMSA8PCBGSVJTVF9JTlRFUk5BTF9QU0VVRE9JRCkgLSAx KSAmIH4oKDEgPDwgRklSU1RfUFVCTElDX1BTRVVET0lEKSAtIDEpCiB9OwogCi1lbnVtIENvbHVt blNwYW4geyBDb2x1bW5TcGFuT25lID0gMCwgQ29sdW1uU3BhbkFsbH07CitlbnVtIENvbHVtblNw YW4geyBDb2x1bW5TcGFuTm9uZSA9IDAsIENvbHVtblNwYW5BbGwgfTsKIAogZW51bSBFQm9yZGVy Q29sbGFwc2UgeyBCU0VQQVJBVEUgPSAwLCBCQ09MTEFQU0UgPSAxIH07CiAK 176339 2012-11-27 14:29:01 -0800 2012-11-28 13:31:03 -0800 Patch 101462_column_span_none2.patch text/plain 9824 cdumez ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0YWM2NWRlLi45OWI3MWI2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMTEt MjcgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAg ICAgICBDU1MzIE11bHRpY29sdW1uOiBjb2x1bW4tc3BhbiBzaG91bGQgYWNjZXB0IHZhbHVlICdu b25lJyAoaW5zdGVhZCBvZiAnMScpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMDE0NjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBVcGRhdGUgZXhwZWN0ZWQgcmVzdWx0cyBmb3Igc2V2ZXJhbCB0ZXN0IGNh c2VzIG5vdyB0aGF0IHRoZQorICAgICAgICBkZWZhdWx0IHZhbHVlIGZvciBjb2x1bW4tc3BhbiBw cm9wZXJ0eSB3YXMgcmVuYW1lZCBmcm9tIDEKKyAgICAgICAgdG8gbm9uZS4KKworICAgICAgICAq IGZhc3QvY3NzL2dldENvbXB1dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtZXhwZWN0ZWQudHh0Ogor ICAgICAgICAqIGZhc3QvY3NzL2dldENvbXB1dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtd2l0aG91 dC1yZW5kZXJlci1leHBlY3RlZC50eHQ6CisgICAgICAgICogc3ZnL2Nzcy9nZXRDb21wdXRlZFN0 eWxlLWJhc2ljLWV4cGVjdGVkLnR4dDoKKwogMjAxMi0xMS0yNyAgQWFyb24gQ29sd2VsbCAgPGFj b2x3ZWxsQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVc2UtYWZ0ZXItZnJlZSBpbiBtZWRpYSBw bGF5ZXIgaGFuZGxpbmcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL2dldENvbXB1 dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9j c3MvZ2V0Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS1leHBlY3RlZC50eHQKaW5kZXggY2Uw NzA2My4uMDk3M2RmZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZ2V0Q29tcHV0 ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZmFz dC9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS1leHBlY3RlZC50eHQKQEAgLTE0 MSw3ICsxNDEsNyBAQCB6b29tOiAxOwogLXdlYmtpdC1jb2x1bW4tcnVsZS1jb2xvcjogcmdiKDAs IDAsIDApOwogLXdlYmtpdC1jb2x1bW4tcnVsZS1zdHlsZTogbm9uZTsKIC13ZWJraXQtY29sdW1u LXJ1bGUtd2lkdGg6IDBweDsKLS13ZWJraXQtY29sdW1uLXNwYW46IDE7Cistd2Via2l0LWNvbHVt bi1zcGFuOiBub25lOwogLXdlYmtpdC1jb2x1bW4td2lkdGg6IGF1dG87CiAtd2Via2l0LWFsaWdu LWNvbnRlbnQ6IHN0cmV0Y2g7CiAtd2Via2l0LWFsaWduLWl0ZW1zOiBzdHJldGNoOwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1zdHls ZS13aXRob3V0LXJlbmRlcmVyLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2dl dENvbXB1dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtd2l0aG91dC1yZW5kZXJlci1leHBlY3RlZC50 eHQKaW5kZXggNTVkMjhmZS4uN2MzNGZkMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9j c3MvZ2V0Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS13aXRob3V0LXJlbmRlcmVyLWV4cGVj dGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1 dGVkLXN0eWxlLXdpdGhvdXQtcmVuZGVyZXItZXhwZWN0ZWQudHh0CkBAIC0xNDAsNyArMTQwLDcg QEAgem9vbTogMQogLXdlYmtpdC1jb2x1bW4tcnVsZS1jb2xvcjogcmdiKDAsIDAsIDApCiAtd2Vi a2l0LWNvbHVtbi1ydWxlLXN0eWxlOiBub25lCiAtd2Via2l0LWNvbHVtbi1ydWxlLXdpZHRoOiAw cHgKLS13ZWJraXQtY29sdW1uLXNwYW46IDEKKy13ZWJraXQtY29sdW1uLXNwYW46IG5vbmUKIC13 ZWJraXQtY29sdW1uLXdpZHRoOiBhdXRvCiAtd2Via2l0LWFsaWduLWNvbnRlbnQ6IHN0cmV0Y2gK IC13ZWJraXQtYWxpZ24taXRlbXM6IHN0cmV0Y2gKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3N2 Zy9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS1iYXNpYy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9z dmcvY3NzL2dldENvbXB1dGVkU3R5bGUtYmFzaWMtZXhwZWN0ZWQudHh0CmluZGV4IGU0ZWZiOWYu LmM3NDkzY2QgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3N2Zy9jc3MvZ2V0Q29tcHV0ZWRTdHls ZS1iYXNpYy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvc3ZnL2Nzcy9nZXRDb21wdXRl ZFN0eWxlLWJhc2ljLWV4cGVjdGVkLnR4dApAQCAtMjgwLDcgKzI4MCw3IEBAIHJlY3Q6IHN0eWxl LmdldFByb3BlcnR5VmFsdWUoLXdlYmtpdC1jb2x1bW4tcnVsZS1zdHlsZSkgOiBub25lCiByZWN0 OiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtY29sdW1uLXJ1bGUtc3R5bGUpIDog W29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUo LXdlYmtpdC1jb2x1bW4tcnVsZS13aWR0aCkgOiAwcHgKIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5 Q1NTVmFsdWUoLXdlYmtpdC1jb2x1bW4tcnVsZS13aWR0aCkgOiBbb2JqZWN0IENTU1ByaW1pdGl2 ZVZhbHVlXQotcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LWNvbHVtbi1zcGFu KSA6IDEKK3JlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtpdC1jb2x1bW4tc3Bhbikg OiBub25lCiByZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtY29sdW1uLXNw YW4pIDogW29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5 VmFsdWUoLXdlYmtpdC1jb2x1bW4td2lkdGgpIDogYXV0bwogcmVjdDogc3R5bGUuZ2V0UHJvcGVy dHlDU1NWYWx1ZSgtd2Via2l0LWNvbHVtbi13aWR0aCkgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZh bHVlXQpAQCAtNzgyLDcgKzc4Miw3IEBAIGc6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtp dC1jb2x1bW4tcnVsZS1zdHlsZSkgOiBub25lCiBnOiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVl KC13ZWJraXQtY29sdW1uLXJ1bGUtc3R5bGUpIDogW29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0K IGc6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtpdC1jb2x1bW4tcnVsZS13aWR0aCkgOiAw cHgKIGc6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1jb2x1bW4tcnVsZS13aWR0 aCkgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQotZzogc3R5bGUuZ2V0UHJvcGVydHlWYWx1 ZSgtd2Via2l0LWNvbHVtbi1zcGFuKSA6IDEKK2c6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdl YmtpdC1jb2x1bW4tc3BhbikgOiBub25lCiBnOiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13 ZWJraXQtY29sdW1uLXNwYW4pIDogW29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KIGc6IHN0eWxl LmdldFByb3BlcnR5VmFsdWUoLXdlYmtpdC1jb2x1bW4td2lkdGgpIDogYXV0bwogZzogc3R5bGUu Z2V0UHJvcGVydHlDU1NWYWx1ZSgtd2Via2l0LWNvbHVtbi13aWR0aCkgOiBbb2JqZWN0IENTU1By aW1pdGl2ZVZhbHVlXQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDc5NGVkMGQuLjk5NzMwMDIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwzMCBAQAorMjAxMi0xMS0yNyAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9w aGUuZHVtZXpAaW50ZWwuY29tPgorCisgICAgICAgIENTUzMgTXVsdGljb2x1bW46IGNvbHVtbi1z cGFuIHNob3VsZCBhY2NlcHQgdmFsdWUgJ25vbmUnIChpbnN0ZWFkIG9mICcxJykKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTQ2MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFjY29yZGluZyB0byB0aGUg bGF0ZXN0IENTUzMgTXVsdGktY29sdW1uIHNwZWNpZmljYXRpb246CisgICAgICAgIGh0dHA6Ly93 d3cudzMub3JnL1RSLzIwMTEvQ1ItY3NzMy1tdWx0aWNvbC0yMDExMDQxMi8jY29sdW1uLXNwYW4K KworICAgICAgICBjb2x1bW4tc3BhbiBzaG91bGQgYWNjZXB0IHZhbHVlcyBbIG5vbmUgfCBhbGwg XSwgaW5zdGVhZCBvZgorICAgICAgICBbIDEgfCBhbGwgXS4gVGhpcyBwYXRjaCB1cGRhdGVzIFdl YktpdCBpbXBsZW1lbnRhdGlvbiB0byByZWZsZWN0CisgICAgICAgIHRoaXMgY2hhbmdlIGluIHRo ZSBzcGVjaWZpY2F0aW9uLiBUaGUgdmFsdWUgMSBpcyBzdGlsbCBzdXBwb3J0ZWQKKyAgICAgICAg Zm9yIGNvbXBhdGliaWxpdHkgcmVhc29ucyBhbmQgaXMgbWFwcGVkIHRvIG5vbmUuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzLCBhbHJlYWR5IGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAg ICAgICAgKiBjc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkNTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbjo6Z2V0UHJvcGVydHlDU1NWYWx1ZSk6 CisgICAgICAgICogY3NzL0NTU1BhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJz ZXI6OnBhcnNlVmFsdWUpOgorICAgICAgICAqIGNzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdz Lmg6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZlVmFs dWUpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9yIENvbHVt blNwYW4pOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oOgorICAgICAg ICAqIHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5oOgorCiAyMDEyLTExLTI3 ICBBYXJvbiBDb2x3ZWxsICA8YWNvbHdlbGxAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVzZS1h ZnRlci1mcmVlIGluIG1lZGlhIHBsYXllciBoYW5kbGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAppbmRleCBiMTI3YWE5Li41ZDZi YTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xh cmF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xh cmF0aW9uLmNwcApAQCAtMTcxNSw5ICsxNzE1LDcgQEAgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gQ1NT Q29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uOjpnZXRQcm9wZXJ0eUNTU1ZhbHVlKENTU1Byb3BlcnQK ICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVtblJ1bGVXaWR0aDoKICAgICAgICAg ICAgIHJldHVybiB6b29tQWRqdXN0ZWRQaXhlbFZhbHVlKHN0eWxlLT5jb2x1bW5SdWxlV2lkdGgo KSwgc3R5bGUuZ2V0KCkpOwogICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uU3Bh bjoKLSAgICAgICAgICAgIGlmIChzdHlsZS0+Y29sdW1uU3BhbigpKQotICAgICAgICAgICAgICAg IHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVBbGwp OwotICAgICAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKDEsIENTU1By aW1pdGl2ZVZhbHVlOjpDU1NfTlVNQkVSKTsKKyAgICAgICAgICAgIHJldHVybiBjc3NWYWx1ZVBv b2woKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoc3R5bGUtPmNvbHVtblNwYW4oKSA/IENTU1ZhbHVl QWxsIDogQ1NTVmFsdWVOb25lKTsKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVt bkJyZWFrQWZ0ZXI6CiAgICAgICAgICAgICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFs dWUoc3R5bGUtPmNvbHVtbkJyZWFrQWZ0ZXIoKSk7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlX ZWJraXRDb2x1bW5CcmVha0JlZm9yZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9D U1NQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAKaW5kZXggMGEw ZjFkNC4uZjZlZDQ4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAKQEAgLTI1MjEsOCArMjUy MSw4IEBAIGJvb2wgQ1NTUGFyc2VyOjpwYXJzZVZhbHVlKENTU1Byb3BlcnR5SUQgcHJvcElkLCBi b29sIGltcG9ydGFudCkKICAgICAgICAgaWYgKGlkID09IENTU1ZhbHVlTm9ybWFsIHx8IGlkID09 IENTU1ZhbHVlUmV2ZXJzZSkKICAgICAgICAgICAgIHZhbGlkUHJpbWl0aXZlID0gdHJ1ZTsKICAg ICAgICAgYnJlYWs7Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVtblNwYW46ICAgICAg ICAvLyBhbGwgfCAxCi0gICAgICAgIGlmIChpZCA9PSBDU1NWYWx1ZUFsbCkKKyAgICBjYXNlIENT U1Byb3BlcnR5V2Via2l0Q29sdW1uU3BhbjogLy8gbm9uZSB8IGFsbCB8IDEgKHdpbGwgYmUgZHJv cHBlZCBpbiB0aGUgdW5wcmVmaXhlZCBwcm9wZXJ0eSkKKyAgICAgICAgaWYgKGlkID09IENTU1Zh bHVlQWxsIHx8IGlkID09IENTU1ZhbHVlTm9uZSkKICAgICAgICAgICAgIHZhbGlkUHJpbWl0aXZl ID0gdHJ1ZTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgdmFsaWRQcmltaXRpdmUgPSB2YWxp ZFVuaXQodmFsdWUsIEZOdW1iZXIgfCBGTm9uTmVnKSAmJiB2YWx1ZS0+ZlZhbHVlID09IDE7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5o IGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaAppbmRleCAy MmY5ZmI3Li5kYjEwYWNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0 aXZlVmFsdWVNYXBwaW5ncy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVW YWx1ZU1hcHBpbmdzLmgKQEAgLTE0OSwyNiArMTQ5LDMyIEBAIHRlbXBsYXRlPD4gaW5saW5lIENT U1ByaW1pdGl2ZVZhbHVlOjpvcGVyYXRvciBMaW5lQ2xhbXBWYWx1ZSgpIGNvbnN0CiB0ZW1wbGF0 ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZlVmFsdWUoQ29sdW1uU3Bh biBjb2x1bW5TcGFuKQogICAgIDogQ1NTVmFsdWUoUHJpbWl0aXZlQ2xhc3MpCiB7CisgICAgbV9w cmltaXRpdmVVbml0VHlwZSA9IENTU19JREVOVDsKICAgICBzd2l0Y2ggKGNvbHVtblNwYW4pIHsK ICAgICBjYXNlIENvbHVtblNwYW5BbGw6Ci0gICAgICAgIG1fcHJpbWl0aXZlVW5pdFR5cGUgPSBD U1NfSURFTlQ7CiAgICAgICAgIG1fdmFsdWUuaWRlbnQgPSBDU1NWYWx1ZUFsbDsKICAgICAgICAg YnJlYWs7Ci0gICAgY2FzZSBDb2x1bW5TcGFuT25lOgotICAgICAgICBtX3ByaW1pdGl2ZVVuaXRU eXBlID0gQ1NTX05VTUJFUjsKLSAgICAgICAgbV92YWx1ZS5udW0gPSAxOworICAgIGNhc2UgQ29s dW1uU3Bhbk5vbmU6CisgICAgICAgIG1fdmFsdWUuaWRlbnQgPSBDU1NWYWx1ZU5vbmU7CiAgICAg ICAgIGJyZWFrOwogICAgIH0KIH0KIAogdGVtcGxhdGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFs dWU6Om9wZXJhdG9yIENvbHVtblNwYW4oKSBjb25zdAogewotICAgIGlmIChtX3ByaW1pdGl2ZVVu aXRUeXBlID09IENTU19JREVOVCAmJiBtX3ZhbHVlLmlkZW50ID09IENTU1ZhbHVlQWxsKQotICAg ICAgICByZXR1cm4gQ29sdW1uU3BhbkFsbDsKKyAgICAvLyBNYXAgMSB0byBub25lIGZvciBjb21w YXRpYmlsaXR5IHJlYXNvbnMuCiAgICAgaWYgKG1fcHJpbWl0aXZlVW5pdFR5cGUgPT0gQ1NTX05V TUJFUiAmJiBtX3ZhbHVlLm51bSA9PSAxKQotICAgICAgICByZXR1cm4gQ29sdW1uU3Bhbk9uZTsK KyAgICAgICAgcmV0dXJuIENvbHVtblNwYW5Ob25lOworCisgICAgc3dpdGNoIChtX3ZhbHVlLmlk ZW50KSB7CisgICAgY2FzZSBDU1NWYWx1ZUFsbDoKKyAgICAgICAgcmV0dXJuIENvbHVtblNwYW5B bGw7CisgICAgY2FzZSBDU1NWYWx1ZU5vbmU6CisgICAgICAgIHJldHVybiBDb2x1bW5TcGFuTm9u ZTsKKyAgICB9CisKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICByZXR1cm4gQ29sdW1u U3Bhbk9uZTsKKyAgICByZXR1cm4gQ29sdW1uU3Bhbk5vbmU7CiB9CiAKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmggYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAppbmRleCAzMTk5NmZhLi4yZjhhZTY2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaApAQCAt MTY3NCw3ICsxNjc0LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBPcmRlciBpbml0aWFsUlRMT3Jk ZXJpbmcoKSB7IHJldHVybiBMb2dpY2FsT3JkZXI7IH0KICAgICBzdGF0aWMgZmxvYXQgaW5pdGlh bFRleHRTdHJva2VXaWR0aCgpIHsgcmV0dXJuIDA7IH0KICAgICBzdGF0aWMgdW5zaWduZWQgc2hv cnQgaW5pdGlhbENvbHVtbkNvdW50KCkgeyByZXR1cm4gMTsgfQotICAgIHN0YXRpYyBDb2x1bW5T cGFuIGluaXRpYWxDb2x1bW5TcGFuKCkgeyByZXR1cm4gQ29sdW1uU3Bhbk9uZTsgfQorICAgIHN0 YXRpYyBDb2x1bW5TcGFuIGluaXRpYWxDb2x1bW5TcGFuKCkgeyByZXR1cm4gQ29sdW1uU3Bhbk5v bmU7IH0KICAgICBzdGF0aWMgY29uc3QgVHJhbnNmb3JtT3BlcmF0aW9ucyYgaW5pdGlhbFRyYW5z Zm9ybSgpIHsgREVGSU5FX1NUQVRJQ19MT0NBTChUcmFuc2Zvcm1PcGVyYXRpb25zLCBvcHMsICgp KTsgcmV0dXJuIG9wczsgfQogICAgIHN0YXRpYyBMZW5ndGggaW5pdGlhbFRyYW5zZm9ybU9yaWdp blgoKSB7IHJldHVybiBMZW5ndGgoNTAuMCwgUGVyY2VudCk7IH0KICAgICBzdGF0aWMgTGVuZ3Ro IGluaXRpYWxUcmFuc2Zvcm1PcmlnaW5ZKCkgeyByZXR1cm4gTGVuZ3RoKDUwLjAsIFBlcmNlbnQp OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5 bGVDb25zdGFudHMuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHls ZUNvbnN0YW50cy5oCmluZGV4IDcyZTBjNGMuLmJmYzFhNWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5oCkBAIC04MSw3 ICs4MSw3IEBAIGVudW0gUHNldWRvSWQgewogICAgIFBVQkxJQ19QU0VVRE9JRF9NQVNLID0gKCgx IDw8IEZJUlNUX0lOVEVSTkFMX1BTRVVET0lEKSAtIDEpICYgfigoMSA8PCBGSVJTVF9QVUJMSUNf UFNFVURPSUQpIC0gMSkKIH07CiAKLWVudW0gQ29sdW1uU3BhbiB7IENvbHVtblNwYW5PbmUgPSAw LCBDb2x1bW5TcGFuQWxsfTsKK2VudW0gQ29sdW1uU3BhbiB7IENvbHVtblNwYW5Ob25lID0gMCwg Q29sdW1uU3BhbkFsbCB9OwogCiBlbnVtIEVCb3JkZXJDb2xsYXBzZSB7IEJTRVBBUkFURSA9IDAs IEJDT0xMQVBTRSA9IDEgfTsKIAo=