17248 2008-02-08 18:29:39 -0800 :nth-child() and :lang() should allow spaces before, after and inside the expression 2010-01-07 13:12:57 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED http://build.webkit.org/results/trunk-mac-ppc-release/10799/fast/css/css3-nth-child-diffs.txt InRadar, LayoutTestFailure P2 Normal --- 1 mitz webkit-unassigned bdakin commit-queue gavin.sharp hyatt nickshanks phiw2 webkit.review.bot yuzo oldest_to_newest 69881 0 mitz 2008-02-08 18:29:39 -0800 fast/css/css3-nth-child.html is failing because :nth-child(-n + 2) fails to parse because of the spaces around the "+". According to the spec, spaces should be allowed before and after each part of the expression in the parentheses. Similarly, :lang() should allow leading and trailing space. 69930 1 mitz 2008-02-09 11:00:02 -0800 <rdar://problem/5733761> 73353 2 hyatt 2008-03-11 11:26:35 -0700 CSS WG is proposing to amend this so that whitespace is only allowed after the '(' and before the ')'. HEre is the text of Daniel's email to www-style: The CSS Working Group discussed today the grammar of the :nth-child() and friends functional pseudo-classes included in the Selectors spec. Because of the CSS lexical scanner, parsing :nth-child(an+b) can be very complex if, as always in CSS, we allow whitespaces everywhere, including between the sign of a and its numeral part and so on. We also would like at some point in the future to discuss real math expressions in CSS, so we don't want to make today choices that could be harmful to that future discussion. We then propose to restrict whitespaces in the nth-child()'s argument to ONLY after the '(' and before the ')'. Since this is not the common practice in CSS - whitespace is usually allowed everywhere - we would like the web designers community to let us know if they think it's an acceptable compromise or if you think for instance that web authors will make a lot of mistakes putting invalid whitespaces inside the expression. Thanks for your valuable feedback. Feel free to forward the question as soon as the answer is sent to the mailing-list. </Daniel> 177548 3 45956 yuzo 2010-01-05 23:58:41 -0800 Created attachment 45956 Allow leading/trailing space for CSS nth-*() and lang() 177549 4 webkit.review.bot 2010-01-05 23:59:37 -0800 style-queue ran check-webkit-style on attachment 45956 without any errors. 177586 5 45956 darin 2010-01-06 07:53:57 -0800 Comment on attachment 45956 Allow leading/trailing space for CSS nth-*() and lang() New test cases would be better than changing existing ones. Why remove the testing of the no-spaces cases? 177992 6 46021 yuzo 2010-01-06 22:11:08 -0800 Created attachment 46021 Allow leading/trailing space for CSS :nth-*() and :lang() 177994 7 yuzo 2010-01-06 22:14:16 -0800 Thank you for reviewing this. I've added a dedicated test for this bug. Can you take another look? Yuzo 177997 8 webkit.review.bot 2010-01-06 22:15:38 -0800 style-queue ran check-webkit-style on attachment 46021 without any errors. 178233 9 46021 darin 2010-01-07 09:44:08 -0800 Comment on attachment 46021 Allow leading/trailing space for CSS :nth-*() and :lang() r=me Two thoughts on how to improve in the future or with a followup: 1) This doesn't need to be a non-text test. It would be good to make a test of this that dumps as text instead of a render tree. There are plenty of ways to check that CSS has been parsed other than actually dumping out the render tree. 2) We should have a test of the "spaces inside the expression" case, even though we're not changing behavior of that. We want to test all the significant cases, and that clearly is significant, given the discussion in this bug. 178333 10 46021 commit-queue 2010-01-07 12:58:21 -0800 Comment on attachment 46021 Allow leading/trailing space for CSS :nth-*() and :lang() Clearing flags on attachment: 46021 Committed r52943: <http://trac.webkit.org/changeset/52943> 178335 11 commit-queue 2010-01-07 12:58:27 -0800 All reviewed patches have been landed. Closing bug. 178346 12 ap 2010-01-07 13:12:57 -0800 This was landed without pixel results. Please land those, or better yet, change the test to a dumpAsText one. 45956 2010-01-05 23:58:41 -0800 2010-01-06 22:11:02 -0800 Allow leading/trailing space for CSS nth-*() and lang() bug-17248-20100106165839.patch text/plain 5004 yuzo ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxOGFiNDM1Li4wZjNlNmI2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDEt MDUgIFl1em8gRnVqaXNoaW1hICA8eXV6b0Bnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFsbG93IGxlYWRpbmcvdHJhaWxpbmcgc3Bh Y2UgZm9yIENTUyBudGgtKigpIGFuZCBsYW5nKCkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzI0OAorCisgICAgICAgIEZvciBwc2V1ZG8tY2xhc3Nl cyBudGgtKigpIGFuZCBsYW5nKCksIHNwYWNlIG11c3QgYmUgYWxsb3dlZCBhZnRlciAnKCcgYW5k IGJlZm9yZSAnKScuCisgICAgICAgIFNlZSB0aGUgYnVnIGNvbW1lbnRzIGZvciB3aHkgd2UgZG9u J3QgYWxsb3cgc3BhY2UgYXQgb3RoZXIgcGxhY2VzLgorCisgICAgICAgICogZmFzdC9jc3MvY3Nz My1tb2RzZWwtMjIuaHRtbDoKKyAgICAgICAgKiBmYXN0L2Nzcy9jc3MzLW50aC1jaGlsZC5odG1s OgorCiAyMDEwLTAxLTA1ICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBNYWNpZWogU3RhY2hvd2lhay4KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3QvY3NzL2NzczMtbW9kc2VsLTIyLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9j c3MzLW1vZHNlbC0yMi5odG1sCmluZGV4IDZhYTc3ZmQuLmFhMmY4MjQgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL2Zhc3QvY3NzL2NzczMtbW9kc2VsLTIyLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMv ZmFzdC9jc3MvY3NzMy1tb2RzZWwtMjIuaHRtbApAQCAtMyw3ICszLDcgQEAKICA8aGVhZD4KICAg PHRpdGxlPjpsYW5nKCkgcHNldWRvLWNsYXNzPC90aXRsZT4KICAgPHN0eWxlIHR5cGU9InRleHQv Y3NzIj51bCA+IGxpIHsgYmFja2dyb3VuZC1jb2xvciA6IHJlZCB9Ci1saTpsYW5nKGVuLUdCKSB7 IGJhY2tncm91bmQtY29sb3IgOiBsaW1lIH08L3N0eWxlPgorbGk6bGFuZyggZW4tR0IgKSB7IGJh Y2tncm91bmQtY29sb3IgOiBsaW1lIH0gLyogc3BhY2UgaXMgYWxsb3dlZCBhZnRlciAnKCcgYW5k IGJlZm9yZSAnKScgKi88L3N0eWxlPgogICA8bGluayByZWw9ImZpcnN0IiBocmVmPSJjc3MzLW1v ZHNlbC0xLmh0bWwiIHRpdGxlPSJHcm91cHMgb2Ygc2VsZWN0b3JzIj4KICAgPGxpbmsgcmVsPSJw cmV2IiBocmVmPSJjc3MzLW1vZHNlbC0yMWMuaHRtbCIgdGl0bGU9Ijp0YXJnZXQgcHNldWRvLWNs YXNzIj4KICAgPGxpbmsgcmVsPSJuZXh0IiBocmVmPSJjc3MzLW1vZHNlbC0yMy5odG1sIiB0aXRs ZT0iOmVuYWJsZWQgcHNldWRvLWNsYXNzIj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qv Y3NzL2NzczMtbnRoLWNoaWxkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9jc3MzLW50aC1j aGlsZC5odG1sCmluZGV4IDFjNTY5M2MuLjJmNjI2ZTYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2Zhc3QvY3NzL2NzczMtbnRoLWNoaWxkLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3Mv Y3NzMy1udGgtY2hpbGQuaHRtbApAQCAtMywxMCArMywxMCBAQAogICAgIDxzdHlsZSB0eXBlPSJ0 ZXh0L2NzcyI+CiAgICAgICAgIC8qIFRhYmxlIG9kZCAvIGV2ZW4gdGVzdCAqLwogICAgICAgICB0 cjpudGgtY2hpbGQob2RkKSAgICAgICB7IGNvbG9yOiBncmVlbjsgfQotICAgICAgICB0cjpudGgt Y2hpbGQoZXZlbikgICAgICB7IGNvbG9yOiBwdXJwbGU7IH0KKyAgICAgICAgdHI6bnRoLWNoaWxk KCBldmVuICkgICAgICB7IGNvbG9yOiBwdXJwbGU7IH0gLyogc3BhY2UgaXMgYWxsb3dlZCBhZnRl ciAnKCcgYW5kIGJlZm9yZSAnKScgKi8KICAgICAgICAgCiAgICAgICAgIC8qIENoZWNrIGZvciBu ZWdhdGl2ZSBuIHVzZSAqLwotICAgICAgICB0cjpudGgtY2hpbGQoLW4rMikgICAgICB7IGZvbnQt d2VpZ2h0OiBib2xkOyB9CisgICAgICAgIHRyOm50aC1jaGlsZCggLW4rMiApICAgICAgeyBmb250 LXdlaWdodDogYm9sZDsgfSAvKiBzcGFjZSBpcyBhbGxvd2VkIGFmdGVyICcoJyBhbmQgYmVmb3Jl ICcpJyAqLwogICAgICAgICAKICAgICAgICAgLyogQWx0ZXJuYXRlIHBhcmFncmFwaCBjb2xvdXJz IGluIENTUyAqLwogICAgICAgICBwOm50aC1jaGlsZCgybisxKSB7IGNvbG9yOiBuYXZ5OyB9IC8q IG9kZCBwYXJhZ3JhcGhzICovCkBAIC0xNCw3ICsxNCw3IEBACiAgICAgICAgIAogICAgICAgICAv KiBDaGVjayBudGgtb2YtdHlwZSBhbmQgc3BlY2lmaWNpdHkgKi8KICAgICAgICAgc3BhbgkJCQkJ CXsgZm9udC13ZWlnaHQ6IGJvbGQ7IH0KLSAgICAgICAgc3BhbjpudGgtb2YtdHlwZSgxKQkJCXsg Zm9udC13ZWlnaHQ6IG5vcm1hbDsgfQorICAgICAgICBzcGFuOm50aC1vZi10eXBlKCAxICkJCQl7 IGZvbnQtd2VpZ2h0OiBub3JtYWw7IH0gLyogc3BhY2UgaXMgYWxsb3dlZCBhZnRlciAnKCcgYW5k IGJlZm9yZSAnKScgKi8KICAgICAgICAgc3BhbjpudGgtb2YtdHlwZSgybikJCXsgZm9udC1zdHls ZTogaXRhbGljOyB9CiAgICAgPC9zdHlsZT4KIDwvaGVhZD4KZGlmZiAtLWdpdCBhL1dlYkNvcmUv Q2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGQ1YThjMC4uNDc4ODQ1NSAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxMC0wMS0wNSAgWXV6byBGdWppc2hpbWEgIDx5dXpvQGdvb2dsZS5jb20+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxsb3cg bGVhZGluZy90cmFpbGluZyBzcGFjZSBmb3IgQ1NTIG50aC0qKCkgYW5kIGxhbmcoKS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MjQ4CisKKyAgICAg ICAgRm9yIHBzZXVkby1jbGFzc2VzIG50aC0qKCkgYW5kIGxhbmcoKSwgc3BhY2UgbXVzdCBiZSBh bGxvd2VkIGFmdGVyICcoJyBhbmQgYmVmb3JlICcpJy4KKyAgICAgICAgU2VlIHRoZSBidWcgY29t bWVudHMgZm9yIHdoeSB3ZSBkb24ndCBhbGxvdyBzcGFjZSBhdCBvdGhlciBwbGFjZXMuCisKKyAg ICAgICAgKiBjc3MvQ1NTR3JhbW1hci55OgorCiAyMDEwLTAxLTA1ICBBZGFtIEJhcnRoICA8YWJh cnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292Lgpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9jc3MvQ1NTR3JhbW1hci55IGIvV2ViQ29yZS9jc3MvQ1NTR3Jh bW1hci55CmluZGV4IGNmODcxMDUuLmVkMjY5MzUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvY3NzL0NT U0dyYW1tYXIueQorKysgYi9XZWJDb3JlL2Nzcy9DU1NHcmFtbWFyLnkKQEAgLTExMDksMTEgKzEx MDksMTEgQEAgcHNldWRvOgogICAgICAgICB9CiAgICAgfQogICAgIC8vIHVzZWQgYnkgOm50aC0q KGF4K2IpCi0gICAgfCAnOicgRlVOQ1RJT04gTlRIICcpJyB7CisgICAgfCAnOicgRlVOQ1RJT04g bWF5YmVfc3BhY2UgTlRIIG1heWJlX3NwYWNlICcpJyB7CiAgICAgICAgIENTU1BhcnNlciAqcCA9 IHN0YXRpY19jYXN0PENTU1BhcnNlcio+KHBhcnNlcik7CiAgICAgICAgICQkID0gcC0+Y3JlYXRl RmxvYXRpbmdTZWxlY3RvcigpOwogICAgICAgICAkJC0+bV9tYXRjaCA9IENTU1NlbGVjdG9yOjpQ c2V1ZG9DbGFzczsKLSAgICAgICAgJCQtPnNldEFyZ3VtZW50KCQzKTsKKyAgICAgICAgJCQtPnNl dEFyZ3VtZW50KCQ0KTsKICAgICAgICAgJCQtPm1fdmFsdWUgPSAkMjsKICAgICAgICAgQ1NTU2Vs ZWN0b3I6OlBzZXVkb1R5cGUgdHlwZSA9ICQkLT5wc2V1ZG9UeXBlKCk7CiAgICAgICAgIGlmICh0 eXBlID09IENTU1NlbGVjdG9yOjpQc2V1ZG9Vbmtub3duKQpAQCAtMTEyNywxMSArMTEyNywxMSBA QCBwc2V1ZG86CiAgICAgICAgIH0KICAgICB9CiAgICAgLy8gdXNlZCBieSA6bnRoLSoKLSAgICB8 ICc6JyBGVU5DVElPTiBJTlRFR0VSICcpJyB7CisgICAgfCAnOicgRlVOQ1RJT04gbWF5YmVfc3Bh Y2UgSU5URUdFUiBtYXliZV9zcGFjZSAnKScgewogICAgICAgICBDU1NQYXJzZXIgKnAgPSBzdGF0 aWNfY2FzdDxDU1NQYXJzZXIqPihwYXJzZXIpOwogICAgICAgICAkJCA9IHAtPmNyZWF0ZUZsb2F0 aW5nU2VsZWN0b3IoKTsKICAgICAgICAgJCQtPm1fbWF0Y2ggPSBDU1NTZWxlY3Rvcjo6UHNldWRv Q2xhc3M7Ci0gICAgICAgICQkLT5zZXRBcmd1bWVudChTdHJpbmc6Om51bWJlcigkMykpOworICAg ICAgICAkJC0+c2V0QXJndW1lbnQoU3RyaW5nOjpudW1iZXIoJDQpKTsKICAgICAgICAgJCQtPm1f dmFsdWUgPSAkMjsKICAgICAgICAgQ1NTU2VsZWN0b3I6OlBzZXVkb1R5cGUgdHlwZSA9ICQkLT5w c2V1ZG9UeXBlKCk7CiAgICAgICAgIGlmICh0eXBlID09IENTU1NlbGVjdG9yOjpQc2V1ZG9Vbmtu b3duKQpAQCAtMTE0NSwxMSArMTE0NSwxMSBAQCBwc2V1ZG86CiAgICAgICAgIH0KICAgICB9CiAg ICAgLy8gdXNlZCBieSA6bnRoLSoob2RkL2V2ZW4pIGFuZCA6bGFuZwotICAgIHwgJzonIEZVTkNU SU9OIElERU5UICcpJyB7CisgICAgfCAnOicgRlVOQ1RJT04gbWF5YmVfc3BhY2UgSURFTlQgbWF5 YmVfc3BhY2UgJyknIHsKICAgICAgICAgQ1NTUGFyc2VyICpwID0gc3RhdGljX2Nhc3Q8Q1NTUGFy c2VyKj4ocGFyc2VyKTsKICAgICAgICAgJCQgPSBwLT5jcmVhdGVGbG9hdGluZ1NlbGVjdG9yKCk7 CiAgICAgICAgICQkLT5tX21hdGNoID0gQ1NTU2VsZWN0b3I6OlBzZXVkb0NsYXNzOwotICAgICAg ICAkJC0+c2V0QXJndW1lbnQoJDMpOworICAgICAgICAkJC0+c2V0QXJndW1lbnQoJDQpOwogICAg ICAgICAkMi5sb3dlcigpOwogICAgICAgICAkJC0+bV92YWx1ZSA9ICQyOwogICAgICAgICBDU1NT ZWxlY3Rvcjo6UHNldWRvVHlwZSB0eXBlID0gJCQtPnBzZXVkb1R5cGUoKTsK 46021 2010-01-06 22:11:08 -0800 2010-01-07 12:58:21 -0800 Allow leading/trailing space for CSS :nth-*() and :lang() bug-17248-20100107151106.patch text/plain 5507 yuzo ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxOGFiNDM1Li4wNGM1NDY5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDEt MDYgIFl1em8gRnVqaXNoaW1hICA8eXV6b0Bnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFsbG93IGxlYWRpbmcvdHJhaWxpbmcgc3Bh Y2UgZm9yIENTUyBudGgtKigpIGFuZCBsYW5nKCkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzI0OAorCisgICAgICAgIEZvciBwc2V1ZG8tY2xhc3Nl cyA6bnRoLSooKSBhbmQgOmxhbmcoKSwgc3BhY2UgbXVzdCBiZSBhbGxvd2VkIGFmdGVyICcoJyBh bmQgYmVmb3JlICcpJy4KKyAgICAgICAgU2VlIHRoZSBidWcgY29tbWVudHMgZm9yIHdoeSB3ZSBk b24ndCBhbGxvdyBzcGFjZSBhdCBvdGhlciBwbGFjZXMuCisKKyAgICAgICAgKiBmYXN0L2Nzcy9j c3MzLXNwYWNlLWluLW50aC1hbmQtbGFuZy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9y bS9tYWMvZmFzdC9jc3MvY3NzMy1zcGFjZS1pbi1udGgtYW5kLWxhbmctZXhwZWN0ZWQudHh0OiBB ZGRlZC4KKwogMjAxMC0wMS0wNSAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgTWFjaWVqIFN0YWNob3dpYWsuCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9mYXN0L2Nzcy9jc3MzLXNwYWNlLWluLW50aC1hbmQtbGFuZy5odG1sIGIvTGF5b3V0 VGVzdHMvZmFzdC9jc3MvY3NzMy1zcGFjZS1pbi1udGgtYW5kLWxhbmcuaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xMzBlMDcyCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC9jc3MvY3NzMy1zcGFjZS1pbi1udGgtYW5kLWxhbmcuaHRtbApAQCAtMCww ICsxLDI2IEBACis8aHRtbD4KKzxoZWFkPgorICAgIDx0aXRsZT5MZWFkaW5nL3RyYWlsaW5nIHNw YWNlIGluIDpudGgtKiBhbmQgOmxhbmcgcHNldWRvLWNsYXNzZXM8L3RpdGxlPgorICAgIDxzdHls ZSB0eXBlPSJ0ZXh0L2NzcyI+CisgICAgICAgIC8qIEludGVnZXIgKi8KKyAgICAgICAgZGl2Om50 aC1jaGlsZCggMSApIHsgYmFja2dyb3VuZC1jb2xvcjogeWVsbG93OyB9CisKKyAgICAgICAgLyog SWRlbnRpZmllciAqLworICAgICAgICBkaXY6bnRoLWNoaWxkKCBvZGQgKSB7IGNvbG9yOiBncmVl bjsgfQorICAgICAgICBkaXY6bGFuZyggZW4tR0IgKSB7IGJhY2tncm91bmQtY29sb3I6IHNpbHZl cjsgfQorCisgICAgICAgIC8qIGFuK2IgKi8KKyAgICAgICAgZGl2Om50aC1jaGlsZCggMm4gKSB7 IGNvbG9yOiBibHVlOyB9CisgICAgPC9zdHlsZT4KKzwvaGVhZD4KKworPGJvZHk+CisgICAgPGRp dj5HcmVlbiBvbiBZZWxsb3c8L2Rpdj4KKyAgICA8ZGl2IGxhbmc9ImVuLUdCIj5CbHVlIG9uIFNp bHZlcjwvZGl2PgorICAgIDxkaXY+R3JlZW48L2Rpdj4KKyAgICA8ZGl2PkJsdWU8L2Rpdj4KKyAg ICA8ZGl2PkdyZWVuPC9kaXY+CisgICAgPGRpdj5CbHVlPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+ CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L2Nzcy9jc3MzLXNw YWNlLWluLW50aC1hbmQtbGFuZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMvZmFzdC9jc3MvY3NzMy1zcGFjZS1pbi1udGgtYW5kLWxhbmctZXhwZWN0ZWQudHh0Cm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjNlMWExMDEKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9jc3MvY3NzMy1zcGFjZS1pbi1udGgtYW5k LWxhbmctZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMjMgQEAKK2xheWVyIGF0ICgwLDApIHNpemUg ODAweDYwMAorICBSZW5kZXJWaWV3IGF0ICgwLDApIHNpemUgODAweDYwMAorbGF5ZXIgYXQgKDAs MCkgc2l6ZSA4MDB4NjAwCisgIFJlbmRlckJsb2NrIHtIVE1MfSBhdCAoMCwwKSBzaXplIDgwMHg2 MDAKKyAgICBSZW5kZXJCb2R5IHtCT0RZfSBhdCAoOCw4KSBzaXplIDc4NHg1ODQKKyAgICAgIFJl bmRlckJsb2NrIHtESVZ9IGF0ICgwLDApIHNpemUgNzg0eDE4IFtjb2xvcj0jMDA4MDAwXSBbYmdj b2xvcj0jRkZGRjAwXQorICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAx MTB4MTgKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAxMTA6ICJHcmVlbiBvbiBZ ZWxsb3ciCisgICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoMCwxOCkgc2l6ZSA3ODR4MTggW2Nv bG9yPSMwMDAwRkZdIFtiZ2NvbG9yPSNDMEMwQzBdCisgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0 fSBhdCAoMCwwKSBzaXplIDkxeDE4CisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGgg OTE6ICJCbHVlIG9uIFNpbHZlciIKKyAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgwLDM2KSBz aXplIDc4NHgxOCBbY29sb3I9IzAwODAwMF0KKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0 ICgwLDApIHNpemUgMzl4MTgKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAzOTog IkdyZWVuIgorICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsNTQpIHNpemUgNzg0eDE4IFtj b2xvcj0jMDAwMEZGXQorICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAz MHgxOAorICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDMwOiAiQmx1ZSIKKyAgICAg IFJlbmRlckJsb2NrIHtESVZ9IGF0ICgwLDcyKSBzaXplIDc4NHgxOCBbY29sb3I9IzAwODAwMF0K KyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMzl4MTgKKyAgICAgICAg ICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAzOTogIkdyZWVuIgorICAgICAgUmVuZGVyQmxvY2sg e0RJVn0gYXQgKDAsOTApIHNpemUgNzg0eDE4IFtjb2xvcj0jMDAwMEZGXQorICAgICAgICBSZW5k ZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAzMHgxOAorICAgICAgICAgIHRleHQgcnVuIGF0 ICgwLDApIHdpZHRoIDMwOiAiQmx1ZSIKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIv V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGQ1YThjMC4uMmJhMjA3NCAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAor MjAxMC0wMS0wNiAgWXV6byBGdWppc2hpbWEgIDx5dXpvQGdvb2dsZS5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxsb3cgbGVhZGluZy90cmFp bGluZyBzcGFjZSBmb3IgQ1NTIG50aC0qKCkgYW5kIGxhbmcoKS4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MjQ4CisKKyAgICAgICAgRm9yIHBzZXVk by1jbGFzc2VzIDpudGgtKigpIGFuZCA6bGFuZygpLCBzcGFjZSBtdXN0IGJlIGFsbG93ZWQgYWZ0 ZXIgJygnIGFuZCBiZWZvcmUgJyknLgorICAgICAgICBTZWUgdGhlIGJ1ZyBjb21tZW50cyBmb3Ig d2h5IHdlIGRvbid0IGFsbG93IHNwYWNlIGF0IG90aGVyIHBsYWNlcy4KKworICAgICAgICAqIGNz cy9DU1NHcmFtbWFyLnk6CisKIDIwMTAtMDEtMDUgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0 Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCmRpZmYgLS1naXQg YS9XZWJDb3JlL2Nzcy9DU1NHcmFtbWFyLnkgYi9XZWJDb3JlL2Nzcy9DU1NHcmFtbWFyLnkKaW5k ZXggY2Y4NzEwNS4uZWQyNjkzNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9jc3MvQ1NTR3JhbW1hci55 CisrKyBiL1dlYkNvcmUvY3NzL0NTU0dyYW1tYXIueQpAQCAtMTEwOSwxMSArMTEwOSwxMSBAQCBw c2V1ZG86CiAgICAgICAgIH0KICAgICB9CiAgICAgLy8gdXNlZCBieSA6bnRoLSooYXgrYikKLSAg ICB8ICc6JyBGVU5DVElPTiBOVEggJyknIHsKKyAgICB8ICc6JyBGVU5DVElPTiBtYXliZV9zcGFj ZSBOVEggbWF5YmVfc3BhY2UgJyknIHsKICAgICAgICAgQ1NTUGFyc2VyICpwID0gc3RhdGljX2Nh c3Q8Q1NTUGFyc2VyKj4ocGFyc2VyKTsKICAgICAgICAgJCQgPSBwLT5jcmVhdGVGbG9hdGluZ1Nl bGVjdG9yKCk7CiAgICAgICAgICQkLT5tX21hdGNoID0gQ1NTU2VsZWN0b3I6OlBzZXVkb0NsYXNz OwotICAgICAgICAkJC0+c2V0QXJndW1lbnQoJDMpOworICAgICAgICAkJC0+c2V0QXJndW1lbnQo JDQpOwogICAgICAgICAkJC0+bV92YWx1ZSA9ICQyOwogICAgICAgICBDU1NTZWxlY3Rvcjo6UHNl dWRvVHlwZSB0eXBlID0gJCQtPnBzZXVkb1R5cGUoKTsKICAgICAgICAgaWYgKHR5cGUgPT0gQ1NT U2VsZWN0b3I6OlBzZXVkb1Vua25vd24pCkBAIC0xMTI3LDExICsxMTI3LDExIEBAIHBzZXVkbzoK ICAgICAgICAgfQogICAgIH0KICAgICAvLyB1c2VkIGJ5IDpudGgtKgotICAgIHwgJzonIEZVTkNU SU9OIElOVEVHRVIgJyknIHsKKyAgICB8ICc6JyBGVU5DVElPTiBtYXliZV9zcGFjZSBJTlRFR0VS IG1heWJlX3NwYWNlICcpJyB7CiAgICAgICAgIENTU1BhcnNlciAqcCA9IHN0YXRpY19jYXN0PENT U1BhcnNlcio+KHBhcnNlcik7CiAgICAgICAgICQkID0gcC0+Y3JlYXRlRmxvYXRpbmdTZWxlY3Rv cigpOwogICAgICAgICAkJC0+bV9tYXRjaCA9IENTU1NlbGVjdG9yOjpQc2V1ZG9DbGFzczsKLSAg ICAgICAgJCQtPnNldEFyZ3VtZW50KFN0cmluZzo6bnVtYmVyKCQzKSk7CisgICAgICAgICQkLT5z ZXRBcmd1bWVudChTdHJpbmc6Om51bWJlcigkNCkpOwogICAgICAgICAkJC0+bV92YWx1ZSA9ICQy OwogICAgICAgICBDU1NTZWxlY3Rvcjo6UHNldWRvVHlwZSB0eXBlID0gJCQtPnBzZXVkb1R5cGUo KTsKICAgICAgICAgaWYgKHR5cGUgPT0gQ1NTU2VsZWN0b3I6OlBzZXVkb1Vua25vd24pCkBAIC0x MTQ1LDExICsxMTQ1LDExIEBAIHBzZXVkbzoKICAgICAgICAgfQogICAgIH0KICAgICAvLyB1c2Vk IGJ5IDpudGgtKihvZGQvZXZlbikgYW5kIDpsYW5nCi0gICAgfCAnOicgRlVOQ1RJT04gSURFTlQg JyknIHsKKyAgICB8ICc6JyBGVU5DVElPTiBtYXliZV9zcGFjZSBJREVOVCBtYXliZV9zcGFjZSAn KScgewogICAgICAgICBDU1NQYXJzZXIgKnAgPSBzdGF0aWNfY2FzdDxDU1NQYXJzZXIqPihwYXJz ZXIpOwogICAgICAgICAkJCA9IHAtPmNyZWF0ZUZsb2F0aW5nU2VsZWN0b3IoKTsKICAgICAgICAg JCQtPm1fbWF0Y2ggPSBDU1NTZWxlY3Rvcjo6UHNldWRvQ2xhc3M7Ci0gICAgICAgICQkLT5zZXRB cmd1bWVudCgkMyk7CisgICAgICAgICQkLT5zZXRBcmd1bWVudCgkNCk7CiAgICAgICAgICQyLmxv d2VyKCk7CiAgICAgICAgICQkLT5tX3ZhbHVlID0gJDI7CiAgICAgICAgIENTU1NlbGVjdG9yOjpQ c2V1ZG9UeXBlIHR5cGUgPSAkJC0+cHNldWRvVHlwZSgpOwo=