33353 2010-01-07 16:32:13 -0800 [GTK] loading test should use SoupServer instead of actual sites 2010-01-08 03:57:30 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED Gtk P2 Normal --- 1 gustavo webkit-unassigned webkit.review.bot oldest_to_newest 178442 0 gustavo 2010-01-07 16:32:13 -0800 Summary says it all. The test should not require loading stuff from the Internet. 178445 1 46097 gustavo 2010-01-07 16:38:11 -0800 Created attachment 46097 proposed patch 178447 2 webkit.review.bot 2010-01-07 16:42:30 -0800 Attachment 46097 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebKit/gtk/tests/testloading.c:32: Declaration has space between * and variable name in SoupURI* base_uri [whitespace/declaration] [3] WebKit/gtk/tests/testloading.c:32: base_uri is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit/gtk/tests/testloading.c:91: get_uri_for_path is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit/gtk/tests/testloading.c:93: Declaration has space between * and variable name in SoupURI* uri [whitespace/declaration] [3] WebKit/gtk/tests/testloading.c:94: Declaration has space between * and variable name in char* uri_string [whitespace/declaration] [3] WebKit/gtk/tests/testloading.c:94: uri_string is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit/gtk/tests/testloading.c:98: Extra space before ( in function call [whitespace/parens] [4] WebKit/gtk/tests/testloading.c:148: Declaration has space between * and variable name in char* uri_string [whitespace/declaration] [3] WebKit/gtk/tests/testloading.c:148: uri_string is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit/gtk/tests/testloading.c:208: Declaration has space between * and variable name in char* uri_string [whitespace/declaration] [3] WebKit/gtk/tests/testloading.c:208: uri_string is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit/gtk/tests/testloading.c:271: Declaration has space between * and variable name in char* uri_string [whitespace/declaration] [3] WebKit/gtk/tests/testloading.c:271: uri_string is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit/gtk/tests/testloading.c:315: Declaration has space between * and variable name in char* uri_string [whitespace/declaration] [3] WebKit/gtk/tests/testloading.c:315: uri_string is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit/gtk/tests/testloading.c:316: Declaration has space between * and variable name in char* uri_string2 [whitespace/declaration] [3] WebKit/gtk/tests/testloading.c:316: uri_string2 is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit/gtk/tests/testloading.c:343: load_error_test is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit/gtk/tests/testloading.c:350: Declaration has space between * and variable name in char* uri_string [whitespace/declaration] [3] WebKit/gtk/tests/testloading.c:350: uri_string is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit/gtk/tests/testloading.c:394: Declaration has space between * and variable name in SoupServer* server [whitespace/declaration] [3] Total errors found: 21 178591 3 46097 xan.lopez 2010-01-08 03:02:24 -0800 Comment on attachment 46097 proposed patch >+/* For real request testing */ >+static void >+server_callback(SoupServer *server, SoupMessage *msg, >+ const char *path, GHashTable *query, >+ SoupClientContext *context, gpointer data) This style issue you should fix at least. BTW, I'm not sure I see any valid reason to not use the WebKit style in our tests too. Not in this patch, but we should do it afterwards. Everything else looks good to me, thanks for working on this. 178624 4 gustavo 2010-01-08 03:49:41 -0800 (In reply to comment #3) > (From update of attachment 46097 [details]) > >+/* For real request testing */ > >+static void > >+server_callback(SoupServer *server, SoupMessage *msg, > >+ const char *path, GHashTable *query, > >+ SoupClientContext *context, gpointer data) > > This style issue you should fix at least. > > BTW, I'm not sure I see any valid reason to not use the WebKit style in our > tests too. Not in this patch, but we should do it afterwards. > > Everything else looks good to me, thanks for working on this. True. I guess it just started like this. I can move them to webkit style. 178628 5 gustavo 2010-01-08 03:57:30 -0800 Landed as r52986. 46097 2010-01-07 16:38:11 -0800 2010-01-08 03:02:24 -0800 proposed patch 0001-2010-01-07-Gustavo-Noronha-Silva-gns-gnome.org.patch text/plain 11417 gustavo RnJvbSAzMTM2YmY0ZTZhNTI0MmJmM2Q0ZjA1MTA1ZWY0ZGE4NzA0NDVkNjgyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+ CkRhdGU6IFRodSwgNyBKYW4gMjAxMCAyMjozMzo0NiAtMDIwMApTdWJqZWN0OiBbUEFUQ0hdIDIw MTAtMDEtMDcgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGduc0Bnbm9tZS5vcmc+CgogICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBbR1RLXSBsb2FkaW5nIHRlc3Qg c2hvdWxkIHVzZSBTb3VwU2VydmVyIGluc3RlYWQgb2YgYWN0dWFsIHNpdGVzCiAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMzMzUzCgogICAgICAgIE1ha2Ug YWxsIHRoZSBsb2FkaW5nIHRlc3RzIHVzZSBTb3VwU2VydmVyLCBpbnN0ZWFkIG9mIGZldGNoaW5n CiAgICAgICAgc3R1ZmYgZnJvbSB0aGUgSW50ZXJuZXQuCgogICAgICAgICogdGVzdHMvdGVzdGxv YWRpbmcuYzoKICAgICAgICAoc2VydmVyX2NhbGxiYWNrKToKICAgICAgICAoZ2V0X3VyaV9mb3Jf cGF0aCk6CiAgICAgICAgKHRlc3RfbG9hZGluZ19zdGF0dXMpOgogICAgICAgICh0ZXN0X2xvYWRp bmdfZXJyb3IpOgogICAgICAgICh0ZXN0X2xvYWRpbmdfY2FuY2VsbGVkKToKICAgICAgICAobG9h ZF93ZW50YmFja19zdGF0dXNfY2hhbmdlZF9jYik6CiAgICAgICAgKGxvYWRfZXJyb3JfdGVzdCk6 CiAgICAgICAgKHRlc3RfbG9hZGluZ19nb2JhY2spOgogICAgICAgIChtYWluKToKLS0tCiBXZWJL aXQvZ3RrL0NoYW5nZUxvZyAgICAgICAgICAgfCAgIDIxICsrKysrKysKIFdlYktpdC9ndGsvdGVz dHMvdGVzdGxvYWRpbmcuYyB8ICAxMTkgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKy0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxMzEgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1dlYktpdC9ndGsvQ2hhbmdl TG9nCmluZGV4IGNjNmQxMmUuLjAwMDZkY2QgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvQ2hhbmdl TG9nCisrKyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTAtMDEt MDcgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGduc0Bnbm9tZS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gbG9hZGluZyB0ZXN0IHNo b3VsZCB1c2UgU291cFNlcnZlciBpbnN0ZWFkIG9mIGFjdHVhbCBzaXRlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMzNTMKKworICAgICAgICBNYWtl IGFsbCB0aGUgbG9hZGluZyB0ZXN0cyB1c2UgU291cFNlcnZlciwgaW5zdGVhZCBvZiBmZXRjaGlu ZworICAgICAgICBzdHVmZiBmcm9tIHRoZSBJbnRlcm5ldC4KKworICAgICAgICAqIHRlc3RzL3Rl c3Rsb2FkaW5nLmM6CisgICAgICAgIChzZXJ2ZXJfY2FsbGJhY2spOgorICAgICAgICAoZ2V0X3Vy aV9mb3JfcGF0aCk6CisgICAgICAgICh0ZXN0X2xvYWRpbmdfc3RhdHVzKToKKyAgICAgICAgKHRl c3RfbG9hZGluZ19lcnJvcik6CisgICAgICAgICh0ZXN0X2xvYWRpbmdfY2FuY2VsbGVkKToKKyAg ICAgICAgKGxvYWRfd2VudGJhY2tfc3RhdHVzX2NoYW5nZWRfY2IpOgorICAgICAgICAobG9hZF9l cnJvcl90ZXN0KToKKyAgICAgICAgKHRlc3RfbG9hZGluZ19nb2JhY2spOgorICAgICAgICAobWFp bik6CisKIDIwMTAtMDEtMDYgIEpvYW5tYXJpZSBEaWdncyAgPGpvYW5tYXJpZS5kaWdnc0BnbWFp bC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWGFuIExvcGV6LgpkaWZmIC0tZ2l0IGEvV2Vi S2l0L2d0ay90ZXN0cy90ZXN0bG9hZGluZy5jIGIvV2ViS2l0L2d0ay90ZXN0cy90ZXN0bG9hZGlu Zy5jCmluZGV4IDg4MzhkN2IuLjBmYzA4ZmEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvdGVzdHMv dGVzdGxvYWRpbmcuYworKysgYi9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3Rsb2FkaW5nLmMKQEAgLTEs NSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA5IEd1c3Rhdm8gTm9yb25oYSBTaWx2 YQorICogQ29weXJpZ2h0IChDKSAyMDA5LCAyMDEwIEd1c3Rhdm8gTm9yb25oYSBTaWx2YQogICog Q29weXJpZ2h0IChDKSAyMDA5IElnYWxpYSBTLkwuCiAgKgogICogVGhpcyBsaWJyYXJ5IGlzIGZy ZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgpAQCAtMTksMTAgKzE5 LDQ1IEBACiAgKi8KIAogI2luY2x1ZGUgPGd0ay9ndGsuaD4KKyNpbmNsdWRlIDxsaWJzb3VwL3Nv dXAuaD4KKyNpbmNsdWRlIDxzdHJpbmcuaD4KICNpbmNsdWRlIDx3ZWJraXQvd2Via2l0Lmg+CiAK ICNpZiBHTElCX0NIRUNLX1ZFUlNJT04oMiwgMTYsIDApICYmIEdUS19DSEVDS19WRVJTSU9OKDIs IDE0LCAwKQogCisvKiBUaGlzIHN0cmluZyBoYXMgdG8gYmUgcmF0aGVyIGJpZyBiZWNhdXNlIG9m IHRoZSBjYW5jZWxsZWQgdGVzdCAtIGl0CisgKiBsb29rcyBsaWtlIHNvdXAgcmVmdXNlcyB0byBz ZW5kIG9yIHJlY2VpdmUgYSB0b28gc21hbGwgY2h1bmsgKi8KKyNkZWZpbmUgSFRNTF9TVFJJTkcg IjxodG1sPjxib2R5PlRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0 aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3Rp bmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGlu ZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5n IVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3Rpbmch VGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFU ZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRl c3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVz dGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0 aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3Rp bmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGlu ZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5n IVRlc3RpbmchVGVzdGluZyE8L2JvZHk+PC9odG1sPiIKKworU291cFVSSSogYmFzZV91cmk7CisK Ky8qIEZvciByZWFsIHJlcXVlc3QgdGVzdGluZyAqLworc3RhdGljIHZvaWQKK3NlcnZlcl9jYWxs YmFjayhTb3VwU2VydmVyICpzZXJ2ZXIsIFNvdXBNZXNzYWdlICptc2csCisgICAgICAgICAgICAg ICAgY29uc3QgY2hhciAqcGF0aCwgR0hhc2hUYWJsZSAqcXVlcnksCisgICAgICAgICAgICAgICAg U291cENsaWVudENvbnRleHQgKmNvbnRleHQsIGdwb2ludGVyIGRhdGEpCit7CisgICAgaWYgKG1z Zy0+bWV0aG9kICE9IFNPVVBfTUVUSE9EX0dFVCkgeworICAgICAgICBzb3VwX21lc3NhZ2Vfc2V0 X3N0YXR1cyhtc2csIFNPVVBfU1RBVFVTX05PVF9JTVBMRU1FTlRFRCk7CisgICAgICAgIHJldHVy bjsKKyAgICB9CisKKyAgICBzb3VwX21lc3NhZ2Vfc2V0X3N0YXR1cyhtc2csIFNPVVBfU1RBVFVT X09LKTsKKworICAgIGlmIChnX3N0cl9lcXVhbChwYXRoLCAiL3Rlc3RfbG9hZGluZ19zdGF0dXMi KSB8fCBnX3N0cl9lcXVhbChwYXRoLCAiL3Rlc3RfbG9hZGluZ19zdGF0dXMyIikpCisgICAgICAg IHNvdXBfbWVzc2FnZV9ib2R5X2FwcGVuZChtc2ctPnJlc3BvbnNlX2JvZHksIFNPVVBfTUVNT1JZ X1NUQVRJQywgSFRNTF9TVFJJTkcsIHN0cmxlbihIVE1MX1NUUklORykpOworICAgIGVsc2UgaWYg KGdfc3RyX2VxdWFsKHBhdGgsICIvdGVzdF9sb2FkX2Vycm9yIikpIHsKKyAgICAgICAgc291cF9t ZXNzYWdlX3NldF9zdGF0dXMobXNnLCBTT1VQX1NUQVRVU19DQU5UX0NPTk5FQ1QpOworICAgIH0g ZWxzZSBpZiAoZ19zdHJfZXF1YWwocGF0aCwgIi90ZXN0X2xvYWRpbmdfY2FuY2VsbGVkIikpIHsK KyAgICAgICAgc291cF9tZXNzYWdlX2hlYWRlcnNfc2V0X2VuY29kaW5nKG1zZy0+cmVzcG9uc2Vf aGVhZGVycywgU09VUF9FTkNPRElOR19DSFVOS0VEKTsKKyAgICAgICAgc291cF9tZXNzYWdlX2Jv ZHlfYXBwZW5kKG1zZy0+cmVzcG9uc2VfYm9keSwgU09VUF9NRU1PUllfU1RBVElDLCBIVE1MX1NU UklORywgc3RybGVuKEhUTUxfU1RSSU5HKSk7CisgICAgICAgIHNvdXBfc2VydmVyX3VucGF1c2Vf bWVzc2FnZShzZXJ2ZXIsIG1zZyk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBzb3Vw X21lc3NhZ2VfYm9keV9jb21wbGV0ZShtc2ctPnJlc3BvbnNlX2JvZHkpOworfQorCiB0eXBlZGVm IHN0cnVjdCB7CiAgICAgV2ViS2l0V2ViVmlldyogd2ViVmlldzsKICAgICBHTWFpbkxvb3AgKmxv b3A7CkBAIC01Myw2ICs4OCwxOCBAQCBzdGF0aWMgdm9pZCB3ZWJfbG9hZGluZ19maXh0dXJlX3Rl YXJkb3duKFdlYkxvYWRpbmdGaXh0dXJlKiBmaXh0dXJlLCBnY29uc3Rwb2ludAogICAgIGdfbWFp bl9sb29wX3VucmVmKGZpeHR1cmUtPmxvb3ApOwogfQogCitzdGF0aWMgY2hhciogZ2V0X3VyaV9m b3JfcGF0aChjb25zdCBjaGFyKiBwYXRoKQoreworICAgIFNvdXBVUkkqIHVyaTsKKyAgICBjaGFy KiB1cmlfc3RyaW5nOworCisgICAgdXJpID0gc291cF91cmlfbmV3X3dpdGhfYmFzZShiYXNlX3Vy aSwgcGF0aCk7CisgICAgdXJpX3N0cmluZyA9IHNvdXBfdXJpX3RvX3N0cmluZyh1cmksIEZBTFNF KTsKKyAgICBzb3VwX3VyaV9mcmVlICh1cmkpOworCisgICAgcmV0dXJuIHVyaV9zdHJpbmc7Cit9 CisKIHN0YXRpYyB2b2lkIGxvYWRfZmluaXNoZWRfY2IoV2ViS2l0V2ViVmlldyogd2ViX3ZpZXcs IFdlYktpdFdlYkZyYW1lKiB3ZWJfZnJhbWUsIFdlYkxvYWRpbmdGaXh0dXJlKiBmaXh0dXJlKQog ewogICAgIGdfYXNzZXJ0KGZpeHR1cmUtPmhhc19iZWVuX3Byb3Zpc2lvbmFsKTsKQEAgLTk4LDYg KzE0NSw4IEBAIHN0YXRpYyB2b2lkIHN0YXR1c19jaGFuZ2VkX2NiKEdPYmplY3QqIG9iamVjdCwg R1BhcmFtU3BlYyogcHNwZWMsIFdlYkxvYWRpbmdGaXh0CiAKIHN0YXRpYyB2b2lkIHRlc3RfbG9h ZGluZ19zdGF0dXMoV2ViTG9hZGluZ0ZpeHR1cmUqIGZpeHR1cmUsIGdjb25zdHBvaW50ZXIgZGF0 YSkKIHsKKyAgICBjaGFyKiB1cmlfc3RyaW5nOworCiAgICAgZ19hc3NlcnRfY21waW50KHdlYmtp dF93ZWJfdmlld19nZXRfbG9hZF9zdGF0dXMoZml4dHVyZS0+d2ViVmlldyksID09LCBXRUJLSVRf TE9BRF9QUk9WSVNJT05BTCk7CiAKICAgICBnX29iamVjdF9jb25uZWN0KEdfT0JKRUNUKGZpeHR1 cmUtPndlYlZpZXcpLApAQCAtMTA1LDEwICsxNTQsMTMgQEAgc3RhdGljIHZvaWQgdGVzdF9sb2Fk aW5nX3N0YXR1cyhXZWJMb2FkaW5nRml4dHVyZSogZml4dHVyZSwgZ2NvbnN0cG9pbnRlciBkYXRh KQogICAgICAgICAgICAgICAgICAgICAgInNpZ25hbDo6bG9hZC1maW5pc2hlZCIsIEdfQ0FMTEJB Q0sobG9hZF9maW5pc2hlZF9jYiksIGZpeHR1cmUsCiAgICAgICAgICAgICAgICAgICAgICBOVUxM KTsKIAorICAgIHVyaV9zdHJpbmcgPSBnZXRfdXJpX2Zvcl9wYXRoKCIvdGVzdF9sb2FkaW5nX3N0 YXR1cyIpOworCiAgICAgLyogbG9hZF91cmkgd2lsbCB0cmlnZ2VyIHRoZSBuYXZpZ2F0aW9uLXBv bGljeS1kZWNpc2lvbi1yZXF1ZXN0ZWQKICAgICAgKiBzaWduYWwgZW1pc3Npb247CiAgICAgICov Ci0gICAgd2Via2l0X3dlYl92aWV3X2xvYWRfdXJpKGZpeHR1cmUtPndlYlZpZXcsICJodHRwOi8v Z25vbWUub3JnLyIpOworICAgIHdlYmtpdF93ZWJfdmlld19sb2FkX3VyaShmaXh0dXJlLT53ZWJW aWV3LCB1cmlfc3RyaW5nKTsKKyAgICBnX2ZyZWUodXJpX3N0cmluZyk7CiAKICAgICBnX21haW5f bG9vcF9ydW4oZml4dHVyZS0+bG9vcCk7CiB9CkBAIC0xNTMsMTIgKzIwNSwxNyBAQCBzdGF0aWMg Z2Jvb2xlYW4gbG9hZF9lcnJvcl9jYihXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBXZWJLaXRXZWJG cmFtZSogZnJhbWUsIGNvbgogCiBzdGF0aWMgdm9pZCB0ZXN0X2xvYWRpbmdfZXJyb3IoV2ViTG9h ZGluZ0ZpeHR1cmUqIGZpeHR1cmUsIGdjb25zdHBvaW50ZXIgZGF0YSkKIHsKKyAgICBjaGFyKiB1 cmlfc3RyaW5nOworCiAgICAgZ190ZXN0X2J1ZygiMjg4NDIiKTsKIAogICAgIGdfc2lnbmFsX2Nv bm5lY3QoZml4dHVyZS0+d2ViVmlldywgImxvYWQtZXJyb3IiLCBHX0NBTExCQUNLKGxvYWRfZXJy b3JfY2IpLCBmaXh0dXJlKTsKICAgICBnX3NpZ25hbF9jb25uZWN0KGZpeHR1cmUtPndlYlZpZXcs ICJub3RpZnk6OmxvYWQtc3RhdHVzIiwgR19DQUxMQkFDSyhsb2FkX2Vycm9yX3N0YXR1c19jaGFu Z2VkX2NiKSwgZml4dHVyZSk7CiAKLSAgICB3ZWJraXRfd2ViX3ZpZXdfbG9hZF91cmkoZml4dHVy ZS0+d2ViVmlldywgImh0dHA6Ly9zbm9ldHVoc2V0dWhzZW91dG9ldXRjLmNvbS8iKTsKKyAgICB1 cmlfc3RyaW5nID0gZ2V0X3VyaV9mb3JfcGF0aCgiL3Rlc3RfbG9hZF9lcnJvciIpOworICAgIHdl YmtpdF93ZWJfdmlld19sb2FkX3VyaShmaXh0dXJlLT53ZWJWaWV3LCB1cmlfc3RyaW5nKTsKKyAg ICBnX2ZyZWUodXJpX3N0cmluZyk7CisKICAgICBnX21haW5fbG9vcF9ydW4oZml4dHVyZS0+bG9v cCk7CiB9CiAKQEAgLTIxMSwxMiArMjY4LDE3IEBAIHN0YXRpYyB2b2lkIGxvYWRfY2FuY2VsbGVk X3N0YXR1c19jaGFuZ2VkX2NiKEdPYmplY3QqIG9iamVjdCwgR1BhcmFtU3BlYyogcHNwZWMsCiAK IHN0YXRpYyB2b2lkIHRlc3RfbG9hZGluZ19jYW5jZWxsZWQoV2ViTG9hZGluZ0ZpeHR1cmUqIGZp eHR1cmUsIGdjb25zdHBvaW50ZXIgZGF0YSkKIHsKKyAgICBjaGFyKiB1cmlfc3RyaW5nOworCiAg ICAgZ190ZXN0X2J1ZygiMjk2NDQiKTsKIAogICAgIGdfc2lnbmFsX2Nvbm5lY3QoZml4dHVyZS0+ d2ViVmlldywgImxvYWQtZXJyb3IiLCBHX0NBTExCQUNLKGxvYWRfY2FuY2VsbGVkX2NiKSwgZml4 dHVyZSk7CiAgICAgZ19zaWduYWxfY29ubmVjdChmaXh0dXJlLT53ZWJWaWV3LCAibm90aWZ5Ojps b2FkLXN0YXR1cyIsIEdfQ0FMTEJBQ0sobG9hZF9jYW5jZWxsZWRfc3RhdHVzX2NoYW5nZWRfY2Ip LCBmaXh0dXJlKTsKIAotICAgIHdlYmtpdF93ZWJfdmlld19sb2FkX3VyaShmaXh0dXJlLT53ZWJW aWV3LCAiaHR0cDovL2dvb2dsZS5jb20vIik7CisgICAgdXJpX3N0cmluZyA9IGdldF91cmlfZm9y X3BhdGgoIi90ZXN0X2xvYWRpbmdfY2FuY2VsbGVkIik7CisgICAgd2Via2l0X3dlYl92aWV3X2xv YWRfdXJpKGZpeHR1cmUtPndlYlZpZXcsIHVyaV9zdHJpbmcpOworICAgIGdfZnJlZSh1cmlfc3Ry aW5nKTsKKwogICAgIGdfbWFpbl9sb29wX3J1bihmaXh0dXJlLT5sb29wKTsKIH0KIApAQCAtMjUw LDMxICszMTIsNTEgQEAgc3RhdGljIHZvaWQgbG9hZF9nb2JhY2tfc3RhdHVzX2NoYW5nZWRfY2Io R09iamVjdCogb2JqZWN0LCBHUGFyYW1TcGVjKiBwc3BlYywgV2UKIHN0YXRpYyB2b2lkIGxvYWRf d2VudGJhY2tfc3RhdHVzX2NoYW5nZWRfY2IoR09iamVjdCogb2JqZWN0LCBHUGFyYW1TcGVjKiBw c3BlYywgV2ViTG9hZGluZ0ZpeHR1cmUqIGZpeHR1cmUpCiB7CiAgICAgV2ViS2l0TG9hZFN0YXR1 cyBzdGF0dXMgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2xvYWRfc3RhdHVzKFdFQktJVF9XRUJfVklF VyhvYmplY3QpKTsKKyAgICBjaGFyKiB1cmlfc3RyaW5nOworICAgIGNoYXIqIHVyaV9zdHJpbmcy OworCisgICAgdXJpX3N0cmluZyA9IGdldF91cmlfZm9yX3BhdGgoIi90ZXN0X2xvYWRpbmdfc3Rh dHVzIik7CisgICAgdXJpX3N0cmluZzIgPSBnZXRfdXJpX2Zvcl9wYXRoKCIvdGVzdF9sb2FkaW5n X3N0YXR1czIiKTsKIAogICAgIHN3aXRjaChzdGF0dXMpIHsKICAgICBjYXNlIFdFQktJVF9MT0FE X1BST1ZJU0lPTkFMOgotICAgICAgICBnX2Fzc2VydF9jbXBzdHIod2Via2l0X3dlYl92aWV3X2dl dF91cmkoZml4dHVyZS0+d2ViVmlldyksID09LCAiaHR0cDovL3d3dy5kZWJpYW4ub3JnL2Rpc3Ry aWIvIik7CisgICAgICAgIGdfYXNzZXJ0X2NtcHN0cih3ZWJraXRfd2ViX3ZpZXdfZ2V0X3VyaShm aXh0dXJlLT53ZWJWaWV3KSwgPT0sIHVyaV9zdHJpbmcyKTsKICAgICAgICAgYnJlYWs7CiAgICAg Y2FzZSBXRUJLSVRfTE9BRF9DT01NSVRURUQ6Ci0gICAgICAgIGdfYXNzZXJ0X2NtcHN0cih3ZWJr aXRfd2ViX3ZpZXdfZ2V0X3VyaShmaXh0dXJlLT53ZWJWaWV3KSwgPT0sICJodHRwOi8vd3d3LmRl Ymlhbi5vcmcvIik7CisgICAgICAgIGdfYXNzZXJ0X2NtcHN0cih3ZWJraXRfd2ViX3ZpZXdfZ2V0 X3VyaShmaXh0dXJlLT53ZWJWaWV3KSwgPT0sIHVyaV9zdHJpbmcpOwogICAgICAgICBicmVhazsK ICAgICBjYXNlIFdFQktJVF9MT0FEX0ZBSUxFRDoKICAgICAgICAgZ19hc3NlcnRfbm90X3JlYWNo ZWQoKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXRUJLSVRfTE9BRF9GSU5JU0hFRDoKLSAg ICAgICAgZ19hc3NlcnRfY21wc3RyKHdlYmtpdF93ZWJfdmlld19nZXRfdXJpKGZpeHR1cmUtPndl YlZpZXcpLCA9PSwgImh0dHA6Ly93d3cuZGViaWFuLm9yZy8iKTsKKyAgICAgICAgZ19hc3NlcnRf Y21wc3RyKHdlYmtpdF93ZWJfdmlld19nZXRfdXJpKGZpeHR1cmUtPndlYlZpZXcpLCA9PSwgdXJp X3N0cmluZyk7CiAgICAgICAgIGdfbWFpbl9sb29wX3F1aXQoZml4dHVyZS0+bG9vcCk7CiAgICAg ICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIGJyZWFrOwogICAgIH0KKworICAgIGdf ZnJlZSh1cmlfc3RyaW5nKTsKKyAgICBnX2ZyZWUodXJpX3N0cmluZzIpOworfQorCitzdGF0aWMg dm9pZCBsb2FkX2Vycm9yX3Rlc3QoV2ViS2l0V2ViVmlldyogd2VidmlldywgV2ViS2l0V2ViRnJh bWUqIGZyYW1lLCBjb25zdCBjaGFyKiB1cmksIEdFcnJvciogZXJyb3IpCit7CisgICAgZ19kZWJ1 ZygiRXJyb3I6ICVzIiwgZXJyb3ItPm1lc3NhZ2UpOwogfQogCiBzdGF0aWMgdm9pZCB0ZXN0X2xv YWRpbmdfZ29iYWNrKFdlYkxvYWRpbmdGaXh0dXJlKiBmaXh0dXJlLCBnY29uc3Rwb2ludGVyIGRh dGEpCiB7CisgICAgY2hhciogdXJpX3N0cmluZzsKKwogICAgIGdfc2lnbmFsX2Nvbm5lY3QoZml4 dHVyZS0+d2ViVmlldywgIm5vdGlmeTo6bG9hZC1zdGF0dXMiLCBHX0NBTExCQUNLKGxvYWRfZ29i YWNrX3N0YXR1c19jaGFuZ2VkX2NiKSwgZml4dHVyZSk7CiAKLSAgICB3ZWJraXRfd2ViX3ZpZXdf bG9hZF91cmkoZml4dHVyZS0+d2ViVmlldywgImh0dHA6Ly93d3cuZGViaWFuLm9yZy8iKTsKKyAg ICBnX3NpZ25hbF9jb25uZWN0KGZpeHR1cmUtPndlYlZpZXcsICJsb2FkLWVycm9yIiwgR19DQUxM QkFDSyhsb2FkX2Vycm9yX3Rlc3QpLCBmaXh0dXJlKTsKKworICAgIHVyaV9zdHJpbmcgPSBnZXRf dXJpX2Zvcl9wYXRoKCIvdGVzdF9sb2FkaW5nX3N0YXR1cyIpOworICAgIHdlYmtpdF93ZWJfdmll d19sb2FkX3VyaShmaXh0dXJlLT53ZWJWaWV3LCB1cmlfc3RyaW5nKTsKKyAgICBnX2ZyZWUodXJp X3N0cmluZyk7CisKICAgICBnX21haW5fbG9vcF9ydW4oZml4dHVyZS0+bG9vcCk7CiAKICAgICBm aXh0dXJlLT5oYXNfYmVlbl9wcm92aXNpb25hbCA9IEZBTFNFOwpAQCAtMjg0LDkgKzM2NiwxNCBA QCBzdGF0aWMgdm9pZCB0ZXN0X2xvYWRpbmdfZ29iYWNrKFdlYkxvYWRpbmdGaXh0dXJlKiBmaXh0 dXJlLCBnY29uc3Rwb2ludGVyIGRhdGEpCiAgICAgZml4dHVyZS0+aGFzX2JlZW5fZmFpbGVkID0g RkFMU0U7CiAgICAgZml4dHVyZS0+aGFzX2JlZW5fbG9hZF9lcnJvciA9IEZBTFNFOwogCi0gICAg d2Via2l0X3dlYl92aWV3X2xvYWRfdXJpKGZpeHR1cmUtPndlYlZpZXcsICJodHRwOi8vZGViaWFu Lm9yZy9kaXN0cmliLyIpOworICAgIHVyaV9zdHJpbmcgPSBnZXRfdXJpX2Zvcl9wYXRoKCIvdGVz dF9sb2FkaW5nX3N0YXR1czIiKTsKKyAgICB3ZWJraXRfd2ViX3ZpZXdfbG9hZF91cmkoZml4dHVy ZS0+d2ViVmlldywgdXJpX3N0cmluZyk7CisgICAgZ19mcmVlKHVyaV9zdHJpbmcpOworCiAgICAg Z19tYWluX2xvb3BfcnVuKGZpeHR1cmUtPmxvb3ApOwogCisgICAgZ19zaWduYWxfaGFuZGxlcnNf ZGlzY29ubmVjdF9ieV9mdW5jKGZpeHR1cmUtPndlYlZpZXcsIGxvYWRfZ29iYWNrX3N0YXR1c19j aGFuZ2VkX2NiLCBmaXh0dXJlKTsKKwogICAgIGZpeHR1cmUtPmhhc19iZWVuX3Byb3Zpc2lvbmFs ID0gRkFMU0U7CiAgICAgZml4dHVyZS0+aGFzX2JlZW5fY29tbWl0dGVkID0gRkFMU0U7CiAgICAg Zml4dHVyZS0+aGFzX2JlZW5fZmlyc3RfdmlzdWFsbHlfbm9uX2VtcHR5X2xheW91dCA9IEZBTFNF OwpAQCAtMjk2LDEzICszODMsMjcgQEAgc3RhdGljIHZvaWQgdGVzdF9sb2FkaW5nX2dvYmFjayhX ZWJMb2FkaW5nRml4dHVyZSogZml4dHVyZSwgZ2NvbnN0cG9pbnRlciBkYXRhKQogCiAgICAgZ19z aWduYWxfY29ubmVjdChmaXh0dXJlLT53ZWJWaWV3LCAibm90aWZ5Ojpsb2FkLXN0YXR1cyIsIEdf Q0FMTEJBQ0sobG9hZF93ZW50YmFja19zdGF0dXNfY2hhbmdlZF9jYiksIGZpeHR1cmUpOwogICAg IHdlYmtpdF93ZWJfdmlld19nb19iYWNrKGZpeHR1cmUtPndlYlZpZXcpOworCisgICAgZ19tYWlu X2xvb3BfcnVuKGZpeHR1cmUtPmxvb3ApOworCisgICAgZ19zaWduYWxfaGFuZGxlcnNfZGlzY29u bmVjdF9ieV9mdW5jKGZpeHR1cmUtPndlYlZpZXcsIGxvYWRfd2VudGJhY2tfc3RhdHVzX2NoYW5n ZWRfY2IsIGZpeHR1cmUpOwogfQogCiBpbnQgbWFpbihpbnQgYXJnYywgY2hhcioqIGFyZ3YpCiB7 CisgICAgU291cFNlcnZlciogc2VydmVyOworCiAgICAgZ190aHJlYWRfaW5pdChOVUxMKTsKICAg ICBndGtfdGVzdF9pbml0KCZhcmdjLCAmYXJndiwgTlVMTCk7CiAKKyAgICBzZXJ2ZXIgPSBzb3Vw X3NlcnZlcl9uZXcoU09VUF9TRVJWRVJfUE9SVCwgMCwgTlVMTCk7CisgICAgc291cF9zZXJ2ZXJf cnVuX2FzeW5jKHNlcnZlcik7CisKKyAgICBzb3VwX3NlcnZlcl9hZGRfaGFuZGxlcihzZXJ2ZXIs IE5VTEwsIHNlcnZlcl9jYWxsYmFjaywgTlVMTCwgTlVMTCk7CisKKyAgICBiYXNlX3VyaSA9IHNv dXBfdXJpX25ldygiaHR0cDovLzEyNy4wLjAuMS8iKTsKKyAgICBzb3VwX3VyaV9zZXRfcG9ydChi YXNlX3VyaSwgc291cF9zZXJ2ZXJfZ2V0X3BvcnQoc2VydmVyKSk7CisKICAgICBnX3Rlc3RfYnVn X2Jhc2UoImh0dHBzOi8vYnVncy53ZWJraXQub3JnLyIpOwogICAgIGdfdGVzdF9hZGQoIi93ZWJr aXQvbG9hZGluZy9zdGF0dXMiLAogICAgICAgICAgICAgICAgV2ViTG9hZGluZ0ZpeHR1cmUsIE5V TEwsCi0tIAoxLjYuNS43Cgo=