219160 2020-11-19 07:15:42 -0800 [GTK][WPE] Migrate WebKitTestServer to libsoup 2.48 API 2021-02-02 00:50:35 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=146109 InRadar P2 Normal --- 220922 219257 1 fred.wang fred.wang benjamin cdumez cgarcia cmarcelo commit-queue ews-watchlist mcatanzaro pgriffis webkit-bug-importer oldest_to_newest 1709089 0 414575 fred.wang 2020-11-19 07:15:42 -0800 Created attachment 414575 Untested patch It seems our WebDriver code uses the new soup_server_listen APIs from 2.48, so the code added in bug 146165 is no longer correct, we should really require 2.48 or higher. 1709090 1 414576 fred.wang 2020-11-19 07:16:25 -0800 Created attachment 414576 Untested patch 1709091 2 414577 fred.wang 2020-11-19 07:17:07 -0800 Created attachment 414577 Untested patch 1709161 3 414577 fred.wang 2020-11-19 09:52:16 -0800 Comment on attachment 414577 Untested patch Please take a look. Disclaimer: I haven't use glib for a long time, hopefully I haven't misused the API. 1709410 4 414660 fred.wang 2020-11-20 00:54:40 -0800 Created attachment 414660 Patch 1709420 5 ews-feeder 2020-11-20 01:40:37 -0800 Committed r270074: <https://trac.webkit.org/changeset/270074> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414660. 1709421 6 webkit-bug-importer 2020-11-20 01:41:16 -0800 <rdar://problem/71620310> 1722058 7 commit-queue 2021-01-25 07:06:46 -0800 Re-opened since this is blocked by bug 220922 1724193 8 418858 cgarcia 2021-02-01 04:43:28 -0800 Created attachment 418858 Patch 1724220 9 418858 mcatanzaro 2021-02-01 06:54:17 -0800 Comment on attachment 418858 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418858&action=review > Tools/TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.cpp:35 > + m_soupServer = adoptGRef(soup_server_new("server-header", "WebKitTestServer ", nullptr)); If options[ServerRunInThread] is set, I would go even further and create this on the WorkQueue thread using your trick with BinarySemaphore to dispatch a function and wait until it completes. Sharing m_soupServer across threads like the current code does might work in practice, but I doubt it's safe. 1724224 10 cgarcia 2021-02-01 07:09:28 -0800 (In reply to Michael Catanzaro from comment #9) > Comment on attachment 418858 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=418858&action=review > > > Tools/TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.cpp:35 > > + m_soupServer = adoptGRef(soup_server_new("server-header", "WebKitTestServer ", nullptr)); > > If options[ServerRunInThread] is set, I would go even further and create > this on the WorkQueue thread using your trick with BinarySemaphore to > dispatch a function and wait until it completes. Sharing m_soupServer across > threads like the current code does might work in practice, but I doubt it's > safe. Well, the creation and run happen before any test start, so it should be safe, I would say. We don't even need the run, and server callback could be a constructor parameter, but that would require all the tests and I don't think it's worth it. 1724231 11 mcatanzaro 2021-02-01 07:12:24 -0800 I just like to be paranoid about sharing objects across threads. Anyway, it's probably OK. You have r+. 1724558 12 cgarcia 2021-02-02 00:50:35 -0800 Committed r272195: <https://trac.webkit.org/changeset/272195> 414575 2020-11-19 07:15:42 -0800 2020-11-19 07:16:25 -0800 Untested patch a.patch text/plain 1973 fred.wang Y29tbWl0IDgxOWM2NTQxMmFmNjg4MDNiNWRkNDEyYWU0NmMwMGExOWQ1ODg3YTkKQXV0aG9yOiBG cmVkZXJpYyBXYW5nIDxmd2FuZ0BpZ2FsaWEuY29tPgpEYXRlOiAgIFRodSBOb3YgMTkgMTY6MDU6 MzQgMjAyMCArMDEwMAoKICAgIHdlYmtpdHRlc3RzZXJ2ZXIKCmRpZmYgLS1naXQgYS9Ub29scy9U ZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmNwcCBiL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYktpdFRlc3RTZXJ2ZXIuY3BwCmluZGV4 IGQyZTQ5NWNhZDJhMy4uYjBhMGRiZjFiZGVlIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0 QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmNwcAorKysgYi9Ub29scy9UZXN0 V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmNwcApAQCAtMzksMTUg KzM5LDIyIEBAIFdlYktpdFRlc3RTZXJ2ZXI6OldlYktpdFRlc3RTZXJ2ZXIoU2VydmVyT3B0aW9u cyBvcHRpb25zKQogICAgICAgICBzc2xLZXlGaWxlLnJlc2V0KGdfYnVpbGRfZmlsZW5hbWUocmVz b3VyY2VzRGlyLmRhdGEoKSwgInRlc3Qta2V5LnBlbSIsIE5VTEwpKTsKICAgICB9CiAKLSAgICBH UmVmUHRyPFNvdXBBZGRyZXNzPiBhZGRyZXNzID0gYWRvcHRHUmVmKHNvdXBfYWRkcmVzc19uZXco IjEyNy4wLjAuMSIsIFNPVVBfQUREUkVTU19BTllfUE9SVCkpOwotICAgIHNvdXBfYWRkcmVzc19y ZXNvbHZlX3N5bmMoYWRkcmVzcy5nZXQoKSwgMCk7Ci0KLSAgICBtX3NvdXBTZXJ2ZXIgPSBhZG9w dEdSZWYoc291cF9zZXJ2ZXJfbmV3KFNPVVBfU0VSVkVSX0lOVEVSRkFDRSwgYWRkcmVzcy5nZXQo KSwKKyAgICBtX3NvdXBTZXJ2ZXIgPSBhZG9wdEdSZWYoc291cF9zZXJ2ZXJfbmV3KAogICAgICAg ICBTT1VQX1NFUlZFUl9BU1lOQ19DT05URVhULCBtX3F1ZXVlID8gbV9xdWV1ZS0+cnVuTG9vcCgp Lm1haW5Db250ZXh0KCkgOiBudWxscHRyLAogICAgICAgICBTT1VQX1NFUlZFUl9TU0xfQ0VSVF9G SUxFLCBzc2xDZXJ0aWZpY2F0ZUZpbGUuZ2V0KCksCiAgICAgICAgIFNPVVBfU0VSVkVSX1NTTF9L RVlfRklMRSwgc3NsS2V5RmlsZS5nZXQoKSwgbnVsbHB0cikpOwotICAgIG1fYmFzZVVSSSA9IG9w dGlvbnMgJiBTZXJ2ZXJIVFRQUyA/IHNvdXBfdXJpX25ldygiaHR0cHM6Ly8xMjcuMC4wLjEvIikg OiBzb3VwX3VyaV9uZXcoImh0dHA6Ly8xMjcuMC4wLjEvIik7Ci0gICAgc291cF91cmlfc2V0X3Bv cnQobV9iYXNlVVJJLCBzb3VwX3NlcnZlcl9nZXRfcG9ydChtX3NvdXBTZXJ2ZXIuZ2V0KCkpKTsK KworICAgIEdVbmlxdWVPdXRQdHI8R0Vycm9yPiBlcnJvcjsKKyAgICBTb3VwU2VydmVyTGlzdGVu T3B0aW9ucyBzZXJ2ZXJPcHRpb25zID0gc3RhdGljX2Nhc3Q8U291cFNlcnZlckxpc3Rlbk9wdGlv bnM+KG9wdGlvbnMgJiBTZXJ2ZXJIVFRQUyA/IFNPVVBfU0VSVkVSX0xJU1RFTl9JUFY0X09OTFkg OiBTT1VQX1NFUlZFUl9MSVNURU5fSVBWNF9PTkxZIHwgU09VUF9TRVJWRVJfTElTVEVOX0hUVFBT KTsKKyAgICBpZiAoIXNvdXBfc2VydmVyX2xpc3Rlbl9sb2NhbChtX3NvdXBTZXJ2ZXIuZ2V0KCks IDAsIHNlcnZlck9wdGlvbnMsICZlcnJvci5vdXRQdHIoKSkpIHsKKyAgICAgICAgV1RGTG9nQWx3 YXlzKCJGYWlsZWQgdG8gc3RhcnQgSFRUUCBzZXJ2ZXI6ICVzIiwgZXJyb3ItPm1lc3NhZ2UpOwor ICAgICAgICBDUkFTSCgpOworICAgIH0KKworICAgIEdTTGlzdCogdXJpcyA9IHNvdXBfc2VydmVy X2dldF91cmlzKG1fc291cFNlcnZlci5nZXQoKSk7CisgICAgQVNTRVJUKHVyaXMpOworICAgIG1f YmFzZVVSSSA9IHN0YXRpY19jYXN0PFNvdXBVUkkqPihnX29iamVjdF9yZWYodXJpcy0+ZGF0YSkp OworICAgIGdfc2xpc3RfZnJlZV9mdWxsKHVyaXMsIGdfb2JqZWN0X3VucmVmKTsKIH0KIAogV2Vi S2l0VGVzdFNlcnZlcjo6fldlYktpdFRlc3RTZXJ2ZXIoKQo= 414576 2020-11-19 07:16:25 -0800 2020-11-19 07:17:07 -0800 Untested patch a.patch text/plain 1973 fred.wang Y29tbWl0IDgxOWM2NTQxMmFmNjg4MDNiNWRkNDEyYWU0NmMwMGExOWQ1ODg3YTkKQXV0aG9yOiBG cmVkZXJpYyBXYW5nIDxmd2FuZ0BpZ2FsaWEuY29tPgpEYXRlOiAgIFRodSBOb3YgMTkgMTY6MDU6 MzQgMjAyMCArMDEwMAoKICAgIHdlYmtpdHRlc3RzZXJ2ZXIKCmRpZmYgLS1naXQgYS9Ub29scy9U ZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmNwcCBiL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYktpdFRlc3RTZXJ2ZXIuY3BwCmluZGV4 IGQyZTQ5NWNhZDJhMy4uYjBhMGRiZjFiZGVlIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0 QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmNwcAorKysgYi9Ub29scy9UZXN0 V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmNwcApAQCAtMzksMTUg KzM5LDIyIEBAIFdlYktpdFRlc3RTZXJ2ZXI6OldlYktpdFRlc3RTZXJ2ZXIoU2VydmVyT3B0aW9u cyBvcHRpb25zKQogICAgICAgICBzc2xLZXlGaWxlLnJlc2V0KGdfYnVpbGRfZmlsZW5hbWUocmVz b3VyY2VzRGlyLmRhdGEoKSwgInRlc3Qta2V5LnBlbSIsIE5VTEwpKTsKICAgICB9CiAKLSAgICBH UmVmUHRyPFNvdXBBZGRyZXNzPiBhZGRyZXNzID0gYWRvcHRHUmVmKHNvdXBfYWRkcmVzc19uZXco IjEyNy4wLjAuMSIsIFNPVVBfQUREUkVTU19BTllfUE9SVCkpOwotICAgIHNvdXBfYWRkcmVzc19y ZXNvbHZlX3N5bmMoYWRkcmVzcy5nZXQoKSwgMCk7Ci0KLSAgICBtX3NvdXBTZXJ2ZXIgPSBhZG9w dEdSZWYoc291cF9zZXJ2ZXJfbmV3KFNPVVBfU0VSVkVSX0lOVEVSRkFDRSwgYWRkcmVzcy5nZXQo KSwKKyAgICBtX3NvdXBTZXJ2ZXIgPSBhZG9wdEdSZWYoc291cF9zZXJ2ZXJfbmV3KAogICAgICAg ICBTT1VQX1NFUlZFUl9BU1lOQ19DT05URVhULCBtX3F1ZXVlID8gbV9xdWV1ZS0+cnVuTG9vcCgp Lm1haW5Db250ZXh0KCkgOiBudWxscHRyLAogICAgICAgICBTT1VQX1NFUlZFUl9TU0xfQ0VSVF9G SUxFLCBzc2xDZXJ0aWZpY2F0ZUZpbGUuZ2V0KCksCiAgICAgICAgIFNPVVBfU0VSVkVSX1NTTF9L RVlfRklMRSwgc3NsS2V5RmlsZS5nZXQoKSwgbnVsbHB0cikpOwotICAgIG1fYmFzZVVSSSA9IG9w dGlvbnMgJiBTZXJ2ZXJIVFRQUyA/IHNvdXBfdXJpX25ldygiaHR0cHM6Ly8xMjcuMC4wLjEvIikg OiBzb3VwX3VyaV9uZXcoImh0dHA6Ly8xMjcuMC4wLjEvIik7Ci0gICAgc291cF91cmlfc2V0X3Bv cnQobV9iYXNlVVJJLCBzb3VwX3NlcnZlcl9nZXRfcG9ydChtX3NvdXBTZXJ2ZXIuZ2V0KCkpKTsK KworICAgIEdVbmlxdWVPdXRQdHI8R0Vycm9yPiBlcnJvcjsKKyAgICBTb3VwU2VydmVyTGlzdGVu T3B0aW9ucyBzZXJ2ZXJPcHRpb25zID0gc3RhdGljX2Nhc3Q8U291cFNlcnZlckxpc3Rlbk9wdGlv bnM+KG9wdGlvbnMgJiBTZXJ2ZXJIVFRQUyA/IFNPVVBfU0VSVkVSX0xJU1RFTl9JUFY0X09OTFkg fCBTT1VQX1NFUlZFUl9MSVNURU5fSFRUUFMgOiBTT1VQX1NFUlZFUl9MSVNURU5fSVBWNF9PTkxZ KTsKKyAgICBpZiAoIXNvdXBfc2VydmVyX2xpc3Rlbl9sb2NhbChtX3NvdXBTZXJ2ZXIuZ2V0KCks IDAsIHNlcnZlck9wdGlvbnMsICZlcnJvci5vdXRQdHIoKSkpIHsKKyAgICAgICAgV1RGTG9nQWx3 YXlzKCJGYWlsZWQgdG8gc3RhcnQgSFRUUCBzZXJ2ZXI6ICVzIiwgZXJyb3ItPm1lc3NhZ2UpOwor ICAgICAgICBDUkFTSCgpOworICAgIH0KKworICAgIEdTTGlzdCogdXJpcyA9IHNvdXBfc2VydmVy X2dldF91cmlzKG1fc291cFNlcnZlci5nZXQoKSk7CisgICAgQVNTRVJUKHVyaXMpOworICAgIG1f YmFzZVVSSSA9IHN0YXRpY19jYXN0PFNvdXBVUkkqPihnX29iamVjdF9yZWYodXJpcy0+ZGF0YSkp OworICAgIGdfc2xpc3RfZnJlZV9mdWxsKHVyaXMsIGdfb2JqZWN0X3VucmVmKTsKIH0KIAogV2Vi S2l0VGVzdFNlcnZlcjo6fldlYktpdFRlc3RTZXJ2ZXIoKQo= 414577 2020-11-19 07:17:07 -0800 2020-11-20 00:54:40 -0800 Untested patch a.patch text/plain 1973 fred.wang Y29tbWl0IDgxOWM2NTQxMmFmNjg4MDNiNWRkNDEyYWU0NmMwMGExOWQ1ODg3YTkKQXV0aG9yOiBG cmVkZXJpYyBXYW5nIDxmd2FuZ0BpZ2FsaWEuY29tPgpEYXRlOiAgIFRodSBOb3YgMTkgMTY6MDU6 MzQgMjAyMCArMDEwMAoKICAgIHdlYmtpdHRlc3RzZXJ2ZXIKCmRpZmYgLS1naXQgYS9Ub29scy9U ZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmNwcCBiL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYktpdFRlc3RTZXJ2ZXIuY3BwCmluZGV4 IGQyZTQ5NWNhZDJhMy4uYjBhMGRiZjFiZGVlIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0 QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmNwcAorKysgYi9Ub29scy9UZXN0 V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmNwcApAQCAtMzksMTUg KzM5LDIyIEBAIFdlYktpdFRlc3RTZXJ2ZXI6OldlYktpdFRlc3RTZXJ2ZXIoU2VydmVyT3B0aW9u cyBvcHRpb25zKQogICAgICAgICBzc2xLZXlGaWxlLnJlc2V0KGdfYnVpbGRfZmlsZW5hbWUocmVz b3VyY2VzRGlyLmRhdGEoKSwgInRlc3Qta2V5LnBlbSIsIE5VTEwpKTsKICAgICB9CiAKLSAgICBH UmVmUHRyPFNvdXBBZGRyZXNzPiBhZGRyZXNzID0gYWRvcHRHUmVmKHNvdXBfYWRkcmVzc19uZXco IjEyNy4wLjAuMSIsIFNPVVBfQUREUkVTU19BTllfUE9SVCkpOwotICAgIHNvdXBfYWRkcmVzc19y ZXNvbHZlX3N5bmMoYWRkcmVzcy5nZXQoKSwgMCk7Ci0KLSAgICBtX3NvdXBTZXJ2ZXIgPSBhZG9w dEdSZWYoc291cF9zZXJ2ZXJfbmV3KFNPVVBfU0VSVkVSX0lOVEVSRkFDRSwgYWRkcmVzcy5nZXQo KSwKKyAgICBtX3NvdXBTZXJ2ZXIgPSBhZG9wdEdSZWYoc291cF9zZXJ2ZXJfbmV3KAogICAgICAg ICBTT1VQX1NFUlZFUl9BU1lOQ19DT05URVhULCBtX3F1ZXVlID8gbV9xdWV1ZS0+cnVuTG9vcCgp Lm1haW5Db250ZXh0KCkgOiBudWxscHRyLAogICAgICAgICBTT1VQX1NFUlZFUl9TU0xfQ0VSVF9G SUxFLCBzc2xDZXJ0aWZpY2F0ZUZpbGUuZ2V0KCksCiAgICAgICAgIFNPVVBfU0VSVkVSX1NTTF9L RVlfRklMRSwgc3NsS2V5RmlsZS5nZXQoKSwgbnVsbHB0cikpOwotICAgIG1fYmFzZVVSSSA9IG9w dGlvbnMgJiBTZXJ2ZXJIVFRQUyA/IHNvdXBfdXJpX25ldygiaHR0cHM6Ly8xMjcuMC4wLjEvIikg OiBzb3VwX3VyaV9uZXcoImh0dHA6Ly8xMjcuMC4wLjEvIik7Ci0gICAgc291cF91cmlfc2V0X3Bv cnQobV9iYXNlVVJJLCBzb3VwX3NlcnZlcl9nZXRfcG9ydChtX3NvdXBTZXJ2ZXIuZ2V0KCkpKTsK KworICAgIEdVbmlxdWVPdXRQdHI8R0Vycm9yPiBlcnJvcjsKKyAgICBTb3VwU2VydmVyTGlzdGVu T3B0aW9ucyBzZXJ2ZXJPcHRpb25zID0gc3RhdGljX2Nhc3Q8U291cFNlcnZlckxpc3Rlbk9wdGlv bnM+KG9wdGlvbnMgJiBTZXJ2ZXJIVFRQUyA/IFNPVVBfU0VSVkVSX0xJU1RFTl9JUFY0X09OTFkg fCBTT1VQX1NFUlZFUl9MSVNURU5fSFRUUFMgOiBTT1VQX1NFUlZFUl9MSVNURU5fSVBWNF9PTkxZ KTsKKyAgICBpZiAoIXNvdXBfc2VydmVyX2xpc3Rlbl9sb2NhbChtX3NvdXBTZXJ2ZXIuZ2V0KCks IDAsIHNlcnZlck9wdGlvbnMsICZlcnJvci5vdXRQdHIoKSkpIHsKKyAgICAgICAgV1RGTG9nQWx3 YXlzKCJGYWlsZWQgdG8gc3RhcnQgSFRUUCBzZXJ2ZXI6ICVzIiwgZXJyb3ItPm1lc3NhZ2UpOwor ICAgICAgICBDUkFTSCgpOworICAgIH0KKworICAgIEdTTGlzdCogdXJpcyA9IHNvdXBfc2VydmVy X2dldF91cmlzKG1fc291cFNlcnZlci5nZXQoKSk7CisgICAgQVNTRVJUKHVyaXMpOworICAgIG1f YmFzZVVSSSA9IHN0YXRpY19jYXN0PFNvdXBVUkkqPihnX29iamVjdF9yZWYodXJpcy0+ZGF0YSkp OworICAgIGdfc2xpc3RfZnJlZV9mdWxsKHVyaXMsIGdfb2JqZWN0X3VucmVmKTsKIH0KIAogV2Vi S2l0VGVzdFNlcnZlcjo6fldlYktpdFRlc3RTZXJ2ZXIoKQo= 414660 2020-11-20 00:54:40 -0800 2021-02-01 04:43:28 -0800 Patch 0001-webkittestserver.patch text/plain 3176 fred.wang RnJvbSBmNTU4MTYwYTdhN2MwMjJiMjYyN2Y2ZTkwNGEyODZhZWQ5YzI2NWQ4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGcmVkZXJpYyBXYW5nIDxmd2FuZ0BpZ2FsaWEuY29tPgpEYXRl OiBUaHUsIDE5IE5vdiAyMDIwIDE2OjA1OjM0ICswMTAwClN1YmplY3Q6IFtQQVRDSCB4c2VydmVy XSB3ZWJraXR0ZXN0c2VydmVyCgotLS0KIFRvb2xzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB8IDEzICsrKysrKysrKysrKysKIC4uLi9nbGliL1dlYktpdEdMaWIvV2Vi S2l0VGVzdFNlcnZlci5jcHAgICAgICB8IDE5ICsrKysrKysrKysrKystLS0tLS0KIDIgZmlsZXMg Y2hhbmdlZCwgMjYgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9U b29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMGNkYjNjMGQ4OGQzLi43NTQ4 YjBhMWViNDkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMC0xMS0yMCAgRnJlZGVyaWMgV2FuZyAgPGZ3YW5nQGln YWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gTWlncmF0ZSBXZWJLaXRUZXN0U2VydmVyIHRvIGxp YnNvdXAgMi40OCBBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxOTE2MAorCisgICAgICAgIFJldmlld2VkIGJ5IENhcmxvcyBHYXJjaWEgQ2FtcG9z LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdMaWIvV2ViS2l0VGVzdFNl cnZlci5jcHA6CisgICAgICAgIChXZWJLaXRUZXN0U2VydmVyOjpXZWJLaXRUZXN0U2VydmVyKTog U09VUF9TRVJWRVJfSU5URVJGQUNFIGFuZCBzb3VwX3NlcnZlcl9nZXRfcG9ydCBhcmUKKyAgICAg ICAgZGVwcmVjYXRlZC4gVGhlIGxpYnNvdXAgZG9jIHJlY29tbWVuZHMgdG8gdXNlIHNvdXBfc2Vy dmVyX2xpc3RlbiogYW5kIHNvdXBfc2VydmVyX2dldF91cmlzCisgICAgICAgIGluc3RlYWQuIEV4 aXN0aW5nIGNvZGUgdXNlcyAxMjcuMC4wLjEgKGh0dHBzIG9yIGh0dHApIHdoaWNoIGNvcnJlc3Bv bmRzIHRvIGNhbGxpbmcKKyAgICAgICAgc291cF9zZXJ2ZXJfbGlzdGVuX2xvY2FsIHdpdGggdGhJ UFY0X09OTFkgKGFuZCBIVFRQUyBvciBIVFRQKSBvcHRpb24uCisKIDIwMjAtMTEtMTEgIEZyZWRl cmljIFdhbmcgIDxmd2FuZ0BpZ2FsaWEuY29tPgogCiAgICAgICAgIERvbid0IHRyZWF0IGxvb3Bi YWNrIElQIGFkZHJlc3NlcyAoMTI3LjAuMC4wLzgsIDo6MS8xMjgsIGxvY2FsaG9zdCkgYXMgbWl4 ZWQgY29udGVudApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdM aWIvV2ViS2l0VGVzdFNlcnZlci5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0 R0xpYi9XZWJLaXRUZXN0U2VydmVyLmNwcAppbmRleCBkMmU0OTVjYWQyYTMuLjkzNmM5MjJhNzgw ZCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdMaWIvV2ViS2l0 VGVzdFNlcnZlci5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdMaWIv V2ViS2l0VGVzdFNlcnZlci5jcHAKQEAgLTM5LDE1ICszOSwyMiBAQCBXZWJLaXRUZXN0U2VydmVy OjpXZWJLaXRUZXN0U2VydmVyKFNlcnZlck9wdGlvbnMgb3B0aW9ucykKICAgICAgICAgc3NsS2V5 RmlsZS5yZXNldChnX2J1aWxkX2ZpbGVuYW1lKHJlc291cmNlc0Rpci5kYXRhKCksICJ0ZXN0LWtl eS5wZW0iLCBOVUxMKSk7CiAgICAgfQogCi0gICAgR1JlZlB0cjxTb3VwQWRkcmVzcz4gYWRkcmVz cyA9IGFkb3B0R1JlZihzb3VwX2FkZHJlc3NfbmV3KCIxMjcuMC4wLjEiLCBTT1VQX0FERFJFU1Nf QU5ZX1BPUlQpKTsKLSAgICBzb3VwX2FkZHJlc3NfcmVzb2x2ZV9zeW5jKGFkZHJlc3MuZ2V0KCks IDApOwotCi0gICAgbV9zb3VwU2VydmVyID0gYWRvcHRHUmVmKHNvdXBfc2VydmVyX25ldyhTT1VQ X1NFUlZFUl9JTlRFUkZBQ0UsIGFkZHJlc3MuZ2V0KCksCisgICAgbV9zb3VwU2VydmVyID0gYWRv cHRHUmVmKHNvdXBfc2VydmVyX25ldygKICAgICAgICAgU09VUF9TRVJWRVJfQVNZTkNfQ09OVEVY VCwgbV9xdWV1ZSA/IG1fcXVldWUtPnJ1bkxvb3AoKS5tYWluQ29udGV4dCgpIDogbnVsbHB0ciwK ICAgICAgICAgU09VUF9TRVJWRVJfU1NMX0NFUlRfRklMRSwgc3NsQ2VydGlmaWNhdGVGaWxlLmdl dCgpLAogICAgICAgICBTT1VQX1NFUlZFUl9TU0xfS0VZX0ZJTEUsIHNzbEtleUZpbGUuZ2V0KCks IG51bGxwdHIpKTsKLSAgICBtX2Jhc2VVUkkgPSBvcHRpb25zICYgU2VydmVySFRUUFMgPyBzb3Vw X3VyaV9uZXcoImh0dHBzOi8vMTI3LjAuMC4xLyIpIDogc291cF91cmlfbmV3KCJodHRwOi8vMTI3 LjAuMC4xLyIpOwotICAgIHNvdXBfdXJpX3NldF9wb3J0KG1fYmFzZVVSSSwgc291cF9zZXJ2ZXJf Z2V0X3BvcnQobV9zb3VwU2VydmVyLmdldCgpKSk7CisKKyAgICBHVW5pcXVlT3V0UHRyPEdFcnJv cj4gZXJyb3I7CisgICAgU291cFNlcnZlckxpc3Rlbk9wdGlvbnMgc2VydmVyT3B0aW9ucyA9IHN0 YXRpY19jYXN0PFNvdXBTZXJ2ZXJMaXN0ZW5PcHRpb25zPihvcHRpb25zICYgU2VydmVySFRUUFMg PyBTT1VQX1NFUlZFUl9MSVNURU5fSVBWNF9PTkxZIDogU09VUF9TRVJWRVJfTElTVEVOX0lQVjRf T05MWSB8IFNPVVBfU0VSVkVSX0xJU1RFTl9IVFRQUyk7CisgICAgaWYgKCFzb3VwX3NlcnZlcl9s aXN0ZW5fbG9jYWwobV9zb3VwU2VydmVyLmdldCgpLCBTT1VQX0FERFJFU1NfQU5ZX1BPUlQsIHNl cnZlck9wdGlvbnMsICZlcnJvci5vdXRQdHIoKSkpIHsKKyAgICAgICAgV1RGTG9nQWx3YXlzKCJG YWlsZWQgdG8gc3RhcnQgSFRUUCBzZXJ2ZXI6ICVzIiwgZXJyb3ItPm1lc3NhZ2UpOworICAgICAg ICBDUkFTSCgpOworICAgIH0KKworICAgIEdTTGlzdCogdXJpcyA9IHNvdXBfc2VydmVyX2dldF91 cmlzKG1fc291cFNlcnZlci5nZXQoKSk7CisgICAgQVNTRVJUKHVyaXMpOworICAgIG1fYmFzZVVS SSA9IHN0YXRpY19jYXN0PFNvdXBVUkkqPihnX29iamVjdF9yZWYodXJpcy0+ZGF0YSkpOworICAg IGdfc2xpc3RfZnJlZV9mdWxsKHVyaXMsIGdfb2JqZWN0X3VucmVmKTsKIH0KIAogV2ViS2l0VGVz dFNlcnZlcjo6fldlYktpdFRlc3RTZXJ2ZXIoKQotLSAKMi4yOS4yCgo= 418858 2021-02-01 04:43:28 -0800 2021-02-01 06:54:17 -0800 Patch wk-tests-deprecated-soup.diff text/plain 10596 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggZjIyODgzODE4ZjdjLi4zYTFlYjhhYmMwNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MjEtMDItMDEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisg ICAgICAgIFtHVEtdW1dQRV0gTWlncmF0ZSBXZWJLaXRUZXN0U2VydmVyIHRvIGxpYnNvdXAgMi40 OCBBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx OTE2MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzE2MjAzMTA+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3dGYvUGxhdGZvcm0uaDogQnVtcCBs aWJzb3VwIG1pbmltdW0gcmVxdWlyZWQgdmVyc2lvbiB0byAyLjU0LgorCiAyMDIxLTAxLTMxICBZ dXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgRGF0ZS5wYXJzZSBy ZXR1cm5zIG5vbi1pbnRlZ3JhbCB0aW1lIHZhbHVlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0 Zi9QbGF0Zm9ybS5oIGIvU291cmNlL1dURi93dGYvUGxhdGZvcm0uaAppbmRleCBiMGQ4MTc3Mjcz N2QuLjAyMTllZDkzOGM4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvUGxhdGZvcm0uaAor KysgYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oCkBAIC05Niw3ICs5Niw3IEBACiAjZW5kaWYK IAogI2lmIFVTRShTT1VQKQotI2RlZmluZSBTT1VQX1ZFUlNJT05fTUlOX1JFUVVJUkVEIFNPVVBf VkVSU0lPTl8yXzQyCisjZGVmaW5lIFNPVVBfVkVSU0lPTl9NSU5fUkVRVUlSRUQgU09VUF9WRVJT SU9OXzJfNTQKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oQ09DT0EpCmRpZmYgLS1naXQgYS9Ub29s cy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzY4NDNkZmVkYTg3Li5hMmY0ZmNl YTgyYmQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwyMyBAQAorMjAyMS0wMi0wMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2Fy Y2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS11bV1BFXSBNaWdyYXRlIFdlYktpdFRlc3RT ZXJ2ZXIgdG8gbGlic291cCAyLjQ4IEFQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjE5MTYwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83MTYyMDMx MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0QXV0aGVudGljYXRpb24uY3BwOgorICAg ICAgICAoc2VydmVyQ2FsbGJhY2spOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0R0xpYi9UZXN0Q29va2llTWFuYWdlci5jcHA6CisgICAgICAgIChzZXJ2ZXJDYWxsYmFjayk6 CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RXZWJLaXRXZWJD b250ZXh0LmNwcDoKKyAgICAgICAgKHNlcnZlckNhbGxiYWNrKToKKyAgICAgICAgKiBUZXN0V2Vi S2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmNwcDoKKyAgICAgICAgKFdl YktpdFRlc3RTZXJ2ZXI6OldlYktpdFRlc3RTZXJ2ZXIpOgorICAgICAgICAoV2ViS2l0VGVzdFNl cnZlcjo6cnVuKToKKyAgICAgICAgKFdlYktpdFRlc3RTZXJ2ZXI6OnBvcnQgY29uc3QpOgorICAg ICAgICAqIFRlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYktpdFRlc3RTZXJ2ZXIuaDoK KwogMjAyMS0wMS0yOSAgRG9uIE9sbXN0ZWFkICA8ZG9uLm9sbXN0ZWFkQHNvbnkuY29tPgogCiAg ICAgICAgIFt3ZWJraXRweV0gVGhyZWFkLmlzQWxpdmUgd2FzIHJlbmFtZWQgdG8gVGhyZWFkLmlz X2FsaXZlCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIv VGVzdEF1dGhlbnRpY2F0aW9uLmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 R0xpYi9UZXN0QXV0aGVudGljYXRpb24uY3BwCmluZGV4IGRmMWNiMTIxZTFmNy4uYzkyMDYzZmIy ZjRmIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVz dEF1dGhlbnRpY2F0aW9uLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dEdMaWIvVGVzdEF1dGhlbnRpY2F0aW9uLmNwcApAQCAtMzc1LDggKzM3NSw5IEBAIHVuc2lnbmVk IGdQcm94eVNlcnZlclBvcnQ7CiAKIHN0YXRpYyB2b2lkIHNlcnZlckNhbGxiYWNrKFNvdXBTZXJ2 ZXIqIHNlcnZlciwgU291cE1lc3NhZ2UqIG1lc3NhZ2UsIGNvbnN0IGNoYXIqIHBhdGgsIEdIYXNo VGFibGUqLCBTb3VwQ2xpZW50Q29udGV4dCogY29udGV4dCwgdm9pZCopCiB7CisgICAgdW5zaWdu ZWQgcG9ydCA9IGdfaW5ldF9zb2NrZXRfYWRkcmVzc19nZXRfcG9ydChHX0lORVRfU09DS0VUX0FE RFJFU1MoKHNvdXBfY2xpZW50X2NvbnRleHRfZ2V0X2xvY2FsX2FkZHJlc3MoY29udGV4dCkpKSk7 CiAgICAgaWYgKG1lc3NhZ2UtPm1ldGhvZCA9PSBTT1VQX01FVEhPRF9DT05ORUNUKSB7Ci0gICAg ICAgIGdfYXNzZXJ0X2NtcHVpbnQoc291cF9zZXJ2ZXJfZ2V0X3BvcnQoc2VydmVyKSwgPT0sIGdQ cm94eVNlcnZlclBvcnQpOworICAgICAgICBnX2Fzc2VydF9jbXB1aW50KHBvcnQsID09LCBnUHJv eHlTZXJ2ZXJQb3J0KTsKICAgICAgICAgYXV0byB0dW5uZWwgPSBtYWtlVW5pcXVlPFR1bm5lbD4o c2VydmVyLCBtZXNzYWdlKTsKICAgICAgICAgYXV0byogdHVubmVsUHRyID0gdHVubmVsLmdldCgp OwogICAgICAgICB0dW5uZWxQdHItPmNvbm5lY3QoW3R1bm5lbCA9IFdURk1vdmUodHVubmVsKV0o Y29uc3QgY2hhciogZXJyb3JNZXNzYWdlKSB7CkBAIC0zOTksNyArNDAwLDcgQEAgc3RhdGljIHZv aWQgc2VydmVyQ2FsbGJhY2soU291cFNlcnZlciogc2VydmVyLCBTb3VwTWVzc2FnZSogbWVzc2Fn ZSwgY29uc3QgY2hhcioKICAgICBpZiAoZ19zdHJfaGFzX3N1ZmZpeChwYXRoLCAiL2F1dGgtdGVz dC5odG1sIikgfHwgZ19zdHJfaGFzX3N1ZmZpeChwYXRoLCAiL2VtcHR5LXJlYWxtLmh0bWwiKSkg ewogICAgICAgICBib29sIGlzUHJveHkgPSBnX3N0cl9oYXNfcHJlZml4KHBhdGgsICIvcHJveHki KTsKICAgICAgICAgaWYgKGlzUHJveHkpCi0gICAgICAgICAgICBnX2Fzc2VydF9jbXB1aW50KHNv dXBfc2VydmVyX2dldF9wb3J0KHNlcnZlciksID09LCBnUHJveHlTZXJ2ZXJQb3J0KTsKKyAgICAg ICAgICAgIGdfYXNzZXJ0X2NtcHVpbnQocG9ydCwgPT0sIGdQcm94eVNlcnZlclBvcnQpOwogCiAg ICAgICAgIGNvbnN0IGNoYXIqIGF1dGhvcml6YXRpb24gPSBzb3VwX21lc3NhZ2VfaGVhZGVyc19n ZXRfb25lKG1lc3NhZ2UtPnJlcXVlc3RfaGVhZGVycywgIkF1dGhvcml6YXRpb24iKTsKICAgICAg ICAgLy8gUmVxdWlyZSBhdXRoZW50aWNhdGlvbi4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0Q29va2llTWFuYWdlci5jcHAgYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdENvb2tpZU1hbmFnZXIuY3BwCmluZGV4IDc5 ODlhMzkyMmE0ZS4uNGE5NTEwMTAwYWY4IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdEdMaWIvVGVzdENvb2tpZU1hbmFnZXIuY3BwCisrKyBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0Q29va2llTWFuYWdlci5jcHAKQEAgLTcxNiw3 ICs3MTYsNyBAQCBzdGF0aWMgdm9pZCBzZXJ2ZXJDYWxsYmFjayhTb3VwU2VydmVyKiBzZXJ2ZXIs IFNvdXBNZXNzYWdlKiBtZXNzYWdlLCBjb25zdCBjaGFyKgogICAgIGdjaGFyKiBoZWFkZXJfc3Ry ID0gZ19zdHJkdXBfcHJpbnRmKCIlcz0lczsgTWF4LUFnZT02MCIsIGtDb29raWVOYW1lLCBrQ29v a2llVmFsdWUpOwogCiAgICAgaWYgKGdfc3RyX2VxdWFsKHBhdGgsICIvaW5kZXguaHRtbCIpKSB7 Ci0gICAgICAgIGNoYXIqIGluZGV4SHRtbCA9IGdfc3RyZHVwX3ByaW50ZihrSW5kZXhIdG1sRm9y bWF0LCBzb3VwX3NlcnZlcl9nZXRfcG9ydChzZXJ2ZXIpKTsKKyAgICAgICAgY2hhciogaW5kZXhI dG1sID0gZ19zdHJkdXBfcHJpbnRmKGtJbmRleEh0bWxGb3JtYXQsIGtTZXJ2ZXItPnBvcnQoKSk7 CiAgICAgICAgIHNvdXBfbWVzc2FnZV9oZWFkZXJzX3JlcGxhY2UobWVzc2FnZS0+cmVzcG9uc2Vf aGVhZGVycywgIlNldC1Db29raWUiLCBoZWFkZXJfc3RyKTsKICAgICAgICAgc291cF9tZXNzYWdl X2JvZHlfYXBwZW5kKG1lc3NhZ2UtPnJlc3BvbnNlX2JvZHksIFNPVVBfTUVNT1JZX1RBS0UsIGlu ZGV4SHRtbCwgc3RybGVuKGluZGV4SHRtbCkpOwogICAgIH0gZWxzZSBpZiAoZ19zdHJfZXF1YWwo cGF0aCwgIi9pbWFnZS5wbmciKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0R0xpYi9UZXN0V2ViS2l0V2ViQ29udGV4dC5jcHAgYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFdlYktpdFdlYkNvbnRleHQuY3BwCmluZGV4IDJmM2Ey YjJmNzM0NS4uOGU5MWM0M2Q3YmI5IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdEdMaWIvVGVzdFdlYktpdFdlYkNvbnRleHQuY3BwCisrKyBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2ViS2l0V2ViQ29udGV4dC5jcHAKQEAgLTM4 Niw3ICszODYsNyBAQCBzdGF0aWMgdm9pZCB0ZXN0V2ViQ29udGV4dExhbmd1YWdlcyhXZWJWaWV3 VGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKICAgICBnX2Fzc2VydF9lcnJvcihlcnJvci5nZXQo KSwgV0VCS0lUX0pBVkFTQ1JJUFRfRVJST1IsIFdFQktJVF9KQVZBU0NSSVBUX0VSUk9SX1NDUklQ VF9GQUlMRUQpOwogfQogCi1zdGF0aWMgdm9pZCBzZXJ2ZXJDYWxsYmFjayhTb3VwU2VydmVyKiBz ZXJ2ZXIsIFNvdXBNZXNzYWdlKiBtZXNzYWdlLCBjb25zdCBjaGFyKiBwYXRoLCBHSGFzaFRhYmxl KiwgU291cENsaWVudENvbnRleHQqLCBncG9pbnRlcikKK3N0YXRpYyB2b2lkIHNlcnZlckNhbGxi YWNrKFNvdXBTZXJ2ZXIqIHNlcnZlciwgU291cE1lc3NhZ2UqIG1lc3NhZ2UsIGNvbnN0IGNoYXIq IHBhdGgsIEdIYXNoVGFibGUqLCBTb3VwQ2xpZW50Q29udGV4dCogY29udGV4dCwgZ3BvaW50ZXIp CiB7CiAgICAgaWYgKG1lc3NhZ2UtPm1ldGhvZCAhPSBTT1VQX01FVEhPRF9HRVQpIHsKICAgICAg ICAgc291cF9tZXNzYWdlX3NldF9zdGF0dXMobWVzc2FnZSwgU09VUF9TVEFUVVNfTk9UX0lNUExF TUVOVEVEKTsKQEAgLTQwNCw3ICs0MDQsNyBAQCBzdGF0aWMgdm9pZCBzZXJ2ZXJDYWxsYmFjayhT b3VwU2VydmVyKiBzZXJ2ZXIsIFNvdXBNZXNzYWdlKiBtZXNzYWdlLCBjb25zdCBjaGFyKgogICAg ICAgICBzb3VwX21lc3NhZ2VfYm9keV9jb21wbGV0ZShtZXNzYWdlLT5yZXNwb25zZV9ib2R5KTsK ICAgICAgICAgc291cF9tZXNzYWdlX3NldF9zdGF0dXMobWVzc2FnZSwgU09VUF9TVEFUVVNfT0sp OwogICAgIH0gZWxzZSBpZiAoZ19zdHJfZXF1YWwocGF0aCwgIi9lY2hvUG9ydCIpKSB7Ci0gICAg ICAgIGNoYXIqIHBvcnQgPSBnX3N0cmR1cF9wcmludGYoIiV1Iiwgc291cF9zZXJ2ZXJfZ2V0X3Bv cnQoc2VydmVyKSk7CisgICAgICAgIGNoYXIqIHBvcnQgPSBnX3N0cmR1cF9wcmludGYoIiV1Iiwg Z19pbmV0X3NvY2tldF9hZGRyZXNzX2dldF9wb3J0KEdfSU5FVF9TT0NLRVRfQUREUkVTUygoc291 cF9jbGllbnRfY29udGV4dF9nZXRfbG9jYWxfYWRkcmVzcyhjb250ZXh0KSkpKSk7CiAgICAgICAg IHNvdXBfbWVzc2FnZV9ib2R5X2FwcGVuZChtZXNzYWdlLT5yZXNwb25zZV9ib2R5LCBTT1VQX01F TU9SWV9UQUtFLCBwb3J0LCBzdHJsZW4ocG9ydCkpOwogICAgICAgICBzb3VwX21lc3NhZ2VfYm9k eV9jb21wbGV0ZShtZXNzYWdlLT5yZXNwb25zZV9ib2R5KTsKICAgICAgICAgc291cF9tZXNzYWdl X3NldF9zdGF0dXMobWVzc2FnZSwgU09VUF9TVEFUVVNfT0spOwpkaWZmIC0tZ2l0IGEvVG9vbHMv VGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdMaWIvV2ViS2l0VGVzdFNlcnZlci5jcHAgYi9Ub29s cy9UZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmNwcAppbmRl eCBkMmU0OTVjYWQyYTMuLjdlMTA4NWM3OWZlMiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktp dEFQSS9nbGliL1dlYktpdEdMaWIvV2ViS2l0VGVzdFNlcnZlci5jcHAKKysrIGIvVG9vbHMvVGVz dFdlYktpdEFQSS9nbGliL1dlYktpdEdMaWIvV2ViS2l0VGVzdFNlcnZlci5jcHAKQEAgLTIzLDYg KzIzLDcgQEAKICNpbmNsdWRlICJUZXN0TWFpbi5oIgogI2luY2x1ZGUgPHd0Zi9UaHJlYWRpbmcu aD4KICNpbmNsdWRlIDx3dGYvZ2xpYi9HVW5pcXVlUHRyLmg+CisjaW5jbHVkZSA8d3RmL3RocmVh ZHMvQmluYXJ5U2VtYXBob3JlLmg+CiAKIFdlYktpdFRlc3RTZXJ2ZXI6OldlYktpdFRlc3RTZXJ2 ZXIoU2VydmVyT3B0aW9ucyBvcHRpb25zKQogewpAQCAtMzEsMjMgKzMyLDE0IEBAIFdlYktpdFRl c3RTZXJ2ZXI6OldlYktpdFRlc3RTZXJ2ZXIoU2VydmVyT3B0aW9ucyBvcHRpb25zKQogICAgICAg ICBtX3F1ZXVlID0gV29ya1F1ZXVlOjpjcmVhdGUoIldlYktpdFRlc3RTZXJ2ZXIiKTsKICAgICB9 CiAKLSAgICBHVW5pcXVlUHRyPGNoYXI+IHNzbENlcnRpZmljYXRlRmlsZTsKLSAgICBHVW5pcXVl UHRyPGNoYXI+IHNzbEtleUZpbGU7CisgICAgbV9zb3VwU2VydmVyID0gYWRvcHRHUmVmKHNvdXBf c2VydmVyX25ldygic2VydmVyLWhlYWRlciIsICJXZWJLaXRUZXN0U2VydmVyICIsIG51bGxwdHIp KTsKKwogICAgIGlmIChvcHRpb25zICYgU2VydmVySFRUUFMpIHsKICAgICAgICAgQ1N0cmluZyBy ZXNvdXJjZXNEaXIgPSBUZXN0OjpnZXRSZXNvdXJjZXNEaXIoKTsKLSAgICAgICAgc3NsQ2VydGlm aWNhdGVGaWxlLnJlc2V0KGdfYnVpbGRfZmlsZW5hbWUocmVzb3VyY2VzRGlyLmRhdGEoKSwgInRl c3QtY2VydC5wZW0iLCBOVUxMKSk7Ci0gICAgICAgIHNzbEtleUZpbGUucmVzZXQoZ19idWlsZF9m aWxlbmFtZShyZXNvdXJjZXNEaXIuZGF0YSgpLCAidGVzdC1rZXkucGVtIiwgTlVMTCkpOworICAg ICAgICBHVW5pcXVlUHRyPGNoYXI+IHNzbENlcnRpZmljYXRlRmlsZShnX2J1aWxkX2ZpbGVuYW1l KHJlc291cmNlc0Rpci5kYXRhKCksICJ0ZXN0LWNlcnQucGVtIiwgbnVsbHB0cikpOworICAgICAg ICBHVW5pcXVlUHRyPGNoYXI+IHNzbEtleUZpbGUoZ19idWlsZF9maWxlbmFtZShyZXNvdXJjZXNE aXIuZGF0YSgpLCAidGVzdC1rZXkucGVtIiwgbnVsbHB0cikpOworICAgICAgICBnX2Fzc2VydF90 cnVlKHNvdXBfc2VydmVyX3NldF9zc2xfY2VydF9maWxlKG1fc291cFNlcnZlci5nZXQoKSwgc3Ns Q2VydGlmaWNhdGVGaWxlLmdldCgpLCBzc2xLZXlGaWxlLmdldCgpLCBudWxscHRyKSk7CiAgICAg fQotCi0gICAgR1JlZlB0cjxTb3VwQWRkcmVzcz4gYWRkcmVzcyA9IGFkb3B0R1JlZihzb3VwX2Fk ZHJlc3NfbmV3KCIxMjcuMC4wLjEiLCBTT1VQX0FERFJFU1NfQU5ZX1BPUlQpKTsKLSAgICBzb3Vw X2FkZHJlc3NfcmVzb2x2ZV9zeW5jKGFkZHJlc3MuZ2V0KCksIDApOwotCi0gICAgbV9zb3VwU2Vy dmVyID0gYWRvcHRHUmVmKHNvdXBfc2VydmVyX25ldyhTT1VQX1NFUlZFUl9JTlRFUkZBQ0UsIGFk ZHJlc3MuZ2V0KCksCi0gICAgICAgIFNPVVBfU0VSVkVSX0FTWU5DX0NPTlRFWFQsIG1fcXVldWUg PyBtX3F1ZXVlLT5ydW5Mb29wKCkubWFpbkNvbnRleHQoKSA6IG51bGxwdHIsCi0gICAgICAgIFNP VVBfU0VSVkVSX1NTTF9DRVJUX0ZJTEUsIHNzbENlcnRpZmljYXRlRmlsZS5nZXQoKSwKLSAgICAg ICAgU09VUF9TRVJWRVJfU1NMX0tFWV9GSUxFLCBzc2xLZXlGaWxlLmdldCgpLCBudWxscHRyKSk7 Ci0gICAgbV9iYXNlVVJJID0gb3B0aW9ucyAmIFNlcnZlckhUVFBTID8gc291cF91cmlfbmV3KCJo dHRwczovLzEyNy4wLjAuMS8iKSA6IHNvdXBfdXJpX25ldygiaHR0cDovLzEyNy4wLjAuMS8iKTsK LSAgICBzb3VwX3VyaV9zZXRfcG9ydChtX2Jhc2VVUkksIHNvdXBfc2VydmVyX2dldF9wb3J0KG1f c291cFNlcnZlci5nZXQoKSkpOwogfQogCiBXZWJLaXRUZXN0U2VydmVyOjp+V2ViS2l0VGVzdFNl cnZlcigpCkBAIC01OSwxNSArNTEsMjYgQEAgV2ViS2l0VGVzdFNlcnZlcjo6fldlYktpdFRlc3RT ZXJ2ZXIoKQogCiB2b2lkIFdlYktpdFRlc3RTZXJ2ZXI6OnJ1bihTb3VwU2VydmVyQ2FsbGJhY2sg c2VydmVyQ2FsbGJhY2spCiB7CisgICAgc291cF9zZXJ2ZXJfYWRkX2hhbmRsZXIobV9zb3VwU2Vy dmVyLmdldCgpLCBudWxscHRyLCBzZXJ2ZXJDYWxsYmFjaywgbnVsbHB0ciwgbnVsbHB0cik7CisK KyAgICB1bnNpZ25lZCBvcHRpb25zID0gU09VUF9TRVJWRVJfTElTVEVOX0lQVjRfT05MWTsKKyAg ICBpZiAoc291cF9zZXJ2ZXJfaXNfaHR0cHMobV9zb3VwU2VydmVyLmdldCgpKSkKKyAgICAgICAg b3B0aW9ucyB8PSBTT1VQX1NFUlZFUl9MSVNURU5fSFRUUFM7CisKICAgICBpZiAobV9xdWV1ZSkg ewotICAgICAgICBtX3F1ZXVlLT5kaXNwYXRjaChbdGhpcywgc2VydmVyQ2FsbGJhY2tdIHsKLSAg ICAgICAgICAgIHNvdXBfc2VydmVyX3J1bl9hc3luYyhtX3NvdXBTZXJ2ZXIuZ2V0KCkpOwotICAg ICAgICAgICAgc291cF9zZXJ2ZXJfYWRkX2hhbmRsZXIobV9zb3VwU2VydmVyLmdldCgpLCBudWxs cHRyLCBzZXJ2ZXJDYWxsYmFjaywgbnVsbHB0ciwgbnVsbHB0cik7CisgICAgICAgIEJpbmFyeVNl bWFwaG9yZSBzZW1hcGhvcmU7CisgICAgICAgIG1fcXVldWUtPmRpc3BhdGNoKFsmXSB7CisgICAg ICAgICAgICBnX2Fzc2VydF90cnVlKHNvdXBfc2VydmVyX2xpc3Rlbl9sb2NhbChtX3NvdXBTZXJ2 ZXIuZ2V0KCksIFNPVVBfQUREUkVTU19BTllfUE9SVCwgc3RhdGljX2Nhc3Q8U291cFNlcnZlckxp c3Rlbk9wdGlvbnM+KG9wdGlvbnMpLCBudWxscHRyKSk7CisgICAgICAgICAgICBzZW1hcGhvcmUu c2lnbmFsKCk7CiAgICAgICAgIH0pOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIHNvdXBfc2VydmVy X3J1bl9hc3luYyhtX3NvdXBTZXJ2ZXIuZ2V0KCkpOwotICAgICAgICBzb3VwX3NlcnZlcl9hZGRf aGFuZGxlcihtX3NvdXBTZXJ2ZXIuZ2V0KCksIG51bGxwdHIsIHNlcnZlckNhbGxiYWNrLCBudWxs cHRyLCBudWxscHRyKTsKLSAgICB9CisgICAgICAgIHNlbWFwaG9yZS53YWl0KCk7CisgICAgfSBl bHNlCisgICAgICAgIGdfYXNzZXJ0X3RydWUoc291cF9zZXJ2ZXJfbGlzdGVuX2xvY2FsKG1fc291 cFNlcnZlci5nZXQoKSwgU09VUF9BRERSRVNTX0FOWV9QT1JULCBzdGF0aWNfY2FzdDxTb3VwU2Vy dmVyTGlzdGVuT3B0aW9ucz4ob3B0aW9ucyksIG51bGxwdHIpKTsKKworICAgIEdTTGlzdCogdXJp cyA9IHNvdXBfc2VydmVyX2dldF91cmlzKG1fc291cFNlcnZlci5nZXQoKSk7CisgICAgZ19hc3Nl cnRfbm9ubnVsbCh1cmlzKTsKKyAgICBtX2Jhc2VVUkkgPSBzb3VwX3VyaV9jb3B5KHN0YXRpY19j YXN0PFNvdXBVUkkqPih1cmlzLT5kYXRhKSk7CisgICAgZ19zbGlzdF9mcmVlX2Z1bGwodXJpcywg cmVpbnRlcnByZXRfY2FzdDxHRGVzdHJveU5vdGlmeT4oc291cF91cmlfZnJlZSkpOwogfQogCiB2 b2lkIFdlYktpdFRlc3RTZXJ2ZXI6OmFkZFdlYlNvY2tldEhhbmRsZXIoU291cFNlcnZlcldlYnNv Y2tldENhbGxiYWNrIGNhbGxiYWNrLCBncG9pbnRlciB1c2VyRGF0YSkKQEAgLTExMywzICsxMTYs OCBAQCBDU3RyaW5nIFdlYktpdFRlc3RTZXJ2ZXI6OmdldFVSSUZvclBhdGgoY29uc3QgY2hhciog cGF0aCkgY29uc3QKICAgICBzb3VwX3VyaV9mcmVlKHVyaSk7CiAgICAgcmV0dXJuIHVyaVN0cmlu Zy5nZXQoKTsKIH0KKwordW5zaWduZWQgV2ViS2l0VGVzdFNlcnZlcjo6cG9ydCgpIGNvbnN0Cit7 CisgICAgcmV0dXJuIHNvdXBfdXJpX2dldF9wb3J0KG1fYmFzZVVSSSk7Cit9CmRpZmYgLS1naXQg YS9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmgg Yi9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmgK aW5kZXggMjgxNDUyN2YxOWI5Li5mNWJkNDdkNmQzM2MgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYktpdFRlc3RTZXJ2ZXIuaAorKysgYi9Ub29scy9U ZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmgKQEAgLTM4LDYg KzM4LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgfldlYktpdFRlc3RTZXJ2ZXIoKTsKIAogICAg IFNvdXBVUkkqIGJhc2VVUkkoKSBjb25zdCB7IHJldHVybiBtX2Jhc2VVUkk7IH0KKyAgICB1bnNp Z25lZCBwb3J0KCkgY29uc3Q7CiAgICAgQ1N0cmluZyBnZXRVUklGb3JQYXRoKGNvbnN0IGNoYXIq IHBhdGgpIGNvbnN0OwogICAgIHZvaWQgcnVuKFNvdXBTZXJ2ZXJDYWxsYmFjayk7CiAK