Merge branch 'master' into es17.01

This commit is contained in:
Jocelyn Fiat
2017-04-11 13:38:27 +02:00
15 changed files with 737 additions and 21 deletions

View File

@@ -5,5 +5,5 @@ socket_timeout=60
socket_recv_timeout=45
keep_alive_timeout=25
ssl_enabled=false
ssl_ca_key=demo.key
ssl_ca_crt=demo.crt
ssl_ca_key=server.key
ssl_ca_crt=server.crt

View File

@@ -10,9 +10,16 @@ class
inherit
ROC_CMS_LAUNCHER [DEMO_CMS_EXECUTION]
redefine
optional_application_name
end
create
make_and_launch
feature -- Access
optional_application_name: STRING_32 = "server"
end