Merge branch '2.2' into 2.2-mrm

2017-11-08 10:44:35 +02:00
parent 4cf01fa88f 42d9064b04
commit 3a35d49ffe
13 changed files with 36 additions and 647 deletions
--- a/server/core/config_runtime.cc
+++ b/server/core/config_runtime.cc
@ -597,7 +597,9 @@ bool runtime_alter_service(SERVICE *service, const char* zKey, const char* zValu
        {
            valid = true;
            // TODO: Once connection queues are implemented, use correct values
-            serviceSetConnectionLimits(service, i, 0, 0);
+            const int queued_connections = 0; // At most this many pending connections.
+            const int timeout = 0;            // Wait at most this much for a connection.
+            serviceSetConnectionLimits(service, i, queued_connections, timeout);
        }
    }
    else if (key == CN_CONNECTION_TIMEOUT)