150481 2015-10-22 16:53:15 -0700 Navigations on the same host (but with different schemes and ports) should not trigger universal links 2015-10-23 09:35:27 -0700 1 1 1 Unclassified WebKit WebKit API WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sam sam oldest_to_newest 1135898 0 sam 2015-10-22 16:53:15 -0700 Navigating from a page on http://foo.com to a page on https://foo.com should not trigger app links. 1135899 1 sam 2015-10-22 16:55:04 -0700 <rdar://problem/22811325> 1135902 2 263880 sam 2015-10-22 17:05:38 -0700 Created attachment 263880 Patch 1135905 3 sam 2015-10-22 17:10:01 -0700 Committed r191487: <http://trac.webkit.org/changeset/191487> 1136057 4 263880 darin 2015-10-23 09:35:27 -0700 Comment on attachment 263880 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=263880&action=review > Source/WebCore/platform/URL.cpp:1612 > + for (int i = 0; i < hostLengthA; ++i) { > + if (a.string()[hostStartA + i] != b.string()[hostStartB + i]) > + return false; > + } No ASCII case folding? Should consider using StringView::substring rather than writing out the loop. Might even want URL member functions that return StringView for pieces of the URL like the host in place inside the URL. 263880 2015-10-22 17:05:38 -0700 2015-10-22 17:07:42 -0700 Patch bug-150481-20151022170454.patch text/plain 17054 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5MTQ4NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE1LTEwLTIyICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTmF2aWdhdGlvbnMgb24gdGhlIHNhbWUg aG9zdCAoYnV0IHdpdGggZGlmZmVyZW50IHNjaGVtZXMgYW5kIHBvcnRzKSBzaG91bGQgbm90IHRy aWdnZXIgdW5pdmVyc2FsIGxpbmtzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMjgxMTMyNT4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDQ4MQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBuZXcg aGVscGVyIHdoaWNoIGVmZmljaWVudGx5IGNvbXBhcmVzIHRoZSBob3N0cyBvZiB0d28gVVJMcy4K KworICAgICAgICAqIHBsYXRmb3JtL1VSTC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpob3N0c0Fy ZUVxdWFsKToKKyAgICAgICAgKiBwbGF0Zm9ybS9VUkwuaDoKKwogMjAxNS0xMC0yMiAgSm9zZXBo IFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IFJlbW92ZSB1bnVzZWQgVGltZWxpbmUgR0NFdmVudCBSZWNvcmQgdHlwZQpJbmRleDogU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vVVJMLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9VUkwuY3BwCShyZXZpc2lvbiAxOTE0ODYpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9VUkwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTk3LDYgKzE1OTcsMjMgQEAgYm9vbCBw cm90b2NvbEhvc3RBbmRQb3J0QXJlRXF1YWwoY29uc3QgVQogICAgIHJldHVybiB0cnVlOwogfQog Citib29sIGhvc3RzQXJlRXF1YWwoY29uc3QgVVJMJiBhLCBjb25zdCBVUkwmIGIpCit7CisgICAg aW50IGhvc3RTdGFydEEgPSBhLmhvc3RTdGFydCgpOworICAgIGludCBob3N0TGVuZ3RoQSA9IGEu aG9zdEVuZCgpIC0gaG9zdFN0YXJ0QTsKKyAgICBpbnQgaG9zdFN0YXJ0QiA9IGIuaG9zdFN0YXJ0 KCk7CisgICAgaW50IGhvc3RMZW5ndGhCID0gYi5ob3N0RW5kKCkgLSBob3N0U3RhcnRCOworICAg IGlmIChob3N0TGVuZ3RoQSAhPSBob3N0TGVuZ3RoQikKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor CisgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBob3N0TGVuZ3RoQTsgKytpKSB7CisgICAgICAgIGlm IChhLnN0cmluZygpW2hvc3RTdGFydEEgKyBpXSAhPSBiLnN0cmluZygpW2hvc3RTdGFydEIgKyBp XSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICByZXR1cm4gdHJ1ZTsK K30KKwogU3RyaW5nIGVuY29kZVdpdGhVUkxFc2NhcGVTZXF1ZW5jZXMoY29uc3QgU3RyaW5nJiBu b3RFbmNvZGVkU3RyaW5nLCBQZXJjZW50RW5jb2RlQ2hhcmFjdGVyQ2xhc3Mgd2hhdFRvRW5jb2Rl KQogewogICAgIENTdHJpbmcgYXNVVEY4ID0gbm90RW5jb2RlZFN0cmluZy51dGY4KCk7CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9VUkwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9VUkwuaAkocmV2aXNpb24gMTkxNDg2KQorKysgU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vVVJMLmgJKHdvcmtpbmcgY29weSkKQEAgLTIzMyw2ICsyMzMsNyBAQCBib29sIG9w ZXJhdG9yIT0oY29uc3QgU3RyaW5nJiwgY29uc3QgVVJMCiAKIFdFQkNPUkVfRVhQT1JUIGJvb2wg ZXF1YWxJZ25vcmluZ0ZyYWdtZW50SWRlbnRpZmllcihjb25zdCBVUkwmLCBjb25zdCBVUkwmKTsK IFdFQkNPUkVfRVhQT1JUIGJvb2wgcHJvdG9jb2xIb3N0QW5kUG9ydEFyZUVxdWFsKGNvbnN0IFVS TCYsIGNvbnN0IFVSTCYpOworV0VCQ09SRV9FWFBPUlQgYm9vbCBob3N0c0FyZUVxdWFsKGNvbnN0 IFVSTCYsIGNvbnN0IFVSTCYpOwogCiBXRUJDT1JFX0VYUE9SVCBjb25zdCBVUkwmIGJsYW5rVVJM KCk7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5MTQ4NikKKysrIFNvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE1LTEwLTIyICBT YW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTmF2aWdhdGlvbnMgb24gdGhl IHNhbWUgaG9zdCAoYnV0IHdpdGggZGlmZmVyZW50IHNjaGVtZXMgYW5kIHBvcnRzKSBzaG91bGQg bm90IHRyaWdnZXIgdW5pdmVyc2FsIGxpbmtzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMjgx MTMyNT4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1 MDQ4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVw ZGF0ZSB0aGUgcG9saWN5IGZvciBmb2xsb3dpbmcgdW5pdmVyc2FsIGxpbmtzIHRvIG9ubHkgdGFr ZSBob3N0IGludG8gY29uc2lkZXJhdGlvbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9X S1BhZ2UuY3BwOgorICAgICAgICAoV0tQYWdlU2V0UGFnZVVJQ2xpZW50KToKKyAgICAgICAgKiBV SVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbToKKyAgICAgICAgKFdlYktpdDo6VUlEZWxlZ2F0 ZTo6VUlDbGllbnQ6OmNyZWF0ZU5ld1BhZ2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZv ck5hdmlnYXRpb25BY3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRlY2lk ZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94 eTo6Y3JlYXRlTmV3UGFnZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2hvd1Bh Z2UpOgorCiAyMDE1LTEwLTIyICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+ CiAKICAgICAgICAgU2ltcGxpZnkgbWVudSBjcmVhdGlvbgpJbmRleDogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDE5MTQ4NikKKysrIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMzAx LDcgKzMzMDEsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhCiAg ICAgICAgIGVsc2UgaWYgKG9yaWdpbmF0aW5nRnJhbWUpCiAgICAgICAgICAgICBzb3VyY2VGcmFt ZUluZm8gPSBBUEk6OkZyYW1lSW5mbzo6Y3JlYXRlKCpvcmlnaW5hdGluZ0ZyYW1lLCBvcmlnaW5h dGluZ0ZyYW1lU2VjdXJpdHlPcmlnaW4uc2VjdXJpdHlPcmlnaW4oKSk7CiAKLSAgICAgICAgYm9v bCBzaG91bGRPcGVuQXBwTGlua3MgPSAhbV9zaG91bGRTdXBwcmVzc0FwcExpbmtzSW5OZXh0TmF2 aWdhdGlvblBvbGljeURlY2lzaW9uICYmICghZGVzdGluYXRpb25GcmFtZUluZm8gfHwgZGVzdGlu YXRpb25GcmFtZUluZm8tPmlzTWFpbkZyYW1lKCkpICYmICFwcm90b2NvbEhvc3RBbmRQb3J0QXJl RXF1YWwoVVJMKFBhcnNlZFVSTFN0cmluZywgbV9tYWluRnJhbWUtPnVybCgpKSwgcmVxdWVzdC51 cmwoKSk7CisgICAgICAgIGJvb2wgc2hvdWxkT3BlbkFwcExpbmtzID0gIW1fc2hvdWxkU3VwcHJl c3NBcHBMaW5rc0luTmV4dE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbiAmJiAoIWRlc3RpbmF0aW9u RnJhbWVJbmZvIHx8IGRlc3RpbmF0aW9uRnJhbWVJbmZvLT5pc01haW5GcmFtZSgpKSAmJiAhaG9z dHNBcmVFcXVhbChVUkwoUGFyc2VkVVJMU3RyaW5nLCBtX21haW5GcmFtZS0+dXJsKCkpLCByZXF1 ZXN0LnVybCgpKTsKIAogICAgICAgICBhdXRvIG5hdmlnYXRpb25BY3Rpb24gPSBBUEk6Ok5hdmln YXRpb25BY3Rpb246OmNyZWF0ZShuYXZpZ2F0aW9uQWN0aW9uRGF0YSwgc291cmNlRnJhbWVJbmZv LmdldCgpLCBkZXN0aW5hdGlvbkZyYW1lSW5mby5nZXQoKSwgcmVxdWVzdCwgb3JpZ2luYWxSZXF1 ZXN0LnVybCgpLCBzaG91bGRPcGVuQXBwTGlua3MpOwogCkBAIC0zMzM1LDcgKzMzMzUsNyBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yTmV3V2luCiAgICAgICAgIGlmIChmcmFt ZSkKICAgICAgICAgICAgIHNvdXJjZUZyYW1lSW5mbyA9IEFQSTo6RnJhbWVJbmZvOjpjcmVhdGUo KmZyYW1lLCBmcmFtZVNlY3VyaXR5T3JpZ2luLnNlY3VyaXR5T3JpZ2luKCkpOwogCi0gICAgICAg IGJvb2wgc2hvdWxkT3BlbkFwcExpbmtzID0gIXByb3RvY29sSG9zdEFuZFBvcnRBcmVFcXVhbChV UkwoUGFyc2VkVVJMU3RyaW5nLCBtX21haW5GcmFtZS0+dXJsKCkpLCByZXF1ZXN0LnVybCgpKTsK KyAgICAgICAgYm9vbCBzaG91bGRPcGVuQXBwTGlua3MgPSAhaG9zdHNBcmVFcXVhbChVUkwoUGFy c2VkVVJMU3RyaW5nLCBtX21haW5GcmFtZS0+dXJsKCkpLCByZXF1ZXN0LnVybCgpKTsKICAgICAg ICAgYXV0byBuYXZpZ2F0aW9uQWN0aW9uID0gQVBJOjpOYXZpZ2F0aW9uQWN0aW9uOjpjcmVhdGUo bmF2aWdhdGlvbkFjdGlvbkRhdGEsIHNvdXJjZUZyYW1lSW5mby5nZXQoKSwgbnVsbHB0ciwgcmVx dWVzdCwgcmVxdWVzdC51cmwoKSwgc2hvdWxkT3BlbkFwcExpbmtzKTsKIAogICAgICAgICBtX25h dmlnYXRpb25DbGllbnQtPmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oKnRoaXMsIG5h dmlnYXRpb25BY3Rpb24uZ2V0KCksIFdURjo6bW92ZShsaXN0ZW5lciksIG1fcHJvY2Vzcy0+dHJh bnNmb3JtSGFuZGxlc1RvT2JqZWN0cyh1c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkpOwpAQCAtMzUw Niw3ICszNTA2LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmNyZWF0ZU5ld1BhZ2UodWludDY0Xwog ICAgIG5ld1BhZ2VQYXJhbWV0ZXJzID0gbmV3UGFnZS0+Y3JlYXRpb25QYXJhbWV0ZXJzKCk7CiAK ICAgICBXZWJzaXRlRGF0YVN0b3JlOjpjbG9uZVNlc3Npb25EYXRhKCp0aGlzLCAqbmV3UGFnZSk7 Ci0gICAgbmV3UGFnZS0+bV9zaG91bGRTdXBwcmVzc0FwcExpbmtzSW5OZXh0TmF2aWdhdGlvblBv bGljeURlY2lzaW9uID0gcHJvdG9jb2xIb3N0QW5kUG9ydEFyZUVxdWFsKFVSTChQYXJzZWRVUkxT dHJpbmcsIG1haW5GcmFtZVVSTCksIHJlcXVlc3QudXJsKCkpOworICAgIG5ld1BhZ2UtPm1fc2hv dWxkU3VwcHJlc3NBcHBMaW5rc0luTmV4dE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbiA9IGhvc3Rz QXJlRXF1YWwoVVJMKFBhcnNlZFVSTFN0cmluZywgbWFpbkZyYW1lVVJMKSwgcmVxdWVzdC51cmwo KSk7CiB9CiAgICAgCiB2b2lkIFdlYlBhZ2VQcm94eTo6c2hvd1BhZ2UoKQpJbmRleDogU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAJKHJldmlzaW9uIDE5MTQ4NikKKysr IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xNTc5LDcgKzE1NzksNyBAQCB2b2lkIFdLUGFnZVNldFBhZ2VVSUNsaWVudChXS1BhZ2VS ZWYgcGFnCiAKICAgICAgICAgICAgIGF1dG8gc291cmNlRnJhbWVJbmZvID0gQVBJOjpGcmFtZUlu Zm86OmNyZWF0ZSgqaW5pdGlhdGluZ0ZyYW1lLCBzZWN1cml0eU9yaWdpbkRhdGEuc2VjdXJpdHlP cmlnaW4oKSk7CiAKLSAgICAgICAgICAgIGJvb2wgc2hvdWxkT3BlbkFwcExpbmtzID0gIXByb3Rv Y29sSG9zdEFuZFBvcnRBcmVFcXVhbChXZWJDb3JlOjpVUkwoV2ViQ29yZTo6UGFyc2VkVVJMU3Ry aW5nLCBpbml0aWF0aW5nRnJhbWUtPnVybCgpKSwgcmVzb3VyY2VSZXF1ZXN0LnVybCgpKTsKKyAg ICAgICAgICAgIGJvb2wgc2hvdWxkT3BlbkFwcExpbmtzID0gIWhvc3RzQXJlRXF1YWwoV2ViQ29y ZTo6VVJMKFdlYkNvcmU6OlBhcnNlZFVSTFN0cmluZywgaW5pdGlhdGluZ0ZyYW1lLT51cmwoKSks IHJlc291cmNlUmVxdWVzdC51cmwoKSk7CiAgICAgICAgICAgICBhdXRvIGFwaU5hdmlnYXRpb25B Y3Rpb24gPSBBUEk6Ok5hdmlnYXRpb25BY3Rpb246OmNyZWF0ZShuYXZpZ2F0aW9uQWN0aW9uRGF0 YSwgc291cmNlRnJhbWVJbmZvLnB0cigpLCBudWxscHRyLCByZXNvdXJjZVJlcXVlc3QsIFdlYkNv cmU6OlVSTCgpLCBzaG91bGRPcGVuQXBwTGlua3MpOwogCiAgICAgICAgICAgICBhdXRvIGFwaVdp bmRvd0ZlYXR1cmVzID0gQVBJOjpXaW5kb3dGZWF0dXJlczo6Y3JlYXRlKHdpbmRvd0ZlYXR1cmVz KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1t CShyZXZpc2lvbiAxOTE0ODYpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvVUlE ZWxlZ2F0ZS5tbQkod29ya2luZyBjb3B5KQpAQCAtMTExLDcgKzExMSw3IEBAIFBhc3NSZWZQdHI8 V2ViS2l0OjpXZWJQYWdlUHJveHk+IFVJRGVsZWcKIAogICAgIGF1dG8gc291cmNlRnJhbWVJbmZv ID0gQVBJOjpGcmFtZUluZm86OmNyZWF0ZSgqaW5pdGlhdGluZ0ZyYW1lLCBzZWN1cml0eU9yaWdp bkRhdGEuc2VjdXJpdHlPcmlnaW4oKSk7CiAKLSAgICBib29sIHNob3VsZE9wZW5BcHBMaW5rcyA9 ICFwcm90b2NvbEhvc3RBbmRQb3J0QXJlRXF1YWwoV2ViQ29yZTo6VVJMKFdlYkNvcmU6OlBhcnNl ZFVSTFN0cmluZywgaW5pdGlhdGluZ0ZyYW1lLT51cmwoKSksIHJlcXVlc3QudXJsKCkpOworICAg IGJvb2wgc2hvdWxkT3BlbkFwcExpbmtzID0gIWhvc3RzQXJlRXF1YWwoV2ViQ29yZTo6VVJMKFdl YkNvcmU6OlBhcnNlZFVSTFN0cmluZywgaW5pdGlhdGluZ0ZyYW1lLT51cmwoKSksIHJlcXVlc3Qu dXJsKCkpOwogICAgIGF1dG8gYXBpTmF2aWdhdGlvbkFjdGlvbiA9IEFQSTo6TmF2aWdhdGlvbkFj dGlvbjo6Y3JlYXRlKG5hdmlnYXRpb25BY3Rpb25EYXRhLCBzb3VyY2VGcmFtZUluZm8ucHRyKCks IG51bGxwdHIsIHJlcXVlc3QsIFdlYkNvcmU6OlVSTCgpLCBzaG91bGRPcGVuQXBwTGlua3MpOwog CiAgICAgYXV0byBhcGlXaW5kb3dGZWF0dXJlcyA9IEFQSTo6V2luZG93RmVhdHVyZXM6OmNyZWF0 ZSh3aW5kb3dGZWF0dXJlcyk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxOTE0ODYp CisrKyBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwxNSBAQAorMjAxNS0xMC0yMiAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgorCisgICAg ICAgIE5hdmlnYXRpb25zIG9uIHRoZSBzYW1lIGhvc3QgKGJ1dCB3aXRoIGRpZmZlcmVudCBzY2hl bWVzIGFuZCBwb3J0cykgc2hvdWxkIG5vdCB0cmlnZ2VyIHVuaXZlcnNhbCBsaW5rcworICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMjI4MTEzMjU+CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNTA0ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50 Lm1tOgorICAgICAgICAoc2hvdWxkVHJ5QXBwTGluayk6CisgICAgICAgIFVwZGF0ZSB0aGUgcG9s aWN5IGZvciBmb2xsb3dpbmcgdW5pdmVyc2FsIGxpbmtzIHRvIG9ubHkgdGFrZSBob3N0IGludG8g Y29uc2lkZXJhdGlvbi4KKwogMjAxNS0xMC0yMiAgR29yZG9uIFNoZXJpZGFuICA8Z29yZG9uX3No ZXJpZGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggYnVpbGQgZm9yIGNsYW5nLTcwMC4wLjU5 LjUgYnkgcmVwbGFjaW5nIGRlcHJlY2F0ZWQgY2FsbHMgdG8gY29udmVydCBwb2ludHMgYmV0d2Vl biBzY3JlZW4gYW5kIHdpbmRvdyBjb29yZGluYXRlcyBmb3IgTWFjLgpJbmRleDogU291cmNlL1dl YktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGll bnQubW0JKHJldmlzaW9uIDE5MTQ4NikKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBw b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC04ODcsNyArODg3 LDcgQEAgc3RhdGljIEJPT0wgc2hvdWxkVHJ5QXBwTGluayhXZWJWaWV3ICp3ZQogICAgIGlmICgh YWN0aW9uLnByb2Nlc3NpbmdVc2VyR2VzdHVyZSgpKQogICAgICAgICByZXR1cm4gTk87CiAKLSAg ICBpZiAodGFyZ2V0RnJhbWUgJiYgdGFyZ2V0RnJhbWUtPmRvY3VtZW50KCkgJiYgcHJvdG9jb2xI b3N0QW5kUG9ydEFyZUVxdWFsKHRhcmdldEZyYW1lLT5kb2N1bWVudCgpLT51cmwoKSwgYWN0aW9u LnVybCgpKSkKKyAgICBpZiAodGFyZ2V0RnJhbWUgJiYgdGFyZ2V0RnJhbWUtPmRvY3VtZW50KCkg JiYgaG9zdHNBcmVFcXVhbCh0YXJnZXRGcmFtZS0+ZG9jdW1lbnQoKS0+dXJsKCksIGFjdGlvbi51 cmwoKSkpCiAgICAgICAgIHJldHVybiBOTzsKIAogICAgIHJldHVybiBZRVM7CkluZGV4OiBUb29s cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxOTE0 ODYpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAor MjAxNS0xMC0yMiAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgorCisgICAgICAgIE5hdmln YXRpb25zIG9uIHRoZSBzYW1lIGhvc3QgKGJ1dCB3aXRoIGRpZmZlcmVudCBzY2hlbWVzIGFuZCBw b3J0cykgc2hvdWxkIG5vdCB0cmlnZ2VyIHVuaXZlcnNhbCBsaW5rcworICAgICAgICA8cmRhcjov L3Byb2JsZW0vMjI4MTEzMjU+CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNTA0ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0MkNvY29hL1Nob3VsZE9wZW5F eHRlcm5hbFVSTHNJbk5ld1dpbmRvd0FjdGlvbnMubW06CisgICAgICAgIFVwZGF0ZSB0ZXN0IHRv IHRlc3QgdGhhdCBuYXZpZ2F0aW9ucyBvbiB0aGUgc2FtZSBob3N0IGJ1dCB3aXRoIGRpZmZlcmVu dCBzY2hlbWVzIGRvZXMgbm90CisgICAgICAgIHRyaWdnZXIgdW5pdmVyc2FsIGxpbmtzLCBidXQg dGhhdCBjaGFuZ2VzIGluIHRoZSBob3N0IGRvLgorCiAyMDE1LTEwLTIyICBSeW9zdWtlIE5pd2Eg IDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIxODE5NzIpOiBTY3Jv bGwgcG9zaXRpb24gY2hhbmdlcyB0byB0b3Agb2YgeW91dHViZSBwYWdlIHdoZW4gc3dpdGNoaW5n IHRhYnMKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0MkNvY29hL1Nob3Vs ZE9wZW5FeHRlcm5hbFVSTHNJbk5ld1dpbmRvd0FjdGlvbnMubW0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyQ29jb2EvU2hvdWxkT3BlbkV4dGVybmFsVVJM c0luTmV3V2luZG93QWN0aW9ucy5tbQkocmV2aXNpb24gMTkxNDg2KQorKysgVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXQyQ29jb2EvU2hvdWxkT3BlbkV4dGVybmFsVVJMc0luTmV3V2lu ZG93QWN0aW9ucy5tbQkod29ya2luZyBjb3B5KQpAQCAtODAsNyArODAsNyBAQCBURVNUKFdlYktp dDIsIFNob3VsZE9wZW5FeHRlcm5hbFVSTHNJbldpCiAgICAgW3dlYlZpZXcgc2V0TmF2aWdhdGlv bkRlbGVnYXRlOmNvbnRyb2xsZXIuZ2V0KCldOwogICAgIFt3ZWJWaWV3IHNldFVJRGVsZWdhdGU6 Y29udHJvbGxlci5nZXQoKV07CiAKLSAgICBbd2ViVmlldyBsb2FkSFRNTFN0cmluZzpAIjxib2R5 IG9uY2xpY2s9XCJ3aW5kb3cub3BlbignaHR0cDovL3dlYmtpdC5vcmcvZGVzdGluYXRpb24nKVwi PiIgYmFzZVVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImh0dHA6Ly93ZWJraXQub3JnIl1dOwor ICAgIFt3ZWJWaWV3IGxvYWRIVE1MU3RyaW5nOkAiPGJvZHkgb25jbGljaz1cIndpbmRvdy5vcGVu KCdodHRwczovL3dlYmtpdC5vcmcvZGVzdGluYXRpb24nKVwiPiIgYmFzZVVSTDpbTlNVUkwgVVJM V2l0aFN0cmluZzpAImh0dHA6Ly93ZWJraXQub3JnIl1dOwogICAgIFRlc3RXZWJLaXRBUEk6OlV0 aWw6OnJ1bigmZmluaXNoZWROYXZpZ2F0aW9uKTsKICAgICBmaW5pc2hlZE5hdmlnYXRpb24gPSBm YWxzZTsKIApAQCAtOTEsNyArOTEsNyBAQCBURVNUKFdlYktpdDIsIFNob3VsZE9wZW5FeHRlcm5h bFVSTHNJbldpCiAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZjcmVhdGVkV2ViVmlldyk7 CiAgICAgY3JlYXRlZFdlYlZpZXcgPSBmYWxzZTsKIAotICAgIC8vIFVzZXItaW5pdGlhdGVkIHdp bmRvdy5vcGVuIHRvIHRoZSBzYW1lIHNjaGVtZSwgaG9zdCBhbmQgcG9ydCBzaG91bGQgYWxsb3cg ZXh0ZXJuYWwgc2NoZW1lcyBidXQgbm90IEFwcCBMaW5rcy4KKyAgICAvLyBVc2VyLWluaXRpYXRl ZCB3aW5kb3cub3BlbiB0byB0aGUgc2FtZSBob3N0IHNob3VsZCBhbGxvdyBleHRlcm5hbCBzY2hl bWVzIGJ1dCBub3QgQXBwIExpbmtzLgogICAgIEFTU0VSVF9UUlVFKFthY3Rpb24gX3Nob3VsZE9w ZW5FeHRlcm5hbFNjaGVtZXNdKTsKICAgICBBU1NFUlRfRkFMU0UoW2FjdGlvbiBfc2hvdWxkT3Bl bkFwcExpbmtzXSk7CiAKQEAgLTEwMCwxMSArMTAwLDExIEBAIFRFU1QoV2ViS2l0MiwgU2hvdWxk T3BlbkV4dGVybmFsVVJMc0luV2kKICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRlY2lk ZWRQb2xpY3kpOwogICAgIGRlY2lkZWRQb2xpY3kgPSBmYWxzZTsKIAotICAgIC8vIFVzZXItaW5p dGlhdGVkIHdpbmRvdy5vcGVuIHRvIHRoZSBzYW1lIHNjaGVtZSwgaG9zdCBhbmQgcG9ydCBzaG91 bGQgYWxsb3cgZXh0ZXJuYWwgc2NoZW1lcyBidXQgbm90IEFwcCBMaW5rcy4KKyAgICAvLyBVc2Vy LWluaXRpYXRlZCB3aW5kb3cub3BlbiB0byB0aGUgc2FtZSBob3N0IHNob3VsZCBhbGxvdyBleHRl cm5hbCBzY2hlbWVzIGJ1dCBub3QgQXBwIExpbmtzLgogICAgIEFTU0VSVF9UUlVFKFthY3Rpb24g X3Nob3VsZE9wZW5FeHRlcm5hbFNjaGVtZXNdKTsKICAgICBBU1NFUlRfRkFMU0UoW2FjdGlvbiBf c2hvdWxkT3BlbkFwcExpbmtzXSk7CiAKLSAgICBbd2ViVmlldyBsb2FkSFRNTFN0cmluZzpAIjxi b2R5IG9uY2xpY2s9XCJ3aW5kb3cub3BlbignaHR0cHM6Ly93ZWJraXQub3JnL2Rlc3RpbmF0aW9u JylcIj4iIGJhc2VVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJodHRwOi8vd2Via2l0Lm9yZyJd XTsKKyAgICBbd2ViVmlldyBsb2FkSFRNTFN0cmluZzpAIjxib2R5IG9uY2xpY2s9XCJ3aW5kb3cu b3BlbignaHR0cDovL2FwcGxlLmNvbS9kZXN0aW5hdGlvbicpXCI+IiBiYXNlVVJMOltOU1VSTCBV UkxXaXRoU3RyaW5nOkAiaHR0cDovL3dlYmtpdC5vcmciXV07CiAgICAgVGVzdFdlYktpdEFQSTo6 VXRpbDo6cnVuKCZmaW5pc2hlZE5hdmlnYXRpb24pOwogICAgIGZpbmlzaGVkTmF2aWdhdGlvbiA9 IGZhbHNlOwogCkBAIC0xMTMsNyArMTEzLDcgQEAgVEVTVChXZWJLaXQyLCBTaG91bGRPcGVuRXh0 ZXJuYWxVUkxzSW5XaQogICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmY3JlYXRlZFdlYlZp ZXcpOwogICAgIGNyZWF0ZWRXZWJWaWV3ID0gZmFsc2U7CiAKLSAgICAvLyBVc2VyLWluaXRpYXRl ZCB3aW5kb3cub3BlbiB0byBkaWZmZXJlbnQgc2NoZW1lLCBob3N0IG9yIHBvcnQgc2hvdWxkIGFs bG93IGV4dGVybmFsIHNjaGVtZXMgYW5kIEFwcCBMaW5rcy4KKyAgICAvLyBVc2VyLWluaXRpYXRl ZCB3aW5kb3cub3BlbiB0byBkaWZmZXJlbnQgaG9zdCBzaG91bGQgYWxsb3cgZXh0ZXJuYWwgc2No ZW1lcyBhbmQgQXBwIExpbmtzLgogICAgIEFTU0VSVF9UUlVFKFthY3Rpb24gX3Nob3VsZE9wZW5F eHRlcm5hbFNjaGVtZXNdKTsKICAgICBBU1NFUlRfVFJVRShbYWN0aW9uIF9zaG91bGRPcGVuQXBw TGlua3NdKTsKIApAQCAtMTIyLDcgKzEyMiw3IEBAIFRFU1QoV2ViS2l0MiwgU2hvdWxkT3BlbkV4 dGVybmFsVVJMc0luV2kKICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRlY2lkZWRQb2xp Y3kpOwogICAgIGRlY2lkZWRQb2xpY3kgPSBmYWxzZTsKIAotICAgIC8vIFVzZXItaW5pdGlhdGVk IHdpbmRvdy5vcGVuIHRvIGRpZmZlcmVudCBzY2hlbWUsIGhvc3Qgb3IgcG9ydCBzaG91bGQgYWxs b3cgZXh0ZXJuYWwgc2NoZW1lcyBhbmQgQXBwIExpbmtzLgorICAgIC8vIFVzZXItaW5pdGlhdGVk IHdpbmRvdy5vcGVuIHRvIGRpZmZlcmVudCBob3N0IHNob3VsZCBhbGxvdyBleHRlcm5hbCBzY2hl bWVzIGFuZCBBcHAgTGlua3MuCiAgICAgQVNTRVJUX1RSVUUoW2FjdGlvbiBfc2hvdWxkT3BlbkV4 dGVybmFsU2NoZW1lc10pOwogICAgIEFTU0VSVF9UUlVFKFthY3Rpb24gX3Nob3VsZE9wZW5BcHBM aW5rc10pOwogCkBAIC0xNDEsNyArMTQxLDcgQEAgVEVTVChXZWJLaXQyLCBTaG91bGRPcGVuRXh0 ZXJuYWxVUkxzSW5UYQogICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpjb250cm9s bGVyLmdldCgpXTsKICAgICBbd2ViVmlldyBzZXRVSURlbGVnYXRlOmNvbnRyb2xsZXIuZ2V0KCld OwogCi0gICAgW3dlYlZpZXcgbG9hZEhUTUxTdHJpbmc6QCI8YSBzdHlsZT1cImRpc3BsYXk6IGJs b2NrOyBoZWlnaHQ6IDEwMCVcIiBocmVmPVwiZGVzdGluYXRpb24uaHRtbFwiIHRhcmdldD1cIl9i bGFua1wiPiIgYmFzZVVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImh0dHA6Ly93ZWJraXQub3Jn Il1dOworICAgIFt3ZWJWaWV3IGxvYWRIVE1MU3RyaW5nOkAiPGEgc3R5bGU9XCJkaXNwbGF5OiBi bG9jazsgaGVpZ2h0OiAxMDAlXCIgaHJlZj1cImh0dHBzOi8vd2Via2l0Lm9yZy9kZXN0aW5hdGlv bi5odG1sXCIgdGFyZ2V0PVwiX2JsYW5rXCI+IiBiYXNlVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5n OkAiaHR0cDovL3dlYmtpdC5vcmciXV07CiAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZm aW5pc2hlZE5hdmlnYXRpb24pOwogICAgIGZpbmlzaGVkTmF2aWdhdGlvbiA9IGZhbHNlOwogCkBA IC0xNTMsMTQgKzE1MywxNCBAQCBURVNUKFdlYktpdDIsIFNob3VsZE9wZW5FeHRlcm5hbFVSTHNJ blRhCiAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkZWNpZGVkUG9saWN5KTsKICAgICBk ZWNpZGVkUG9saWN5ID0gZmFsc2U7CiAKLSAgICAvLyBVc2VyLWluaXRpYXRlZCB0YXJnZXRlZCBu YXZpZ2F0aW9uIHRvIHRoZSBzYW1lIHNjaGVtZSwgaG9zdCBhbmQgcG9ydCBzaG91bGQgYWxsb3cg ZXh0ZXJuYWwgc2NoZW1lcyBidXQgbm90IEFwcCBMaW5rcy4KKyAgICAvLyBVc2VyLWluaXRpYXRl ZCB0YXJnZXRlZCBuYXZpZ2F0aW9uIHRvIHRoZSBzYW1lIGhvc3Qgc2hvdWxkIGFsbG93IGV4dGVy bmFsIHNjaGVtZXMgYnV0IG5vdCBBcHAgTGlua3MuCiAgICAgQVNTRVJUX1RSVUUoW2FjdGlvbiBf c2hvdWxkT3BlbkV4dGVybmFsU2NoZW1lc10pOwogICAgIEFTU0VSVF9GQUxTRShbYWN0aW9uIF9z aG91bGRPcGVuQXBwTGlua3NdKTsKIAogICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmY3Jl YXRlZFdlYlZpZXcpOwogICAgIGNyZWF0ZWRXZWJWaWV3ID0gZmFsc2U7CiAKLSAgICAvLyBVc2Vy LWluaXRpYXRlZCB0YXJnZXRlZCBuYXZpZ2F0aW9uIHRvIHRoZSBzYW1lIHNjaGVtZSwgaG9zdCBh bmQgcG9ydCBzaG91bGQgYWxsb3cgZXh0ZXJuYWwgc2NoZW1lcyBidXQgbm90IEFwcCBMaW5rcy4K KyAgICAvLyBVc2VyLWluaXRpYXRlZCB0YXJnZXRlZCBuYXZpZ2F0aW9uIHRvIHRoZSBzYW1lIGhv c3Qgc2hvdWxkIGFsbG93IGV4dGVybmFsIHNjaGVtZXMgYnV0IG5vdCBBcHAgTGlua3MuCiAgICAg QVNTRVJUX1RSVUUoW2FjdGlvbiBfc2hvdWxkT3BlbkV4dGVybmFsU2NoZW1lc10pOwogICAgIEFT U0VSVF9GQUxTRShbYWN0aW9uIF9zaG91bGRPcGVuQXBwTGlua3NdKTsKIApAQCAtMTY5LDExICsx NjksMTEgQEAgVEVTVChXZWJLaXQyLCBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzSW5UYQogICAgIFRl c3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZGVjaWRlZFBvbGljeSk7CiAgICAgZGVjaWRlZFBvbGlj eSA9IGZhbHNlOwogCi0gICAgLy8gVXNlci1pbml0aWF0ZWQgdGFyZ2V0ZWQgbmF2aWdhdGlvbiB0 byB0aGUgc2FtZSBzY2hlbWUsIGhvc3QgYW5kIHBvcnQgc2hvdWxkIGFsbG93IGV4dGVybmFsIHNj aGVtZXMgYnV0IG5vdCBBcHAgTGlua3MuCisgICAgLy8gVXNlci1pbml0aWF0ZWQgdGFyZ2V0ZWQg bmF2aWdhdGlvbiB0byB0aGUgc2FtZSBob3N0IHNob3VsZCBhbGxvdyBleHRlcm5hbCBzY2hlbWVz IGJ1dCBub3QgQXBwIExpbmtzLgogICAgIEFTU0VSVF9UUlVFKFthY3Rpb24gX3Nob3VsZE9wZW5F eHRlcm5hbFNjaGVtZXNdKTsKICAgICBBU1NFUlRfRkFMU0UoW2FjdGlvbiBfc2hvdWxkT3BlbkFw cExpbmtzXSk7CiAKLSAgICBbd2ViVmlldyBsb2FkSFRNTFN0cmluZzpAIjxhIHN0eWxlPVwiZGlz cGxheTogYmxvY2s7IGhlaWdodDogMTAwJVwiIGhyZWY9XCJodHRwczovL3dlYmtpdC5vcmcvZGVz dGluYXRpb24uaHRtbFwiIHRhcmdldD1cIl9ibGFua1wiPiIgYmFzZVVSTDpbTlNVUkwgVVJMV2l0 aFN0cmluZzpAImh0dHA6Ly93ZWJraXQub3JnIl1dOworICAgIFt3ZWJWaWV3IGxvYWRIVE1MU3Ry aW5nOkAiPGEgc3R5bGU9XCJkaXNwbGF5OiBibG9jazsgaGVpZ2h0OiAxMDAlXCIgaHJlZj1cImh0 dHA6Ly9hcHBsZS5jb20vZGVzdGluYXRpb24uaHRtbFwiIHRhcmdldD1cIl9ibGFua1wiPiIgYmFz ZVVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImh0dHA6Ly93ZWJraXQub3JnIl1dOwogICAgIFRl c3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZmluaXNoZWROYXZpZ2F0aW9uKTsKICAgICBmaW5pc2hl ZE5hdmlnYXRpb24gPSBmYWxzZTsKIApAQCAtMTgzLDE0ICsxODMsMTQgQEAgVEVTVChXZWJLaXQy LCBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzSW5UYQogICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1 bigmZGVjaWRlZFBvbGljeSk7CiAgICAgZGVjaWRlZFBvbGljeSA9IGZhbHNlOwogCi0gICAgLy8g VXNlci1pbml0aWF0ZWQgdGFyZ2V0ZWQgbmF2aWdhdGlvbiB0byBkaWZmZXJlbnQgc2NoZW1lLCBo b3N0IG9yIHBvcnQgc2hvdWxkIGFsbG93IGV4dGVybmFsIHNjaGVtZXMgYW5kIEFwcCBMaW5rcy4K KyAgICAvLyBVc2VyLWluaXRpYXRlZCB0YXJnZXRlZCBuYXZpZ2F0aW9uIHRvIGRpZmZlcmVudCBo b3N0IHNob3VsZCBhbGxvdyBleHRlcm5hbCBzY2hlbWVzIGFuZCBBcHAgTGlua3MuCiAgICAgQVNT RVJUX1RSVUUoW2FjdGlvbiBfc2hvdWxkT3BlbkV4dGVybmFsU2NoZW1lc10pOwogICAgIEFTU0VS VF9UUlVFKFthY3Rpb24gX3Nob3VsZE9wZW5BcHBMaW5rc10pOwogCiAgICAgVGVzdFdlYktpdEFQ STo6VXRpbDo6cnVuKCZjcmVhdGVkV2ViVmlldyk7CiAgICAgY3JlYXRlZFdlYlZpZXcgPSBmYWxz ZTsKIAotICAgIC8vIFVzZXItaW5pdGlhdGVkIHRhcmdldGVkIG5hdmlnYXRpb24gdG8gZGlmZmVy ZW50IHNjaGVtZSwgaG9zdCBvciBwb3J0IHNob3VsZCBhbGxvdyBleHRlcm5hbCBzY2hlbWVzIGFu ZCBBcHAgTGlua3MuCisgICAgLy8gVXNlci1pbml0aWF0ZWQgdGFyZ2V0ZWQgbmF2aWdhdGlvbiB0 byBkaWZmZXJlbnQgaG9zdCBzaG91bGQgYWxsb3cgZXh0ZXJuYWwgc2NoZW1lcyBhbmQgQXBwIExp bmtzLgogICAgIEFTU0VSVF9UUlVFKFthY3Rpb24gX3Nob3VsZE9wZW5FeHRlcm5hbFNjaGVtZXNd KTsKICAgICBBU1NFUlRfVFJVRShbYWN0aW9uIF9zaG91bGRPcGVuQXBwTGlua3NdKTsKIApAQCAt MTk5LDcgKzE5OSw3IEBAIFRFU1QoV2ViS2l0MiwgU2hvdWxkT3BlbkV4dGVybmFsVVJMc0luVGEK ICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRlY2lkZWRQb2xpY3kpOwogICAgIGRlY2lk ZWRQb2xpY3kgPSBmYWxzZTsKIAotICAgIC8vIFVzZXItaW5pdGlhdGVkIHRhcmdldGVkIG5hdmln YXRpb24gdG8gZGlmZmVyZW50IHNjaGVtZSwgaG9zdCBvciBwb3J0IHNob3VsZCBhbGxvdyBleHRl cm5hbCBzY2hlbWVzIGFuZCBBcHAgTGlua3MuCisgICAgLy8gVXNlci1pbml0aWF0ZWQgdGFyZ2V0 ZWQgbmF2aWdhdGlvbiB0byBkaWZmZXJlbnQgaG9zdCBzaG91bGQgYWxsb3cgZXh0ZXJuYWwgc2No ZW1lcyBhbmQgQXBwIExpbmtzLgogICAgIEFTU0VSVF9UUlVFKFthY3Rpb24gX3Nob3VsZE9wZW5F eHRlcm5hbFNjaGVtZXNdKTsKICAgICBBU1NFUlRfVFJVRShbYWN0aW9uIF9zaG91bGRPcGVuQXBw TGlua3NdKTsKIAo=