BUG/MINOR: http: don't report client aborts as server errors

If a client aborts with an abortonclose flag, the close is forwarded
to the server and when server response is processed, the analyser thinks
it's the server who has closed first, and logs flags "SD" or "SH" and
counts a server error. In order to avoid this, we now first detect that
the client has closed and log a client abort instead.

This likely is the reason why many people have been observing a small rate
of SD/SH flags without being able to find what the error was.

This fix should probably be backported to 1.4.

diff --git a/src/proto_http.c b/src/proto_http.c
index 19ddbec31b2b117c6e9383ad7d8e6355c76fb3b1..2b96ca33652a3698fd89d0590569f984df903d5c 100644 (file)
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -4918,6 +4918,29 @@ int http_wait_for_response(struct session *s, struct channel *rep, int an_bit)
                        return 0;
                }
 
+               /* client abort with an abortonclose */
+               else if ((rep->flags & CF_SHUTR) && ((s->req->flags & (CF_SHUTR|CF_SHUTW)) == (CF_SHUTR|CF_SHUTW))) {
+                       s->fe->fe_counters.cli_aborts++;
+                       s->be->be_counters.cli_aborts++;
+                       if (objt_server(s->target))
+                               objt_server(s->target)->counters.cli_aborts++;
+
+                       rep->analysers = 0;
+                       channel_auto_close(rep);
+
+                       txn->status = 400;
+                       bi_erase(rep);
+                       stream_int_retnclose(rep->cons, http_error_message(s, HTTP_ERR_400));
+
+                       if (!(s->flags & SN_ERR_MASK))
+                               s->flags |= SN_ERR_CLICL;
+                       if (!(s->flags & SN_FINST_MASK))
+                               s->flags |= SN_FINST_H;
+
+                       /* process_session() will take care of the error */
+                       return 0;
+               }
+
                /* close from server, capture the response if the server has started to respond */
                else if (rep->flags & CF_SHUTR) {
                        if (msg->msg_state >= HTTP_MSG_RPVER || msg->err_pos >= 0)
@@ -5738,8 +5761,18 @@ int http_response_forward_body(struct session *s, struct channel *res, int an_bi
                http_compression_buffer_end(s, &res->buf, &tmpbuf, 0);
                compressing = 0;
        }
-       /* stop waiting for data if the input is closed before the end */
+
+       if (res->flags & CF_SHUTW)
+               goto aborted_xfer;
+
+       /* stop waiting for data if the input is closed before the end. If the
+        * client side was already closed, it means that the client has aborted,
+        * so we don't want to count this as a server abort. Otherwise it's a
+        * server abort.
+        */
        if (res->flags & CF_SHUTR) {
+               if ((res->flags & CF_SHUTW_NOW) || (s->req->flags & CF_SHUTR))
+                       goto aborted_xfer;
                if (!(s->flags & SN_ERR_MASK))
                        s->flags |= SN_ERR_SRVCL;
                s->be->be_counters.srv_aborts++;
@@ -5748,9 +5781,6 @@ int http_response_forward_body(struct session *s, struct channel *res, int an_bi
                goto return_bad_res_stats_ok;
        }
 
-       if (res->flags & CF_SHUTW)
-               goto aborted_xfer;
-
        /* we need to obey the req analyser, so if it leaves, we must too */
        if (!s->req->analysers)
                goto return_bad_res;