83042 2012-04-03 09:48:51 -0700 WebSocketServer: Honour WebSocketFrame::masked in makeFrameData 2012-04-09 08:32:51 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jturcotte jturcotte tkent yutak oldest_to_newest 594572 0 jturcotte 2012-04-03 09:48:51 -0700 WebSocketServer: Honour WebSocketFrame::masked in makeFrameData 594579 1 135348 jturcotte 2012-04-03 09:57:28 -0700 Created attachment 135348 Patch 595177 2 135348 tkent 2012-04-03 20:10:01 -0700 Comment on attachment 135348 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=135348&action=review > Source/WebCore/Modules/websockets/WebSocketFrame.cpp:157 > + char& firstByte = frameData.at(0); > + char& secondByte = frameData.at(1); > + firstByte = (final ? finalBit : 0) | (compress ? compressBit : 0) | opCode; The variable firstByte looks unnecessary. frameData.at(0) = (final ? ... 598295 3 jturcotte 2012-04-09 08:31:35 -0700 Committed r113580: <http://trac.webkit.org/changeset/113580> 598296 4 jturcotte 2012-04-09 08:32:51 -0700 Thanks! 135348 2012-04-03 09:57:28 -0700 2012-04-03 20:10:01 -0700 Patch bug-83042-20120403185458.patch text/plain 4598 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2M4ZTBiODNkMTJmNjI2 MzgwYWE0NGNmYzAzMjNiMjBlOGJlZWYxOC4uYTU1Y2EzNjkyOWJiZjExNTgwYTVlYjgxNWU1YTIy MzhjZjhmZjhiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA0LTAzICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CisKKyAgICAgICAgV2Vi U29ja2V0U2VydmVyOiBIb25vdXIgV2ViU29ja2V0RnJhbWU6Om1hc2tlZCBpbiBtYWtlRnJhbWVE YXRhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzA0 MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZyYW1l cyBmcm9tIHRoZSBzZXJ2ZXIgc2hvdWxkIG5vdCBiZSBtYXNrZWQuCisgICAgICAgIEN1cnJlbnRs eSwgdGhlIGZsYWcgaXMgc2V0IHRvIGZhbHNlLCBidXQgdGhlIGZyYW1lcyB3ZXJlIG1hc2tlZCBh bnl3YXkuCisgICAgICAgIFRoaXMgY2F1c2VzIGNsaWVudHMgd2l0aCByZWNlbnQgYnVpbGRzIG9m IFdlYktpdCB0byBhYm9ydCB0aGUgY29ubmVjdGlvbiB0byB0aGUKKyAgICAgICAgaW5zcGVjdG9y IHNlcnZlciwgcmVmdXNpbmcgbWFza2VkIGZyYW1lcyBmcm9tIHRoZSBzZXJ2ZXIgYXMgcGVyIHRo ZSBzcGVjLgorICAgICAgICBUaGlzIGRvZXNuJ3QgY2hhbmdlIHRoZSBiZWhhdmlvciBvZiBXZWJT b2NrZXQgY2xpZW50cywgd2hpY2ggc2V0IHRoZSBtYXNrZWQgZmxhZyB0byB0cnVlLgorCisgICAg ICAgICogTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldEZyYW1lLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OmFwcGVuZEZyYW1lUGF5bG9hZCk6CisgICAgICAgIChXZWJDb3JlOjpXZWJTb2NrZXRG cmFtZTo6bWFrZUZyYW1lRGF0YSk6CisKIDIwMTItMDMtMjkgIEpvc2VwaCBQZWNvcmFybyAgPGpv ZXBlY2tAd2Via2l0Lm9yZz4gYW5kIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRl QG5va2lhLmNvbT4KIAogICAgICAgICBBZGQgYSBHZW5lcmljIFdlYlNvY2tldCBTZXJ2ZXIuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvV2ViU29ja2V0RnJh bWUuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldEZyYW1l LmNwcAppbmRleCAxMjExY2I5NGQxMzI1NTBhNTQwMGE5NmIxMjQ1MmIzMGQ0YWE0MzcxLi5jNDRk NzUwZGVmNjY1M2MyNDFhNmMzMGFhZTQ2NDhiMjU5MTNjODVkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvV2ViU29ja2V0RnJhbWUuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvd2Vic29ja2V0cy9XZWJTb2NrZXRGcmFtZS5jcHAKQEAgLTEyOSwz NCArMTI5LDQyIEBAIFdlYlNvY2tldEZyYW1lOjpQYXJzZUZyYW1lUmVzdWx0IFdlYlNvY2tldEZy YW1lOjpwYXJzZUZyYW1lKGNoYXIqIGRhdGEsIHNpemVfdCBkCiAgICAgcmV0dXJuIEZyYW1lT0s7 CiB9CiAKLXN0YXRpYyB2b2lkIGFwcGVuZE1hc2tlZEZyYW1lUGF5bG9hZChjb25zdCBXZWJTb2Nr ZXRGcmFtZSYgZnJhbWUsIFZlY3RvcjxjaGFyPiYgZnJhbWVEYXRhKQorc3RhdGljIHZvaWQgYXBw ZW5kRnJhbWVQYXlsb2FkKGNvbnN0IFdlYlNvY2tldEZyYW1lJiBmcmFtZSwgVmVjdG9yPGNoYXI+ JiBmcmFtZURhdGEpCiB7Ci0gICAgc2l6ZV90IG1hc2tpbmdLZXlTdGFydCA9IGZyYW1lRGF0YS5z aXplKCk7Ci0gICAgZnJhbWVEYXRhLmdyb3coZnJhbWVEYXRhLnNpemUoKSArIG1hc2tpbmdLZXlX aWR0aEluQnl0ZXMpOyAvLyBBZGQgcGxhY2Vob2xkZXIgZm9yIG1hc2tpbmcga2V5LiBXaWxsIGJl IG92ZXJ3cml0dGVuLgorICAgIHNpemVfdCBtYXNraW5nS2V5U3RhcnQgPSAwOworICAgIGlmIChm cmFtZS5tYXNrZWQpIHsKKyAgICAgICAgbWFza2luZ0tleVN0YXJ0ID0gZnJhbWVEYXRhLnNpemUo KTsKKyAgICAgICAgZnJhbWVEYXRhLmdyb3coZnJhbWVEYXRhLnNpemUoKSArIG1hc2tpbmdLZXlX aWR0aEluQnl0ZXMpOyAvLyBBZGQgcGxhY2Vob2xkZXIgZm9yIG1hc2tpbmcga2V5LiBXaWxsIGJl IG92ZXJ3cml0dGVuLgorICAgIH0KKwogICAgIHNpemVfdCBwYXlsb2FkU3RhcnQgPSBmcmFtZURh dGEuc2l6ZSgpOwogICAgIGZyYW1lRGF0YS5hcHBlbmQoZnJhbWUucGF5bG9hZCwgZnJhbWUucGF5 bG9hZExlbmd0aCk7CiAKLSAgICBjcnlwdG9ncmFwaGljYWxseVJhbmRvbVZhbHVlcyhmcmFtZURh dGEuZGF0YSgpICsgbWFza2luZ0tleVN0YXJ0LCBtYXNraW5nS2V5V2lkdGhJbkJ5dGVzKTsKLSAg ICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGZyYW1lLnBheWxvYWRMZW5ndGg7ICsraSkKLSAgICAg ICAgZnJhbWVEYXRhW3BheWxvYWRTdGFydCArIGldIF49IGZyYW1lRGF0YVttYXNraW5nS2V5U3Rh cnQgKyBpICUgbWFza2luZ0tleVdpZHRoSW5CeXRlc107CisgICAgaWYgKGZyYW1lLm1hc2tlZCkg eworICAgICAgICBjcnlwdG9ncmFwaGljYWxseVJhbmRvbVZhbHVlcyhmcmFtZURhdGEuZGF0YSgp ICsgbWFza2luZ0tleVN0YXJ0LCBtYXNraW5nS2V5V2lkdGhJbkJ5dGVzKTsKKyAgICAgICAgZm9y IChzaXplX3QgaSA9IDA7IGkgPCBmcmFtZS5wYXlsb2FkTGVuZ3RoOyArK2kpCisgICAgICAgICAg ICBmcmFtZURhdGFbcGF5bG9hZFN0YXJ0ICsgaV0gXj0gZnJhbWVEYXRhW21hc2tpbmdLZXlTdGFy dCArIGkgJSBtYXNraW5nS2V5V2lkdGhJbkJ5dGVzXTsKKyAgICB9CiB9CiAKIHZvaWQgV2ViU29j a2V0RnJhbWU6Om1ha2VGcmFtZURhdGEoVmVjdG9yPGNoYXI+JiBmcmFtZURhdGEpCiB7CiAgICAg QVNTRVJUKCEob3BDb2RlICYgfm9wQ29kZU1hc2spKTsgLy8gQ2hlY2tzIHdoZXRoZXIgIm9wQ29k ZSIgZml0cyBpbiB0aGUgcmFuZ2Ugb2Ygb3BDb2Rlcy4KIAotICAgIHVuc2lnbmVkIGNoYXIgZmly c3RCeXRlID0gKGZpbmFsID8gZmluYWxCaXQgOiAwKSB8IG9wQ29kZTsKLSAgICBpZiAoY29tcHJl c3MpCi0gICAgICAgIGZpcnN0Qnl0ZSB8PSBjb21wcmVzc0JpdDsKLSAgICBmcmFtZURhdGEuYXBw ZW5kKGZpcnN0Qnl0ZSk7CisgICAgZnJhbWVEYXRhLnJlc2l6ZSgyKTsKKyAgICBjaGFyJiBmaXJz dEJ5dGUgPSBmcmFtZURhdGEuYXQoMCk7CisgICAgY2hhciYgc2Vjb25kQnl0ZSA9IGZyYW1lRGF0 YS5hdCgxKTsKKyAgICBmaXJzdEJ5dGUgPSAoZmluYWwgPyBmaW5hbEJpdCA6IDApIHwgKGNvbXBy ZXNzID8gY29tcHJlc3NCaXQgOiAwKSB8IG9wQ29kZTsKKyAgICBzZWNvbmRCeXRlID0gbWFza2Vk ID8gbWFza0JpdCA6IDA7CisKICAgICBpZiAocGF5bG9hZExlbmd0aCA8PSBtYXhQYXlsb2FkTGVu Z3RoV2l0aG91dEV4dGVuZGVkTGVuZ3RoRmllbGQpCi0gICAgICAgIGZyYW1lRGF0YS5hcHBlbmQo bWFza0JpdCB8IHBheWxvYWRMZW5ndGgpOworICAgICAgICBzZWNvbmRCeXRlIHw9IHBheWxvYWRM ZW5ndGg7CiAgICAgZWxzZSBpZiAocGF5bG9hZExlbmd0aCA8PSAweEZGRkYpIHsKLSAgICAgICAg ZnJhbWVEYXRhLmFwcGVuZChtYXNrQml0IHwgcGF5bG9hZExlbmd0aFdpdGhUd29CeXRlRXh0ZW5k ZWRMZW5ndGhGaWVsZCk7CisgICAgICAgIHNlY29uZEJ5dGUgfD0gcGF5bG9hZExlbmd0aFdpdGhU d29CeXRlRXh0ZW5kZWRMZW5ndGhGaWVsZDsKICAgICAgICAgZnJhbWVEYXRhLmFwcGVuZCgocGF5 bG9hZExlbmd0aCAmIDB4RkYwMCkgPj4gOCk7CiAgICAgICAgIGZyYW1lRGF0YS5hcHBlbmQocGF5 bG9hZExlbmd0aCAmIDB4RkYpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIGZyYW1lRGF0YS5hcHBl bmQobWFza0JpdCB8IHBheWxvYWRMZW5ndGhXaXRoRWlnaHRCeXRlRXh0ZW5kZWRMZW5ndGhGaWVs ZCk7CisgICAgICAgIHNlY29uZEJ5dGUgfD0gcGF5bG9hZExlbmd0aFdpdGhFaWdodEJ5dGVFeHRl bmRlZExlbmd0aEZpZWxkOwogICAgICAgICBjaGFyIGV4dGVuZGVkUGF5bG9hZExlbmd0aFs4XTsK ICAgICAgICAgc2l6ZV90IHJlbWFpbmluZyA9IHBheWxvYWRMZW5ndGg7CiAgICAgICAgIC8vIEZp bGwgdGhlIGxlbmd0aCBpbnRvIGV4dGVuZGVkUGF5bG9hZExlbmd0aCBpbiB0aGUgbmV0d29yayBi eXRlIG9yZGVyLgpAQCAtMTY4LDcgKzE3Niw3IEBAIHZvaWQgV2ViU29ja2V0RnJhbWU6Om1ha2VG cmFtZURhdGEoVmVjdG9yPGNoYXI+JiBmcmFtZURhdGEpCiAgICAgICAgIGZyYW1lRGF0YS5hcHBl bmQoZXh0ZW5kZWRQYXlsb2FkTGVuZ3RoLCA4KTsKICAgICB9CiAKLSAgICBhcHBlbmRNYXNrZWRG cmFtZVBheWxvYWQoKnRoaXMsIGZyYW1lRGF0YSk7CisgICAgYXBwZW5kRnJhbWVQYXlsb2FkKCp0 aGlzLCBmcmFtZURhdGEpOwogfQogCiBXZWJTb2NrZXRGcmFtZTo6V2ViU29ja2V0RnJhbWUoT3BD b2RlIG9wQ29kZSwgYm9vbCBmaW5hbCwgYm9vbCBjb21wcmVzcywgYm9vbCBtYXNrZWQsIGNvbnN0 IGNoYXIqIHBheWxvYWQsIHNpemVfdCBwYXlsb2FkTGVuZ3RoKQo=