Document the children ... concurrency=N option

auth_param digest/basic children .. concurrency=N

and remove the documentation of the old and no longer supported
auth_param basic concurrency N option..

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 4b71076944d6c96332d3a33157f6063d9ceabf5a..dfa4510eb1df5f787ac0ccb5fb01307344101ce3 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -130,7 +130,7 @@ DOC_START
        translate the HTTP iso-latin-1 charset to UTF-8 before sending the
        username & password to the helper.
 
-       "children" numberofchildren [startup=N] [idle=N]
+       "children" numberofchildren [startup=N] [idle=N] [concurrency=N]
        The maximum number of authenticator processes to spawn. If you start too few
        Squid will have to wait for them to process a backlog of credential
        verifications, slowing it down. When password verifications are
@@ -143,17 +143,15 @@ DOC_START
        traffic needs and to keep idle=N free above those traffic needs up to
        the maximum.
 
-       auth_param basic children 20 startup=0 idle=1
-
-       "concurrency" concurrency
-       The number of concurrent requests the helper can process.
-       The default of 0 is used for helpers who only supports
-       one request at a time. Setting this changes the protocol used to
-       include a channel number first on the request/response line, allowing
-       multiple requests to be sent to the same helper in parallell without
-       wating for the response.
+       The concurrency= option sets the number of concurrent requests the
+       helper can process.  The default of 0 is used for helpers who only
+       supports one request at a time. Setting this to a number greater than
+       0 changes the protocol used to include a channel number first on the
+       request/response line, allowing multiple requests to be sent to the
+       same helper in parallell without wating for the response.
        Must not be set unless it's known the helper supports this.
-       auth_param basic concurrency 0
+
+       auth_param basic children 20 startup=0 idle=1
 
        "realm" realmstring
        Specifies the realm name which is to be reported to the
@@ -205,7 +203,7 @@ DOC_START
        translate the HTTP iso-latin-1 charset to UTF-8 before sending the
        username & password to the helper.
 
-       "children" numberofchildren [startup=N] [idle=N]
+       "children" numberofchildren [startup=N] [idle=N] [concurrency=N]
        The maximum number of authenticator processes to spawn (default 5).
        If you start too few Squid will have to wait for them to
        process a backlog of H(A1) calculations, slowing it down.
@@ -218,6 +216,14 @@ DOC_START
        traffic needs and to keep idle=N free above those traffic needs up to
        the maximum.
 
+       The concurrency= option sets the number of concurrent requests the
+       helper can process.  The default of 0 is used for helpers who only
+       supports one request at a time. Setting this to a number greater than
+       0 changes the protocol used to include a channel number first on the
+       request/response line, allowing multiple requests to be sent to the
+       same helper in parallell without wating for the response.
+       Must not be set unless it's known the helper supports this.
+
        auth_param digest children 20 startup=0 idle=1
 
        "realm" realmstring

diff --git a/src/helper.cc b/src/helper.cc
index a327b653f5137aae4396d2ef89e774cb50e2d48b..bbbefa5990a51c2a24d7dae22a390c68d40e5720 100644 (file)
--- a/src/helper.cc
+++ b/src/helper.cc
@@ -199,6 +199,9 @@ helperStatefulOpenServers(statefulhelper * hlp)
     if (hlp->cmdline == NULL)
         return;
 
+    if (hlp->childs.concurrency)
+       debugs(84, 0, "ERROR: concurrency= is not yet supported for stateful helpers ('" << hlp->cmdline << "')");
+
     char *progname = hlp->cmdline->key;
 
     char *s;