Merge branch '2.0' into develop-2.0-merge

2016-11-15 00:09:24 +02:00
parent 2202ec7a33 7ddb4d8e5a
commit 3c15b58891
26 changed files with 621 additions and 239 deletions
--- a/server/core/config.c
+++ b/server/core/config.c
@ -1729,7 +1729,7 @@ process_config_update(CONFIG_CONTEXT *context)

                        if (connection_timeout)
                        {
-                            serviceSetTimeout(service, config_truth_value(connection_timeout));
+                            serviceSetTimeout(service, atoi(connection_timeout));
                        }

                        if (strlen(max_connections))