215695 2020-08-20 05:05:25 -0700 Align console log message of new WebSocket code path with the legacy code path 2020-08-20 10:31:19 -0700 1 1 1 Unclassified WebKit Page Loading WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen beidson webkit-bug-importer oldest_to_newest 1681674 0 youennf 2020-08-20 05:05:25 -0700 Align console log message of new WebSocket code path with the legacy code path 1681675 1 406925 youennf 2020-08-20 05:06:42 -0700 Created attachment 406925 Patch 1681693 2 406933 youennf 2020-08-20 08:39:33 -0700 Created attachment 406933 Patch 1681730 3 ews-feeder 2020-08-20 10:30:49 -0700 Committed r265952: <https://trac.webkit.org/changeset/265952> All reviewed patches have been landed. Closing bug and clearing flags on attachment 406933. 1681732 4 webkit-bug-importer 2020-08-20 10:31:19 -0700 <rdar://problem/67490294> 406925 2020-08-20 05:06:42 -0700 2020-08-20 08:39:29 -0700 Patch bug-215695-20200820140641.patch text/plain 3021 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1OTM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU5ODAwN2Y0NGY3MjgwMjll NmY3YjM4YmY3NWVmZTBkZGIxMmVkMTUuLjM5OGNhMmJiYzc4ZGE3MTNhNDZhZTRkYzBkOGNkZDcx MzZkNDE5NzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjAtMDgtMjAgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIEFsaWduIGNvbnNvbGUgbG9nIG1l c3NhZ2Ugb2YgbmV3IFdlYlNvY2tldCBjb2RlIHBhdGggd2l0aCB0aGUgbGVnYWN5IGNvZGUgcGF0 aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE1Njk1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gb2Jz ZXJ2YWJsZSBjaGFuZ2Ugb2YgYmVoYXZpb3IgZnJvbSB0aGUgcGFnZS4KKyAgICAgICAgQ29uc29s ZSBsb2cgbWVzc2FnZXMgYXBwZWFyIGluIGV4cGVjdGVkLnR4dCBmaWxlcyB3aGVuIE5TVVJMU2Vz c2lvbiBjb2RlIHBhdGggaXMgZW5hYmxlZC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvTmV0d29y ay9XZWJTb2NrZXRDaGFubmVsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViU29ja2V0Q2hhbm5l bDo6Y29ubmVjdCk6CisgICAgICAgIChXZWJLaXQ6OldlYlNvY2tldENoYW5uZWw6OmRpZFJlY2Vp dmVNZXNzYWdlRXJyb3IpOgorICAgICAgICAqIFdlYlByb2Nlc3MvTmV0d29yay9XZWJTb2NrZXRD aGFubmVsLmg6CisKIDIwMjAtMDgtMjAgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29t PgogCiAgICAgICAgIFdlYlNvY2tldFRhc2s6OmNsb3NlIHNob3VsZCBjb3JyZWN0bHkgY29tcHV0 ZSByZWFzb24gYnl0ZSBzaXplIGluIFVURi04CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvTmV0d29yay9XZWJTb2NrZXRDaGFubmVsLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9OZXR3b3JrL1dlYlNvY2tldENoYW5uZWwuY3BwCmluZGV4IGE5MTE1NDliMDFhNGU0 NzBkNmFkYzhhZDEzYjY1YWNkYWJjYzcxNWUuLmVlYzhkNWY3ZjY4ZTZkOWRiMzQwZTRjMWZmYmUy Y2FkNDdmM2UzNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3Jr L1dlYlNvY2tldENoYW5uZWwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3 b3JrL1dlYlNvY2tldENoYW5uZWwuY3BwCkBAIC0xMTcsNyArMTE3LDcgQEAgV2ViU29ja2V0Q2hh bm5lbDo6Q29ubmVjdFN0YXR1cyBXZWJTb2NrZXRDaGFubmVsOjpjb25uZWN0KGNvbnN0IFVSTCYg dXJsLCBjb25zdAogICAgICAgICBtX2NsaWVudC0+ZGlkVXBncmFkZVVSTCgpOwogCiAgICAgbV9p bnNwZWN0b3IuZGlkQ3JlYXRlV2ViU29ja2V0KG1fZG9jdW1lbnQuZ2V0KCksIHVybCk7Ci0KKyAg ICBtX3VybCA9IHJlcXVlc3QtPnVybCgpOwogICAgIE1lc3NhZ2VTZW5kZXI6OnNlbmQoTWVzc2Fn ZXM6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpDcmVhdGVTb2NrZXRDaGFubmVsIHsg KnJlcXVlc3QsIHByb3RvY29sLCBtX2lkZW50aWZpZXIgfSk7CiAgICAgcmV0dXJuIENvbm5lY3RT dGF0dXM6Ok9LOwogfQpAQCAtMzQxLDggKzM0MSwxNCBAQCB2b2lkIFdlYlNvY2tldENoYW5uZWw6 OmRpZFJlY2VpdmVNZXNzYWdlRXJyb3IoU3RyaW5nJiYgZXJyb3JNZXNzYWdlKQogICAgICAgICBy ZXR1cm47CiAgICAgfQogCi0gICAgaWYgKG1fZG9jdW1lbnQpCi0gICAgICAgIG1fZG9jdW1lbnQt PmFkZENvbnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3VyY2U6Ok5ldHdvcmssIE1lc3NhZ2VMZXZlbDo6 RXJyb3IsIGVycm9yTWVzc2FnZSk7CisgICAgaWYgKG1fZG9jdW1lbnQpIHsKKyAgICAgICAgU3Ry aW5nIGNvbnNvbGVNZXNzYWdlOworICAgICAgICBpZiAoIW1fdXJsLmlzTnVsbCgpKQorICAgICAg ICAgICAgY29uc29sZU1lc3NhZ2UgPSBtYWtlU3RyaW5nKCJXZWJTb2NrZXQgY29ubmVjdGlvbiB0 byAnIiwgbV91cmwuc3RyaW5nKCksICInIGZhaWxlZDogIiwgZXJyb3JNZXNzYWdlKTsKKyAgICAg ICAgZWxzZQorICAgICAgICAgICAgY29uc29sZU1lc3NhZ2UgPSBtYWtlU3RyaW5nKCJXZWJTb2Nr ZXQgY29ubmVjdGlvbiBmYWlsZWQ6ICIsIGVycm9yTWVzc2FnZSk7CisgICAgICAgIG1fZG9jdW1l bnQtPmFkZENvbnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3VyY2U6Ok5ldHdvcmssIE1lc3NhZ2VMZXZl bDo6RXJyb3IsIGNvbnNvbGVNZXNzYWdlKTsKKyAgICB9CiAKICAgICBtX2NsaWVudC0+ZGlkUmVj ZWl2ZU1lc3NhZ2VFcnJvcigpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL05ldHdvcmsvV2ViU29ja2V0Q2hhbm5lbC5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L05ldHdvcmsvV2ViU29ja2V0Q2hhbm5lbC5oCmluZGV4IDUxMDE5MjY4YjVkYjliYTY5NGE3ZGJh MWFlYTY1MWM5ZjljZGI1YzguLjY5MzA1ZDY2NDYyY2JhNzMyOTY4ZTNhMzk5NWYwY2E3NGJiMjBk MGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlNvY2tl dENoYW5uZWwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJTb2Nr ZXRDaGFubmVsLmgKQEAgLTEwMCw2ICsxMDAsNyBAQCBwcml2YXRlOgogICAgIFdlYWtQdHI8V2Vi Q29yZTo6RG9jdW1lbnQ+IG1fZG9jdW1lbnQ7CiAgICAgV2ViU29ja2V0SWRlbnRpZmllciBtX2lk ZW50aWZpZXI7CiAgICAgV2Vha1B0cjxXZWJDb3JlOjpXZWJTb2NrZXRDaGFubmVsQ2xpZW50PiBt X2NsaWVudDsKKyAgICBVUkwgbV91cmw7CiAgICAgU3RyaW5nIG1fc3VicHJvdG9jb2w7CiAgICAg U3RyaW5nIG1fZXh0ZW5zaW9uczsKICAgICBzaXplX3QgbV9idWZmZXJlZEFtb3VudCB7IDAgfTsK 406933 2020-08-20 08:39:33 -0700 2020-08-20 10:30:50 -0700 Patch bug-215695-20200820173931.patch text/plain 4085 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1OTM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU5ODAwN2Y0NGY3MjgwMjll NmY3YjM4YmY3NWVmZTBkZGIxMmVkMTUuLjM5OGNhMmJiYzc4ZGE3MTNhNDZhZTRkYzBkOGNkZDcx MzZkNDE5NzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjAtMDgtMjAgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIEFsaWduIGNvbnNvbGUgbG9nIG1l c3NhZ2Ugb2YgbmV3IFdlYlNvY2tldCBjb2RlIHBhdGggd2l0aCB0aGUgbGVnYWN5IGNvZGUgcGF0 aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE1Njk1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gb2Jz ZXJ2YWJsZSBjaGFuZ2Ugb2YgYmVoYXZpb3IgZnJvbSB0aGUgcGFnZS4KKyAgICAgICAgQ29uc29s ZSBsb2cgbWVzc2FnZXMgYXBwZWFyIGluIGV4cGVjdGVkLnR4dCBmaWxlcyB3aGVuIE5TVVJMU2Vz c2lvbiBjb2RlIHBhdGggaXMgZW5hYmxlZC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvTmV0d29y ay9XZWJTb2NrZXRDaGFubmVsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViU29ja2V0Q2hhbm5l bDo6Y29ubmVjdCk6CisgICAgICAgIChXZWJLaXQ6OldlYlNvY2tldENoYW5uZWw6OmRpZFJlY2Vp dmVNZXNzYWdlRXJyb3IpOgorICAgICAgICAqIFdlYlByb2Nlc3MvTmV0d29yay9XZWJTb2NrZXRD aGFubmVsLmg6CisKIDIwMjAtMDgtMjAgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29t PgogCiAgICAgICAgIFdlYlNvY2tldFRhc2s6OmNsb3NlIHNob3VsZCBjb3JyZWN0bHkgY29tcHV0 ZSByZWFzb24gYnl0ZSBzaXplIGluIFVURi04CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvTmV0d29yay9XZWJTb2NrZXRDaGFubmVsLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9OZXR3b3JrL1dlYlNvY2tldENoYW5uZWwuY3BwCmluZGV4IGE5MTE1NDliMDFhNGU0 NzBkNmFkYzhhZDEzYjY1YWNkYWJjYzcxNWUuLjZlMzc5ZDk1ZTI4NDNhMGRjNzg4NDI4MTE3MDQ4 NTAwOTM3Zjc3MjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3Jr L1dlYlNvY2tldENoYW5uZWwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3 b3JrL1dlYlNvY2tldENoYW5uZWwuY3BwCkBAIC0xMTcsNyArMTE3LDcgQEAgV2ViU29ja2V0Q2hh bm5lbDo6Q29ubmVjdFN0YXR1cyBXZWJTb2NrZXRDaGFubmVsOjpjb25uZWN0KGNvbnN0IFVSTCYg dXJsLCBjb25zdAogICAgICAgICBtX2NsaWVudC0+ZGlkVXBncmFkZVVSTCgpOwogCiAgICAgbV9p bnNwZWN0b3IuZGlkQ3JlYXRlV2ViU29ja2V0KG1fZG9jdW1lbnQuZ2V0KCksIHVybCk7Ci0KKyAg ICBtX3VybCA9IHJlcXVlc3QtPnVybCgpOwogICAgIE1lc3NhZ2VTZW5kZXI6OnNlbmQoTWVzc2Fn ZXM6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpDcmVhdGVTb2NrZXRDaGFubmVsIHsg KnJlcXVlc3QsIHByb3RvY29sLCBtX2lkZW50aWZpZXIgfSk7CiAgICAgcmV0dXJuIENvbm5lY3RT dGF0dXM6Ok9LOwogfQpAQCAtMjA5LDYgKzIwOSw3IEBAIHZvaWQgV2ViU29ja2V0Q2hhbm5lbDo6 Y2xvc2UoaW50IGNvZGUsIGNvbnN0IFN0cmluZyYgcmVhc29uKQogCiB2b2lkIFdlYlNvY2tldENo YW5uZWw6OmZhaWwoY29uc3QgU3RyaW5nJiByZWFzb24pCiB7CisgICAgbG9nRXJyb3JNZXNzYWdl KHJlYXNvbik7CiAgICAgaWYgKG1fY2xpZW50KQogICAgICAgICBtX2NsaWVudC0+ZGlkUmVjZWl2 ZU1lc3NhZ2VFcnJvcigpOwogCkBAIC0zMjksNiArMzMwLDE5IEBAIHZvaWQgV2ViU29ja2V0Q2hh bm5lbDo6ZGlkQ2xvc2UodW5zaWduZWQgc2hvcnQgY29kZSwgU3RyaW5nJiYgcmVhc29uKQogICAg IG1fY2xpZW50LT5kaWRDbG9zZShtX2J1ZmZlcmVkQW1vdW50LCAobV9pc0Nsb3NpbmcgfHwgcmVj ZWl2ZWRDbG9zaW5nSGFuZHNoYWtlKSA/IFdlYkNvcmU6OldlYlNvY2tldENoYW5uZWxDbGllbnQ6 OkNsb3NpbmdIYW5kc2hha2VDb21wbGV0ZSA6IFdlYkNvcmU6OldlYlNvY2tldENoYW5uZWxDbGll bnQ6OkNsb3NpbmdIYW5kc2hha2VJbmNvbXBsZXRlLCBjb2RlLCByZWFzb24pOwogfQogCit2b2lk IFdlYlNvY2tldENoYW5uZWw6OmxvZ0Vycm9yTWVzc2FnZShjb25zdCBTdHJpbmcmIGVycm9yTWVz c2FnZSkKK3sKKyAgICBpZiAoIW1fZG9jdW1lbnQpCisgICAgICAgIHJldHVybjsKKworICAgIFN0 cmluZyBjb25zb2xlTWVzc2FnZTsKKyAgICBpZiAoIW1fdXJsLmlzTnVsbCgpKQorICAgICAgICBj b25zb2xlTWVzc2FnZSA9IG1ha2VTdHJpbmcoIldlYlNvY2tldCBjb25uZWN0aW9uIHRvICciLCBt X3VybC5zdHJpbmcoKSwgIicgZmFpbGVkOiAiLCBlcnJvck1lc3NhZ2UpOworICAgIGVsc2UKKyAg ICAgICAgY29uc29sZU1lc3NhZ2UgPSBtYWtlU3RyaW5nKCJXZWJTb2NrZXQgY29ubmVjdGlvbiBm YWlsZWQ6ICIsIGVycm9yTWVzc2FnZSk7CisgICAgbV9kb2N1bWVudC0+YWRkQ29uc29sZU1lc3Nh Z2UoTWVzc2FnZVNvdXJjZTo6TmV0d29yaywgTWVzc2FnZUxldmVsOjpFcnJvciwgY29uc29sZU1l c3NhZ2UpOworfQorCiB2b2lkIFdlYlNvY2tldENoYW5uZWw6OmRpZFJlY2VpdmVNZXNzYWdlRXJy b3IoU3RyaW5nJiYgZXJyb3JNZXNzYWdlKQogewogICAgIGlmICghbV9jbGllbnQpCkBAIC0zNDEs OSArMzU1LDcgQEAgdm9pZCBXZWJTb2NrZXRDaGFubmVsOjpkaWRSZWNlaXZlTWVzc2FnZUVycm9y KFN0cmluZyYmIGVycm9yTWVzc2FnZSkKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGlm IChtX2RvY3VtZW50KQotICAgICAgICBtX2RvY3VtZW50LT5hZGRDb25zb2xlTWVzc2FnZShNZXNz YWdlU291cmNlOjpOZXR3b3JrLCBNZXNzYWdlTGV2ZWw6OkVycm9yLCBlcnJvck1lc3NhZ2UpOwot CisgICAgbG9nRXJyb3JNZXNzYWdlKGVycm9yTWVzc2FnZSk7CiAgICAgbV9jbGllbnQtPmRpZFJl Y2VpdmVNZXNzYWdlRXJyb3IoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL05ldHdvcmsvV2ViU29ja2V0Q2hhbm5lbC5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL05ldHdvcmsvV2ViU29ja2V0Q2hhbm5lbC5oCmluZGV4IDUxMDE5MjY4YjVkYjliYTY5NGE3 ZGJhMWFlYTY1MWM5ZjljZGI1YzguLjljNDUwYWM3MWVhZjYxMWZmMTk2ZThhODFkZTgxM2RiOWQy OWRmN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlNv Y2tldENoYW5uZWwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJT b2NrZXRDaGFubmVsLmgKQEAgLTc4LDYgKzc4LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRlcmVm VGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWwoKSBmaW5hbCB7IGRlcmVmKCk7IH0KIAogICAgIHZv aWQgbm90aWZ5U2VuZEZyYW1lKFdlYkNvcmU6OldlYlNvY2tldEZyYW1lOjpPcENvZGUsIGNvbnN0 IGNoYXIqIGRhdGEsIHNpemVfdCBsZW5ndGgpOworICAgIHZvaWQgbG9nRXJyb3JNZXNzYWdlKGNv bnN0IFN0cmluZyYpOwogCiAgICAgLy8gTWVzc2FnZSByZWNlaXZlcnMKICAgICB2b2lkIGRpZENv bm5lY3QoU3RyaW5nJiYgc3VicHJvdG9jb2wsIFN0cmluZyYmIGV4dGVuc2lvbnMpOwpAQCAtMTAw LDYgKzEwMSw3IEBAIHByaXZhdGU6CiAgICAgV2Vha1B0cjxXZWJDb3JlOjpEb2N1bWVudD4gbV9k b2N1bWVudDsKICAgICBXZWJTb2NrZXRJZGVudGlmaWVyIG1faWRlbnRpZmllcjsKICAgICBXZWFr UHRyPFdlYkNvcmU6OldlYlNvY2tldENoYW5uZWxDbGllbnQ+IG1fY2xpZW50OworICAgIFVSTCBt X3VybDsKICAgICBTdHJpbmcgbV9zdWJwcm90b2NvbDsKICAgICBTdHJpbmcgbV9leHRlbnNpb25z OwogICAgIHNpemVfdCBtX2J1ZmZlcmVkQW1vdW50IHsgMCB9Owo=