Stop having ws send subcommand send a binary message in text mode, which would cause error in make ws_test
shell script test
This commit is contained in:
parent
05f29639e5
commit
3cd7c0194f
@ -1 +1 @@
|
|||||||
6.2.6
|
6.2.7
|
||||||
|
@ -1,6 +1,10 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
|
|
||||||
|
## [6.2.7] - 2019-09-25
|
||||||
|
|
||||||
|
- Stop having ws send subcommand send a binary message in text mode, which would cause error in `make ws_test` shell script test.
|
||||||
|
|
||||||
## [6.2.6] - 2019-09-24
|
## [6.2.6] - 2019-09-24
|
||||||
|
|
||||||
- Fix 2 race conditions detected with TSan, one in CobraMetricsPublisher::push and another one in WebSocketTransport::sendData (that one was bad).
|
- Fix 2 race conditions detected with TSan, one in CobraMetricsPublisher::push and another one in WebSocketTransport::sendData (that one was bad).
|
||||||
|
@ -6,4 +6,4 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define IX_WEBSOCKET_VERSION "6.2.6"
|
#define IX_WEBSOCKET_VERSION "6.2.7"
|
||||||
|
@ -273,7 +273,7 @@ TEST_CASE("Websocket_chat", "[websocket_chat]")
|
|||||||
chatB.sendMessage("from B1");
|
chatB.sendMessage("from B1");
|
||||||
chatB.sendMessage("from B2");
|
chatB.sendMessage("from B2");
|
||||||
|
|
||||||
// Test large messages that needs to be broken into small fragments
|
// Test large messages that need to be broken into small fragments
|
||||||
size_t size = 1 * 1024 * 1024; // ~1Mb
|
size_t size = 1 * 1024 * 1024; // ~1Mb
|
||||||
std::string bigMessage(size, 'a');
|
std::string bigMessage(size, 'a');
|
||||||
chatB.sendMessage(bigMessage);
|
chatB.sendMessage(bigMessage);
|
||||||
|
@ -59,7 +59,7 @@ namespace ix
|
|||||||
, _delayMs(delayMs)
|
, _delayMs(delayMs)
|
||||||
, _receivedFragmentCounter(0)
|
, _receivedFragmentCounter(0)
|
||||||
{
|
{
|
||||||
;
|
_webSocket.disableAutomaticReconnection();
|
||||||
}
|
}
|
||||||
|
|
||||||
void WebSocketReceiver::stop()
|
void WebSocketReceiver::stop()
|
||||||
@ -113,7 +113,7 @@ namespace ix
|
|||||||
pdu["message"] = errMsg;
|
pdu["message"] = errMsg;
|
||||||
|
|
||||||
MsgPack msg(pdu);
|
MsgPack msg(pdu);
|
||||||
_webSocket.send(msg.dump());
|
_webSocket.sendBinary(msg.dump());
|
||||||
}
|
}
|
||||||
|
|
||||||
void WebSocketReceiver::handleMessage(const std::string& str)
|
void WebSocketReceiver::handleMessage(const std::string& str)
|
||||||
@ -164,8 +164,9 @@ namespace ix
|
|||||||
pdu["id"] = data["id"];
|
pdu["id"] = data["id"];
|
||||||
pdu["filename"] = data["filename"];
|
pdu["filename"] = data["filename"];
|
||||||
|
|
||||||
|
std::cout << "Sending ack to sender" << std::endl;
|
||||||
MsgPack msg(pdu);
|
MsgPack msg(pdu);
|
||||||
_webSocket.send(msg.dump());
|
_webSocket.sendBinary(msg.dump());
|
||||||
}
|
}
|
||||||
|
|
||||||
void WebSocketReceiver::start()
|
void WebSocketReceiver::start()
|
||||||
|
@ -52,7 +52,7 @@ namespace ix
|
|||||||
: _url(url)
|
: _url(url)
|
||||||
, _enablePerMessageDeflate(enablePerMessageDeflate)
|
, _enablePerMessageDeflate(enablePerMessageDeflate)
|
||||||
{
|
{
|
||||||
;
|
_webSocket.disableAutomaticReconnection();
|
||||||
}
|
}
|
||||||
|
|
||||||
void WebSocketSender::stop()
|
void WebSocketSender::stop()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user