I just downloaded the latest trunk and applied the patch as-is, and it worked fine...
Oops, formatting makes this patch a bit messy. I have added it as an attachment.
Ensure sockets are closed when sessions are closed