33319 2010-01-07 05:34:06 -0800 RegExp.prototype.toString returns "//" for empty regular expressions 2010-01-10 20:55:44 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 kent.hansen kent.hansen commit-queue darin eric webkit.review.bot oldest_to_newest 178153 0 kent.hansen 2010-01-07 05:34:06 -0800 The ECMA specification states that the string representation of an empty regular expression is /(?:)/. With the current behavior, "eval((new RegExp).toString())" returns undefined (because // is interpreted as a comment), whereas it should return a regular expression object. 178155 1 46048 kent.hansen 2010-01-07 05:40:01 -0800 Created attachment 46048 Proposed patch 178156 2 webkit.review.bot 2010-01-07 05:43:30 -0800 style-queue ran check-webkit-style on attachment 46048 without any errors. 178208 3 46048 darin 2010-01-07 09:18:31 -0800 Comment on attachment 46048 Proposed patch Why is "/(?:)/" correct? Is this specified in the ECMAScript specification? Is it critical to match Firefox? What does IE do? 178209 4 darin 2010-01-07 09:18:43 -0800 Oh, I see. 178211 5 46048 darin 2010-01-07 09:20:15 -0800 Comment on attachment 46048 Proposed patch > - return jsNontrivialString(exec, makeString("/", asRegExpObject(thisValue)->get(exec, exec->propertyNames().source).toString(exec), postfix)); > + UString source = asRegExpObject(thisValue)->get(exec, exec->propertyNames().source).toString(exec); > + return jsNontrivialString(exec, makeString("/", source.size() ? source : UString("(?:)"), postfix)); There should be a comment here explaining that "//" has to be avoided because it collides with comment syntax. Otherwise, it's non-obvious why that code exists. r=me 178599 6 46048 commit-queue 2010-01-08 03:17:35 -0800 Comment on attachment 46048 Proposed patch Clearing flags on attachment: 46048 Committed r52981: <http://trac.webkit.org/changeset/52981> 178600 7 commit-queue 2010-01-08 03:17:40 -0800 All reviewed patches have been landed. Closing bug. 178608 8 eric 2010-01-08 03:33:52 -0800 Looks like this may have broken some JS tests: ** Danger, Will Robinson! Danger! The following failures have been introduced: ecma_2/RegExp/properties-001.js js1_2/regexp/toString.js 2 regressions found. At least on the Qt bot: http://build.webkit.org/builders/Qt%20Linux%20Release/builds/5736/steps/jscore-test/logs/stdio If the error shows up in other bots, I'll begin a rollout. 178610 9 eric 2010-01-08 03:34:45 -0800 Yup. Broke all the bots. Rolling out. I expect the js tests may just need expectation updates. 178620 10 eric 2010-01-08 03:44:41 -0800 Reverted r52981 for reason: Caused two JS tests to start failing: ecma_2/RegExp/properties-001.js and js1_2/regexp/toString.js Committed r52984: <http://trac.webkit.org/changeset/52984> 178660 11 46135 kent.hansen 2010-01-08 06:35:27 -0800 Created attachment 46135 Revised patch (update Mozilla tests, add comment) Sorry, I didn't know/remember to run the ECMA test suite on the first try. Interestingly, the behavior was fixed in Mozilla just one month after the tests were imported into WebKit trunk. :) 178661 12 webkit.review.bot 2010-01-08 06:40:46 -0800 Attachment 46135 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 JavaScriptCore/tests/mozilla/js1_2/regexp/toString.js:44: Line contains tab character. [whitespace/tab] [5] Total errors found: 1 178663 13 kent.hansen 2010-01-08 06:45:13 -0800 (In reply to comment #12) > Attachment 46135 [details] did not pass style-queue: > > Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 > JavaScriptCore/tests/mozilla/js1_2/regexp/toString.js:44: Line contains tab > character. [whitespace/tab] [5] > Total errors found: 1 The line already had a tab character. I only changed the content of '//'. 178664 14 kent.hansen 2010-01-08 06:48:11 -0800 (In reply to comment #10) > Caused two JS tests to start failing: ecma_2/RegExp/properties-001.js and > js1_2/regexp/toString.js Stale tests. I spun off https://bugs.webkit.org/show_bug.cgi?id=33382 to investigate bringing WebKit's copy of the tests up-to-date. 178673 15 46135 darin 2010-01-08 07:50:00 -0800 Comment on attachment 46135 Revised patch (update Mozilla tests, add comment) > + // If source is empty, use "/(?:)/" to avoid colliding with comment syntax We use periods in sentence-style comments like this one. > + return jsNontrivialString(exec, makeString("/", source.size() ? source : UString("(?:)"), postfix)); I would write it like this: return jsNontrivialString(exec, isEmpty() ? UString("(?:)" : makeString("/", source, postfix)); r=me as is because neither of those comments are important 178899 16 46135 commit-queue 2010-01-08 17:41:22 -0800 Comment on attachment 46135 Revised patch (update Mozilla tests, add comment) Rejecting patch 46135 from commit-queue. Failed to run "['git', 'svn', 'dcommit']" exit_code: 1 Last 500 characters of output: outTests/fast/regex/non-pattern-characters-expected.txt A repository hook failed: MERGE request failed on '/repository/webkit/trunk': Commit blocked by pre-commit hook (exit code 1) with output: The following files contain tab characters: trunk/JavaScriptCore/tests/mozilla/js1_2/regexp/toString.js Please use spaces instead to indent. If you must commit a file with tabs, use svn propset to set the "allow-tabs" property. at /usr/local/git/libexec/git-core/git-svn line 558 Full output: http://webkit-commit-queue.appspot.com/results/176030 179222 17 eric 2010-01-10 19:34:33 -0800 This can't (easily) be landed via the commit-queue because of bug 27204 which deals with svn-apply not understanding svn properties. 179224 18 eric 2010-01-10 19:35:37 -0800 It would be possible for someone first to mark all of the files in JavaScriptCore/mozilla/ with "allow-tabs" and then this could be commit-queue'd. I assume those files just pre-date the banning of tabs from svn.webkit.org 179241 19 46135 darin 2010-01-10 20:34:56 -0800 Comment on attachment 46135 Revised patch (update Mozilla tests, add comment) Give the commit queue a try, now that I added allow-tabs properties. 179252 20 46135 commit-queue 2010-01-10 20:55:36 -0800 Comment on attachment 46135 Revised patch (update Mozilla tests, add comment) Clearing flags on attachment: 46135 Committed r53062: <http://trac.webkit.org/changeset/53062> 179253 21 commit-queue 2010-01-10 20:55:44 -0800 All reviewed patches have been landed. Closing bug. 46048 2010-01-07 05:40:01 -0800 2010-01-08 06:35:27 -0800 Proposed patch RegExpPrototypeToString_emptyRegExp.diff text/plain 5325 kent.hansen ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCAwMTdjMGRhLi5mMmY5ZWNlIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTAtMDEtMDcgIEtlbnQgSGFuc2VuICA8a2VudC5oYW5zZW5Abm9raWEuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlZ0V4cC5wcm90 b3R5cGUudG9TdHJpbmcgcmV0dXJucyAiLy8iIGZvciBlbXB0eSByZWd1bGFyIGV4cHJlc3Npb25z CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzMxOQor CisgICAgICAgICIvLyIgc3RhcnRzIGEgc2luZ2xlLWxpbmUgY29tbWVudCwgaGVuY2UgIi8oPzop LyIgc2hvdWxkIGJlIHVzZWQsIGFjY29yZGluZyB0byBFQ01BLgorCisgICAgICAgICogcnVudGlt ZS9SZWdFeHBQcm90b3R5cGUuY3BwOgorICAgICAgICAoSlNDOjpyZWdFeHBQcm90b0Z1bmNUb1N0 cmluZyk6CisKIDIwMTAtMDEtMDYgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBw bGUuY29tPgogCiAgICAgICAgIFFUIGJ1aWxkIGZpeC4KZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvUmVnRXhwUHJvdG90eXBlLmNwcCBiL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv UmVnRXhwUHJvdG90eXBlLmNwcAppbmRleCBjM2VlNTY1Li4wNjA5YjI5IDEwMDY0NAotLS0gYS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL1JlZ0V4cFByb3RvdHlwZS5jcHAKKysrIGIvSmF2YVNjcmlw dENvcmUvcnVudGltZS9SZWdFeHBQcm90b3R5cGUuY3BwCkBAIC0xMTQsOCArMTE0LDggQEAgSlNW YWx1ZSBKU0NfSE9TVF9DQUxMIHJlZ0V4cFByb3RvRnVuY1RvU3RyaW5nKEV4ZWNTdGF0ZSogZXhl YywgSlNPYmplY3QqLCBKU1ZhbHUKICAgICAgICAgcG9zdGZpeFtpbmRleCsrXSA9ICdpJzsKICAg ICBpZiAoYXNSZWdFeHBPYmplY3QodGhpc1ZhbHVlKS0+Z2V0KGV4ZWMsIGV4ZWMtPnByb3BlcnR5 TmFtZXMoKS5tdWx0aWxpbmUpLnRvQm9vbGVhbihleGVjKSkKICAgICAgICAgcG9zdGZpeFtpbmRl eF0gPSAnbSc7Ci0gICAgCi0gICAgcmV0dXJuIGpzTm9udHJpdmlhbFN0cmluZyhleGVjLCBtYWtl U3RyaW5nKCIvIiwgYXNSZWdFeHBPYmplY3QodGhpc1ZhbHVlKS0+Z2V0KGV4ZWMsIGV4ZWMtPnBy b3BlcnR5TmFtZXMoKS5zb3VyY2UpLnRvU3RyaW5nKGV4ZWMpLCBwb3N0Zml4KSk7CisgICAgVVN0 cmluZyBzb3VyY2UgPSBhc1JlZ0V4cE9iamVjdCh0aGlzVmFsdWUpLT5nZXQoZXhlYywgZXhlYy0+ cHJvcGVydHlOYW1lcygpLnNvdXJjZSkudG9TdHJpbmcoZXhlYyk7CisgICAgcmV0dXJuIGpzTm9u dHJpdmlhbFN0cmluZyhleGVjLCBtYWtlU3RyaW5nKCIvIiwgc291cmNlLnNpemUoKSA/IHNvdXJj ZSA6IFVTdHJpbmcoIig/OikiKSwgcG9zdGZpeCkpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBKU0MK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjOWJlNDg3Li42YzZkMmVlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDEt MDcgIEtlbnQgSGFuc2VuICA8a2VudC5oYW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlZ0V4cC5wcm90b3R5cGUudG9TdHJp bmcgcmV0dXJucyAiLy8iIGZvciBlbXB0eSByZWd1bGFyIGV4cHJlc3Npb25zCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzMxOQorCisgICAgICAgIEFk ZCBuZXcgdGVzdCBjYXNlcyBhbmQgYWRhcHQgZXhpc3Rpbmcgb25lcy4KKworICAgICAgICAqIGZh c3QvanMva2RlL1JlZ0V4cC1leHBlY3RlZC50eHQ6CisgICAgICAgICogZmFzdC9qcy9rZGUvc2Ny aXB0LXRlc3RzL1JlZ0V4cC5qczoKKyAgICAgICAgKiBmYXN0L2pzL3NjcmlwdC10ZXN0cy9yZWdl eHAtY29tcGlsZS5qczoKKyAgICAgICAgKiBmYXN0L3JlZ2V4L25vbi1wYXR0ZXJuLWNoYXJhY3Rl cnMtZXhwZWN0ZWQudHh0OgorCiAyMDEwLTAxLTA2ICBNT1JJVEEgSGFqaW1lICA8bW9ycml0YUBn bWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTmlrb2xhcyBaaW1tZXJtYW5uLgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9qcy9rZGUvUmVnRXhwLWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL2Zhc3QvanMva2RlL1JlZ0V4cC1leHBlY3RlZC50eHQKaW5kZXggNTJkYmJhMS4u NjE1MWJiZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9qcy9rZGUvUmVnRXhwLWV4cGVj dGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2pzL2tkZS9SZWdFeHAtZXhwZWN0ZWQudHh0 CkBAIC05Miw2ICs5MiwxMCBAQCBQQVNTIC9cdTAwNjEvLnNvdXJjZSBpcyAnXFx1MDA2MScKIFBB U1MgJ2FiYycubWF0Y2goL1x1MDA2Mi8pLnRvU3RyaW5nKCkgaXMgJ2InCiBGQUlMIE9iamVjdC5w cm90b3R5cGUudG9TdHJpbmcuYXBwbHkoUmVnRXhwLnByb3RvdHlwZSkgc2hvdWxkIGJlIFtvYmpl Y3QgUmVnRXhwXS4gV2FzIFtvYmplY3QgUmVnRXhwUHJvdG90eXBlXS4KIFBBU1MgdHlwZW9mIFJl Z0V4cC5wcm90b3R5cGUudG9TdHJpbmcoKSBpcyAnc3RyaW5nJworUEFTUyBuZXcgUmVnRXhwKCku dG9TdHJpbmcoKSBpcyAnLyg/OikvJworUEFTUyAobmV3IFJlZ0V4cCgnKD86KScpKS5zb3VyY2Ug aXMgJyg/OiknCitQQVNTIC8oPzopLy50b1N0cmluZygpIGlzICcvKD86KS8nCitQQVNTIC8oPzop Ly5zb3VyY2UgaXMgJyg/OiknCiBEb25lLgogUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1 ZQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2pzL2tkZS9zY3JpcHQtdGVzdHMvUmVn RXhwLmpzIGIvTGF5b3V0VGVzdHMvZmFzdC9qcy9rZGUvc2NyaXB0LXRlc3RzL1JlZ0V4cC5qcwpp bmRleCBjYjdhMTQyLi5mYmFiODQwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2pzL2tk ZS9zY3JpcHQtdGVzdHMvUmVnRXhwLmpzCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvanMva2RlL3Nj cmlwdC10ZXN0cy9SZWdFeHAuanMKQEAgLTE0OCw1ICsxNDgsMTEgQEAgc2hvdWxkQmUoIk9iamVj dC5wcm90b3R5cGUudG9TdHJpbmcuYXBwbHkoUmVnRXhwLnByb3RvdHlwZSkiLAogLy8gaXQgZG9l c24ndCB0aHJvdyBhbiBleGNlcHRpb24KIHNob3VsZEJlKCJ0eXBlb2YgUmVnRXhwLnByb3RvdHlw ZS50b1N0cmluZygpIiwgIidzdHJpbmcnIik7CiAKKy8vIEVtcHR5IHJlZ3VsYXIgZXhwcmVzc2lv bnMgaGF2ZSBzdHJpbmcgcmVwcmVzZW50YXRpb24gLyg/OikvCitzaG91bGRCZSgibmV3IFJlZ0V4 cCgpLnRvU3RyaW5nKCkiLCAiJy8oPzopLyciKTsKK3Nob3VsZEJlKCIobmV3IFJlZ0V4cCgnKD86 KScpKS5zb3VyY2UiLCAiJyg/OiknIik7CitzaG91bGRCZSgiLyg/OikvLnRvU3RyaW5nKCkiLCAi Jy8oPzopLyciKTsKK3Nob3VsZEJlKCIvKD86KS8uc291cmNlIiwgIicoPzopJyIpOworCiBkZWJ1 ZygiRG9uZS4iKTsKIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWUKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2Zhc3QvanMvcmVnZXhwLWNvbXBpbGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv ZmFzdC9qcy9yZWdleHAtY29tcGlsZS1leHBlY3RlZC50eHQKaW5kZXggODU0ZDUwYS4uYTZiZWU1 MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9qcy9yZWdleHAtY29tcGlsZS1leHBlY3Rl ZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9qcy9yZWdleHAtY29tcGlsZS1leHBlY3RlZC50 eHQKQEAgLTE5LDcgKzE5LDcgQEAgUEFTUyByZS50b1N0cmluZygpIGlzICcvYy9pJwogUEFTUyBy ZS5jb21waWxlKG5ldyBSZWdFeHAoJysnKSk7IHRocmV3IGV4Y2VwdGlvbiBTeW50YXhFcnJvcjog SW52YWxpZCByZWd1bGFyIGV4cHJlc3Npb246IG5vdGhpbmcgdG8gcmVwZWF0LgogUEFTUyByZS50 b1N0cmluZygpIGlzICcvdW5kZWZpbmVkLycKIFBBU1MgcmUudG9TdHJpbmcoKSBpcyAnL251bGwv JwotUEFTUyByZS50b1N0cmluZygpIGlzICcvLycKK1BBU1MgcmUudG9TdHJpbmcoKSBpcyAnLyg/ OikvJwogUEFTUyByZS50b1N0cmluZygpIGlzICcvei8nCiBQQVNTIHJlLmxhc3RJbmRleCBpcyAw CiBQQVNTIHJlLmxhc3RJbmRleCBpcyAxCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2pz L3NjcmlwdC10ZXN0cy9yZWdleHAtY29tcGlsZS5qcyBiL0xheW91dFRlc3RzL2Zhc3QvanMvc2Ny aXB0LXRlc3RzL3JlZ2V4cC1jb21waWxlLmpzCmluZGV4IGVhZTU3ODcuLjVhMjEzMDAgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvanMvc2NyaXB0LXRlc3RzL3JlZ2V4cC1jb21waWxlLmpz CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvanMvc2NyaXB0LXRlc3RzL3JlZ2V4cC1jb21waWxlLmpz CkBAIC0zOCw3ICszOCw3IEBAIHJlLmNvbXBpbGUobnVsbCk7CiBzaG91bGRCZSgicmUudG9TdHJp bmcoKSIsICInL251bGwvJyIpOwogCiByZS5jb21waWxlKCk7Ci1zaG91bGRCZSgicmUudG9TdHJp bmcoKSIsICInLy8nIik7IC8vIC8oPzopLyBpbiBGaXJlZm94CitzaG91bGRCZSgicmUudG9TdHJp bmcoKSIsICInLyg/OikvJyIpOwogCiByZS5jb21waWxlKCJ6IiwgdW5kZWZpbmVkKTsKIHNob3Vs ZEJlKCJyZS50b1N0cmluZygpIiwgIicvei8nIik7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9m YXN0L3JlZ2V4L25vbi1wYXR0ZXJuLWNoYXJhY3RlcnMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvZmFzdC9yZWdleC9ub24tcGF0dGVybi1jaGFyYWN0ZXJzLWV4cGVjdGVkLnR4dAppbmRleCBj NmM3YmNiLi5kZTM5ZmVkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2V4L25vbi1w YXR0ZXJuLWNoYXJhY3RlcnMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvcmVn ZXgvbm9uLXBhdHRlcm4tY2hhcmFjdGVycy1leHBlY3RlZC50eHQKQEAgLTE1Niw3ICsxNTYsNyBA QCBUZXN0aW5nIHJlZ2V4cDogL2F9L2dtCiBQQVNTIHJlZ2V4cC50ZXN0KCdhfScpIGlzIHRydWUK IFBBU1MgcmVnZXhwLmxhc3RJbmRleCBpcyAyCiAKLVRlc3RpbmcgcmVnZXhwOiAvL2dtCitUZXN0 aW5nIHJlZ2V4cDogLyg/OikvZ20KIFBBU1MgcmVnZXhwLnRlc3QoJycpIGlzIHRydWUKIFBBU1Mg cmVnZXhwLmxhc3RJbmRleCBpcyAwCiAK 46135 2010-01-08 06:35:27 -0800 2010-01-10 20:55:36 -0800 Revised patch (update Mozilla tests, add comment) RegExpPrototypeToString_emptyRegExp2.diff text/plain 7203 kent.hansen ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCA2YmI5NjIwLi41ODUzMjEyIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTAtMDEtMDggIEtlbnQgSGFuc2VuICA8a2VudC5oYW5zZW5Abm9raWEuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlZ0V4cC5wcm90 b3R5cGUudG9TdHJpbmcgcmV0dXJucyAiLy8iIGZvciBlbXB0eSByZWd1bGFyIGV4cHJlc3Npb25z CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzMxOQor CisgICAgICAgICIvLyIgc3RhcnRzIGEgc2luZ2xlLWxpbmUgY29tbWVudCwgaGVuY2UgIi8oPzop LyIgc2hvdWxkIGJlIHVzZWQsIGFjY29yZGluZyB0byBFQ01BLgorCisgICAgICAgICogcnVudGlt ZS9SZWdFeHBQcm90b3R5cGUuY3BwOgorICAgICAgICAoSlNDOjpyZWdFeHBQcm90b0Z1bmNUb1N0 cmluZyk6CisKKyAgICAgICAgKiB0ZXN0cy9tb3ppbGxhL2VjbWFfMi9SZWdFeHAvcHJvcGVydGll cy0wMDEuanM6CisgICAgICAgIChBZGRSZWdFeHBDYXNlcyk6CisgICAgICAgICogdGVzdHMvbW96 aWxsYS9qczFfMi9yZWdleHAvdG9TdHJpbmcuanM6CisgICAgICAgIFVwZGF0ZSByZWxldmFudCBN b3ppbGxhIHRlc3RzIChNb3ppbGxhIGhhcyBoYWQgdGhpcyBiZWhhdmlvciBzaW5jZSBOb3ZlbWJl ciAyMDAzKS4KKwogMjAxMC0wMS0wOCAgTm9yYmVydCBMZXNlciAgPG5vcmJlcnQubGVzZXJAbm9r aWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEv SmF2YVNjcmlwdENvcmUvcnVudGltZS9SZWdFeHBQcm90b3R5cGUuY3BwIGIvSmF2YVNjcmlwdENv cmUvcnVudGltZS9SZWdFeHBQcm90b3R5cGUuY3BwCmluZGV4IGMzZWU1NjUuLjVmOWQzNTcgMTAw NjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwUHJvdG90eXBlLmNwcAorKysg Yi9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1JlZ0V4cFByb3RvdHlwZS5jcHAKQEAgLTExNCw4ICsx MTQsOSBAQCBKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgcmVnRXhwUHJvdG9GdW5jVG9TdHJpbmcoRXhl Y1N0YXRlKiBleGVjLCBKU09iamVjdCosIEpTVmFsdQogICAgICAgICBwb3N0Zml4W2luZGV4Kytd ID0gJ2knOwogICAgIGlmIChhc1JlZ0V4cE9iamVjdCh0aGlzVmFsdWUpLT5nZXQoZXhlYywgZXhl Yy0+cHJvcGVydHlOYW1lcygpLm11bHRpbGluZSkudG9Cb29sZWFuKGV4ZWMpKQogICAgICAgICBw b3N0Zml4W2luZGV4XSA9ICdtJzsKLSAgICAKLSAgICByZXR1cm4ganNOb250cml2aWFsU3RyaW5n KGV4ZWMsIG1ha2VTdHJpbmcoIi8iLCBhc1JlZ0V4cE9iamVjdCh0aGlzVmFsdWUpLT5nZXQoZXhl YywgZXhlYy0+cHJvcGVydHlOYW1lcygpLnNvdXJjZSkudG9TdHJpbmcoZXhlYyksIHBvc3RmaXgp KTsKKyAgICBVU3RyaW5nIHNvdXJjZSA9IGFzUmVnRXhwT2JqZWN0KHRoaXNWYWx1ZSktPmdldChl eGVjLCBleGVjLT5wcm9wZXJ0eU5hbWVzKCkuc291cmNlKS50b1N0cmluZyhleGVjKTsKKyAgICAv LyBJZiBzb3VyY2UgaXMgZW1wdHksIHVzZSAiLyg/OikvIiB0byBhdm9pZCBjb2xsaWRpbmcgd2l0 aCBjb21tZW50IHN5bnRheAorICAgIHJldHVybiBqc05vbnRyaXZpYWxTdHJpbmcoZXhlYywgbWFr ZVN0cmluZygiLyIsIHNvdXJjZS5zaXplKCkgPyBzb3VyY2UgOiBVU3RyaW5nKCIoPzopIiksIHBv c3RmaXgpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgSlNDCmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0 Q29yZS90ZXN0cy9tb3ppbGxhL2VjbWFfMi9SZWdFeHAvcHJvcGVydGllcy0wMDEuanMgYi9KYXZh U2NyaXB0Q29yZS90ZXN0cy9tb3ppbGxhL2VjbWFfMi9SZWdFeHAvcHJvcGVydGllcy0wMDEuanMK aW5kZXggMTZmMjY1Yy4uM2ViNTFjYiAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvdGVzdHMv bW96aWxsYS9lY21hXzIvUmVnRXhwL3Byb3BlcnRpZXMtMDAxLmpzCisrKyBiL0phdmFTY3JpcHRD b3JlL3Rlc3RzL21vemlsbGEvZWNtYV8yL1JlZ0V4cC9wcm9wZXJ0aWVzLTAwMS5qcwpAQCAtNTYs OCArNTYsMTUgQEAgZnVuY3Rpb24gQWRkUmVnRXhwQ2FzZXMoIHJlLCBzLCBnLCBpLCBtLCBsICkg ewogICAgICAgICAgICAgICAgICBzLAogICAgICAgICAgICAgICAgICByZS5zb3VyY2UgKTsKIAor LyoKKyAqIGh0dHA6Ly9idWd6aWxsYS5tb3ppbGxhLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1NTUw IGNoYW5nZWQKKyAqIHRoZSBiZWhhdmlvciBvZiB0b1N0cmluZygpIGFuZCB0b1NvdXJjZSgpIG9u IGVtcHR5IHJlZ2V4cHMuCisgKiBTbyBicmFuY2ggaWYgfHN8IGlzIHRoZSBlbXB0eSBzdHJpbmcg LQorICovCisgICAgdmFyIFMgPSBzPyBzIDogJyg/OiknOworCiAgICAgQWRkVGVzdENhc2UoIHJl ICsgIi50b1N0cmluZygpIiwKLSAgICAgICAgICAgICAgICAgIi8iICsgcyArIi8iICsgKGc/Imci OiIiKSArIChpPyJpIjoiIikgKyhtPyJtIjoiIiksCisgICAgICAgICAgICAgICAgICIvIiArIFMg KyIvIiArIChnPyJnIjoiIikgKyAoaT8iaSI6IiIpICsobT8ibSI6IiIpLAogICAgICAgICAgICAg ICAgICByZS50b1N0cmluZygpICk7CiAKICAgICBBZGRUZXN0Q2FzZSggcmUgKyAiLmdsb2JhbCIs CmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9tb3ppbGxhL2pzMV8yL3JlZ2V4cC90 b1N0cmluZy5qcyBiL0phdmFTY3JpcHRDb3JlL3Rlc3RzL21vemlsbGEvanMxXzIvcmVnZXhwL3Rv U3RyaW5nLmpzCmluZGV4IDU1NGI5MzQuLmIwOGI3NzIgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRD b3JlL3Rlc3RzL21vemlsbGEvanMxXzIvcmVnZXhwL3RvU3RyaW5nLmpzCisrKyBiL0phdmFTY3Jp cHRDb3JlL3Rlc3RzL21vemlsbGEvanMxXzIvcmVnZXhwL3RvU3RyaW5nLmpzCkBAIC00MSw3ICs0 MSw3IEBACiAgICAgLy8gdmFyIHJlID0gbmV3IFJlZ0V4cCgpOyByZS50b1N0cmluZygpCiAJdmFy IHJlID0gbmV3IFJlZ0V4cCgpOwogCXRlc3RjYXNlc1tjb3VudCsrXSA9IG5ldyBUZXN0Q2FzZSAo IFNFQ1RJT04sICJ2YXIgcmUgPSBuZXcgUmVnRXhwKCk7IHJlLnRvU3RyaW5nKCkiLAotCSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICcvLycsIHJlLnRvU3RyaW5nKCkpOworCSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICcvKD86KS8nLCByZS50b1N0cmluZygp KTsKIAogICAgIC8vIHJlID0gLy4rLzsgcmUudG9TdHJpbmcoKTsKICAgICByZSA9IC8uKy87CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK aW5kZXggYWUzZmM4MS4uMGFlOGMzNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEwLTAxLTA4 ICBLZW50IEhhbnNlbiAgPGtlbnQuaGFuc2VuQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZWdFeHAucHJvdG90eXBlLnRvU3RyaW5n IHJldHVybnMgIi8vIiBmb3IgZW1wdHkgcmVndWxhciBleHByZXNzaW9ucworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMzMTkKKworICAgICAgICBBZGQg bmV3IHRlc3QgY2FzZXMgYW5kIGFkYXB0IGV4aXN0aW5nIG9uZXMuCisKKyAgICAgICAgKiBmYXN0 L2pzL2tkZS9SZWdFeHAtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvanMva2RlL3Njcmlw dC10ZXN0cy9SZWdFeHAuanM6CisgICAgICAgICogZmFzdC9qcy9yZWdleHAtY29tcGlsZS1leHBl Y3RlZC50eHQ6CisgICAgICAgICogZmFzdC9qcy9zY3JpcHQtdGVzdHMvcmVnZXhwLWNvbXBpbGUu anM6CisgICAgICAgICogZmFzdC9yZWdleC9ub24tcGF0dGVybi1jaGFyYWN0ZXJzLWV4cGVjdGVk LnR4dDoKKwogMjAxMC0wMS0wNyAgQWZvbnNvIFIuIENvc3RhIEpyLiAgPGFmb25zby5jb3N0YUBv cGVuYm9zc2Eub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9qcy9rZGUvUmVnRXhwLWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL2Zhc3QvanMva2RlL1JlZ0V4cC1leHBlY3RlZC50eHQKaW5kZXggNTJkYmJhMS4uNjE1 MWJiZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9qcy9rZGUvUmVnRXhwLWV4cGVjdGVk LnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2pzL2tkZS9SZWdFeHAtZXhwZWN0ZWQudHh0CkBA IC05Miw2ICs5MiwxMCBAQCBQQVNTIC9cdTAwNjEvLnNvdXJjZSBpcyAnXFx1MDA2MScKIFBBU1Mg J2FiYycubWF0Y2goL1x1MDA2Mi8pLnRvU3RyaW5nKCkgaXMgJ2InCiBGQUlMIE9iamVjdC5wcm90 b3R5cGUudG9TdHJpbmcuYXBwbHkoUmVnRXhwLnByb3RvdHlwZSkgc2hvdWxkIGJlIFtvYmplY3Qg UmVnRXhwXS4gV2FzIFtvYmplY3QgUmVnRXhwUHJvdG90eXBlXS4KIFBBU1MgdHlwZW9mIFJlZ0V4 cC5wcm90b3R5cGUudG9TdHJpbmcoKSBpcyAnc3RyaW5nJworUEFTUyBuZXcgUmVnRXhwKCkudG9T dHJpbmcoKSBpcyAnLyg/OikvJworUEFTUyAobmV3IFJlZ0V4cCgnKD86KScpKS5zb3VyY2UgaXMg Jyg/OiknCitQQVNTIC8oPzopLy50b1N0cmluZygpIGlzICcvKD86KS8nCitQQVNTIC8oPzopLy5z b3VyY2UgaXMgJyg/OiknCiBEb25lLgogUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQog CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2pzL2tkZS9zY3JpcHQtdGVzdHMvUmVnRXhw LmpzIGIvTGF5b3V0VGVzdHMvZmFzdC9qcy9rZGUvc2NyaXB0LXRlc3RzL1JlZ0V4cC5qcwppbmRl eCBjYjdhMTQyLi5mYmFiODQwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2pzL2tkZS9z Y3JpcHQtdGVzdHMvUmVnRXhwLmpzCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvanMva2RlL3Njcmlw dC10ZXN0cy9SZWdFeHAuanMKQEAgLTE0OCw1ICsxNDgsMTEgQEAgc2hvdWxkQmUoIk9iamVjdC5w cm90b3R5cGUudG9TdHJpbmcuYXBwbHkoUmVnRXhwLnByb3RvdHlwZSkiLAogLy8gaXQgZG9lc24n dCB0aHJvdyBhbiBleGNlcHRpb24KIHNob3VsZEJlKCJ0eXBlb2YgUmVnRXhwLnByb3RvdHlwZS50 b1N0cmluZygpIiwgIidzdHJpbmcnIik7CiAKKy8vIEVtcHR5IHJlZ3VsYXIgZXhwcmVzc2lvbnMg aGF2ZSBzdHJpbmcgcmVwcmVzZW50YXRpb24gLyg/OikvCitzaG91bGRCZSgibmV3IFJlZ0V4cCgp LnRvU3RyaW5nKCkiLCAiJy8oPzopLyciKTsKK3Nob3VsZEJlKCIobmV3IFJlZ0V4cCgnKD86KScp KS5zb3VyY2UiLCAiJyg/OiknIik7CitzaG91bGRCZSgiLyg/OikvLnRvU3RyaW5nKCkiLCAiJy8o PzopLyciKTsKK3Nob3VsZEJlKCIvKD86KS8uc291cmNlIiwgIicoPzopJyIpOworCiBkZWJ1Zygi RG9uZS4iKTsKIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWUKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3QvanMvcmVnZXhwLWNvbXBpbGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFz dC9qcy9yZWdleHAtY29tcGlsZS1leHBlY3RlZC50eHQKaW5kZXggODU0ZDUwYS4uYTZiZWU1MiAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9qcy9yZWdleHAtY29tcGlsZS1leHBlY3RlZC50 eHQKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9qcy9yZWdleHAtY29tcGlsZS1leHBlY3RlZC50eHQK QEAgLTE5LDcgKzE5LDcgQEAgUEFTUyByZS50b1N0cmluZygpIGlzICcvYy9pJwogUEFTUyByZS5j b21waWxlKG5ldyBSZWdFeHAoJysnKSk7IHRocmV3IGV4Y2VwdGlvbiBTeW50YXhFcnJvcjogSW52 YWxpZCByZWd1bGFyIGV4cHJlc3Npb246IG5vdGhpbmcgdG8gcmVwZWF0LgogUEFTUyByZS50b1N0 cmluZygpIGlzICcvdW5kZWZpbmVkLycKIFBBU1MgcmUudG9TdHJpbmcoKSBpcyAnL251bGwvJwot UEFTUyByZS50b1N0cmluZygpIGlzICcvLycKK1BBU1MgcmUudG9TdHJpbmcoKSBpcyAnLyg/Oikv JwogUEFTUyByZS50b1N0cmluZygpIGlzICcvei8nCiBQQVNTIHJlLmxhc3RJbmRleCBpcyAwCiBQ QVNTIHJlLmxhc3RJbmRleCBpcyAxCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2pzL3Nj cmlwdC10ZXN0cy9yZWdleHAtY29tcGlsZS5qcyBiL0xheW91dFRlc3RzL2Zhc3QvanMvc2NyaXB0 LXRlc3RzL3JlZ2V4cC1jb21waWxlLmpzCmluZGV4IGVhZTU3ODcuLjVhMjEzMDAgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2Zhc3QvanMvc2NyaXB0LXRlc3RzL3JlZ2V4cC1jb21waWxlLmpzCisr KyBiL0xheW91dFRlc3RzL2Zhc3QvanMvc2NyaXB0LXRlc3RzL3JlZ2V4cC1jb21waWxlLmpzCkBA IC0zOCw3ICszOCw3IEBAIHJlLmNvbXBpbGUobnVsbCk7CiBzaG91bGRCZSgicmUudG9TdHJpbmco KSIsICInL251bGwvJyIpOwogCiByZS5jb21waWxlKCk7Ci1zaG91bGRCZSgicmUudG9TdHJpbmco KSIsICInLy8nIik7IC8vIC8oPzopLyBpbiBGaXJlZm94CitzaG91bGRCZSgicmUudG9TdHJpbmco KSIsICInLyg/OikvJyIpOwogCiByZS5jb21waWxlKCJ6IiwgdW5kZWZpbmVkKTsKIHNob3VsZEJl KCJyZS50b1N0cmluZygpIiwgIicvei8nIik7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L3JlZ2V4L25vbi1wYXR0ZXJuLWNoYXJhY3RlcnMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv ZmFzdC9yZWdleC9ub24tcGF0dGVybi1jaGFyYWN0ZXJzLWV4cGVjdGVkLnR4dAppbmRleCBjNmM3 YmNiLi5kZTM5ZmVkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2V4L25vbi1wYXR0 ZXJuLWNoYXJhY3RlcnMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvcmVnZXgv bm9uLXBhdHRlcm4tY2hhcmFjdGVycy1leHBlY3RlZC50eHQKQEAgLTE1Niw3ICsxNTYsNyBAQCBU ZXN0aW5nIHJlZ2V4cDogL2F9L2dtCiBQQVNTIHJlZ2V4cC50ZXN0KCdhfScpIGlzIHRydWUKIFBB U1MgcmVnZXhwLmxhc3RJbmRleCBpcyAyCiAKLVRlc3RpbmcgcmVnZXhwOiAvL2dtCitUZXN0aW5n IHJlZ2V4cDogLyg/OikvZ20KIFBBU1MgcmVnZXhwLnRlc3QoJycpIGlzIHRydWUKIFBBU1MgcmVn ZXhwLmxhc3RJbmRleCBpcyAwCiAK