summaryrefslogtreecommitdiff
path: root/cpp/src/IceSSL/PluginI.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2015-01-09 09:18:21 -0330
committerDwayne Boone <dwayne@zeroc.com>2015-01-09 09:18:21 -0330
commitd02b0603f1bd1b66b47673474bc167c65f619f93 (patch)
tree2176351e8b5a9452a1c453add92ebd77ee3dae16 /cpp/src/IceSSL/PluginI.cpp
parentICE-6196 added ProtocolInstance::secure() (diff)
downloadice-d02b0603f1bd1b66b47673474bc167c65f619f93.tar.bz2
ice-d02b0603f1bd1b66b47673474bc167c65f619f93.tar.xz
ice-d02b0603f1bd1b66b47673474bc167c65f619f93.zip
ICE-6196 Fixes for ProtocolInstance::secure()
Diffstat (limited to 'cpp/src/IceSSL/PluginI.cpp')
-rw-r--r--cpp/src/IceSSL/PluginI.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp
index 5f35b0780d1..021f4007071 100644
--- a/cpp/src/IceSSL/PluginI.cpp
+++ b/cpp/src/IceSSL/PluginI.cpp
@@ -47,9 +47,9 @@ IceSSL::PluginI::PluginI(const Ice::CommunicatorPtr& communicator)
#else
_engine = new OpenSSLEngine(communicator);
#endif
-
+
IceInternal::ProtocolPluginFacadePtr facade = IceInternal::getProtocolPluginFacade(communicator);
-
+
//
// Register the endpoint factory. We have to do this now, rather
// than in initialize, because the communicator may need to
@@ -57,8 +57,9 @@ IceSSL::PluginI::PluginI(const Ice::CommunicatorPtr& communicator)
//
IceInternal::EndpointFactoryPtr sslFactory = new EndpointFactoryI(new Instance(_engine, EndpointType, "ssl"));
facade->addEndpointFactory(sslFactory);
-
- IceInternal::ProtocolInstancePtr wss = new IceInternal::ProtocolInstance(communicator, WSSEndpointType, "wss");
+
+ IceInternal::ProtocolInstancePtr wss =
+ new IceInternal::ProtocolInstance(communicator, WSSEndpointType, "wss", true);
facade->addEndpointFactory(new IceInternal::WSEndpointFactory(wss, sslFactory->clone(wss)));
}