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.

40 lines
1.4 KiB

  1. commit a80c11777b09ea494b5da76a5bcb096851fb6097
  2. Author: Christopher Faulet <cfaulet@haproxy.com>
  3. Date: Mon Sep 23 16:11:57 2019 +0200
  4. BUG/MEDIUM: stream-int: Process connection/CS errors during synchronous sends
  5. If an error occurred on the connection or the conn-stream, no syncrhonous send
  6. is performed. If the error was not already processed and there is no more I/O,
  7. it will never be processed and the stream will never be notified of this
  8. error. This may block the stream until a timeout is reached or infinitly if
  9. there is no timeout.
  10. Concretly, this bug can be triggered time to time with h2spec, running the test
  11. "http2/5.1.1/2".
  12. This patch depends on the commit 328ed220a "BUG/MINOR: stream-int: Process
  13. connection/CS errors first in si_cs_send()". Both must be backported to 2.0 and
  14. probably to 1.9. In 1.9, the code is totally different, so this patch would have
  15. to be adapted.
  16. (cherry picked from commit e55a5a41713b629d349ba020183744a38129b892)
  17. Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
  18. diff --git a/src/stream_interface.c b/src/stream_interface.c
  19. index 4130444e..ef0fea7f 100644
  20. --- a/src/stream_interface.c
  21. +++ b/src/stream_interface.c
  22. @@ -922,12 +922,6 @@ void si_sync_send(struct stream_interface *si)
  23. if (!cs)
  24. return;
  25. - if (cs->flags & (CS_FL_ERROR|CS_FL_ERR_PENDING))
  26. - return;
  27. -
  28. - if (cs->conn->flags & CO_FL_ERROR)
  29. - return;
  30. -
  31. si_cs_send(cs);
  32. }