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.

30 lines
1.1 KiB

  1. commit 01d9157013729859fdb7470887d78d67a3cdf6b9
  2. Author: Christopher Faulet <cfaulet@haproxy.com>
  3. Date: Fri Apr 19 15:26:01 2019 +0200
  4. BUG/MINOR: da: Get the request channel to call CHECK_HTTP_MESSAGE_FIRST()
  5. Since the commit 89dc49935 ("BUG/MAJOR: http_fetch: Get the channel depending on
  6. the keyword used"), the right channel must be passed as argument when the macro
  7. CHECK_HTTP_MESSAGE_FIRST is called.
  8. This patch must be backported to 1.9.
  9. (cherry picked from commit f48552f2c10a2f956d7bd1eb02a6d694d2b5c5d3)
  10. Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
  11. (cherry picked from commit 2a38fa09b588d8b30fabc77282e66ef613336ee7)
  12. Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
  13. diff --git a/src/da.c b/src/da.c
  14. index 685a79d1..cd4050bf 100644
  15. --- a/src/da.c
  16. +++ b/src/da.c
  17. @@ -293,7 +293,7 @@ static int da_haproxy_fetch(const struct arg *args, struct sample *smp, const ch
  18. return 1;
  19. }
  20. - CHECK_HTTP_MESSAGE_FIRST();
  21. + CHECK_HTTP_MESSAGE_FIRST((smp->strm ? &smp->strm->req : NULL));
  22. smp->data.type = SMP_T_STR;
  23. /**