In future versions of HTTP requests can be terminated abnormally
without ditching the entire session, and this change starts the
transition to that logic.

Fixes: #1732