61851 2011-06-01 03:01:11 -0700 WebSocket: WebSocketChannel::fail() should close the connection immediately 2011-06-01 19:53:31 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 61841 1 yutak yutak ap commit-queue tkent oldest_to_newest 413252 0 yutak 2011-06-01 03:01:11 -0700 Currently WebSocketChannel::fail() calls m_handle->close() instead of m_handle->disconnect(). This was a mistake, because m_handle->close() may not close the connection immediately if it has unsent data. m_handle->disconnect() should have been used, since it does exactly the same thing as what we want to do. For details, see how *fail the WebSocket connection* and *close the WebSocket connection* is defined in the protocol specification. http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-00#section-6 413263 1 95576 yutak 2011-06-01 03:31:17 -0700 Created attachment 95576 Patch 413785 2 95576 tkent 2011-06-01 17:36:01 -0700 Comment on attachment 95576 Patch Looks ok. 413849 3 95576 commit-queue 2011-06-01 19:53:26 -0700 Comment on attachment 95576 Patch Clearing flags on attachment: 95576 Committed r87876: <http://trac.webkit.org/changeset/87876> 413850 4 commit-queue 2011-06-01 19:53:31 -0700 All reviewed patches have been landed. Closing bug. 95576 2011-06-01 03:31:17 -0700 2011-06-01 19:53:26 -0700 Patch bug-61851-20110601193115.patch text/plain 2210 yutak U3VidmVyc2lvbiBSZXZpc2lvbjogODc3NzEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0ODM4YmM4MTRjOGY5MDQ1 MzQ1MzdlYWNmOTNhNWM0YjEwYjVkYzE2Li5iZTliM2RkZjY3NzIwYjM0NmMzOTlkOWIwZGUzYzQy Yzk0MzQxMjZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDYtMDEgIFl1dGEg S2l0YW11cmEgIDx5dXRha0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViU29ja2V0OiBXZWJTb2NrZXRDaGFubmVsOjpmYWls KCkgc2hvdWxkIGNsb3NlIHRoZSBjb25uZWN0aW9uIGltbWVkaWF0ZWx5CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTg1MQorCisgICAgICAgIFRoZSBl ZmZlY3Qgb2YgdGhpcyBjaGFuZ2UgaXMgYWxtb3N0IHVub2JzZXJ2YWJsZS4gVGhlIGRpZmZlcmVu Y2UgYmV0d2VlbiBtX2hhbmRsZS0+Y2xvc2UoKSBhbmQKKyAgICAgICAgbV9oYW5kbGUtPmRpc2Nv bm5lY3QoKSBpcyB0aGF0IHRoZSBmb3JtZXIgZG9lcyBub3QgY2xvc2UgdGhlIGNvbm5lY3Rpb24g aWYgdGhlIGhhbmRsZSBoYXMKKyAgICAgICAgdW5zZW50IGRhdGEgd2hpbGUgdGhlIGxhdHRlciBp bW1lZGlhdGVseSBjbG9zZXMgdGhlIGNvbm5lY3Rpb24gcmVnYXJkbGVzcyBvZiB1bnNlbnQgZGF0 YS4KKyAgICAgICAgVXN1YWxseSBhIHNvY2tldCBzdHJlYW0gaGFuZGxlIGRvZXMgbm90IGhhdmUg dW5zZW50IGRhdGEsIGFuZCBldmVuIGlmIGl0IGhhcyBhbnksIGl0IGlzIGhhcmQKKyAgICAgICAg Zm9yIHVzZXIgc2NyaXB0cyB0byBvYnNlcnZlIHRoZSBkaWZmZXJlbmNlIGJldHdlZW4gY2xvc2Uo KSBhbmQgZGlzY29ubmVjdCgpIChpdCBzaG91bGQgdGFrZSBzb21lIHRpbWUKKyAgICAgICAgZm9y IG9uY2xvc2UoKSB0byBiZSBjYWxsZWQgaWYgdGhlcmUgYXJlIGFueSB1bnNlbnQgZGF0YSwgYnV0 IHRoZXJlIG91Z2h0IHRvIGJlIG5vIG90aGVyIGRpZmZlcmVuY2UKKyAgICAgICAgaW4gdXNlciBz Y3JpcHRzJyBwZXJzcGVjdGl2ZSkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFyZSBhZGRlZCwg YmVjYXVzZSB3cml0aW5nIGEgdGVzdCBmb3IgdGhpcyBpc3N1ZSBpcyBub3QgZmVhc2libGUgZHVl IHRvIHRoZSBhYm92ZSByZWFzb24uCisKKyAgICAgICAgKiB3ZWJzb2NrZXRzL1dlYlNvY2tldENo YW5uZWwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViU29ja2V0Q2hhbm5lbDo6ZmFpbCk6IFVz ZSBtX2hhbmRsZS0+ZGlzY29ubmVjdCgpIGluc3RlYWQgb2YgbV9oYW5kbGUtPmNsb3NlKCkuCisK IDIwMTEtMDUtMzEgIFlvbmcgTGkgIDx5b2xpQHJpbS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRzL1dl YlNvY2tldENoYW5uZWwuY3BwIGIvU291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRD aGFubmVsLmNwcAppbmRleCAwYmU1NmUzNWE3ZTA1NmJjOTZjNjZmMmJhMWYxYjVhMTI2MGU0NTc0 Li42ZDQ5YTU2M2EwZGI5OGE5NGEzYzU0Y2JjMWYyMTUxM2Y4M2EzZWZhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldENoYW5uZWwuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5jcHAKQEAgLTEzNiw3ICsxMzYs NyBAQCB2b2lkIFdlYlNvY2tldENoYW5uZWw6OmZhaWwoY29uc3QgU3RyaW5nJiByZWFzb24pCiAg ICAgaWYgKG1fY29udGV4dCkKICAgICAgICAgbV9jb250ZXh0LT5hZGRNZXNzYWdlKEpTTWVzc2Fn ZVNvdXJjZSwgTG9nTWVzc2FnZVR5cGUsIEVycm9yTWVzc2FnZUxldmVsLCByZWFzb24sIDAsIG1f aGFuZHNoYWtlLmNsaWVudE9yaWdpbigpLCAwKTsKICAgICBpZiAobV9oYW5kbGUgJiYgIW1fY2xv c2VkKQotICAgICAgICBtX2hhbmRsZS0+Y2xvc2UoKTsgLy8gV2lsbCBjYWxsIGRpZENsb3NlKCku CisgICAgICAgIG1faGFuZGxlLT5kaXNjb25uZWN0KCk7IC8vIFdpbGwgY2FsbCBkaWRDbG9zZSgp LgogfQogCiB2b2lkIFdlYlNvY2tldENoYW5uZWw6OmRpc2Nvbm5lY3QoKQo=