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.

29 lines
953 B

  1. From 21877a43afd6300518140c415ccec2dba0a0591f Mon Sep 17 00:00:00 2001
  2. From: Willy Tarreau <w@1wt.eu>
  3. Date: Fri, 21 Oct 2016 17:13:24 +0200
  4. Subject: [PATCH 07/26] BUG/MINOR: vars: use sess and not s->sess in
  5. action_store()
  6. This causes the stream to be dereferenced when not needed. It will
  7. cause trouble when variables are used outside of a stream.
  8. (cherry picked from commit 108a8fd8be0c78a4bf147a2028fd9bda3343c93c)
  9. ---
  10. src/vars.c | 2 +-
  11. 1 file changed, 1 insertion(+), 1 deletion(-)
  12. diff --git a/src/vars.c b/src/vars.c
  13. index 56fade5..b22c3bf 100644
  14. --- a/src/vars.c
  15. +++ b/src/vars.c
  16. @@ -507,7 +507,7 @@ static enum act_return action_store(struct act_rule *rule, struct proxy *px,
  17. /* Process the expression. */
  18. memset(&smp, 0, sizeof(smp));
  19. - if (!sample_process(px, s->sess, s, dir|SMP_OPT_FINAL,
  20. + if (!sample_process(px, sess, s, dir|SMP_OPT_FINAL,
  21. rule->arg.vars.expr, &smp))
  22. return ACT_RET_CONT;
  23. --
  24. 2.7.3