157162 2016-04-28 20:19:29 -0700 Web Inspector: FormatterWorker fails to find "External/Esprima.js" in Production builds 2016-05-04 16:04:37 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck aestes bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer webkit oldest_to_newest 1188491 0 joepeck 2016-04-28 20:19:29 -0700 * SUMMARY FormatterWorker fails to find "External/Esprima.js" in Production builds. This affects Safari Technology Preview Release 3 and Nightlies. * STEPS TO REPRODUCE 1. Open Inspector on this page 2. Try to open any Script with minified contents => Infinite loading indicator * ERROR [Error] Failed to load resource: The requested URL was not found on this server. (esprima.js, line 0) URL in this case being: file:///Applications/Safari%20Technology%20Preview.app/Contents/Frameworks/WebInspectorUI.framework/Resources/External/Esprima/esprima.js Bad path: WebInspectorUI.framework/Resources/External/Esprima.js The actual path ends up be: WebInspectorUI.framework/Resources/Esprima.js * NOTES Source/WebInspectorUI/UserInterface/Workers/Formatter/FormatterWorker.js does: > importScripts(...[ > "../../External/Esprima/esprima.js", > "FormatterUtilities.js", > "FormatterContentBuilder.js", > "ESTreeWalker.js", > "EsprimaFormatter.js", > ]); So apparently our optimization pass doesn't keep the External directory. 1188492 1 webkit-bug-importer 2016-04-28 20:22:45 -0700 <rdar://problem/25996556> 1188498 2 277670 joepeck 2016-04-28 21:09:57 -0700 Created attachment 277670 [PATCH] Proposed Fix 1188499 3 joepeck 2016-04-28 21:11:21 -0700 Here is an example of the script producing a warning and working correctly. It modifies the files in place, so you can test on the UserInterface directory. # Comment out the line that does the replace. shell> perl ./Scripts/fix-worker-imports-for-optimized-builds.pl --input-directory ./UserInterface/Workers ERROR: Workers/Formatter/FormatterWorker.js: Unhandled External importScript in Worker script on line 27: "../../External/Esprima/esprima.js", shell> echo $? 1 # Revert the script back to expected shell> perl ./Scripts/fix-worker-imports-for-optimized-builds.pl --input-directory ./UserInterface/Workers shell> echo $? 0 shell> git diff . diff --git a/Source/WebInspectorUI/UserInterface/Workers/Formatter/FormatterWorker.js b/Source/WebInspectorUI/UserInterface/Workers/Formatter/FormatterWorker.js index 4f9067b..5811361 100644 --- a/Source/WebInspectorUI/UserInterface/Workers/Formatter/FormatterWorker.js +++ b/Source/WebInspectorUI/UserInterface/Workers/Formatter/FormatterWorker.js @@ -24,7 +24,7 @@ */ importScripts(...[ - "../../External/Esprima/esprima.js", + "../../Esprima.js", "FormatterUtilities.js", "FormatterContentBuilder.js", "ESTreeWalker.js", 1188500 4 277670 joepeck 2016-04-28 21:15:16 -0700 Comment on attachment 277670 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=277670&action=review > Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl:250 > + system(File::Spec->catfile($scriptsRoot, 'fix-worker-imports-for-optimized-builds.pl'), '--input-directory', $workersDir); This should: and die "Reason"; so that `make` itself fails the build if fix-worker-imports returns with a bad exit code 1188502 5 277671 joepeck 2016-04-28 21:16:58 -0700 Created attachment 277671 [PATCH] Proposed Fix 1188504 6 joepeck 2016-04-28 21:19:18 -0700 With the "and die" the build will actually fail now if this script fails. PhaseScriptExecution Copy\ User\ Interface\ Resources /Build/WebInspectorUI.build/Release/WebInspectorUI.build/Script-1C60FF1214E6D9AF006CD77D.sh cd /Code/safari/OpenSource/Source/WebInspectorUI export ACTION=build export ALTERNATE_GROUP=staff .... /bin/sh -c /Build/WebInspectorUI.build/Release/WebInspectorUI.build/Script-1C60FF1214E6D9AF006CD77D.sh ERROR: Workers/Formatter/FormatterWorker.js: Unhandled External importScript in Worker script on line 27: "../../External/Esprima/esprima.js", Failed to update Worker imports for optimized builds. at /Code/safari/OpenSource/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl line 250. Command /bin/sh failed with exit code 1 That is important, otherwise these issues could go unnoticed! 1188510 7 277671 commit-queue 2016-04-28 22:23:17 -0700 Comment on attachment 277671 [PATCH] Proposed Fix Clearing flags on attachment: 277671 Committed r200229: <http://trac.webkit.org/changeset/200229> 1188511 8 commit-queue 2016-04-28 22:23:23 -0700 All reviewed patches have been landed. Closing bug. 1188958 9 joepeck 2016-04-29 19:14:54 -0700 *** Bug 157223 has been marked as a duplicate of this bug. *** 1190259 10 timothy 2016-05-04 16:04:37 -0700 *** Bug 157343 has been marked as a duplicate of this bug. *** 277670 2016-04-28 21:09:57 -0700 2016-04-28 21:16:58 -0700 [PATCH] Proposed Fix esprima-fix.patch text/plain 4726 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGNiM2M0NTMuLjVlNzI1YjEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE2LTA0LTI4ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRm9ybWF0 dGVyV29ya2VyIGZhaWxzIHRvIGZpbmQgIkV4dGVybmFsL0VzcHJpbWEuanMiIGluIFByb2R1Y3Rp b24gYnVpbGRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNTcxNjIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI1OTk2NTU2PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdvcmtlcnMgaGF2ZSByZWxhdGl2 ZSBpbmNsdWRlIHBhdGhzLiBGb3JtYXR0ZXJXb3JrZXIgaGFzIGFuIGluY2x1ZGVzCisgICAgICAg IHRoYXQgbG9va3MgbGlrZToKKworICAgICAgICAgICAgaW1wb3J0U2NyaXB0cyguLi5bCisgICAg ICAgICAgICAgICAgIi4uLy4uL0V4dGVybmFsL0VzcHJpbWEvZXNwcmltYS5qcyIsCisgICAgICAg ICAgICAgICAgLi4uCisgICAgICAgICAgICBdKTsKKworICAgICAgICBJbiBvcHRpbWl6ZWQgYnVp bGRzIChQcm9kdWN0aW9uKSB0aGUgZXNwcmltYSByZXNvdXJjZXMgYXJlIGNvbWJpbmVkCisgICAg ICAgIGFuZCBtb3ZlZCBvdXQgb2YgYW4gRXh0ZXJuYWwgZGlyZWN0b3J5IHRvICJFc3ByaW1hLmpz Ii4gV2UgbmVlZCB0bworICAgICAgICB1cGRhdGUgdGhlIHBhdGggb2YgdGhpcyBpbmNsdWRlIGlu IG9wdGltaXplZCBidWlsZHMuCisKKyAgICAgICAgVGhpcyBhZGRzIGEgc2NyaXB0IHRvIGRvIHNv bWUgYmFzaWMgcmV3cml0ZXMgb2YgcGF0aHMuIEl0IHdpbGwgYWxzbworICAgICAgICBwcm9kdWNl IGEgYnVpbGQgZXJyb3IgaWYgdGhlcmUgYXJlIGFueSBvdGhlciBFeHRlcm5hbCBwYXRocyB0aGF0 CisgICAgICAgIG1heSBoYXZlIGJlZW4gdW5oYW5kbGVkLgorCisgICAgICAgICogU2NyaXB0cy9j b3B5LXVzZXItaW50ZXJmYWNlLXJlc291cmNlcy5wbDoKKyAgICAgICAgUnVuIGEgbmV3IHNjcmlw dCB0byBmaXggdXAgdGhlIFdvcmtlciBpbXBvcnRzIGZvciBuZXcgcGF0aGVzLgorCisgICAgICAg ICogU2NyaXB0cy9maXgtd29ya2VyLWltcG9ydHMtZm9yLW9wdGltaXplZC1idWlsZHMucGw6IEFk ZGVkLgorICAgICAgICAoZml4V29ya2VySW1wb3J0c0luRmlsZSk6CisgICAgICAgIChmaXhXb3Jr ZXJJbXBvcnRzSW5EaXJlY3RvcnkpOgorICAgICAgICBSZXBsYWNlICIvRXh0ZXJuYWwvRXNwcmlt YS9lc3ByaW1hLmpzIiB3aXRoICIvRXNwcmltYS5qcyIgaW4gaW1wb3J0cy4KKyAgICAgICAgRmF0 YWwgZXJyb3IgZm9yIGFueSB1bmhhbmRsZWQgIi9FeHRlcm5hbCIgbGluZXMgdGhhdCB3ZXJlIG5v dCByZXBsYWNlZC4KKwogMjAxNi0wNC0yNyAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBw bGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE1pc3NpbmcgQ1NTIGF1dG9jb21wbGV0 aW9uIHN1Z2dlc3Rpb25zIGZvciAtd2Via2l0LXVzZXItc2VsZWN0CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvU2NyaXB0cy9jb3B5LXVzZXItaW50ZXJmYWNlLXJlc291cmNlcy5w bCBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL2NvcHktdXNlci1pbnRlcmZhY2UtcmVz b3VyY2VzLnBsCmluZGV4IGQ3ZWE4MzAuLjQwNjA2OTggMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9TY3JpcHRzL2NvcHktdXNlci1pbnRlcmZhY2UtcmVzb3VyY2VzLnBsCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL2NvcHktdXNlci1pbnRlcmZhY2UtcmVzb3Vy Y2VzLnBsCkBAIC0yNDUsNiArMjQ1LDkgQEAgaWYgKCRzaG91bGRDb21iaW5lTWFpbikgewogCiAg ICAgIyBSZW1vdmUgY29uc29sZS5hc3NlcnQgY2FsbHMgZnJvbSB0aGUgV29ya2VyIGpzIGZpbGVz LgogICAgIHN5c3RlbShGaWxlOjpTcGVjLT5jYXRmaWxlKCRzY3JpcHRzUm9vdCwgJ3JlbW92ZS1j b25zb2xlLWFzc2VydHMucGwnKSwgJy0taW5wdXQtZGlyZWN0b3J5JywgJHdvcmtlcnNEaXIpOwor CisgICAgIyBGaXggaW1wb3J0IHJlZmVyZW5jZXMgaW4gV29ya2VycyBkaXJlY3Rvcmllcy4gVGhp cyByZXdyaXRlcyAiLi4vLi4vRXh0ZXJuYWwvc2NyaXB0LmpzIiBpbXBvcnQgcGF0aHMgdG8gdGhl aXIgbmV3IGxvY2F0aW9ucy4KKyAgICBzeXN0ZW0oRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkc2NyaXB0 c1Jvb3QsICdmaXgtd29ya2VyLWltcG9ydHMtZm9yLW9wdGltaXplZC1idWlsZHMucGwnKSwgJy0t aW5wdXQtZGlyZWN0b3J5JywgJHdvcmtlcnNEaXIpOwogfSBlbHNlIHsKICAgICAjIEtlZXAgdGhl IGZpbGVzIHNlcGFyYXRlIGZvciBlbmdpbmVlcmluZyBidWlsZHMuCiAgICAgZGl0dG8oJHVpUm9v dCwgJHRhcmdldFJlc291cmNlUGF0aCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvU2NyaXB0cy9maXgtd29ya2VyLWltcG9ydHMtZm9yLW9wdGltaXplZC1idWlsZHMucGwgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvU2NyaXB0cy9maXgtd29ya2VyLWltcG9ydHMtZm9yLW9wdGlt aXplZC1idWlsZHMucGwKbmV3IGZpbGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAwMC4uOGE4ZDI1 YQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL2ZpeC13 b3JrZXItaW1wb3J0cy1mb3Itb3B0aW1pemVkLWJ1aWxkcy5wbApAQCAtMCwwICsxLDY5IEBACisj IS91c3IvYmluL3BlcmwgLXcKKwordXNlIHN0cmljdDsKK3VzZSBHZXRvcHQ6Okxvbmc7Cit1c2Ug RmlsZTo6Q29weSBxdy9tb3ZlLzsKK3VzZSBGaWxlOjpUZW1wIHF3L3RlbXBmaWxlLzsKK3VzZSBG aWxlOjpTcGVjOworCitzdWIgZml4V29ya2VySW1wb3J0c0luRmlsZSgkJCk7CitzdWIgZml4V29y a2VySW1wb3J0c0luRGlyZWN0b3J5KCQpOworCitvdXIgJGlucHV0RGlyZWN0b3J5OworCitHZXRP cHRpb25zKCdpbnB1dC1kaXJlY3Rvcnk9cycgPT4gXCRpbnB1dERpcmVjdG9yeSk7CisKK2lmIChk ZWZpbmVkICRpbnB1dERpcmVjdG9yeSkgeworICAgIGZpeFdvcmtlckltcG9ydHNJbkRpcmVjdG9y eSgkaW5wdXREaXJlY3RvcnkpOworICAgIGV4aXQ7Cit9CisKK3ByaW50ICJVc2FnZTogJDAgLS1p bnB1dC1kaXJlY3RvcnkgPHBhdGg+XG4iOworZXhpdDsKKworc3ViIGZpeFdvcmtlckltcG9ydHNJ bkZpbGUoJCQpCit7CisgICAgbXkgJGlucHV0U2NyaXB0RmlsZW5hbWUgPSBzaGlmdDsKKyAgICBt eSAkb3V0cHV0U2NyaXB0RmlsZW5hbWUgPSBzaGlmdDsKKworICAgIG9wZW4gSU4sICRpbnB1dFNj cmlwdEZpbGVuYW1lIG9yIGRpZSAiQ291bGRuJ3Qgb3BlbiAkaW5wdXRTY3JpcHRGaWxlbmFtZTog JCEiOworICAgIG15ICgkb3V0LCAkdGVtcEZpbGVuYW1lKSA9IHRlbXBmaWxlKFVOTElOSyA9PiAw KSBvciBkaWU7CisKKyAgICBteSAkcHJldmlvdXNMaW5lID0gIiI7CisgICAgd2hpbGUgKDxJTj4p IHsKKyAgICAgICAgc3wvRXh0ZXJuYWwvRXNwcmltYS9lc3ByaW1hLmpzfC9Fc3ByaW1hLmpzfDsK KyAgICAgICAgcHJpbnQgJG91dCAkXzsKKworICAgICAgICAjIEVycm9yIGlmIHRoZXJlIGlzIGFu ICJFeHRlcm5hbC8iIHBhdGggdGhhdCB3ZSBkaWQgbm90IHJld3JpdGUuCisgICAgICAgIGlmICgk XyA9fiAvRXh0ZXJuYWxcLy8pIHsKKyAgICAgICAgICAgIG15ICRzYW5pdGl6ZWRQYXRoID0gJGlu cHV0U2NyaXB0RmlsZW5hbWU7CisgICAgICAgICAgICAkc2FuaXRpemVkUGF0aCA9fiBzL14uKj9X b3JrZXJzL1dvcmtlcnMvOworICAgICAgICAgICAgcHJpbnQgIkVSUk9SOiAkc2FuaXRpemVkUGF0 aDogVW5oYW5kbGVkIEV4dGVybmFsIGltcG9ydFNjcmlwdCBpbiBXb3JrZXIgc2NyaXB0IG9uIGxp bmUgJC46ICRfIjsKKyAgICAgICAgICAgIGV4aXQgMTsKKyAgICAgICAgfQorICAgIH0KKworICAg IGNsb3NlICRvdXQ7CisgICAgY2xvc2UgSU47CisKKyAgICBtb3ZlICR0ZW1wRmlsZW5hbWUsICRv dXRwdXRTY3JpcHRGaWxlbmFtZSBvciBkaWUgIiQhIjsKK30KKworc3ViIGZpeFdvcmtlckltcG9y dHNJbkRpcmVjdG9yeSgkKQoreworICAgIG15ICRpbnB1dERpcmVjdG9yeSA9IHNoaWZ0OworCisg ICAgb3BlbmRpcihESVIsICRpbnB1dERpcmVjdG9yeSkgfHwgZGllICIkISI7CisgICAgbXkgQGZp bGVzID0gZ3JlcCB7ICEvXlwuezEsMn0kLyB9IHJlYWRkaXIgKERJUik7CisgICAgY2xvc2VkaXIo RElSKTsKKworICAgIGZvcmVhY2ggbXkgJGZpbGUgKEBmaWxlcykgeworICAgICAgICBuZXh0IGlm ICRmaWxlIGVxICcuJyBvciAkZmlsZSBlcSAnLi4nOworICAgICAgICBteSAkcGF0aCA9IEZpbGU6 OlNwZWMtPmNhdGRpcigkaW5wdXREaXJlY3RvcnksICRmaWxlKTsKKyAgICAgICAgaWYgKC1kICRw YXRoKSB7CisgICAgICAgICAgICBmaXhXb3JrZXJJbXBvcnRzSW5EaXJlY3RvcnkoJHBhdGgpOwor ICAgICAgICB9IGVsc2lmICgkZmlsZSA9fiAvXC5qcyQvKSB7CisgICAgICAgICAgICBmaXhXb3Jr ZXJJbXBvcnRzSW5GaWxlKCRwYXRoLCAkcGF0aCk7CisgICAgICAgIH0KKyAgICB9Cit9Cg== 277671 2016-04-28 21:16:58 -0700 2016-04-28 22:23:17 -0700 [PATCH] Proposed Fix fix-workers.patch text/plain 4790 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGNiM2M0NTMuLjVlNzI1YjEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE2LTA0LTI4ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRm9ybWF0 dGVyV29ya2VyIGZhaWxzIHRvIGZpbmQgIkV4dGVybmFsL0VzcHJpbWEuanMiIGluIFByb2R1Y3Rp b24gYnVpbGRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNTcxNjIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI1OTk2NTU2PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdvcmtlcnMgaGF2ZSByZWxhdGl2 ZSBpbmNsdWRlIHBhdGhzLiBGb3JtYXR0ZXJXb3JrZXIgaGFzIGFuIGluY2x1ZGVzCisgICAgICAg IHRoYXQgbG9va3MgbGlrZToKKworICAgICAgICAgICAgaW1wb3J0U2NyaXB0cyguLi5bCisgICAg ICAgICAgICAgICAgIi4uLy4uL0V4dGVybmFsL0VzcHJpbWEvZXNwcmltYS5qcyIsCisgICAgICAg ICAgICAgICAgLi4uCisgICAgICAgICAgICBdKTsKKworICAgICAgICBJbiBvcHRpbWl6ZWQgYnVp bGRzIChQcm9kdWN0aW9uKSB0aGUgZXNwcmltYSByZXNvdXJjZXMgYXJlIGNvbWJpbmVkCisgICAg ICAgIGFuZCBtb3ZlZCBvdXQgb2YgYW4gRXh0ZXJuYWwgZGlyZWN0b3J5IHRvICJFc3ByaW1hLmpz Ii4gV2UgbmVlZCB0bworICAgICAgICB1cGRhdGUgdGhlIHBhdGggb2YgdGhpcyBpbmNsdWRlIGlu IG9wdGltaXplZCBidWlsZHMuCisKKyAgICAgICAgVGhpcyBhZGRzIGEgc2NyaXB0IHRvIGRvIHNv bWUgYmFzaWMgcmV3cml0ZXMgb2YgcGF0aHMuIEl0IHdpbGwgYWxzbworICAgICAgICBwcm9kdWNl IGEgYnVpbGQgZXJyb3IgaWYgdGhlcmUgYXJlIGFueSBvdGhlciBFeHRlcm5hbCBwYXRocyB0aGF0 CisgICAgICAgIG1heSBoYXZlIGJlZW4gdW5oYW5kbGVkLgorCisgICAgICAgICogU2NyaXB0cy9j b3B5LXVzZXItaW50ZXJmYWNlLXJlc291cmNlcy5wbDoKKyAgICAgICAgUnVuIGEgbmV3IHNjcmlw dCB0byBmaXggdXAgdGhlIFdvcmtlciBpbXBvcnRzIGZvciBuZXcgcGF0aGVzLgorCisgICAgICAg ICogU2NyaXB0cy9maXgtd29ya2VyLWltcG9ydHMtZm9yLW9wdGltaXplZC1idWlsZHMucGw6IEFk ZGVkLgorICAgICAgICAoZml4V29ya2VySW1wb3J0c0luRmlsZSk6CisgICAgICAgIChmaXhXb3Jr ZXJJbXBvcnRzSW5EaXJlY3RvcnkpOgorICAgICAgICBSZXBsYWNlICIvRXh0ZXJuYWwvRXNwcmlt YS9lc3ByaW1hLmpzIiB3aXRoICIvRXNwcmltYS5qcyIgaW4gaW1wb3J0cy4KKyAgICAgICAgRmF0 YWwgZXJyb3IgZm9yIGFueSB1bmhhbmRsZWQgIi9FeHRlcm5hbCIgbGluZXMgdGhhdCB3ZXJlIG5v dCByZXBsYWNlZC4KKwogMjAxNi0wNC0yNyAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBw bGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE1pc3NpbmcgQ1NTIGF1dG9jb21wbGV0 aW9uIHN1Z2dlc3Rpb25zIGZvciAtd2Via2l0LXVzZXItc2VsZWN0CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvU2NyaXB0cy9jb3B5LXVzZXItaW50ZXJmYWNlLXJlc291cmNlcy5w bCBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL2NvcHktdXNlci1pbnRlcmZhY2UtcmVz b3VyY2VzLnBsCmluZGV4IGQ3ZWE4MzAuLmMyZTk3NjMgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9TY3JpcHRzL2NvcHktdXNlci1pbnRlcmZhY2UtcmVzb3VyY2VzLnBsCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL2NvcHktdXNlci1pbnRlcmZhY2UtcmVzb3Vy Y2VzLnBsCkBAIC0yNDUsNiArMjQ1LDkgQEAgaWYgKCRzaG91bGRDb21iaW5lTWFpbikgewogCiAg ICAgIyBSZW1vdmUgY29uc29sZS5hc3NlcnQgY2FsbHMgZnJvbSB0aGUgV29ya2VyIGpzIGZpbGVz LgogICAgIHN5c3RlbShGaWxlOjpTcGVjLT5jYXRmaWxlKCRzY3JpcHRzUm9vdCwgJ3JlbW92ZS1j b25zb2xlLWFzc2VydHMucGwnKSwgJy0taW5wdXQtZGlyZWN0b3J5JywgJHdvcmtlcnNEaXIpOwor CisgICAgIyBGaXggaW1wb3J0IHJlZmVyZW5jZXMgaW4gV29ya2VycyBkaXJlY3Rvcmllcy4gVGhp cyByZXdyaXRlcyAiLi4vLi4vRXh0ZXJuYWwvc2NyaXB0LmpzIiBpbXBvcnQgcGF0aHMgdG8gdGhl aXIgbmV3IGxvY2F0aW9ucy4KKyAgICBzeXN0ZW0oRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkc2NyaXB0 c1Jvb3QsICdmaXgtd29ya2VyLWltcG9ydHMtZm9yLW9wdGltaXplZC1idWlsZHMucGwnKSwgJy0t aW5wdXQtZGlyZWN0b3J5JywgJHdvcmtlcnNEaXIpIGFuZCBkaWUgIkZhaWxlZCB0byB1cGRhdGUg V29ya2VyIGltcG9ydHMgZm9yIG9wdGltaXplZCBidWlsZHMuIjsKIH0gZWxzZSB7CiAgICAgIyBL ZWVwIHRoZSBmaWxlcyBzZXBhcmF0ZSBmb3IgZW5naW5lZXJpbmcgYnVpbGRzLgogICAgIGRpdHRv KCR1aVJvb3QsICR0YXJnZXRSZXNvdXJjZVBhdGgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1NjcmlwdHMvZml4LXdvcmtlci1pbXBvcnRzLWZvci1vcHRpbWl6ZWQtYnVpbGRz LnBsIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1NjcmlwdHMvZml4LXdvcmtlci1pbXBvcnRzLWZv ci1vcHRpbWl6ZWQtYnVpbGRzLnBsCm5ldyBmaWxlIG1vZGUgMTAwNzU1CmluZGV4IDAwMDAwMDAu LjhhOGQyNWEKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvU2NyaXB0 cy9maXgtd29ya2VyLWltcG9ydHMtZm9yLW9wdGltaXplZC1idWlsZHMucGwKQEAgLTAsMCArMSw2 OSBAQAorIyEvdXNyL2Jpbi9wZXJsIC13CisKK3VzZSBzdHJpY3Q7Cit1c2UgR2V0b3B0OjpMb25n OwordXNlIEZpbGU6OkNvcHkgcXcvbW92ZS87Cit1c2UgRmlsZTo6VGVtcCBxdy90ZW1wZmlsZS87 Cit1c2UgRmlsZTo6U3BlYzsKKworc3ViIGZpeFdvcmtlckltcG9ydHNJbkZpbGUoJCQpOworc3Vi IGZpeFdvcmtlckltcG9ydHNJbkRpcmVjdG9yeSgkKTsKKworb3VyICRpbnB1dERpcmVjdG9yeTsK KworR2V0T3B0aW9ucygnaW5wdXQtZGlyZWN0b3J5PXMnID0+IFwkaW5wdXREaXJlY3RvcnkpOwor CitpZiAoZGVmaW5lZCAkaW5wdXREaXJlY3RvcnkpIHsKKyAgICBmaXhXb3JrZXJJbXBvcnRzSW5E aXJlY3RvcnkoJGlucHV0RGlyZWN0b3J5KTsKKyAgICBleGl0OworfQorCitwcmludCAiVXNhZ2U6 ICQwIC0taW5wdXQtZGlyZWN0b3J5IDxwYXRoPlxuIjsKK2V4aXQ7CisKK3N1YiBmaXhXb3JrZXJJ bXBvcnRzSW5GaWxlKCQkKQoreworICAgIG15ICRpbnB1dFNjcmlwdEZpbGVuYW1lID0gc2hpZnQ7 CisgICAgbXkgJG91dHB1dFNjcmlwdEZpbGVuYW1lID0gc2hpZnQ7CisKKyAgICBvcGVuIElOLCAk aW5wdXRTY3JpcHRGaWxlbmFtZSBvciBkaWUgIkNvdWxkbid0IG9wZW4gJGlucHV0U2NyaXB0Rmls ZW5hbWU6ICQhIjsKKyAgICBteSAoJG91dCwgJHRlbXBGaWxlbmFtZSkgPSB0ZW1wZmlsZShVTkxJ TksgPT4gMCkgb3IgZGllOworCisgICAgbXkgJHByZXZpb3VzTGluZSA9ICIiOworICAgIHdoaWxl ICg8SU4+KSB7CisgICAgICAgIHN8L0V4dGVybmFsL0VzcHJpbWEvZXNwcmltYS5qc3wvRXNwcmlt YS5qc3w7CisgICAgICAgIHByaW50ICRvdXQgJF87CisKKyAgICAgICAgIyBFcnJvciBpZiB0aGVy ZSBpcyBhbiAiRXh0ZXJuYWwvIiBwYXRoIHRoYXQgd2UgZGlkIG5vdCByZXdyaXRlLgorICAgICAg ICBpZiAoJF8gPX4gL0V4dGVybmFsXC8vKSB7CisgICAgICAgICAgICBteSAkc2FuaXRpemVkUGF0 aCA9ICRpbnB1dFNjcmlwdEZpbGVuYW1lOworICAgICAgICAgICAgJHNhbml0aXplZFBhdGggPX4g cy9eLio/V29ya2Vycy9Xb3JrZXJzLzsKKyAgICAgICAgICAgIHByaW50ICJFUlJPUjogJHNhbml0 aXplZFBhdGg6IFVuaGFuZGxlZCBFeHRlcm5hbCBpbXBvcnRTY3JpcHQgaW4gV29ya2VyIHNjcmlw dCBvbiBsaW5lICQuOiAkXyI7CisgICAgICAgICAgICBleGl0IDE7CisgICAgICAgIH0KKyAgICB9 CisKKyAgICBjbG9zZSAkb3V0OworICAgIGNsb3NlIElOOworCisgICAgbW92ZSAkdGVtcEZpbGVu YW1lLCAkb3V0cHV0U2NyaXB0RmlsZW5hbWUgb3IgZGllICIkISI7Cit9CisKK3N1YiBmaXhXb3Jr ZXJJbXBvcnRzSW5EaXJlY3RvcnkoJCkKK3sKKyAgICBteSAkaW5wdXREaXJlY3RvcnkgPSBzaGlm dDsKKworICAgIG9wZW5kaXIoRElSLCAkaW5wdXREaXJlY3RvcnkpIHx8IGRpZSAiJCEiOworICAg IG15IEBmaWxlcyA9IGdyZXAgeyAhL15cLnsxLDJ9JC8gfSByZWFkZGlyIChESVIpOworICAgIGNs b3NlZGlyKERJUik7CisKKyAgICBmb3JlYWNoIG15ICRmaWxlIChAZmlsZXMpIHsKKyAgICAgICAg bmV4dCBpZiAkZmlsZSBlcSAnLicgb3IgJGZpbGUgZXEgJy4uJzsKKyAgICAgICAgbXkgJHBhdGgg PSBGaWxlOjpTcGVjLT5jYXRkaXIoJGlucHV0RGlyZWN0b3J5LCAkZmlsZSk7CisgICAgICAgIGlm ICgtZCAkcGF0aCkgeworICAgICAgICAgICAgZml4V29ya2VySW1wb3J0c0luRGlyZWN0b3J5KCRw YXRoKTsKKyAgICAgICAgfSBlbHNpZiAoJGZpbGUgPX4gL1wuanMkLykgeworICAgICAgICAgICAg Zml4V29ya2VySW1wb3J0c0luRmlsZSgkcGF0aCwgJHBhdGgpOworICAgICAgICB9CisgICAgfQor fQo=