[1.x] Ensure connection close handler is cleaned up for each request

[1.x] Ensure connection close handler is cleaned up for each request #31