98342 2012-10-03 23:46:25 -0700 REGRESSION (r129989 - r130019): [WK2] TestResources test is failing 2012-10-05 08:26:06 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan webkit-unassigned cgarcia gustavo mario mrobinson spena webkit.review.bot oldest_to_newest 734404 0 zan 2012-10-03 23:46:25 -0700 The TestResources unit test is failing, first starting doing so here: http://build.webkit.org/builders/GTK%20Linux%2064-bit%20Release/builds/29211 Output for this test: TEST: ./Tools/gtk/../Scripts/../../WebKitBuild/Release/Programs/WebKit2APITests/TestResources... (pid=9982) /webkit2/WebKitWebResource/loading: ** ERROR:../../Source/WebKit2/UIProcess/API/gtk/tests/TestResources.cpp:344:void testWebResourceLoading(SingleResourceLoadTest*, gconstpointer): assertion failed (events.size() == 4): (6 == 4) FAIL Suspect revisions are: http://trac.webkit.org/changeset/129992 http://trac.webkit.org/changeset/129994 734408 1 zan 2012-10-03 23:58:27 -0700 The failure in debug build is a bit different: TEST: ./Tools/gtk/../Scripts/../../WebKitBuild/Debug/Programs/WebKit2APITests/TestResources... (pid=20594) /webkit2/WebKitWebResource/loading: ERROR: Failed to start load for icon at url http://127.0.0.1:46786/favicon.ico ../../Source/WebCore/loader/icon/IconLoader.cpp(73) : void WebCore::IconLoader::startLoading() ERROR: Failed to start load for icon at url http://127.0.0.1:46786/favicon.ico ../../Source/WebCore/loader/icon/IconLoader.cpp(73) : void WebCore::IconLoader::startLoading() OK /webkit2/WebKitWebResource/response: ERROR: Failed to start load for icon at url http://127.0.0.1:46786/favicon.ico ../../Source/WebCore/loader/icon/IconLoader.cpp(73) : void WebCore::IconLoader::startLoading() ERROR: Failed to start load for icon at url http://127.0.0.1:46786/favicon.ico ../../Source/WebCore/loader/icon/IconLoader.cpp(73) : void WebCore::IconLoader::startLoading() ERROR: Failed to start load for icon at url http://127.0.0.1:46786/favicon.ico ../../Source/WebCore/loader/icon/IconLoader.cpp(73) : void WebCore::IconLoader::startLoading() ** (./Tools/gtk/../Scripts/../../WebKitBuild/Debug/Programs/WebKit2APITests/TestResources:20594): CRITICAL **: guint webkit_uri_response_get_status_code(WebKitURIResponse*): assertion `WEBKIT_IS_URI_RESPONSE(response)' failed FAIL 734415 2 cgarcia 2012-10-04 00:09:34 -0700 We probably need to update some unit tests to handle /favicon.icon requests in the soup server to return a 404. I'll look at it. 735586 3 167313 cgarcia 2012-10-05 05:22:24 -0700 Created attachment 167313 Try to fix the errors loading the favicon 735588 4 webkit.review.bot 2012-10-05 05:26:33 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 735653 5 cgarcia 2012-10-05 08:26:06 -0700 Committed r130507: <http://trac.webkit.org/changeset/130507> 167313 2012-10-05 05:22:24 -0700 2012-10-05 08:14:05 -0700 Try to fix the errors loading the favicon wk2-ignore-favicon.diff text/plain 9065 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBjYmZhNjRhLi45NzBmNWRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEg QEAKKzIwMTItMTAtMDUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFJFR1JFU1NJT04gKHIxMjk5ODkgLSByMTMwMDE5KTogW1dLMl0gVGVzdFJl c291cmNlcyB0ZXN0IGlzIGZhaWxpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTk4MzQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUmV0dXJuIDQwNCBlcnJvciBpbiB1bml0IHRlc3RzIHVzaW5nIGEgSFRU UCBzZXJ2ZXIgZm9yIHBhdGhzIG5vdAorICAgICAgICBoYW5kbGVkIGJ5IHRoZSB0ZXN0LiBUaGlz IHdheSBhbGwgdGVzdHMgc2hvdWxkIHJldHVybiBub3cgYSA0MDQKKyAgICAgICAgZm9yIC9mYXZp Y29uLmljby4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RCYWNrRm9y d2FyZExpc3QuY3BwOgorICAgICAgICAoc2VydmVyQ2FsbGJhY2spOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RDb29raWVNYW5hZ2VyLmNwcDoKKyAgICAgICAgKHNlcnZl ckNhbGxiYWNrKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0TG9hZGVy Q2xpZW50LmNwcDoKKyAgICAgICAgKHNlcnZlckNhbGxiYWNrKToKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL2d0ay90ZXN0cy9UZXN0UmVzb3VyY2VzLmNwcDoKKyAgICAgICAgKHNlcnZlckNhbGxi YWNrKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0U1NMLmNwcDoKKyAg ICAgICAgKHNlcnZlckNhbGxiYWNrKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay90ZXN0 cy9UZXN0V2ViS2l0UG9saWN5Q2xpZW50LmNwcDoKKyAgICAgICAgKHNlcnZlckNhbGxiYWNrKToK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0U2V0dGluZ3MuY3Bw OgorICAgICAgICAoc2VydmVyQ2FsbGJhY2spOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3Rr L3Rlc3RzL1Rlc3RXZWJLaXRXZWJDb250ZXh0LmNwcDoKKyAgICAgICAgKHNlcnZlckNhbGxiYWNr KToKKwogMjAxMi0xMC0wNSAgSm9uZ3Nlb2sgWWFuZyAgPGpzNDUueWFuZ0BzYW1zdW5nLmNvbT4K IAogICAgICAgICBbRUZMXVtXSzJdIFJlbW92ZSAid2ViIiB3b3JkIGZyb20gZXdrX3Jlc291cmNl IEFQSXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3Rz L1Rlc3RCYWNrRm9yd2FyZExpc3QuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9n dGsvdGVzdHMvVGVzdEJhY2tGb3J3YXJkTGlzdC5jcHAKaW5kZXggZTcwZTM5MS4uYjQ3OTM2NiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdEJh Y2tGb3J3YXJkTGlzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv dGVzdHMvVGVzdEJhY2tGb3J3YXJkTGlzdC5jcHAKQEAgLTM4LDYgKzM4LDExIEBAIHN0YXRpYyB2 b2lkIHNlcnZlckNhbGxiYWNrKFNvdXBTZXJ2ZXIqIHNlcnZlciwgU291cE1lc3NhZ2UqIG1zZywg Y29uc3QgY2hhciogcGF0CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICBpZiAoZ19zdHJf aGFzX3N1ZmZpeChwYXRoLCAiZmF2aWNvbi5pY28iKSkgeworICAgICAgICBzb3VwX21lc3NhZ2Vf c2V0X3N0YXR1cyhtc2csIFNPVVBfU1RBVFVTX05PVF9GT1VORCk7CisgICAgICAgIHJldHVybjsK KyAgICB9CisKICAgICBzb3VwX21lc3NhZ2Vfc2V0X3N0YXR1cyhtc2csIFNPVVBfU1RBVFVTX09L KTsKIAogICAgIGNoYXIqIGJvZHkgPSBnX3N0cmR1cF9wcmludGYoIjxodG1sPjx0aXRsZT4lczwv dGl0bGU+PGJvZHk+JXM8L2JvZHk+PC9odG1sPiIsIHBhdGggKyAxLCBwYXRoICsgMSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0Q29va2ll TWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0 Q29va2llTWFuYWdlci5jcHAKaW5kZXggMjlmMjMyMS4uOTRhZWVmNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdENvb2tpZU1hbmFnZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RDb29raWVN YW5hZ2VyLmNwcApAQCAtMjk0LDYgKzI5NCw4IEBAIHN0YXRpYyB2b2lkIHNlcnZlckNhbGxiYWNr KFNvdXBTZXJ2ZXIqIHNlcnZlciwgU291cE1lc3NhZ2UqIG1lc3NhZ2UsIGNvbnN0IGNoYXIqCiAg ICAgICAgIHNvdXBfbWVzc2FnZV9ib2R5X2FwcGVuZChtZXNzYWdlLT5yZXNwb25zZV9ib2R5LCBT T1VQX01FTU9SWV9UQUtFLCBpbmRleEh0bWwsIHN0cmxlbihpbmRleEh0bWwpKTsKICAgICB9IGVs c2UgaWYgKGdfc3RyX2VxdWFsKHBhdGgsICIvaW1hZ2UucG5nIikpCiAgICAgICAgIHNvdXBfbWVz c2FnZV9oZWFkZXJzX3JlcGxhY2UobWVzc2FnZS0+cmVzcG9uc2VfaGVhZGVycywgIlNldC1Db29r aWUiLCAiYmF6PXF1eDsgTWF4LUFnZT02MCIpOworICAgIGVsc2UKKyAgICAgICAgc291cF9tZXNz YWdlX3NldF9zdGF0dXMobWVzc2FnZSwgU09VUF9TVEFUVVNfTk9UX0ZPVU5EKTsKICAgICBzb3Vw X21lc3NhZ2VfYm9keV9jb21wbGV0ZShtZXNzYWdlLT5yZXNwb25zZV9ib2R5KTsKIH0KIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdExvYWRl ckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0 TG9hZGVyQ2xpZW50LmNwcAppbmRleCBjM2ExNDE5Li44ZmNmMzMwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0TG9hZGVyQ2xpZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0TG9hZGVyQ2xp ZW50LmNwcApAQCAtMzEyLDcgKzMxMiw4IEBAIHN0YXRpYyB2b2lkIHNlcnZlckNhbGxiYWNrKFNv dXBTZXJ2ZXIqIHNlcnZlciwgU291cE1lc3NhZ2UqIG1lc3NhZ2UsIGNvbnN0IGNoYXIqCiAgICAg ICAgIHNvdXBfbWVzc2FnZV9ib2R5X2FwcGVuZChtZXNzYWdlLT5yZXNwb25zZV9ib2R5LCBTT1VQ X01FTU9SWV9TVEFUSUMsIHJlc3BvbnNlU3RyaW5nLCBzdHJsZW4ocmVzcG9uc2VTdHJpbmcpKTsK ICAgICAgICAgc291cF9zZXJ2ZXJfdW5wYXVzZV9tZXNzYWdlKHNlcnZlciwgbWVzc2FnZSk7CiAg ICAgICAgIHJldHVybjsKLSAgICB9CisgICAgfSBlbHNlCisgICAgICAgIHNvdXBfbWVzc2FnZV9z ZXRfc3RhdHVzKG1lc3NhZ2UsIFNPVVBfU1RBVFVTX05PVF9GT1VORCk7CiAKICAgICBzb3VwX21l c3NhZ2VfYm9keV9jb21wbGV0ZShtZXNzYWdlLT5yZXNwb25zZV9ib2R5KTsKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RSZXNvdXJjZXMu Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFJlc291cmNl cy5jcHAKaW5kZXggN2UyZTVkZS4uMWJhNTkyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFJlc291cmNlcy5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFJlc291cmNlcy5jcHAKQEAgLTU5NCw2 ICs1OTQsOCBAQCBzdGF0aWMgdm9pZCBzZXJ2ZXJDYWxsYmFjayhTb3VwU2VydmVyKiBzZXJ2ZXIs IFNvdXBNZXNzYWdlKiBtZXNzYWdlLCBjb25zdCBjaGFyKgogICAgICAgICBzb3VwX21lc3NhZ2Vf aGVhZGVyc19hcHBlbmQobWVzc2FnZS0+cmVzcG9uc2VfaGVhZGVycywgIkxvY2F0aW9uIiwgIi9z aW1wbGUtc3R5bGUuY3NzIik7CiAgICAgfSBlbHNlIGlmIChnX3N0cl9lcXVhbChwYXRoLCAiL2lu dmFsaWQuY3NzIikpCiAgICAgICAgIHNvdXBfbWVzc2FnZV9zZXRfc3RhdHVzKG1lc3NhZ2UsIFNP VVBfU1RBVFVTX0NBTlRfQ09OTkVDVCk7CisgICAgZWxzZQorICAgICAgICBzb3VwX21lc3NhZ2Vf c2V0X3N0YXR1cyhtZXNzYWdlLCBTT1VQX1NUQVRVU19OT1RfRk9VTkQpOwogICAgIHNvdXBfbWVz c2FnZV9ib2R5X2NvbXBsZXRlKG1lc3NhZ2UtPnJlc3BvbnNlX2JvZHkpOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0U1NMLmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RTU0wuY3BwCmluZGV4 IDQwZTlmYmUuLjhmYTAxM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL3Rlc3RzL1Rlc3RTU0wuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL3Rlc3RzL1Rlc3RTU0wuY3BwCkBAIC04Miw5ICs4MiwxMiBAQCBzdGF0aWMgdm9pZCBz ZXJ2ZXJDYWxsYmFjayhTb3VwU2VydmVyKiBzZXJ2ZXIsIFNvdXBNZXNzYWdlKiBtZXNzYWdlLCBj b25zdCBjaGFyKgogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgc291cF9tZXNzYWdlX3Nl dF9zdGF0dXMobWVzc2FnZSwgU09VUF9TVEFUVVNfT0spOwotICAgIHNvdXBfbWVzc2FnZV9ib2R5 X2FwcGVuZChtZXNzYWdlLT5yZXNwb25zZV9ib2R5LCBTT1VQX01FTU9SWV9TVEFUSUMsIGluZGV4 SFRNTCwgc3RybGVuKGluZGV4SFRNTCkpOwotICAgIHNvdXBfbWVzc2FnZV9ib2R5X2NvbXBsZXRl KG1lc3NhZ2UtPnJlc3BvbnNlX2JvZHkpOworICAgIGlmIChnX3N0cl9lcXVhbChwYXRoLCAiLyIp KSB7CisgICAgICAgIHNvdXBfbWVzc2FnZV9zZXRfc3RhdHVzKG1lc3NhZ2UsIFNPVVBfU1RBVFVT X09LKTsKKyAgICAgICAgc291cF9tZXNzYWdlX2JvZHlfYXBwZW5kKG1lc3NhZ2UtPnJlc3BvbnNl X2JvZHksIFNPVVBfTUVNT1JZX1NUQVRJQywgaW5kZXhIVE1MLCBzdHJsZW4oaW5kZXhIVE1MKSk7 CisgICAgICAgIHNvdXBfbWVzc2FnZV9ib2R5X2NvbXBsZXRlKG1lc3NhZ2UtPnJlc3BvbnNlX2Jv ZHkpOworICAgIH0gZWxzZQorICAgICAgICBzb3VwX21lc3NhZ2Vfc2V0X3N0YXR1cyhtZXNzYWdl LCBTT1VQX1NUQVRVU19OT1RfRk9VTkQpOwogfQogCiB2b2lkIGJlZm9yZUFsbCgpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0UG9s aWN5Q2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rl c3RXZWJLaXRQb2xpY3lDbGllbnQuY3BwCmluZGV4IDlmNmNlNzguLmFiYmZkNjUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRQb2xp Y3lDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3Rz L1Rlc3RXZWJLaXRQb2xpY3lDbGllbnQuY3BwCkBAIC0yMzIsMTEgKzIzMiwxMyBAQCBzdGF0aWMg dm9pZCBzZXJ2ZXJDYWxsYmFjayhTb3VwU2VydmVyKiBzZXJ2ZXIsIFNvdXBNZXNzYWdlKiBtZXNz YWdlLCBjb25zdCBjaGFyKgogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgc291cF9tZXNz YWdlX3NldF9zdGF0dXMobWVzc2FnZSwgU09VUF9TVEFUVVNfT0spOwotCi0gICAgc3RhdGljIGNv bnN0IGNoYXIqIHJlc3BvbnNlU3RyaW5nID0gIjxodG1sPjxib2R5PlRlc3RpbmchPC9ib2R5Pjwv aHRtbD4iOwotICAgIHNvdXBfbWVzc2FnZV9ib2R5X2FwcGVuZChtZXNzYWdlLT5yZXNwb25zZV9i b2R5LCBTT1VQX01FTU9SWV9TVEFUSUMsIHJlc3BvbnNlU3RyaW5nLCBzdHJsZW4ocmVzcG9uc2VT dHJpbmcpKTsKLSAgICBzb3VwX21lc3NhZ2VfYm9keV9jb21wbGV0ZShtZXNzYWdlLT5yZXNwb25z ZV9ib2R5KTsKKyAgICBpZiAoZ19zdHJfZXF1YWwocGF0aCwgIi8iKSkgeworICAgICAgICBzdGF0 aWMgY29uc3QgY2hhciogcmVzcG9uc2VTdHJpbmcgPSAiPGh0bWw+PGJvZHk+VGVzdGluZyE8L2Jv ZHk+PC9odG1sPiI7CisgICAgICAgIHNvdXBfbWVzc2FnZV9zZXRfc3RhdHVzKG1lc3NhZ2UsIFNP VVBfU1RBVFVTX09LKTsKKyAgICAgICAgc291cF9tZXNzYWdlX2JvZHlfYXBwZW5kKG1lc3NhZ2Ut PnJlc3BvbnNlX2JvZHksIFNPVVBfTUVNT1JZX1NUQVRJQywgcmVzcG9uc2VTdHJpbmcsIHN0cmxl bihyZXNwb25zZVN0cmluZykpOworICAgICAgICBzb3VwX21lc3NhZ2VfYm9keV9jb21wbGV0ZSht ZXNzYWdlLT5yZXNwb25zZV9ib2R5KTsKKyAgICB9IGVsc2UKKyAgICAgICAgc291cF9tZXNzYWdl X3NldF9zdGF0dXMobWVzc2FnZSwgU09VUF9TVEFUVVNfTk9UX0ZPVU5EKTsKIH0KIAogdm9pZCBi ZWZvcmVBbGwoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv dGVzdHMvVGVzdFdlYktpdFNldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRTZXR0aW5ncy5jcHAKaW5kZXggZDhlMzU1NC4uMjlkMWFk YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVz dFdlYktpdFNldHRpbmdzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay90ZXN0cy9UZXN0V2ViS2l0U2V0dGluZ3MuY3BwCkBAIC0zMTUsMTAgKzMxNSwxMyBAQCBzdGF0 aWMgdm9pZCBzZXJ2ZXJDYWxsYmFjayhTb3VwU2VydmVyKiBzZXJ2ZXIsIFNvdXBNZXNzYWdlKiBt ZXNzYWdlLCBjb25zdCBjaGFyKgogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgc291cF9t ZXNzYWdlX3NldF9zdGF0dXMobWVzc2FnZSwgU09VUF9TVEFUVVNfT0spOwotICAgIGNvbnN0IGNo YXIqIHVzZXJBZ2VudCA9IHNvdXBfbWVzc2FnZV9oZWFkZXJzX2dldF9vbmUobWVzc2FnZS0+cmVx dWVzdF9oZWFkZXJzLCAiVXNlci1BZ2VudCIpOwotICAgIHNvdXBfbWVzc2FnZV9ib2R5X2FwcGVu ZChtZXNzYWdlLT5yZXNwb25zZV9ib2R5LCBTT1VQX01FTU9SWV9DT1BZLCB1c2VyQWdlbnQsIHN0 cmxlbih1c2VyQWdlbnQpKTsKLSAgICBzb3VwX21lc3NhZ2VfYm9keV9jb21wbGV0ZShtZXNzYWdl LT5yZXNwb25zZV9ib2R5KTsKKyAgICBpZiAoZ19zdHJfZXF1YWwocGF0aCwgIi8iKSkgeworICAg ICAgICBjb25zdCBjaGFyKiB1c2VyQWdlbnQgPSBzb3VwX21lc3NhZ2VfaGVhZGVyc19nZXRfb25l KG1lc3NhZ2UtPnJlcXVlc3RfaGVhZGVycywgIlVzZXItQWdlbnQiKTsKKyAgICAgICAgc291cF9t ZXNzYWdlX3NldF9zdGF0dXMobWVzc2FnZSwgU09VUF9TVEFUVVNfT0spOworICAgICAgICBzb3Vw X21lc3NhZ2VfYm9keV9hcHBlbmQobWVzc2FnZS0+cmVzcG9uc2VfYm9keSwgU09VUF9NRU1PUllf Q09QWSwgdXNlckFnZW50LCBzdHJsZW4odXNlckFnZW50KSk7CisgICAgICAgIHNvdXBfbWVzc2Fn ZV9ib2R5X2NvbXBsZXRlKG1lc3NhZ2UtPnJlc3BvbnNlX2JvZHkpOworICAgIH0gZWxzZQorICAg ICAgICBzb3VwX21lc3NhZ2Vfc2V0X3N0YXR1cyhtZXNzYWdlLCBTT1VQX1NUQVRVU19OT1RfRk9V TkQpOwogfQogCiB2b2lkIGJlZm9yZUFsbCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0V2ViQ29udGV4dC5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0V2ViQ29udGV4dC5jcHAK aW5kZXggMTM5YzI4OC4uMTg1YzA2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdFdlYkNvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRXZWJDb250ZXh0LmNwcApA QCAtMjkzLDEwICsyOTMsMTMgQEAgc3RhdGljIHZvaWQgc2VydmVyQ2FsbGJhY2soU291cFNlcnZl ciogc2VydmVyLCBTb3VwTWVzc2FnZSogbWVzc2FnZSwgY29uc3QgY2hhcioKICAgICAgICAgcmV0 dXJuOwogICAgIH0KIAotICAgIHNvdXBfbWVzc2FnZV9zZXRfc3RhdHVzKG1lc3NhZ2UsIFNPVVBf U1RBVFVTX09LKTsKLSAgICBjb25zdCBjaGFyKiBhY2NlcHRMYW5ndWFnZSA9IHNvdXBfbWVzc2Fn ZV9oZWFkZXJzX2dldF9vbmUobWVzc2FnZS0+cmVxdWVzdF9oZWFkZXJzLCAiQWNjZXB0LUxhbmd1 YWdlIik7Ci0gICAgc291cF9tZXNzYWdlX2JvZHlfYXBwZW5kKG1lc3NhZ2UtPnJlc3BvbnNlX2Jv ZHksIFNPVVBfTUVNT1JZX0NPUFksIGFjY2VwdExhbmd1YWdlLCBzdHJsZW4oYWNjZXB0TGFuZ3Vh Z2UpKTsKLSAgICBzb3VwX21lc3NhZ2VfYm9keV9jb21wbGV0ZShtZXNzYWdlLT5yZXNwb25zZV9i b2R5KTsKKyAgICBpZiAoZ19zdHJfZXF1YWwocGF0aCwgIi8iKSkgeworICAgICAgICBjb25zdCBj aGFyKiBhY2NlcHRMYW5ndWFnZSA9IHNvdXBfbWVzc2FnZV9oZWFkZXJzX2dldF9vbmUobWVzc2Fn ZS0+cmVxdWVzdF9oZWFkZXJzLCAiQWNjZXB0LUxhbmd1YWdlIik7CisgICAgICAgIHNvdXBfbWVz c2FnZV9zZXRfc3RhdHVzKG1lc3NhZ2UsIFNPVVBfU1RBVFVTX09LKTsKKyAgICAgICAgc291cF9t ZXNzYWdlX2JvZHlfYXBwZW5kKG1lc3NhZ2UtPnJlc3BvbnNlX2JvZHksIFNPVVBfTUVNT1JZX0NP UFksIGFjY2VwdExhbmd1YWdlLCBzdHJsZW4oYWNjZXB0TGFuZ3VhZ2UpKTsKKyAgICAgICAgc291 cF9tZXNzYWdlX2JvZHlfY29tcGxldGUobWVzc2FnZS0+cmVzcG9uc2VfYm9keSk7CisgICAgfSBl bHNlCisgICAgICAgIHNvdXBfbWVzc2FnZV9zZXRfc3RhdHVzKG1lc3NhZ2UsIFNPVVBfU1RBVFVT X05PVF9GT1VORCk7CiB9CiAKIGNsYXNzIFNlY3VyaXR5UG9saWN5VGVzdDogcHVibGljIFRlc3Qg ewo=