Merge branch 'master' into v1

2017-10-19 10:57:45 +02:00 · 2017-10-17 14:52:17 +02:00 · 2017-09-21 21:22:38 +02:00 · 2017-06-21 08:58:15 +02:00 · 2017-06-20 18:17:30 +02:00 · 2017-06-20 18:16:43 +02:00
1 changed files with 4 additions and 4 deletions
--- a/examples/simple/simple.ini
+++ b/examples/simple/simple.ini
@@ -2,8 +2,8 @@ verbose=true
 verbose_level=ALERT
 port=9090
 #max_concurrent_connections=100
-#keep_alive_timeout=5
-#max_keep_alive_requests=300
+keep_alive_timeout=3
 #max_tcp_clients=100
-#socket_timeout=60
-#socket_recv_timeout=15
+socket_timeout=60
+socket_recv_timeout=15
+#max_keep_alive_requests=300
Author	SHA1	Message	Date
Jocelyn Fiat	a8ddd10b46	Merge branch 'master' into v1	2017-10-19 10:57:45 +02:00
Jocelyn Fiat	1c9f5ac0e7	Merge branch 'master' into v1	2017-10-17 14:52:17 +02:00
Jocelyn Fiat	8ff20d34a7	Merge branch 'master' into v1	2017-09-21 21:22:38 +02:00
Jocelyn Fiat	67bdcfb6ef	Made the parameters not hidden implementation classes.	2017-06-21 08:58:15 +02:00
Jocelyn Fiat	ca4043b102	Merge branch 'master' into v1	2017-06-20 18:17:30 +02:00
Jocelyn Fiat	310e96e185	Updated EOL for 2 ecf files.	2017-06-20 18:16:43 +02:00