summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2001-12-08 16:05:04 +0000
committerMarc Laukien <marc@zeroc.com>2001-12-08 16:05:04 +0000
commit1c1448d21f87676afe0728630dccdf00c86b3868 (patch)
tree70f0cd82dd102c78ef0ee418110858d0dda87e47 /cpp
parentfixes (diff)
downloadice-1c1448d21f87676afe0728630dccdf00c86b3868.tar.bz2
ice-1c1448d21f87676afe0728630dccdf00c86b3868.tar.xz
ice-1c1448d21f87676afe0728630dccdf00c86b3868.zip
fixes
Diffstat (limited to 'cpp')
-rw-r--r--cpp/config/TestUtil.py4
-rw-r--r--cpp/demo/Ice/latency/config8
2 files changed, 5 insertions, 7 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index d9ea2b2519b..9c0be05ef95 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -14,8 +14,8 @@
# protocol. Otherwise TCP is used.
#
-protocol = "ssl"
-#protocol = ""
+#protocol = "ssl"
+protocol = ""
#
# Set the host to the host name the test servers are running on. If not
diff --git a/cpp/demo/Ice/latency/config b/cpp/demo/Ice/latency/config
index 9c19d0a92a9..1c5f8b7752e 100644
--- a/cpp/demo/Ice/latency/config
+++ b/cpp/demo/Ice/latency/config
@@ -1,6 +1,4 @@
-Latency.Ping=ping:tcp -p 10000 -h localhost
-Ice.Adapter.LatencyAdapter.Endpoints=tcp -p 10000
-# Latency.Ping=ping -s :ssl -p 10000 -h localhost
-# Ice.Adapter.LatencyAdapter.Endpoints=ssl -p 10000
+Latency.Ping=ping:default -p 10000 -h localhost
+Ice.Adapter.LatencyAdapter.Endpoints=default -p 10000
Ice.Security.Ssl.CertPath=../../../certs
-Ice.Security.Ssl.Config=./client_sslconfig.xml
+Ice.Security.Ssl.Config=./sslconfig.xml