From c1a07960a67789e1e01db14049892db1f040669a Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Tue, 16 Mar 2010 20:55:43 +0100 Subject: [PATCH] [BUG] checks: don't report an error when recv() returns an error after data This happens when a server immediately closes the connection after the response without lingering or when we close before the end of the data. We get an RST which translates into a late error. We must not declare an error without checking that the contents are OK. --- src/checks.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/checks.c b/src/checks.c index eeed75af4..cba49f8b2 100644 --- a/src/checks.c +++ b/src/checks.c @@ -898,10 +898,17 @@ static int event_srv_chk_r(int fd) fdtab[fd].ev &= ~FD_POLL_IN; return 0; } - /* network error, report it */ - if (!(s->result & SRV_CHK_ERROR)) - set_server_check_status(s, HCHK_STATUS_SOCKERR, NULL); - goto out_wakeup; + + /* Report network errors only if we got no other data. Otherwise + * we'll let the upper layers decide whether the response is OK + * or not. It is very common that an RST sent by the server is + * reported as an error just after the last data chunk. + */ + if (!s->check_data_len) { + if (!(s->result & SRV_CHK_ERROR)) + set_server_check_status(s, HCHK_STATUS_SOCKERR, NULL); + goto out_wakeup; + } } /* Full response received.