diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Glacier2/SessionRouterI.cpp | 25 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.h | 2 | ||||
| -rw-r--r-- | cpp/test/Glacier2/ssl/Server.cpp | 7 | ||||
| -rwxr-xr-x | cpp/test/Glacier2/ssl/run.py | 1 |
5 files changed, 3 insertions, 35 deletions
diff --git a/cpp/src/Glacier2/SessionRouterI.cpp b/cpp/src/Glacier2/SessionRouterI.cpp index 8e95f0d8783..07dff9c4bdd 100644 --- a/cpp/src/Glacier2/SessionRouterI.cpp +++ b/cpp/src/Glacier2/SessionRouterI.cpp @@ -548,31 +548,8 @@ CreateSession::sessionCreated(const SessionPrx& session) ident = _control->ice_getIdentity(); } - if(_instance->properties()->getPropertyAsInt("Glacier2.AddConnectionContext") == 1 || - _instance->properties()->getPropertyAsInt("Glacier2.AddSSLContext") > 0) + if(_instance->properties()->getPropertyAsInt("Glacier2.AddConnectionContext") == 1) { - // - // DEPRECATED: Glacier2.AddSSLContext. - // - IceSSL::ConnectionInfoPtr info = IceSSL::ConnectionInfoPtr::dynamicCast(_current.con->getInfo()); - if(info && _instance->properties()->getPropertyAsInt("Glacier2.AddSSLContext") > 0) - { - _context["SSL.Active"] = "1"; - _context["SSL.Cipher"] = info->cipher; - ostringstream os; - os << info->remotePort; - _context["SSL.Remote.Port"] = os.str(); - _context["SSL.Remote.Host"] = info->remoteAddress; - os.str(""); - os << info->localPort; - _context["SSL.Local.Port"] = os.str(); - _context["SSL.Local.Host"] = info->localAddress; - if(info->certs.size() > 0) - { - _context["SSL.PeerCert"] = info->certs[0]; - } - } - router = new RouterI(_instance, _current.con, _user, session, ident, _filterManager, _context); } else diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index d7fcbb2a18a..17da093d5b5 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -6,7 +6,7 @@ // ICE_LICENSE file included in this distribution. // // ********************************************************************** -// Generated by makeprops.py from file ./config/PropertyNames.xml, Thu Nov 6 07:51:16 2014 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Dec 9 12:08:30 2014 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -1057,7 +1057,6 @@ const IceInternal::PropertyArray const IceInternal::Property Glacier2PropsData[] = { - IceInternal::Property("Glacier2.AddSSLContext", true, 0), IceInternal::Property("Glacier2.AddConnectionContext", false, 0), IceInternal::Property("Glacier2.Client.ACM.Timeout", false, 0), IceInternal::Property("Glacier2.Client.ACM.Heartbeat", false, 0), diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index d7b2b86ebdd..304ae323f3e 100644 --- a/cpp/src/Ice/PropertyNames.h +++ b/cpp/src/Ice/PropertyNames.h @@ -6,7 +6,7 @@ // ICE_LICENSE file included in this distribution. // // ********************************************************************** -// Generated by makeprops.py from file ./config/PropertyNames.xml, Thu Nov 6 07:51:16 2014 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Dec 9 12:08:30 2014 // IMPORTANT: Do not edit this file -- any edits made here will be lost! diff --git a/cpp/test/Glacier2/ssl/Server.cpp b/cpp/test/Glacier2/ssl/Server.cpp index 00c1b317161..e5315e5dd0e 100644 --- a/cpp/test/Glacier2/ssl/Server.cpp +++ b/cpp/test/Glacier2/ssl/Server.cpp @@ -84,13 +84,6 @@ public: { testContext(_ssl, current.ctx); - if(_ssl && _shutdown) - { - // DEPRECATED - Ice::Context::const_iterator p = current.ctx.find("SSL.Active"); - test(p != current.ctx.end() && p->second == "1"); - } - current.adapter->remove(current.id); if(_shutdown) { diff --git a/cpp/test/Glacier2/ssl/run.py b/cpp/test/Glacier2/ssl/run.py index 6b2e95eec64..be446fe90c5 100755 --- a/cpp/test/Glacier2/ssl/run.py +++ b/cpp/test/Glacier2/ssl/run.py @@ -35,7 +35,6 @@ serverProc = TestUtil.startServer(server) print("ok") args = ' --Ice.Warn.Dispatch=0' + \ - ' --Glacier2.AddSSLContext=1' + \ ' --Glacier2.AddConnectionContext=1' + \ ' --Glacier2.Client.Endpoints="tcp -h 127.0.0.1 -p 12347:ssl -h 127.0.0.1 -p 12348"' + \ ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1"' \ |