111372 2013-03-04 15:55:54 -0800 [CSS Grid Layout] Add parsing for grid-{end|after} 2013-03-05 08:30:03 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 103314 1 jchaffraix jchaffraix allan.jensen eric esprehn+autocc macpherson menard ojan.autocc ojan tony webkit.review.bot xan.lopez oldest_to_newest 846957 0 jchaffraix 2013-03-04 15:55:54 -0800 After bug 110988, we have support for grid-{start|before}. This change will add support for grid-{end|after}, following our current grammar. 846961 1 191333 jchaffraix 2013-03-04 16:05:14 -0800 Created attachment 191333 Proposed implementation 1: Didn't change grid-{row|column} to be shorthands though. 847706 2 191333 webkit.review.bot 2013-03-05 08:29:59 -0800 Comment on attachment 191333 Proposed implementation 1: Didn't change grid-{row|column} to be shorthands though. Clearing flags on attachment: 191333 Committed r144762: <http://trac.webkit.org/changeset/144762> 847707 3 webkit.review.bot 2013-03-05 08:30:03 -0800 All reviewed patches have been landed. Closing bug. 191333 2013-03-04 16:05:14 -0800 2013-03-05 08:29:59 -0800 Proposed implementation 1: Didn't change grid-{row|column} to be shorthands though. bug-111372-20130304160122.patch text/plain 23205 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0Njg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzI4OTdiYWY3NzNlNmVj ZTNiNGQ4YjllZGNmY2Q3NjVlMTY2ZWQxZC4uZjk2YTlhZjY0ZDY1YmE2Yzc4YzY1M2I2MjFkNzVi MGMwOGY1YjJlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDEzLTAzLTA0ICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIFtDU1MgR3Jp ZCBMYXlvdXRdIEFkZCBwYXJzaW5nIGZvciBncmlkLXtlbmR8YWZ0ZXJ9CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTEzNzIKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy1ncmlkLWxh eW91dC9ncmlkLWl0ZW0tZW5kLWFmdGVyLWdldC1zZXQuaHRtbAorCisgICAgICAgIFRoaXMgY2hh bmdlIGFkZHMgdGhlIHByb3BlciBzdXBwb3J0IGZvciBncmlkLXtlbmR8YWZ0ZXJ9LiBJdCBkb2Vz bid0IHVwZGF0ZQorICAgICAgICBncmlkLXtyb3d8Y29sdW1ufSB0byBiZSBhIHNob3J0aGFuZCBm b3IgYm90aCBncmlkLXtiZWZvcmV8c3RhcnR9IGFuZCBncmlkLXthZnRlcnxlbmR9CisgICAgICAg IHRob3VnaC4KKworICAgICAgICAqIGNzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uOjpnZXRQcm9w ZXJ0eUNTU1ZhbHVlKToKKyAgICAgICAgQWRkZWQgdGhlIG5ldyBwcm9wZXJ0aWVzIHRvIG91ciBr bm93biBwcm9wZXJ0aWVzLiBBbHNvIGFkZGVkCisgICAgICAgIHN1cHBvcnQgZm9yIGdldENvbXB1 dGVkU3R5bGUuCisKKyAgICAgICAgKiBjc3MvQ1NTUGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkNTU1BhcnNlcjo6cGFyc2VWYWx1ZSk6CisgICAgICAgIEFkZGVkIHBhcnNpbmcgZm9yIHRo ZSBuZXcgcHJvcGVydGllcy4KKworICAgICAgICAqIGNzcy9DU1NQcm9wZXJ0eS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDU1NQcm9wZXJ0eTo6aXNJbmhlcml0ZWRQcm9wZXJ0eSk6CisgICAgICAg IFRoZSBuZXcgcHJvcGVydGllcyBhcmUgbm90IGluaGVyaXRlZC4KKworICAgICAgICAqIGNzcy9D U1NQcm9wZXJ0eU5hbWVzLmluOgorICAgICAgICBBZGRlZCB0aGUgbmV3IHByb3BlcnRpZXMuCisK KyAgICAgICAgKiBjc3MvU3R5bGVSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHls ZVJlc29sdmVyOjphcHBseVByb3BlcnR5KToKKyAgICAgICAgQWRkZWQgY29kZSB0byBoYW5kbGUg YXBwbHlpbmcgdGhlbSB0byBvdXIgc3R5bGUuCisKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUv UmVuZGVyU3R5bGUuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvU3R5bGVHcmlkSXRlbURh dGEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVHcmlkSXRlbURhdGE6OlN0eWxlR3JpZEl0 ZW1EYXRhKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvU3R5bGVHcmlkSXRlbURhdGEuaDoK KyAgICAgICAgKFdlYkNvcmU6OlN0eWxlR3JpZEl0ZW1EYXRhOjpvcGVyYXRvcj09KToKKyAgICAg ICAgKFN0eWxlR3JpZEl0ZW1EYXRhKToKKyAgICAgICAgVXBkYXRlZCBvdXIgcmVwcmVzZW50YXRp b24gdG8gc3RvcmUgdGhlIG5ldyBwcm9wZXJ0aWVzLgorCiAyMDEzLTAzLTA0ICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEdpdmUgVmlld3BvcnRDb25z dHJhaW50cyBjbGFzc2VzIGNvcHkgY29uc3RydWN0b3JzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCmluZGV4IGQ5OWU4MGNkMjc5MTI1 YTUwN2YzMGE0OGRhOTZlNGI2NTdmMWQ4ZTcuLjVmZjMxYWUwZmQ2OWE2OTBiYzhmMGFhNTdhNTI4 MGFkMmYxNGY1ZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0 eWxlRGVjbGFyYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0 eWxlRGVjbGFyYXRpb24uY3BwCkBAIC0yODUsNyArMjg1LDkgQEAgc3RhdGljIGNvbnN0IENTU1By b3BlcnR5SUQgY29tcHV0ZWRQcm9wZXJ0aWVzW10gPSB7CiAgICAgQ1NTUHJvcGVydHlXZWJraXRH cmlkQ29sdW1ucywKICAgICBDU1NQcm9wZXJ0eVdlYmtpdEdyaWRSb3dzLAogICAgIENTU1Byb3Bl cnR5V2Via2l0R3JpZFN0YXJ0LAorICAgIENTU1Byb3BlcnR5V2Via2l0R3JpZEVuZCwKICAgICBD U1NQcm9wZXJ0eVdlYmtpdEdyaWRCZWZvcmUsCisgICAgQ1NTUHJvcGVydHlXZWJraXRHcmlkQWZ0 ZXIsCiAgICAgQ1NTUHJvcGVydHlXZWJraXRHcmlkQ29sdW1uLAogICAgIENTU1Byb3BlcnR5V2Vi a2l0R3JpZFJvdywKICAgICBDU1NQcm9wZXJ0eVdlYmtpdEhpZ2hsaWdodCwKQEAgLTE5MzMsOSAr MTkzNSwxMyBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlPiBDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRp b246OmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NTUHJvcGVydAogICAgICAgICBjYXNlIENTU1Byb3Bl cnR5V2Via2l0R3JpZFN0YXJ0OgogICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0R3JpZENv bHVtbjoKICAgICAgICAgICAgIHJldHVybiB2YWx1ZUZvckdyaWRQb3NpdGlvbihzdHlsZS0+Z3Jp ZEl0ZW1TdGFydCgpKTsKKyAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEdyaWRFbmQ6Cisg ICAgICAgICAgICByZXR1cm4gdmFsdWVGb3JHcmlkUG9zaXRpb24oc3R5bGUtPmdyaWRJdGVtRW5k KCkpOwogICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0R3JpZEJlZm9yZToKICAgICAgICAg Y2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEdyaWRSb3c6CiAgICAgICAgICAgICByZXR1cm4gdmFsdWVG b3JHcmlkUG9zaXRpb24oc3R5bGUtPmdyaWRJdGVtQmVmb3JlKCkpOworICAgICAgICBjYXNlIENT U1Byb3BlcnR5V2Via2l0R3JpZEFmdGVyOgorICAgICAgICAgICAgcmV0dXJuIHZhbHVlRm9yR3Jp ZFBvc2l0aW9uKHN0eWxlLT5ncmlkSXRlbUFmdGVyKCkpOwogCiAgICAgICAgIGNhc2UgQ1NTUHJv cGVydHlIZWlnaHQ6CiAgICAgICAgICAgICBpZiAocmVuZGVyZXIpIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Bh cnNlci5jcHAKaW5kZXggN2M3MDViZjE0ODFjMjIzNDM1M2Y3MjdkYTliZTUwZmE2NzBkMjM3Ny4u NmFlZDhhODNkZmIzZDNmNTRkNjY4YzZmMzU0ZmM2ZThjOWZkM2RiMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NT U1BhcnNlci5jcHAKQEAgLTI2MDAsNyArMjYwMCw5IEBAIGJvb2wgQ1NTUGFyc2VyOjpwYXJzZVZh bHVlKENTU1Byb3BlcnR5SUQgcHJvcElkLCBib29sIGltcG9ydGFudCkKICAgICAgICAgcmV0dXJu IHBhcnNlR3JpZFRyYWNrTGlzdChwcm9wSWQsIGltcG9ydGFudCk7CiAKICAgICBjYXNlIENTU1By b3BlcnR5V2Via2l0R3JpZFN0YXJ0OgorICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRHcmlkRW5k OgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRHcmlkQmVmb3JlOgorICAgIGNhc2UgQ1NTUHJv cGVydHlXZWJraXRHcmlkQWZ0ZXI6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEdyaWRDb2x1 bW46CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEdyaWRSb3c6CiAgICAgICAgIGlmICghY3Nz R3JpZExheW91dEVuYWJsZWQoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQ cm9wZXJ0eS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHkuY3BwCmluZGV4IDQ4 OTk2YTQ5NmM3ZDI3NjlmYmI2ZWE5MWM4ZjE0ZjMzMmFhM2UwYjMuLjI1ODIxNzkzMmY1NTY2M2Nk NTAxOTQ2ODlmY2I0ZjA5NzE2NTUzZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9D U1NQcm9wZXJ0eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5LmNwcApA QCAtNTg0LDcgKzU4NCw5IEBAIGJvb2wgQ1NTUHJvcGVydHk6OmlzSW5oZXJpdGVkUHJvcGVydHko Q1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlEKQogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRHcmlk Q29sdW1uczoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0R3JpZFJvd3M6CiAgICAgY2FzZSBD U1NQcm9wZXJ0eVdlYmtpdEdyaWRTdGFydDoKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0R3Jp ZEVuZDoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0R3JpZEJlZm9yZToKKyAgICBjYXNlIENT U1Byb3BlcnR5V2Via2l0R3JpZEFmdGVyOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRHcmlk Q29sdW1uOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRHcmlkUm93OgogICAgIGNhc2UgQ1NT UHJvcGVydHlXZWJraXRMaW5lQ2xhbXA6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTUHJvcGVydHlOYW1lcy5pbiBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVz LmluCmluZGV4IGM3ODQ1ZWY1MTU4ODM0ZWIyNTMyMTg4ZmU3ZWU0YzIwNzc3M2JjMzAuLjZjMjcz ZDBjYTdmMzFhM2YyOTBkYjhhYzEyZmM2OTJiYTQxZWVmMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9D U1NQcm9wZXJ0eU5hbWVzLmluCkBAIC0yOTMsNyArMjkzLDkgQEAgei1pbmRleAogLXdlYmtpdC1n cmlkLWNvbHVtbnMKIC13ZWJraXQtZ3JpZC1yb3dzCiAtd2Via2l0LWdyaWQtc3RhcnQKKy13ZWJr aXQtZ3JpZC1lbmQKIC13ZWJraXQtZ3JpZC1iZWZvcmUKKy13ZWJraXQtZ3JpZC1hZnRlcgogLXdl YmtpdC1ncmlkLWNvbHVtbgogLXdlYmtpdC1ncmlkLXJvdwogLXdlYmtpdC1ncmlkLWF1dG8tZmxv dwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCmluZGV4IGQxNjUxZDVkOTViZjMxM2Uw OTcwM2EwNDI5YWRkOWM1ZDliYzIwMjMuLmE1MjU0MmQzZDJiZDM4M2I4M2QyMzkyY2U5NTUxMjRl ODI1YTY4ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKQEAgLTM1NjcsNiAr MzU2Nyw3IEBAIHZvaWQgU3R5bGVSZXNvbHZlcjo6YXBwbHlQcm9wZXJ0eShDU1NQcm9wZXJ0eUlE IGlkLCBDU1NWYWx1ZSogdmFsdWUpCiAgICAgfQogCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtp dEdyaWRTdGFydDoKKyAgICAvLyBGSVhNRTogVGhpcyBpcyB3cm9uZyBhcyB0aGUgcHJvcGVydHkg c2hvdWxkIGJlIGEgc2hvcnRoYW5kLgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRHcmlkQ29s dW1uOiB7CiAgICAgICAgIEdyaWRQb3NpdGlvbiBzdGFydFBvc2l0aW9uOwogICAgICAgICBpZiAo IWNyZWF0ZUdyaWRQb3NpdGlvbih2YWx1ZSwgc3RhcnRQb3NpdGlvbikpCkBAIC0zNTc0LDcgKzM1 NzUsMTYgQEAgdm9pZCBTdHlsZVJlc29sdmVyOjphcHBseVByb3BlcnR5KENTU1Byb3BlcnR5SUQg aWQsIENTU1ZhbHVlKiB2YWx1ZSkKICAgICAgICAgc3RhdGUuc3R5bGUoKS0+c2V0R3JpZEl0ZW1T dGFydChzdGFydFBvc2l0aW9uKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KKyAgICBjYXNlIENT U1Byb3BlcnR5V2Via2l0R3JpZEVuZDogeworICAgICAgICBHcmlkUG9zaXRpb24gZW5kUG9zaXRp b247CisgICAgICAgIGlmICghY3JlYXRlR3JpZFBvc2l0aW9uKHZhbHVlLCBlbmRQb3NpdGlvbikp CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIHN0YXRlLnN0eWxlKCktPnNldEdyaWRJdGVt RW5kKGVuZFBvc2l0aW9uKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIGNhc2UgQ1NT UHJvcGVydHlXZWJraXRHcmlkQmVmb3JlOgorICAgIC8vIEZJWE1FOiBUaGlzIGlzIHdyb25nIGFz IHRoZSBwcm9wZXJ0eSBzaG91bGQgYmUgYSBzaG9ydGhhbmQuCiAgICAgY2FzZSBDU1NQcm9wZXJ0 eVdlYmtpdEdyaWRSb3c6IHsKICAgICAgICAgR3JpZFBvc2l0aW9uIGJlZm9yZVBvc2l0aW9uOwog ICAgICAgICBpZiAoIWNyZWF0ZUdyaWRQb3NpdGlvbih2YWx1ZSwgYmVmb3JlUG9zaXRpb24pKQpA QCAtMzU4Miw2ICszNTkyLDE0IEBAIHZvaWQgU3R5bGVSZXNvbHZlcjo6YXBwbHlQcm9wZXJ0eShD U1NQcm9wZXJ0eUlEIGlkLCBDU1NWYWx1ZSogdmFsdWUpCiAgICAgICAgIHN0YXRlLnN0eWxlKCkt PnNldEdyaWRJdGVtQmVmb3JlKGJlZm9yZVBvc2l0aW9uKTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KKyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0R3JpZEFmdGVyOiB7CisgICAgICAgIEdyaWRQ b3NpdGlvbiBhZnRlclBvc2l0aW9uOworICAgICAgICBpZiAoIWNyZWF0ZUdyaWRQb3NpdGlvbih2 YWx1ZSwgYWZ0ZXJQb3NpdGlvbikpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIHN0YXRl LnN0eWxlKCktPnNldEdyaWRJdGVtQWZ0ZXIoYWZ0ZXJQb3NpdGlvbik7CisgICAgICAgIHJldHVy bjsKKyAgICB9CisKICAgICAvLyBUaGVzZSBwcm9wZXJ0aWVzIGFyZSBhbGlhc2VkIGFuZCBTdHls ZUJ1aWxkZXIgYWxyZWFkeSBhcHBsaWVkIHRoZSBwcm9wZXJ0eSBvbiB0aGUgcHJlZml4ZWQgdmVy c2lvbi4KICAgICBjYXNlIENTU1Byb3BlcnR5VHJhbnNpdGlvbkRlbGF5OgogICAgIGNhc2UgQ1NT UHJvcGVydHlUcmFuc2l0aW9uRHVyYXRpb246CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9SZW5kZXJTdHlsZS5oCmluZGV4IDkwMzViODI5ODAxMzg0OGNjM2M2NDQ3MDY5NzZkMGRk NjA5OTY5NDUuLjJjMGU1NWE0NGY3NjIwNjViNzc2YWI5OThlZDMzYTU1MjEwMGM2OTcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCkBAIC03NjYsNyAr NzY2LDkgQEAgcHVibGljOgogICAgIEdyaWRBdXRvRmxvdyBncmlkQXV0b0Zsb3coKSBjb25zdCB7 IHJldHVybiByYXJlTm9uSW5oZXJpdGVkRGF0YS0+bV9ncmlkLT5tX2dyaWRBdXRvRmxvdzsgfQog CiAgICAgY29uc3QgR3JpZFBvc2l0aW9uJiBncmlkSXRlbVN0YXJ0KCkgY29uc3QgeyByZXR1cm4g cmFyZU5vbkluaGVyaXRlZERhdGEtPm1fZ3JpZEl0ZW0tPm1fZ3JpZFN0YXJ0OyB9CisgICAgY29u c3QgR3JpZFBvc2l0aW9uJiBncmlkSXRlbUVuZCgpIGNvbnN0IHsgcmV0dXJuIHJhcmVOb25Jbmhl cml0ZWREYXRhLT5tX2dyaWRJdGVtLT5tX2dyaWRFbmQ7IH0KICAgICBjb25zdCBHcmlkUG9zaXRp b24mIGdyaWRJdGVtQmVmb3JlKCkgY29uc3QgeyByZXR1cm4gcmFyZU5vbkluaGVyaXRlZERhdGEt Pm1fZ3JpZEl0ZW0tPm1fZ3JpZEJlZm9yZTsgfQorICAgIGNvbnN0IEdyaWRQb3NpdGlvbiYgZ3Jp ZEl0ZW1BZnRlcigpIGNvbnN0IHsgcmV0dXJuIHJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX2dyaWRJ dGVtLT5tX2dyaWRBZnRlcjsgfQogCiAgICAgY29uc3QgU2hhZG93RGF0YSogYm94U2hhZG93KCkg Y29uc3QgeyByZXR1cm4gcmFyZU5vbkluaGVyaXRlZERhdGEtPm1fYm94U2hhZG93LmdldCgpOyB9 CiAgICAgdm9pZCBnZXRCb3hTaGFkb3dFeHRlbnQoTGF5b3V0VW5pdCYgdG9wLCBMYXlvdXRVbml0 JiByaWdodCwgTGF5b3V0VW5pdCYgYm90dG9tLCBMYXlvdXRVbml0JiBsZWZ0KSBjb25zdCB7IGdl dFNoYWRvd0V4dGVudChib3hTaGFkb3coKSwgdG9wLCByaWdodCwgYm90dG9tLCBsZWZ0KTsgfQpA QCAtMTI1NCw3ICsxMjU2LDkgQEAgcHVibGljOgogICAgIHZvaWQgc2V0R3JpZFJvd3MoY29uc3Qg VmVjdG9yPEdyaWRUcmFja1NpemU+JiBsZW5ndGhzKSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRl ZERhdGEuYWNjZXNzKCktPm1fZ3JpZCwgbV9ncmlkUm93cywgbGVuZ3Rocyk7IH0KICAgICB2b2lk IHNldEdyaWRBdXRvRmxvdyhHcmlkQXV0b0Zsb3cgZmxvdykgeyBTRVRfVkFSKHJhcmVOb25Jbmhl cml0ZWREYXRhLmFjY2VzcygpLT5tX2dyaWQsIG1fZ3JpZEF1dG9GbG93LCBmbG93KTsgfQogICAg IHZvaWQgc2V0R3JpZEl0ZW1TdGFydChjb25zdCBHcmlkUG9zaXRpb24mIHN0YXJ0UG9zaXRpb24p IHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9ncmlkSXRlbSwgbV9n cmlkU3RhcnQsIHN0YXJ0UG9zaXRpb24pOyB9CisgICAgdm9pZCBzZXRHcmlkSXRlbUVuZChjb25z dCBHcmlkUG9zaXRpb24mIGVuZFBvc2l0aW9uKSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERh dGEuYWNjZXNzKCktPm1fZ3JpZEl0ZW0sIG1fZ3JpZEVuZCwgZW5kUG9zaXRpb24pOyB9CiAgICAg dm9pZCBzZXRHcmlkSXRlbUJlZm9yZShjb25zdCBHcmlkUG9zaXRpb24mIGJlZm9yZVBvc2l0aW9u KSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNzKCktPm1fZ3JpZEl0ZW0sIG1f Z3JpZEJlZm9yZSwgYmVmb3JlUG9zaXRpb24pOyB9CisgICAgdm9pZCBzZXRHcmlkSXRlbUFmdGVy KGNvbnN0IEdyaWRQb3NpdGlvbiYgYWZ0ZXJQb3NpdGlvbikgeyBTRVRfVkFSKHJhcmVOb25Jbmhl cml0ZWREYXRhLmFjY2VzcygpLT5tX2dyaWRJdGVtLCBtX2dyaWRBZnRlciwgYWZ0ZXJQb3NpdGlv bik7IH0KIAogICAgIHZvaWQgc2V0TWFycXVlZUluY3JlbWVudChjb25zdCBMZW5ndGgmIGYpIHsg U0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9tYXJxdWVlLCBpbmNyZW1l bnQsIGYpOyB9CiAgICAgdm9pZCBzZXRNYXJxdWVlU3BlZWQoaW50IGYpIHsgU0VUX1ZBUihyYXJl Tm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9tYXJxdWVlLCBzcGVlZCwgZik7IH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZUdyaWRJdGVtRGF0YS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVHcmlkSXRlbURhdGEuY3Bw CmluZGV4IGUzZGM4NjdmYWY1NTUzMWU3YTM2MWUyMzgwMzUzYTQwYzQ0ZjZkZGMuLjlhNjRmMDUx ZTAxMWQwNDMzZGIyOGZlYmZhZGQyNDUwYTcyYjIwMWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZUdyaWRJdGVtRGF0YS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlR3JpZEl0ZW1EYXRhLmNwcApAQCAtMzYsMTQgKzM2 LDE4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogU3R5bGVHcmlkSXRlbURhdGE6OlN0eWxlR3Jp ZEl0ZW1EYXRhKCkKICAgICA6IG1fZ3JpZFN0YXJ0KFJlbmRlclN0eWxlOjppbml0aWFsR3JpZFBv c2l0aW9uKCkpCisgICAgLCBtX2dyaWRFbmQoUmVuZGVyU3R5bGU6OmluaXRpYWxHcmlkUG9zaXRp b24oKSkKICAgICAsIG1fZ3JpZEJlZm9yZShSZW5kZXJTdHlsZTo6aW5pdGlhbEdyaWRQb3NpdGlv bigpKQorICAgICwgbV9ncmlkQWZ0ZXIoUmVuZGVyU3R5bGU6OmluaXRpYWxHcmlkUG9zaXRpb24o KSkKIHsKIH0KIAogU3R5bGVHcmlkSXRlbURhdGE6OlN0eWxlR3JpZEl0ZW1EYXRhKGNvbnN0IFN0 eWxlR3JpZEl0ZW1EYXRhJiBvKQogICAgIDogUmVmQ291bnRlZDxTdHlsZUdyaWRJdGVtRGF0YT4o KQogICAgICwgbV9ncmlkU3RhcnQoby5tX2dyaWRTdGFydCkKKyAgICAsIG1fZ3JpZEVuZChvLm1f Z3JpZEVuZCkKICAgICAsIG1fZ3JpZEJlZm9yZShvLm1fZ3JpZEJlZm9yZSkKKyAgICAsIG1fZ3Jp ZEFmdGVyKG8ubV9ncmlkQWZ0ZXIpCiB7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdHlsZS9TdHlsZUdyaWRJdGVtRGF0YS5oIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1N0eWxlR3JpZEl0ZW1EYXRhLmgKaW5kZXggYWJkNTNlN2RlODRlMzY2ZDcx MTRjNmU4MThkNzRmNDNiMjAxZDFlOS4uMzJmY2I2Zjc2ODlhZGIwYTg0NTJmMTJiYmUxOWJjNzNl OTAwMjdjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxl R3JpZEl0ZW1EYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxl R3JpZEl0ZW1EYXRhLmgKQEAgLTQ2LDcgKzQ2LDggQEAgcHVibGljOgogCiAgICAgYm9vbCBvcGVy YXRvcj09KGNvbnN0IFN0eWxlR3JpZEl0ZW1EYXRhJiBvKSBjb25zdAogICAgIHsKLSAgICAgICAg cmV0dXJuIG1fZ3JpZFN0YXJ0ID09IG8ubV9ncmlkU3RhcnQgJiYgbV9ncmlkQmVmb3JlID09IG8u bV9ncmlkQmVmb3JlOworICAgICAgICByZXR1cm4gbV9ncmlkU3RhcnQgPT0gby5tX2dyaWRTdGFy dCAmJiBtX2dyaWRFbmQgPT0gby5tX2dyaWRFbmQKKyAgICAgICAgICAgICYmIG1fZ3JpZEJlZm9y ZSA9PSBvLm1fZ3JpZEJlZm9yZSAmJiBtX2dyaWRBZnRlciA9PSBvLm1fZ3JpZEFmdGVyOwogICAg IH0KIAogICAgIGJvb2wgb3BlcmF0b3IhPShjb25zdCBTdHlsZUdyaWRJdGVtRGF0YSYgbykgY29u c3QKQEAgLTU1LDcgKzU2LDkgQEAgcHVibGljOgogICAgIH0KIAogICAgIEdyaWRQb3NpdGlvbiBt X2dyaWRTdGFydDsKKyAgICBHcmlkUG9zaXRpb24gbV9ncmlkRW5kOwogICAgIEdyaWRQb3NpdGlv biBtX2dyaWRCZWZvcmU7CisgICAgR3JpZFBvc2l0aW9uIG1fZ3JpZEFmdGVyOwogCiBwcml2YXRl OgogICAgIFN0eWxlR3JpZEl0ZW1EYXRhKCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNTA4MGFkNjc1NjQxOTMwMjc3NDRi YTcyZDhiNmViZWUyMGUxYjUyNy4uY2FmY2Y1YmE1NjJjZmMyYjgzYTNlNmFhZjM0MjEzNzU1Yjc3 NTM4ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE2IEBACiAyMDEzLTAzLTA0ICBKdWxpZW4gQ2hhZmZyYWl4 ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgogCisgICAgICAgIFtDU1MgR3JpZCBMYXlvdXRdIEFk ZCBwYXJzaW5nIGZvciBncmlkLXtlbmR8YWZ0ZXJ9CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTEzNzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtaXRlbS1l bmQtYWZ0ZXItZ2V0LXNldC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvY3Nz LWdyaWQtbGF5b3V0L2dyaWQtaXRlbS1lbmQtYWZ0ZXItZ2V0LXNldC5odG1sOiBBZGRlZC4KKyAg ICAgICAgTm90ZSB0aGF0IHNvbWUgb2YgdGhlIHRlc3QgZmFpbHMgYXMgd2UgZG9uJ3QgdHJlYXQg Z3JpZC17cm93fGNvbHVtbn0gYXMgYSBzaG9ydGhhbmQuCisKKzIwMTMtMDMtMDQgIEp1bGllbiBD aGFmZnJhaXggIDxqY2hhZmZyYWl4QHdlYmtpdC5vcmc+CisKICAgICAgICAgW0NTUyBHcmlkIExh eW91dF0gQWRkIHBhcnNpbmcgZm9yIGdyaWQte3N0YXJ0fGJlZm9yZX0KICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDk4OAogCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWl0ZW0tZW5kLWFmdGVyLWdldC1z ZXQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1p dGVtLWVuZC1hZnRlci1nZXQtc2V0LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5kMGUxNzQ2OWJi MWE0ZmQ3OTFhNTY4ZjkwOTRhNGMwODc3NDgwMjc2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1pdGVtLWVuZC1hZnRlci1nZXQtc2V0LWV4 cGVjdGVkLnR4dApAQCAtMCwwICsxLDU2IEBACitUZXN0IHRoYXQgc2V0dGluZyBhbmQgZ2V0dGlu ZyBncmlkLWVuZCBhbmQgZ3JpZC1hZnRlciB3b3JrcyBhcyBleHBlY3RlZAorCitPbiBzdWNjZXNz LCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAi VEVTVCBDT01QTEVURSIuCisKKworVGVzdCBnZXR0aW5nIC13ZWJraXQtZ3JpZC1lbmQgYW5kIC13 ZWJraXQtZ3JpZC1hZnRlciBzZXQgdGhyb3VnaCBDU1MKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShn cmlkRWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3JpZC1lbmQnKSBpcyAn YXV0bycKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShncmlkRWxlbWVudCwgJycpLmdldFByb3BlcnR5 VmFsdWUoJy13ZWJraXQtZ3JpZC1jb2x1bW4nKSBpcyAnYXV0bycKK1BBU1MgZ2V0Q29tcHV0ZWRT dHlsZShncmlkRWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3JpZC1hZnRl cicpIGlzICdhdXRvJworUEFTUyBnZXRDb21wdXRlZFN0eWxlKGdyaWRFbGVtZW50LCAnJykuZ2V0 UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLXJvdycpIGlzICdhdXRvJworUEFTUyBnZXRDb21w dXRlZFN0eWxlKGdyaWRJdGVtV2l0aFBvc2l0aXZlSW50ZWdlciwgJycpLmdldFByb3BlcnR5VmFs dWUoJy13ZWJraXQtZ3JpZC1lbmQnKSBpcyAnMTAnCitGQUlMIGdldENvbXB1dGVkU3R5bGUoZ3Jp ZEl0ZW1XaXRoUG9zaXRpdmVJbnRlZ2VyLCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1n cmlkLWNvbHVtbicpIHNob3VsZCBiZSAxMC4gV2FzIGF1dG8uCitQQVNTIGdldENvbXB1dGVkU3R5 bGUoZ3JpZEl0ZW1XaXRoUG9zaXRpdmVJbnRlZ2VyLCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdl YmtpdC1ncmlkLWFmdGVyJykgaXMgJzE1JworRkFJTCBnZXRDb21wdXRlZFN0eWxlKGdyaWRJdGVt V2l0aFBvc2l0aXZlSW50ZWdlciwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3JpZC1y b3cnKSBzaG91bGQgYmUgMTUuIFdhcyBhdXRvLgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKGdyaWRJ dGVtV2l0aE5lZ2F0aXZlSW50ZWdlciwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3Jp ZC1lbmQnKSBpcyAnLTEwJworRkFJTCBnZXRDb21wdXRlZFN0eWxlKGdyaWRJdGVtV2l0aE5lZ2F0 aXZlSW50ZWdlciwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3JpZC1jb2x1bW4nKSBz aG91bGQgYmUgLTEwLiBXYXMgYXV0by4KK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShncmlkSXRlbVdp dGhOZWdhdGl2ZUludGVnZXIsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtYWZ0 ZXInKSBpcyAnLTE1JworRkFJTCBnZXRDb21wdXRlZFN0eWxlKGdyaWRJdGVtV2l0aE5lZ2F0aXZl SW50ZWdlciwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3JpZC1yb3cnKSBzaG91bGQg YmUgLTE1LiBXYXMgYXV0by4KK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShncmlkSXRlbVdpdGhBdXRv RWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3JpZC1lbmQnKSBpcyAnYXV0 bycKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShncmlkSXRlbVdpdGhBdXRvRWxlbWVudCwgJycpLmdl dFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3JpZC1jb2x1bW4nKSBpcyAnYXV0bycKK1BBU1MgZ2V0 Q29tcHV0ZWRTdHlsZShncmlkSXRlbVdpdGhBdXRvRWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFs dWUoJy13ZWJraXQtZ3JpZC1hZnRlcicpIGlzICdhdXRvJworUEFTUyBnZXRDb21wdXRlZFN0eWxl KGdyaWRJdGVtV2l0aEF1dG9FbGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1n cmlkLXJvdycpIGlzICdhdXRvJworCitUZXN0IHRoZSBpbml0aWFsIHZhbHVlCitQQVNTIGdldENv bXB1dGVkU3R5bGUoZWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3JpZC1l bmQnKSBpcyAnYXV0bycKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0UHJv cGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWNvbHVtbicpIGlzICdhdXRvJworUEFTUyBnZXRDb21w dXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtYWZ0 ZXInKSBpcyAnYXV0bycKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0UHJv cGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLXJvdycpIGlzICdhdXRvJworCitUZXN0IGdldHRpbmcg YW5kIHNldHRpbmcgZ3JpZC1lbmQgYW5kIGdyaWQtYWZ0ZXIgdGhyb3VnaCBKUworUEFTUyBnZXRD b21wdXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQt ZW5kJykgaXMgJzE4JworRkFJTCBnZXRDb21wdXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9w ZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtY29sdW1uJykgc2hvdWxkIGJlIDE4LiBXYXMgYXV0by4K K1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdl YmtpdC1ncmlkLWFmdGVyJykgaXMgJzY2JworRkFJTCBnZXRDb21wdXRlZFN0eWxlKGVsZW1lbnQs ICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtcm93Jykgc2hvdWxkIGJlIDY2LiBX YXMgYXV0by4KK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0UHJvcGVydHlW YWx1ZSgnLXdlYmtpdC1ncmlkLWVuZCcpIGlzICctNTUnCitGQUlMIGdldENvbXB1dGVkU3R5bGUo ZWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3JpZC1jb2x1bW4nKSBzaG91 bGQgYmUgLTU1LiBXYXMgYXV0by4KK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJyku Z2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWFmdGVyJykgaXMgJy00MCcKK0ZBSUwgZ2V0 Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlk LXJvdycpIHNob3VsZCBiZSAtNDAuIFdhcyBhdXRvLgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKGVs ZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtZW5kJykgaXMgJ2F1dG8n CitQQVNTIGdldENvbXB1dGVkU3R5bGUoZWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13 ZWJraXQtZ3JpZC1jb2x1bW4nKSBpcyAnYXV0bycKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShlbGVt ZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWFmdGVyJykgaXMgJ2F1dG8n CitQQVNTIGdldENvbXB1dGVkU3R5bGUoZWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13 ZWJraXQtZ3JpZC1yb3cnKSBpcyAnYXV0bycKKworVGVzdCBzZXR0aW5nIGdyaWQtZW5kIGFuZCBn cmlkLWFmdGVyIGJhY2sgdG8gJ2F1dG8nIHRocm91Z2ggSlMKK1BBU1MgZ2V0Q29tcHV0ZWRTdHls ZShlbGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWVuZCcpIGlzICcx OCcKK0ZBSUwgZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgn LXdlYmtpdC1ncmlkLWNvbHVtbicpIHNob3VsZCBiZSAxOC4gV2FzIGF1dG8uCitQQVNTIGdldENv bXB1dGVkU3R5bGUoZWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3JpZC1h ZnRlcicpIGlzICc2NicKK0ZBSUwgZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0UHJv cGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLXJvdycpIHNob3VsZCBiZSA2Ni4gV2FzIGF1dG8uCitQ QVNTIGdldENvbXB1dGVkU3R5bGUoZWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJr aXQtZ3JpZC1lbmQnKSBpcyAnYXV0bycKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAn JykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWNvbHVtbicpIGlzICdhdXRvJworUEFT UyBnZXRDb21wdXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0 LWdyaWQtYWZ0ZXInKSBpcyAnYXV0bycKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAn JykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLXJvdycpIGlzICdhdXRvJworUEFTUyBz dWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtaXRlbS1lbmQtYWZ0ZXItZ2V0 LXNldC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1pdGVtLWVu ZC1hZnRlci1nZXQtc2V0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZTIwMjg2MTEwMWI3ZTNlZmY1NDM4OWE3 YmM4MjhkNjAxNWY5Njc5MgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3Nz LWdyaWQtbGF5b3V0L2dyaWQtaXRlbS1lbmQtYWZ0ZXItZ2V0LXNldC5odG1sCkBAIC0wLDAgKzEs MTExIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0PgoraWYgKHdp bmRvdy50ZXN0UnVubmVyKQorICAgIHRlc3RSdW5uZXIub3ZlcnJpZGVQcmVmZXJlbmNlKCJXZWJL aXRDU1NHcmlkTGF5b3V0RW5hYmxlZCIsIDEpOworPC9zY3JpcHQ+Cis8c3R5bGU+CisuZ3JpZEl0 ZW1XaXRoUG9zaXRpdmVJbnRlZ2VyIHsKKyAgICAtd2Via2l0LWdyaWQtZW5kOiAxMDsKKyAgICAt d2Via2l0LWdyaWQtYWZ0ZXI6IDE1OworfQorLmdyaWRJdGVtV2l0aE5lZ2F0aXZlSW50ZWdlciB7 CisgICAgLXdlYmtpdC1ncmlkLWVuZDogLTEwOworICAgIC13ZWJraXQtZ3JpZC1hZnRlcjogLTE1 OworfQorLmdyaWRJdGVtV2l0aEF1dG8geworICAgIC13ZWJraXQtZ3JpZC1lbmQ6IGF1dG87Cisg ICAgLXdlYmtpdC1ncmlkLWFmdGVyOiBhdXRvOworfQorPC9zdHlsZT4KKzxzY3JpcHQgc3JjPSIu Li9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+ Cis8IS0tIFRoZSBmaXJzdCBoYXMgbm8gcHJvcGVydGllcyBzZXQgb24gaXQuIC0tPgorPGRpdiBp ZD0iZ3JpZEVsZW1lbnQiPjwvZGl2PgorPGRpdiBjbGFzcz0iZ3JpZEl0ZW1XaXRoUG9zaXRpdmVJ bnRlZ2VyIiBpZD0iZ3JpZEl0ZW1XaXRoUG9zaXRpdmVJbnRlZ2VyIj48L2Rpdj4KKzxkaXYgY2xh c3M9ImdyaWRJdGVtV2l0aE5lZ2F0aXZlSW50ZWdlciIgaWQ9ImdyaWRJdGVtV2l0aE5lZ2F0aXZl SW50ZWdlciI+PC9kaXY+Cis8ZGl2IGNsYXNzPSJncmlkSXRlbVdpdGhBdXRvIiBpZD0iZ3JpZEl0 ZW1XaXRoQXV0b0VsZW1lbnQiPjwvZGl2PgorPHNjcmlwdD4KKyAgICBkZXNjcmlwdGlvbignVGVz dCB0aGF0IHNldHRpbmcgYW5kIGdldHRpbmcgZ3JpZC1lbmQgYW5kIGdyaWQtYWZ0ZXIgd29ya3Mg YXMgZXhwZWN0ZWQnKTsKKworICAgIGRlYnVnKCJUZXN0IGdldHRpbmcgLXdlYmtpdC1ncmlkLWVu ZCBhbmQgLXdlYmtpdC1ncmlkLWFmdGVyIHNldCB0aHJvdWdoIENTUyIpOworICAgIHZhciBncmlk RWxlbWVudCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJncmlkRWxlbWVudCIpOworICAgIHNo b3VsZEJlKCJnZXRDb21wdXRlZFN0eWxlKGdyaWRFbGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1 ZSgnLXdlYmtpdC1ncmlkLWVuZCcpIiwgIidhdXRvJyIpOworICAgIHNob3VsZEJlKCJnZXRDb21w dXRlZFN0eWxlKGdyaWRFbGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlk LWNvbHVtbicpIiwgIidhdXRvJyIpOworICAgIHNob3VsZEJlKCJnZXRDb21wdXRlZFN0eWxlKGdy aWRFbGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWFmdGVyJykiLCAi J2F1dG8nIik7CisgICAgc2hvdWxkQmUoImdldENvbXB1dGVkU3R5bGUoZ3JpZEVsZW1lbnQsICcn KS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtcm93JykiLCAiJ2F1dG8nIik7CisKKyAg ICB2YXIgZ3JpZEl0ZW1XaXRoUG9zaXRpdmVJbnRlZ2VyID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoImdyaWRJdGVtV2l0aFBvc2l0aXZlSW50ZWdlciIpOworICAgIHNob3VsZEJlKCJnZXRDb21w dXRlZFN0eWxlKGdyaWRJdGVtV2l0aFBvc2l0aXZlSW50ZWdlciwgJycpLmdldFByb3BlcnR5VmFs dWUoJy13ZWJraXQtZ3JpZC1lbmQnKSIsICInMTAnIik7CisgICAgc2hvdWxkQmUoImdldENvbXB1 dGVkU3R5bGUoZ3JpZEl0ZW1XaXRoUG9zaXRpdmVJbnRlZ2VyLCAnJykuZ2V0UHJvcGVydHlWYWx1 ZSgnLXdlYmtpdC1ncmlkLWNvbHVtbicpIiwgIicxMCciKTsKKyAgICBzaG91bGRCZSgiZ2V0Q29t cHV0ZWRTdHlsZShncmlkSXRlbVdpdGhQb3NpdGl2ZUludGVnZXIsICcnKS5nZXRQcm9wZXJ0eVZh bHVlKCctd2Via2l0LWdyaWQtYWZ0ZXInKSIsICInMTUnIik7CisgICAgc2hvdWxkQmUoImdldENv bXB1dGVkU3R5bGUoZ3JpZEl0ZW1XaXRoUG9zaXRpdmVJbnRlZ2VyLCAnJykuZ2V0UHJvcGVydHlW YWx1ZSgnLXdlYmtpdC1ncmlkLXJvdycpIiwgIicxNSciKTsKKworICAgIHZhciBncmlkSXRlbVdp dGhOZWdhdGl2ZUludGVnZXIgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZ3JpZEl0ZW1XaXRo TmVnYXRpdmVJbnRlZ2VyIik7CisgICAgc2hvdWxkQmUoImdldENvbXB1dGVkU3R5bGUoZ3JpZEl0 ZW1XaXRoTmVnYXRpdmVJbnRlZ2VyLCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlk LWVuZCcpIiwgIictMTAnIik7CisgICAgc2hvdWxkQmUoImdldENvbXB1dGVkU3R5bGUoZ3JpZEl0 ZW1XaXRoTmVnYXRpdmVJbnRlZ2VyLCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlk LWNvbHVtbicpIiwgIictMTAnIik7CisgICAgc2hvdWxkQmUoImdldENvbXB1dGVkU3R5bGUoZ3Jp ZEl0ZW1XaXRoTmVnYXRpdmVJbnRlZ2VyLCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1n cmlkLWFmdGVyJykiLCAiJy0xNSciKTsKKyAgICBzaG91bGRCZSgiZ2V0Q29tcHV0ZWRTdHlsZShn cmlkSXRlbVdpdGhOZWdhdGl2ZUludGVnZXIsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0 LWdyaWQtcm93JykiLCAiJy0xNSciKTsKKworICAgIHZhciBncmlkSXRlbVdpdGhBdXRvRWxlbWVu dCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJncmlkSXRlbVdpdGhBdXRvRWxlbWVudCIpOwor ICAgIHNob3VsZEJlKCJnZXRDb21wdXRlZFN0eWxlKGdyaWRJdGVtV2l0aEF1dG9FbGVtZW50LCAn JykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWVuZCcpIiwgIidhdXRvJyIpOworICAg IHNob3VsZEJlKCJnZXRDb21wdXRlZFN0eWxlKGdyaWRJdGVtV2l0aEF1dG9FbGVtZW50LCAnJyku Z2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWNvbHVtbicpIiwgIidhdXRvJyIpOworICAg IHNob3VsZEJlKCJnZXRDb21wdXRlZFN0eWxlKGdyaWRJdGVtV2l0aEF1dG9FbGVtZW50LCAnJyku Z2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWFmdGVyJykiLCAiJ2F1dG8nIik7CisgICAg c2hvdWxkQmUoImdldENvbXB1dGVkU3R5bGUoZ3JpZEl0ZW1XaXRoQXV0b0VsZW1lbnQsICcnKS5n ZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtcm93JykiLCAiJ2F1dG8nIik7CisKKyAgICBk ZWJ1ZygiIik7CisgICAgZGVidWcoIlRlc3QgdGhlIGluaXRpYWwgdmFsdWUiKTsKKyAgICB2YXIg ZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIGRvY3VtZW50LmJv ZHkuYXBwZW5kQ2hpbGQoZWxlbWVudCk7CisgICAgc2hvdWxkQmUoImdldENvbXB1dGVkU3R5bGUo ZWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3JpZC1lbmQnKSIsICInYXV0 byciKTsKKyAgICBzaG91bGRCZSgiZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0UHJv cGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWNvbHVtbicpIiwgIidhdXRvJyIpOworICAgIHNob3Vs ZEJlKCJnZXRDb21wdXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Vi a2l0LWdyaWQtYWZ0ZXInKSIsICInYXV0byciKTsKKyAgICBzaG91bGRCZSgiZ2V0Q29tcHV0ZWRT dHlsZShlbGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLXJvdycpIiwg IidhdXRvJyIpOworCisgICAgZGVidWcoIiIpOworICAgIGRlYnVnKCJUZXN0IGdldHRpbmcgYW5k IHNldHRpbmcgZ3JpZC1lbmQgYW5kIGdyaWQtYWZ0ZXIgdGhyb3VnaCBKUyIpOworICAgIGVsZW1l bnQuc3R5bGUud2Via2l0R3JpZEVuZCA9ICIxOCI7CisgICAgZWxlbWVudC5zdHlsZS53ZWJraXRH cmlkQWZ0ZXIgPSAiNjYiOworICAgIHNob3VsZEJlKCJnZXRDb21wdXRlZFN0eWxlKGVsZW1lbnQs ICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtZW5kJykiLCAiJzE4JyIpOworICAg IHNob3VsZEJlKCJnZXRDb21wdXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVl KCctd2Via2l0LWdyaWQtY29sdW1uJykiLCAiJzE4JyIpOworICAgIHNob3VsZEJlKCJnZXRDb21w dXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtYWZ0 ZXInKSIsICInNjYnIik7CisgICAgc2hvdWxkQmUoImdldENvbXB1dGVkU3R5bGUoZWxlbWVudCwg JycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3JpZC1yb3cnKSIsICInNjYnIik7CisKKyAg ICBlbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgZG9jdW1lbnQu Ym9keS5hcHBlbmRDaGlsZChlbGVtZW50KTsKKyAgICBlbGVtZW50LnN0eWxlLndlYmtpdEdyaWRF bmQgPSAiLTU1IjsKKyAgICBlbGVtZW50LnN0eWxlLndlYmtpdEdyaWRBZnRlciA9ICItNDAiOwor ICAgIHNob3VsZEJlKCJnZXRDb21wdXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZh bHVlKCctd2Via2l0LWdyaWQtZW5kJykiLCAiJy01NSciKTsKKyAgICBzaG91bGRCZSgiZ2V0Q29t cHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWNv bHVtbicpIiwgIictNTUnIik7CisgICAgc2hvdWxkQmUoImdldENvbXB1dGVkU3R5bGUoZWxlbWVu dCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3JpZC1hZnRlcicpIiwgIictNDAnIik7 CisgICAgc2hvdWxkQmUoImdldENvbXB1dGVkU3R5bGUoZWxlbWVudCwgJycpLmdldFByb3BlcnR5 VmFsdWUoJy13ZWJraXQtZ3JpZC1yb3cnKSIsICInLTQwJyIpOworCisgICAgZWxlbWVudCA9IGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIGRvY3VtZW50LmJvZHkuYXBwZW5kQ2hp bGQoZWxlbWVudCk7CisgICAgZWxlbWVudC5zdHlsZS53ZWJraXRHcmlkRW5kID0gImF1dG8iOwor ICAgIGVsZW1lbnQuc3R5bGUud2Via2l0R3JpZEFmdGVyID0gImF1dG8iOworICAgIHNob3VsZEJl KCJnZXRDb21wdXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0 LWdyaWQtZW5kJykiLCAiJ2F1dG8nIik7CisgICAgc2hvdWxkQmUoImdldENvbXB1dGVkU3R5bGUo ZWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3JpZC1jb2x1bW4nKSIsICIn YXV0byciKTsKKyAgICBzaG91bGRCZSgiZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0 UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWFmdGVyJykiLCAiJ2F1dG8nIik7CisgICAgc2hv dWxkQmUoImdldENvbXB1dGVkU3R5bGUoZWxlbWVudCwgJycpLmdldFByb3BlcnR5VmFsdWUoJy13 ZWJraXQtZ3JpZC1yb3cnKSIsICInYXV0byciKTsKKworICAgIGRlYnVnKCIiKTsKKyAgICBkZWJ1 ZygiVGVzdCBzZXR0aW5nIGdyaWQtZW5kIGFuZCBncmlkLWFmdGVyIGJhY2sgdG8gJ2F1dG8nIHRo cm91Z2ggSlMiKTsKKyAgICBlbGVtZW50LnN0eWxlLndlYmtpdEdyaWRFbmQgPSAiMTgiOworICAg IGVsZW1lbnQuc3R5bGUud2Via2l0R3JpZEFmdGVyID0gIjY2IjsKKyAgICBzaG91bGRCZSgiZ2V0 Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlk LWVuZCcpIiwgIicxOCciKTsKKyAgICBzaG91bGRCZSgiZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50 LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdlYmtpdC1ncmlkLWNvbHVtbicpIiwgIicxOCciKTsK KyAgICBzaG91bGRCZSgiZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0UHJvcGVydHlW YWx1ZSgnLXdlYmtpdC1ncmlkLWFmdGVyJykiLCAiJzY2JyIpOworICAgIHNob3VsZEJlKCJnZXRD b21wdXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQt cm93JykiLCAiJzY2JyIpOworICAgIGVsZW1lbnQuc3R5bGUud2Via2l0R3JpZEVuZCA9ICJhdXRv IjsKKyAgICBlbGVtZW50LnN0eWxlLndlYmtpdEdyaWRBZnRlciA9ICJhdXRvIjsKKyAgICBzaG91 bGRCZSgiZ2V0Q29tcHV0ZWRTdHlsZShlbGVtZW50LCAnJykuZ2V0UHJvcGVydHlWYWx1ZSgnLXdl YmtpdC1ncmlkLWVuZCcpIiwgIidhdXRvJyIpOworICAgIHNob3VsZEJlKCJnZXRDb21wdXRlZFN0 eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVlKCctd2Via2l0LWdyaWQtY29sdW1uJyki LCAiJ2F1dG8nIik7CisgICAgc2hvdWxkQmUoImdldENvbXB1dGVkU3R5bGUoZWxlbWVudCwgJycp LmdldFByb3BlcnR5VmFsdWUoJy13ZWJraXQtZ3JpZC1hZnRlcicpIiwgIidhdXRvJyIpOworICAg IHNob3VsZEJlKCJnZXRDb21wdXRlZFN0eWxlKGVsZW1lbnQsICcnKS5nZXRQcm9wZXJ0eVZhbHVl KCctd2Via2l0LWdyaWQtcm93JykiLCAiJ2F1dG8nIik7Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3Jj PSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwv aHRtbD4K