108451 2013-01-31 03:04:09 -0800 [EFL][WK2] Reenable ewk_auth_request API tests 2013-02-12 15:12:15 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez andersca apavlov benjamin gyuyoung.kim kenneth kling laszlo.gombos lucas.de.marchi rakuco sam tmpsantos webkit.review.bot oldest_to_newest 821311 0 cdumez 2013-01-31 03:04:09 -0800 ewk_auth_request API tests have been temporarily disabled after the WK2 C API for resource loading was removed. We need to fix the tests so that they no longer rely on that API and renable them. 821319 1 185733 cdumez 2013-01-31 03:12:49 -0800 Created attachment 185733 Patch 828763 2 cdumez 2013-02-08 14:15:56 -0800 Could I please get informal review for this one? 828769 3 185733 tmpsantos 2013-02-08 14:31:20 -0800 Comment on attachment 185733 Patch LGTM. Thanks for fixing/re-enabling it. 828823 4 laszlo.gombos 2013-02-08 16:17:37 -0800 Looks good to me as well. 831220 5 185733 benjamin 2013-02-12 13:48:42 -0800 Comment on attachment 185733 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=185733&action=review > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_auth_request.cpp:40 > static const char TEST_USERNAME[] = "username"; > static const char TEST_PASSWORD[] = "password"; > +static const char EXPECTED_SUCCESS_TITLE[] = "EFLWebKit2 Authentication test"; > static const char EXPECTED_AUTHORIZATION[] = "Basic dXNlcm5hbWU6cGFzc3dvcmQ="; // Base64 encoding of "username:password". > static const char INDEX_HTML_STRING[] = This style is a bit far from WebKit style. 831230 6 187928 cdumez 2013-02-12 14:01:10 -0800 Created attachment 187928 Patch for landing Fixed the naming of the static variables to follow WebKit coding style. 831315 7 187928 webkit.review.bot 2013-02-12 15:12:10 -0800 Comment on attachment 187928 Patch for landing Clearing flags on attachment: 187928 Committed r142678: <http://trac.webkit.org/changeset/142678> 831316 8 webkit.review.bot 2013-02-12 15:12:15 -0800 All reviewed patches have been landed. Closing bug. 185733 2013-01-31 03:12:49 -0800 2013-02-12 14:01:10 -0800 Patch 108451_auth_apitests.patch text/plain 4576 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBiZGE4MDc2Li5lZDhhZTZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTMtMDEtMzEgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFJlZW5hYmxlIGV3a19hdXRoX3JlcXVlc3QgQVBJ IHRlc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MDg0NTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBl d2tfYXV0aF9yZXF1ZXN0IEFQSSB0ZXN0cyB3ZXJlIHRlbXBvcmFyaWx5IGRpc2FibGVkIGFmdGVy CisgICAgICAgIHRoZSBDIEFQSSBmb3IgcmVzb3VyY2UgbG9hZGluZyB3YXMgcmVtb3ZlZCBmcm9t IFdlYktpdDIuCisgICAgICAgIFRoaXMgcGF0Y2hlcyB1cGRhdGVzIHRoZSB0ZXN0cyBzbyB0aGF0 IHRoZXkgbm8gbG9uZ2VyIHJlbHkKKyAgICAgICAgb24gdGhlIHJlc291cmNlIGxvYWRpbmcgZXZl bnRzIGFuZCByZW5hYmxlcyB0aGVtLgorCisgICAgICAgICogUGxhdGZvcm1FZmwuY21ha2U6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2F1dGhfcmVxdWVzdC5j cHA6CisgICAgICAgIChURVNUX0YpOgorICAgICAgICAob25Mb2FkRmluaXNoZWQpOgorCiAyMDEz LTAxLTMwICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAg IFVucmV2aWV3ZWQgYnVpbGQgZml4IGFmdGVyIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdl c2V0LzE0MTM3Mi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtRWZsLmNtYWtl IGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm1FZmwuY21ha2UKaW5kZXggMzEzZjcxOS4uYTBmMjAy ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm1FZmwuY21ha2UKKysrIGIvU291 cmNlL1dlYktpdDIvUGxhdGZvcm1FZmwuY21ha2UKQEAgLTM3MCw2ICszNzAsNyBAQCB0YXJnZXRf bGlua19saWJyYXJpZXMoZXdrMlVuaXRUZXN0VXRpbHMgJHtFV0syVW5pdFRlc3RzX0xJQlJBUklF U30pCiAjIFRoZSAiZXdrIiBvbiB0aGUgdGVzdCBuYW1lIG5lZWRzIHRvIGJlIHN1ZmZpeGVkIHdp dGggIjIiLCBvdGhlcndpc2UgaXQKICMgd2lsbCBjbGFzaCB3aXRoIHRlc3RzIGZyb20gdGhlIFdl YktpdCAxIHRlc3Qgc3VpdGUuCiBzZXQoRVdLMlVuaXRUZXN0c19CSU5BUklFUworICAgIHRlc3Rf ZXdrMl9hdXRoX3JlcXVlc3QKICAgICB0ZXN0X2V3azJfYmFja19mb3J3YXJkX2xpc3QKICAgICB0 ZXN0X2V3azJfY29sb3JfcGlja2VyCiAgICAgdGVzdF9ld2syX2NvbnRleHQKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9hdXRoX3Jl cXVlc3QuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9l d2syX2F1dGhfcmVxdWVzdC5jcHAKaW5kZXggY2MzNTAyMS4uMjIwNTM4YiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2F1dGhfcmVx dWVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVz dF9ld2syX2F1dGhfcmVxdWVzdC5jcHAKQEAgLTM1LDYgKzM1LDcgQEAgZXh0ZXJuIEVXSzJVbml0 VGVzdEVudmlyb25tZW50KiBlbnZpcm9ubWVudDsKIAogc3RhdGljIGNvbnN0IGNoYXIgVEVTVF9V U0VSTkFNRVtdID0gInVzZXJuYW1lIjsKIHN0YXRpYyBjb25zdCBjaGFyIFRFU1RfUEFTU1dPUkRb XSA9ICJwYXNzd29yZCI7CitzdGF0aWMgY29uc3QgY2hhciBFWFBFQ1RFRF9TVUNDRVNTX1RJVExF W10gPSAiRUZMV2ViS2l0MiBBdXRoZW50aWNhdGlvbiB0ZXN0IjsKIHN0YXRpYyBjb25zdCBjaGFy IEVYUEVDVEVEX0FVVEhPUklaQVRJT05bXSA9ICJCYXNpYyBkWE5sY201aGJXVTZjR0Z6YzNkdmNt UT0iOyAvLyBCYXNlNjQgZW5jb2Rpbmcgb2YgInVzZXJuYW1lOnBhc3N3b3JkIi4KIHN0YXRpYyBj b25zdCBjaGFyIElOREVYX0hUTUxfU1RSSU5HW10gPQogICAgICI8aHRtbD4iCkBAIC0xMDEsNyAr MTAyLDcgQEAgVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3a19hdXRoX3JlcXVlc3Rfc3VjY2Vz cykKIAogICAgIGV3a19vYmplY3RfdW5yZWYoYXV0aGVudGljYXRpb25SZXF1ZXN0KTsKIAotICAg IEFTU0VSVF9UUlVFKHdhaXRVbnRpbFRpdGxlQ2hhbmdlZFRvKCJFRkxXZWJLaXQyIEF1dGhlbnRp Y2F0aW9uIHRlc3QiKSk7CisgICAgQVNTRVJUX1RSVUUod2FpdFVudGlsVGl0bGVDaGFuZ2VkVG8o RVhQRUNURURfU1VDQ0VTU19USVRMRSkpOwogfQogCiBURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwg ZXdrX2F1dGhfcmVxdWVzdF9mYWlsdXJlX3RoZW5fc3VjY2VzcykKQEAgLTE0MiwyMSArMTQzLDE1 IEBAIFRFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfYXV0aF9yZXF1ZXN0X2ZhaWx1cmVfdGhl bl9zdWNjZXNzKQogCiAgICAgZXdrX29iamVjdF91bnJlZihhdXRoZW50aWNhdGlvblJlcXVlc3Qp OwogCi0gICAgQVNTRVJUX1RSVUUod2FpdFVudGlsVGl0bGVDaGFuZ2VkVG8oIkVGTFdlYktpdDIg QXV0aGVudGljYXRpb24gdGVzdCIpKTsKKyAgICBBU1NFUlRfVFJVRSh3YWl0VW50aWxUaXRsZUNo YW5nZWRUbyhFWFBFQ1RFRF9TVUNDRVNTX1RJVExFKSk7CiB9CiAKLXN0YXRpYyB2b2lkIG9uUmVz b3VyY2VMb2FkUmVzcG9uc2Uodm9pZCogdXNlckRhdGEsIEV2YXNfT2JqZWN0Kiwgdm9pZCogZXZl bnRJbmZvKQorc3RhdGljIHZvaWQgb25Mb2FkRmluaXNoZWQodm9pZCogdXNlckRhdGEsIEV2YXNf T2JqZWN0Kiwgdm9pZCopCiB7Ci0gICAgaW50KiBzdGF0dXNDb2RlID0gc3RhdGljX2Nhc3Q8aW50 Kj4odXNlckRhdGEpOwotICAgIEFTU0VSVF9UUlVFKHN0YXR1c0NvZGUpOworICAgIGJvb2wqIGlz RmluaXNoZWQgPSBzdGF0aWNfY2FzdDxib29sKj4odXNlckRhdGEpOworICAgIEFTU0VSVF9UUlVF KGlzRmluaXNoZWQpOwogCi0gICAgRXdrX1Jlc291cmNlX0xvYWRfUmVzcG9uc2UqIHJlc3BvbnNl ID0gc3RhdGljX2Nhc3Q8RXdrX1Jlc291cmNlX0xvYWRfUmVzcG9uc2UqPihldmVudEluZm8pOwot ICAgIEFTU0VSVF9UUlVFKHJlc3BvbnNlKTsKLQotICAgIGlmICghZXdrX3Jlc291cmNlX21haW5f cmVzb3VyY2VfZ2V0KHJlc3BvbnNlLT5yZXNvdXJjZSkpCi0gICAgICAgIHJldHVybjsKLQotICAg ICpzdGF0dXNDb2RlID0gZXdrX3VybF9yZXNwb25zZV9zdGF0dXNfY29kZV9nZXQocmVzcG9uc2Ut PnJlc3BvbnNlKTsKKyAgICAqaXNGaW5pc2hlZCA9IHRydWU7CiB9CiAKIFRFU1RfRihFV0syVW5p dFRlc3RCYXNlLCBld2tfYXV0aF9yZXF1ZXN0X2NhbmNlbCkKQEAgLTE3OSwxNyArMTc0LDE2IEBA IFRFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfYXV0aF9yZXF1ZXN0X2NhbmNlbCkKICAgICBF WFBFQ1RfU1RSRVEoIjEyNy4wLjAuMSIsIGV3a19hdXRoX3JlcXVlc3RfaG9zdF9nZXQoYXV0aGVu dGljYXRpb25SZXF1ZXN0KSk7CiAgICAgRVhQRUNUX0ZBTFNFKGV3a19hdXRoX3JlcXVlc3RfcmV0 cnlpbmdfZ2V0KGF1dGhlbnRpY2F0aW9uUmVxdWVzdCkpOwogCi0gICAgaW50IHN0YXR1c0NvZGUg PSAwOwotICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZCh3ZWJWaWV3KCksICJyZXNv dXJjZSxyZXF1ZXN0LHJlc3BvbnNlIiwgb25SZXNvdXJjZUxvYWRSZXNwb25zZSwgJnN0YXR1c0Nv ZGUpOworICAgIGJvb2wgaXNGaW5pc2hlZCA9IGZhbHNlOworICAgIGV2YXNfb2JqZWN0X3NtYXJ0 X2NhbGxiYWNrX2FkZCh3ZWJWaWV3KCksICJsb2FkLGZpbmlzaGVkIiwgb25Mb2FkRmluaXNoZWQs ICZpc0ZpbmlzaGVkKTsKIAogICAgIC8vIFdpbGwgYXR0ZW1wdCB0byBjb250aW51ZSB3aXRob3V0 IGF1dGhlbnRpY2F0aW9uIGJ5IGRlZmF1bHQuCiAgICAgZXdrX29iamVjdF91bnJlZihhdXRoZW50 aWNhdGlvblJlcXVlc3QpOwogCi0gICAgd2hpbGUgKCFzdGF0dXNDb2RlKQorICAgIHdoaWxlICgh aXNGaW5pc2hlZCkKICAgICAgICAgZWNvcmVfbWFpbl9sb29wX2l0ZXJhdGUoKTsKIAotICAgIC8v IFdlIHNob3VsZCBnZXQgYSAiNDAyIFVuYXV0aG9yaXplZCIgZXJyb3IuCi0gICAgRVhQRUNUX0VR KFNPVVBfU1RBVFVTX1VOQVVUSE9SSVpFRCwgc3RhdHVzQ29kZSk7CisgICAgQVNTRVJUX1NUUk5F KEVYUEVDVEVEX1NVQ0NFU1NfVElUTEUsIGV3a192aWV3X3RpdGxlX2dldCh3ZWJWaWV3KCkpKTsK IAotICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2RlbCh3ZWJWaWV3KCksICJyZXNvdXJj ZSxyZXF1ZXN0LHJlc3BvbnNlIiwgb25SZXNvdXJjZUxvYWRSZXNwb25zZSk7CisgICAgZXZhc19v YmplY3Rfc21hcnRfY2FsbGJhY2tfZGVsKHdlYlZpZXcoKSwgImxvYWQsZmluaXNoZWQiLCBvbkxv YWRGaW5pc2hlZCk7CiB9Cg== 187928 2013-02-12 14:01:10 -0800 2013-02-12 15:12:10 -0800 Patch for landing 108451_auth_utest.patch text/plain 7269 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzZjg1NzExLi41YTJmZDQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTMtMDItMTIgIENocmlzdG9waGUgRHVtZXogIDxjaC5kdW1lekBzaXNhLnNhbXN1bmcu Y29tPgorCisgICAgICAgIFtFRkxdW1dLMl0gUmVlbmFibGUgZXdrX2F1dGhfcmVxdWVzdCBBUEkg dGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEw ODQ1MQorCisgICAgICAgIFJldmlld2VkIGJ5IEJlbmphbWluIFBvdWxhaW4uCisKKyAgICAgICAg ZXdrX2F1dGhfcmVxdWVzdCBBUEkgdGVzdHMgd2VyZSB0ZW1wb3JhcmlseSBkaXNhYmxlZCBhZnRl cgorICAgICAgICB0aGUgQyBBUEkgZm9yIHJlc291cmNlIGxvYWRpbmcgd2FzIHJlbW92ZWQgZnJv bSBXZWJLaXQyLgorICAgICAgICBUaGlzIHBhdGNoZXMgdXBkYXRlcyB0aGUgdGVzdHMgc28gdGhh dCB0aGV5IG5vIGxvbmdlciByZWx5CisgICAgICAgIG9uIHRoZSByZXNvdXJjZSBsb2FkaW5nIGV2 ZW50cyBhbmQgcmVuYWJsZXMgdGhlbS4KKworICAgICAgICBUaGlzIHBhdGNoIGFsc28gY29ycmVj dHMgdGhlIG5hbWluZyBvZiB0aGUgc3RhdGljIHZhcmlhYmxlcworICAgICAgICBpbiB0aGUgdGVz dCB0byBmb2xsb3cgbW9yZSBjbG9zZWx5IHRoZSBXZWJLaXQgY29kaW5nIHN0eWxlLgorCisgICAg ICAgICogUGxhdGZvcm1FZmwuY21ha2U6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVz dHMvdGVzdF9ld2syX2F1dGhfcmVxdWVzdC5jcHA6CisgICAgICAgIChzZXJ2ZXJDYWxsYmFjayk6 CisgICAgICAgIChURVNUX0YpOgorICAgICAgICAob25Mb2FkRmluaXNoZWQpOgorCiAyMDEzLTAy LTEyICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgVHlw byBmaXggYWZ0ZXIgcjE0MjY2My4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3Jt RWZsLmNtYWtlIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm1FZmwuY21ha2UKaW5kZXggZjZjZTE3 Ni4uOWNlNDViMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm1FZmwuY21ha2UK KysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm1FZmwuY21ha2UKQEAgLTM2Nyw2ICszNjcsNyBA QCB0YXJnZXRfbGlua19saWJyYXJpZXMoZXdrMlVuaXRUZXN0VXRpbHMgJHtFV0syVW5pdFRlc3Rz X0xJQlJBUklFU30pCiAjIFRoZSAiZXdrIiBvbiB0aGUgdGVzdCBuYW1lIG5lZWRzIHRvIGJlIHN1 ZmZpeGVkIHdpdGggIjIiLCBvdGhlcndpc2UgaXQKICMgd2lsbCBjbGFzaCB3aXRoIHRlc3RzIGZy b20gdGhlIFdlYktpdCAxIHRlc3Qgc3VpdGUuCiBzZXQoRVdLMlVuaXRUZXN0c19CSU5BUklFUwor ICAgIHRlc3RfZXdrMl9hdXRoX3JlcXVlc3QKICAgICB0ZXN0X2V3azJfYmFja19mb3J3YXJkX2xp c3QKICAgICB0ZXN0X2V3azJfY29sb3JfcGlja2VyCiAgICAgdGVzdF9ld2syX2NvbnRleHQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdr Ml9hdXRoX3JlcXVlc3QuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVz dHMvdGVzdF9ld2syX2F1dGhfcmVxdWVzdC5jcHAKaW5kZXggY2MzNTAyMS4uNjBkYTlkYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2sy X2F1dGhfcmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv dGVzdHMvdGVzdF9ld2syX2F1dGhfcmVxdWVzdC5jcHAKQEAgLTMzLDEwICszMywxMSBAQCB1c2lu ZyBuYW1lc3BhY2UgRVdLMlVuaXRUZXN0OwogCiBleHRlcm4gRVdLMlVuaXRUZXN0RW52aXJvbm1l bnQqIGVudmlyb25tZW50OwogCi1zdGF0aWMgY29uc3QgY2hhciBURVNUX1VTRVJOQU1FW10gPSAi dXNlcm5hbWUiOwotc3RhdGljIGNvbnN0IGNoYXIgVEVTVF9QQVNTV09SRFtdID0gInBhc3N3b3Jk IjsKLXN0YXRpYyBjb25zdCBjaGFyIEVYUEVDVEVEX0FVVEhPUklaQVRJT05bXSA9ICJCYXNpYyBk WE5sY201aGJXVTZjR0Z6YzNkdmNtUT0iOyAvLyBCYXNlNjQgZW5jb2Rpbmcgb2YgInVzZXJuYW1l OnBhc3N3b3JkIi4KLXN0YXRpYyBjb25zdCBjaGFyIElOREVYX0hUTUxfU1RSSU5HW10gPQorc3Rh dGljIGNvbnN0IGNoYXIgdGVzdFVzZXJuYW1lW10gPSAidXNlcm5hbWUiOworc3RhdGljIGNvbnN0 IGNoYXIgdGVzdFBhc3N3b3JkW10gPSAicGFzc3dvcmQiOworc3RhdGljIGNvbnN0IGNoYXIgZXhw ZWN0ZWRTdWNjZXNzVGl0bGVbXSA9ICJFRkxXZWJLaXQyIEF1dGhlbnRpY2F0aW9uIHRlc3QiOwor c3RhdGljIGNvbnN0IGNoYXIgZXhwZWN0ZWRBdXRob3JpemF0aW9uW10gPSAiQmFzaWMgZFhObGNt NWhiV1U2Y0dGemMzZHZjbVE9IjsgLy8gQmFzZTY0IGVuY29kaW5nIG9mICJ1c2VybmFtZTpwYXNz d29yZCIuCitzdGF0aWMgY29uc3QgY2hhciBpbmRleEhUTUxTdHJpbmdbXSA9CiAgICAgIjxodG1s PiIKICAgICAiPGhlYWQ+PHRpdGxlPkVGTFdlYktpdDIgQXV0aGVudGljYXRpb24gdGVzdDwvdGl0 bGU+PC9oZWFkPiIKICAgICAiPGJvZHk+PC9ib2R5PjwvaHRtbD4iOwpAQCAtNTEsMTAgKzUyLDEw IEBAIHN0YXRpYyB2b2lkIHNlcnZlckNhbGxiYWNrKFNvdXBTZXJ2ZXIqLCBTb3VwTWVzc2FnZSog bWVzc2FnZSwgY29uc3QgY2hhciogcGF0aCwKICAgICBpZiAoIXN0cmNtcChwYXRoLCAiL2luZGV4 Lmh0bWwiKSkgewogICAgICAgICBjb25zdCBjaGFyKiBhdXRob3JpemF0aW9uID0gc291cF9tZXNz YWdlX2hlYWRlcnNfZ2V0X29uZShtZXNzYWdlLT5yZXF1ZXN0X2hlYWRlcnMsICJBdXRob3JpemF0 aW9uIik7CiAgICAgICAgIC8vIFJlcXVpcmUgYXV0aGVudGljYXRpb24KLSAgICAgICAgaWYgKGF1 dGhvcml6YXRpb24gJiYgIXN0cmNtcChhdXRob3JpemF0aW9uLCBFWFBFQ1RFRF9BVVRIT1JJWkFU SU9OKSkgeworICAgICAgICBpZiAoYXV0aG9yaXphdGlvbiAmJiAhc3RyY21wKGF1dGhvcml6YXRp b24sIGV4cGVjdGVkQXV0aG9yaXphdGlvbikpIHsKICAgICAgICAgICAgIC8vIFN1Y2Nlc3NmdWwg YXV0aGVudGljYXRpb24uCiAgICAgICAgICAgICBzb3VwX21lc3NhZ2Vfc2V0X3N0YXR1cyhtZXNz YWdlLCBTT1VQX1NUQVRVU19PSyk7Ci0gICAgICAgICAgICBzb3VwX21lc3NhZ2VfYm9keV9hcHBl bmQobWVzc2FnZS0+cmVzcG9uc2VfYm9keSwgU09VUF9NRU1PUllfQ09QWSwgSU5ERVhfSFRNTF9T VFJJTkcsIHN0cmxlbihJTkRFWF9IVE1MX1NUUklORykpOworICAgICAgICAgICAgc291cF9tZXNz YWdlX2JvZHlfYXBwZW5kKG1lc3NhZ2UtPnJlc3BvbnNlX2JvZHksIFNPVVBfTUVNT1JZX0NPUFks IGluZGV4SFRNTFN0cmluZywgc3RybGVuKGluZGV4SFRNTFN0cmluZykpOwogICAgICAgICB9IGVs c2UgewogICAgICAgICAgICAgLy8gTm8gKHZhbGlkKSBhdXRob3JpemF0aW9uIGhlYWRlciBwcm92 aWRlZCBieSB0aGUgY2xpZW50LCByZXF1ZXN0IGF1dGhlbnRpY2F0aW9uLgogICAgICAgICAgICAg c291cF9tZXNzYWdlX3NldF9zdGF0dXMobWVzc2FnZSwgU09VUF9TVEFUVVNfVU5BVVRIT1JJWkVE KTsKQEAgLTk3LDExICs5OCwxMSBAQCBURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwgZXdrX2F1dGhf cmVxdWVzdF9zdWNjZXNzKQogICAgIEVYUEVDVF9TVFJFUSgiMTI3LjAuMC4xIiwgZXdrX2F1dGhf cmVxdWVzdF9ob3N0X2dldChhdXRoZW50aWNhdGlvblJlcXVlc3QpKTsKICAgICBFWFBFQ1RfRkFM U0UoZXdrX2F1dGhfcmVxdWVzdF9yZXRyeWluZ19nZXQoYXV0aGVudGljYXRpb25SZXF1ZXN0KSk7 CiAKLSAgICBBU1NFUlRfVFJVRShld2tfYXV0aF9yZXF1ZXN0X2F1dGhlbnRpY2F0ZShhdXRoZW50 aWNhdGlvblJlcXVlc3QsIFRFU1RfVVNFUk5BTUUsIFRFU1RfUEFTU1dPUkQpKTsKKyAgICBBU1NF UlRfVFJVRShld2tfYXV0aF9yZXF1ZXN0X2F1dGhlbnRpY2F0ZShhdXRoZW50aWNhdGlvblJlcXVl c3QsIHRlc3RVc2VybmFtZSwgdGVzdFBhc3N3b3JkKSk7CiAKICAgICBld2tfb2JqZWN0X3VucmVm KGF1dGhlbnRpY2F0aW9uUmVxdWVzdCk7CiAKLSAgICBBU1NFUlRfVFJVRSh3YWl0VW50aWxUaXRs ZUNoYW5nZWRUbygiRUZMV2ViS2l0MiBBdXRoZW50aWNhdGlvbiB0ZXN0IikpOworICAgIEFTU0VS VF9UUlVFKHdhaXRVbnRpbFRpdGxlQ2hhbmdlZFRvKGV4cGVjdGVkU3VjY2Vzc1RpdGxlKSk7CiB9 CiAKIFRFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfYXV0aF9yZXF1ZXN0X2ZhaWx1cmVfdGhl bl9zdWNjZXNzKQpAQCAtMTIzLDcgKzEyNCw3IEBAIFRFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBl d2tfYXV0aF9yZXF1ZXN0X2ZhaWx1cmVfdGhlbl9zdWNjZXNzKQogICAgIEVYUEVDVF9TVFJFUSgi MTI3LjAuMC4xIiwgZXdrX2F1dGhfcmVxdWVzdF9ob3N0X2dldChhdXRoZW50aWNhdGlvblJlcXVl c3QpKTsKICAgICBFWFBFQ1RfRkFMU0UoZXdrX2F1dGhfcmVxdWVzdF9yZXRyeWluZ19nZXQoYXV0 aGVudGljYXRpb25SZXF1ZXN0KSk7CiAKLSAgICBBU1NFUlRfVFJVRShld2tfYXV0aF9yZXF1ZXN0 X2F1dGhlbnRpY2F0ZShhdXRoZW50aWNhdGlvblJlcXVlc3QsIFRFU1RfVVNFUk5BTUUsICJ3cm9u Z3Bhc3N3b3JkIikpOworICAgIEFTU0VSVF9UUlVFKGV3a19hdXRoX3JlcXVlc3RfYXV0aGVudGlj YXRlKGF1dGhlbnRpY2F0aW9uUmVxdWVzdCwgdGVzdFVzZXJuYW1lLCAid3JvbmdwYXNzd29yZCIp KTsKIAogICAgIGV3a19vYmplY3RfdW5yZWYoYXV0aGVudGljYXRpb25SZXF1ZXN0KTsKICAgICBh dXRoZW50aWNhdGlvblJlcXVlc3QgPSAwOwpAQCAtMTM4LDI1ICsxMzksMTkgQEAgVEVTVF9GKEVX SzJVbml0VGVzdEJhc2UsIGV3a19hdXRoX3JlcXVlc3RfZmFpbHVyZV90aGVuX3N1Y2Nlc3MpCiAg ICAgRVhQRUNUX1RSVUUoZXdrX2F1dGhfcmVxdWVzdF9yZXRyeWluZ19nZXQoYXV0aGVudGljYXRp b25SZXF1ZXN0KSk7CiAKICAgICAvLyBOb3cgcHJvdmlkZSB0aGUgcmlnaHQgcGFzc3dvcmQuCi0g ICAgQVNTRVJUX1RSVUUoZXdrX2F1dGhfcmVxdWVzdF9hdXRoZW50aWNhdGUoYXV0aGVudGljYXRp b25SZXF1ZXN0LCBURVNUX1VTRVJOQU1FLCBURVNUX1BBU1NXT1JEKSk7CisgICAgQVNTRVJUX1RS VUUoZXdrX2F1dGhfcmVxdWVzdF9hdXRoZW50aWNhdGUoYXV0aGVudGljYXRpb25SZXF1ZXN0LCB0 ZXN0VXNlcm5hbWUsIHRlc3RQYXNzd29yZCkpOwogCiAgICAgZXdrX29iamVjdF91bnJlZihhdXRo ZW50aWNhdGlvblJlcXVlc3QpOwogCi0gICAgQVNTRVJUX1RSVUUod2FpdFVudGlsVGl0bGVDaGFu Z2VkVG8oIkVGTFdlYktpdDIgQXV0aGVudGljYXRpb24gdGVzdCIpKTsKKyAgICBBU1NFUlRfVFJV RSh3YWl0VW50aWxUaXRsZUNoYW5nZWRUbyhleHBlY3RlZFN1Y2Nlc3NUaXRsZSkpOwogfQogCi1z dGF0aWMgdm9pZCBvblJlc291cmNlTG9hZFJlc3BvbnNlKHZvaWQqIHVzZXJEYXRhLCBFdmFzX09i amVjdCosIHZvaWQqIGV2ZW50SW5mbykKK3N0YXRpYyB2b2lkIG9uTG9hZEZpbmlzaGVkKHZvaWQq IHVzZXJEYXRhLCBFdmFzX09iamVjdCosIHZvaWQqKQogewotICAgIGludCogc3RhdHVzQ29kZSA9 IHN0YXRpY19jYXN0PGludCo+KHVzZXJEYXRhKTsKLSAgICBBU1NFUlRfVFJVRShzdGF0dXNDb2Rl KTsKKyAgICBib29sKiBpc0ZpbmlzaGVkID0gc3RhdGljX2Nhc3Q8Ym9vbCo+KHVzZXJEYXRhKTsK KyAgICBBU1NFUlRfVFJVRShpc0ZpbmlzaGVkKTsKIAotICAgIEV3a19SZXNvdXJjZV9Mb2FkX1Jl c3BvbnNlKiByZXNwb25zZSA9IHN0YXRpY19jYXN0PEV3a19SZXNvdXJjZV9Mb2FkX1Jlc3BvbnNl Kj4oZXZlbnRJbmZvKTsKLSAgICBBU1NFUlRfVFJVRShyZXNwb25zZSk7Ci0KLSAgICBpZiAoIWV3 a19yZXNvdXJjZV9tYWluX3Jlc291cmNlX2dldChyZXNwb25zZS0+cmVzb3VyY2UpKQotICAgICAg ICByZXR1cm47Ci0KLSAgICAqc3RhdHVzQ29kZSA9IGV3a191cmxfcmVzcG9uc2Vfc3RhdHVzX2Nv ZGVfZ2V0KHJlc3BvbnNlLT5yZXNwb25zZSk7CisgICAgKmlzRmluaXNoZWQgPSB0cnVlOwogfQog CiBURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwgZXdrX2F1dGhfcmVxdWVzdF9jYW5jZWwpCkBAIC0x NzksMTcgKzE3NCwxNiBAQCBURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwgZXdrX2F1dGhfcmVxdWVz dF9jYW5jZWwpCiAgICAgRVhQRUNUX1NUUkVRKCIxMjcuMC4wLjEiLCBld2tfYXV0aF9yZXF1ZXN0 X2hvc3RfZ2V0KGF1dGhlbnRpY2F0aW9uUmVxdWVzdCkpOwogICAgIEVYUEVDVF9GQUxTRShld2tf YXV0aF9yZXF1ZXN0X3JldHJ5aW5nX2dldChhdXRoZW50aWNhdGlvblJlcXVlc3QpKTsKIAotICAg IGludCBzdGF0dXNDb2RlID0gMDsKLSAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQo d2ViVmlldygpLCAicmVzb3VyY2UscmVxdWVzdCxyZXNwb25zZSIsIG9uUmVzb3VyY2VMb2FkUmVz cG9uc2UsICZzdGF0dXNDb2RlKTsKKyAgICBib29sIGlzRmluaXNoZWQgPSBmYWxzZTsKKyAgICBl dmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQod2ViVmlldygpLCAibG9hZCxmaW5pc2hlZCIs IG9uTG9hZEZpbmlzaGVkLCAmaXNGaW5pc2hlZCk7CiAKICAgICAvLyBXaWxsIGF0dGVtcHQgdG8g Y29udGludWUgd2l0aG91dCBhdXRoZW50aWNhdGlvbiBieSBkZWZhdWx0LgogICAgIGV3a19vYmpl Y3RfdW5yZWYoYXV0aGVudGljYXRpb25SZXF1ZXN0KTsKIAotICAgIHdoaWxlICghc3RhdHVzQ29k ZSkKKyAgICB3aGlsZSAoIWlzRmluaXNoZWQpCiAgICAgICAgIGVjb3JlX21haW5fbG9vcF9pdGVy YXRlKCk7CiAKLSAgICAvLyBXZSBzaG91bGQgZ2V0IGEgIjQwMiBVbmF1dGhvcml6ZWQiIGVycm9y LgotICAgIEVYUEVDVF9FUShTT1VQX1NUQVRVU19VTkFVVEhPUklaRUQsIHN0YXR1c0NvZGUpOwor ICAgIEFTU0VSVF9TVFJORShleHBlY3RlZFN1Y2Nlc3NUaXRsZSwgZXdrX3ZpZXdfdGl0bGVfZ2V0 KHdlYlZpZXcoKSkpOwogCi0gICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfZGVsKHdlYlZp ZXcoKSwgInJlc291cmNlLHJlcXVlc3QscmVzcG9uc2UiLCBvblJlc291cmNlTG9hZFJlc3BvbnNl KTsKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19kZWwod2ViVmlldygpLCAibG9hZCxm aW5pc2hlZCIsIG9uTG9hZEZpbmlzaGVkKTsKIH0K