summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Proxy.cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2001-12-06 19:27:15 +0000
committerMarc Laukien <marc@zeroc.com>2001-12-06 19:27:15 +0000
commit1e9d01c5622565bf8c578021433085b974ecc47b (patch)
treea8cad8eda26de8dfc180ad11887253efcab47484 /cpp/src/Ice/Proxy.cpp
parentupdate all dependencies. (diff)
downloadice-1e9d01c5622565bf8c578021433085b974ecc47b.tar.bz2
ice-1e9d01c5622565bf8c578021433085b974ecc47b.tar.xz
ice-1e9d01c5622565bf8c578021433085b974ecc47b.zip
default protocol
Diffstat (limited to 'cpp/src/Ice/Proxy.cpp')
-rw-r--r--cpp/src/Ice/Proxy.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 7cc0d97e1ee..cb4851bcb34 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -631,11 +631,17 @@ IceDelegateM::Ice::Object::setup(const ReferencePtr& ref)
endpoints.erase(remove_if(endpoints.begin(), endpoints.end(), not1(::Ice::constMemFun(&Endpoint::secure))),
endpoints.end());
}
+//
+// We allow secure connections also if they are not explicitly
+// required.
+//
+/*
else
{
endpoints.erase(remove_if(endpoints.begin(), endpoints.end(), ::Ice::constMemFun(&Endpoint::secure)),
endpoints.end());
}
+*/
if (endpoints.empty())
{