[MEDIUM] tcp-request : don't wait for inspect-delay to expire when the buffer is...

If a request buffer is full, there's no point waiting for the timeout to
expire, the contents will not change.

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 926ce9a216674baed850b6663f855abf14bdecb6..9eedf798724392dfd1d68d7ae0523f959d49a111 100644 (file)
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -5497,7 +5497,9 @@ tcp-request inspect-delay <timeout>
   to use large values, for instance to ensure that the client never talks
   before the server (eg: SMTP), or to wait for a client to talk before passing
   data to the server (eg: SSL). Note that the client timeout must cover at
-  least the inspection delay, otherwise it will expire first.
+  least the inspection delay, otherwise it will expire first. If the client
+  closes the connection or if the buffer is full, the delay immediately expires
+  since the contents will not be able to change anymore.
 
   See also : "tcp-request content accept", "tcp-request content reject",
              "timeout client".

diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 2670666126634f44a02ccd6fca57edb129947674..22179b9ab6bdbd8fe3cecfd4bc5487a8e06ba635 100644 (file)
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -646,7 +646,7 @@ int tcp_inspect_request(struct session *s, struct buffer *req, int an_bit)
         * - if one rule returns KO, then return KO
         */
 
-       if (req->flags & BF_SHUTR || !s->be->tcp_req.inspect_delay || tick_is_expired(req->analyse_exp, now_ms))
+       if (req->flags & (BF_SHUTR|BF_FULL) || !s->be->tcp_req.inspect_delay || tick_is_expired(req->analyse_exp, now_ms))
                partial = 0;
        else
                partial = ACL_PARTIAL;