summaryrefslogtreecommitdiff
path: root/cpp/config/TestUtil.py
diff options
context:
space:
mode:
authorAnthony Neal <aneal@zeroc.com>2001-11-30 19:58:47 +0000
committerAnthony Neal <aneal@zeroc.com>2001-11-30 19:58:47 +0000
commit0943a96869b83130fb7f2c3983a918a0dbad144b (patch)
tree45203542428d3f0776f88e98733eb1ad47dbabbc /cpp/config/TestUtil.py
parentconverted some stuff to use Application.h (diff)
downloadice-0943a96869b83130fb7f2c3983a918a0dbad144b.tar.bz2
ice-0943a96869b83130fb7f2c3983a918a0dbad144b.tar.xz
ice-0943a96869b83130fb7f2c3983a918a0dbad144b.zip
Have fixed the handshake problem, now handshakes take place in the
read/write methods. As well, I have changed the configuration properties to be under the Ice.Security.* branch of properties. I have added a new configuration property having to do with the timeout value for the first read after the handshake has completed - the default value should be sufficient, but in case it is not, this is a tweak that is avaliable.
Diffstat (limited to 'cpp/config/TestUtil.py')
-rw-r--r--cpp/config/TestUtil.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index 1c3b375ac0e..0c5e2cb33fd 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -15,17 +15,19 @@ protocol = "tcp"
serverOptions = \
" --Ice.PrintProcessId --Ice.PrintAdapterReady --Ice.WarnAboutServerExceptions --Ice.ServerIdleTime=30" + \
-" --Ice.Ssl.CertPath=TOPLEVELDIR/certs --Ice.Ssl.Config=server_sslconfig.xml --Ice.Protocol=" + protocol
+" --Ice.Security.Ssl.CertPath=TOPLEVELDIR/certs --Ice.Security.Ssl.Config=server_sslconfig.xml" + \
+" --Ice.Protocol=" + protocol
clientOptions = \
-" --Ice.Ssl.CertPath=TOPLEVELDIR/certs --Ice.Ssl.Config=client_sslconfig.xml --Ice.Protocol=" + protocol
+" --Ice.Security.Ssl.CertPath=TOPLEVELDIR/certs --Ice.Security.Ssl.Config=client_sslconfig.xml" + \
+" --Ice.Protocol=" + protocol
clientServerOptions = \
" --Ice.PrintProcessId --Ice.PrintAdapterReady --Ice.WarnAboutServerExceptions --Ice.ServerIdleTime=30" + \
-" --Ice.Ssl.CertPath=TOPLEVELDIR/certs --Ice.Ssl.Config=sslconfig.xml --Ice.Protocol=" + protocol
+" --Ice.Security.Ssl.CertPath=TOPLEVELDIR/certs --Ice.Security.Ssl.Config=sslconfig.xml --Ice.Protocol=" + protocol
collocatedOptions = \
-" --Ice.Ssl.CertPath=TOPLEVELDIR/certs --Ice.Ssl.Config=sslconfig.xml --Ice.Protocol=" + protocol
+" --Ice.Security.Ssl.CertPath=TOPLEVELDIR/certs --Ice.Security.Ssl.Config=sslconfig.xml --Ice.Protocol=" + protocol
serverPids = []