Merge branch 'master' into v1

2017-10-19 11:20:55 +02:00
parent a8ddd10b46 a0c1ab5232
commit d089fd3a03
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=3
-#max_tcp_clients=100
-socket_timeout=60
-socket_recv_timeout=15
+#keep_alive_timeout=5
 #max_keep_alive_requests=300
+#max_tcp_clients=100
+#socket_timeout=60
+#socket_recv_timeout=15