223999 2021-03-31 08:25:53 -0700 Make use of NSURLSessionWebSocket.sendCloseCode if available 2021-03-31 11:13:10 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen sam webkit-bug-importer oldest_to_newest 1745623 0 youennf 2021-03-31 08:25:53 -0700 Make use of NSURLSessionWebSocket.sendCloseCode if available 1745624 1 424772 youennf 2021-03-31 08:29:37 -0700 Created attachment 424772 Patch 1745633 2 webkit-bug-importer 2021-03-31 09:01:51 -0700 <rdar://problem/76055268> 1745650 3 424772 sam 2021-03-31 09:27:42 -0700 Comment on attachment 424772 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424772&action=review > Source/WebKit/NetworkProcess/cocoa/WebSocketTaskCocoa.mm:42 > +@interface NSURLSessionWebSocketTask (SPI) > +// Send close frame but do not cancel the task > +- (void)_sendCloseCode:(NSURLSessionWebSocketCloseCode)closeCode reason:(NSData *)reason; > +@end Please put SPI declarations into the CFNetworkSPI.h header. 1745675 4 424785 achristensen 2021-03-31 10:12:09 -0700 Created attachment 424785 Patch 1745694 5 ews-feeder 2021-03-31 11:13:08 -0700 Committed r275294: <https://commits.webkit.org/r275294> All reviewed patches have been landed. Closing bug and clearing flags on attachment 424785. 424772 2021-03-31 08:29:37 -0700 2021-03-31 10:12:08 -0700 Patch bug-223999-20210331172935.patch text/plain 2095 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1MTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJmNWJkODc4MWQwOWIxYWEy MmNkN2QxNThhYmJkYzMzODc0MjY1MWIuLmU0NGJjYTY2Y2QwNTQwYTJlOTFiMjkyYmY3MGRkMjZk ZDk1NzAzOGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMDMtMzEgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgdXNlIG9mIE5TVVJMU2Vz c2lvbldlYlNvY2tldC5zZW5kQ2xvc2VDb2RlIGlmIGF2YWlsYWJsZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzOTk5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYgYXZhaWxhYmxlLCB3ZSBqdXN0IGNh bGwgc2VuZENsb3NlQ29kZSwgY2FuY2VsIHdpbGwgaGFwcGVuIHdoZW4gTmV0d29ya1NvY2tldENo YW5uZWwgaXMgZGVzdHJveWVkLgorICAgICAgICBDb3ZlcmVkIGJ5IExheW91dFRlc3RzL2h0dHAv dGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvY2xpZW50LWNsb3NlLTIuaHRtbC4KKworICAgICAg ICAqIE5ldHdvcmtQcm9jZXNzL2NvY29hL1dlYlNvY2tldFRhc2tDb2NvYS5tbToKKyAgICAgICAg KFdlYktpdDo6V2ViU29ja2V0VGFzazo6Y2xvc2UpOgorCiAyMDIxLTAzLTMxICBZb3Vlbm4gRmFi bGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBTZW5kIFdlYlNvY2tldCBjb2NvYSBh dXRoZW50aWNhdGlvbiBjaGFsbGVuZ2UgdG8gQXV0aGVudGljYXRpb25NYW5hZ2VyCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL1dlYlNvY2tldFRhc2tDb2Nv YS5tbSBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvV2ViU29ja2V0VGFza0Nv Y29hLm1tCmluZGV4IGRmNTk4MmIxNjQ1ZjEwNTg0ZWQ0OWZhMDZhZDM2YTkzYjA1NGY0MGYuLjBi ZjllODRjM2RhYzgzZjc1MmZlMTE2ZWYyMzQwOTJkOTE5ZmZkMmMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvV2ViU29ja2V0VGFza0NvY29hLm1tCisrKyBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvV2ViU29ja2V0VGFza0NvY29hLm1t CkBAIC0zNiw2ICszNiwxMSBAQAogI2ltcG9ydCA8V2ViQ29yZS9XZWJTb2NrZXRDaGFubmVsLmg+ CiAjaW1wb3J0IDx3dGYvQmxvY2tQdHIuaD4KIAorQGludGVyZmFjZSBOU1VSTFNlc3Npb25XZWJT b2NrZXRUYXNrIChTUEkpCisvLyBTZW5kIGNsb3NlIGZyYW1lIGJ1dCBkbyBub3QgY2FuY2VsIHRo ZSB0YXNrCistICh2b2lkKV9zZW5kQ2xvc2VDb2RlOihOU1VSTFNlc3Npb25XZWJTb2NrZXRDbG9z ZUNvZGUpY2xvc2VDb2RlIHJlYXNvbjooTlNEYXRhICopcmVhc29uOworQGVuZAorCiBuYW1lc3Bh Y2UgV2ViS2l0IHsKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CkBAIC0xNDQsNiArMTQ5LDEw IEBAIHZvaWQgV2ViU29ja2V0VGFzazo6Y2xvc2UoaW50MzJfdCBjb2RlLCBjb25zdCBTdHJpbmcm IHJlYXNvbikKICAgICAgICAgY29kZSA9IDEwMDU7CiAgICAgYXV0byB1dGY4ID0gcmVhc29uLnV0 ZjgoKTsKICAgICBhdXRvIG5zRGF0YSA9IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRo Qnl0ZXM6dXRmOC5kYXRhKCkgbGVuZ3RoOnV0ZjgubGVuZ3RoKCldKTsKKyAgICBpZiAoW21fdGFz ayByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9zZW5kQ2xvc2VDb2RlOnJlYXNvbjopXSkg eworICAgICAgICBbbV90YXNrIF9zZW5kQ2xvc2VDb2RlOihOU1VSTFNlc3Npb25XZWJTb2NrZXRD bG9zZUNvZGUpY29kZSByZWFzb246bnNEYXRhLmdldCgpXTsKKyAgICAgICAgcmV0dXJuOworICAg IH0KICAgICBbbV90YXNrIGNhbmNlbFdpdGhDbG9zZUNvZGU6KE5TVVJMU2Vzc2lvbldlYlNvY2tl dENsb3NlQ29kZSljb2RlIHJlYXNvbjpuc0RhdGEuZ2V0KCldOwogfQogCg== 424785 2021-03-31 10:12:09 -0700 2021-03-31 11:13:09 -0700 Patch bug-223999-20210331101208.patch text/plain 2762 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvUEFML0NoYW5nZUxvZwkocmV2aXNpb24gMjc1Mjg3KQorKysgU291cmNlL1dlYkNv cmUvUEFML0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDIxLTAz LTMxICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIHVz ZSBvZiBOU1VSTFNlc3Npb25XZWJTb2NrZXQuc2VuZENsb3NlQ29kZSBpZiBhdmFpbGFibGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzk5OQorCisg ICAgICAgIFJldmlld2VkIGJ5IEFsZXggQ2hyaXN0ZW5zZW4uCisKKyAgICAgICAgKiBwYWwvc3Bp L2NmL0NGTmV0d29ya1NQSS5oOgorCiAyMDIxLTAzLTI5ICBQZXIgQXJuZSAgPHB2b2xsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFRoZSBoZWFkZXIgZmlsZSBOb3RpZnlTUEkuaCBzaG91bGQgbm90 IGJlIHByaXZhdGUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NGTmV0d29y a1NQSS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NGTmV0 d29ya1NQSS5oCShyZXZpc2lvbiAyNzUyODYpCisrKyBTb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3Nw aS9jZi9DRk5ldHdvcmtTUEkuaAkod29ya2luZyBjb3B5KQpAQCAtNDcxLDQgKzQ3MSw4IEBAIFdU Rl9FWFRFUk5fQ19FTkQKIEBwcm9wZXJ0eSAocmVhZG9ubHkpIFNTTFByb3RvY29sIF9UTFNOZWdv dGlhdGVkUHJvdG9jb2xWZXJzaW9uOwogQGVuZAogCitAaW50ZXJmYWNlIE5TVVJMU2Vzc2lvbldl YlNvY2tldFRhc2sgKFNQSSkKKy0gKHZvaWQpX3NlbmRDbG9zZUNvZGU6KE5TVVJMU2Vzc2lvbldl YlNvY2tldENsb3NlQ29kZSljbG9zZUNvZGUgcmVhc29uOihOU0RhdGEgKilyZWFzb247CitAZW5k CisKICNlbmRpZiAvLyBkZWZpbmVkKF9fT0JKQ19fKQpJbmRleDogU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDI3 NTI4NikKKysrIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTYgQEAKKzIwMjEtMDMtMzEgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgor CisgICAgICAgIE1ha2UgdXNlIG9mIE5TVVJMU2Vzc2lvbldlYlNvY2tldC5zZW5kQ2xvc2VDb2Rl IGlmIGF2YWlsYWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjIzOTk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleCBDaHJpc3RlbnNlbi4KKwor ICAgICAgICBJZiBhdmFpbGFibGUsIHdlIGp1c3QgY2FsbCBzZW5kQ2xvc2VDb2RlLCBjYW5jZWwg d2lsbCBoYXBwZW4gd2hlbiBOZXR3b3JrU29ja2V0Q2hhbm5lbCBpcyBkZXN0cm95ZWQuCisgICAg ICAgIENvdmVyZWQgYnkgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHli aS9jbGllbnQtY2xvc2UtMi5odG1sLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY29jb2Ev V2ViU29ja2V0VGFza0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJTb2NrZXRUYXNrOjpj bG9zZSk6CisKIDIwMjEtMDMtMzAgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5j b20+CiAKICAgICAgICAgW2lPU10gRmFsbCBiYWNrIHRvIGNvbnRleHQgbWVudSBwcmVzZW50YXRp b24gYWZ0ZXIgbG9uZyBwcmVzc2luZyBpbWFnZSBvdmVybGF5IHRleHQKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvV2ViU29ja2V0VGFza0NvY29hLm1tCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvV2ViU29ja2V0VGFza0Nv Y29hLm1tCShyZXZpc2lvbiAyNzUyODYpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L2NvY29hL1dlYlNvY2tldFRhc2tDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMTQyLDYgKzE0 MiwxMCBAQCB2b2lkIFdlYlNvY2tldFRhc2s6OmNsb3NlKGludDMyX3QgY29kZSwgCiAgICAgICAg IGNvZGUgPSAxMDA1OwogICAgIGF1dG8gdXRmOCA9IHJlYXNvbi51dGY4KCk7CiAgICAgYXV0byBu c0RhdGEgPSBhZG9wdE5TKFtbTlNEYXRhIGFsbG9jXSBpbml0V2l0aEJ5dGVzOnV0ZjguZGF0YSgp IGxlbmd0aDp1dGY4Lmxlbmd0aCgpXSk7CisgICAgaWYgKFttX3Rhc2sgcmVzcG9uZHNUb1NlbGVj dG9yOkBzZWxlY3Rvcihfc2VuZENsb3NlQ29kZTpyZWFzb246KV0pIHsKKyAgICAgICAgW21fdGFz ayBfc2VuZENsb3NlQ29kZTooTlNVUkxTZXNzaW9uV2ViU29ja2V0Q2xvc2VDb2RlKWNvZGUgcmVh c29uOm5zRGF0YS5nZXQoKV07CisgICAgICAgIHJldHVybjsKKyAgICB9CiAgICAgW21fdGFzayBj YW5jZWxXaXRoQ2xvc2VDb2RlOihOU1VSTFNlc3Npb25XZWJTb2NrZXRDbG9zZUNvZGUpY29kZSBy ZWFzb246bnNEYXRhLmdldCgpXTsKIH0KIAo=