You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

31 lines
1.1 KiB

  1. From 9ac7cabaf9945fb92c96cb92f5ea85235f54f7d6 Mon Sep 17 00:00:00 2001
  2. From: Simon Horman <horms@verge.net.au>
  3. Date: Fri, 20 Jun 2014 12:29:47 +0900
  4. Subject: [PATCH] BUG/MEDIUM: Consistently use 'check' in process_chk
  5. I am not entirely sure that this is a bug, but it seems
  6. to me that it may cause a problem if there agent-check is
  7. configured and there is some kind of error making a connection for it.
  8. Signed-off-by: Simon Horman <horms@verge.net.au>
  9. (cherry picked from commit ccaabcdfca23851af6fd83f4f3265284d283e2ab)
  10. ---
  11. src/checks.c | 2 +-
  12. 1 file changed, 1 insertion(+), 1 deletion(-)
  13. diff --git a/src/checks.c b/src/checks.c
  14. index cba0018..f3b2b54 100644
  15. --- a/src/checks.c
  16. +++ b/src/checks.c
  17. @@ -1541,7 +1541,7 @@ static struct task *process_chk(struct task *t)
  18. * First, let's check whether there was an uncaught error,
  19. * which can happen on connect timeout or error.
  20. */
  21. - if (s->check.result == CHK_RES_UNKNOWN) {
  22. + if (check->result == CHK_RES_UNKNOWN) {
  23. /* good connection is enough for pure TCP check */
  24. if ((conn->flags & CO_FL_CONNECTED) && !check->type) {
  25. if (check->use_ssl)
  26. --
  27. 1.8.5.5