diff options
| author | Tor Brede Vekterli <vekterli@oath.com> | 2018-09-10 12:43:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-10 12:43:42 +0200 |
| commit | 0a003477115303a75f8f5b68e71815e4943b04c7 (patch) | |
| tree | 65e9557982b5d926d24fa3f04ec2fbffd8474bb0 /searchlib | |
| parent | a7066e7028de1f35264bbfe164ba950ba5c6752f (diff) | |
| parent | 20120ad4ebb64dccf45052c88739d9e4e6dbc901 (diff) | |
Merge pull request #6867 from vespa-engine/havardpe/explicitly-turn-off-encryption-some-places
Havardpe/explicitly turn off encryption some places
Diffstat (limited to 'searchlib')
| -rw-r--r-- | searchlib/src/vespa/searchlib/engine/transportserver.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/searchlib/src/vespa/searchlib/engine/transportserver.cpp b/searchlib/src/vespa/searchlib/engine/transportserver.cpp index c5e59024c31..bc739a7bf48 100644 --- a/searchlib/src/vespa/searchlib/engine/transportserver.cpp +++ b/searchlib/src/vespa/searchlib/engine/transportserver.cpp @@ -7,6 +7,7 @@ #include <vespa/fnet/connection.h> #include <vespa/fnet/connector.h> #include <vespa/fnet/iexecutable.h> +#include <vespa/vespalib/net/crypto_engine.h> #include <vespa/log/log.h> LOG_SETUP(".engine.transportserver"); @@ -358,7 +359,7 @@ TransportServer::TransportServer(SearchServer &searchServer, : _searchServer(searchServer), _docsumServer(docsumServer), _monitorServer(monitorServer), - _transport(), + _transport(std::make_shared<vespalib::NullCryptoEngine>(), 1), // disable encryption _ready(false), _failed(false), _doListen(true), |