37431 2010-04-11 19:52:03 -0700 Make comma/whitespace around arc flags optional in SVG path syntax 2010-04-12 09:51:43 -0700 1 1 1 Unclassified WebKit SVG 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jeffschiller webkit-unassigned commit-queue krit zimmermann oldest_to_newest 211507 0 53136 jeffschiller 2010-04-11 19:52:03 -0700 Created attachment 53136 Test case showing that comma/whitespace is optional between and after arc flags As per recent W3C SVG WG discussion: http://lists.w3.org/Archives/Public/www-svg/2010Apr/0042.html All other browsers (Firefox, Opera, Batik, IE9) treat the whitespace/comma between largeArcFlag and sweepFlag in the SVG arc path command syntax as optional. They also treat the whitespace/comma between sweepFlag and the coordinate pair as optional. Finally only values of "0" and "1" are allowed for the largeArcFlag and sweepFlag as per the path grammar: http://dev.w3.org/SVG/profiles/1.1F2/publish/paths.html#PathDataBNF I am attaching a test case. This test case renders all paths as green in Firefox, Opera and IE9. This test case renders all paths as red in WebKit-based browsers. I would like to suggest that WebKit align with what other browsers are doing, especially considering that the WG considers this as 'proper' behavior. 211511 1 53139 jeffschiller 2010-04-11 19:56:11 -0700 Created attachment 53139 Test case showing that comma/whitespace is optional between and after arc flags and that flags should only be 0 or 1 211540 2 53146 jeffschiller 2010-04-11 22:05:35 -0700 Created attachment 53146 Fix to the parser to only accept 0,1 for arc flags and to make comma/whitespace after the flag be optional Test file shows all green paths after applying the patch and all LayoutTests pass. 211548 3 krit 2010-04-11 23:11:13 -0700 Looks good to me. Since this is still in discussion and it is not sure if this moves into SVG1.1SE or SVG2.0, I think we shouldn't land this patch yet. I know, that this could be landed because of compatibility reasons, but let us wait some days for the responses of the SVG WG members. I'll clear the review flag for the moment. Feel free to set it again after more clearness on this topic later. 211589 4 jeffschiller 2010-04-12 05:33:41 -0700 The SVG 1.1 2nd Edition spec has been updated to support the grammar as outlined in this bug: http://dev.w3.org/SVG/profiles/1.1F2/publish/paths.html#PathDataBNF SVG WG decision: http://lists.w3.org/Archives/Public/www-svg/2010Apr/0046.html 211605 5 jeffschiller 2010-04-12 07:55:21 -0700 Incidentally, WebKit with this patch correctly displays the following test case from the official SVG 1.1 2nd Edition Test Suite: http://dev.w3.org/SVG/profiles/1.1F2/test/svg/paths-data-20-f.svg 211608 6 53146 krit 2010-04-12 08:21:09 -0700 Comment on attachment 53146 Fix to the parser to only accept 0,1 for arc flags and to make comma/whitespace after the flag be optional LGTM. r=me. 211625 7 53146 commit-queue 2010-04-12 08:50:00 -0700 Comment on attachment 53146 Fix to the parser to only accept 0,1 for arc flags and to make comma/whitespace after the flag be optional Clearing flags on attachment: 53146 Committed r57473: <http://trac.webkit.org/changeset/57473> 211626 8 commit-queue 2010-04-12 08:50:05 -0700 All reviewed patches have been landed. Closing bug. 211631 9 krit 2010-04-12 09:04:12 -0700 This patch causes a break of the SL bot http://build.webkit.org/builders/SnowLeopard Intel Leaks/builds/5883/steps/compile-webkit/logs/stdio 211632 10 krit 2010-04-12 09:07:37 -0700 (In reply to comment #9) > This patch causes a break of the SL bot > http://build.webkit.org/builders/SnowLeopard Intel > Leaks/builds/5883/steps/compile-webkit/logs/stdio cc1plus: warnings being treated as errors /Volumes/Data/WebKit-BuildSlave/snowleopard-intel-leaks/build/WebCore/svg/SVGParserUtilities.cpp:145: warning: no previous prototype for 'bool WebCore::parseArcFlag(const UChar*&, const UChar*, bool&)' 211634 11 jeffschiller 2010-04-12 09:11:16 -0700 Ok, I'm not sure I can test this out as I don't have SL. Is it just a matter of adding a function prototype to the header? I declared the function before invoking it, but I guess that's not good enough? 211644 12 krit 2010-04-12 09:51:43 -0700 Landed SL build bix in http://trac.webkit.org/changeset/57474 53136 2010-04-11 19:52:03 -0700 2010-04-11 19:56:11 -0700 Test case showing that comma/whitespace is optional between and after arc flags path-arc.svg image/svg+xml 996 jeffschiller PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAv c3ZnIj4KCiAgICA8IS0tIFRoaXMgdGVzdHMgcGFyc2luZyBydWxlcyBvZiB0aGUgZmxhZ3MgaW4g dGhlIGFyYyBwYXRoIGNvbW1hbmQuCiAgICAgICAgIE5vIHJlZCBzaG91bGQgYmUgdmlzaWJsZSwg b25seSBncmVlbiAtLT4KCiAgICA8IS0tIHRoaXMgdGVzdHMgdGhhdCB0aGUgdHdvIGZsYWdzIGRv IG5vdCBuZWVkIHdoaXRlc3BhY2UgYmV0d2VlbiB0aGVtIC0tPgoJPHBhdGggZmlsbD0icmVkIiBk PSJNMjAwLDIwMCBoLTE1MCBhMTUwLDE1MCAwIDAsMCAxNTAsLTE1MCB6Ii8+Cgk8cGF0aCBmaWxs PSJncmVlbiIgZD0iTTIwMCwyMDAgaC0xNTAgYTE1MCwxNTAgMCAwMCAxNTAsLTE1MCB6Ii8+Cgog ICAgPCEtLSB0aGlzIHRlc3RzIHRoYXQgdGhlIGxhc3QgZmxhZ3MgZG9lcyBub3QgbmVlZCB3aGl0 ZXNwYWNlIGJldHdlZW4gaXQKICAgICAgICAgYW5kIHRoZSB4LWNvb3JkaW5hdGUgLS0+Cgk8cGF0 aCBmaWxsPSJyZWQiIGQ9Ik01MDAsMjAwIGgtMTUwIGExNTAsMTUwIDAgMCwxIDE1MCwtMTUwIHoi Lz4KCTxwYXRoIGZpbGw9ImdyZWVuIiBkPSJNNTAwLDIwMCBoLTE1MCBhMTUwLDE1MCAwIDAxIDE1 MCwtMTUwIHoiLz4KCiAgICA8IS0tIHRoZXNlIHR3byBzdWItdGVzdHMgdGVzdCB0aGF0IHRoZSBz YW1lIHJ1bGVzIGFwcGx5IHdoZW4gZmxhZ3MgYXJlIDAgb3IgMSAtLT4KCTxwYXRoIGZpbGw9InJl ZCIgZD0iTTIwMCw1MDAgaC0xNTAgYTE1MCwxNTAgMCAxLDAgMTUwLC0xNTAgeiIvPgoJPHBhdGgg ZmlsbD0iZ3JlZW4iIGQ9Ik0yMDAsNTAwIGgtMTUwIGExNTAsMTUwIDAgMTAgMTUwLC0xNTAgeiIv PgoKCTxwYXRoIGZpbGw9InJlZCIgZD0iTTcwMCw2NTAgaC0xNTAgYTE1MCwxNTAgMCAxLDEgMTUw LC0xNTAgeiIvPgoJPHBhdGggZmlsbD0iZ3JlZW4iIGQ9Ik03MDAsNjUwIGgtMTUwIGExNTAsMTUw IDAgMTEgMTUwLC0xNTAgeiIvPgoKPC9zdmc+ 53139 2010-04-11 19:56:11 -0700 2010-04-11 19:56:11 -0700 Test case showing that comma/whitespace is optional between and after arc flags and that flags should only be 0 or 1 path-arc.svg image/svg+xml 1225 jeffschiller PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAv c3ZnIj4KCiAgICA8IS0tIFRoaXMgdGVzdHMgcGFyc2luZyBydWxlcyBvZiB0aGUgZmxhZ3MgaW4g dGhlIGFyYyBwYXRoIGNvbW1hbmQuCiAgICAgICAgIE5vIHJlZCBzaG91bGQgYmUgdmlzaWJsZSwg b25seSBncmVlbiAtLT4KCiAgICA8IS0tIHRoaXMgdGVzdHMgdGhhdCB0aGUgdHdvIGZsYWdzIGRv IG5vdCBuZWVkIHdoaXRlc3BhY2UgYmV0d2VlbiB0aGVtIC0tPgoJPHBhdGggZmlsbD0icmVkIiBk PSJNMjAwLDIwMCBoLTE1MCBhMTUwLDE1MCAwIDAsMCAxNTAsLTE1MCB6Ii8+Cgk8cGF0aCBmaWxs PSJncmVlbiIgZD0iTTIwMCwyMDAgaC0xNTAgYTE1MCwxNTAgMCAwMCAxNTAsLTE1MCB6Ii8+Cgog ICAgPCEtLSB0aGlzIHRlc3RzIHRoYXQgdGhlIGxhc3QgZmxhZ3MgZG9lcyBub3QgbmVlZCB3aGl0 ZXNwYWNlIGJldHdlZW4gaXQKICAgICAgICAgYW5kIHRoZSB4LWNvb3JkaW5hdGUgLS0+Cgk8cGF0 aCBmaWxsPSJyZWQiIGQ9Ik01MDAsMjAwIGgtMTUwIGExNTAsMTUwIDAgMCwxIDE1MCwtMTUwIHoi Lz4KCTxwYXRoIGZpbGw9ImdyZWVuIiBkPSJNNTAwLDIwMCBoLTE1MCBhMTUwLDE1MCAwIDAxIDE1 MCwtMTUwIHoiLz4KCiAgICA8IS0tIHRoaXMgdGVzdHMgdGhhdCBvbmx5IGZsYWdzIHdpdGggYSAw IG9yIDEgYXJlIHZhbGlkLCBvdGhlcndpc2UgdGhlIHBhdGggaXMgaW4gZXJyb3IgLS0+Cgk8cGF0 aCBmaWxsPSJncmVlbiIgZD0iTTgwMCwyMDAgaC0xNTAgYTE1MCwxNTAgMCAwLDAgMTUwLC0xNTAg eiIvPgoJPHBhdGggZmlsbD0icmVkIiBkPSJNODAwLDIwMCBoLTE1MCBhMTUwLDE1MCAwIDAsOCAx NTAsLTE1MCB6Ii8+CgogICAgPCEtLSB0aGVzZSB0d28gc3ViLXRlc3RzIHRlc3QgdGhhdCB0aGUg c2FtZSBydWxlcyBhcHBseSB3aGVuIGZsYWdzIGFyZSAwIG9yIDEgLS0+Cgk8cGF0aCBmaWxsPSJy ZWQiIGQ9Ik0yMDAsNTAwIGgtMTUwIGExNTAsMTUwIDAgMSwwIDE1MCwtMTUwIHoiLz4KCTxwYXRo IGZpbGw9ImdyZWVuIiBkPSJNMjAwLDUwMCBoLTE1MCBhMTUwLDE1MCAwIDEwIDE1MCwtMTUwIHoi Lz4KCgk8cGF0aCBmaWxsPSJyZWQiIGQ9Ik03MDAsNjUwIGgtMTUwIGExNTAsMTUwIDAgMSwxIDE1 MCwtMTUwIHoiLz4KCTxwYXRoIGZpbGw9ImdyZWVuIiBkPSJNNzAwLDY1MCBoLTE1MCBhMTUwLDE1 MCAwIDExIDE1MCwtMTUwIHoiLz4KCjwvc3ZnPg== 53146 2010-04-11 22:05:35 -0700 2010-04-12 08:50:00 -0700 Fix to the parser to only accept 0,1 for arc flags and to make comma/whitespace after the flag be optional bug37431.patch.txt text/plain 8850 jeffschiller SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzQ2OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMTAtMDQtMTEgIEplZmYgU2NoaWxsZXIgIDxjb2RlZHJlYWRAZ21h aWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE1ha2UgY29tbWEvd2hpdGVzcGFjZSBhcm91bmQgYXJjIGZsYWdzIG9wdGlvbmFsIGluIFNWRyBw YXRoIHN5bnRheCBhbmQgZW5zdXJlIGZsYWdzIGFyZQorICAgICAgICBlaXRoZXIgMCBvciAxOiBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzc0MzEKKworICAgICAgICAq IHN2Zy9TVkdQYXJzZXJVdGlsaXRpZXMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cGFyc2VBcmNG bGFnKTogZnVuY3Rpb24gdG8gcmVhZCBpbiBhIDAgb3IgMSBmb3IgbGFyZ2VBcmNGbGFnIGFuZCBz d2VlcEZsYWcKKyAgICAgICAgKFdlYkNvcmU6OlNWR1BhdGhQYXJzZXI6OnBhcnNlU1ZHKTogbW9k aWZ5L3NpbXBsaWZ5IGFyYyBwYXJzaW5nIGJ5IHVzaW5nIHBhcnNlQXJjRmxhZygpCisKIDIwMTAt MDQtMTEgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFdlYkNvcmUvc3ZnL1NWR1BhcnNlclV0aWxpdGllcy5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9zdmcvU1ZHUGFyc2VyVXRpbGl0aWVzLmNwcAkocmV2 aXNpb24gNTc0NjYpCisrKyBXZWJDb3JlL3N2Zy9TVkdQYXJzZXJVdGlsaXRpZXMuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xNDAsNiArMTQwLDIzIEBAIHN0YXRpYyBib29sIHBhcnNlTnVtYmVyKGNv bnN0IFVDaGFyKiYgcHQKICAgICByZXR1cm4gX3BhcnNlTnVtYmVyKHB0ciwgZW5kLCBudW1iZXIs IHNraXApOwogfQogCisvLyBvbmx5IHVzZWQgdG8gcGFyc2UgbGFyZ2VBcmNGbGFnIGFuZCBzd2Vl cEZsYWcgd2hpY2ggbXVzdCBiZSBhICIwIiBvciAiMSIKKy8vIGFuZCBtaWdodCBub3QgaGF2ZSBh bnkgd2hpdGVzcGFjZS9jb21tYSBhZnRlciBpdAorYm9vbCBwYXJzZUFyY0ZsYWcoY29uc3QgVUNo YXIqJiBwdHIsIGNvbnN0IFVDaGFyKiBlbmQsIGJvb2wmIGZsYWcpCit7CisgICAgY29uc3QgVUNo YXIgZmxhZ0NoYXIgPSAqcHRyKys7CisgICAgaWYgKGZsYWdDaGFyID09ICcwJykKKyAgICAgICAg ZmxhZyA9IGZhbHNlOworICAgIGVsc2UgaWYgKGZsYWdDaGFyID09ICcxJykKKyAgICAgICAgZmxh ZyA9IHRydWU7CisgICAgZWxzZQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgCisgICAgc2tp cE9wdGlvbmFsU3BhY2VzT3JEZWxpbWl0ZXIocHRyLCBlbmQpOworICAgIAorICAgIHJldHVybiB0 cnVlOworfQorCiBib29sIHBhcnNlTnVtYmVyT3B0aW9uYWxOdW1iZXIoY29uc3QgU3RyaW5nJiBz LCBmbG9hdCYgeCwgZmxvYXQmIHkpCiB7CiAgICAgaWYgKHMuaXNFbXB0eSgpKQpAQCAtNDc4LDE0 ICs0OTUsMTAgQEAgYm9vbCBTVkdQYXRoUGFyc2VyOjpwYXJzZVNWRyhjb25zdCBTdHJpbgogICAg ICAgICAgICAgewogICAgICAgICAgICAgICAgIGJvb2wgbGFyZ2VBcmMsIHN3ZWVwOwogICAgICAg ICAgICAgICAgIGRvdWJsZSBhbmdsZSwgcngsIHJ5OwotICAgICAgICAgICAgICAgIGlmICghcGFy c2VOdW1iZXIocHRyLCBlbmQsIHJ4KSAgICB8fCAhcGFyc2VOdW1iZXIocHRyLCBlbmQsIHJ5KSB8 fAotICAgICAgICAgICAgICAgICAgICAhcGFyc2VOdW1iZXIocHRyLCBlbmQsIGFuZ2xlKSB8fCAh cGFyc2VOdW1iZXIocHRyLCBlbmQsIHRveCkpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiBm YWxzZTsKLSAgICAgICAgICAgICAgICBsYXJnZUFyYyA9IHRveCA9PSAxOwotICAgICAgICAgICAg ICAgIGlmICghcGFyc2VOdW1iZXIocHRyLCBlbmQsIHRveCkpCi0gICAgICAgICAgICAgICAgICAg IHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgICAgICBzd2VlcCA9IHRveCA9PSAxOwotICAgICAg ICAgICAgICAgIGlmICghcGFyc2VOdW1iZXIocHRyLCBlbmQsIHRveCkgfHwgIXBhcnNlTnVtYmVy KHB0ciwgZW5kLCB0b3kpKQorICAgICAgICAgICAgICAgIGlmICghcGFyc2VOdW1iZXIocHRyLCBl bmQsIHJ4KSAgICB8fCAhcGFyc2VOdW1iZXIocHRyLCBlbmQsIHJ5KQorICAgICAgICAgICAgICAg ICAgICB8fCAhcGFyc2VOdW1iZXIocHRyLCBlbmQsIGFuZ2xlKQorICAgICAgICAgICAgICAgICAg ICB8fCAhcGFyc2VBcmNGbGFnKHB0ciwgZW5kLCBsYXJnZUFyYykgfHwgIXBhcnNlQXJjRmxhZyhw dHIsIGVuZCwgc3dlZXApCisgICAgICAgICAgICAgICAgICAgIHx8ICFwYXJzZU51bWJlcihwdHIs IGVuZCwgdG94KSB8fCAhcGFyc2VOdW1iZXIocHRyLCBlbmQsIHRveSkpCiAgICAgICAgICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICAgICAgICAgIC8vIFNwZWM6IHJhZGlpIGFy ZSBub25uZWdhdGl2ZSBudW1iZXJzCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA1NzQ2OCkKKysrIExheW91 dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEwLTA0 LTExICBKZWZmIFNjaGlsbGVyICA8Y29kZWRyZWFkQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgdGVzdHMgdG8gaGFuZGxlIHRo YXQgY29tbWEvd2hpdGVzcGFjZSBhcm91bmQgYXJjIGZsYWdzIGFyZSBvcHRpb25hbAorICAgICAg ICBhbmQgdGhhdCBhcmMgZmxhZ3MgY2FuIG9ubHkgYmUgMCBvciAxIGluIFNWRyBwYXRoIHN5bnRh eDogCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzQz MQorCisgICAgICAgICogc3ZnL2RvbS9mdXp6LXBhdGgtcGFyc2VyLWV4cGVjdGVkLnR4dDogT25l IHRlc3Qgbm93IGZhaWxzIGR1ZSB0byBmbGFncyBub3QgMCBvciAxCisgICAgICAgICogc3ZnL2Rv bS9wYXRoLXBhcnNlci1leHBlY3RlZC50eHQ6IEFkZCB0ZXN0IHJlc3VsdHMgZm9yIG1pc3Npbmcg d2hpdGVzcGFjZSBhbmQgZmxhZ3Mgbm90IDAgb3IgMQorICAgICAgICAqIHN2Zy9kb20vc2NyaXB0 LXRlc3RzL3BhdGgtcGFyc2VyLmpzOiBBZGQgNiB0ZXN0cyB0byBjaGVjayB0aGF0IHdoaXRlc3Bh Y2UgaXMgb3B0aW9uYWwgYWZ0ZXIgZmxhZ3MgYW5kIGZsYWdzIG11c3QgYmUgMCBvciAxCisKIDIw MTAtMDQtMTEgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KIAogICAgICAgICBOb3Qg cmV2aWV3ZWQsIGxheW91dCB0ZXN0IGZpeCBmb3IgUVQgYm90cy4KSW5kZXg6IExheW91dFRlc3Rz L3N2Zy9kb20vZnV6ei1wYXRoLXBhcnNlci1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvc3ZnL2RvbS9mdXp6LXBhdGgtcGFyc2VyLWV4cGVjdGVkLnR4dAkocmV2aXNpb24g NTc0NjYpCisrKyBMYXlvdXRUZXN0cy9zdmcvZG9tL2Z1enotcGF0aC1wYXJzZXItZXhwZWN0ZWQu dHh0CSh3b3JraW5nIGNvcHkpCkBAIC0zLDYgKzMsNyBAQCBDT05TT0xFIE1FU1NBR0U6IGxpbmUg OTc6IEVycm9yOiBQcm9ibGVtCiBDT05TT0xFIE1FU1NBR0U6IGxpbmUgOTc6IEVycm9yOiBQcm9i bGVtIHBhcnNpbmcgZD0iTTEsMWgwIEE2IDUsNSA0LDEsNSwzIEg1IGE4IDgsMCAwLDksOCAzIGE2 LDEsNiwzIDUsNiwzLFMxIDkgNSAxIDcsIgogQ09OU09MRSBNRVNTQUdFOiBsaW5lIDk3OiBFcnJv cjogUHJvYmxlbSBwYXJzaW5nIGQ9Ik0xLDFzNiAzLDgsaDkgcTUsNSAxIDQsNCxoMCBUNSB0Myw2 IHM4IDUgOCAyIHpTMCA3LDcsczYsMywxLCIKIENPTlNPTEUgTUVTU0FHRTogbGluZSA5NzogRXJy b3I6IFByb2JsZW0gcGFyc2luZyBkPSJNMSwxdDQgNCBsNiA2IGE0IDIsMywwLDEsMiAxLFExLDEs MCwzLEg4IEM3LDkgOCA0LDAgdDUsMixIOSx6SHExIDUsOSxUNiA4LCIKK0NPTlNPTEUgTUVTU0FH RTogbGluZSA5NzogRXJyb3I6IFByb2JsZW0gcGFyc2luZyBkPSJNMSwxdDEgMCBaYzMsOCw4IDcg Myw0IHp6UTUsMyA0LDQgSDAgdjgsdjEsQzAsMSw2LDIsNSw0IHEyIDcgNSAzIGE3LDQgNyA5LDcs MiA5LFpMNiA2LCIKIENPTlNPTEUgTUVTU0FHRTogbGluZSA5NzogRXJyb3I6IFByb2JsZW0gcGFy c2luZyBkPSJNMSwxTDUsOSx0MyA3IFE2IDEgMSwxIFQzLDAgczQgNiA4IDEsczggMyw4IDksYTUg NCAzIDIsNCwyIDMsNiAiCiBDT05TT0xFIE1FU1NBR0U6IGxpbmUgOTc6IEVycm9yOiBQcm9ibGVt IHBhcnNpbmcgZD0iTTEsMWE5LDIgNiAxIDIgMiAyLHphOSAwIDIgOCwyLDMsMyBzNSw4LDggMSxI QzUgOCA1LDgsNCAyIGM4IDQgNSAyIDUgOSxsMyA5LEg3IHM2IDIsMCAwIGE0IDksMSA2LDMsNyww LE02LCIKIENPTlNPTEUgTUVTU0FHRTogbGluZSA5NzogRXJyb3I6IFByb2JsZW0gcGFyc2luZyBk PSJNMSwxVDggNSxBMiA3IDUsNyA5IDYgNSw3LHpDOCw1LDggMSw2IDMgdjgsek03LDgscTgsNiA0 IDcsYzksNiw0LDksMiAxIGMwIDYsOSA5LDAgNywiCkBAIC0yMTIsNyArMjEzLDcgQEAgQ291bGQg bm90IHBhcnNlOiBNMSwxaDAgQTYgNSw1IDQsMSw1LDMgSAogQ291bGQgbm90IHBhcnNlOiBNMSwx czYgMyw4LGg5IHE1LDUgMSA0LDQsaDAgVDUgdDMsNiBzOCA1IDggMiB6UzAgNyw3LHM2LDMsMSwK IENvdWxkIG5vdCBwYXJzZTogTTEsMXQ0IDQgbDYgNiBhNCAyLDMsMCwxLDIgMSxRMSwxLDAsMyxI OCBDNyw5IDggNCwwIHQ1LDIsSDksekhxMSA1LDksVDYgOCwKIFBhcnNlZCBhcyAxIGNvbW1hbmQo cykgW01dOiBNMSwxCi1QYXJzZWQgYXMgMTYgY29tbWFuZChzKSBbTUNaQ1paQ0xMTENDQ0NaTF06 IE0xLDF0MSAwIFpjMyw4LDggNyAzLDQgenpRNSwzIDQsNCBIMCB2OCx2MSxDMCwxLDYsMiw1LDQg cTIgNyA1IDMgYTcsNCA3IDksNywyIDksWkw2IDYsCitDb3VsZCBub3QgcGFyc2U6IE0xLDF0MSAw IFpjMyw4LDggNyAzLDQgenpRNSwzIDQsNCBIMCB2OCx2MSxDMCwxLDYsMiw1LDQgcTIgNyA1IDMg YTcsNCA3IDksNywyIDksWkw2IDYsCiBDb3VsZCBub3QgcGFyc2U6IE0xLDFMNSw5LHQzIDcgUTYg MSAxLDEgVDMsMCBzNCA2IDggMSxzOCAzLDggOSxhNSA0IDMgMiw0LDIgMyw2IAogUGFyc2VkIGFz IDYgY29tbWFuZChzKSBbTUNMTENDXTogTTEsMXQ4IDksbDMgNSBsOSw1IHM2LDksMiA5LFQxIDkg CiBDb3VsZCBub3QgcGFyc2U6IE0xLDFhOSwyIDYgMSAyIDIgMix6YTkgMCAyIDgsMiwzLDMgczUs OCw4IDEsSEM1IDggNSw4LDQgMiBjOCA0IDUgMiA1IDksbDMgOSxINyBzNiAyLDAgMCBhNCA5LDEg NiwzLDcsMCxNNiwKSW5kZXg6IExheW91dFRlc3RzL3N2Zy9kb20vcGF0aC1wYXJzZXItZXhwZWN0 ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3N2Zy9kb20vcGF0aC1wYXJzZXItZXhw ZWN0ZWQudHh0CShyZXZpc2lvbiA1NzQ2NikKKysrIExheW91dFRlc3RzL3N2Zy9kb20vcGF0aC1w YXJzZXItZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNSBAQAorQ09OU09M RSBNRVNTQUdFOiBsaW5lIDk6IEVycm9yOiBQcm9ibGVtIHBhcnNpbmcgZD0iTTEwMCwyMDAgYTMs NCw1LDIsMSw2LDciCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgOTogRXJyb3I6IFByb2JsZW0gcGFy c2luZyBkPSJNMTAwLDIwMCBhMyw0LDUsMSwyLDYsNyIKIENPTlNPTEUgTUVTU0FHRTogbGluZSA5 OiBFcnJvcjogUHJvYmxlbSBwYXJzaW5nIGQ9IgtNMSwyIgogQ09OU09MRSBNRVNTQUdFOiBsaW5l IDk6IEVycm9yOiBQcm9ibGVtIHBhcnNpbmcgZD0ieE0xLDIiCiBDT05TT0xFIE1FU1NBR0U6IGxp bmUgOTogRXJyb3I6IFByb2JsZW0gcGFyc2luZyBkPSJNMSwyCyIKQEAgLTM3LDYgKzM5LDEyIEBA IFBBU1MgcGFyc2VQYXRoKCdNMTAwLDIwMCBhMyw0LDUsMCwwLDYsNycKIFBBU1MgcGFyc2VQYXRo KCdNMTAwLDIwMCBhMyw0LDUsMCwxLDYsNycpIGlzICdNMTAwLDIwMCBDMTAxLjUsMTk3LjcsMTA0 LjEsMTk3LjQsMTA1LjgsMTk5LjMgQzEwNy40LDIwMS4zLDEwNy41LDIwNC43LDEwNiwyMDcnCiBQ QVNTIHBhcnNlUGF0aCgnTTEwMCwyMDAgYTMsNCw1LDEsMCw2LDcnKSBpcyAnTTEwMCwyMDAgQzk4 LjUsMjAyLjMsOTguNiwyMDUuNywxMDAuMiwyMDcuNyBDMTAxLjksMjA5LjYsMTA0LjUsMjA5LjMs MTA2LDIwNycKIFBBU1MgcGFyc2VQYXRoKCdNMTAwLDIwMCBhMyw0LDUsMSwxLDYsNycpIGlzICdN MTAwLDIwMCBDMTAxLjUsMTk3LjcsMTA0LjEsMTk3LjQsMTA1LjgsMTk5LjMgQzEwNy40LDIwMS4z LDEwNy41LDIwNC43LDEwNiwyMDcnCitQQVNTIHBhcnNlUGF0aCgnTTEwMCwyMDAgYTMsNCw1LDAw Niw3JykgaXMgJ00xMDAsMjAwIEM5OC41LDIwMi4zLDk4LjYsMjA1LjcsMTAwLjIsMjA3LjcgQzEw MS45LDIwOS42LDEwNC41LDIwOS4zLDEwNiwyMDcnCitQQVNTIHBhcnNlUGF0aCgnTTEwMCwyMDAg YTMsNCw1LDAxNiw3JykgaXMgJ00xMDAsMjAwIEMxMDEuNSwxOTcuNywxMDQuMSwxOTcuNCwxMDUu OCwxOTkuMyBDMTA3LjQsMjAxLjMsMTA3LjUsMjA0LjcsMTA2LDIwNycKK1BBU1MgcGFyc2VQYXRo KCdNMTAwLDIwMCBhMyw0LDUsMTA2LDcnKSBpcyAnTTEwMCwyMDAgQzk4LjUsMjAyLjMsOTguNiwy MDUuNywxMDAuMiwyMDcuNyBDMTAxLjksMjA5LjYsMTA0LjUsMjA5LjMsMTA2LDIwNycKK1BBU1Mg cGFyc2VQYXRoKCdNMTAwLDIwMCBhMyw0LDUsMTE2LDcnKSBpcyAnTTEwMCwyMDAgQzEwMS41LDE5 Ny43LDEwNC4xLDE5Ny40LDEwNS44LDE5OS4zIEMxMDcuNCwyMDEuMywxMDcuNSwyMDQuNywxMDYs MjA3JworUEFTUyBwYXJzZVBhdGgoJ00xMDAsMjAwIGEzLDQsNSwyLDEsNiw3JykgaXMgJycKK1BB U1MgcGFyc2VQYXRoKCdNMTAwLDIwMCBhMyw0LDUsMSwyLDYsNycpIGlzICcnCiBQQVNTIHBhcnNl UGF0aCgnTTEsMiwzLDQnKSBpcyAnTTEsMiBMMyw0JwogUEFTUyBwYXJzZVBhdGgoJ20xMDAsMjAw LDMsNCcpIGlzICdNMTAwLDIwMCBMMTAzLDIwNCcKIFBBU1MgcGFyc2VQYXRoKCdNIDEwMC0yMDAn KSBpcyAnTTEwMCwtMjAwJwpJbmRleDogTGF5b3V0VGVzdHMvc3ZnL2RvbS9zY3JpcHQtdGVzdHMv cGF0aC1wYXJzZXIuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvc3ZnL2RvbS9zY3JpcHQt dGVzdHMvcGF0aC1wYXJzZXIuanMJKHJldmlzaW9uIDU3NDY2KQorKysgTGF5b3V0VGVzdHMvc3Zn L2RvbS9zY3JpcHQtdGVzdHMvcGF0aC1wYXJzZXIuanMJKHdvcmtpbmcgY29weSkKQEAgLTgzLDYg KzgzLDEyIEBAIHNob3VsZEJlKCJwYXJzZVBhdGgoJ00xMDAsMjAwIGEzLDQsNSwwLDAKIHNob3Vs ZEJlKCJwYXJzZVBhdGgoJ00xMDAsMjAwIGEzLDQsNSwwLDEsNiw3JykiLCAiJ00xMDAsMjAwIEMx MDEuNSwxOTcuNywxMDQuMSwxOTcuNCwxMDUuOCwxOTkuMyBDMTA3LjQsMjAxLjMsMTA3LjUsMjA0 LjcsMTA2LDIwNyciKTsKIHNob3VsZEJlKCJwYXJzZVBhdGgoJ00xMDAsMjAwIGEzLDQsNSwxLDAs Niw3JykiLCAiJ00xMDAsMjAwIEM5OC41LDIwMi4zLDk4LjYsMjA1LjcsMTAwLjIsMjA3LjcgQzEw MS45LDIwOS42LDEwNC41LDIwOS4zLDEwNiwyMDcnIik7CiBzaG91bGRCZSgicGFyc2VQYXRoKCdN MTAwLDIwMCBhMyw0LDUsMSwxLDYsNycpIiwgIidNMTAwLDIwMCBDMTAxLjUsMTk3LjcsMTA0LjEs MTk3LjQsMTA1LjgsMTk5LjMgQzEwNy40LDIwMS4zLDEwNy41LDIwNC43LDEwNiwyMDcnIik7Citz aG91bGRCZSgicGFyc2VQYXRoKCdNMTAwLDIwMCBhMyw0LDUsMDA2LDcnKSIsICInTTEwMCwyMDAg Qzk4LjUsMjAyLjMsOTguNiwyMDUuNywxMDAuMiwyMDcuNyBDMTAxLjksMjA5LjYsMTA0LjUsMjA5 LjMsMTA2LDIwNyciKTsKK3Nob3VsZEJlKCJwYXJzZVBhdGgoJ00xMDAsMjAwIGEzLDQsNSwwMTYs NycpIiwgIidNMTAwLDIwMCBDMTAxLjUsMTk3LjcsMTA0LjEsMTk3LjQsMTA1LjgsMTk5LjMgQzEw Ny40LDIwMS4zLDEwNy41LDIwNC43LDEwNiwyMDcnIik7CitzaG91bGRCZSgicGFyc2VQYXRoKCdN MTAwLDIwMCBhMyw0LDUsMTA2LDcnKSIsICInTTEwMCwyMDAgQzk4LjUsMjAyLjMsOTguNiwyMDUu NywxMDAuMiwyMDcuNyBDMTAxLjksMjA5LjYsMTA0LjUsMjA5LjMsMTA2LDIwNyciKTsKK3Nob3Vs ZEJlKCJwYXJzZVBhdGgoJ00xMDAsMjAwIGEzLDQsNSwxMTYsNycpIiwgIidNMTAwLDIwMCBDMTAx LjUsMTk3LjcsMTA0LjEsMTk3LjQsMTA1LjgsMTk5LjMgQzEwNy40LDIwMS4zLDEwNy41LDIwNC43 LDEwNiwyMDcnIik7CitzaG91bGRCZSgicGFyc2VQYXRoKCdNMTAwLDIwMCBhMyw0LDUsMiwxLDYs NycpIiwgIicnIik7CitzaG91bGRCZSgicGFyc2VQYXRoKCdNMTAwLDIwMCBhMyw0LDUsMSwyLDYs NycpIiwgIicnIik7CiAKIHNob3VsZEJlKCJwYXJzZVBhdGgoJ00xLDIsMyw0JykiLCAiJ00xLDIg TDMsNCciKTsKIHNob3VsZEJlKCJwYXJzZVBhdGgoJ20xMDAsMjAwLDMsNCcpIiwgIidNMTAwLDIw MCBMMTAzLDIwNCciKTsK