15754 2007-10-29 11:56:00 -0700 webarchive layout tests fail when WebKit directory path contains symlinks 2008-02-29 10:22:59 -0800 1 1 1 Unclassified WebKit Tools / Tests 523.x (Safari 3) Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 andersca webkit-unassigned ddkilzer oldest_to_newest 59804 0 andersca 2007-10-29 11:56:00 -0700 The diffs all look like: --- /tmp/layout-test-results/webarchive/archive-empty-frame-dom-expected.txt 2007-10-29 11:55:19.000000000 -0700 +++ /tmp/layout-test-results/webarchive/archive-empty-frame-dom-actual.txt 2007-10-29 11:55:19.000000000 -0700 @@ -29,7 +29,7 @@ <key>WebResourceTextEncodingName</key> <string>UTF-8</string> <key>WebResourceURL</key> - <string>file:///LayoutTests/webarchive/archive-empty-frame-dom.html</string> + <string>file:///Users/andersca/WebKit/OpenSource/LayoutTests/webarchive/archive-empty-frame-dom.html</string> </dict> <key>WebSubframeArchives</key> <array> Running run-webkit-tests from elsewhere works fine. 59829 1 ddkilzer 2007-10-29 21:38:32 -0700 There is code in WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm that attempts to normalize the directories embedded in .webarchive files to make the test results repeatable. Apparently, it is not working as expected in this case. It would be interesting to see what cwdURL in serializeWebArchiveToXML(WebArchive*) is in cases where it works and where it doesn't. 72197 2 ddkilzer 2008-02-27 15:43:51 -0800 Anders' ~/WebKit directory is a symlink to a directory on /Volumes. So the code in DRT to remove directory paths probably isn't resolving the symlink when it should (or is resolving the symlink when it should not). 72213 3 19422 ddkilzer 2008-02-27 18:25:11 -0800 Created attachment 19422 Patch v1 Proposed fix. 72284 4 ggaren 2008-02-28 11:58:51 -0800 This patch looks OK to me, but I don't think it will fix the whole problem: there are a few webarchive tests that are not located in LayoutTests/webarchive. For example, there are svg webarchive tests. 72339 5 19447 ddkilzer 2008-02-29 07:33:21 -0800 Created attachment 19447 Patch v2 (In reply to comment #4) > This patch looks OK to me, but I don't think it will fix the whole problem: > there are a few webarchive tests that are not located in > LayoutTests/webarchive. For example, there are svg webarchive tests. Thanks for catching this. I fixed this by searching backwards in the URL for "/LayoutTests/" instead of searching forward for "/LayoutTests/webarchive/". Assuming we never create any subdirectories named "LayoutTests" under "LayoutTests" with webarchive tests in them, this will just work! I also ran all of the layout tests this time. The SVG tests did fail with the previous patch. They all pass now with this patch, as do LayoutTests/webarchive. Sorry it took so long to fix this. 72350 6 19447 darin 2008-02-29 09:54:15 -0800 Comment on attachment 19447 Patch v2 r=me 72355 7 ddkilzer 2008-02-29 10:22:59 -0800 Committed revision 30666. 19422 2008-02-27 18:25:11 -0800 2008-02-29 07:33:21 -0800 Patch v1 bug-15754-v1.diff text/plain 5556 ddkilzer SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDMwNjQxKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMzIgQEAKKzIwMDgtMDItMjcgIERhdmlkIEtpbHplciAgPGRk a2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICBCdWcgMTU3NTQ6IHdlYmFyY2hpdmUgbGF5b3V0 IHRlc3RzIGZhaWwgd2hlbiBXZWJLaXQgZGlyZWN0b3J5IHBhdGggY29udGFpbnMgc3ltbGlua3MK KworICAgICAgICA8aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU3NTQ+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Ugd2Vy ZSB1c2luZyAtW05TRmlsZU1hbmFnZXIgY3VycmVudERpcmVjdG9yeVBhdGhdIHRvIGdldCB0aGUg Y3VycmVudCB3b3JraW5nIGRpcmVjdG9yeSwKKyAgICAgICAgdGhlbiByZW1vdmluZyB0aGF0IHBh dGggZnJvbSBhbGwgZmlsZTovLy8gVVJMcyBpbiB0aGUgV2ViQXJjaGl2ZSBvdXRwdXQgc28gdGhl c2UgdGVzdHMKKyAgICAgICAgd291bGQgcGFzcyBubyBtYXR0ZXIgd2hlcmUgdGhleSB3ZXJlIHJ1 bi4KKworICAgICAgICBUaGUgcHJvYmxlbSB3YXMgdGhhdCAtW05TRmlsZU1hbmFnZXIgY3VycmVu dERpcmVjdG9yeVBhdGhdIHJlc29sdmVzIHN5bWxpbmtzIGluIHRoZQorICAgICAgICBjdXJyZW50 IHdvcmtpbmcgZGlyZWN0b3J5LCBidXQgdGhlIFdlYkFyY2hpdmUgZG9lcyBub3QuICBUaGlzIGxl ZnQgdGhlIGN1cnJlbnQgd29ya2luZworICAgICAgICBkaXJlY3RvcnkgaW4gYWxsIGZpbGU6Ly8v IFVSTHMgaW4gdGhlIHRlc3Qgb3V0cHV0LCBhbmQgdGh1cyBhbGwgdGVzdHMgZmFpbGVkLCBmb3Ig YW55CisgICAgICAgIGRldmVsb3BlciB0aGF0IHVzZWQgc3ltbGlua3MgdG8gZ2V0IHRvIHRoZWly IFdlYktpdCBzb3VyY2UgZGlyZWN0b3J5LgorCisgICAgICAgIFRoZSBmaXggaXMgdG8gbG9vayBm b3IgIi9MYXlvdXRUZXN0cy93ZWJhcmNoaXZlLyIgaW4gdGhlIFVSTCB3ZSdyZSBwYXNzZWQsIGFu ZCBzaW1wbHkKKyAgICAgICAgcmVtb3ZlIHRoZSBjdXJyZW50IHdvcmtpbmcgZGlyZWN0b3J5IHBh dGggKG5vIG1hdHRlciB3aGF0IGl0IGlzKSBhZnRlciAiZmlsZTovLyIgYW5kCisgICAgICAgIGJl Zm9yZSAiL0xheW91dFRlc3RzL3dlYmFyY2hpdmUvIi4KKworICAgICAgICAqIER1bXBSZW5kZXJU cmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbToKKyAgICAgICAgKG5vcm1hbGl6ZVdlYlJlc291cmNl VVJMKTogUmVtb3ZlZCB1bnVzZWQgb2xkVVJMQmFzZSBhcmd1bWVudC4gIFdlIG5vdyByZXBsYWNl IHRoZQorICAgICAgICBjdXJyZW50IHdvcmtpbmcgZGlyZWN0b3J5IGFzIGRlc2NyaWJlZCBhYm92 ZS4KKyAgICAgICAgKGNvbnZlcnRXZWJSZXNvdXJjZVJlc3BvbnNlVG9EaWN0aW9uYXJ5KTogUmVt b3ZlIHVudXNlZCBvbGRVUkxCYXNlIGFyZ3VtZW50LiAgVXBkYXRlCisgICAgICAgIGNhbGxzIHRv IG5vcm1hbGl6ZVdlYlJlc291cmNlVVJMKCkuCisgICAgICAgIChzZXJpYWxpemVXZWJBcmNoaXZl VG9YTUwpOiBSZW1vdmVkIHVudXNlZCBjd2RVUkwgdmFyaWFibGUuICBVcGRhdGUgY2FsbHMgdG8K KyAgICAgICAgbm9ybWFsaXplV2ViUmVzb3VyY2VVUkwoKSBhbmQgY29udmVydFdlYlJlc291cmNl UmVzcG9uc2VUb0RpY3Rpb25hcnkoKS4KKwogMjAwOC0wMi0yNiAgUm9iaW4gRHVubiA8cm9iaW5A YWxsZHVubi5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2V2aW4gT2xsaXZpZXIuCkluZGV4 OiBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1t CShyZXZpc2lvbiAzMDU4MykKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1w UmVuZGVyVHJlZS5tbQkod29ya2luZyBjb3B5KQpAQCAtNTUwLDE1ICs1NTIsMTcgQEAgc3RhdGlj IHZvaWQgY29udmVydFdlYlJlc291cmNlRGF0YVRvU3RyaQogICAgIH0KIH0KIAotc3RhdGljIHZv aWQgbm9ybWFsaXplV2ViUmVzb3VyY2VVUkwoTlNNdXRhYmxlU3RyaW5nICp3ZWJSZXNvdXJjZVVS TCwgTlNTdHJpbmcgKm9sZFVSTEJhc2UpCitzdGF0aWMgdm9pZCBub3JtYWxpemVXZWJSZXNvdXJj ZVVSTChOU011dGFibGVTdHJpbmcgKndlYlJlc291cmNlVVJMKQogewotICAgIFt3ZWJSZXNvdXJj ZVVSTCByZXBsYWNlT2NjdXJyZW5jZXNPZlN0cmluZzpvbGRVUkxCYXNlCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB3aXRoU3RyaW5nOkAiZmlsZTovLyIKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9wdGlvbnM6TlNMaXRlcmFsU2VhcmNoCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJhbmdlOk5TTWFrZVJhbmdlKDAs IFt3ZWJSZXNvdXJjZVVSTCBsZW5ndGhdKV07CisgICAgc3RhdGljIGludCBmaWxlVXJsTGVuZ3Ro ID0gW0AiZmlsZTovLyIgbGVuZ3RoXTsKKyAgICBOU1JhbmdlIGxheW91dFRlc3RzV2ViQXJjaGl2 ZVBhdGhSYW5nZSA9IFt3ZWJSZXNvdXJjZVVSTCByYW5nZU9mU3RyaW5nOkAiL0xheW91dFRlc3Rz L3dlYmFyY2hpdmUvIl07CisgICAgaWYgKGxheW91dFRlc3RzV2ViQXJjaGl2ZVBhdGhSYW5nZS5s b2NhdGlvbiA9PSBOU05vdEZvdW5kKQorICAgICAgICByZXR1cm47CisgICAgTlNSYW5nZSBjdXJy ZW50V29ya2luZ0RpcmVjdG9yeVJhbmdlID0gTlNNYWtlUmFuZ2UoZmlsZVVybExlbmd0aCwgbGF5 b3V0VGVzdHNXZWJBcmNoaXZlUGF0aFJhbmdlLmxvY2F0aW9uIC0gZmlsZVVybExlbmd0aCk7Cisg ICAgW3dlYlJlc291cmNlVVJMIHJlcGxhY2VDaGFyYWN0ZXJzSW5SYW5nZTpjdXJyZW50V29ya2lu Z0RpcmVjdG9yeVJhbmdlIHdpdGhTdHJpbmc6QCIiXTsKIH0KIAotc3RhdGljIHZvaWQgY29udmVy dFdlYlJlc291cmNlUmVzcG9uc2VUb0RpY3Rpb25hcnkoTlNNdXRhYmxlRGljdGlvbmFyeSAqcHJv cGVydHlMaXN0LCBOU1N0cmluZyAqb2xkVVJMQmFzZSkKK3N0YXRpYyB2b2lkIGNvbnZlcnRXZWJS ZXNvdXJjZVJlc3BvbnNlVG9EaWN0aW9uYXJ5KE5TTXV0YWJsZURpY3Rpb25hcnkgKnByb3BlcnR5 TGlzdCkKIHsKICAgICBOU1VSTFJlc3BvbnNlICpyZXNwb25zZSA9IG5pbDsKICAgICBOU0RhdGEg KnJlc3BvbnNlRGF0YSA9IFtwcm9wZXJ0eUxpc3Qgb2JqZWN0Rm9yS2V5OkAiV2ViUmVzb3VyY2VS ZXNwb25zZSJdOyAvLyBXZWJSZXNvdXJjZVJlc3BvbnNlS2V5IGluIFdlYlJlc291cmNlLm0KQEAg LTU3Myw3ICs1NzcsNyBAQCBzdGF0aWMgdm9pZCBjb252ZXJ0V2ViUmVzb3VyY2VSZXNwb25zZVRv CiAgICAgTlNNdXRhYmxlRGljdGlvbmFyeSAqcmVzcG9uc2VEaWN0aW9uYXJ5ID0gW1tOU011dGFi bGVEaWN0aW9uYXJ5IGFsbG9jXSBpbml0XTsKICAgICAKICAgICBOU011dGFibGVTdHJpbmcgKnVy bFN0cmluZyA9IFtbW3Jlc3BvbnNlIFVSTF0gZGVzY3JpcHRpb25dIG11dGFibGVDb3B5XTsKLSAg ICBub3JtYWxpemVXZWJSZXNvdXJjZVVSTCh1cmxTdHJpbmcsIG9sZFVSTEJhc2UpOworICAgIG5v cm1hbGl6ZVdlYlJlc291cmNlVVJMKHVybFN0cmluZyk7CiAgICAgW3Jlc3BvbnNlRGljdGlvbmFy eSBzZXRPYmplY3Q6dXJsU3RyaW5nIGZvcktleTpAIlVSTCJdOwogICAgIFt1cmxTdHJpbmcgcmVs ZWFzZV07CiAgICAgCkBAIC02MDgsOSArNjEyLDYgQEAgc3RhdGljIE5TU3RyaW5nICpzZXJpYWxp emVXZWJBcmNoaXZlVG9YTQogICAgIGlmICghcHJvcGVydHlMaXN0KQogICAgICAgICByZXR1cm4g ZXJyb3JTdHJpbmc7CiAKLSAgICAvLyBOb3JtYWxpemUgV2ViUmVzb3VyY2VSZXNwb25zZSBhbmQg V2ViUmVzb3VyY2VVUkwgdmFsdWVzIGluIHBsaXN0IGZvciB0ZXN0aW5nCi0gICAgTlNTdHJpbmcg KmN3ZFVSTCA9IFtAImZpbGU6Ly8iIHN0cmluZ0J5QXBwZW5kaW5nU3RyaW5nOltbW05TRmlsZU1h bmFnZXIgZGVmYXVsdE1hbmFnZXJdIGN1cnJlbnREaXJlY3RvcnlQYXRoXSBzdHJpbmdCeUV4cGFu ZGluZ1RpbGRlSW5QYXRoXV07Ci0gICAgCiAgICAgTlNNdXRhYmxlQXJyYXkgKnJlc291cmNlcyA9 IFtOU011dGFibGVBcnJheSBhcnJheVdpdGhDYXBhY2l0eToxXTsKICAgICBbcmVzb3VyY2VzIGFk ZE9iamVjdDpwcm9wZXJ0eUxpc3RdOwogCkBAIC02MTksNyArNjIwLDcgQEAgc3RhdGljIE5TU3Ry aW5nICpzZXJpYWxpemVXZWJBcmNoaXZlVG9YTQogICAgICAgICBbcmVzb3VyY2VzIHJlbW92ZU9i amVjdEF0SW5kZXg6MF07CiAKICAgICAgICAgTlNNdXRhYmxlRGljdGlvbmFyeSAqbWFpblJlc291 cmNlID0gW3Jlc291cmNlUHJvcGVydHlMaXN0IG9iamVjdEZvcktleTpAIldlYk1haW5SZXNvdXJj ZSJdOwotICAgICAgICBub3JtYWxpemVXZWJSZXNvdXJjZVVSTChbbWFpblJlc291cmNlIG9iamVj dEZvcktleTpAIldlYlJlc291cmNlVVJMIl0sIGN3ZFVSTCk7CisgICAgICAgIG5vcm1hbGl6ZVdl YlJlc291cmNlVVJMKFttYWluUmVzb3VyY2Ugb2JqZWN0Rm9yS2V5OkAiV2ViUmVzb3VyY2VVUkwi XSk7CiAgICAgICAgIGNvbnZlcnRXZWJSZXNvdXJjZURhdGFUb1N0cmluZyhtYWluUmVzb3VyY2Up OwogCiAgICAgICAgIC8vIEFkZCBzdWJmcmFtZUFyY2hpdmVzIHRvIGxpc3QgZm9yIHByb2Nlc3Np bmcKQEAgLTYzMSw4ICs2MzIsOCBAQCBzdGF0aWMgTlNTdHJpbmcgKnNlcmlhbGl6ZVdlYkFyY2hp dmVUb1hNCiAgICAgICAgIE5TRW51bWVyYXRvciAqZW51bWVyYXRvciA9IFtzdWJyZXNvdXJjZXMg b2JqZWN0RW51bWVyYXRvcl07CiAgICAgICAgIE5TTXV0YWJsZURpY3Rpb25hcnkgKnN1YnJlc291 cmNlUHJvcGVydHlMaXN0OwogICAgICAgICB3aGlsZSAoKHN1YnJlc291cmNlUHJvcGVydHlMaXN0 ID0gW2VudW1lcmF0b3IgbmV4dE9iamVjdF0pKSB7Ci0gICAgICAgICAgICBub3JtYWxpemVXZWJS ZXNvdXJjZVVSTChbc3VicmVzb3VyY2VQcm9wZXJ0eUxpc3Qgb2JqZWN0Rm9yS2V5OkAiV2ViUmVz b3VyY2VVUkwiXSwgY3dkVVJMKTsKLSAgICAgICAgICAgIGNvbnZlcnRXZWJSZXNvdXJjZVJlc3Bv bnNlVG9EaWN0aW9uYXJ5KHN1YnJlc291cmNlUHJvcGVydHlMaXN0LCBjd2RVUkwpOworICAgICAg ICAgICAgbm9ybWFsaXplV2ViUmVzb3VyY2VVUkwoW3N1YnJlc291cmNlUHJvcGVydHlMaXN0IG9i amVjdEZvcktleTpAIldlYlJlc291cmNlVVJMIl0pOworICAgICAgICAgICAgY29udmVydFdlYlJl c291cmNlUmVzcG9uc2VUb0RpY3Rpb25hcnkoc3VicmVzb3VyY2VQcm9wZXJ0eUxpc3QpOwogICAg ICAgICAgICAgY29udmVydFdlYlJlc291cmNlRGF0YVRvU3RyaW5nKHN1YnJlc291cmNlUHJvcGVy dHlMaXN0KTsKICAgICAgICAgfQogICAgIH0K 19447 2008-02-29 07:33:21 -0800 2008-02-29 09:54:15 -0800 Patch v2 bug-15754-v2.diff text/plain 5565 ddkilzer SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDMwNjU1KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMzIgQEAKKzIwMDgtMDItMjkgIERhdmlkIEtpbHplciAgPGRk a2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICBCdWcgMTU3NTQ6IHdlYmFyY2hpdmUgbGF5b3V0 IHRlc3RzIGZhaWwgd2hlbiBXZWJLaXQgZGlyZWN0b3J5IHBhdGggY29udGFpbnMgc3ltbGlua3MK KworICAgICAgICA8aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU3NTQ+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Ugd2Vy ZSB1c2luZyAtW05TRmlsZU1hbmFnZXIgY3VycmVudERpcmVjdG9yeVBhdGhdIHRvIGdldCB0aGUg Y3VycmVudCB3b3JraW5nIGRpcmVjdG9yeSwKKyAgICAgICAgdGhlbiByZW1vdmluZyB0aGF0IHBh dGggZnJvbSBhbGwgZmlsZTovLy8gVVJMcyBpbiB0aGUgV2ViQXJjaGl2ZSBvdXRwdXQgc28gdGhl c2UgdGVzdHMKKyAgICAgICAgd291bGQgcGFzcyBubyBtYXR0ZXIgd2hlcmUgdGhleSB3ZXJlIHJ1 bi4KKworICAgICAgICBUaGUgcHJvYmxlbSB3YXMgdGhhdCAtW05TRmlsZU1hbmFnZXIgY3VycmVu dERpcmVjdG9yeVBhdGhdIHJlc29sdmVzIHN5bWxpbmtzIGluIHRoZQorICAgICAgICBjdXJyZW50 IHdvcmtpbmcgZGlyZWN0b3J5LCBidXQgdGhlIFdlYkFyY2hpdmUgZG9lcyBub3QuICBUaGlzIGxl ZnQgdGhlIGN1cnJlbnQgd29ya2luZworICAgICAgICBkaXJlY3RvcnkgaW4gYWxsIGZpbGU6Ly8v IFVSTHMgaW4gdGhlIHRlc3Qgb3V0cHV0LCBhbmQgdGh1cyBhbGwgdGVzdHMgZmFpbGVkLCBmb3Ig YW55CisgICAgICAgIGRldmVsb3BlciB0aGF0IHVzZWQgc3ltbGlua3MgdG8gZ2V0IHRvIHRoZWly IFdlYktpdCBzb3VyY2UgZGlyZWN0b3J5LgorCisgICAgICAgIFRoZSBmaXggaXMgdG8gbG9vayBi YWNrd2FyZHMgZm9yICIvTGF5b3V0VGVzdHMvIiBpbiB0aGUgVVJMIHdlJ3JlIHBhc3NlZCwgYW5k IHNpbXBseQorICAgICAgICByZW1vdmUgdGhlIGN1cnJlbnQgd29ya2luZyBkaXJlY3RvcnkgcGF0 aCAobm8gbWF0dGVyIHdoYXQgaXQgaXMpIGFmdGVyICJmaWxlOi8vIiBidXQKKyAgICAgICAgYmVm b3JlICIvTGF5b3V0VGVzdHMvIi4gIAorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvbWFjL0R1 bXBSZW5kZXJUcmVlLm1tOgorICAgICAgICAobm9ybWFsaXplV2ViUmVzb3VyY2VVUkwpOiBSZW1v dmVkIHVudXNlZCBvbGRVUkxCYXNlIGFyZ3VtZW50LiAgV2Ugbm93IHJlcGxhY2UgdGhlCisgICAg ICAgIGN1cnJlbnQgd29ya2luZyBkaXJlY3RvcnkgYXMgZGVzY3JpYmVkIGFib3ZlLgorICAgICAg ICAoY29udmVydFdlYlJlc291cmNlUmVzcG9uc2VUb0RpY3Rpb25hcnkpOiBSZW1vdmUgdW51c2Vk IG9sZFVSTEJhc2UgYXJndW1lbnQuICBVcGRhdGUKKyAgICAgICAgY2FsbHMgdG8gbm9ybWFsaXpl V2ViUmVzb3VyY2VVUkwoKS4KKyAgICAgICAgKHNlcmlhbGl6ZVdlYkFyY2hpdmVUb1hNTCk6IFJl bW92ZWQgbm93IHVudXNlZCBjd2RVUkwgdmFyaWFibGUuICBVcGRhdGUgY2FsbHMgdG8KKyAgICAg ICAgbm9ybWFsaXplV2ViUmVzb3VyY2VVUkwoKSBhbmQgY29udmVydFdlYlJlc291cmNlUmVzcG9u c2VUb0RpY3Rpb25hcnkoKS4KKwogMjAwOC0wMi0yNiAgUm9iaW4gRHVubiA8cm9iaW5AYWxsZHVu bi5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2V2aW4gT2xsaXZpZXIuCkluZGV4OiBXZWJL aXRUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCShyZXZp c2lvbiAzMDY1NSkKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVy VHJlZS5tbQkod29ya2luZyBjb3B5KQpAQCAtNTUwLDE1ICs1NTIsMTcgQEAgc3RhdGljIHZvaWQg Y29udmVydFdlYlJlc291cmNlRGF0YVRvU3RyaQogICAgIH0KIH0KIAotc3RhdGljIHZvaWQgbm9y bWFsaXplV2ViUmVzb3VyY2VVUkwoTlNNdXRhYmxlU3RyaW5nICp3ZWJSZXNvdXJjZVVSTCwgTlNT dHJpbmcgKm9sZFVSTEJhc2UpCitzdGF0aWMgdm9pZCBub3JtYWxpemVXZWJSZXNvdXJjZVVSTChO U011dGFibGVTdHJpbmcgKndlYlJlc291cmNlVVJMKQogewotICAgIFt3ZWJSZXNvdXJjZVVSTCBy ZXBsYWNlT2NjdXJyZW5jZXNPZlN0cmluZzpvbGRVUkxCYXNlCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB3aXRoU3RyaW5nOkAiZmlsZTovLyIKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIG9wdGlvbnM6TlNMaXRlcmFsU2VhcmNoCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJhbmdlOk5TTWFrZVJhbmdlKDAsIFt3ZWJS ZXNvdXJjZVVSTCBsZW5ndGhdKV07CisgICAgc3RhdGljIGludCBmaWxlVXJsTGVuZ3RoID0gW0Ai ZmlsZTovLyIgbGVuZ3RoXTsKKyAgICBOU1JhbmdlIGxheW91dFRlc3RzV2ViQXJjaGl2ZVBhdGhS YW5nZSA9IFt3ZWJSZXNvdXJjZVVSTCByYW5nZU9mU3RyaW5nOkAiL0xheW91dFRlc3RzLyIgb3B0 aW9uczpOU0JhY2t3YXJkc1NlYXJjaF07CisgICAgaWYgKGxheW91dFRlc3RzV2ViQXJjaGl2ZVBh dGhSYW5nZS5sb2NhdGlvbiA9PSBOU05vdEZvdW5kKQorICAgICAgICByZXR1cm47CisgICAgTlNS YW5nZSBjdXJyZW50V29ya2luZ0RpcmVjdG9yeVJhbmdlID0gTlNNYWtlUmFuZ2UoZmlsZVVybExl bmd0aCwgbGF5b3V0VGVzdHNXZWJBcmNoaXZlUGF0aFJhbmdlLmxvY2F0aW9uIC0gZmlsZVVybExl bmd0aCk7CisgICAgW3dlYlJlc291cmNlVVJMIHJlcGxhY2VDaGFyYWN0ZXJzSW5SYW5nZTpjdXJy ZW50V29ya2luZ0RpcmVjdG9yeVJhbmdlIHdpdGhTdHJpbmc6QCIiXTsKIH0KIAotc3RhdGljIHZv aWQgY29udmVydFdlYlJlc291cmNlUmVzcG9uc2VUb0RpY3Rpb25hcnkoTlNNdXRhYmxlRGljdGlv bmFyeSAqcHJvcGVydHlMaXN0LCBOU1N0cmluZyAqb2xkVVJMQmFzZSkKK3N0YXRpYyB2b2lkIGNv bnZlcnRXZWJSZXNvdXJjZVJlc3BvbnNlVG9EaWN0aW9uYXJ5KE5TTXV0YWJsZURpY3Rpb25hcnkg KnByb3BlcnR5TGlzdCkKIHsKICAgICBOU1VSTFJlc3BvbnNlICpyZXNwb25zZSA9IG5pbDsKICAg ICBOU0RhdGEgKnJlc3BvbnNlRGF0YSA9IFtwcm9wZXJ0eUxpc3Qgb2JqZWN0Rm9yS2V5OkAiV2Vi UmVzb3VyY2VSZXNwb25zZSJdOyAvLyBXZWJSZXNvdXJjZVJlc3BvbnNlS2V5IGluIFdlYlJlc291 cmNlLm0KQEAgLTU3Myw3ICs1NzcsNyBAQCBzdGF0aWMgdm9pZCBjb252ZXJ0V2ViUmVzb3VyY2VS ZXNwb25zZVRvCiAgICAgTlNNdXRhYmxlRGljdGlvbmFyeSAqcmVzcG9uc2VEaWN0aW9uYXJ5ID0g W1tOU011dGFibGVEaWN0aW9uYXJ5IGFsbG9jXSBpbml0XTsKICAgICAKICAgICBOU011dGFibGVT dHJpbmcgKnVybFN0cmluZyA9IFtbW3Jlc3BvbnNlIFVSTF0gZGVzY3JpcHRpb25dIG11dGFibGVD b3B5XTsKLSAgICBub3JtYWxpemVXZWJSZXNvdXJjZVVSTCh1cmxTdHJpbmcsIG9sZFVSTEJhc2Up OworICAgIG5vcm1hbGl6ZVdlYlJlc291cmNlVVJMKHVybFN0cmluZyk7CiAgICAgW3Jlc3BvbnNl RGljdGlvbmFyeSBzZXRPYmplY3Q6dXJsU3RyaW5nIGZvcktleTpAIlVSTCJdOwogICAgIFt1cmxT dHJpbmcgcmVsZWFzZV07CiAgICAgCkBAIC02MDgsOSArNjEyLDYgQEAgc3RhdGljIE5TU3RyaW5n ICpzZXJpYWxpemVXZWJBcmNoaXZlVG9YTQogICAgIGlmICghcHJvcGVydHlMaXN0KQogICAgICAg ICByZXR1cm4gZXJyb3JTdHJpbmc7CiAKLSAgICAvLyBOb3JtYWxpemUgV2ViUmVzb3VyY2VSZXNw b25zZSBhbmQgV2ViUmVzb3VyY2VVUkwgdmFsdWVzIGluIHBsaXN0IGZvciB0ZXN0aW5nCi0gICAg TlNTdHJpbmcgKmN3ZFVSTCA9IFtAImZpbGU6Ly8iIHN0cmluZ0J5QXBwZW5kaW5nU3RyaW5nOltb W05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIGN1cnJlbnREaXJlY3RvcnlQYXRoXSBzdHJp bmdCeUV4cGFuZGluZ1RpbGRlSW5QYXRoXV07Ci0gICAgCiAgICAgTlNNdXRhYmxlQXJyYXkgKnJl c291cmNlcyA9IFtOU011dGFibGVBcnJheSBhcnJheVdpdGhDYXBhY2l0eToxXTsKICAgICBbcmVz b3VyY2VzIGFkZE9iamVjdDpwcm9wZXJ0eUxpc3RdOwogCkBAIC02MTksNyArNjIwLDcgQEAgc3Rh dGljIE5TU3RyaW5nICpzZXJpYWxpemVXZWJBcmNoaXZlVG9YTQogICAgICAgICBbcmVzb3VyY2Vz IHJlbW92ZU9iamVjdEF0SW5kZXg6MF07CiAKICAgICAgICAgTlNNdXRhYmxlRGljdGlvbmFyeSAq bWFpblJlc291cmNlID0gW3Jlc291cmNlUHJvcGVydHlMaXN0IG9iamVjdEZvcktleTpAIldlYk1h aW5SZXNvdXJjZSJdOwotICAgICAgICBub3JtYWxpemVXZWJSZXNvdXJjZVVSTChbbWFpblJlc291 cmNlIG9iamVjdEZvcktleTpAIldlYlJlc291cmNlVVJMIl0sIGN3ZFVSTCk7CisgICAgICAgIG5v cm1hbGl6ZVdlYlJlc291cmNlVVJMKFttYWluUmVzb3VyY2Ugb2JqZWN0Rm9yS2V5OkAiV2ViUmVz b3VyY2VVUkwiXSk7CiAgICAgICAgIGNvbnZlcnRXZWJSZXNvdXJjZURhdGFUb1N0cmluZyhtYWlu UmVzb3VyY2UpOwogCiAgICAgICAgIC8vIEFkZCBzdWJmcmFtZUFyY2hpdmVzIHRvIGxpc3QgZm9y IHByb2Nlc3NpbmcKQEAgLTYzMSw4ICs2MzIsOCBAQCBzdGF0aWMgTlNTdHJpbmcgKnNlcmlhbGl6 ZVdlYkFyY2hpdmVUb1hNCiAgICAgICAgIE5TRW51bWVyYXRvciAqZW51bWVyYXRvciA9IFtzdWJy ZXNvdXJjZXMgb2JqZWN0RW51bWVyYXRvcl07CiAgICAgICAgIE5TTXV0YWJsZURpY3Rpb25hcnkg KnN1YnJlc291cmNlUHJvcGVydHlMaXN0OwogICAgICAgICB3aGlsZSAoKHN1YnJlc291cmNlUHJv cGVydHlMaXN0ID0gW2VudW1lcmF0b3IgbmV4dE9iamVjdF0pKSB7Ci0gICAgICAgICAgICBub3Jt YWxpemVXZWJSZXNvdXJjZVVSTChbc3VicmVzb3VyY2VQcm9wZXJ0eUxpc3Qgb2JqZWN0Rm9yS2V5 OkAiV2ViUmVzb3VyY2VVUkwiXSwgY3dkVVJMKTsKLSAgICAgICAgICAgIGNvbnZlcnRXZWJSZXNv dXJjZVJlc3BvbnNlVG9EaWN0aW9uYXJ5KHN1YnJlc291cmNlUHJvcGVydHlMaXN0LCBjd2RVUkwp OworICAgICAgICAgICAgbm9ybWFsaXplV2ViUmVzb3VyY2VVUkwoW3N1YnJlc291cmNlUHJvcGVy dHlMaXN0IG9iamVjdEZvcktleTpAIldlYlJlc291cmNlVVJMIl0pOworICAgICAgICAgICAgY29u dmVydFdlYlJlc291cmNlUmVzcG9uc2VUb0RpY3Rpb25hcnkoc3VicmVzb3VyY2VQcm9wZXJ0eUxp c3QpOwogICAgICAgICAgICAgY29udmVydFdlYlJlc291cmNlRGF0YVRvU3RyaW5nKHN1YnJlc291 cmNlUHJvcGVydHlMaXN0KTsKICAgICAgICAgfQogICAgIH0K