Merge remote-tracking branch 'origin/master'

This commit is contained in:
xiongziliang 2021-04-01 20:14:44 +08:00
commit f217467699

View File

@ -150,7 +150,7 @@ void WebSocketSplitter::onPayloadData(uint8_t *data, size_t len) {
void WebSocketSplitter::encode(const WebSocketHeader &header,const Buffer::Ptr &buffer) { void WebSocketSplitter::encode(const WebSocketHeader &header,const Buffer::Ptr &buffer) {
string ret; string ret;
auto len = buffer ? buffer->size() : 0; uint64_t len = buffer ? buffer->size() : 0;
uint8_t byte = header._fin << 7 | ((header._reserved & 0x07) << 4) | (header._opcode & 0x0F) ; uint8_t byte = header._fin << 7 | ((header._reserved & 0x07) << 4) | (header._opcode & 0x0F) ;
ret.push_back(byte); ret.push_back(byte);