215563 2020-08-17 03:17:58 -0700 NetworkSocketChannel should delay sending back error message as done by NetworkSocketStream 2020-08-18 08:17:17 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen webkit-bug-importer oldest_to_newest 1680758 0 youennf 2020-08-17 03:17:58 -0700 Delay sending back to WebProcess WebSocket error message as done in NetworkSocketStream 1680759 1 406709 youennf 2020-08-17 03:20:51 -0700 Created attachment 406709 Patch 1680822 2 406709 achristensen 2020-08-17 09:03:05 -0700 Comment on attachment 406709 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=406709&action=review > Source/WebKit/NetworkProcess/NetworkSocketChannel.h:94 > + String m_errorMessage; It would be nice if we could make a version of Timer::startOneShot that takes a lambda so these could be in a lambda capture instead of members of this object. > Source/WebKit/NetworkProcess/NetworkSocketChannel.h:95 > + Optional<std::pair<unsigned short, String>> m_closeInfo; Could we make this uint16_t? 1681062 3 youennf 2020-08-18 08:13:24 -0700 (In reply to Alex Christensen from comment #2) > Comment on attachment 406709 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=406709&action=review > > > Source/WebKit/NetworkProcess/NetworkSocketChannel.h:94 > > + String m_errorMessage; > > It would be nice if we could make a version of Timer::startOneShot that > takes a lambda so these could be in a lambda capture instead of members of > this object. Agreed, but here we have two call sites, one for the error message and one for code and reason. > > Source/WebKit/NetworkProcess/NetworkSocketChannel.h:95 > > + Optional<std::pair<unsigned short, String>> m_closeInfo; > > Could we make this uint16_t? We probably could since it is an unsigned short for WebIDL as well. But this would not be very consistent with other parts of the WebSocket implementation. 1681063 4 ews-feeder 2020-08-18 08:16:06 -0700 Committed r265814: <https://trac.webkit.org/changeset/265814> All reviewed patches have been landed. Closing bug and clearing flags on attachment 406709. 1681064 5 webkit-bug-importer 2020-08-18 08:17:17 -0700 <rdar://problem/67327819> 406709 2020-08-17 03:20:51 -0700 2020-08-18 08:16:07 -0700 Patch bug-215563-20200817122049.patch text/plain 4019 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1NzUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQyODJkMmM3NTYxZDc4NDhk ZGRiNWIyY2UyMDE5ZjZjZmYwNmJhMGUuLjc2MGU2MTM0MWU2MTFiNThjMWM1ZGIwNDdmNGQ5OTZk MzcyMmExYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjAtMDgtMTcgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE5ldHdvcmtTb2NrZXRDaGFubmVs IHNob3VsZCBkZWxheSBzZW5kaW5nIGJhY2sgZXJyb3IgbWVzc2FnZSBhcyBkb25lIGJ5IE5ldHdv cmtTb2NrZXRTdHJlYW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxNTU2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFwcGx5IHNhbWUgcG9saWN5IGFzIE5ldHdvcmtTb2NrZXRTdHJlYW0gaW4gY2FzZSBv ZiBXZWJTb2NrZXQgY29ubmVjdGlvbiBlcnJvci4KKyAgICAgICAgQ292ZXJlZCBieSBodHRwL3Rl c3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpL2Nsb3NlZC1wb3J0LWRlbGF5Lmh0bWwgd2l0aCBOU1VS TFNlc3Npb24gV2ViU29ja2V0IGNvZGUgcGF0aC4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNz L05ldHdvcmtTb2NrZXRDaGFubmVsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1NvY2tl dENoYW5uZWw6Ok5ldHdvcmtTb2NrZXRDaGFubmVsKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29y a1NvY2tldENoYW5uZWw6OmRpZENsb3NlKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1NvY2tl dENoYW5uZWw6OmRpZFJlY2VpdmVNZXNzYWdlRXJyb3IpOgorICAgICAgICAoV2ViS2l0OjpOZXR3 b3JrU29ja2V0Q2hhbm5lbDo6c2VuZERlbGF5ZWRFcnJvcik6CisgICAgICAgICogTmV0d29ya1By b2Nlc3MvTmV0d29ya1NvY2tldENoYW5uZWwuaDoKKwogMjAyMC0wOC0xNyAgWW91ZW5uIEZhYmxl dCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIG1lc3NhZ2UgY2hlY2sgaW4g V2ViU29ja2V0VGFzazo6cmVhZE5leHRNZXNzYWdlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTb2NrZXRDaGFubmVsLmNwcCBiL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvTmV0d29ya1NvY2tldENoYW5uZWwuY3BwCmluZGV4IDI2NTY3MGIzMTA1 YTI2NmNmNDcyMzVlM2NjOTg0ZWE3NjVhZGY1MmUuLjQ0OWIxM2Q4ZTA3YjJjZDA0MmM0YmEzNjM2 YWI3OTNkMzdiMWMzZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv TmV0d29ya1NvY2tldENoYW5uZWwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvTmV0d29ya1NvY2tldENoYW5uZWwuY3BwCkBAIC01MSw2ICs1MSw3IEBAIE5ldHdvcmtTb2Nr ZXRDaGFubmVsOjpOZXR3b3JrU29ja2V0Q2hhbm5lbChOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJv Y2VzcyYgY29ubmVjCiAgICAgOiBtX2Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MoY29ubmVjdGlvbikK ICAgICAsIG1faWRlbnRpZmllcihpZGVudGlmaWVyKQogICAgICwgbV9zZXNzaW9uKG1ha2VXZWFr UHRyKHNlc3Npb24pKQorICAgICwgbV9lcnJvclRpbWVyKCp0aGlzLCAmTmV0d29ya1NvY2tldENo YW5uZWw6OnNlbmREZWxheWVkRXJyb3IpCiB7CiAgICAgaWYgKCFtX3Nlc3Npb24pCiAgICAgICAg IHJldHVybjsKQEAgLTExNSwxMyArMTE2LDI3IEBAIHZvaWQgTmV0d29ya1NvY2tldENoYW5uZWw6 OmRpZFJlY2VpdmVCaW5hcnlEYXRhKGNvbnN0IHVpbnQ4X3QqIGRhdGEsIHNpemVfdCBsZW5nCiAK IHZvaWQgTmV0d29ya1NvY2tldENoYW5uZWw6OmRpZENsb3NlKHVuc2lnbmVkIHNob3J0IGNvZGUs IGNvbnN0IFN0cmluZyYgcmVhc29uKQogeworICAgIGlmIChtX2Vycm9yVGltZXIuaXNBY3RpdmUo KSkgeworICAgICAgICBtX2Nsb3NlSW5mbyA9IHN0ZDo6bWFrZV9wYWlyKGNvZGUsIHJlYXNvbik7 CisgICAgICAgIHJldHVybjsKKyAgICB9CiAgICAgc2VuZChNZXNzYWdlczo6V2ViU29ja2V0Q2hh bm5lbDo6RGlkQ2xvc2UgeyBjb2RlLCByZWFzb24gfSk7CiAgICAgZmluaXNoQ2xvc2luZ0lmUG9z c2libGUoKTsKIH0KIAogdm9pZCBOZXR3b3JrU29ja2V0Q2hhbm5lbDo6ZGlkUmVjZWl2ZU1lc3Nh Z2VFcnJvcihjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSkKIHsKLSAgICBzZW5kKE1lc3NhZ2Vz OjpXZWJTb2NrZXRDaGFubmVsOjpEaWRSZWNlaXZlTWVzc2FnZUVycm9yIHsgZXJyb3JNZXNzYWdl IH0pOworICAgIG1fZXJyb3JNZXNzYWdlID0gZXJyb3JNZXNzYWdlOworICAgIG1fZXJyb3JUaW1l ci5zdGFydE9uZVNob3QoTmV0d29ya1Byb2Nlc3M6OnJhbmRvbUNsb3NlZFBvcnREZWxheSgpKTsK K30KKwordm9pZCBOZXR3b3JrU29ja2V0Q2hhbm5lbDo6c2VuZERlbGF5ZWRFcnJvcigpCit7Cisg ICAgc2VuZChNZXNzYWdlczo6V2ViU29ja2V0Q2hhbm5lbDo6RGlkUmVjZWl2ZU1lc3NhZ2VFcnJv ciB7IG1fZXJyb3JNZXNzYWdlIH0pOworICAgIGlmIChtX2Nsb3NlSW5mbykgeworICAgICAgICBz ZW5kKE1lc3NhZ2VzOjpXZWJTb2NrZXRDaGFubmVsOjpEaWRDbG9zZSB7IG1fY2xvc2VJbmZvLT5m aXJzdCwgbV9jbG9zZUluZm8tPnNlY29uZCB9KTsKKyAgICAgICAgZmluaXNoQ2xvc2luZ0lmUG9z c2libGUoKTsKKyAgICB9CiB9CiAKIHZvaWQgTmV0d29ya1NvY2tldENoYW5uZWw6OmRpZFNlbmRI YW5kc2hha2VSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTb2NrZXRDaGFubmVsLmggYi9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTb2NrZXRDaGFubmVsLmgKaW5kZXggNTE0 N2UzZGM3YmU0NWY4MDMxMjI2MjVkM2I4ZjA5MmUwYjQ5YzVmMy4uM2IxNTE1NmZkMDcxNjM3OGIz NDI2Y2IyYzE3NGUzMTM1ZjUyN2FmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrU29ja2V0Q2hhbm5lbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvTmV0d29ya1NvY2tldENoYW5uZWwuaApAQCAtMjgsNiArMjgsNyBAQAogI2luY2x1 ZGUgIk1lc3NhZ2VSZWNlaXZlci5oIgogI2luY2x1ZGUgIk1lc3NhZ2VTZW5kZXIuaCIKICNpbmNs dWRlICJXZWJTb2NrZXRJZGVudGlmaWVyLmgiCisjaW5jbHVkZSA8V2ViQ29yZS9UaW1lci5oPgog I2luY2x1ZGUgPHBhbC9TZXNzaW9uSUQuaD4KICNpbmNsdWRlIDx3dGYvQ29tcGxldGlvbkhhbmRs ZXIuaD4KICNpbmNsdWRlIDx3dGYvV2Vha1B0ci5oPgpAQCAtNzMsNiArNzQsNyBAQCBwcml2YXRl OgogICAgIHZvaWQgc2VuZFN0cmluZyhjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmLCBDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwogICAgIHZvaWQgc2VuZERhdGEoY29uc3QgSVBDOjpEYXRh UmVmZXJlbmNlJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKICAgICB2b2lkIGNsb3Nl KGludDMyX3QgY29kZSwgY29uc3QgU3RyaW5nJiByZWFzb24pOworICAgIHZvaWQgc2VuZERlbGF5 ZWRFcnJvcigpOwogCiAgICAgTmV0d29ya1Nlc3Npb24qIHNlc3Npb24oKTsKIApAQCAtODgsNiAr OTAsOSBAQCBwcml2YXRlOgogCiAgICAgZW51bSBjbGFzcyBTdGF0ZSB7IE9wZW4sIENsb3Npbmcs IENsb3NlZCB9OwogICAgIFN0YXRlIG1fc3RhdGUgeyBTdGF0ZTo6T3BlbiB9OworICAgIFdlYkNv cmU6OlRpbWVyIG1fZXJyb3JUaW1lcjsKKyAgICBTdHJpbmcgbV9lcnJvck1lc3NhZ2U7CisgICAg T3B0aW9uYWw8c3RkOjpwYWlyPHVuc2lnbmVkIHNob3J0LCBTdHJpbmc+PiBtX2Nsb3NlSW5mbzsK IH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAo=