145718 2015-06-05 16:26:49 -0700 Clean up tests for blocking mixed content 2015-06-08 08:01:34 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=145717 https://bugs.webkit.org/show_bug.cgi?id=142378 P2 Normal --- 140625 1 ap ap commit-queue oliver oldest_to_newest 1100008 0 ap 2015-06-05 16:26:49 -0700 The tests abuse timeouts, and are thus flaky. 1100010 1 254395 ap 2015-06-05 16:32:01 -0700 Created attachment 254395 proposed fix 1100129 2 254395 commit-queue 2015-06-06 17:09:57 -0700 Comment on attachment 254395 proposed fix Clearing flags on attachment: 254395 Committed r185296: <http://trac.webkit.org/changeset/185296> 1100130 3 commit-queue 2015-06-06 17:10:02 -0700 All reviewed patches have been landed. Closing bug. 254395 2015-06-05 16:32:01 -0700 2015-06-06 17:09:57 -0700 proposed fix MixedContentBlockingTests.txt text/plain 11890 ap SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE4NTI3MykKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE1LTA2LTA1ICBBbGV4ZXkgUHJvc2t1cnlh a292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIHRlc3RzIGZvciBibG9ja2lu ZyBtaXhlZCBjb250ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNDU3MTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBTdG9wIHVzaW5nIHRpbWVvdXRzLCB3aGljaCB3ZXJlIG1ha2luZyB0aGUgdGVzdHMg Zmxha3kuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L2FjY2Vzcy1jb250 cm9sLXJlc3BvbnNlLXdpdGgtYm9keS5odG1sOiBUaGlzIHdhc24ndCBldmVuCisgICAgICAgIGEg bWl4ZWQgY29udGVudCB0ZXN0LCBidXQgdGhlIGZpbGUgd2FzIHJldXNlZCBpbiBvbmUuIEkgbm93 IG1hZGUgYSBzZXBhcmF0ZSBoZWxwZXIKKyAgICAgICAgZG9jdW1lbnQsIHNvIHRoaXMgaXMganVz dCBhIHJlZ3VsYXIgdGVzdCBub3csIG5vdCBhbm90aGVyIHRlc3QncyByZXNvdXJjZS4KKworICAg ICAgICAqIGh0dHAvdGVzdHMvc2VjdXJpdHkvbWl4ZWRDb250ZW50L3JlZGlyZWN0LWh0dHAtdG8t aHR0cHMtaWZyYW1lLWluLW1haW4tZnJhbWUuaHRtbDoKKyAgICAgICAgKiBodHRwL3Rlc3RzL3Nl Y3VyaXR5L21peGVkQ29udGVudC9yZWRpcmVjdC1odHRwcy10by1odHRwLWlmcmFtZS1pbi1tYWlu LWZyYW1lLmh0bWw6CisgICAgICAgICogaHR0cC90ZXN0cy9zZWN1cml0eS9taXhlZENvbnRlbnQv cmVzb3VyY2VzL2ZyYW1lLXdpdGgtaW5zZWN1cmUtZnJhbWUuaHRtbDoKKyAgICAgICAgKiBodHRw L3Rlc3RzL3NlY3VyaXR5L21peGVkQ29udGVudC9yZXNvdXJjZXMvZnJhbWUtd2l0aC1yZWRpcmVj dC1odHRwLXRvLWh0dHBzLWZyYW1lLmh0bWw6CisgICAgICAgICogaHR0cC90ZXN0cy9zZWN1cml0 eS9taXhlZENvbnRlbnQvcmVzb3VyY2VzL2ZyYW1lLXdpdGgtcmVkaXJlY3QtaHR0cHMtdG8taHR0 cC1mcmFtZS5odG1sOgorICAgICAgICBSZWZhY3RvcmVkIHRvIG5vdCBkZXBlbmQgb24gdGltZW91 dHMuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL3NlY3VyaXR5L21peGVkQ29udGVudC9pbnNlY3Vy ZS14aHItaW4tbWFpbi1mcmFtZS1leHBlY3RlZC50eHQ6CisgICAgICAgICogaHR0cC90ZXN0cy9z ZWN1cml0eS9taXhlZENvbnRlbnQvaW5zZWN1cmUteGhyLWluLW1haW4tZnJhbWUuaHRtbDoKKyAg ICAgICAgKiBodHRwL3Rlc3RzL3NlY3VyaXR5L21peGVkQ29udGVudC9yZXNvdXJjZXMvaW5zZWN1 cmUteGhyLWluLW1haW4tZnJhbWUtd2luZG93Lmh0bWw6IEFkZGVkLgorICAgICAgICBUaGlzIHRl c3Qgc3RpbGwgbmVlZHMgYSB0aW1lb3V0LCBiZWNhdXNlIG9mIGEgV2ViS2l0IGJ1Zy4gSSBqdXN0 IG1hZGUgaXQgbXVjaCBsb25nZXIuCisKIDIwMTUtMDYtMDUgIENocmlzIER1bWV6ICA8Y2R1bWV6 QGFwcGxlLmNvbT4KIAogICAgICAgICBSZWdyZXNzaW9uKHIxNzYyMTIpOiBCcm9rZSBhcHAgc3dp dGNoaW5nIG9uIGlDbG91ZC5jb20KSW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJp dHkvbWl4ZWRDb250ZW50L2luc2VjdXJlLXhoci1pbi1tYWluLWZyYW1lLWV4cGVjdGVkLnR4dAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L21peGVkQ29udGVu dC9pbnNlY3VyZS14aHItaW4tbWFpbi1mcmFtZS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDE4NTE2 NykKKysrIExheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvbWl4ZWRDb250ZW50L2luc2Vj dXJlLXhoci1pbi1tYWluLWZyYW1lLWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMgQEAKLUNPTlNPTEUgTUVTU0FHRTogbGluZSAyNjogW2Jsb2NrZWRdIFRoZSBwYWdlIGF0 IGh0dHBzOi8vMTI3LjAuMC4xOjg0NDMveG1saHR0cHJlcXVlc3QvYWNjZXNzLWNvbnRyb2wtcmVz cG9uc2Utd2l0aC1ib2R5Lmh0bWwgd2FzIG5vdCBhbGxvd2VkIHRvIGRpc3BsYXkgaW5zZWN1cmUg Y29udGVudCBmcm9tIGh0dHA6Ly9sb2NhbGhvc3Q6ODAwMC94bWxodHRwcmVxdWVzdC9yZXNvdXJj ZXMvYWNjZXNzLWNvbnRyb2wtYWxsb3ctd2l0aC1ib2R5LnBocC4KK0NPTlNPTEUgTUVTU0FHRTog bGluZSAyODogW2Jsb2NrZWRdIFRoZSBwYWdlIGF0IGh0dHBzOi8vMTI3LjAuMC4xOjg0NDMvc2Vj dXJpdHkvbWl4ZWRDb250ZW50L3Jlc291cmNlcy9pbnNlY3VyZS14aHItaW4tbWFpbi1mcmFtZS13 aW5kb3cuaHRtbCB3YXMgbm90IGFsbG93ZWQgdG8gZGlzcGxheSBpbnNlY3VyZSBjb250ZW50IGZy b20gaHR0cDovLzEyNy4wLjAuMTo4MDAwLy4KIAogVGhpcyB0ZXN0IG9wZW5zIGEgSFRUUFMgd2lu ZG93IHRoYXQgbG9hZHMgaW5zZWN1cmUgZGF0YSB2aWEgWEhSLiBXZSBzaG91bGQgdHJpZ2dlciBh IG1peGVkIGNvbnRlbnQgY2FsbGJhY2sgYmVjYXVzZSB0aGUgbWFpbiBmcmFtZSBpbiB0aGUgd2lu ZG93IGlzIEhUVFBTIGJ1dCBub3cgaGFzIGluc2VjdXJlIGRhdGEuCkluZGV4OiBMYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL3NlY3VyaXR5L21peGVkQ29udGVudC9pbnNlY3VyZS14aHItaW4tbWFpbi1m cmFtZS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkv bWl4ZWRDb250ZW50L2luc2VjdXJlLXhoci1pbi1tYWluLWZyYW1lLmh0bWwJKHJldmlzaW9uIDE4 NTE2NykKKysrIExheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvbWl4ZWRDb250ZW50L2lu c2VjdXJlLXhoci1pbi1tYWluLWZyYW1lLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTgsMjAgKzgs MTMgQEAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CiAgICAgdGVzdFJ1bm5lci5zZXRDbG9zZVJl bWFpbmluZ1dpbmRvd3NXaGVuQ29tcGxldGUodHJ1ZSk7CiB9CiAKLXdpbmRvdy5hZGRFdmVudExp c3RlbmVyKCJtZXNzYWdlIiwgZnVuY3Rpb24gKGUpIHsKLSAgICBpZiAod2luZG93LnRlc3RSdW5u ZXIpCi0gICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOwotICAgIGlmIChlLmRhdGEgPT0g ImRvbmUiKQotICAgIAl0aHJvdyAiU2hvdWxkIG5vdCBsb2FkIHRoaXMiCi19LCBmYWxzZSk7Ci0K IDwvc2NyaXB0PgogPHA+VGhpcyB0ZXN0IG9wZW5zIGEgSFRUUFMgd2luZG93IHRoYXQgbG9hZHMg aW5zZWN1cmUgZGF0YSB2aWEgWEhSLiAgV2Ugc2hvdWxkCiB0cmlnZ2VyIGEgbWl4ZWQgY29udGVu dCBjYWxsYmFjayBiZWNhdXNlIHRoZSBtYWluIGZyYW1lIGluIHRoZSB3aW5kb3cgaXMgSFRUUFMg YnV0CiBub3cgaGFzIGluc2VjdXJlIGRhdGEuPC9wPgogPHNjcmlwdD4KIG9ubG9hZCA9IGZ1bmN0 aW9uKCkgewotICAgIHdpbmRvdy5vcGVuKCJodHRwczovLzEyNy4wLjAuMTo4NDQzL3htbGh0dHBy ZXF1ZXN0L2FjY2Vzcy1jb250cm9sLXJlc3BvbnNlLXdpdGgtYm9keS5odG1sIik7CisgICAgd2lu ZG93Lm9wZW4oImh0dHBzOi8vMTI3LjAuMC4xOjg0NDMvc2VjdXJpdHkvbWl4ZWRDb250ZW50L3Jl c291cmNlcy9pbnNlY3VyZS14aHItaW4tbWFpbi1mcmFtZS13aW5kb3cuaHRtbCIpOwogfQogPC9z Y3JpcHQ+CiA8L2JvZHk+CkluZGV4OiBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L21p eGVkQ29udGVudC9yZWRpcmVjdC1odHRwLXRvLWh0dHBzLWlmcmFtZS1pbi1tYWluLWZyYW1lLmh0 bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9taXhlZENv bnRlbnQvcmVkaXJlY3QtaHR0cC10by1odHRwcy1pZnJhbWUtaW4tbWFpbi1mcmFtZS5odG1sCShy ZXZpc2lvbiAxODUxNjcpCisrKyBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L21peGVk Q29udGVudC9yZWRpcmVjdC1odHRwLXRvLWh0dHBzLWlmcmFtZS1pbi1tYWluLWZyYW1lLmh0bWwJ KHdvcmtpbmcgY29weSkKQEAgLTEwLDEwICsxMCwxMCBAQCBpZiAod2luZG93LnRlc3RSdW5uZXIp IHsKIH0KIAogd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoIm1lc3NhZ2UiLCBmdW5jdGlvbiAoZSkg ewotICBpZiAod2luZG93LnRlc3RSdW5uZXIpCi0gICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUo KTsKLQlpZiAoZS5kYXRhID09ICJkb25lIikKLQkgICAgdGhyb3cgInNob3VsZCBub3QgaGF2ZSBs b2FkZWQgaW5zZWN1cmUgY29udGVudCIKKyAgICBpZiAoZS5kYXRhID09ICJkb25lIikKKyAgICAg ICAgYWxlcnQoInNob3VsZCBub3QgaGF2ZSBsb2FkZWQgaW5zZWN1cmUgY29udGVudCIpOworICAg IGlmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgICAgdGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7 CiB9LCBmYWxzZSk7CiAKIDwvc2NyaXB0PgpJbmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9z ZWN1cml0eS9taXhlZENvbnRlbnQvcmVkaXJlY3QtaHR0cHMtdG8taHR0cC1pZnJhbWUtaW4tbWFp bi1mcmFtZS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJp dHkvbWl4ZWRDb250ZW50L3JlZGlyZWN0LWh0dHBzLXRvLWh0dHAtaWZyYW1lLWluLW1haW4tZnJh bWUuaHRtbAkocmV2aXNpb24gMTg1MTY3KQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1 cml0eS9taXhlZENvbnRlbnQvcmVkaXJlY3QtaHR0cHMtdG8taHR0cC1pZnJhbWUtaW4tbWFpbi1m cmFtZS5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0xMCwxMCArMTAsMTAgQEAgaWYgKHdpbmRvdy50 ZXN0UnVubmVyKSB7CiB9CiAKIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCJtZXNzYWdlIiwgZnVu Y3Rpb24gKGUpIHsKKwlpZiAoZS5kYXRhID09ICJkb25lIikKKwkgICAgYWxlcnQoInNob3VsZCBu b3QgaGF2ZSBsb2FkZWQgaW5zZWN1cmUgY29udGVudCIpOwogCWlmICh3aW5kb3cudGVzdFJ1bm5l cikKIAkJdGVzdFJ1bm5lci5ub3RpZnlEb25lKCkKLQlpZiAoZS5kYXRhID09ICJkb25lIikKLQkg ICAgdGhyb3cgInNob3VsZCBub3QgaGF2ZSBsb2FkZWQgaW5zZWN1cmUgY29udGVudCIKIH0sIGZh bHNlKTsKIAogPC9zY3JpcHQ+CkluZGV4OiBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5 L21peGVkQ29udGVudC9yZXNvdXJjZXMvZnJhbWUtd2l0aC1pbnNlY3VyZS1mcmFtZS5odG1sCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvbWl4ZWRDb250ZW50 L3Jlc291cmNlcy9mcmFtZS13aXRoLWluc2VjdXJlLWZyYW1lLmh0bWwJKHJldmlzaW9uIDE4NTE2 NykKKysrIExheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvbWl4ZWRDb250ZW50L3Jlc291 cmNlcy9mcmFtZS13aXRoLWluc2VjdXJlLWZyYW1lLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTEs MTIgKzEsMTEgQEAKIDxzY3JpcHQ+Ci1mdW5jdGlvbiBmcmFtZUxvYWRlZCgpIHsKLSAgaWYgKHdp bmRvdy5vcGVuZXIpCi0gICAgd2luZG93Lm9wZW5lci5wb3N0TWVzc2FnZSgnZG9uZScsICcqJyk7 Cit2YXIgZnJhbWVEaWRMb2FkID0gZmFsc2U7CisKK29ubG9hZCA9IGZ1bmN0aW9uKCkKK3sKKyAg ICBpZiAod2luZG93Lm9wZW5lcikKKyAgICAgICAgd2luZG93Lm9wZW5lci5wb3N0TWVzc2FnZShm cmFtZURpZExvYWQgPyAnZG9uZScgOiAnYmxvY2tlZCcsICcqJyk7CiB9Ci1zZXRUaW1lb3V0KGZ1 bmN0aW9uKCl7Ci0gIGlmICh3aW5kb3cub3BlbmVyKQotICAgIHdpbmRvdy5vcGVuZXIucG9zdE1l c3NhZ2UoJ2Jsb2NrZWQnLCAnKicpOwotfSwgMTAwKQogPC9zY3JpcHQ+Ci08aWZyYW1lIG9ubG9h ZD0iZnJhbWVMb2FkZWQoKSIKKzxpZnJhbWUgb25sb2FkPSJmcmFtZURpZExvYWQgPSB0cnVlIgog ICAgICAgICBzcmM9Imh0dHA6Ly8xMjcuMC4wLjE6ODA4MC9zZWN1cml0eS9taXhlZENvbnRlbnQv cmVzb3VyY2VzL2JvcmluZy5odG1sIj48L2lmcmFtZT4KSW5kZXg6IExheW91dFRlc3RzL2h0dHAv dGVzdHMvc2VjdXJpdHkvbWl4ZWRDb250ZW50L3Jlc291cmNlcy9mcmFtZS13aXRoLXJlZGlyZWN0 LWh0dHAtdG8taHR0cHMtZnJhbWUuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRw L3Rlc3RzL3NlY3VyaXR5L21peGVkQ29udGVudC9yZXNvdXJjZXMvZnJhbWUtd2l0aC1yZWRpcmVj dC1odHRwLXRvLWh0dHBzLWZyYW1lLmh0bWwJKHJldmlzaW9uIDE4NTE2NykKKysrIExheW91dFRl c3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvbWl4ZWRDb250ZW50L3Jlc291cmNlcy9mcmFtZS13aXRo LXJlZGlyZWN0LWh0dHAtdG8taHR0cHMtZnJhbWUuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMSwx MiArMSwxMSBAQAogPHNjcmlwdD4KLWZ1bmN0aW9uIGZyYW1lTG9hZGVkKCkgewotICBpZiAod2lu ZG93Lm9wZW5lcikKLSAgICB3aW5kb3cub3BlbmVyLnBvc3RNZXNzYWdlKCdkb25lJywgJyonKTsK K3ZhciBmcmFtZURpZExvYWQgPSBmYWxzZTsKKworb25sb2FkID0gZnVuY3Rpb24oKQoreworICAg IGlmICh3aW5kb3cub3BlbmVyKQorICAgICAgICB3aW5kb3cub3BlbmVyLnBvc3RNZXNzYWdlKGZy YW1lRGlkTG9hZCA/ICdkb25lJyA6ICdibG9ja2VkJywgJyonKTsKIH0KLXNldFRpbWVvdXQoZnVu Y3Rpb24oKXsKLSAgaWYgKHdpbmRvdy5vcGVuZXIpCi0gICAgd2luZG93Lm9wZW5lci5wb3N0TWVz c2FnZSgnYmxvY2tlZCcsICcqJyk7Ci19LCAxMDApCiA8L3NjcmlwdD4KLTxpZnJhbWUgb25sb2Fk PSJmcmFtZUxvYWRlZCgpIiBvbmVycm9yPSJmcmFtZUxvYWRlZCgpIgorPGlmcmFtZSBvbmxvYWQ9 IndpbmRvdy5mcmFtZURpZExvYWQgPSB0cnVlIgogICAgICAgICBzcmM9Imh0dHA6Ly8xMjcuMC4w LjE6ODA4MC9yZXNvdXJjZXMvcmVkaXJlY3QucGhwP3VybD1odHRwczovLzEyNy4wLjAuMTo4NDQz L3NlY3VyaXR5L21peGVkQ29udGVudC9yZXNvdXJjZXMvYm9yaW5nLmh0bWwiPjwvaWZyYW1lPgpJ bmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9taXhlZENvbnRlbnQvcmVzb3Vy Y2VzL2ZyYW1lLXdpdGgtcmVkaXJlY3QtaHR0cHMtdG8taHR0cC1mcmFtZS5odG1sCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvbWl4ZWRDb250ZW50L3Jlc291 cmNlcy9mcmFtZS13aXRoLXJlZGlyZWN0LWh0dHBzLXRvLWh0dHAtZnJhbWUuaHRtbAkocmV2aXNp b24gMTg1MTY3KQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9taXhlZENvbnRl bnQvcmVzb3VyY2VzL2ZyYW1lLXdpdGgtcmVkaXJlY3QtaHR0cHMtdG8taHR0cC1mcmFtZS5odG1s CSh3b3JraW5nIGNvcHkpCkBAIC0xLDEzICsxLDEyIEBACiA8c2NyaXB0PgotZnVuY3Rpb24gZnJh bWVMb2FkZWQoKSB7Ci0gIGlmICh3aW5kb3cub3BlbmVyKQotICAgIHdpbmRvdy5vcGVuZXIucG9z dE1lc3NhZ2UoJ2RvbmUnLCAnKicpOwordmFyIGZyYW1lRGlkTG9hZCA9IGZhbHNlOworCitvbmxv YWQgPSBmdW5jdGlvbigpCit7CisgICAgaWYgKHdpbmRvdy5vcGVuZXIpCisgICAgICAgIHdpbmRv dy5vcGVuZXIucG9zdE1lc3NhZ2UoZnJhbWVEaWRMb2FkID8gJ2RvbmUnIDogJ2Jsb2NrZWQnLCAn KicpOwogfQogCi1zZXRUaW1lb3V0KGZ1bmN0aW9uKCl7Ci0gIGlmICh3aW5kb3cub3BlbmVyKQot ICAgIHdpbmRvdy5vcGVuZXIucG9zdE1lc3NhZ2UoJ2Jsb2NrZWQnLCAnKicpOwotfSwgMTAwKQog PC9zY3JpcHQ+Ci08aWZyYW1lIG9ubG9hZD0iZnJhbWVMb2FkZWQoKSIgb25lcnJvcj0iZnJhbWVM b2FkZWQoKSIKKzxpZnJhbWUgb25sb2FkPSJ3aW5kb3cuZnJhbWVEaWRMb2FkID0gdHJ1ZSIKICAg ICAgICAgc3JjPSJodHRwczovLzEyNy4wLjAuMTo4NDQzL3Jlc291cmNlcy9yZWRpcmVjdC5waHA/ dXJsPWh0dHA6Ly8xMjcuMC4wLjE6ODA4MC9zZWN1cml0eS9taXhlZENvbnRlbnQvcmVzb3VyY2Vz L2JvcmluZy5odG1sIj48L2lmcmFtZT4KSW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvc2Vj dXJpdHkvbWl4ZWRDb250ZW50L3Jlc291cmNlcy9pbnNlY3VyZS14aHItaW4tbWFpbi1mcmFtZS13 aW5kb3cuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5 L21peGVkQ29udGVudC9yZXNvdXJjZXMvaW5zZWN1cmUteGhyLWluLW1haW4tZnJhbWUtd2luZG93 Lmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L21p eGVkQ29udGVudC9yZXNvdXJjZXMvaW5zZWN1cmUteGhyLWluLW1haW4tZnJhbWUtd2luZG93Lmh0 bWwJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwzMyBAQAorPGh0bWw+Cis8Ym9keT4KKzxzY3Jp cHQ+CisKK3dpbmRvdy5vbmxvYWQgPSBmdW5jdGlvbigpIHsKKyAgICB2YXIgeGhyID0gbmV3IFhN TEh0dHBSZXF1ZXN0KCk7CisgICAgeGhyLm9ubG9hZCA9IGZ1bmN0aW9uKCkgeworICAgICAgICBh bGVydCgiRkFJTDogbG9hZCB3YXMgbm90IGJsb2NrZWQiKTsKKyAgICAgICAgaWYgKHdpbmRvdy50 ZXN0UnVubmVyKQorICAgICAgICAgICAgdGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7CisgICAgfTsK KworICAgIC8vIFdoZW4gWEhSIGlzIGJsb2NrZWQgZHVlIHRvIG1peGVkIGNvbnRlbnQgYmxvY2tp bmcsIGl0IGp1c3QgYXBwZWFycyBhcyBpZiB0aGUgbG9hZCBzdGFsbHMsCisgICAgLy8gc2VlIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU3MTcuCisgICAgc2V0VGlt ZW91dChmdW5jdGlvbigpIHsKKyAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAg ICAgICAgdGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7CisgICAgfSwgMjAwMCk7CisKKyAgICB0cnkg eworICAgICAgICB4aHIub3BlbigiR0VUIiwgImh0dHA6Ly8xMjcuMC4wLjE6ODAwMC8iKTsKKyAg ICB9IGNhdGNoIChleCkgeworICAgICAgICAvLyBGaXJlZm94IHJhaXNlcyBhbiBleGNlcHRpb24s IHdoaWNoIGlzIG9uZSB3YXkgdG8gbWFrZSB0aGlzIGRldGVjdGFibGUuCisgICAgICAgIGlmICh3 aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOwor ICAgIH0KKworICAgIHhoci5zZW5kKG51bGwpOworfTsKKzwvc2NyaXB0PgorCis8L2JvZHk+Cis8 L2h0bWw+CgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3Vy aXR5L21peGVkQ29udGVudC9yZXNvdXJjZXMvaW5zZWN1cmUteGhyLWluLW1haW4tZnJhbWUtd2lu ZG93Lmh0bWwKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpBZGRlZDogc3ZuOm1pbWUtdHlwZQojIyAtMCwwICsxICMjCit0 ZXh0L2h0bWwKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBwcm9wZXJ0eQpJbmRleDogTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9hY2Nlc3MtY29udHJvbC1yZXNwb25zZS13aXRo LWJvZHkuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3htbGh0dHBy ZXF1ZXN0L2FjY2Vzcy1jb250cm9sLXJlc3BvbnNlLXdpdGgtYm9keS5odG1sCShyZXZpc2lvbiAx ODUxNjcpCisrKyBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L2FjY2Vzcy1j b250cm9sLXJlc3BvbnNlLXdpdGgtYm9keS5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC01LDMxICs1 LDI1IEBAIEJvZHkgZnJvbSBjcm9zcyBvcmlnaW4gcHJlZmxpZ2h0IHJlc3BvbnMKIDxkaXYgaWQ9 cmVzdWx0PlJ1bm5pbmcgdGVzdC4uLjwvZGl2PgogPHNjcmlwdD4KIAotICBpZiAod2luZG93LnRl c3RSdW5uZXIpIHsKK2lmICh3aW5kb3cudGVzdFJ1bm5lcikgewogICAgIHRlc3RSdW5uZXIuZHVt cEFzVGV4dCgpOwogICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOwotICB9Cit9CiAKLSAg d2luZG93Lm9ubG9hZCA9IGZ1bmN0aW9uKCkgewotICAgICAgdmFyIHhociA9IG5ldyBYTUxIdHRw UmVxdWVzdCgpOwotICAgICAgeGhyLm9ucmVhZHlzdGF0ZWNoYW5nZT1mdW5jdGlvbigpIHsKLSAg ICAgICAgaWYgKHhoci5yZWFkeVN0YXRlPT00KSB7Ci0gICAgICAgICAgZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoInJlc3VsdCIpLmlubmVySFRNTCA9ICh4aHIucmVzcG9uc2VUZXh0ID09ICJlY2hv IikgPyAiUEFTUyIgOiAoIkZBSUw6ICIgKyB4aHIucmVzcG9uc2VUZXh0KTsKLSAgICAgICAgICBp ZiAod2luZG93LnRlc3RSdW5uZXIpCit3aW5kb3cub25sb2FkID0gZnVuY3Rpb24oKSB7CisgICAg dmFyIHhociA9IG5ldyBYTUxIdHRwUmVxdWVzdCgpOworICAgIHhoci5vbmxvYWQ9ZnVuY3Rpb24o KSB7CisgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJyZXN1bHQiKS5pbm5lckhUTUwg PSAoeGhyLnJlc3BvbnNlVGV4dCA9PSAiZWNobyIpID8gIlBBU1MiIDogKCJGQUlMOiAiICsgeGhy LnJlc3BvbnNlVGV4dCk7CisgICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKICAgICAgICAg ICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOwotICAgICAgICB9Ci0gICAgICAgfTsKKyAgICB9 OworCisgICAgeGhyLm9wZW4oIkdFVCIsImh0dHA6Ly9sb2NhbGhvc3Q6ODAwMC94bWxodHRwcmVx dWVzdC9yZXNvdXJjZXMvYWNjZXNzLWNvbnRyb2wtYWxsb3ctd2l0aC1ib2R5LnBocCIpOworICAg IHhoci5zZXRSZXF1ZXN0SGVhZGVyKCJDb250ZW50LXR5cGUiLCAiYXBwbGljYXRpb24veC13d3ct Zm9ybS11cmxlbmNvZGVkIik7CisgICAgeGhyLnNldFJlcXVlc3RIZWFkZXIoIlgtUmVxdWVzdGVk LVdpdGgiLCAiWE1MSHR0cFJlcXVlc3QiKTsKKyAgICB4aHIuc2VuZChudWxsKTsKK307CiAKLSAg ICAgICB4aHIub3BlbigiR0VUIiwiaHR0cDovL2xvY2FsaG9zdDo4MDAwL3htbGh0dHByZXF1ZXN0 L3Jlc291cmNlcy9hY2Nlc3MtY29udHJvbC1hbGxvdy13aXRoLWJvZHkucGhwIik7Ci0gICAgICAg eGhyLnNldFJlcXVlc3RIZWFkZXIoIkNvbnRlbnQtdHlwZSIsICJhcHBsaWNhdGlvbi94LXd3dy1m b3JtLXVybGVuY29kZWQiKTsKLSAgICAgICB4aHIuc2V0UmVxdWVzdEhlYWRlcigiWC1SZXF1ZXN0 ZWQtV2l0aCIsICJYTUxIdHRwUmVxdWVzdCIpOwotICAgICAgIHhoci5zZW5kKG51bGwpOwotICAg ICAgIHNldFRpbWVvdXQoZnVuY3Rpb24oKXsKLSAgICAgICAgICBpZiAod2luZG93LnRlc3RSdW5u ZXIpCi0gICAgICAgICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpCi0gICAgICAgfSwgMTAw KQotICB9OwotICAKIDwvc2NyaXB0PgogCiA8L2JvZHk+Cg==