(websocket server) fix regression with disabling zlib extension on the server side. If a client does not support this extension the server will handle it fine. We still need to figure out how to disable the option. cc #160
This commit is contained in:
parent
e581f29b42
commit
4ef04b8339
@ -1,6 +1,10 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
All changes to this project will be documented in this file.
|
All changes to this project will be documented in this file.
|
||||||
|
|
||||||
|
## [8.1.8] - 2020-03-02
|
||||||
|
|
||||||
|
(websocket server) fix regression with disabling zlib extension on the server side. If a client does not support this extension the server will handle it fine. We still need to figure out how to disable the option.
|
||||||
|
|
||||||
## [8.1.7] - 2020-02-26
|
## [8.1.7] - 2020-02-26
|
||||||
|
|
||||||
(websocket) traffic tracker received bytes is message size while it should be wire size
|
(websocket) traffic tracker received bytes is message size while it should be wire size
|
||||||
|
@ -337,8 +337,7 @@ namespace ix
|
|||||||
WebSocketPerMessageDeflateOptions webSocketPerMessageDeflateOptions(header);
|
WebSocketPerMessageDeflateOptions webSocketPerMessageDeflateOptions(header);
|
||||||
|
|
||||||
// If the client has requested that extension,
|
// If the client has requested that extension,
|
||||||
// and the server does not prevent it, enable it.
|
if (webSocketPerMessageDeflateOptions.enabled())
|
||||||
if (_enablePerMessageDeflate && webSocketPerMessageDeflateOptions.enabled())
|
|
||||||
{
|
{
|
||||||
_enablePerMessageDeflate = true;
|
_enablePerMessageDeflate = true;
|
||||||
|
|
||||||
|
@ -90,15 +90,6 @@ namespace ix
|
|||||||
webSocket->disablePong();
|
webSocket->disablePong();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_enablePerMessageDeflate)
|
|
||||||
{
|
|
||||||
webSocket->enablePerMessageDeflate();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
webSocket->disablePerMessageDeflate();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add this client to our client set
|
// Add this client to our client set
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(_clientsMutex);
|
std::lock_guard<std::mutex> lock(_clientsMutex);
|
||||||
|
Loading…
Reference in New Issue
Block a user