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.

34 lines
1.4 KiB

  1. commit b22f6501bc9838061472128360e0e55d08cb0bd9
  2. Author: Christopher Faulet <cfaulet@haproxy.com>
  3. Date: Fri Jul 26 14:54:52 2019 +0200
  4. MINOR: hlua: Don't set request analyzers on response channel for lua actions
  5. Setting some requests analyzers on the response channel was an old trick to be
  6. sure to re-evaluate the request's analyers after the response's ones have been
  7. called. It is no more necessary. In fact, this trick was removed in the version
  8. 1.8 and backported up to the version 1.6.
  9. This patch must be backported to all versions since 1.6 to ease the backports of
  10. fixes on the lua code.
  11. (cherry picked from commit 51fa358432247fe5d7259d9d8a0e08d49d429c73)
  12. Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
  13. diff --git a/src/hlua.c b/src/hlua.c
  14. index 21351cd6..36454cdc 100644
  15. --- a/src/hlua.c
  16. +++ b/src/hlua.c
  17. @@ -6873,11 +6873,8 @@ static enum act_return hlua_action(struct act_rule *rule, struct proxy *px,
  18. * is detected on a response channel. This is useful
  19. * only for actions targeted on the requests.
  20. */
  21. - if (HLUA_IS_WAKERESWR(s->hlua)) {
  22. + if (HLUA_IS_WAKERESWR(s->hlua))
  23. s->res.flags |= CF_WAKE_WRITE;
  24. - if ((analyzer & (AN_REQ_INSPECT_FE|AN_REQ_HTTP_PROCESS_FE)))
  25. - s->res.analysers |= analyzer;
  26. - }
  27. if (HLUA_IS_WAKEREQWR(s->hlua))
  28. s->req.flags |= CF_WAKE_WRITE;
  29. /* We can quit the function without consistency check