From f270b6559751958a6a5f2d7241be700fa58f6c78 Mon Sep 17 00:00:00 2001 From: Vikram Rajkumar Date: Thu, 12 Jan 2017 17:47:44 -0600 Subject: [PATCH] Revert "Add a command-line option to witness_node, --disable-permessage-deflate" This reverts commit c39f97885d72ef291e63479560b58b4565549999. --- libraries/app/application.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index 87b8476f..823a5bfe 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -237,9 +237,7 @@ namespace detail { if( !_options->count("rpc-endpoint") ) return; - bool enable_deflate_compression = _options->count("enable-permessage-deflate") != 0; - - _websocket_server = std::make_shared(enable_deflate_compression); + _websocket_server = std::make_shared(); _websocket_server->on_connection([&]( const fc::http::websocket_connection_ptr& c ){ auto wsc = std::make_shared(*c); @@ -266,8 +264,7 @@ namespace detail { } string password = _options->count("server-pem-password") ? _options->at("server-pem-password").as() : ""; - bool enable_deflate_compression = _options->count("enable-permessage-deflate") != 0; - _websocket_tls_server = std::make_shared( _options->at("server-pem").as(), password, enable_deflate_compression ); + _websocket_tls_server = std::make_shared( _options->at("server-pem").as(), password ); _websocket_tls_server->on_connection([&]( const fc::http::websocket_connection_ptr& c ){ auto wsc = std::make_shared(*c); @@ -962,8 +959,6 @@ void application::set_program_options(boost::program_options::options_descriptio ("checkpoint,c", bpo::value>()->composing(), "Pairs of [BLOCK_NUM,BLOCK_ID] that should be enforced as checkpoints.") ("rpc-endpoint", bpo::value()->implicit_value("127.0.0.1:8090"), "Endpoint for websocket RPC to listen on") ("rpc-tls-endpoint", bpo::value()->implicit_value("127.0.0.1:8089"), "Endpoint for TLS websocket RPC to listen on") - ("enable-permessage-deflate", "Enable support for per-message deflate compression in the websocket servers " - "(--rpc-endpoint and --rpc-tls-endpoint), disabled by default") ("server-pem,p", bpo::value()->implicit_value("server.pem"), "The TLS certificate file for this server") ("server-pem-password,P", bpo::value()->implicit_value(""), "Password for this certificate") ("genesis-json", bpo::value(), "File to read Genesis State from")