(ws send) add option (-x) to disable per message deflate compression

This commit is contained in:
Benjamin Sergeant 2020-01-04 15:08:36 -08:00
parent e0187b2d8e
commit f56098dd4c
5 changed files with 10 additions and 3 deletions

View File

@ -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.
## [7.9.0] - 2020-01-04
(ws send) add option (-x) to disable per message deflate compression
## [7.8.9] - 2020-01-04 ## [7.8.9] - 2020-01-04
(ws send + receive) handle all message types (ping + pong + fragment) / investigate #140 (ws send + receive) handle all message types (ping + pong + fragment) / investigate #140

View File

@ -6,4 +6,4 @@
#pragma once #pragma once
#define IX_WEBSOCKET_VERSION "7.8.9" #define IX_WEBSOCKET_VERSION "7.9.0"

View File

@ -130,6 +130,7 @@ int main(int argc, char** argv)
->required() ->required()
->check(CLI::ExistingPath); ->check(CLI::ExistingPath);
sendApp->add_option("--pidfile", pidfile, "Pid file"); sendApp->add_option("--pidfile", pidfile, "Pid file");
sendApp->add_flag("-x", disablePerMessageDeflate, "Disable per message deflate");
addTLSOptions(sendApp); addTLSOptions(sendApp);
CLI::App* receiveApp = app.add_subcommand("receive", "Receive a file"); CLI::App* receiveApp = app.add_subcommand("receive", "Receive a file");
@ -359,7 +360,7 @@ int main(int argc, char** argv)
} }
else if (app.got_subcommand("send")) else if (app.got_subcommand("send"))
{ {
ret = ix::ws_send_main(url, path, tlsOptions); ret = ix::ws_send_main(url, path, disablePerMessageDeflate, tlsOptions);
} }
else if (app.got_subcommand("receive")) else if (app.got_subcommand("receive"))
{ {

View File

@ -55,6 +55,7 @@ namespace ix
int ws_send_main(const std::string& url, int ws_send_main(const std::string& url,
const std::string& path, const std::string& path,
bool disablePerMessageDeflate,
const ix::SocketTLSOptions& tlsOptions); const ix::SocketTLSOptions& tlsOptions);
int ws_redis_publish_main(const std::string& hostname, int ws_redis_publish_main(const std::string& hostname,

View File

@ -301,10 +301,11 @@ namespace ix
int ws_send_main(const std::string& url, int ws_send_main(const std::string& url,
const std::string& path, const std::string& path,
bool disablePerMessageDeflate,
const ix::SocketTLSOptions& tlsOptions) const ix::SocketTLSOptions& tlsOptions)
{ {
bool throttle = false; bool throttle = false;
bool enablePerMessageDeflate = false; bool enablePerMessageDeflate = !disablePerMessageDeflate;
wsSend(url, path, enablePerMessageDeflate, throttle, tlsOptions); wsSend(url, path, enablePerMessageDeflate, throttle, tlsOptions);
return 0; return 0;