219257 2020-11-23 06:31:35 -0800 [GTK] Allow WebKitTestServer to run non-loopback addresses for API tests 2022-01-11 14:27:19 -0800 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified REOPENED https://bugs.webkit.org/show_bug.cgi?id=235083 InRadar P2 Normal --- 219160 220922 222273 171934 218623 219198 1 fred.wang webkit-unassigned beidson cgarcia commit-queue jfernandez mcatanzaro pgriffis webkit-bug-importer oldest_to_newest 1709886 0 fred.wang 2020-11-23 06:31:35 -0800 This is needed to test WEBKIT_INSECURE_CONTENT_RUN and WEBKIT_INSECURE_CONTENT_DISPLAYED APIs if localhost & loopback IP addresses are no longer mixed content. Unfortunately, that does not seem possible until bug 219198 is fixed. Meanwhile, let's try to move from "127.0.0.1" to "localhost" as Michael suggested elsewhere. 1709887 1 414801 fred.wang 2020-11-23 06:36:28 -0800 Created attachment 414801 Tentative patch (untested) 1709891 2 414801 fred.wang 2020-11-23 07:31:20 -0800 Comment on attachment 414801 Tentative patch (untested) It looks like the API tests pass after this change, so I'm asking review now. Will update the changelog later, but basically this is doing Michael's suggestion in bug 218623 comment 15, so that the test won't be broken when we stop treating loopback IP address as mixed content. 1709893 3 414801 mcatanzaro 2020-11-23 08:08:16 -0800 Comment on attachment 414801 Tentative patch (untested) View in context: https://bugs.webkit.org/attachment.cgi?id=414801&action=review > Tools/TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.h:35 > + ServerNonLocalHost = 1 << 3, If you call it ServerNonLoopback instead, this would be a lot less weird. Because passing ServerNonLocalHost to cause the server to use localhost is weird. ;) 1709894 4 414801 mcatanzaro 2020-11-23 08:12:00 -0800 Comment on attachment 414801 Tentative patch (untested) View in context: https://bugs.webkit.org/attachment.cgi?id=414801&action=review LGTM. I see TestSSL now needs two HTTP servers instead of one, but that's fine. I bet Carlos Garcia will want to review this before it lands. > Tools/TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.h:38 > - WebKitTestServer(ServerOptions = ServerHTTP); > + WebKitTestServer(uint8_t options = ServerHTTP); I don't like this... why are you removing its nice type? 1709904 5 fred.wang 2020-11-23 09:15:27 -0800 (In reply to Michael Catanzaro from comment #3) > Comment on attachment 414801 [details] > Tentative patch (untested) > > View in context: > https://bugs.webkit.org/attachment.cgi?id=414801&action=review > > > Tools/TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.h:35 > > + ServerNonLocalHost = 1 << 3, > > If you call it ServerNonLoopback instead, this would be a lot less weird. > Because passing ServerNonLocalHost to cause the server to use localhost is > weird. ;) Right, but ultimately I want to call it ServerNonLocalHost as we want to stop treating localhost as mixed content too. I'm fine keeping this name for now... but maybe people would add new tests assuming it's just not loopback. (In reply to Michael Catanzaro from comment #4) > Comment on attachment 414801 [details] > Tentative patch (untested) > > View in context: > https://bugs.webkit.org/attachment.cgi?id=414801&action=review > > LGTM. I see TestSSL now needs two HTTP servers instead of one, but that's > fine. Actually three (2 HTTPS and HTTP). I can also change the tests to always use the new version HTTPS version, but not sure that really makes a difference. > I bet Carlos Garcia will want to review this before it lands. > > > Tools/TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.h:38 > > - WebKitTestServer(ServerOptions = ServerHTTP); > > + WebKitTestServer(uint8_t options = ServerHTTP); > > I don't like this... why are you removing its nice type? ServerOptions is currently an enum of bit flags, so it can't accept a combination ServerHttps | ServerNonLoopback. 1709916 6 mcatanzaro 2020-11-23 10:31:43 -0800 (In reply to Frédéric Wang (:fredw) from comment #5) > ServerOptions is currently an enum of bit flags, so it can't accept a > combination ServerHttps | ServerNonLoopback. Try: static_cast<ServerOptions>(ServerHttps | ServerNonLoopback) 1709917 7 mcatanzaro 2020-11-23 10:32:21 -0800 Or better: try std::bitset! 1709992 8 414835 fred.wang 2020-11-24 05:58:55 -0800 Created attachment 414835 Patch (reverted) 1709993 9 fred.wang 2020-11-24 06:01:15 -0800 (In reply to Michael Catanzaro from comment #3) > If you call it ServerNonLoopback instead, this would be a lot less weird. > Because passing ServerNonLocalHost to cause the server to use localhost is > weird. ;) Done (In reply to Michael Catanzaro from comment #4) > LGTM. I see TestSSL now needs two HTTP servers instead of one, but that's > fine. Merged to use only one HTTPS server, let's see if that does not break any test... (In reply to Michael Catanzaro from comment #7) > Or better: try std::bitset! Done. 1710190 10 ews-feeder 2020-11-26 16:41:21 -0800 Committed r270170: <https://trac.webkit.org/changeset/270170> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414835. 1722059 11 commit-queue 2021-01-25 07:06:48 -0800 Re-opened since this is blocked by bug 220922 1722061 12 webkit-bug-importer 2021-01-25 07:07:06 -0800 <rdar://problem/73570185> 1732299 13 fred.wang 2021-02-22 14:08:12 -0800 (In reply to Frédéric Wang (:fredw) from comment #9) > (In reply to Michael Catanzaro from comment #7) > > Or better: try std::bitset! > > Done. This change was problematic, std::bitset's constructor takes a bit mask but its setter/getter relies on the bit's position instead. I've extracted this change to bug 222273. 1732870 14 421409 fred.wang 2021-02-24 07:44:18 -0800 Created attachment 421409 Patch I tried a bit to rebase, but was not able to make the certificate stuff work. Probably some special config is needed for the domain name... 1822591 15 fred.wang 2021-12-10 02:10:58 -0800 Removing myself from assignee since I'm not working on this anymore. 414801 2020-11-23 06:36:28 -0800 2020-11-24 05:58:55 -0800 Tentative patch (untested) 0001-GTK-Allow-WebKitTestServer-to-run-non-localhost-addr.patch text/plain 4875 fred.wang RnJvbSBlNTUxMTk0Yjg2ZjdjMDk4OTVlMzA3Nzg1MTI5YzAxMDRkMmNiZDkxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGcmVkZXJpYyBXYW5nIDxmd2FuZ0BpZ2FsaWEuY29tPgpEYXRl OiBNb24sIDIzIE5vdiAyMDIwIDE1OjIxOjQ5ICswMTAwClN1YmplY3Q6IFtQQVRDSCB4c2VydmVy IDEvMl0gW0dUS10gQWxsb3cgV2ViS2l0VGVzdFNlcnZlciB0byBydW4gbm9uLWxvY2FsaG9zdAog YWRkcmVzc2VzIGZvciBBUEkgdGVzdHMKCi0tLQogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRHTGliL1Rlc3RTU0wuY3BwICAgIHwgIDcgKysrKysrLQogLi4uL2dsaWIvV2ViS2l0R0xp Yi9XZWJLaXRUZXN0U2VydmVyLmNwcCAgICAgICAgICAgIHwgMTMgKysrKysrKysrKystLQogLi4u L2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmggICAgICAgICAgICAgIHwgIDMgKyst CiAzIGZpbGVzIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RTU0wuY3Bw IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RTU0wuY3BwCmluZGV4 IDg5MmQzNDI4MDZiZi4uNWRkZDBjZWI2Y2E2IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFNTTC5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RTU0wuY3BwCkBAIC0yNCw2ICsyNCw3IEBACiAKIHN0YXRp YyBXZWJLaXRUZXN0U2VydmVyKiBrSHR0cHNTZXJ2ZXI7CiBzdGF0aWMgV2ViS2l0VGVzdFNlcnZl cioga0h0dHBTZXJ2ZXI7CitzdGF0aWMgV2ViS2l0VGVzdFNlcnZlcioga05vbkxvY2FsaG9zdEh0 dHBzU2VydmVyOwogCiBzdGF0aWMgY29uc3QgY2hhciogaW5kZXhIVE1MID0gIjxodG1sPjxib2R5 PlRlc3RpbmcgV2ViS2l0MkdUSysgU1NMPC9ib2R5PjwvaHRtbGw+IjsKIHN0YXRpYyBjb25zdCBj aGFyKiBpbnNlY3VyZUNvbnRlbnRIVE1MID0gIjxodG1sPjxzY3JpcHQgc3JjPVwiJXNcIj48L3Nj cmlwdD48Ym9keT48cD5UZXh0ICsgaW1hZ2UgPGltZyBzcmM9XCIlc1wiIGFsaWduPVwicmlnaHRc Ii8+PC9wPjwvYm9keT48L2h0bWw+IjsKQEAgLTEyMCw3ICsxMjEsNyBAQCBzdGF0aWMgdm9pZCB0 ZXN0SW5zZWN1cmVDb250ZW50KEluc2VjdXJlQ29udGVudFRlc3QqIHRlc3QsIGdjb25zdHBvaW50 ZXIpCiAgICAgV2ViS2l0VExTRXJyb3JzUG9saWN5IG9yaWdpbmFsUG9saWN5ID0gd2Via2l0X3dl YnNpdGVfZGF0YV9tYW5hZ2VyX2dldF90bHNfZXJyb3JzX3BvbGljeSh3ZWJzaXRlRGF0YU1hbmFn ZXIpOwogICAgIHdlYmtpdF93ZWJzaXRlX2RhdGFfbWFuYWdlcl9zZXRfdGxzX2Vycm9yc19wb2xp Y3kod2Vic2l0ZURhdGFNYW5hZ2VyLCBXRUJLSVRfVExTX0VSUk9SU19QT0xJQ1lfSUdOT1JFKTsK IAotICAgIHRlc3QtPmxvYWRVUkkoa0h0dHBzU2VydmVyLT5nZXRVUklGb3JQYXRoKCIvaW5zZWN1 cmUtY29udGVudC8iKS5kYXRhKCkpOworICAgIHRlc3QtPmxvYWRVUkkoa05vbkxvY2FsaG9zdEh0 dHBzU2VydmVyLT5nZXRVUklGb3JQYXRoKCIvaW5zZWN1cmUtY29udGVudC8iKS5kYXRhKCkpOwog ICAgIHRlc3QtPndhaXRVbnRpbExvYWRGaW5pc2hlZCgpOwogCiAgICAgZ19hc3NlcnRfZmFsc2Uo dGVzdC0+bV9pbnNlY3VyZUNvbnRlbnRSdW4pOwpAQCAtNTYwLDYgKzU2MSw5IEBAIHZvaWQgYmVm b3JlQWxsKCkKICAgICBrSHR0cFNlcnZlciA9IG5ldyBXZWJLaXRUZXN0U2VydmVyKFdlYktpdFRl c3RTZXJ2ZXI6OlNlcnZlckhUVFApOwogICAgIGtIdHRwU2VydmVyLT5ydW4oaHR0cFNlcnZlckNh bGxiYWNrKTsKIAorICAgIGtOb25Mb2NhbGhvc3RIdHRwc1NlcnZlciA9IG5ldyBXZWJLaXRUZXN0 U2VydmVyKFdlYktpdFRlc3RTZXJ2ZXI6OlNlcnZlckhUVFBTIHwgV2ViS2l0VGVzdFNlcnZlcjo6 U2VydmVyTm9uTG9jYWxIb3N0KTsKKyAgICBrTm9uTG9jYWxob3N0SHR0cHNTZXJ2ZXItPnJ1biho dHRwc1NlcnZlckNhbGxiYWNrKTsKKwogICAgIFNTTFRlc3Q6OmFkZCgiV2ViS2l0V2ViVmlldyIs ICJzc2wiLCB0ZXN0U1NMKTsKICAgICBJbnNlY3VyZUNvbnRlbnRUZXN0OjphZGQoIldlYktpdFdl YlZpZXciLCAiaW5zZWN1cmUtY29udGVudCIsIHRlc3RJbnNlY3VyZUNvbnRlbnQpOwogICAgIFNT TFRlc3Q6OmFkZCgiV2ViS2l0V2ViVmlldyIsICJ0bHMtZXJyb3JzLXBvbGljeSIsIHRlc3RUTFNF cnJvcnNQb2xpY3kpOwpAQCAtNTc1LDQgKzU3OSw1IEBAIHZvaWQgYWZ0ZXJBbGwoKQogewogICAg IGRlbGV0ZSBrSHR0cHNTZXJ2ZXI7CiAgICAgZGVsZXRlIGtIdHRwU2VydmVyOworICAgIGRlbGV0 ZSBrTm9uTG9jYWxob3N0SHR0cHNTZXJ2ZXI7CiB9CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2Vi S2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmNwcCBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYktpdFRlc3RTZXJ2ZXIuY3BwCmluZGV4IDkzNmM5 MjJhNzgwZC4uNjJhOTBjNmJjNzY1IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL2ds aWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0 QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmNwcApAQCAtMjQsNyArMjQsNyBA QAogI2luY2x1ZGUgPHd0Zi9UaHJlYWRpbmcuaD4KICNpbmNsdWRlIDx3dGYvZ2xpYi9HVW5pcXVl UHRyLmg+CiAKLVdlYktpdFRlc3RTZXJ2ZXI6OldlYktpdFRlc3RTZXJ2ZXIoU2VydmVyT3B0aW9u cyBvcHRpb25zKQorV2ViS2l0VGVzdFNlcnZlcjo6V2ViS2l0VGVzdFNlcnZlcih1aW50OF90IG9w dGlvbnMpCiB7CiAgICAgaWYgKG9wdGlvbnMgJiBTZXJ2ZXJSdW5JblRocmVhZCkgewogICAgICAg ICBXVEY6OmluaXRpYWxpemUoKTsKQEAgLTQ2LDcgKzQ2LDE2IEBAIFdlYktpdFRlc3RTZXJ2ZXI6 OldlYktpdFRlc3RTZXJ2ZXIoU2VydmVyT3B0aW9ucyBvcHRpb25zKQogCiAgICAgR1VuaXF1ZU91 dFB0cjxHRXJyb3I+IGVycm9yOwogICAgIFNvdXBTZXJ2ZXJMaXN0ZW5PcHRpb25zIHNlcnZlck9w dGlvbnMgPSBzdGF0aWNfY2FzdDxTb3VwU2VydmVyTGlzdGVuT3B0aW9ucz4ob3B0aW9ucyAmIFNl cnZlckhUVFBTID8gU09VUF9TRVJWRVJfTElTVEVOX0lQVjRfT05MWSA6IFNPVVBfU0VSVkVSX0xJ U1RFTl9JUFY0X09OTFkgfCBTT1VQX1NFUlZFUl9MSVNURU5fSFRUUFMpOwotICAgIGlmICghc291 cF9zZXJ2ZXJfbGlzdGVuX2xvY2FsKG1fc291cFNlcnZlci5nZXQoKSwgU09VUF9BRERSRVNTX0FO WV9QT1JULCBzZXJ2ZXJPcHRpb25zLCAmZXJyb3Iub3V0UHRyKCkpKSB7CisgICAgYm9vbCBzZXJ2 ZXJTdGFydGVkID0gZmFsc2U7CisgICAgaWYgKG9wdGlvbnMgJiBTZXJ2ZXJOb25Mb2NhbEhvc3Qp IHsKKyAgICAgICAgLy8gRklYTUUoaHR0cHM6Ly93ZWJraXQub3JnL2IvMjE5MTk4KTogVGhpcyBz aG91bGQgcmVhbGx5IGJlIGEgbm9uLWxvY2FsaG9zdCBkb21haW4gYnV0CisgICAgICAgIC8vIHJl bHlpbmcgb24gImxvY2FsaG9zdCIgaXMgZmluZSB1bnRpbCBidWcgMTcxOTM0IGlzIGZpeGVkLgor ICAgICAgICBHUmVmUHRyPFNvdXBBZGRyZXNzPiBhZGRyZXNzID0gYWRvcHRHUmVmKHNvdXBfYWRk cmVzc19uZXcoImxvY2FsaG9zdCIsIFNPVVBfQUREUkVTU19BTllfUE9SVCkpOworICAgICAgICBz b3VwX2FkZHJlc3NfcmVzb2x2ZV9zeW5jKGFkZHJlc3MuZ2V0KCksIG51bGxwdHIpOworICAgICAg ICBzZXJ2ZXJTdGFydGVkID0gc291cF9zZXJ2ZXJfbGlzdGVuKG1fc291cFNlcnZlci5nZXQoKSwg c291cF9hZGRyZXNzX2dldF9nc29ja2FkZHIoYWRkcmVzcy5nZXQoKSksIHNlcnZlck9wdGlvbnMs ICZlcnJvci5vdXRQdHIoKSk7CisgICAgfSBlbHNlCisgICAgICAgIHNlcnZlclN0YXJ0ZWQgPSBz b3VwX3NlcnZlcl9saXN0ZW5fbG9jYWwobV9zb3VwU2VydmVyLmdldCgpLCBTT1VQX0FERFJFU1Nf QU5ZX1BPUlQsIHNlcnZlck9wdGlvbnMsICZlcnJvci5vdXRQdHIoKSk7CisgICAgaWYgKCFzZXJ2 ZXJTdGFydGVkKSB7CiAgICAgICAgIFdURkxvZ0Fsd2F5cygiRmFpbGVkIHRvIHN0YXJ0IEhUVFAg c2VydmVyOiAlcyIsIGVycm9yLT5tZXNzYWdlKTsKICAgICAgICAgQ1JBU0goKTsKICAgICB9CmRp ZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0 U2VydmVyLmggYi9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0 U2VydmVyLmgKaW5kZXggMjgxNDUyN2YxOWI5Li44ZTQzMzI4ZWU2ODkgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYktpdFRlc3RTZXJ2ZXIuaAorKysg Yi9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmgK QEAgLTMyLDkgKzMyLDEwIEBAIHB1YmxpYzoKICAgICAgICAgU2VydmVySFRUUCA9IDAsCiAgICAg ICAgIFNlcnZlckhUVFBTID0gMSA8PCAxLAogICAgICAgICBTZXJ2ZXJSdW5JblRocmVhZCA9IDEg PDwgMiwKKyAgICAgICAgU2VydmVyTm9uTG9jYWxIb3N0ID0gMSA8PCAzLAogICAgIH07CiAKLSAg ICBXZWJLaXRUZXN0U2VydmVyKFNlcnZlck9wdGlvbnMgPSBTZXJ2ZXJIVFRQKTsKKyAgICBXZWJL aXRUZXN0U2VydmVyKHVpbnQ4X3Qgb3B0aW9ucyA9IFNlcnZlckhUVFApOwogICAgIHZpcnR1YWwg fldlYktpdFRlc3RTZXJ2ZXIoKTsKIAogICAgIFNvdXBVUkkqIGJhc2VVUkkoKSBjb25zdCB7IHJl dHVybiBtX2Jhc2VVUkk7IH0KLS0gCjIuMjkuMgoK 414835 2020-11-24 05:58:55 -0800 2021-02-24 07:43:13 -0800 Patch (reverted) 0001-GTK-Allow-WebKitTestServer-to-run-non-localhost-addr.patch text/plain 6930 fred.wang RnJvbSA5Zjk3ODRhN2VmZTFhNDRjMmU5M2FlOTYzMzU5YWRiNDE2ZjYxZWM0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGcmVkZXJpYyBXYW5nIDxmd2FuZ0BpZ2FsaWEuY29tPgpEYXRl OiBNb24sIDIzIE5vdiAyMDIwIDE1OjIxOjQ5ICswMTAwClN1YmplY3Q6IFtQQVRDSCB4c2VydmVy XSBbR1RLXSBBbGxvdyBXZWJLaXRUZXN0U2VydmVyIHRvIHJ1biBub24tbG9jYWxob3N0CiBhZGRy ZXNzZXMgZm9yIEFQSSB0ZXN0cwoKLS0tCiBUb29scy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgfCAyNyArKysrKysrKysrKysrKysrKysrCiAuLi4vVGVzdHMvV2ViS2l0 R0xpYi9UZXN0U1NMLmNwcCAgICAgICAgICAgICAgfCAgNiArKystLQogLi4uL2dsaWIvV2ViS2l0 R0xpYi9XZWJLaXRUZXN0U2VydmVyLmNwcCAgICAgIHwgMTcgKysrKysrKystLS0tCiAuLi4vZ2xp Yi9XZWJLaXRHTGliL1dlYktpdFRlc3RTZXJ2ZXIuaCAgICAgICAgfCAxMCArKysrLS0tCiA0IGZp bGVzIGNoYW5nZWQsIDQ5IGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhNjNiY2Q0YmM0NTQu LjJhNjUyMGEyNjExYiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0No YW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTExLTI0ICBGcmVkZXJpYyBXYW5nICA8Zndh bmdAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBBbGxvdyBXZWJLaXRUZXN0U2VydmVyIHRv IHJ1biBub24tbG9vcGJhY2sgYWRkcmVzc2VzIGZvciBBUEkgdGVzdHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTI1NworCisgICAgICAgIEdUSyBB UEkgdGVzdHMgY3VycmVudGx5IGFzc3VtZXMgdGhhdCBsb29wYmFjayBJUCBhZGRyZXNzZXMgY2Fu IGJlIHRyZWF0ZWQgYXMgbWl4ZWQgY29udGVudAorICAgICAgICBpbiBvcmRlciB0byB0ZXN0IFdF QktJVF9JTlNFQ1VSRV9DT05URU5UX1JVTiBhbmQgV0VCS0lUX0lOU0VDVVJFX0NPTlRFTlRfRElT UExBWUVEIEFQSXMuCisgICAgICAgIEFmdGVyIGJ1ZyAyMTg2MjMsIHRoaXMgd2lsbCBubyBsb25n ZXIgYmUgdHJ1ZSBzbyB0aGlzIHBhdGNoIGFkZHMgYW4gb3B0aW9uIHRvCisgICAgICAgIFdlYktp dFRlc3RTZXJ2ZXIgc28gdGhhdCBpdCBjYW4gcnVuIGEgc2VydmVyIGxpc3RlbmluZyB0byAibG9j YWxob3N0IiBpbnN0ZWFkLiBUaGlzIGFwcHJvYWNoCisgICAgICAgIHdpbGwgd29yayB1bnRpbCBi dWcgMTcxOTM0IGlzIGZpeGVkLCBidXQgd2UgbWlnaHQgYWRkIGEgd2F5IHRvIGxhdW5jaCBhIHNl cnZlciBsaXN0ZW5pbmcgdG8KKyAgICAgICAgbm9uLWxvY2FsaG9zdCBhZGRyZXNzZXMgKGJ1ZyAy MTkxOTgpIG9yIHJldmlldyB0aGUgd2hvbGUgbWl4ZWQgY29udGVudCBoYW5kbGluZyBpbiB0aGUK KyAgICAgICAgZnV0dXJlIChidWcgMTQwNjI1KS4gVGhpcyBwYXRjaCBhbHNvIHR3ZWFrcyBhIGJp dCBXZWJLaXRUZXN0U2VydmVyIG9wdGlvbnMsIHNvIHRoZXkgdXNlIGEKKyAgICAgICAgYml0c2V0 IGluc3RlYWQuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTWljaGFlbCBDYXRhbnphcm8uCisKKyAg ICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFNTTC5jcHA6CisgICAg ICAgIChiZWZvcmVBbGwpOiBBZGQgYSBTZXJ2ZXJOb25Mb29wYmFjayBiaXQgdG8gdGhlIEhUVFBT IHNlcnZlciB1c2VkIGJ5IHRoZSB0ZXN0cywgc28gdGhhdAorICAgICAgICBpbnNlY3VyZSBjb250 ZW50IEFQSXMgd2lsbCBzdGlsbCB3b3JrIGFmdGVyIGJ1ZyAyMTg2MjMuIEFsc28gcmVtb3ZlIGV4 cGxpY2l0IG9wdGlvbnMgZm9yIHRoZQorICAgICAgICBIVFRQIHNlcnZlciBzaW5jZSBpdCBqdXN0 IHVzZXMgdGhlIGRlZmF1bHQgKG5vIGJpdHMgc2V0KS4KKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJ L2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmNwcDoKKyAgICAgICAgKFdlYktpdFRl c3RTZXJ2ZXI6OldlYktpdFRlc3RTZXJ2ZXIpOiBVc2UgdGhlIG5ldyBiaXRzZXQgc3ludGF4LiBT dGFydHMgYSBzZXJ2ZXIgbGlzdGVuaW5nIHRvCisgICAgICAgICJsb2NhbGhvc3QiIGlmIHRoZSBT ZXJ2ZXJOb25Mb29wYmFjayBiaXQgaXMgc2V0LgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvZ2xp Yi9XZWJLaXRHTGliL1dlYktpdFRlc3RTZXJ2ZXIuaDogTWFrZSB0aGUgZW51bSBhIGxpc3Qgb2Yg Yml0IHBvc2l0aW9ucworICAgICAgICBhbmQgdGhlIHBhcmFtZXRlciBhIGJpdHNldCBvZiBvcHRp b25zLiBBZGQgdGhlIG5ldyBTZXJ2ZXJOb25Mb29wYmFjayBvcHRpb24gYW5kIHJlbW92ZQorICAg ICAgICBTZXJ2ZXJIVFRQLCB3aGljaCBjb3JyZXNwb25kcyB0byB0aGUgZGVmYXVsdCB2YWx1ZSAo bm8gYml0cyBzZXQpLgorCiAyMDIwLTExLTIxICBKaWV3ZW4gVGFuICA8amlld2VuX3RhbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW1dlYkF1dGhuXSBJbXBsZW1lbnQgU1BJIGZvciBBdXRoZW50aWNh dGlvblNlcnZpY2VzLkZyYW1ld29yawpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRHTGliL1Rlc3RTU0wuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRHTGliL1Rlc3RTU0wuY3BwCmluZGV4IDg5MmQzNDI4MDZiZi4uZjYwMGZkN2FjYzk1IDEw MDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFNTTC5j cHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RTU0wuY3Bw CkBAIC01NTQsMTAgKzU1NCwxMiBAQCBzdGF0aWMgdm9pZCBodHRwU2VydmVyQ2FsbGJhY2soU291 cFNlcnZlciogc2VydmVyLCBTb3VwTWVzc2FnZSogbWVzc2FnZSwgY29uc3QgYwogCiB2b2lkIGJl Zm9yZUFsbCgpCiB7Ci0gICAga0h0dHBzU2VydmVyID0gbmV3IFdlYktpdFRlc3RTZXJ2ZXIoV2Vi S2l0VGVzdFNlcnZlcjo6U2VydmVySFRUUFMpOworICAgIC8vIEZJWE1FKGh0dHBzOi8vd2Via2l0 Lm9yZy9iLzIxOTE5OCk6IFRoaXMgc2hvdWxkIHJlYWxseSBiZSBhIG5vbi1sb2NhbGhvc3QgZG9t YWluIGJ1dAorICAgIC8vIHJlbHlpbmcgb24gYSBub24tbG9vcGJhY2sgSVAgYWRkcmVzcyBpcyBl bm91Z2ggdW50aWwgYnVnIDE3MTkzNCBpcyBmaXhlZC4KKyAgICBrSHR0cHNTZXJ2ZXIgPSBuZXcg V2ViS2l0VGVzdFNlcnZlcihXZWJLaXRUZXN0U2VydmVyOjpTZXJ2ZXJIVFRQUyB8IFdlYktpdFRl c3RTZXJ2ZXI6OlNlcnZlck5vbkxvb3BiYWNrKTsKICAgICBrSHR0cHNTZXJ2ZXItPnJ1bihodHRw c1NlcnZlckNhbGxiYWNrKTsKIAotICAgIGtIdHRwU2VydmVyID0gbmV3IFdlYktpdFRlc3RTZXJ2 ZXIoV2ViS2l0VGVzdFNlcnZlcjo6U2VydmVySFRUUCk7CisgICAga0h0dHBTZXJ2ZXIgPSBuZXcg V2ViS2l0VGVzdFNlcnZlcigpOwogICAgIGtIdHRwU2VydmVyLT5ydW4oaHR0cFNlcnZlckNhbGxi YWNrKTsKIAogICAgIFNTTFRlc3Q6OmFkZCgiV2ViS2l0V2ViVmlldyIsICJzc2wiLCB0ZXN0U1NM KTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYktp dFRlc3RTZXJ2ZXIuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdMaWIvV2Vi S2l0VGVzdFNlcnZlci5jcHAKaW5kZXggOTM2YzkyMmE3ODBkLi4yYTA3MjBmYzNmZGQgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYktpdFRlc3RTZXJ2 ZXIuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYktpdFRl c3RTZXJ2ZXIuY3BwCkBAIC0yNCwxNiArMjQsMTYgQEAKICNpbmNsdWRlIDx3dGYvVGhyZWFkaW5n Lmg+CiAjaW5jbHVkZSA8d3RmL2dsaWIvR1VuaXF1ZVB0ci5oPgogCi1XZWJLaXRUZXN0U2VydmVy OjpXZWJLaXRUZXN0U2VydmVyKFNlcnZlck9wdGlvbnMgb3B0aW9ucykKK1dlYktpdFRlc3RTZXJ2 ZXI6OldlYktpdFRlc3RTZXJ2ZXIoU2VydmVyT3B0aW9uc0JpdFNldCBvcHRpb25zKQogewotICAg IGlmIChvcHRpb25zICYgU2VydmVyUnVuSW5UaHJlYWQpIHsKKyAgICBpZiAob3B0aW9uc1tTZXJ2 ZXJSdW5JblRocmVhZF0pIHsKICAgICAgICAgV1RGOjppbml0aWFsaXplKCk7CiAgICAgICAgIG1f cXVldWUgPSBXb3JrUXVldWU6OmNyZWF0ZSgiV2ViS2l0VGVzdFNlcnZlciIpOwogICAgIH0KIAog ICAgIEdVbmlxdWVQdHI8Y2hhcj4gc3NsQ2VydGlmaWNhdGVGaWxlOwogICAgIEdVbmlxdWVQdHI8 Y2hhcj4gc3NsS2V5RmlsZTsKLSAgICBpZiAob3B0aW9ucyAmIFNlcnZlckhUVFBTKSB7CisgICAg aWYgKG9wdGlvbnNbU2VydmVySFRUUFNdKSB7CiAgICAgICAgIENTdHJpbmcgcmVzb3VyY2VzRGly ID0gVGVzdDo6Z2V0UmVzb3VyY2VzRGlyKCk7CiAgICAgICAgIHNzbENlcnRpZmljYXRlRmlsZS5y ZXNldChnX2J1aWxkX2ZpbGVuYW1lKHJlc291cmNlc0Rpci5kYXRhKCksICJ0ZXN0LWNlcnQucGVt IiwgTlVMTCkpOwogICAgICAgICBzc2xLZXlGaWxlLnJlc2V0KGdfYnVpbGRfZmlsZW5hbWUocmVz b3VyY2VzRGlyLmRhdGEoKSwgInRlc3Qta2V5LnBlbSIsIE5VTEwpKTsKQEAgLTQ1LDggKzQ1LDE1 IEBAIFdlYktpdFRlc3RTZXJ2ZXI6OldlYktpdFRlc3RTZXJ2ZXIoU2VydmVyT3B0aW9ucyBvcHRp b25zKQogICAgICAgICBTT1VQX1NFUlZFUl9TU0xfS0VZX0ZJTEUsIHNzbEtleUZpbGUuZ2V0KCks IG51bGxwdHIpKTsKIAogICAgIEdVbmlxdWVPdXRQdHI8R0Vycm9yPiBlcnJvcjsKLSAgICBTb3Vw U2VydmVyTGlzdGVuT3B0aW9ucyBzZXJ2ZXJPcHRpb25zID0gc3RhdGljX2Nhc3Q8U291cFNlcnZl ckxpc3Rlbk9wdGlvbnM+KG9wdGlvbnMgJiBTZXJ2ZXJIVFRQUyA/IFNPVVBfU0VSVkVSX0xJU1RF Tl9JUFY0X09OTFkgOiBTT1VQX1NFUlZFUl9MSVNURU5fSVBWNF9PTkxZIHwgU09VUF9TRVJWRVJf TElTVEVOX0hUVFBTKTsKLSAgICBpZiAoIXNvdXBfc2VydmVyX2xpc3Rlbl9sb2NhbChtX3NvdXBT ZXJ2ZXIuZ2V0KCksIFNPVVBfQUREUkVTU19BTllfUE9SVCwgc2VydmVyT3B0aW9ucywgJmVycm9y Lm91dFB0cigpKSkgeworICAgIFNvdXBTZXJ2ZXJMaXN0ZW5PcHRpb25zIHNlcnZlck9wdGlvbnMg PSBzdGF0aWNfY2FzdDxTb3VwU2VydmVyTGlzdGVuT3B0aW9ucz4ob3B0aW9uc1tTZXJ2ZXJIVFRQ U10gPyBTT1VQX1NFUlZFUl9MSVNURU5fSVBWNF9PTkxZIDogU09VUF9TRVJWRVJfTElTVEVOX0lQ VjRfT05MWSB8IFNPVVBfU0VSVkVSX0xJU1RFTl9IVFRQUyk7CisgICAgYm9vbCBzZXJ2ZXJTdGFy dGVkID0gZmFsc2U7CisgICAgaWYgKG9wdGlvbnNbU2VydmVyTm9uTG9vcGJhY2tdKSB7CisgICAg ICAgIEdSZWZQdHI8U291cEFkZHJlc3M+IGFkZHJlc3MgPSBhZG9wdEdSZWYoc291cF9hZGRyZXNz X25ldygibG9jYWxob3N0IiwgU09VUF9BRERSRVNTX0FOWV9QT1JUKSk7CisgICAgICAgIHNvdXBf YWRkcmVzc19yZXNvbHZlX3N5bmMoYWRkcmVzcy5nZXQoKSwgbnVsbHB0cik7CisgICAgICAgIHNl cnZlclN0YXJ0ZWQgPSBzb3VwX3NlcnZlcl9saXN0ZW4obV9zb3VwU2VydmVyLmdldCgpLCBzb3Vw X2FkZHJlc3NfZ2V0X2dzb2NrYWRkcihhZGRyZXNzLmdldCgpKSwgc2VydmVyT3B0aW9ucywgJmVy cm9yLm91dFB0cigpKTsKKyAgICB9IGVsc2UKKyAgICAgICAgc2VydmVyU3RhcnRlZCA9IHNvdXBf c2VydmVyX2xpc3Rlbl9sb2NhbChtX3NvdXBTZXJ2ZXIuZ2V0KCksIFNPVVBfQUREUkVTU19BTllf UE9SVCwgc2VydmVyT3B0aW9ucywgJmVycm9yLm91dFB0cigpKTsKKyAgICBpZiAoIXNlcnZlclN0 YXJ0ZWQpIHsKICAgICAgICAgV1RGTG9nQWx3YXlzKCJGYWlsZWQgdG8gc3RhcnQgSFRUUCBzZXJ2 ZXI6ICVzIiwgZXJyb3ItPm1lc3NhZ2UpOwogICAgICAgICBDUkFTSCgpOwogICAgIH0KZGlmZiAt LWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYktpdFRlc3RTZXJ2 ZXIuaCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYktpdFRlc3RTZXJ2 ZXIuaAppbmRleCAyODE0NTI3ZjE5YjkuLmRhMjVlYWRhODM2YSAxMDA2NDQKLS0tIGEvVG9vbHMv VGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdMaWIvV2ViS2l0VGVzdFNlcnZlci5oCisrKyBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYktpdFRlc3RTZXJ2ZXIuaApAQCAt MTksNiArMTksNyBAQAogCiAjcHJhZ21hIG9uY2UKIAorI2luY2x1ZGUgPGJpdHNldD4KICNpbmNs dWRlIDxsaWJzb3VwL3NvdXAuaD4KICNpbmNsdWRlIDx3dGYvV29ya1F1ZXVlLmg+CiAjaW5jbHVk ZSA8d3RmL2dsaWIvR1JlZlB0ci5oPgpAQCAtMjksMTIgKzMwLDEzIEBAIGNsYXNzIFdlYktpdFRl c3RTZXJ2ZXIgewogcHVibGljOgogCiAgICAgZW51bSBTZXJ2ZXJPcHRpb25zIHsKLSAgICAgICAg U2VydmVySFRUUCA9IDAsCi0gICAgICAgIFNlcnZlckhUVFBTID0gMSA8PCAxLAotICAgICAgICBT ZXJ2ZXJSdW5JblRocmVhZCA9IDEgPDwgMiwKKyAgICAgICAgU2VydmVySFRUUFMgPSAwLAorICAg ICAgICBTZXJ2ZXJSdW5JblRocmVhZCA9IDEsCisgICAgICAgIFNlcnZlck5vbkxvb3BiYWNrID0g MiwKICAgICB9OworICAgIHVzaW5nIFNlcnZlck9wdGlvbnNCaXRTZXQgPSBzdGQ6OmJpdHNldDwz PjsKIAotICAgIFdlYktpdFRlc3RTZXJ2ZXIoU2VydmVyT3B0aW9ucyA9IFNlcnZlckhUVFApOwor ICAgIFdlYktpdFRlc3RTZXJ2ZXIoU2VydmVyT3B0aW9uc0JpdFNldCA9IDApOwogICAgIHZpcnR1 YWwgfldlYktpdFRlc3RTZXJ2ZXIoKTsKIAogICAgIFNvdXBVUkkqIGJhc2VVUkkoKSBjb25zdCB7 IHJldHVybiBtX2Jhc2VVUkk7IH0KLS0gCjIuMjkuMgoK 421409 2021-02-24 07:44:18 -0800 2021-02-24 07:44:18 -0800 Patch 0001-GTK-Allow-WebKitTestServer-to-run-non-loopback-addre.patch text/plain 5381 fred.wang RnJvbSBjMDFjM2NhM2Y0ZmNhODA1N2JmM2UzMmVlZTQ3ZjRlMzAxNzBlMjUxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/RnI9QzM9QTlkPUMzPUE5cmljPTIwV2FuZz89 IDxmd2FuZ0BpZ2FsaWEuY29tPgpEYXRlOiBXZWQsIDI0IEZlYiAyMDIxIDE2OjQxOjMxICswMTAw ClN1YmplY3Q6IFtQQVRDSF0gW0dUS10gQWxsb3cgV2ViS2l0VGVzdFNlcnZlciB0byBydW4gbm9u LWxvb3BiYWNrIGFkZHJlc3NlcwogZm9yIEFQSSB0ZXN0cwoKLS0tCiAuLi4vVGVzdHMvV2ViS2l0 R0xpYi9UZXN0RG93bmxvYWRzLmNwcCAgICAgICAgfCAgNyArKysrKy0KIC4uLi9UZXN0cy9XZWJL aXRHTGliL1Rlc3RTU0wuY3BwICAgICAgICAgICAgICB8ICAxICsKIC4uLi9nbGliL1dlYktpdEdM aWIvV2ViS2l0VGVzdFNlcnZlci5jcHAgICAgICB8IDI1ICsrKysrKysrKysrKysrLS0tLS0KIC4u Li9nbGliL1dlYktpdEdMaWIvV2ViS2l0VGVzdFNlcnZlci5oICAgICAgICB8ICA1ICsrKy0KIDQg ZmlsZXMgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdERvd25sb2Fkcy5j cHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdERvd25sb2Fkcy5j cHAKaW5kZXggYzc0NTY3NzJiOS4uNTcyMmI0YjZiOCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3REb3dubG9hZHMuY3BwCisrKyBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0RG93bmxvYWRzLmNwcApAQCAtODc5LDcg Kzg3OSwxMiBAQCBzdGF0aWMgdm9pZCB0ZXN0QmxvYkRvd25sb2FkKFdlYlZpZXdEb3dubG9hZFRl c3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAKIHZvaWQgYmVmb3JlQWxsKCkKIHsKLSAgICBrU2Vy dmVyID0gbmV3IFdlYktpdFRlc3RTZXJ2ZXIoKTsKKyAgICBXZWJLaXRUZXN0U2VydmVyOjpTZXJ2 ZXJPcHRpb25zQml0U2V0IHNlcnZlck9wdGlvbnM7CisgICAgLy8gVE9ETzogcmVtb3ZlIHRoaXMg Y2hhbmdlIGZyb20gdGhlIHBhdGNoIQorICAgIHNlcnZlck9wdGlvbnMuc2V0KFdlYktpdFRlc3RT ZXJ2ZXI6OlNlcnZlck5vbkxvb3BiYWNrKTsKKyAgICBzZXJ2ZXJPcHRpb25zLnNldChXZWJLaXRU ZXN0U2VydmVyOjpTZXJ2ZXJSdW5JblRocmVhZCk7CisgICAgLy8gc2VydmVyT3B0aW9ucy5zZXQo V2ViS2l0VGVzdFNlcnZlcjo6U2VydmVySFRUUFMpOworICAgIGtTZXJ2ZXIgPSBuZXcgV2ViS2l0 VGVzdFNlcnZlcihzZXJ2ZXJPcHRpb25zKTsKICAgICBrU2VydmVyLT5ydW4oc2VydmVyQ2FsbGJh Y2spOwogCiAgICAgRG93bmxvYWRUZXN0OjphZGQoIkRvd25sb2FkcyIsICJsb2NhbC1maWxlIiwg dGVzdERvd25sb2FkTG9jYWxGaWxlKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0R0xpYi9UZXN0U1NMLmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0R0xpYi9UZXN0U1NMLmNwcAppbmRleCBjNTYxMTA3M2M2Li4wZjkxZTZhNDRjIDEwMDY0 NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFNTTC5jcHAK KysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RTU0wuY3BwCkBA IC01NjIsNiArNTYyLDcgQEAgc3RhdGljIHZvaWQgaHR0cFNlcnZlckNhbGxiYWNrKFNvdXBTZXJ2 ZXIqIHNlcnZlciwgU291cFNlcnZlck1lc3NhZ2UqIG1lc3NhZ2UsIGMKIAogdm9pZCBiZWZvcmVB bGwoKQogeworICAgIC8vIFRPRE86IHVzZSBub24tbG9vcGJhY2suCiAgICAga0h0dHBzU2VydmVy ID0gbmV3IFdlYktpdFRlc3RTZXJ2ZXIoV2ViS2l0VGVzdFNlcnZlcjo6U2VydmVySFRUUFMpOwog ICAgIGtIdHRwc1NlcnZlci0+cnVuKGh0dHBzU2VydmVyQ2FsbGJhY2spOwogCmRpZmYgLS1naXQg YS9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVyLmNw cCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYktpdFRlc3RTZXJ2ZXIu Y3BwCmluZGV4IGVkODU1ZWVmYzkuLjYxYzllYWNjYmUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYktpdFRlc3RTZXJ2ZXIuY3BwCisrKyBiL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYktpdFRlc3RTZXJ2ZXIuY3BwCkBAIC00 MCwyNSArNDAsMzggQEAgV2ViS2l0VGVzdFNlcnZlcjo6V2ViS2l0VGVzdFNlcnZlcihTZXJ2ZXJP cHRpb25zQml0U2V0IG9wdGlvbnMpCiAgICAgICAgIEdVbmlxdWVQdHI8Y2hhcj4gc3NsS2V5Rmls ZShnX2J1aWxkX2ZpbGVuYW1lKHJlc291cmNlc0Rpci5kYXRhKCksICJ0ZXN0LWtleS5wZW0iLCBu dWxscHRyKSk7CiAgICAgICAgIGdfYXNzZXJ0X3RydWUoc291cF9zZXJ2ZXJfc2V0X3NzbF9jZXJ0 X2ZpbGUobV9zb3VwU2VydmVyLmdldCgpLCBzc2xDZXJ0aWZpY2F0ZUZpbGUuZ2V0KCksIHNzbEtl eUZpbGUuZ2V0KCksIG51bGxwdHIpKTsKICAgICB9CisKKyAgICBpZiAob3B0aW9uc1tTZXJ2ZXJO b25Mb29wYmFja10pIHsKKyAgICAgICAgbV9hZGRyZXNzID0gYWRvcHRHUmVmKHNvdXBfYWRkcmVz c19uZXcoImxvY2FsaG9zdCIsIFNPVVBfQUREUkVTU19BTllfUE9SVCkpOworICAgICAgICBzb3Vw X2FkZHJlc3NfcmVzb2x2ZV9zeW5jKG1fYWRkcmVzcy5nZXQoKSwgbnVsbHB0cik7CisgICAgfQor fQorCitnYm9vbGVhbiBXZWJLaXRUZXN0U2VydmVyOjpsaXN0ZW4oKSB7CisgICAgdW5zaWduZWQg b3B0aW9ucyA9IDA7CisgICAgaWYgKCFtX2FkZHJlc3MpCisgICAgICAgIG9wdGlvbnMgfD0gU09V UF9TRVJWRVJfTElTVEVOX0lQVjRfT05MWTsKKyAgICBpZiAoc291cF9zZXJ2ZXJfaXNfaHR0cHMo bV9zb3VwU2VydmVyLmdldCgpKSkKKyAgICAgICAgb3B0aW9ucyB8PSBTT1VQX1NFUlZFUl9MSVNU RU5fSFRUUFM7CisKKyAgICBpZiAobV9hZGRyZXNzKQorICAgICAgICByZXR1cm4gc291cF9zZXJ2 ZXJfbGlzdGVuKG1fc291cFNlcnZlci5nZXQoKSwgc291cF9hZGRyZXNzX2dldF9nc29ja2FkZHIo bV9hZGRyZXNzLmdldCgpKSwgc3RhdGljX2Nhc3Q8U291cFNlcnZlckxpc3Rlbk9wdGlvbnM+KG9w dGlvbnMpLCBudWxscHRyKTsKKyAgICByZXR1cm4gc291cF9zZXJ2ZXJfbGlzdGVuX2xvY2FsKG1f c291cFNlcnZlci5nZXQoKSwgU09VUF9BRERSRVNTX0FOWV9QT1JULCBzdGF0aWNfY2FzdDxTb3Vw U2VydmVyTGlzdGVuT3B0aW9ucz4ob3B0aW9ucyksIG51bGxwdHIpOwogfQogCiB2b2lkIFdlYktp dFRlc3RTZXJ2ZXI6OnJ1bihTb3VwU2VydmVyQ2FsbGJhY2sgc2VydmVyQ2FsbGJhY2spCiB7CiAg ICAgc291cF9zZXJ2ZXJfYWRkX2hhbmRsZXIobV9zb3VwU2VydmVyLmdldCgpLCBudWxscHRyLCBz ZXJ2ZXJDYWxsYmFjaywgbnVsbHB0ciwgbnVsbHB0cik7CiAKLSAgICB1bnNpZ25lZCBvcHRpb25z ID0gU09VUF9TRVJWRVJfTElTVEVOX0lQVjRfT05MWTsKLSAgICBpZiAoc291cF9zZXJ2ZXJfaXNf aHR0cHMobV9zb3VwU2VydmVyLmdldCgpKSkKLSAgICAgICAgb3B0aW9ucyB8PSBTT1VQX1NFUlZF Ul9MSVNURU5fSFRUUFM7Ci0KICAgICBpZiAobV9xdWV1ZSkgewogICAgICAgICBCaW5hcnlTZW1h cGhvcmUgc2VtYXBob3JlOwogICAgICAgICBtX3F1ZXVlLT5kaXNwYXRjaChbJl0gewotICAgICAg ICAgICAgZ19hc3NlcnRfdHJ1ZShzb3VwX3NlcnZlcl9saXN0ZW5fbG9jYWwobV9zb3VwU2VydmVy LmdldCgpLCAwLCBzdGF0aWNfY2FzdDxTb3VwU2VydmVyTGlzdGVuT3B0aW9ucz4ob3B0aW9ucyks IG51bGxwdHIpKTsKKyAgICAgICAgICAgIGdfYXNzZXJ0X3RydWUobGlzdGVuKCkpOwogICAgICAg ICAgICAgc2VtYXBob3JlLnNpZ25hbCgpOwogICAgICAgICB9KTsKICAgICAgICAgc2VtYXBob3Jl LndhaXQoKTsKICAgICB9IGVsc2UKLSAgICAgICAgZ19hc3NlcnRfdHJ1ZShzb3VwX3NlcnZlcl9s aXN0ZW5fbG9jYWwobV9zb3VwU2VydmVyLmdldCgpLCAwLCBzdGF0aWNfY2FzdDxTb3VwU2VydmVy TGlzdGVuT3B0aW9ucz4ob3B0aW9ucyksIG51bGxwdHIpKTsKKyAgICAgICAgZ19hc3NlcnRfdHJ1 ZShsaXN0ZW4oKSk7CiAKICAgICBHU0xpc3QqIHVyaXMgPSBzb3VwX3NlcnZlcl9nZXRfdXJpcyht X3NvdXBTZXJ2ZXIuZ2V0KCkpOwogICAgIGdfYXNzZXJ0X25vbm51bGwodXJpcyk7CmRpZmYgLS1n aXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVy LmggYi9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9XZWJLaXRUZXN0U2VydmVy LmgKaW5kZXggZGQzY2VlZGQzNS4uOWYwNGFmZjhiOSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdl YktpdEFQSS9nbGliL1dlYktpdEdMaWIvV2ViS2l0VGVzdFNlcnZlci5oCisrKyBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYktpdFRlc3RTZXJ2ZXIuaApAQCAtMzMsOCAr MzMsOSBAQCBwdWJsaWM6CiAgICAgZW51bSBTZXJ2ZXJPcHRpb25zIHsKICAgICAgICAgU2VydmVy SFRUUFMgPSAwLAogICAgICAgICBTZXJ2ZXJSdW5JblRocmVhZCA9IDEsCisgICAgICAgIFNlcnZl ck5vbkxvb3BiYWNrID0gMiwKICAgICB9OwotICAgIHVzaW5nIFNlcnZlck9wdGlvbnNCaXRTZXQg PSBzdGQ6OmJpdHNldDwyPjsKKyAgICB1c2luZyBTZXJ2ZXJPcHRpb25zQml0U2V0ID0gc3RkOjpi aXRzZXQ8Mz47CiAKICAgICBXZWJLaXRUZXN0U2VydmVyKFNlcnZlck9wdGlvbnNCaXRTZXQgPSAw KTsKICAgICBXZWJLaXRUZXN0U2VydmVyKFNlcnZlck9wdGlvbnMgb3B0aW9uKQpAQCAtNDQsNiAr NDUsNyBAQCBwdWJsaWM6CiAgICAgdW5zaWduZWQgcG9ydCgpIGNvbnN0OwogICAgIENTdHJpbmcg Z2V0VVJJRm9yUGF0aChjb25zdCBjaGFyKiBwYXRoKSBjb25zdDsKICAgICB2b2lkIHJ1bihTb3Vw U2VydmVyQ2FsbGJhY2spOworICAgIGdib29sZWFuIGxpc3RlbigpOwogCiAjaWYgU09VUF9DSEVD S19WRVJTSU9OKDIsIDUwLCAwKQogICAgIHZvaWQgYWRkV2ViU29ja2V0SGFuZGxlcihTb3VwU2Vy dmVyV2Vic29ja2V0Q2FsbGJhY2ssIGdwb2ludGVyIHVzZXJEYXRhKTsKQEAgLTU0LDYgKzU2LDcg QEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIEdSZWZQdHI8U291cFNlcnZlcj4gbV9zb3VwU2Vy dmVyOworICAgIEdSZWZQdHI8U291cEFkZHJlc3M+IG1fYWRkcmVzczsKICAgICBVUkwgbV9iYXNl VVJMOwogI2lmIFNPVVBfQ0hFQ0tfVkVSU0lPTigyLCA1MCwgMCkKICAgICBVUkwgbV9iYXNlV2Vi U29ja2V0VVJMOwotLSAKMi4yNS4xCgo=