diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 06:21:51 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 06:21:51 +0000 |
| commit | ce528ee99aadb239b6cb44a72269e07bdc9fc2d0 (patch) | |
| tree | 3aa8f931a0b15e2c4e1f6f35f3b41102b483acc1 /net/server/web_socket.cc | |
| parent | 4aa41f22d029f0d163f30d2b259301c9c479dfc3 (diff) | |
| download | chromium_src-ce528ee99aadb239b6cb44a72269e07bdc9fc2d0.zip chromium_src-ce528ee99aadb239b6cb44a72269e07bdc9fc2d0.tar.gz chromium_src-ce528ee99aadb239b6cb44a72269e07bdc9fc2d0.tar.bz2 | |
Fix Win builder following r111314
BUG=none
TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/8677002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111322 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/server/web_socket.cc')
| -rw-r--r-- | net/server/web_socket.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/server/web_socket.cc b/net/server/web_socket.cc index c2b6098..7360c25 100644 --- a/net/server/web_socket.cc +++ b/net/server/web_socket.cc @@ -216,12 +216,12 @@ class WebSocketHybi17 : public WebSocket { unsigned char first_byte = *p++; unsigned char second_byte = *p++; - final_ = first_byte & kFinalBit; - reserved1_ = first_byte & kReserved1Bit; - reserved2_ = first_byte & kReserved2Bit; - reserved3_ = first_byte & kReserved3Bit; + final_ = (first_byte & kFinalBit) != 0; + reserved1_ = (first_byte & kReserved1Bit) != 0; + reserved2_ = (first_byte & kReserved2Bit) != 0; + reserved3_ = (first_byte & kReserved3Bit) != 0; op_code_ = first_byte & kOpCodeMask; - masked_ = second_byte & kMaskBit; + masked_ = (second_byte & kMaskBit) != 0; switch (op_code_) { case kOpCodeClose: |