diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-12-09 12:09:48 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-12-09 12:09:48 +0100 |
| commit | f500c042d5abebee10b9ec049e5b55bd6c66bbaf (patch) | |
| tree | f255bc215935eee472fa7a3d00acb8510e0aaa5a /cpp/src | |
| parent | Fixed bug number of comment on fast path loopback (diff) | |
| download | ice-f500c042d5abebee10b9ec049e5b55bd6c66bbaf.tar.bz2 ice-f500c042d5abebee10b9ec049e5b55bd6c66bbaf.tar.xz ice-f500c042d5abebee10b9ec049e5b55bd6c66bbaf.zip | |
Fixed ICE-6095: Removed deprecated Glacier2.AddSSLContext property
Diffstat (limited to 'cpp/src')
| -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 |
3 files changed, 3 insertions, 27 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! |