69910 2011-10-12 00:37:40 -0700 WebSocket: Update WebSocket protocol to hybi-17 2011-10-12 02:40:18 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 50099 1 yutak yutak abarth ap tkent webkit.review.bot oldest_to_newest 482273 0 yutak 2011-10-12 00:37:40 -0700 http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-17 - Sec-WebSocket-Origin has been renamed to Origin - Value for Sec-WebSocket-Version header is bumped to 13 482281 1 110651 yutak 2011-10-12 01:00:17 -0700 Created attachment 110651 Patch 482292 2 110651 tkent 2011-10-12 01:29:12 -0700 Comment on attachment 110651 Patch ok 482316 3 110651 webkit.review.bot 2011-10-12 02:40:13 -0700 Comment on attachment 110651 Patch Clearing flags on attachment: 110651 Committed r97249: <http://trac.webkit.org/changeset/97249> 482317 4 webkit.review.bot 2011-10-12 02:40:18 -0700 All reviewed patches have been landed. Closing bug. 110651 2011-10-12 01:00:17 -0700 2011-10-12 02:40:13 -0700 Patch bug-69910-20111012170016.patch text/plain 3472 yutak U3VidmVyc2lvbiBSZXZpc2lvbjogOTcyMzUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwNWE1NzFlM2E3ZWUzYzFi NGVmYTU1MTg3YjVhYTdiYTg5YWMxNTE4Li5mNDliYTJiMDFkYTJlMjAyZjdjMTYyNTY0MjhhMDJk YWIyNzViMjMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMTAtMTIgIFl1dGEg S2l0YW11cmEgIDx5dXRha0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViU29ja2V0OiBVcGRh dGUgV2ViU29ja2V0IHByb3RvY29sIHRvIGh5YmktMTcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5OTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgRXNzZW50aWFsIGNoYW5nZXMgYmV0d2VlbiBoeWJpLTEw IGFuZCBoeWJpLTE3IGFyZToKKyAgICAgICAgLSBTZWMtV2ViU29ja2V0LU9yaWdpbiBoZWFkZXIg aGFzIGJlZW4gcmVuYW1lZCB0byAiT3JpZ2luIi4KKyAgICAgICAgLSBTZWMtV2ViU29ja2V0LVZl cnNpb24gaGVhZGVyIHZhbHVlIGhhcyBiZWVuIGJ1bXBlZCB0byAxMy4KKworICAgICAgICBObyBu ZXcgdGVzdHMgYXJlIG5lY2Vzc2FyeS4gcHl3ZWJzb2NrZXQgaGFzIGFscmVhZHkgYmVlbiB1cGRh dGVkIHRvIHRoZSBsYXRlc3QgdmVyc2lvbgorICAgICAgICB3aGljaCB1bmRlcnN0YW5kcyB0aGUg bmV3IHByb3RvY29sLiBUZXN0cyB1bmRlciBodHRwL3Rlc3RzL3dlYnNvY2tldC8gc2hvdWxkIGtl ZXAKKyAgICAgICAgcGFzc2luZy4KKworICAgICAgICAqIHdlYnNvY2tldHMvV2ViU29ja2V0SGFu ZHNoYWtlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYlNvY2tldEhhbmRzaGFrZTo6Y2xpZW50 SGFuZHNoYWtlTWVzc2FnZSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJTb2NrZXRIYW5kc2hha2U6 OmNsaWVudEhhbmRzaGFrZVJlcXVlc3QpOgorCiAyMDExLTEwLTExICBBbnRvaW5lIExhYm91ciAg PHBpbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBTZXBhcmF0ZSBjb21wb3NpdG9yIGNsaWVu dCB0aHJlYWQgZnJvbSB3ZWJraXQncyBtYWluIHRocmVhZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0SGFuZHNoYWtlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3dlYnNvY2tldHMvV2ViU29ja2V0SGFuZHNoYWtlLmNwcAppbmRleCBiMzMxMWIwNDQ2YTY5Yjgx OTcxNGEzZDViOGNkNzJmMjllMTk5NThjLi44OTA5ZWZhZjE4NDRmMWZhY2FkYjdmMWI1ZTIxMzJk MmJiZGRlOGVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tl dEhhbmRzaGFrZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRI YW5kc2hha2UuY3BwCkBAIC0yNjgsMTAgKzI2OCw3IEBAIENTdHJpbmcgV2ViU29ja2V0SGFuZHNo YWtlOjpjbGllbnRIYW5kc2hha2VNZXNzYWdlKCkgY29uc3QKICAgICAgICAgZmllbGRzLmFwcGVu ZCgiVXBncmFkZTogd2Vic29ja2V0Iik7CiAgICAgZmllbGRzLmFwcGVuZCgiQ29ubmVjdGlvbjog VXBncmFkZSIpOwogICAgIGZpZWxkcy5hcHBlbmQoIkhvc3Q6ICIgKyBob3N0TmFtZShtX3VybCwg bV9zZWN1cmUpKTsKLSAgICBpZiAobV91c2VIaXhpZTc2UHJvdG9jb2wpCi0gICAgICAgIGZpZWxk cy5hcHBlbmQoIk9yaWdpbjogIiArIGNsaWVudE9yaWdpbigpKTsKLSAgICBlbHNlCi0gICAgICAg IGZpZWxkcy5hcHBlbmQoIlNlYy1XZWJTb2NrZXQtT3JpZ2luOiAiICsgY2xpZW50T3JpZ2luKCkp OworICAgIGZpZWxkcy5hcHBlbmQoIk9yaWdpbjogIiArIGNsaWVudE9yaWdpbigpKTsKICAgICBp ZiAoIW1fY2xpZW50UHJvdG9jb2wuaXNFbXB0eSgpKQogICAgICAgICBmaWVsZHMuYXBwZW5kKCJT ZWMtV2ViU29ja2V0LVByb3RvY29sOiAiICsgbV9jbGllbnRQcm90b2NvbCk7CiAKQEAgLTI4OSw3 ICsyODYsNyBAQCBDU3RyaW5nIFdlYlNvY2tldEhhbmRzaGFrZTo6Y2xpZW50SGFuZHNoYWtlTWVz c2FnZSgpIGNvbnN0CiAgICAgICAgIGZpZWxkcy5hcHBlbmQoIlNlYy1XZWJTb2NrZXQtS2V5Mjog IiArIG1faGl4aWU3NlNlY1dlYlNvY2tldEtleTIpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIGZp ZWxkcy5hcHBlbmQoIlNlYy1XZWJTb2NrZXQtS2V5OiAiICsgbV9zZWNXZWJTb2NrZXRLZXkpOwot ICAgICAgICBmaWVsZHMuYXBwZW5kKCJTZWMtV2ViU29ja2V0LVZlcnNpb246IDgiKTsKKyAgICAg ICAgZmllbGRzLmFwcGVuZCgiU2VjLVdlYlNvY2tldC1WZXJzaW9uOiAxMyIpOwogICAgIH0KIAog ICAgIC8vIEZpZWxkcyBpbiB0aGUgaGFuZHNoYWtlIGFyZSBzZW50IGJ5IHRoZSBjbGllbnQgaW4g YSByYW5kb20gb3JkZXI7IHRoZQpAQCAtMzI3LDEwICszMjQsNyBAQCBXZWJTb2NrZXRIYW5kc2hh a2VSZXF1ZXN0IFdlYlNvY2tldEhhbmRzaGFrZTo6Y2xpZW50SGFuZHNoYWtlUmVxdWVzdCgpIGNv bnN0CiAgICAgICAgIHJlcXVlc3QuYWRkSGVhZGVyRmllbGQoIlVwZ3JhZGUiLCAid2Vic29ja2V0 Iik7CiAgICAgcmVxdWVzdC5hZGRIZWFkZXJGaWVsZCgiQ29ubmVjdGlvbiIsICJVcGdyYWRlIik7 CiAgICAgcmVxdWVzdC5hZGRIZWFkZXJGaWVsZCgiSG9zdCIsIGhvc3ROYW1lKG1fdXJsLCBtX3Nl Y3VyZSkpOwotICAgIGlmIChtX3VzZUhpeGllNzZQcm90b2NvbCkKLSAgICAgICAgcmVxdWVzdC5h ZGRIZWFkZXJGaWVsZCgiT3JpZ2luIiwgY2xpZW50T3JpZ2luKCkpOwotICAgIGVsc2UKLSAgICAg ICAgcmVxdWVzdC5hZGRIZWFkZXJGaWVsZCgiU2VjLVdlYlNvY2tldC1PcmlnaW4iLCBjbGllbnRP cmlnaW4oKSk7CisgICAgcmVxdWVzdC5hZGRIZWFkZXJGaWVsZCgiT3JpZ2luIiwgY2xpZW50T3Jp Z2luKCkpOwogICAgIGlmICghbV9jbGllbnRQcm90b2NvbC5pc0VtcHR5KCkpCiAgICAgICAgIHJl cXVlc3QuYWRkSGVhZGVyRmllbGQoIlNlYy1XZWJTb2NrZXQtUHJvdG9jb2w6IiwgbV9jbGllbnRQ cm90b2NvbCk7CiAKQEAgLTM0OSw3ICszNDMsNyBAQCBXZWJTb2NrZXRIYW5kc2hha2VSZXF1ZXN0 IFdlYlNvY2tldEhhbmRzaGFrZTo6Y2xpZW50SGFuZHNoYWtlUmVxdWVzdCgpIGNvbnN0CiAgICAg ICAgIHJlcXVlc3Quc2V0S2V5MyhtX2hpeGllNzZLZXkzKTsKICAgICB9IGVsc2UgewogICAgICAg ICByZXF1ZXN0LmFkZEhlYWRlckZpZWxkKCJTZWMtV2ViU29ja2V0LUtleSIsIG1fc2VjV2ViU29j a2V0S2V5KTsKLSAgICAgICAgcmVxdWVzdC5hZGRIZWFkZXJGaWVsZCgiU2VjLVdlYlNvY2tldC1W ZXJzaW9uIiwgIjgiKTsKKyAgICAgICAgcmVxdWVzdC5hZGRIZWFkZXJGaWVsZCgiU2VjLVdlYlNv Y2tldC1WZXJzaW9uIiwgIjEzIik7CiAgICAgfQogCiAgICAgcmV0dXJuIHJlcXVlc3Q7Cg==