104747 2012-12-11 17:22:58 -0800 [CSS Grid Layout] Implement CSS parsing and handling for min-content and max-content 2012-12-12 09:56:29 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 104125 1 jchaffraix jchaffraix allan.jensen cmarcelo macpherson menard ojan.autocc ojan tony webkit.review.bot xan.lopez oldest_to_newest 789025 0 jchaffraix 2012-12-11 17:22:58 -0800 We currently don't allow min-content and max-content to be a <track-breadth> which is allowed by the specification. Per discussion with Ojan and Tony, we will use the prefixed version of min-content / max-content. 789066 1 178936 jchaffraix 2012-12-11 18:00:09 -0800 Created attachment 178936 Proposed parsing / style resolution extension. 789405 2 178936 menard 2012-12-12 03:04:59 -0800 Comment on attachment 178936 Proposed parsing / style resolution extension. View in context: https://bugs.webkit.org/attachment.cgi?id=178936&action=review > LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js:141 > +element.style.webkitGridColumns = "minmax(-webkit-min-content, -webkit-max-content)"; You could also test the element.style return value in addition of the computed style. Just for the sake of it. 789630 3 178936 jchaffraix 2012-12-12 09:23:50 -0800 Comment on attachment 178936 Proposed parsing / style resolution extension. View in context: https://bugs.webkit.org/attachment.cgi?id=178936&action=review >> LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js:141 >> +element.style.webkitGridColumns = "minmax(-webkit-min-content, -webkit-max-content)"; > > You could also test the element.style return value in addition of the computed style. Just for the sake of it. Very, very good catch. It seems that this is broken (as we have no coverage for that case). Per our discussion, I filed bug 104821 to track adding the coverage and fixing it. 789651 4 178936 webkit.review.bot 2012-12-12 09:56:25 -0800 Comment on attachment 178936 Proposed parsing / style resolution extension. Clearing flags on attachment: 178936 Committed r137478: <http://trac.webkit.org/changeset/137478> 789653 5 webkit.review.bot 2012-12-12 09:56:29 -0800 All reviewed patches have been landed. Closing bug. 178936 2012-12-11 18:00:09 -0800 2012-12-12 09:56:25 -0800 Proposed parsing / style resolution extension. bug-104747-20121211175730.patch text/plain 20376 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3MzQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjM3MDQyZDgwMDAzMzlj ZTMzYjg1MjUyOTRkMjE1M2M5YWIzOGY0Ny4uZWNkOTJhZTIyZjQ2YTNlYTc5NDRiMTk1MGU3ODYy ZDU2NjU0NTQyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTEyLTExICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIFtDU1MgR3Jp ZCBMYXlvdXRdIEltcGxlbWVudCBDU1MgcGFyc2luZyBhbmQgaGFuZGxpbmcgZm9yIG1pbi1jb250 ZW50IGFuZCBtYXgtY29udGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTA0NzQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhpcyBjaGFuZ2UgYWRkcyAtd2Via2l0LW1pbi1jb250ZW50IGFuZCAtd2Vi a2l0LW1heC1jb250ZW50IHRvIG91ciA8dHJhY2stYnJlYWR0aD4gcGFyc2luZy4KKyAgICAgICAg VGhlIHJlbmRlcmluZyBpcyBub3QgcGx1Z2dlZCBpbiBhbmQgd2lsbCBwcm9iYWJseSBkZXBlbmQg b24gYnVnIDEwMzMxMS4KKworICAgICAgICBUZXN0czogZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3Jp ZC1jb2x1bW5zLXJvd3MtZ2V0LXNldC1tdWx0aXBsZS5odG1sOgorICAgICAgICAgICAgICAgZmFz dC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1jb2x1bW5zLXJvd3MtZ2V0LXNldC5odG1sOgorCisgICAg ICAgICogY3NzL0NTU1BhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBh cnNlR3JpZEJyZWFkdGgpOgorICAgICAgICAqIGNzcy9TdHlsZVJlc29sdmVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmNyZWF0ZUdyaWRUcmFja0JyZWFkdGgpOgorICAgICAgICBTdHJhaWdodC1m b3J3YXJkIGV4dGVuc2lvbiBvZiB0aGUgbmV3IGNvZGUuIFdlIHdlcmUgYWxyZWFkeSBzZXJpYWxp emluZyBiYWNrIHByb3Blcmx5CisgICAgICAgIHNvIG5vIG5lZWQgdG8gdG91Y2ggQ1NTQ29tcHV0 ZWRTdHlsZURlY2xhcmF0aW9uLgorCiAyMDEyLTEyLTExICBNaWNoYWVsIFBydWV0dCAgPG1pY2hh ZWxANjhrLm9yZz4KIAogICAgICAgICBbSlNDXSBBZGQgdGVzdHMgZm9yIGV4cGxpY2l0IHNlcmlh bGl6YXRpb24gdmFsdWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2Vy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCmluZGV4IDRiN2Q3Njc3ZDBh MGM2YzVhM2I1MDczNTUzOTNkOGJjYjFiZTAwNzUuLmQ5NjVhODg5ZTEyZjE1NGUzZTA0MmI2Mjkx ZGQwMGYzYjMyZjM5NTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCkBAIC00NTgyLDYgKzQ1 ODIsOSBAQCBib29sIENTU1BhcnNlcjo6cGFyc2VHcmlkVHJhY2tNaW5NYXgoQ1NTVmFsdWVMaXN0 KiB2YWx1ZXMpCiAKIFBhc3NSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IENTU1BhcnNlcjo6cGFy c2VHcmlkQnJlYWR0aChDU1NQYXJzZXJWYWx1ZSogY3VycmVudFZhbHVlKQogeworICAgIGlmIChj dXJyZW50VmFsdWUtPmlkID09IENTU1ZhbHVlV2Via2l0TWluQ29udGVudCB8fCBjdXJyZW50VmFs dWUtPmlkID09IENTU1ZhbHVlV2Via2l0TWF4Q29udGVudCkKKyAgICAgICAgcmV0dXJuIGNzc1Zh bHVlUG9vbCgpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShjdXJyZW50VmFsdWUtPmlkKTsKKwogICAg IGlmICghdmFsaWRVbml0KGN1cnJlbnRWYWx1ZSwgRkxlbmd0aCB8IEZQZXJjZW50KSkKICAgICAg ICAgcmV0dXJuIDA7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29s dmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAppbmRleCBkODlk NjVmM2U2NjNhNDRjMDg1YzcyZTBmYmE1ZGY2ZTg1YjIzNzBiLi4xOTllNDI5MWE5MWZlNzdkYmNi YTM4Yjc0Nzc2OGMwNDAxMWM2MWQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5 bGVSZXNvbHZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3Bw CkBAIC0yNzUyLDYgKzI3NTIsMTYgQEAgYm9vbCBTdHlsZVJlc29sdmVyOjp1c2VTVkdab29tUnVs ZXMoKQogCiBzdGF0aWMgYm9vbCBjcmVhdGVHcmlkVHJhY2tCcmVhZHRoKENTU1ByaW1pdGl2ZVZh bHVlKiBwcmltaXRpdmVWYWx1ZSwgU3R5bGVSZXNvbHZlciogc2VsZWN0b3IsIExlbmd0aCYgd29y a2luZ0xlbmd0aCkKIHsKKyAgICBpZiAocHJpbWl0aXZlVmFsdWUtPmdldElkZW50KCkgPT0gQ1NT VmFsdWVXZWJraXRNaW5Db250ZW50KSB7CisgICAgICAgIHdvcmtpbmdMZW5ndGggPSBMZW5ndGgo TWluQ29udGVudCk7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKworICAgIGlmIChwcmlt aXRpdmVWYWx1ZS0+Z2V0SWRlbnQoKSA9PSBDU1NWYWx1ZVdlYmtpdE1heENvbnRlbnQpIHsKKyAg ICAgICAgd29ya2luZ0xlbmd0aCA9IExlbmd0aChNYXhDb250ZW50KTsKKyAgICAgICAgcmV0dXJu IHRydWU7CisgICAgfQorCiAgICAgd29ya2luZ0xlbmd0aCA9IHByaW1pdGl2ZVZhbHVlLT5jb252 ZXJ0VG9MZW5ndGg8Rml4ZWRJbnRlZ2VyQ29udmVyc2lvbiB8IFBlcmNlbnRDb252ZXJzaW9uIHwg Vmlld3BvcnRQZXJjZW50YWdlQ29udmVyc2lvbiB8IEF1dG9Db252ZXJzaW9uPihzZWxlY3Rvci0+ c3R5bGUoKSwgc2VsZWN0b3ItPnJvb3RFbGVtZW50U3R5bGUoKSwgc2VsZWN0b3ItPnN0eWxlKCkt PmVmZmVjdGl2ZVpvb20oKSk7CiAgICAgaWYgKHdvcmtpbmdMZW5ndGguaXNVbmRlZmluZWQoKSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGU3Y2ExM2MzNDJiYzlkZDAxZDFhOTY3MmVj ZmU2OGFjMzNkOGUxYzUuLmNkMGY1MjM1NzMwMDAwMjE2ZjE2MmUxZmQ2MjZjMjcyNjY3YmUwZGEg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMi0xMi0xMSAgSnVsaWVuIENoYWZmcmFpeCAgPGpj aGFmZnJhaXhAd2Via2l0Lm9yZz4KKworICAgICAgICBbQ1NTIEdyaWQgTGF5b3V0XSBJbXBsZW1l bnQgQ1NTIHBhcnNpbmcgYW5kIGhhbmRsaW5nIGZvciBtaW4tY29udGVudCBhbmQgbWF4LWNvbnRl bnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNDc0 NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEV4dGVu ZGVkIHRoZSAyIHRlc3RzIHRvIGNvdmVyIC13ZWJraXQtbWluLWNvbnRlbnQgYW5kIC13ZWJraXQt bWF4LWNvbnRlbnQuCisKKyAgICAgICAgKiBmYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWNvbHVt bnMtcm93cy1nZXQtc2V0LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBmYXN0L2Nzcy1ncmlkLWxh eW91dC9ncmlkLWNvbHVtbnMtcm93cy1nZXQtc2V0LW11bHRpcGxlLWV4cGVjdGVkLnR4dDoKKyAg ICAgICAgKiBmYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWNvbHVtbnMtcm93cy1nZXQtc2V0LW11 bHRpcGxlLmh0bWw6CisgICAgICAgICogZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1jb2x1bW5z LXJvd3MtZ2V0LXNldC5odG1sOgorICAgICAgICAqIGZhc3QvY3NzLWdyaWQtbGF5b3V0L3Jlc291 cmNlcy9ncmlkLWNvbHVtbnMtcm93cy1nZXQtc2V0LW11bHRpcGxlLmpzOgorICAgICAgICAqIGZh c3QvY3NzLWdyaWQtbGF5b3V0L3Jlc291cmNlcy9ncmlkLWNvbHVtbnMtcm93cy1nZXQtc2V0Lmpz OgorCiAyMDEyLTEyLTExICBBZGFtIEtsZWluICA8YWRhbWtAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJlYmFzZWxpbmUgZmxvYXRzLXdyYXAtaW5zaWRlLWlubGluZS0wMDcuaHRtbCBhZnRlciBy MTM3MzMxLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3Jp ZC1jb2x1bW5zLXJvd3MtZ2V0LXNldC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2Nz cy1ncmlkLWxheW91dC9ncmlkLWNvbHVtbnMtcm93cy1nZXQtc2V0LWV4cGVjdGVkLnR4dAppbmRl eCA4ODJhMjNhMDA0ZmZhNjg0Zjc4OWU0NTZlMjRjZTY3N2E1ZDAxMTg2Li40YjdmNTAwMmFkMTAy M2FiYjFlNGM0ZDc5NzI1NGNiMzdlY2UxMjgzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0 L2Nzcy1ncmlkLWxheW91dC9ncmlkLWNvbHVtbnMtcm93cy1nZXQtc2V0LWV4cGVjdGVkLnR4dAor KysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWNvbHVtbnMtcm93cy1n ZXQtc2V0LWV4cGVjdGVkLnR4dApAQCAtMTgsNiArMTgsMTAgQEAgUEFTUyBnZXRDb21wdXRlZFN0 eWxlKGdyaWRXaXRoVmlld1BvcnRQZXJjZW50YWdlRWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFs dWUoJy0KIFBBU1MgZ2V0Q29tcHV0ZWRTdHlsZShncmlkV2l0aFZpZXdQb3J0UGVyY2VudGFnZUVs ZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtcm93cycpIGlzICc2MHB4 JwogUEFTUyBnZXRDb21wdXRlZFN0eWxlKGdyaWRXaXRoTWluTWF4LCAnJykuZ2V0UHJvcGVydHlW YWx1ZSgnLXdlYmtpdC1ncmlkLWNvbHVtbnMnKSBpcyAnbWlubWF4KDEwJSwgMTVweCknCiBQQVNT IGdldENvbXB1dGVkU3R5bGUoZ3JpZFdpdGhNaW5NYXgsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCct d2Via2l0LWdyaWQtcm93cycpIGlzICdtaW5tYXgoMjBweCwgNTAlKScKK1BBU1MgZ2V0Q29tcHV0 ZWRTdHlsZShncmlkV2l0aE1pbkNvbnRlbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0 LWdyaWQtY29sdW1ucycpIGlzICctd2Via2l0LW1pbi1jb250ZW50JworUEFTUyBnZXRDb21wdXRl ZFN0eWxlKGdyaWRXaXRoTWluQ29udGVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQt Z3JpZC1yb3dzJykgaXMgJy13ZWJraXQtbWluLWNvbnRlbnQnCitQQVNTIGdldENvbXB1dGVkU3R5 bGUoZ3JpZFdpdGhNYXhDb250ZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlk LWNvbHVtbnMnKSBpcyAnLXdlYmtpdC1tYXgtY29udGVudCcKK1BBU1MgZ2V0Q29tcHV0ZWRTdHls ZShncmlkV2l0aE1heENvbnRlbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQt cm93cycpIGlzICctd2Via2l0LW1heC1jb250ZW50JwogCiBUZXN0IGdldHRpbmcgd3JvbmcgdmFs dWVzIGZvciAtd2Via2l0LWdyaWQtY29sdW1ucyBhbmQgLXdlYmtpdC1ncmlkLXJvd3MgdGhyb3Vn aCBDU1MgKHRoZXkgc2hvdWxkIHJlc29sdmUgdG8gdGhlIGRlZmF1bHQ6ICdub25lJykKIFBBU1Mg Z2V0Q29tcHV0ZWRTdHlsZShncmlkV2l0aEZpdENvbnRlbnRFbGVtZW50LCAnJykuZ2V0UHJvcGVy dHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWNvbHVtbnMnKSBpcyAnbm9uZScKQEAgLTM4LDEwICs0Miwy NCBAQCBQQVNTIGdldENvbXB1dGVkU3R5bGUoZWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFsdWUo Jy13ZWJraXQtZ3JpZC1jb2x1bW5zJykgaXMgJwogUEFTUyBnZXRDb21wdXRlZFN0eWxlKGVsZW1l bnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtcm93cycpIGlzICdhdXRvJwog UEFTUyBnZXRDb21wdXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Vi a2l0LWdyaWQtY29sdW1ucycpIGlzICc4MHB4JwogUEFTUyBnZXRDb21wdXRlZFN0eWxlKGVsZW1l bnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtcm93cycpIGlzICcxNTBweCcK K1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdl YmtpdC1ncmlkLWNvbHVtbnMnKSBpcyAnLXdlYmtpdC1taW4tY29udGVudCcKK1BBU1MgZ2V0Q29t cHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLXJv d3MnKSBpcyAnLXdlYmtpdC1taW4tY29udGVudCcKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShlbGVt ZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWNvbHVtbnMnKSBpcyAnLXdl YmtpdC1tYXgtY29udGVudCcKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0 UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLXJvd3MnKSBpcyAnLXdlYmtpdC1tYXgtY29udGVu dCcKKworVGVzdCBnZXR0aW5nIGFuZCBzZXR0aW5nIC13ZWJraXQtZ3JpZC1jb2x1bW5zIGFuZCAt d2Via2l0LWdyaWQtcm93cyB0byBtaW5tYXgoKSB2YWx1ZXMgdGhyb3VnaCBKUwogUEFTUyBnZXRD b21wdXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQt Y29sdW1ucycpIGlzICdtaW5tYXgoNTUlLCA0NXB4KScKIFBBU1MgZ2V0Q29tcHV0ZWRTdHlsZShl bGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLXJvd3MnKSBpcyAnbWlu bWF4KDMwcHgsIDQwJSknCiBQQVNTIGdldENvbXB1dGVkU3R5bGUoZWxlbWVudCwgJycpLmdldFBy b3BlcnR5VmFsdWUoJy13ZWJraXQtZ3JpZC1jb2x1bW5zJykgaXMgJ21pbm1heCgyMjBweCwgNDhw eCknCiBQQVNTIGdldENvbXB1dGVkU3R5bGUoZWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFsdWUo Jy13ZWJraXQtZ3JpZC1yb3dzJykgaXMgJ21pbm1heCg4MHB4LCA1MHB4KScKK1BBU1MgZ2V0Q29t cHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWNv bHVtbnMnKSBpcyAnbWlubWF4KC13ZWJraXQtbWluLWNvbnRlbnQsIDQ4cHgpJworUEFTUyBnZXRD b21wdXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQt cm93cycpIGlzICdtaW5tYXgoODBweCwgLXdlYmtpdC1taW4tY29udGVudCknCitQQVNTIGdldENv bXB1dGVkU3R5bGUoZWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3JpZC1j b2x1bW5zJykgaXMgJ21pbm1heCgyMjBweCwgLXdlYmtpdC1tYXgtY29udGVudCknCitQQVNTIGdl dENvbXB1dGVkU3R5bGUoZWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3Jp ZC1yb3dzJykgaXMgJ21pbm1heCgtd2Via2l0LW1heC1jb250ZW50LCA1MHB4KScKK1BBU1MgZ2V0 Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlk LWNvbHVtbnMnKSBpcyAnbWlubWF4KDIyMHB4LCAtd2Via2l0LW1heC1jb250ZW50KScKK1BBU1Mg Z2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1n cmlkLXJvd3MnKSBpcyAnbWlubWF4KC13ZWJraXQtbWF4LWNvbnRlbnQsIDUwcHgpJworUEFTUyBn ZXRDb21wdXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdy aWQtY29sdW1ucycpIGlzICdtaW5tYXgoLXdlYmtpdC1taW4tY29udGVudCwgLXdlYmtpdC1tYXgt Y29udGVudCknCitQQVNTIGdldENvbXB1dGVkU3R5bGUoZWxlbWVudCwgJycpLmdldFByb3BlcnR5 VmFsdWUoJy13ZWJraXQtZ3JpZC1yb3dzJykgaXMgJ21pbm1heCgtd2Via2l0LW1heC1jb250ZW50 LCAtd2Via2l0LW1pbi1jb250ZW50KScKIAogVGVzdCBzZXR0aW5nIGdyaWQtY29sdW1ucyBhbmQg Z3JpZC1yb3dzIHRvIGJhZCBtaW5tYXggdmFsdWUgdGhyb3VnaCBKUwogUEFTUyBnZXRDb21wdXRl ZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtY29sdW1u cycpIGlzICdub25lJwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlv dXQvZ3JpZC1jb2x1bW5zLXJvd3MtZ2V0LXNldC1tdWx0aXBsZS1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWNvbHVtbnMtcm93cy1nZXQtc2V0LW11 bHRpcGxlLWV4cGVjdGVkLnR4dAppbmRleCBhZjA0YWIyMTRhMGExZDRlM2Q1MTFkYjI1OWUzYjlk NmY2ZTk5NmM2Li43ZmE1M2FhOTAwZDNmMDQxZTU3ZDEwZGEzNWRhODkyNWUyZGEyMjE3IDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWNvbHVtbnMtcm93 cy1nZXQtc2V0LW11bHRpcGxlLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nz cy1ncmlkLWxheW91dC9ncmlkLWNvbHVtbnMtcm93cy1nZXQtc2V0LW11bHRpcGxlLWV4cGVjdGVk LnR4dApAQCAtMTgsOCArMTgsMTIgQEAgUEFTUyBnZXRDb21wdXRlZFN0eWxlKGdyaWRXaXRoUGVy Y2VudEFuZFZpZXdwb3J0UGVyY2VudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy0KIFBBU1MgZ2V0 Q29tcHV0ZWRTdHlsZShncmlkV2l0aFBlcmNlbnRBbmRWaWV3cG9ydFBlcmNlbnQsICcnKS5nZXRQ cm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtcm93cycpIGlzICczNSUgMTY4cHgnCiBQQVNTIGdl dENvbXB1dGVkU3R5bGUoZ3JpZFdpdGhGaXRDb250ZW50QW5kRml0QXZhaWxhYmxlLCAnJykuZ2V0 UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWNvbHVtbnMnKSBpcyAnbm9uZScKIFBBU1MgZ2V0 Q29tcHV0ZWRTdHlsZShncmlkV2l0aEZpdENvbnRlbnRBbmRGaXRBdmFpbGFibGUsICcnKS5nZXRQ cm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtcm93cycpIGlzICdub25lJworUEFTUyBnZXRDb21w dXRlZFN0eWxlKGdyaWRXaXRoTWluTWF4Q29udGVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13 ZWJraXQtZ3JpZC1jb2x1bW5zJykgaXMgJy13ZWJraXQtbWluLWNvbnRlbnQgLXdlYmtpdC1tYXgt Y29udGVudCcKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShncmlkV2l0aE1pbk1heENvbnRlbnQsICcn KS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtcm93cycpIGlzICctd2Via2l0LW1heC1j b250ZW50IC13ZWJraXQtbWluLWNvbnRlbnQnCiBQQVNTIGdldENvbXB1dGVkU3R5bGUoZ3JpZFdp dGhNaW5NYXhBbmRGaXhlZCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3JpZC1jb2x1 bW5zJykgaXMgJ21pbm1heCg0NXB4LCAzMCUpIDE1cHgnCiBQQVNTIGdldENvbXB1dGVkU3R5bGUo Z3JpZFdpdGhNaW5NYXhBbmRGaXhlZCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3Jp ZC1yb3dzJykgaXMgJzEyMHB4IG1pbm1heCgzNSUsIDEwcHgpJworUEFTUyBnZXRDb21wdXRlZFN0 eWxlKGdyaWRXaXRoTWluTWF4QW5kTWluTWF4Q29udGVudCwgJycpLmdldFByb3BlcnR5VmFsdWUo Jy13ZWJraXQtZ3JpZC1jb2x1bW5zJykgaXMgJ21pbm1heCgtd2Via2l0LW1pbi1jb250ZW50LCAz MCUpIDE1cHgnCitQQVNTIGdldENvbXB1dGVkU3R5bGUoZ3JpZFdpdGhNaW5NYXhBbmRNaW5NYXhD b250ZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLXJvd3MnKSBpcyAnMTIw cHggbWlubWF4KDM1JSwgLXdlYmtpdC1tYXgtY29udGVudCknCiAKIFRlc3QgdGhlIGluaXRpYWwg dmFsdWUKIFBBU1MgZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1 ZSgnLXdlYmtpdC1ncmlkLWNvbHVtbnMnKSBpcyAnbm9uZScKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtY29sdW1ucy1yb3dzLWdldC1zZXQtbXVsdGlw bGUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtY29sdW1ucy1y b3dzLWdldC1zZXQtbXVsdGlwbGUuaHRtbAppbmRleCBlN2RjZjg3MDZkNDBkZjhmZmE2ZGZkMGNj YTZjYjAzMzE4ZTVhNzAzLi4xNjg3MDBkMDM3YmMxODIwZDYxZDZjZTkxNzgyMGZiOWQ2MTk0YjZk IDEwMDc1NQotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWNvbHVt bnMtcm93cy1nZXQtc2V0LW11bHRpcGxlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3Mt Z3JpZC1sYXlvdXQvZ3JpZC1jb2x1bW5zLXJvd3MtZ2V0LXNldC1tdWx0aXBsZS5odG1sCkBAIC01 NCwxMiArNTQsMjMgQEAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQogICAgIC13ZWJraXQtZ3JpZC1j b2x1bW5zOiAtd2Via2l0LWNvbnRlbnQtYXZhaWxhYmxlOwogICAgIC13ZWJraXQtZ3JpZC1yb3dz OiAtd2Via2l0LWZpdGNvbnRlbnQgLXdlYmtpdC1maXQtYXZhaWxhYmxlOwogfQorLmdyaWRXaXRo TWluTWF4Q29udGVudCB7CisgICAgZGlzcGxheTogLXdlYmtpdC1ncmlkOworICAgIC13ZWJraXQt Z3JpZC1jb2x1bW5zOiAtd2Via2l0LW1pbi1jb250ZW50IC13ZWJraXQtbWF4LWNvbnRlbnQ7Cisg ICAgLXdlYmtpdC1ncmlkLXJvd3M6IC13ZWJraXQtbWF4LWNvbnRlbnQgLXdlYmtpdC1taW4tY29u dGVudDsKK30KIC5ncmlkV2l0aE1pbk1heEFuZEZpeGVkIHsKICAgICBkaXNwbGF5OiAtd2Via2l0 LWdyaWQ7CiAgICAgLXdlYmtpdC1ncmlkLWNvbHVtbnM6IG1pbm1heCg0NXB4LCAzMCUpIDE1cHg7 CiAgICAgLXdlYmtpdC1ncmlkLXJvd3M6IDEyZW0gbWlubWF4KDM1JSwgMTBweCk7CiAgICAgZm9u dDogMTBweCBBaGVtOwogfQorLmdyaWRXaXRoTWluTWF4QW5kTWluTWF4Q29udGVudCB7CisgICAg ZGlzcGxheTogLXdlYmtpdC1ncmlkOworICAgIC13ZWJraXQtZ3JpZC1jb2x1bW5zOiBtaW5tYXgo LXdlYmtpdC1taW4tY29udGVudCwgMzAlKSAxNXB4OworICAgIC13ZWJraXQtZ3JpZC1yb3dzOiAx MmVtIG1pbm1heCgzNSUsIC13ZWJraXQtbWF4LWNvbnRlbnQpOworICAgIGZvbnQ6IDEwcHggQWhl bTsKK30KIDwvc3R5bGU+CiA8c2NyaXB0IHNyYz0iLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJl LmpzIj48L3NjcmlwdD4KIDwvaGVhZD4KQEAgLTczLDcgKzg0LDkgQEAgaWYgKHdpbmRvdy50ZXN0 UnVubmVyKQogPGRpdiBjbGFzcz0iZ3JpZFdpdGhUaHJlZUl0ZW1zIiBpZD0iZ3JpZFdpdGhUaHJl ZUl0ZW1zIj48L2Rpdj4KIDxkaXYgY2xhc3M9ImdyaWRXaXRoUGVyY2VudEFuZFZpZXdwb3J0UGVy Y2VudCIgaWQ9ImdyaWRXaXRoUGVyY2VudEFuZFZpZXdwb3J0UGVyY2VudCI+PC9kaXY+CiA8ZGl2 IGNsYXNzPSJncmlkV2l0aEZpdENvbnRlbnRBbmRGaXRBdmFpbGFibGUiIGlkPSJncmlkV2l0aEZp dENvbnRlbnRBbmRGaXRBdmFpbGFibGUiPjwvZGl2PgorPGRpdiBjbGFzcz0iZ3JpZFdpdGhNaW5N YXhDb250ZW50IiBpZD0iZ3JpZFdpdGhNaW5NYXhDb250ZW50Ij48L2Rpdj4KIDxkaXYgY2xhc3M9 ImdyaWRXaXRoTWluTWF4QW5kRml4ZWQiIGlkPSJncmlkV2l0aE1pbk1heEFuZEZpeGVkIj48L2Rp dj4KKzxkaXYgY2xhc3M9ImdyaWRXaXRoTWluTWF4QW5kTWluTWF4Q29udGVudCIgaWQ9ImdyaWRX aXRoTWluTWF4QW5kTWluTWF4Q29udGVudCI+PC9kaXY+CiA8c2NyaXB0IHNyYz0icmVzb3VyY2Vz L2dyaWQtY29sdW1ucy1yb3dzLWdldC1zZXQtbXVsdGlwbGUuanMiPjwvc2NyaXB0PgogPHNjcmlw dCBzcmM9Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgogPC9ib2R5 PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1jb2x1 bW5zLXJvd3MtZ2V0LXNldC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQv Z3JpZC1jb2x1bW5zLXJvd3MtZ2V0LXNldC5odG1sCmluZGV4IDIwNGIzZDgxZGE2MGExYjJhNjBl ZmFmYTExYTVlZDgyOWYyN2RjZjkuLjZiZjI3YTc4MTgwYzVhMDQ5OTVhOGZkMmI0NDlkNmU3Zjlh M2Y0ZmQgMTAwNzU1Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQt Y29sdW1ucy1yb3dzLWdldC1zZXQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlk LWxheW91dC9ncmlkLWNvbHVtbnMtcm93cy1nZXQtc2V0Lmh0bWwKQEAgLTQ2LDYgKzQ2LDE0IEBA IGlmICh3aW5kb3cudGVzdFJ1bm5lcikKICAgICAtd2Via2l0LWdyaWQtY29sdW1uczogbWlubWF4 KDEwJSwgMTVweCk7CiAgICAgLXdlYmtpdC1ncmlkLXJvd3M6IG1pbm1heCgyMHB4LCA1MCUpOwog fQorLmdyaWRXaXRoTWluQ29udGVudCB7CisgICAgLXdlYmtpdC1ncmlkLWNvbHVtbnM6IC13ZWJr aXQtbWluLWNvbnRlbnQ7CisgICAgLXdlYmtpdC1ncmlkLXJvd3M6IC13ZWJraXQtbWluLWNvbnRl bnQ7Cit9CisuZ3JpZFdpdGhNYXhDb250ZW50IHsKKyAgICAtd2Via2l0LWdyaWQtY29sdW1uczog LXdlYmtpdC1tYXgtY29udGVudDsKKyAgICAtd2Via2l0LWdyaWQtcm93czogLXdlYmtpdC1tYXgt Y29udGVudDsKK30KIDwvc3R5bGU+CiA8c2NyaXB0IHNyYz0iLi4vanMvcmVzb3VyY2VzL2pzLXRl c3QtcHJlLmpzIj48L3NjcmlwdD4KIDwvaGVhZD4KQEAgLTU5LDYgKzY3LDggQEAgaWYgKHdpbmRv dy50ZXN0UnVubmVyKQogPGRpdiBjbGFzcz0iZ3JpZCBncmlkV2l0aEZpdENvbnRlbnQiIGlkPSJn cmlkV2l0aEZpdENvbnRlbnRFbGVtZW50Ij48L2Rpdj4KIDxkaXYgY2xhc3M9ImdyaWQgZ3JpZFdp dGhGaXRBdmFpbGFibGUiIGlkPSJncmlkV2l0aEZpdEF2YWlsYWJsZUVsZW1lbnQiPjwvZGl2Pgog PGRpdiBjbGFzcz0iZ3JpZCBncmlkV2l0aE1pbk1heCIgaWQ9ImdyaWRXaXRoTWluTWF4Ij48L2Rp dj4KKzxkaXYgY2xhc3M9ImdyaWQgZ3JpZFdpdGhNaW5Db250ZW50IiBpZD0iZ3JpZFdpdGhNaW5D b250ZW50Ij48L2Rpdj4KKzxkaXYgY2xhc3M9ImdyaWQgZ3JpZFdpdGhNYXhDb250ZW50IiBpZD0i Z3JpZFdpdGhNYXhDb250ZW50Ij48L2Rpdj4KIDxzY3JpcHQgc3JjPSJyZXNvdXJjZXMvZ3JpZC1j b2x1bW5zLXJvd3MtZ2V0LXNldC5qcyI+PC9zY3JpcHQ+CiA8c2NyaXB0IHNyYz0iLi4vanMvcmVz b3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+CiA8L2JvZHk+CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9yZXNvdXJjZXMvZ3JpZC1jb2x1bW5zLXJv d3MtZ2V0LXNldC1tdWx0aXBsZS5qcyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0 L3Jlc291cmNlcy9ncmlkLWNvbHVtbnMtcm93cy1nZXQtc2V0LW11bHRpcGxlLmpzCmluZGV4IDc1 Y2Q5OTQ1ODAyMTE2YmViNjgxMTRkYTRiOGE3Zjc4MTMxYzA2ZjAuLjJmNTZmYjMwZmUwOTJhYjA0 ZDBhZjdlOWFiY2Q1ZTU0NmFiOGE1NzkgMTAwNzU1Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvY3Nz LWdyaWQtbGF5b3V0L3Jlc291cmNlcy9ncmlkLWNvbHVtbnMtcm93cy1nZXQtc2V0LW11bHRpcGxl LmpzCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L3Jlc291cmNlcy9ncmlk LWNvbHVtbnMtcm93cy1nZXQtc2V0LW11bHRpcGxlLmpzCkBAIC0yOSwxMCArMjksMTggQEAgdmFy IGdyaWRXaXRoRml0Q29udGVudEFuZEZpdEF2YWlsYWJsZSA9IGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCJncmlkV2l0aEZpdENvbnQKIHNob3VsZEJlKCJnZXRDb21wdXRlZFN0eWxlKGdyaWRXaXRo Rml0Q29udGVudEFuZEZpdEF2YWlsYWJsZSwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQt Z3JpZC1jb2x1bW5zJykiLCAiJ25vbmUnIik7CiBzaG91bGRCZSgiZ2V0Q29tcHV0ZWRTdHlsZShn cmlkV2l0aEZpdENvbnRlbnRBbmRGaXRBdmFpbGFibGUsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCct d2Via2l0LWdyaWQtcm93cycpIiwgIidub25lJyIpOwogCit2YXIgZ3JpZFdpdGhNaW5NYXhDb250 ZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImdyaWRXaXRoTWluTWF4Q29udGVudCIpOwor c2hvdWxkQmUoImdldENvbXB1dGVkU3R5bGUoZ3JpZFdpdGhNaW5NYXhDb250ZW50LCAnJykuZ2V0 UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWNvbHVtbnMnKSIsICInLXdlYmtpdC1taW4tY29u dGVudCAtd2Via2l0LW1heC1jb250ZW50JyIpOworc2hvdWxkQmUoImdldENvbXB1dGVkU3R5bGUo Z3JpZFdpdGhNaW5NYXhDb250ZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlk LXJvd3MnKSIsICInLXdlYmtpdC1tYXgtY29udGVudCAtd2Via2l0LW1pbi1jb250ZW50JyIpOwor CiB2YXIgZ3JpZFdpdGhNaW5NYXhBbmRGaXhlZCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJn cmlkV2l0aE1pbk1heEFuZEZpeGVkIik7CiBzaG91bGRCZSgiZ2V0Q29tcHV0ZWRTdHlsZShncmlk V2l0aE1pbk1heEFuZEZpeGVkLCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWNv bHVtbnMnKSIsICInbWlubWF4KDQ1cHgsIDMwJSkgMTVweCciKTsKIHNob3VsZEJlKCJnZXRDb21w dXRlZFN0eWxlKGdyaWRXaXRoTWluTWF4QW5kRml4ZWQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCct d2Via2l0LWdyaWQtcm93cycpIiwgIicxMjBweCBtaW5tYXgoMzUlLCAxMHB4KSciKTsKIAordmFy IGdyaWRXaXRoTWluTWF4QW5kTWluTWF4Q29udGVudCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJncmlkV2l0aE1pbk1heEFuZE1pbk1heENvbnRlbnQiKTsKK3Nob3VsZEJlKCJnZXRDb21wdXRl ZFN0eWxlKGdyaWRXaXRoTWluTWF4QW5kTWluTWF4Q29udGVudCwgJycpLmdldFByb3BlcnR5VmFs dWUoJy13ZWJraXQtZ3JpZC1jb2x1bW5zJykiLCAiJ21pbm1heCgtd2Via2l0LW1pbi1jb250ZW50 LCAzMCUpIDE1cHgnIik7CitzaG91bGRCZSgiZ2V0Q29tcHV0ZWRTdHlsZShncmlkV2l0aE1pbk1h eEFuZE1pbk1heENvbnRlbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtcm93 cycpIiwgIicxMjBweCBtaW5tYXgoMzUlLCAtd2Via2l0LW1heC1jb250ZW50KSciKTsKKwogZGVi dWcoIiIpOwogZGVidWcoIlRlc3QgdGhlIGluaXRpYWwgdmFsdWUiKTsKIHZhciBlbGVtZW50ID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9m YXN0L2Nzcy1ncmlkLWxheW91dC9yZXNvdXJjZXMvZ3JpZC1jb2x1bW5zLXJvd3MtZ2V0LXNldC5q cyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L3Jlc291cmNlcy9ncmlkLWNvbHVt bnMtcm93cy1nZXQtc2V0LmpzCmluZGV4IDA1NGQxOTkwMzkyOThkNmYzOTI5NDVhOTQwNDM5ODAx NzAzY2JiMGUuLmM1MzViOWI4NDAyODA1MTIxNzNkOTJiOWQ1MjM5YWMwNWYyZDI3NzggMTAwNzU1 Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L3Jlc291cmNlcy9ncmlkLWNv bHVtbnMtcm93cy1nZXQtc2V0LmpzCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5 b3V0L3Jlc291cmNlcy9ncmlkLWNvbHVtbnMtcm93cy1nZXQtc2V0LmpzCkBAIC0yOSw2ICsyOSwx NCBAQCB2YXIgZ3JpZFdpdGhNaW5NYXggPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZ3JpZFdp dGhNaW5NYXgiKTsKIHNob3VsZEJlKCJnZXRDb21wdXRlZFN0eWxlKGdyaWRXaXRoTWluTWF4LCAn JykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWNvbHVtbnMnKSIsICInbWlubWF4KDEw JSwgMTVweCknIik7CiBzaG91bGRCZSgiZ2V0Q29tcHV0ZWRTdHlsZShncmlkV2l0aE1pbk1heCwg JycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3JpZC1yb3dzJykiLCAiJ21pbm1heCgyMHB4 LCA1MCUpJyIpOwogCit2YXIgZ3JpZFdpdGhNaW5Db250ZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoImdyaWRXaXRoTWluQ29udGVudCIpOworc2hvdWxkQmUoImdldENvbXB1dGVkU3R5bGUo Z3JpZFdpdGhNaW5Db250ZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWNv bHVtbnMnKSIsICInLXdlYmtpdC1taW4tY29udGVudCciKTsKK3Nob3VsZEJlKCJnZXRDb21wdXRl ZFN0eWxlKGdyaWRXaXRoTWluQ29udGVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQt Z3JpZC1yb3dzJykiLCAiJy13ZWJraXQtbWluLWNvbnRlbnQnIik7CisKK3ZhciBncmlkV2l0aE1h eENvbnRlbnQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZ3JpZFdpdGhNYXhDb250ZW50Iik7 CitzaG91bGRCZSgiZ2V0Q29tcHV0ZWRTdHlsZShncmlkV2l0aE1heENvbnRlbnQsICcnKS5nZXRQ cm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtY29sdW1ucycpIiwgIictd2Via2l0LW1heC1jb250 ZW50JyIpOworc2hvdWxkQmUoImdldENvbXB1dGVkU3R5bGUoZ3JpZFdpdGhNYXhDb250ZW50LCAn JykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLXJvd3MnKSIsICInLXdlYmtpdC1tYXgt Y29udGVudCciKTsKKwogZGVidWcoIiIpOwogZGVidWcoIlRlc3QgZ2V0dGluZyB3cm9uZyB2YWx1 ZXMgZm9yIC13ZWJraXQtZ3JpZC1jb2x1bW5zIGFuZCAtd2Via2l0LWdyaWQtcm93cyB0aHJvdWdo IENTUyAodGhleSBzaG91bGQgcmVzb2x2ZSB0byB0aGUgZGVmYXVsdDogJ25vbmUnKSIpOwogdmFy IGdyaWRXaXRoRml0Q29udGVudEVsZW1lbnQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZ3Jp ZFdpdGhGaXRDb250ZW50RWxlbWVudCIpOwpAQCAtNzYsNiArODQsMjIgQEAgc2hvdWxkQmUoImdl dENvbXB1dGVkU3R5bGUoZWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3Jp ZC1yb3dzJykiLAogCiBlbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiBk b2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGVsZW1lbnQpOworZWxlbWVudC5zdHlsZS53ZWJraXRH cmlkQ29sdW1ucyA9ICItd2Via2l0LW1pbi1jb250ZW50IjsKK2VsZW1lbnQuc3R5bGUud2Via2l0 R3JpZFJvd3MgPSAiLXdlYmtpdC1taW4tY29udGVudCI7CitzaG91bGRCZSgiZ2V0Q29tcHV0ZWRT dHlsZShlbGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWNvbHVtbnMn KSIsICInLXdlYmtpdC1taW4tY29udGVudCciKTsKK3Nob3VsZEJlKCJnZXRDb21wdXRlZFN0eWxl KGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtcm93cycpIiwgIict d2Via2l0LW1pbi1jb250ZW50JyIpOworCitlbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7Citkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGVsZW1lbnQpOworZWxlbWVudC5z dHlsZS53ZWJraXRHcmlkQ29sdW1ucyA9ICItd2Via2l0LW1heC1jb250ZW50IjsKK2VsZW1lbnQu c3R5bGUud2Via2l0R3JpZFJvd3MgPSAiLXdlYmtpdC1tYXgtY29udGVudCI7CitzaG91bGRCZSgi Z2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1n cmlkLWNvbHVtbnMnKSIsICInLXdlYmtpdC1tYXgtY29udGVudCciKTsKK3Nob3VsZEJlKCJnZXRD b21wdXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQt cm93cycpIiwgIictd2Via2l0LW1heC1jb250ZW50JyIpOworCitkZWJ1ZygiIik7CitkZWJ1Zygi VGVzdCBnZXR0aW5nIGFuZCBzZXR0aW5nIC13ZWJraXQtZ3JpZC1jb2x1bW5zIGFuZCAtd2Via2l0 LWdyaWQtcm93cyB0byBtaW5tYXgoKSB2YWx1ZXMgdGhyb3VnaCBKUyIpOworZWxlbWVudCA9IGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChl bGVtZW50KTsKIGVsZW1lbnQuc3R5bGUud2Via2l0R3JpZENvbHVtbnMgPSAibWlubWF4KDU1JSwg NDVweCkiOwogZWxlbWVudC5zdHlsZS53ZWJraXRHcmlkUm93cyA9ICJtaW5tYXgoMzBweCwgNDAl KSI7CiBzaG91bGRCZSgiZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0UHJvcGVydHlW YWx1ZSgnLXdlYmtpdC1ncmlkLWNvbHVtbnMnKSIsICInbWlubWF4KDU1JSwgNDVweCknIik7CkBA IC04OSw2ICsxMTMsMzYgQEAgZWxlbWVudC5zdHlsZS53ZWJraXRHcmlkUm93cyA9ICJtaW5tYXgo MTB2dywgNWVtKSI7CiBzaG91bGRCZSgiZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0 UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWNvbHVtbnMnKSIsICInbWlubWF4KDIyMHB4LCA0 OHB4KSciKTsKIHNob3VsZEJlKCJnZXRDb21wdXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9w ZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtcm93cycpIiwgIidtaW5tYXgoODBweCwgNTBweCknIik7 CiAKK2VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKK2RvY3VtZW50LmJv ZHkuYXBwZW5kQ2hpbGQoZWxlbWVudCk7CitlbGVtZW50LnN0eWxlLndlYmtpdEdyaWRDb2x1bW5z ID0gIm1pbm1heCgtd2Via2l0LW1pbi1jb250ZW50LCA4dmgpIjsKK2VsZW1lbnQuc3R5bGUud2Vi a2l0R3JpZFJvd3MgPSAibWlubWF4KDEwdncsIC13ZWJraXQtbWluLWNvbnRlbnQpIjsKK3Nob3Vs ZEJlKCJnZXRDb21wdXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Vi a2l0LWdyaWQtY29sdW1ucycpIiwgIidtaW5tYXgoLXdlYmtpdC1taW4tY29udGVudCwgNDhweCkn Iik7CitzaG91bGRCZSgiZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0UHJvcGVydHlW YWx1ZSgnLXdlYmtpdC1ncmlkLXJvd3MnKSIsICInbWlubWF4KDgwcHgsIC13ZWJraXQtbWluLWNv bnRlbnQpJyIpOworCitlbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Citk b2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGVsZW1lbnQpOworZWxlbWVudC5zdHlsZS5mb250ID0g IjEwcHggQWhlbSI7CitlbGVtZW50LnN0eWxlLndlYmtpdEdyaWRDb2x1bW5zID0gIm1pbm1heCgy MmVtLCAtd2Via2l0LW1heC1jb250ZW50KSI7CitlbGVtZW50LnN0eWxlLndlYmtpdEdyaWRSb3dz ID0gIm1pbm1heCgtd2Via2l0LW1heC1jb250ZW50LCA1ZW0pIjsKK3Nob3VsZEJlKCJnZXRDb21w dXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtY29s dW1ucycpIiwgIidtaW5tYXgoMjIwcHgsIC13ZWJraXQtbWF4LWNvbnRlbnQpJyIpOworc2hvdWxk QmUoImdldENvbXB1dGVkU3R5bGUoZWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJr aXQtZ3JpZC1yb3dzJykiLCAiJ21pbm1heCgtd2Via2l0LW1heC1jb250ZW50LCA1MHB4KSciKTsK KworZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworZG9jdW1lbnQuYm9k eS5hcHBlbmRDaGlsZChlbGVtZW50KTsKK2VsZW1lbnQuc3R5bGUuZm9udCA9ICIxMHB4IEFoZW0i OworZWxlbWVudC5zdHlsZS53ZWJraXRHcmlkQ29sdW1ucyA9ICJtaW5tYXgoMjJlbSwgLXdlYmtp dC1tYXgtY29udGVudCkiOworZWxlbWVudC5zdHlsZS53ZWJraXRHcmlkUm93cyA9ICJtaW5tYXgo LXdlYmtpdC1tYXgtY29udGVudCwgNWVtKSI7CitzaG91bGRCZSgiZ2V0Q29tcHV0ZWRTdHlsZShl bGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWNvbHVtbnMnKSIsICIn bWlubWF4KDIyMHB4LCAtd2Via2l0LW1heC1jb250ZW50KSciKTsKK3Nob3VsZEJlKCJnZXRDb21w dXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtcm93 cycpIiwgIidtaW5tYXgoLXdlYmtpdC1tYXgtY29udGVudCwgNTBweCknIik7CisKK2VsZW1lbnQg PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKK2RvY3VtZW50LmJvZHkuYXBwZW5kQ2hp bGQoZWxlbWVudCk7CitlbGVtZW50LnN0eWxlLndlYmtpdEdyaWRDb2x1bW5zID0gIm1pbm1heCgt d2Via2l0LW1pbi1jb250ZW50LCAtd2Via2l0LW1heC1jb250ZW50KSI7CitlbGVtZW50LnN0eWxl LndlYmtpdEdyaWRSb3dzID0gIm1pbm1heCgtd2Via2l0LW1heC1jb250ZW50LCAtd2Via2l0LW1p bi1jb250ZW50KSI7CitzaG91bGRCZSgiZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0 UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWNvbHVtbnMnKSIsICInbWlubWF4KC13ZWJraXQt bWluLWNvbnRlbnQsIC13ZWJraXQtbWF4LWNvbnRlbnQpJyIpOworc2hvdWxkQmUoImdldENvbXB1 dGVkU3R5bGUoZWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3JpZC1yb3dz JykiLCAiJ21pbm1heCgtd2Via2l0LW1heC1jb250ZW50LCAtd2Via2l0LW1pbi1jb250ZW50KSci KTsKKwogZGVidWcoIiIpOwogZGVidWcoIlRlc3Qgc2V0dGluZyBncmlkLWNvbHVtbnMgYW5kIGdy aWQtcm93cyB0byBiYWQgbWlubWF4IHZhbHVlIHRocm91Z2ggSlMiKTsKIGVsZW1lbnQgPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsK